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

[Alex Henrie]

From: Alex Henrie

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

diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c
index bb998543ae7..95c7df5afe0 100644
--- a/dlls/winex11.drv/desktop.c
+++ b/dlls/winex11.drv/desktop.c
@@ -228,7 +228,7 @@ 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 };
+    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 98b0b23e103..429d2076160 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -2745,7 +2745,7 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags,
 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 };
+    UNICODE_STRING str = RTL_CONSTANT_STRING( trayW );

if (data->managed) return TRUE;
     /* hide icons in desktop mode when the taskbar is active */