Commit e4ec6f87 authored by Brendan Shanks's avatar Brendan Shanks Committed by Alexandre Julliard

winemac: Use RTL_CONSTANT_STRING.

parent e5c4acc4
...@@ -1665,8 +1665,7 @@ void macdrv_UpdateClipboard(void) ...@@ -1665,8 +1665,7 @@ void macdrv_UpdateClipboard(void)
if (!NtUserIsWindow(clipboard_manager)) if (!NtUserIsWindow(clipboard_manager))
{ {
UNICODE_STRING str; UNICODE_STRING str = RTL_CONSTANT_STRING(clipboard_classname);
RtlInitUnicodeString(&str, clipboard_classname);
clipboard_manager = NtUserFindWindowEx(NULL, NULL, &str, NULL, 0); clipboard_manager = NtUserFindWindowEx(NULL, NULL, &str, NULL, 0);
if (!clipboard_manager) if (!clipboard_manager)
{ {
......
...@@ -149,7 +149,7 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID ...@@ -149,7 +149,7 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID
char display_key_name[19]; char display_key_name[19];
HKEY display_hkey; HKEY display_hkey;
CGDisplayModeRef display_mode; CGDisplayModeRef display_mode;
UNICODE_STRING str; UNICODE_STRING str = RTL_CONSTANT_STRING(pixelencodingW);
DWORD val; DWORD val;
CFStringRef pixel_encoding; CFStringRef pixel_encoding;
size_t len; size_t len;
...@@ -189,7 +189,6 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID ...@@ -189,7 +189,6 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID
CFStringGetCharacters(pixel_encoding, CFRangeMake(0, len), (UniChar*)buf); CFStringGetCharacters(pixel_encoding, CFRangeMake(0, len), (UniChar*)buf);
buf[len] = 0; buf[len] = 0;
CFRelease(pixel_encoding); CFRelease(pixel_encoding);
RtlInitUnicodeString(&str, pixelencodingW);
if (NtSetValueKey(display_hkey, &str, 0, REG_SZ, (const BYTE*)buf, (len + 1) * sizeof(WCHAR))) if (NtSetValueKey(display_hkey, &str, 0, REG_SZ, (const BYTE*)buf, (len + 1) * sizeof(WCHAR)))
goto fail; goto fail;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment