April 2022 - Wine-commits - list.winehq.org

Alexandre Julliard : kernelbase: Support UTF-8 as default Ansi codepage in MultiByteToWideChar().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 2cc54d4b854e6c4f9610f60116b320c93c21e1e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cc54d4b854e6c4f9610f601… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 17:26:46 2022 +0200 kernelbase: Support UTF-8 as default Ansi codepage in MultiByteToWideChar(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c0cd0307447..c807b1e0124 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2283,11 +2283,6 @@ static int mbstowcs_utf8( DWORD flags, const char *src, int srclen, WCHAR *dst, DWORD reslen; NTSTATUS status; - if (flags & ~(MB_PRECOMPOSED | MB_COMPOSITE | MB_USEGLYPHCHARS | MB_ERR_INVALID_CHARS)) - { - SetLastError( ERROR_INVALID_FLAGS ); - return 0; - } if (!dstlen) dst = NULL; status = RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); if (status == STATUS_SOME_NOT_MAPPED) @@ -2528,24 +2523,12 @@ static int mbstowcs_dbcs( const CPTABLEINFO *info, const unsigned char *src, int } -static int mbstowcs_codepage( UINT codepage, DWORD flags, const char *src, int srclen, +static int mbstowcs_codepage( const CPTABLEINFO *info, DWORD flags, const char *src, int srclen, WCHAR *dst, int dstlen ) { CPTABLEINFO local_info; - const CPTABLEINFO *info = get_codepage_table( codepage ); const unsigned char *str = (const unsigned char *)src; - if (!info) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - if (flags & ~(MB_PRECOMPOSED | MB_COMPOSITE | MB_USEGLYPHCHARS | MB_ERR_INVALID_CHARS)) - { - SetLastError( ERROR_INVALID_FLAGS ); - return 0; - } - if ((flags & MB_USEGLYPHCHARS) && info->MultiByteTable[256] == 256) { local_info = *info; @@ -6161,6 +6144,7 @@ LCID WINAPI DECLSPEC_HOTPATCH LocaleNameToLCID( const WCHAR *name, DWORD flags ) INT WINAPI DECLSPEC_HOTPATCH MultiByteToWideChar( UINT codepage, DWORD flags, const char *src, INT srclen, WCHAR *dst, INT dstlen ) { + const CPTABLEINFO *info; int ret; if (!src || !srclen || (!dst && dstlen) || dstlen < 0) @@ -6178,19 +6162,24 @@ INT WINAPI DECLSPEC_HOTPATCH MultiByteToWideChar( UINT codepage, DWORD flags, co case CP_UTF7: ret = mbstowcs_utf7( flags, src, srclen, dst, dstlen ); break; - case CP_UTF8: - ret = mbstowcs_utf8( flags, src, srclen, dst, dstlen ); - break; case CP_UNIXCP: - if (unix_cp == CP_UTF8) - { - ret = mbstowcs_utf8( flags, src, srclen, dst, dstlen ); - break; - } codepage = unix_cp; /* fall through */ default: - ret = mbstowcs_codepage( codepage, flags, src, srclen, dst, dstlen ); + if (!(info = get_codepage_table( codepage ))) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (flags & ~(MB_PRECOMPOSED | MB_COMPOSITE | MB_USEGLYPHCHARS | MB_ERR_INVALID_CHARS)) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (info->CodePage == CP_UTF8) + ret = mbstowcs_utf8( flags, src, srclen, dst, dstlen ); + else + ret = mbstowcs_codepage( info, flags, src, srclen, dst, dstlen ); break; } TRACE( "cp %d %s -> %s, ret = %d\n", codepage, debugstr_an(src, srclen), debugstr_wn(dst, ret), ret );

1 0

Alexandre Julliard : kernelbase: Support UTF-8 as default Ansi codepage in WideCharToMultiByte().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 1790546d03d8f61e0b01c17529e5ac88b31e1752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1790546d03d8f61e0b01c175… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 17:27:34 2022 +0200 kernelbase: Support UTF-8 as default Ansi codepage in WideCharToMultiByte(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 16 ++++++------- dlls/kernelbase/locale.c | 54 +++++++++++++++--------------------------- 2 files changed, 27 insertions(+), 43 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index b0dbd812346..0a5185d1804 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -263,32 +263,32 @@ static void test_other_invalid_parameters(void) ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%lx\n", len, GetLastError()); - /* CP_UTF7, CP_UTF8, or CP_SYMBOL and defchar not NULL => ERROR_INVALID_PARAMETER */ - /* CP_SYMBOL's behavior here is undocumented */ + /* CP_UTF7 or CP_SYMBOL and defchar not NULL => ERROR_INVALID_PARAMETER */ + /* CP_UTF8 allows it since win10 1709 */ SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_UTF7, 0, w_string, w_string_len, c_string, c_string_len, c_string, NULL); ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%lx\n", len, GetLastError()); SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_UTF8, 0, w_string, w_string_len, c_string, c_string_len, c_string, NULL); - ok((len == 0 && GetLastError() == ERROR_INVALID_PARAMETER) - || broken(len == 12) /* Win10 1709+ */, "len=%d error=%lx\n", len, GetLastError()); + ok(len == 12 || broken(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER), + "len=%d error=%lx\n", len, GetLastError()); SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_SYMBOL, 0, w_string, w_string_len, c_string, c_string_len, c_string, NULL); ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%lx\n", len, GetLastError()); - /* CP_UTF7, CP_UTF8, or CP_SYMBOL and used not NULL => ERROR_INVALID_PARAMETER */ - /* CP_SYMBOL's behavior here is undocumented */ + /* CP_UTF7 or CP_SYMBOL and used not NULL => ERROR_INVALID_PARAMETER */ + /* CP_UTF8 allows it since win10 1709 */ SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_UTF7, 0, w_string, w_string_len, c_string, c_string_len, NULL, &used); ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%lx\n", len, GetLastError()); SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_UTF8, 0, w_string, w_string_len, c_string, c_string_len, NULL, &used); - ok((len == 0 && GetLastError() == ERROR_INVALID_PARAMETER) - || broken(len == 12) /* Win10 1709+ */, "len=%d error=%lx\n", len, GetLastError()); + ok(len == 12 || broken(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER), + "len=%d error=%lx\n", len, GetLastError()); SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_SYMBOL, 0, w_string, w_string_len, c_string, c_string_len, NULL, &used); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c807b1e0124..358aa8c123c 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2687,17 +2687,7 @@ static int wcstombs_utf8( DWORD flags, const WCHAR *src, int srclen, char *dst, DWORD reslen; NTSTATUS status; - if (defchar || used) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - if (flags & ~(WC_DISCARDNS | WC_SEPCHARS | WC_DEFAULTCHAR | WC_ERR_INVALID_CHARS | - WC_COMPOSITECHECK | WC_NO_BEST_FIT_CHARS)) - { - SetLastError( ERROR_INVALID_FLAGS ); - return 0; - } + if (used) *used = FALSE; if (!dstlen) dst = NULL; status = RtlUnicodeToUTF8N( dst, dstlen, &reslen, src, srclen * sizeof(WCHAR) ); if (status == STATUS_SOME_NOT_MAPPED) @@ -2707,6 +2697,7 @@ static int wcstombs_utf8( DWORD flags, const WCHAR *src, int srclen, char *dst, SetLastError( ERROR_NO_UNICODE_TRANSLATION ); return 0; } + if (used) *used = TRUE; } else if (!set_ntstatus( status )) reslen = 0; return reslen; @@ -3054,22 +3045,9 @@ static int wcstombs_dbcs_slow( const CPTABLEINFO *info, DWORD flags, const WCHAR } -static int wcstombs_codepage( UINT codepage, DWORD flags, const WCHAR *src, int srclen, +static int wcstombs_codepage( const CPTABLEINFO *info, DWORD flags, const WCHAR *src, int srclen, char *dst, int dstlen, const char *defchar, BOOL *used ) { - const CPTABLEINFO *info = get_codepage_table( codepage ); - - if (!info) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - if (flags & ~(WC_DISCARDNS | WC_SEPCHARS | WC_DEFAULTCHAR | WC_ERR_INVALID_CHARS | - WC_COMPOSITECHECK | WC_NO_BEST_FIT_CHARS)) - { - SetLastError( ERROR_INVALID_FLAGS ); - return 0; - } if (flags || defchar || used) { if (!defchar) defchar = (const char *)&info->DefaultChar; @@ -6468,6 +6446,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH VerLanguageNameW( DWORD lang, LPWSTR buffer, DWOR INT WINAPI DECLSPEC_HOTPATCH WideCharToMultiByte( UINT codepage, DWORD flags, LPCWSTR src, INT srclen, LPSTR dst, INT dstlen, LPCSTR defchar, BOOL *used ) { + const CPTABLEINFO *info; int ret; if (!src || !srclen || (!dst && dstlen) || dstlen < 0) @@ -6486,20 +6465,25 @@ INT WINAPI DECLSPEC_HOTPATCH WideCharToMultiByte( UINT codepage, DWORD flags, LP case CP_UTF7: ret = wcstombs_utf7( flags, src, srclen, dst, dstlen, defchar, used ); break; - case CP_UTF8: - ret = wcstombs_utf8( flags, src, srclen, dst, dstlen, defchar, used ); - break; case CP_UNIXCP: - if (unix_cp == CP_UTF8) - { - if (used) *used = FALSE; - ret = wcstombs_utf8( flags, src, srclen, dst, dstlen, NULL, NULL ); - break; - } codepage = unix_cp; /* fall through */ default: - ret = wcstombs_codepage( codepage, flags, src, srclen, dst, dstlen, defchar, used ); + if (!(info = get_codepage_table( codepage ))) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (flags & ~(WC_DISCARDNS | WC_SEPCHARS | WC_DEFAULTCHAR | WC_ERR_INVALID_CHARS | + WC_COMPOSITECHECK | WC_NO_BEST_FIT_CHARS)) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (info->CodePage == CP_UTF8) + ret = wcstombs_utf8( flags, src, srclen, dst, dstlen, defchar, used ); + else + ret = wcstombs_codepage( info, flags, src, srclen, dst, dstlen, defchar, used ); break; } TRACE( "cp %d %s -> %s, ret = %d\n", codepage, debugstr_wn(src, srclen), debugstr_an(dst, ret), ret );

1 0

Jacek Caban : winex11: Directly use ntdll for registry access in setup_options.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: a3ebf88ad5da03a78b74b2a5a756b36eb29b6cb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3ebf88ad5da03a78b74b2a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 13:29:16 2022 +0200 winex11: Directly use ntdll for registry access in setup_options. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv.h | 16 +++++- dlls/winex11.drv/x11drv_main.c | 118 ++++++++++++++++++++++++++++++++++------- dlls/winex11.drv/xim.c | 13 +++-- 3 files changed, 124 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f22b7f4f25e..252505f80e6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -823,7 +823,7 @@ extern void X11DRV_DisplayDevices_Update(BOOL) DECLSPEC_HIDDEN; extern struct x11drv_display_device_handler desktop_handler DECLSPEC_HIDDEN; /* XIM support */ -extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_InitXIM( const WCHAR *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; extern void X11DRV_SetupXIM(void) DECLSPEC_HIDDEN; extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDEN; @@ -841,4 +841,18 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) max( rect->bottom, rect->top + 1 ) > virtual_rect.top); } +/* string helpers */ + +static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +{ + while (len--) *dst++ = (unsigned char)*src++; +} + +static inline UINT asciiz_to_unicode( WCHAR *dst, const char *src ) +{ + WCHAR *p = dst; + while ((*p++ = *src++)); + return (p - dst) * sizeof(WCHAR); +} + #endif /* __WINE_X11DRV_H */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index f52e504f468..df3c672708e 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -93,7 +93,7 @@ static int err_callback_result; /* error callback result */ static unsigned long err_serial; /* serial number of first request */ static int (*old_error_handler)( Display *, XErrorEvent * ); static BOOL use_xim = TRUE; -static char input_style[20]; +static WCHAR input_style[20]; static CRITICAL_SECTION x11drv_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -336,16 +336,99 @@ static void init_pixmap_formats( Display *display ) } +static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + return NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 ) ? 0 : ret; +} + + +static HKEY open_hkcu_key( const char *name ) +{ + WCHAR bufferW[256]; + static HKEY hkcu; + + if (!hkcu) + { + char buffer[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + + if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) + return 0; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], + sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], + sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + + ascii_to_unicode( bufferW, buffer, len ); + hkcu = reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); + } + + return reg_open_key( hkcu, bufferW, asciiz_to_unicode( bufferW, name ) - sizeof(WCHAR) ); +} + + +static ULONG query_reg_value( HKEY hkey, const WCHAR *name, + KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +{ + unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + info, size, &size )) + return 0; + + return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); +} + + /*********************************************************************** * get_config_key * * Get a config key from either the app-specific or the default config */ static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, - char *buffer, DWORD size ) + WCHAR *buffer, DWORD size ) { - if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0; - if (defkey && !RegQueryValueExA( defkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0; + WCHAR nameW[128]; + char buf[2048]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)buf; + + asciiz_to_unicode( nameW, name ); + + if (appkey && query_reg_value( appkey, nameW, info, sizeof(buf) )) + { + size = min( info->DataLength, size - sizeof(WCHAR) ); + memcpy( buffer, info->Data, size ); + buffer[size / sizeof(WCHAR)] = 0; + return 0; + } + + if (defkey && query_reg_value( defkey, nameW, info, sizeof(buf) )) + { + size = min( info->DataLength, size - sizeof(WCHAR) ); + memcpy( buffer, info->Data, size ); + buffer[size / sizeof(WCHAR)] = 0; + return 0; + } + return ERROR_FILE_NOT_FOUND; } @@ -358,21 +441,20 @@ static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, static void setup_options(void) { static const WCHAR x11driverW[] = {'\\','X','1','1',' ','D','r','i','v','e','r',0}; - char buffer[64]; - WCHAR bufferW[MAX_PATH+16]; + WCHAR buffer[MAX_PATH+16]; HKEY hkey, appkey = 0; DWORD len; /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver */ - if (RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\X11 Driver", &hkey )) hkey = 0; + hkey = open_hkcu_key( "Software\\Wine\\X11 Driver" ); /* open the app-specific key */ - len = (GetModuleFileNameW( 0, bufferW, MAX_PATH )); + len = GetModuleFileNameW( 0, buffer, MAX_PATH ); if (len && len < MAX_PATH) { HKEY tmpkey; - WCHAR *p, *appname = bufferW; + WCHAR *p, *appname = buffer; if ((p = strrchrW( appname, '/' ))) appname = p + 1; if ((p = strrchrW( appname, '\\' ))) appname = p + 1; CharLowerW(appname); @@ -381,10 +463,10 @@ static void setup_options(void) WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, process_name, len, NULL, NULL ); strcatW( appname, x11driverW ); /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\X11 Driver */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey )) + if ((tmpkey = open_hkcu_key( "Software\\Wine\\AppDefaults" ))) { - if (RegOpenKeyW( tmpkey, appname, &appkey )) appkey = 0; - RegCloseKey( tmpkey ); + appkey = reg_open_key( tmpkey, appname, lstrlenW( appname ) * sizeof(WCHAR) ); + NtClose( tmpkey ); } } @@ -419,7 +501,7 @@ static void setup_options(void) grab_fullscreen = IS_OPTION_TRUE( buffer[0] ); if (!get_config_key( hkey, appkey, "ScreenDepth", buffer, sizeof(buffer) )) - default_visual.depth = atoi(buffer); + default_visual.depth = strtolW( buffer, NULL, 0 ); if (!get_config_key( hkey, appkey, "ClientSideGraphics", buffer, sizeof(buffer) )) client_side_graphics = IS_OPTION_TRUE( buffer[0] ); @@ -437,18 +519,18 @@ static void setup_options(void) private_color_map = IS_OPTION_TRUE( buffer[0] ); if (!get_config_key( hkey, appkey, "PrimaryMonitor", buffer, sizeof(buffer) )) - primary_monitor = atoi( buffer ); + primary_monitor = strtolW( buffer, NULL, 0 ); if (!get_config_key( hkey, appkey, "CopyDefaultColors", buffer, sizeof(buffer) )) - copy_default_colors = atoi(buffer); + copy_default_colors = strtolW( buffer, NULL, 0 ); if (!get_config_key( hkey, appkey, "AllocSystemColors", buffer, sizeof(buffer) )) - alloc_system_colors = atoi(buffer); + alloc_system_colors = strtolW( buffer, NULL, 0 ); get_config_key( hkey, appkey, "InputStyle", input_style, sizeof(input_style) ); - if (appkey) RegCloseKey( appkey ); - if (hkey) RegCloseKey( hkey ); + NtClose( appkey ); + NtClose( hkey ); } #ifdef SONAME_LIBXCOMPOSITE diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..6adf2475de7 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -30,6 +30,7 @@ #include "x11drv.h" #include "imm.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xim); @@ -290,13 +291,17 @@ void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) * * Process-wide XIM initialization. */ -BOOL X11DRV_InitXIM( const char *input_style ) +BOOL X11DRV_InitXIM( const WCHAR *input_style ) { - if (!_strnicmp(input_style, "offthespot", -1)) + static const WCHAR offthespotW[] = {'o','f','f','t','h','e','s','p','o','t',0}; + static const WCHAR overthespotW[] = {'o','v','e','r','t','h','e','s','p','o','t',0}; + static const WCHAR rootW[] = {'r','o','o','t',0}; + + if (!strcmpiW(input_style, offthespotW)) ximStyleRequest = STYLE_OFFTHESPOT; - else if (!_strnicmp(input_style, "overthespot", -1)) + else if (!strcmpiW(input_style, overthespotW)) ximStyleRequest = STYLE_OVERTHESPOT; - else if (!_strnicmp(input_style, "root", -1)) + else if (!strcmpiW(input_style, rootW)) ximStyleRequest = STYLE_ROOT; if (!XSupportsLocale())

1 0

Jacek Caban : winex11: Directly use ntdll for registry access in create_xcursor_system_cursor.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 824e9bddd583b7ace5b0a31d9f7a9dbec65d369a URL: https://source.winehq.org/git/wine.git/?a=commit;h=824e9bddd583b7ace5b0a31d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 13:29:26 2022 +0200 winex11: Directly use ntdll for registry access in create_xcursor_system_cursor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 15 ++++++++------- dlls/winex11.drv/x11drv.h | 6 ++++++ dlls/winex11.drv/x11drv_main.c | 5 ++--- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 6c3d7e09002..1f8bd54cf14 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1060,9 +1060,8 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) HMODULE module; HKEY key; const char * const *names = NULL; - WCHAR *p, name[MAX_PATH * 2], valueW[64]; + WCHAR *p, name[MAX_PATH * 2]; char valueA[64]; - DWORD ret; if (!info->szModName[0]) return 0; @@ -1075,13 +1074,15 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) valueA[0] = 0; /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver\Cursors */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\X11 Driver\\Cursors", &key )) + if ((key = open_hkcu_key( "Software\\Wine\\X11 Driver\\Cursors" ))) { - DWORD size = sizeof(valueW); - ret = RegQueryValueExW( key, name, NULL, NULL, (BYTE *)valueW, &size ); - RegCloseKey( key ); - if (!ret) + char buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + DWORD size = query_reg_value( key, NULL, value, sizeof(buffer) ); + NtClose( key ); + if (size && value->Type == REG_SZ) { + const WCHAR *valueW = (const WCHAR *)value->Data; if (!valueW[0]) return 0; /* force standard cursor */ if (!WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, valueA, sizeof(valueA), NULL, NULL )) valueA[0] = 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 252505f80e6..1168e0ea7a6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -841,6 +841,12 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) max( rect->bottom, rect->top + 1 ) > virtual_rect.top); } +/* registry helpers */ + +extern HKEY open_hkcu_key( const char *name ) DECLSPEC_HIDDEN; +extern ULONG query_reg_value( HKEY hkey, const WCHAR *name, + KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) DECLSPEC_HIDDEN; + /* string helpers */ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index df3c672708e..b6fa5cedc61 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -353,7 +353,7 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) } -static HKEY open_hkcu_key( const char *name ) +HKEY open_hkcu_key( const char *name ) { WCHAR bufferW[256]; static HKEY hkcu; @@ -385,8 +385,7 @@ static HKEY open_hkcu_key( const char *name ) } -static ULONG query_reg_value( HKEY hkey, const WCHAR *name, - KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +ULONG query_reg_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) { unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name };

1 0

Jacek Caban : winex11: Directly use ntdll for registry access in X11DRV_GetICMProfile.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 50c74048853fa05f4b035317f11bb6b7001b8d22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50c74048853fa05f4b035317… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 13:29:32 2022 +0200 winex11: Directly use ntdll for registry access in X11DRV_GetICMProfile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/graphics.c | 32 ++++++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 2 +- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index b3df3cafcb1..b07234bbc22 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1629,12 +1629,14 @@ extern void WINAPI A_SHAUpdate( sha_ctx *, const unsigned char *, unsigned int ) extern void WINAPI A_SHAFinal( sha_ctx *, unsigned char * ); static const WCHAR mntr_key[] = - {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t', - 'V','e','r','s','i','o','n','\\','I','C','M','\\','m','n','t','r',0}; + 'V','e','r','s','i','o','n','\\','I','C','M','\\','m','n','t','r'}; static const WCHAR color_path[] = - {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\','c','o','l','o','r','\\',0}; + {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2', + '\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\','c','o','l','o','r','\\'}; /*********************************************************************** * GetICMProfile (X11DRV.@) @@ -1645,22 +1647,27 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, {'s','R','G','B',' ','C','o','l','o','r',' ','S','p','a','c','e',' ', 'P','r','o','f','i','l','e','.','i','c','m',0}; HKEY hkey; - DWORD required, len; - WCHAR profile[MAX_PATH], fullname[2*MAX_PATH + ARRAY_SIZE( color_path )]; + DWORD required; + char buf[4096]; + KEY_VALUE_FULL_INFORMATION *info = (void *)buf; unsigned char *buffer; unsigned long buflen; + ULONG full_size; + WCHAR profile[MAX_PATH], fullname[MAX_PATH + ARRAY_SIZE( color_path )]; if (!size) return FALSE; - GetSystemDirectoryW( fullname, MAX_PATH ); - strcatW( fullname, color_path ); + memcpy( fullname, color_path, sizeof(color_path) ); + fullname[ARRAYSIZE(color_path)] = 0; - len = ARRAY_SIZE( profile ); - if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, mntr_key, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL ) && - !RegEnumValueW( hkey, 0, profile, &len, NULL, NULL, NULL, NULL )) /* FIXME handle multiple values */ + hkey = reg_open_key( NULL, mntr_key, sizeof(mntr_key) ); + + if (hkey && !NtEnumerateValueKey( hkey, 0, KeyValueFullInformation, + info, sizeof(buf), &full_size )) { - strcatW( fullname, profile ); - RegCloseKey( hkey ); + /* FIXME handle multiple values */ + memcpy( fullname + ARRAYSIZE(color_path), info->Name, info->NameLength ); + fullname[ARRAYSIZE(color_path) + info->NameLength / sizeof(WCHAR)] = 0; } else if ((buffer = get_icm_profile( &buflen ))) { @@ -1694,6 +1701,7 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, else if (!allow_default) return FALSE; else strcatW( fullname, srgb ); + NtClose( hkey ); required = strlenW( fullname ) + 1; if (*size < required) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1168e0ea7a6..9890fc94c22 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -846,6 +846,7 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) extern HKEY open_hkcu_key( const char *name ) DECLSPEC_HIDDEN; extern ULONG query_reg_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) DECLSPEC_HIDDEN; +extern HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) DECLSPEC_HIDDEN; /* string helpers */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index b6fa5cedc61..539f49197a3 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -336,7 +336,7 @@ static void init_pixmap_formats( Display *display ) } -static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) +HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) { UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; OBJECT_ATTRIBUTES attr;

1 0

Jacek Caban : winex11: Directly use ntdll for registry access in get_display_device_reg_key.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 1e2dd059e9537edb1cc50473e5d3959716abd713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e2dd059e9537edb1cc50473… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 13:29:42 2022 +0200 winex11: Directly use ntdll for registry access in get_display_device_reg_key. Also just open the key in write_registry_settings, it should be already created by win32u. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 64 ++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 4b4e91ed558..f4fb450375b 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -219,16 +219,28 @@ void init_registry_display_settings(void) } } -static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len) +static HKEY get_display_device_reg_key( const WCHAR *device_name ) { static const WCHAR display[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; static const WCHAR video_value_fmt[] = {'\\','D','e','v','i','c','e','\\', 'V','i','d','e','o','%','d',0}; - static const WCHAR video_key[] = {'H','A','R','D','W','A','R','E','\\', - 'D','E','V','I','C','E','M','A','P','\\', - 'V','I','D','E','O','\\',0}; - WCHAR value_name[MAX_PATH], buffer[MAX_PATH], *end_ptr; + static const WCHAR video_key[] = { + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','H','A','R','D','W','A','R','E', + '\\','D','E','V','I','C','E','M','A','P', + '\\','V','I','D','E','O'}; + static const WCHAR current_config_key[] = { + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s', + '\\','C','u','r','r','e','n','t'}; + WCHAR value_name[MAX_PATH], buffer[4096], *end_ptr; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; DWORD adapter_index, size; + HKEY hkey; /* Device name has to be \\.\DISPLAY%d */ if (strncmpiW(device_name, display, ARRAY_SIZE(display))) @@ -240,23 +252,23 @@ static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, uns return FALSE; /* Open \Device\Video* in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + if (!(hkey = reg_open_key( NULL, video_key, sizeof(video_key) ))) return FALSE; sprintfW(value_name, video_value_fmt, adapter_index); - size = sizeof(buffer); - if (RegGetValueW(HKEY_LOCAL_MACHINE, video_key, value_name, RRF_RT_REG_SZ, NULL, buffer, &size)) - return FALSE; - - if (len < lstrlenW(buffer + 18) + 1) - return FALSE; - - /* Skip \Registry\Machine\ prefix */ - lstrcpyW(key, buffer + 18); - TRACE("display device %s registry settings key %s.\n", wine_dbgstr_w(device_name), wine_dbgstr_w(key)); - return TRUE; + size = query_reg_value( hkey, value_name, value, sizeof(buffer) ); + NtClose( hkey ); + if (!size || value->Type != REG_SZ) return FALSE; + + /* Replace \Registry\Machine\ prefix with HKEY_CURRENT_CONFIG */ + memmove( buffer + ARRAYSIZE(current_config_key), (const WCHAR *)value->Data + 17, + size - 17 * sizeof(WCHAR) ); + memcpy( buffer, current_config_key, sizeof(current_config_key) ); + TRACE( "display device %s registry settings key %s.\n", wine_dbgstr_w(device_name), + wine_dbgstr_w(buffer) ); + return reg_open_key( NULL, buffer, lstrlenW(buffer) * sizeof(WCHAR) ); } static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) { - WCHAR wine_x11_reg_key[MAX_PATH]; HANDLE mutex; HKEY hkey; DWORD type, size; @@ -265,13 +277,7 @@ static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) dm->dmFields = 0; mutex = get_display_device_init_mutex(); - if (!get_display_device_reg_key(device_name, wine_x11_reg_key, ARRAY_SIZE(wine_x11_reg_key))) - { - release_display_device_init_mutex(mutex); - return FALSE; - } - - if (RegOpenKeyExW(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, KEY_READ, &hkey)) + if (!(hkey = get_display_device_reg_key( device_name ))) { release_display_device_init_mutex(mutex); return FALSE; @@ -309,20 +315,12 @@ static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) static BOOL write_registry_settings(const WCHAR *device_name, const DEVMODEW *dm) { - WCHAR wine_x11_reg_key[MAX_PATH]; HANDLE mutex; HKEY hkey; BOOL ret = TRUE; mutex = get_display_device_init_mutex(); - if (!get_display_device_reg_key(device_name, wine_x11_reg_key, ARRAY_SIZE(wine_x11_reg_key))) - { - release_display_device_init_mutex(mutex); - return FALSE; - } - - if (RegCreateKeyExW(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, NULL, - REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL)) + if (!(hkey = get_display_device_reg_key( device_name ))) { release_display_device_init_mutex(mutex); return FALSE;

1 0

Jacek Caban : winex11: Directly use ntdll for registry access in read_registry_settings.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: bdbbc3467c24db07810e09f988c4498e7a8de3e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdbbc3467c24db07810e09f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 13:29:54 2022 +0200 winex11: Directly use ntdll for registry access in read_registry_settings. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index f4fb450375b..61bdf1afd0f 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -267,11 +267,25 @@ static HKEY get_display_device_reg_key( const WCHAR *device_name ) return reg_open_key( NULL, buffer, lstrlenW(buffer) * sizeof(WCHAR) ); } +static BOOL query_display_setting( HKEY hkey, const char *name, DWORD *ret ) +{ + char buffer[1024]; + WCHAR nameW[128]; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + + asciiz_to_unicode( nameW, name ); + if (query_reg_value( hkey, nameW, value, sizeof(buffer) ) != sizeof(DWORD) || + value->Type != REG_DWORD) + return FALSE; + + *ret = *(DWORD *)value->Data; + return TRUE; +} + static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) { HANDLE mutex; HKEY hkey; - DWORD type, size; BOOL ret = TRUE; dm->dmFields = 0; @@ -283,32 +297,24 @@ static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) return FALSE; } -#define query_value(name, data) \ - size = sizeof(DWORD); \ - if (RegQueryValueExA(hkey, name, 0, &type, (LPBYTE)(data), &size) || \ - type != REG_DWORD || size != sizeof(DWORD)) \ - ret = FALSE - - query_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel); + ret &= query_display_setting( hkey, "DefaultSettings.BitsPerPel", &dm->dmBitsPerPel ); dm->dmFields |= DM_BITSPERPEL; - query_value("DefaultSettings.XResolution", &dm->dmPelsWidth); + ret &= query_display_setting( hkey, "DefaultSettings.XResolution", &dm->dmPelsWidth ); dm->dmFields |= DM_PELSWIDTH; - query_value("DefaultSettings.YResolution", &dm->dmPelsHeight); + ret &= query_display_setting( hkey, "DefaultSettings.YResolution", &dm->dmPelsHeight ); dm->dmFields |= DM_PELSHEIGHT; - query_value("DefaultSettings.VRefresh", &dm->dmDisplayFrequency); + ret &= query_display_setting( hkey, "DefaultSettings.VRefresh", &dm->dmDisplayFrequency ); dm->dmFields |= DM_DISPLAYFREQUENCY; - query_value("DefaultSettings.Flags", &dm->u2.dmDisplayFlags); + ret &= query_display_setting( hkey, "DefaultSettings.Flags", &dm->u2.dmDisplayFlags ); dm->dmFields |= DM_DISPLAYFLAGS; - query_value("DefaultSettings.XPanning", &dm->u1.s2.dmPosition.x); - query_value("DefaultSettings.YPanning", &dm->u1.s2.dmPosition.y); + ret &= query_display_setting( hkey, "DefaultSettings.XPanning", (DWORD *)&dm->u1.s2.dmPosition.x ); + ret &= query_display_setting( hkey, "DefaultSettings.YPanning", (DWORD *)&dm->u1.s2.dmPosition.y ); dm->dmFields |= DM_POSITION; - query_value("DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation); + ret &= query_display_setting( hkey, "DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation ); dm->dmFields |= DM_DISPLAYORIENTATION; - query_value("DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput); + ret &= query_display_setting( hkey, "DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput ); -#undef query_value - - RegCloseKey(hkey); + NtClose( hkey ); release_display_device_init_mutex(mutex); return ret; }

1 0

Jacek Caban : winex11: Directly use ntdll for registry access in write_registry_settings.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 91d6e8b4abe46a58a931c8b6ce0383bffa8f2566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91d6e8b4abe46a58a931c8b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 13:30:02 2022 +0200 winex11: Directly use ntdll for registry access in write_registry_settings. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/settings.c | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 93a975d7f63..b6b1062c425 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winex11.drv -IMPORTS = uuid user32 gdi32 advapi32 win32u +IMPORTS = uuid user32 gdi32 win32u DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 61bdf1afd0f..ec8a01fbc58 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -319,6 +319,13 @@ static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) return ret; } +static BOOL set_setting_value( HKEY hkey, const char *name, DWORD val ) +{ + WCHAR nameW[128]; + UNICODE_STRING str = { asciiz_to_unicode( nameW, name ) - sizeof(WCHAR), sizeof(nameW), nameW }; + return !NtSetValueKey( hkey, &str, 0, REG_DWORD, &val, sizeof(val) ); +} + static BOOL write_registry_settings(const WCHAR *device_name, const DEVMODEW *dm) { HANDLE mutex; @@ -332,23 +339,17 @@ static BOOL write_registry_settings(const WCHAR *device_name, const DEVMODEW *dm return FALSE; } -#define set_value(name, data) \ - if (RegSetValueExA(hkey, name, 0, REG_DWORD, (const BYTE*)(data), sizeof(DWORD))) \ - ret = FALSE + ret &= set_setting_value( hkey, "DefaultSettings.BitsPerPel", dm->dmBitsPerPel ); + ret &= set_setting_value( hkey, "DefaultSettings.XResolution", dm->dmPelsWidth ); + ret &= set_setting_value( hkey, "DefaultSettings.YResolution", dm->dmPelsHeight ); + ret &= set_setting_value( hkey, "DefaultSettings.VRefresh", dm->dmDisplayFrequency ); + ret &= set_setting_value( hkey, "DefaultSettings.Flags", dm->u2.dmDisplayFlags ); + ret &= set_setting_value( hkey, "DefaultSettings.XPanning", dm->u1.s2.dmPosition.x ); + ret &= set_setting_value( hkey, "DefaultSettings.YPanning", dm->u1.s2.dmPosition.y ); + ret &= set_setting_value( hkey, "DefaultSettings.Orientation", dm->u1.s2.dmDisplayOrientation ); + ret &= set_setting_value( hkey, "DefaultSettings.FixedOutput", dm->u1.s2.dmDisplayFixedOutput ); - set_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel); - set_value("DefaultSettings.XResolution", &dm->dmPelsWidth); - set_value("DefaultSettings.YResolution", &dm->dmPelsHeight); - set_value("DefaultSettings.VRefresh", &dm->dmDisplayFrequency); - set_value("DefaultSettings.Flags", &dm->u2.dmDisplayFlags); - set_value("DefaultSettings.XPanning", &dm->u1.s2.dmPosition.x); - set_value("DefaultSettings.YPanning", &dm->u1.s2.dmPosition.y); - set_value("DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation); - set_value("DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput); - -#undef set_value - - RegCloseKey(hkey); + NtClose( hkey ); release_display_device_init_mutex(mutex); return ret; }

1 0

Nikolay Sivov : evr/mixer: Implement GetAvailableVideoProcessorModes().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 0289b9c23a6998369d6a04dd1c88d3427aec9777 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0289b9c23a6998369d6a04dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:23:12 2022 +0300 evr/mixer: Implement GetAvailableVideoProcessorModes(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 22 ++++++++++++++++++++-- dlls/evr/tests/evr.c | 16 ++++++++-------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 0b957e7b6bd..c7e3033f2d1 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1930,9 +1930,27 @@ static ULONG WINAPI video_mixer_processor_Release(IMFVideoProcessor *iface) static HRESULT WINAPI video_mixer_processor_GetAvailableVideoProcessorModes(IMFVideoProcessor *iface, UINT *count, GUID **modes) { - FIXME("%p, %p, %p.\n", iface, count, modes); + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + IDirectXVideoProcessorService *service; + DXVA2_VideoDesc video_desc; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, count, modes); + + EnterCriticalSection(&mixer->cs); + + if (!mixer->inputs[0].media_type || !mixer->output.media_type) + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + else if (SUCCEEDED(hr = video_mixer_get_processor_service(mixer, &service))) + { + video_mixer_init_dxva_videodesc(mixer->inputs[0].media_type, &video_desc); + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, count, modes); + IDirectXVideoProcessorService_Release(service); + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_processor_GetVideoProcessorCaps(IMFVideoProcessor *iface, GUID *mode, diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index ea67ff5b584..bd280836046 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -654,7 +654,6 @@ static void test_default_mixer(void) ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); IMFVideoProcessor_Release(processor); @@ -1071,6 +1070,9 @@ static void test_default_mixer_type_negotiation(void) hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); ok(hr == S_OK, "Failed to create default mixer, hr %#lx.\n", hr); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetInputAvailableType(transform, 0, 0, &media_type); ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); @@ -1095,6 +1097,9 @@ static void test_default_mixer_type_negotiation(void) hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#lx.\n", hr); + hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); + /* Now try with device manager. */ window = create_window(); @@ -1282,9 +1287,6 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType_Release(media_type2); IMFMediaType_Release(media_type); - hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); @@ -1302,7 +1304,6 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType_Release(media_type); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); @@ -1319,10 +1320,9 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - CoTaskMemFree(guids); + ok(count > 0 && !!guids, "Unexpected modes data.\n"); + CoTaskMemFree(guids); hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : evr/mixer: Implement GetVideoProcessorCaps().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 28423d79d4440b0b2a44ad92be305ba37d765012 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28423d79d4440b0b2a44ad92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:23:13 2022 +0300 evr/mixer: Implement GetVideoProcessorCaps(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 25 +++++++++++++++++++++++-- dlls/evr/tests/evr.c | 4 +++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c7e3033f2d1..668a97da979 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1956,9 +1956,30 @@ static HRESULT WINAPI video_mixer_processor_GetAvailableVideoProcessorModes(IMFV static HRESULT WINAPI video_mixer_processor_GetVideoProcessorCaps(IMFVideoProcessor *iface, GUID *mode, DXVA2_VideoProcessorCaps *caps) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(mode), caps); + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + IDirectXVideoProcessorService *service; + DXVA2_VideoDesc video_desc; + GUID subtype = { 0 }; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(mode), caps); + + EnterCriticalSection(&mixer->cs); + + if (!mixer->inputs[0].media_type || !mixer->output.media_type) + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + else if (SUCCEEDED(hr = video_mixer_get_processor_service(mixer, &service))) + { + video_mixer_init_dxva_videodesc(mixer->inputs[0].media_type, &video_desc); + IMFMediaType_GetGUID(mixer->output.media_type, &MF_MT_SUBTYPE, &subtype); + + hr = IDirectXVideoProcessorService_GetVideoProcessorCaps(service, mode, &video_desc, subtype.Data1, caps); + IDirectXVideoProcessorService_Release(service); + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_processor_GetVideoProcessorMode(IMFVideoProcessor *iface, GUID *mode) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index bd280836046..93e262e52a3 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1292,7 +1292,6 @@ static void test_default_mixer_type_negotiation(void) ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorCaps(processor, (GUID *)&DXVA2_VideoProcSoftwareDevice, &caps); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); @@ -1324,6 +1323,9 @@ static void test_default_mixer_type_negotiation(void) ok(count > 0 && !!guids, "Unexpected modes data.\n"); CoTaskMemFree(guids); + hr = IMFVideoProcessor_GetVideoProcessorCaps(processor, (GUID *)&DXVA2_VideoProcSoftwareDevice, &caps); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(media_type == media_type2, "Unexpected media type instance.\n");

1 0