Jacek Caban : win32u: Use RtlInitUnicodeString from ntdll.so.
Alexandre Julliard
julliard at winehq.org
Mon Apr 18 16:08:47 CDT 2022
Module: wine
Branch: master
Commit: acfec2f94ce4e9bb778cc4830f164ac200894ad8
URL: https://source.winehq.org/git/wine.git/?a=commit;h=acfec2f94ce4e9bb778cc4830f164ac200894ad8
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Apr 18 14:06:12 2022 +0200
win32u: Use RtlInitUnicodeString from ntdll.so.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/win32u/driver.c | 4 ++--
dlls/win32u/win32u_private.h | 7 -------
dlls/win32u/winstation.c | 10 +++++-----
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 6b6f1a64ce8..83814ba14f5 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -215,7 +215,7 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap )
dc = get_nulldrv_dc( dev );
memset( &devmode, 0, sizeof(devmode) );
devmode.dmSize = sizeof(devmode);
- init_unicode_string( &display, dc->display );
+ RtlInitUnicodeString( &display, dc->display );
if (NtUserEnumDisplaySettings( &display, ENUM_CURRENT_SETTINGS, &devmode, 0 ) &&
(devmode.dmFields & DM_BITSPERPEL) && devmode.dmBitsPerPel)
return devmode.dmBitsPerPel;
@@ -267,7 +267,7 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap )
memset( &devmode, 0, sizeof(devmode) );
devmode.dmSize = sizeof(devmode);
- init_unicode_string( &display, dc->display );
+ RtlInitUnicodeString( &display, dc->display );
if (NtUserEnumDisplaySettings( &display, ENUM_CURRENT_SETTINGS, &devmode, 0 ) &&
devmode.dmDisplayFrequency)
return devmode.dmDisplayFrequency;
diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index 651003d4e84..d85cb9d683d 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -626,13 +626,6 @@ static inline BOOL is_win9x(void)
return NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32s;
}
-static inline void init_unicode_string( UNICODE_STRING *str, const WCHAR *data )
-{
- str->Length = lstrlenW(data) * sizeof(WCHAR);
- str->MaximumLength = str->Length + sizeof(WCHAR);
- str->Buffer = (WCHAR *)data;
-}
-
static inline const char *debugstr_us( const UNICODE_STRING *us )
{
if (!us) return "<null>";
diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c
index a25edfc9771..8e47c97510e 100644
--- a/dlls/win32u/winstation.c
+++ b/dlls/win32u/winstation.c
@@ -450,11 +450,11 @@ HWND get_desktop_window(void)
params.Environment = peb->ProcessParameters->Environment;
params.EnvironmentSize = peb->ProcessParameters->EnvironmentSize;
params.hStdError = peb->ProcessParameters->hStdError;
- init_unicode_string( ¶ms.CurrentDirectory.DosPath, system_dir );
- init_unicode_string( ¶ms.ImagePathName, appnameW + 4 );
- init_unicode_string( ¶ms.CommandLine, cmdlineW );
- init_unicode_string( ¶ms.WindowTitle, appnameW + 4 );
- init_unicode_string( ¶ms.Desktop, desktop );
+ RtlInitUnicodeString( ¶ms.CurrentDirectory.DosPath, system_dir );
+ RtlInitUnicodeString( ¶ms.ImagePathName, appnameW + 4 );
+ RtlInitUnicodeString( ¶ms.CommandLine, cmdlineW );
+ RtlInitUnicodeString( ¶ms.WindowTitle, appnameW + 4 );
+ RtlInitUnicodeString( ¶ms.Desktop, desktop );
ps_attr.TotalLength = sizeof(ps_attr);
ps_attr.Attributes[0].Attribute = PS_ATTRIBUTE_IMAGE_NAME;
More information about the wine-cvs
mailing list