[PATCH v3 0/2] MR2016: winex11: Take advantage of RTL_CONSTANT_STRING.

[Alex Henrie (＠alexhenrie)]

--
  v3: winex11: Avoid calling RtlInitUnicodeString on a static constant.
      winex11: Use RTL_CONSTANT_STRING instead of reimplementing it.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2016

[PATCH v3 1/2] winex11: Use RTL_CONSTANT_STRING instead of reimplementing it.

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

---
 dlls/winex11.drv/desktop.c | 4 ++--
 dlls/winex11.drv/window.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c
index a0367d6ce50..8a9f476ede2 100644
--- a/dlls/winex11.drv/desktop.c
+++ b/dlls/winex11.drv/desktop.c
@@ -227,8 +227,8 @@ static LONG X11DRV_desktop_set_current_mode( ULONG_PTR id, const DEVMODEW *mode
 
 static void query_desktop_work_area( RECT *rc_work )
 {
-    static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d'};
-    UNICODE_STRING str = { sizeof(trayW), sizeof(trayW), (WCHAR *)trayW };
+    static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0};
+    UNICODE_STRING str = RTL_CONSTANT_STRING( trayW );
     RECT rect;
     HWND hwnd = NtUserFindWindowEx( 0, 0, &str, NULL, 0 );
 
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 17fc6d867f5..776cb5405fb 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -2744,8 +2744,8 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags,
 /* check if the window icon should be hidden (i.e. moved off-screen) */
 static BOOL hide_icon( struct x11drv_win_data *data )
 {
-    static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d'};
-    UNICODE_STRING str = { sizeof(trayW), sizeof(trayW), (WCHAR *)trayW };
+    static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0};
+    UNICODE_STRING str = RTL_CONSTANT_STRING( trayW );
 
     if (data->managed) return TRUE;
     /* hide icons in desktop mode when the taskbar is active */
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2016

[PATCH v3 2/2] winex11: Avoid calling RtlInitUnicodeString on a static constant.

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

---
 dlls/winex11.drv/mouse.c  | 3 +--
 dlls/winex11.drv/window.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index d1ade2eda68..c34f5fde77e 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -374,7 +374,7 @@ static BOOL grab_clipping_window( const RECT *clip )
 #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
     static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0};
     struct x11drv_thread_data *data = x11drv_thread_data();
-    UNICODE_STRING class_name;
+    UNICODE_STRING class_name = RTL_CONSTANT_STRING( messageW );
     Window clip_window;
     HWND msg_hwnd = 0;
     POINT pos;
@@ -385,7 +385,6 @@ static BOOL grab_clipping_window( const RECT *clip )
     if (!data) return FALSE;
     if (!(clip_window = init_clip_window())) return TRUE;
 
-    RtlInitUnicodeString( &class_name, messageW );
     if (!(msg_hwnd = NtUserCreateWindowEx( 0, &class_name, &class_name, NULL, 0, 0, 0, 0, 0,
                                            HWND_MESSAGE, 0, NtCurrentTeb()->Peb->ImageBaseAddress,
                                            NULL, 0, NULL, 0, FALSE )))
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 776cb5405fb..cb9e07599c4 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -2058,7 +2058,7 @@ HWND create_foreign_window( Display *display, Window xwin )
     unsigned int nchildren;
     XWindowAttributes attr;
     UINT style = WS_CLIPCHILDREN;
-    UNICODE_STRING class_name;
+    UNICODE_STRING class_name = RTL_CONSTANT_STRING( classW );
 
     if (!class_registered)
     {
@@ -2069,7 +2069,6 @@ HWND create_foreign_window( Display *display, Window xwin )
         class.cbSize        = sizeof(class);
         class.lpfnWndProc   = client_foreign_window_proc;
         class.lpszClassName = classW;
-        RtlInitUnicodeString( &class_name, classW );
         if (!NtUserRegisterClassExWOW( &class, &class_name, &version, NULL, 0, 0, NULL ) &&
             RtlGetLastWin32Error() != ERROR_CLASS_ALREADY_EXISTS)
         {
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2016

[Alex Henrie (＠alexhenrie)]

On Tue Feb 28 16:34:03 2023 +0000, Jacek Caban wrote:
> You'd need to null-terminate trayW for this to work.
> Fixed, thank you for catching that.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2016#note_25767