Module: wine Branch: master Commit: e4ec6f87e0be4c4ea9908bc22b59c829a2e4ad67 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4ec6f87e0be4c4ea9908bc22b59c82...
Author: Brendan Shanks bshanks@codeweavers.com Date: Tue Dec 5 14:32:24 2023 -0800
winemac: Use RTL_CONSTANT_STRING.
---
dlls/winemac.drv/clipboard.c | 3 +-- dlls/winemac.drv/display.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index ef0c3ae9c25..5a1065cf7c4 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1665,8 +1665,7 @@ void macdrv_UpdateClipboard(void)
if (!NtUserIsWindow(clipboard_manager)) { - UNICODE_STRING str; - RtlInitUnicodeString(&str, clipboard_classname); + UNICODE_STRING str = RTL_CONSTANT_STRING(clipboard_classname); clipboard_manager = NtUserFindWindowEx(NULL, NULL, &str, NULL, 0); if (!clipboard_manager) { diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 14c09649211..9bc8c79896f 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -149,7 +149,7 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID char display_key_name[19]; HKEY display_hkey; CGDisplayModeRef display_mode; - UNICODE_STRING str; + UNICODE_STRING str = RTL_CONSTANT_STRING(pixelencodingW); DWORD val; CFStringRef pixel_encoding; size_t len; @@ -189,7 +189,6 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID CFStringGetCharacters(pixel_encoding, CFRangeMake(0, len), (UniChar*)buf); buf[len] = 0; CFRelease(pixel_encoding); - RtlInitUnicodeString(&str, pixelencodingW); if (NtSetValueKey(display_hkey, &str, 0, REG_SZ, (const BYTE*)buf, (len + 1) * sizeof(WCHAR))) goto fail;