Alex Henrie : winex11: Avoid calling RtlInitUnicodeString on a static constant.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 354e999c5a8f284af3fe833f9fb45bace151a44e
URL:    https://gitlab.winehq.org/wine/wine/-/commit/354e999c5a8f284af3fe833f9fb45ba...

Author: Alex Henrie 
Date:   Tue Feb 28 09:49:36 2023 -0700

winex11: Avoid calling RtlInitUnicodeString on a static constant.

---

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)
         {