wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Jacek Caban : winemac: Directly use ntdll in get_display_device_reg_key.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 9b66a5397a27cdfabd6d6c131a0e98c13a228433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b66a5397a27cdfabd6d6c13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 16:10:08 2022 +0200 winemac: Directly use ntdll in get_display_device_reg_key. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 79 ++++++++++++++++++++---------------------- dlls/winemac.drv/macdrv.h | 3 ++ dlls/winemac.drv/macdrv_main.c | 2 +- 3 files changed, 41 insertions(+), 43 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index a5abf426cc5..182d5f122a5 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -48,15 +48,6 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmod static const char initial_mode_key[] = "Initial Display Mode"; static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d','i','n','g',0}; -static const WCHAR adapter_prefixW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; -static const WCHAR video_keyW[] = { - 'H','A','R','D','W','A','R','E','\\', - 'D','E','V','I','C','E','M','A','P','\\', - 'V','I','D','E','O',0}; -static const WCHAR device_video_fmtW[] = { - '\\','D','e','v','i','c','e','\\', - 'V','i','d','e','o','%','d',0}; - static CFArrayRef modes; static BOOL modes_has_8bpp, modes_has_16bpp; @@ -91,33 +82,52 @@ static void release_display_device_init_mutex(HANDLE mutex) NtClose(mutex); } -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) { - WCHAR value_name[MAX_PATH], buffer[MAX_PATH], *end_ptr; + static const WCHAR display[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + 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; + char adapter_name[100]; + HKEY hkey; /* Device name has to be \\.\DISPLAY%d */ - if (strncmpiW(device_name, adapter_prefixW, ARRAY_SIZE(adapter_prefixW))) + if (wcsnicmp(device_name, display, ARRAY_SIZE(display))) return FALSE; /* Parse \\.\DISPLAY* */ - adapter_index = strtolW(device_name + ARRAY_SIZE(adapter_prefixW), &end_ptr, 10) - 1; + adapter_index = wcstol(device_name + ARRAY_SIZE(display), &end_ptr, 10) - 1; if (*end_ptr) return FALSE; /* Open \Device\Video* in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ - sprintfW(value_name, device_video_fmtW, adapter_index); - size = sizeof(buffer); - if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, 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; + if (!(hkey = reg_open_key(NULL, video_key, sizeof(video_key)))) return FALSE; + sprintf(adapter_name, "\\Device\\Video%d", adapter_index); + asciiz_to_unicode(value_name, adapter_name); + 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)); } @@ -139,7 +149,6 @@ static BOOL query_display_setting(HKEY hkey, const char *name, DWORD *ret) static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) { - WCHAR wine_mac_reg_key[MAX_PATH]; HANDLE mutex; HKEY hkey; BOOL ret = TRUE; @@ -147,13 +156,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_mac_reg_key, ARRAY_SIZE(wine_mac_reg_key))) - { - release_display_device_init_mutex(mutex); - return FALSE; - } - - if (RegOpenKeyExW(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + if (!(hkey = get_display_device_reg_key(device_name))) { release_display_device_init_mutex(mutex); return FALSE; @@ -192,20 +195,12 @@ static BOOL set_setting_value(HKEY hkey, const char *name, DWORD val) static BOOL write_registry_settings(const WCHAR *device_name, const DEVMODEW *dm) { - WCHAR wine_mac_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_mac_reg_key, ARRAY_SIZE(wine_mac_reg_key))) - { - release_display_device_init_mutex(mutex); - return FALSE; - } - - if (RegCreateKeyExW(HKEY_CURRENT_CONFIG, wine_mac_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; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 931561a8209..c216cfb994f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -297,6 +297,7 @@ extern BOOL query_ime_char_rect(macdrv_query* query) 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 */ @@ -313,6 +314,8 @@ static inline UINT asciiz_to_unicode(WCHAR *dst, const char *src) } /* FIXME: remove once we use unixlib */ +#define wcsnicmp strncmpiW #define wcsrchr strrchrW +#define wcstol strtolW #endif /* __WINE_MACDRV_H */ diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index eb693ba968d..134842bbbfb 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -103,7 +103,7 @@ const char* debugstr_cf(CFTypeRef t) } -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 : winemac: Directly use ntdll for display device mutex.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: e04073188132c3508485bf8ec8441f8e48a6b568 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e04073188132c3508485bf8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 22:14:54 2022 +0200 winemac: Directly use ntdll for display device mutex. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 75904bd6f5f..a5abf426cc5 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -74,17 +74,21 @@ static BOOL inited_original_display_mode; static HANDLE get_display_device_init_mutex(void) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; - HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); - - WaitForSingleObject(mutex, INFINITE); + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t'}; + UNICODE_STRING name = { sizeof(init_mutexW), sizeof(init_mutexW), (WCHAR *)init_mutexW }; + OBJECT_ATTRIBUTES attr; + HANDLE mutex = 0; + + InitializeObjectAttributes(&attr, &name, OBJ_OPENIF, NULL, NULL); + NtCreateMutant(&mutex, MUTEX_ALL_ACCESS, &attr, FALSE); + if (mutex) NtWaitForSingleObject(mutex, FALSE, NULL); return mutex; } static void release_display_device_init_mutex(HANDLE mutex) { - ReleaseMutex(mutex); - CloseHandle(mutex); + NtReleaseMutant(mutex, NULL); + NtClose(mutex); } static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len)

1 0

Jacek Caban : winemac: Directly use ntdll to write display settings.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 5c9eb1905c90583937701df2c7975d5cf3e656d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c9eb1905c90583937701df2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 16:03:45 2022 +0200 winemac: Directly use ntdll to write display settings. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index d81b0d5f606..75904bd6f5f 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -178,6 +178,14 @@ static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) } +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) { WCHAR wine_mac_reg_key[MAX_PATH]; @@ -199,23 +207,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->dmDisplayFlags); + ret &= set_setting_value(hkey, "DefaultSettings.XPanning", dm->dmPosition.x); + ret &= set_setting_value(hkey, "DefaultSettings.YPanning", dm->dmPosition.y); + ret &= set_setting_value(hkey, "DefaultSettings.Orientation", dm->dmDisplayOrientation); + ret &= set_setting_value(hkey, "DefaultSettings.FixedOutput", dm->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->dmDisplayFlags); - set_value("DefaultSettings.XPanning", &dm->dmPosition.x); - set_value("DefaultSettings.YPanning", &dm->dmPosition.y); - set_value("DefaultSettings.Orientation", &dm->dmDisplayOrientation); - set_value("DefaultSettings.FixedOutput", &dm->dmDisplayFixedOutput); - -#undef set_value - - RegCloseKey(hkey); + NtClose(hkey); release_display_device_init_mutex(mutex); return ret; }

1 0

Jacek Caban : winemac: Directly use ntdll for querying display settings.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: ffa7c40951b1b2bae747c87a88d253be3bc3936b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffa7c40951b1b2bae747c87a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 16:00:55 2022 +0200 winemac: Directly use ntdll for querying display settings. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 45 ++++++++++++++++++++++++------------------ dlls/winemac.drv/macdrv.h | 5 +++++ dlls/winemac.drv/macdrv_main.c | 2 +- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 8e616652198..d81b0d5f606 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -117,12 +117,27 @@ static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, uns } +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) { WCHAR wine_mac_reg_key[MAX_PATH]; HANDLE mutex; HKEY hkey; - DWORD type, size; BOOL ret = TRUE; dm->dmFields = 0; @@ -140,32 +155,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->dmDisplayFlags); + ret &= query_display_setting(hkey, "DefaultSettings.Flags", &dm->dmDisplayFlags); dm->dmFields |= DM_DISPLAYFLAGS; - query_value("DefaultSettings.XPanning", &dm->dmPosition.x); - query_value("DefaultSettings.YPanning", &dm->dmPosition.y); + ret &= query_display_setting(hkey, "DefaultSettings.XPanning", (DWORD *)&dm->dmPosition.x); + ret &= query_display_setting(hkey, "DefaultSettings.YPanning", (DWORD *)&dm->dmPosition.y); dm->dmFields |= DM_POSITION; - query_value("DefaultSettings.Orientation", &dm->dmDisplayOrientation); + ret &= query_display_setting(hkey, "DefaultSettings.Orientation", &dm->dmDisplayOrientation); dm->dmFields |= DM_DISPLAYORIENTATION; - query_value("DefaultSettings.FixedOutput", &dm->dmDisplayFixedOutput); - -#undef query_value + ret &= query_display_setting(hkey, "DefaultSettings.FixedOutput", &dm->dmDisplayFixedOutput); - RegCloseKey(hkey); + NtClose(hkey); release_display_device_init_mutex(mutex); return ret; } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index bded3500bee..931561a8209 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -293,6 +293,11 @@ extern void macdrv_im_set_text(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_sent_text_input(const macdrv_event *event) DECLSPEC_HIDDEN; extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN; +/* registry helpers */ + +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/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index fccd588c271..eb693ba968d 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -152,7 +152,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) { UNICODE_STRING str;

1 0

Jacek Caban : winemac: Directly use ntdll in setup_options.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 718db04398ac7247a946467b0e17284a33436da0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=718db04398ac7247a946467b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 14:23:14 2022 +0200 winemac: Directly use ntdll in setup_options. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/macdrv.h | 17 ++++++ dlls/winemac.drv/macdrv_main.c | 127 +++++++++++++++++++++++++++++++++++------ 2 files changed, 125 insertions(+), 19 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index d13a2277e61..bded3500bee 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -293,4 +293,21 @@ extern void macdrv_im_set_text(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_sent_text_input(const macdrv_event *event) DECLSPEC_HIDDEN; extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN; +/* 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); +} + +/* FIXME: remove once we use unixlib */ +#define wcsrchr strrchrW + #endif /* __WINE_MACDRV_H */ diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index fff72589417..fccd588c271 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "winreg.h" #include "wine/server.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(macdrv); @@ -102,16 +103,97 @@ const char* debugstr_cf(CFTypeRef t) } +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) +{ + UNICODE_STRING str; + + RtlInitUnicodeString(&str, name); + if (NtQueryValueKey(hkey, &str, 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; } @@ -123,36 +205,41 @@ static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char *name, */ static void setup_options(void) { - char buffer[MAX_PATH + 16]; + static const WCHAR macdriverW[] = {'\\','M','a','c',' ','D','r','i','v','e','r',0}; + WCHAR buffer[MAX_PATH + 16], *p, *appname; HKEY hkey, appkey = 0; DWORD len; /* @@ Wine registry key: HKCU\Software\Wine\Mac Driver */ - if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Mac Driver", &hkey)) hkey = 0; + hkey = open_hkcu_key("Software\\Wine\\Mac Driver"); /* open the app-specific key */ - len = GetModuleFileNameA(0, buffer, MAX_PATH); + appname = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + if ((p = wcsrchr(appname, '/'))) appname = p + 1; + if ((p = wcsrchr(appname, '\\'))) appname = p + 1; + len = lstrlenW(appname); + if (len && len < MAX_PATH) { HKEY tmpkey; - char *p, *appname = buffer; - if ((p = strrchr(appname, '/'))) appname = p + 1; - if ((p = strrchr(appname, '\\'))) appname = p + 1; - strcat(appname, "\\Mac Driver"); + memcpy(buffer, appname, len * sizeof(WCHAR)); + memcpy(buffer + len, macdriverW, sizeof(macdriverW)); /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\Mac Driver */ - if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey)) + if ((tmpkey = open_hkcu_key("Software\\Wine\\AppDefaults"))) { - if (RegOpenKeyA(tmpkey, appname, &appkey)) appkey = 0; - RegCloseKey(tmpkey); + appkey = reg_open_key(tmpkey, buffer, lstrlenW(buffer) * sizeof(WCHAR)); + NtClose(tmpkey); } } if (!get_config_key(hkey, appkey, "WindowsFloatWhenInactive", buffer, sizeof(buffer))) { - if (!strcmp(buffer, "none")) + static const WCHAR noneW[] = {'n','o','n','e',0}; + static const WCHAR allW[] = {'a','l','l',0}; + if (!lstrcmpW(buffer, noneW)) topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONE; - else if (!strcmp(buffer, "all")) + else if (!lstrcmpW(buffer, allW)) topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_ALL; else topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN; @@ -206,9 +293,11 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "OpenGLSurfaceMode", buffer, sizeof(buffer))) { - if (!strcmp(buffer, "transparent")) + static const WCHAR transparentW[] = {'t','r','a','n','s','p','a','r','e','n','t',0}; + static const WCHAR behindW[] = {'b','e','h','i','n','d',0}; + if (!lstrcmpW(buffer, transparentW)) gl_surface_mode = GL_SURFACE_IN_FRONT_TRANSPARENT; - else if (!strcmp(buffer, "behind")) + else if (!lstrcmpW(buffer, behindW)) gl_surface_mode = GL_SURFACE_BEHIND; else gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE; @@ -222,8 +311,8 @@ static void setup_options(void) if (!get_config_key(hkey, NULL, "RetinaMode", buffer, sizeof(buffer))) retina_enabled = IS_OPTION_TRUE(buffer[0]); - if (appkey) RegCloseKey(appkey); - if (hkey) RegCloseKey(hkey); + if (appkey) NtClose(appkey); + if (hkey) NtClose(hkey); }

1 0

Francois Gouget : testbot: Exchange the queued and canceled job colors.
by Alexandre Julliard 17 May '22

17 May '22

Module: tools Branch: master Commit: 4e9f70dc5940a1d4034f7a6cc758591885cc27bf URL: https://source.winehq.org/git/tools.git/?a=commit;h=4e9f70dc5940a1d4034f7a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 16 19:14:57 2022 +0200 testbot: Exchange the queued and canceled job colors. This way the canceled jobs are in black while the runnable (queued) and running jobs are both in blue which is more consistent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/WineTestBot.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 7b63894..fd6fca3 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -380,14 +380,14 @@ pre .right { float: right; } -.queued { color: black; } +.queued { color: darkblue; } .running { color: blue; } .success { color: green; } .badpatch { color: red; } .badbuild { color: red; } .testfail { color: red; } .boterror { color: #e55600; } -.canceled { color: darkblue; } +.canceled { color: black; } .userrequest { color: #e55600; } .userapproved { color: green; }

1 0

Paul Gofman : rsaenh: Output FIXME when HMAC hash algorithm is not found.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: 56d9ed83c14cd7d92076fc518d1a601fa3119b6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=56d9ed83c14cd7d92076fc51… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 13 15:02:05 2022 -0500 rsaenh: Output FIXME when HMAC hash algorithm is not found. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 2dcc85cad7b..beac3c7e850 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -690,7 +690,13 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { const PROV_ENUMALGS_EX *pAlgInfo; pAlgInfo = get_algid_info(pCryptHash->hProv, pCryptHash->pHMACInfo->HashAlgid); - if (!pAlgInfo) return FALSE; + if (!pAlgInfo) + { + /* A number of hash algorithms (e. g., _SHA256) are supported for HMAC even for providers + * which don't list the algorithm, so print a fixme here. */ + FIXME("Hash algroithm %#x not found.\n", pCryptHash->pHMACInfo->HashAlgid); + return FALSE; + } pCryptHash->dwHashSize = pAlgInfo->dwDefaultLen >> 3; init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); update_hash_impl(pCryptHash->hash_handle,

1 0

Paul Gofman : rsaenh: Allow importing bigger RC2 keys.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: 06e125ab3a9477d65ced6d48c494ebf1c8882517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06e125ab3a9477d65ced6d48… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 11 20:06:47 2022 -0500 rsaenh: Allow importing bigger RC2 keys. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 43 ++++++++- dlls/rsaenh/tests/rsaenh.c | 218 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 260 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06e125ab3a9477d65ced…

1 0

Paul Gofman : rsaenh: Factor out alloc_key() function.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: 0ce784300eb5d7a9798f6a6ad5ed96be61b2cf9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ce784300eb5d7a9798f6a6a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 12:22:06 2022 -0500 rsaenh: Factor out alloc_key() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 166 +++++++++++++++++++++++++++------------------------ 1 file changed, 87 insertions(+), 79 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index fd39a5b125e..8a11da5f3f8 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -876,6 +876,92 @@ static inline void setup_key(CRYPTKEY *pCryptKey) { pCryptKey->abKeyValue); } +/****************************************************************************** + * alloc_key [Internal] + * + */ +static HCRYPTKEY alloc_key(HCRYPTPROV hprov, ALG_ID alg_id, DWORD flags, DWORD key_len, CRYPTKEY **ret_key) +{ + KEYCONTAINER *key_container = get_key_container(hprov); + HCRYPTKEY hkey; + CRYPTKEY *key; + + hkey = new_object(&handle_table, sizeof(CRYPTKEY), RSAENH_MAGIC_KEY, + destroy_key, (OBJECTHDR**)&key); + if (hkey == (HCRYPTKEY)INVALID_HANDLE_VALUE) + return hkey; + + key->aiAlgid = alg_id; + key->hProv = hprov; + key->dwModeBits = 0; + key->dwPermissions = CRYPT_ENCRYPT | CRYPT_DECRYPT | CRYPT_READ | CRYPT_WRITE | CRYPT_MAC; + if (flags & CRYPT_EXPORTABLE) + key->dwPermissions |= CRYPT_EXPORT; + key->dwKeyLen = key_len >> 3; + key->dwEffectiveKeyLen = 0; + + /* + * For compatibility reasons a 40 bit key on the Enhanced + * provider will not have salt + */ + if (key_container->dwPersonality == RSAENH_PERSONALITY_ENHANCED + && (alg_id == CALG_RC2 || alg_id == CALG_RC4) + && (flags & CRYPT_CREATE_SALT) && key_len == 40) + key->dwSaltLen = 0; + else if ((flags & CRYPT_CREATE_SALT) || (key_len == 40 && !(flags & CRYPT_NO_SALT))) + key->dwSaltLen = 16 /*FIXME*/ - key->dwKeyLen; + else + key->dwSaltLen = 0; + memset(key->abKeyValue, 0, sizeof(key->abKeyValue)); + memset(key->abInitVector, 0, sizeof(key->abInitVector)); + memset(&key->siSChannelInfo.saEncAlg, 0, sizeof(key->siSChannelInfo.saEncAlg)); + memset(&key->siSChannelInfo.saMACAlg, 0, sizeof(key->siSChannelInfo.saMACAlg)); + init_data_blob(&key->siSChannelInfo.blobClientRandom); + init_data_blob(&key->siSChannelInfo.blobServerRandom); + init_data_blob(&key->blobHmacKey); + + switch(alg_id) + { + case CALG_PCT1_MASTER: + case CALG_SSL2_MASTER: + case CALG_SSL3_MASTER: + case CALG_TLS1_MASTER: + case CALG_RC4: + key->dwBlockLen = 0; + key->dwMode = 0; + break; + + case CALG_RC2: + case CALG_DES: + case CALG_3DES_112: + case CALG_3DES: + key->dwBlockLen = 8; + key->dwMode = CRYPT_MODE_CBC; + break; + + case CALG_AES_128: + case CALG_AES_192: + case CALG_AES_256: + key->dwBlockLen = 16; + key->dwMode = CRYPT_MODE_CBC; + break; + + case CALG_RSA_KEYX: + case CALG_RSA_SIGN: + key->dwBlockLen = key_len >> 3; + key->dwMode = 0; + break; + + case CALG_HMAC: + key->dwBlockLen = 0; + key->dwMode = 0; + break; + } + + *ret_key = key; + return hkey; +} + /****************************************************************************** * new_key [Internal] * @@ -896,8 +982,6 @@ static inline void setup_key(CRYPTKEY *pCryptKey) { */ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTKEY **ppCryptKey) { - HCRYPTKEY hCryptKey; - CRYPTKEY *pCryptKey; DWORD dwKeyLen = HIWORD(dwFlags); const PROV_ENUMALGS_EX *peaAlgidInfo; @@ -969,83 +1053,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK } } - hCryptKey = new_object(&handle_table, sizeof(CRYPTKEY), RSAENH_MAGIC_KEY, - destroy_key, (OBJECTHDR**)&pCryptKey); - if (hCryptKey != (HCRYPTKEY)INVALID_HANDLE_VALUE) - { - KEYCONTAINER *pKeyContainer = get_key_container(hProv); - pCryptKey->aiAlgid = aiAlgid; - pCryptKey->hProv = hProv; - pCryptKey->dwModeBits = 0; - pCryptKey->dwPermissions = CRYPT_ENCRYPT | CRYPT_DECRYPT | CRYPT_READ | CRYPT_WRITE | - CRYPT_MAC; - if (dwFlags & CRYPT_EXPORTABLE) - pCryptKey->dwPermissions |= CRYPT_EXPORT; - pCryptKey->dwKeyLen = dwKeyLen >> 3; - pCryptKey->dwEffectiveKeyLen = 0; - - /* - * For compatibility reasons a 40 bit key on the Enhanced - * provider will not have salt - */ - if (pKeyContainer->dwPersonality == RSAENH_PERSONALITY_ENHANCED - && (aiAlgid == CALG_RC2 || aiAlgid == CALG_RC4) - && (dwFlags & CRYPT_CREATE_SALT) && dwKeyLen == 40) - pCryptKey->dwSaltLen = 0; - else if ((dwFlags & CRYPT_CREATE_SALT) || (dwKeyLen == 40 && !(dwFlags & CRYPT_NO_SALT))) - pCryptKey->dwSaltLen = 16 /*FIXME*/ - pCryptKey->dwKeyLen; - else - pCryptKey->dwSaltLen = 0; - memset(pCryptKey->abKeyValue, 0, sizeof(pCryptKey->abKeyValue)); - memset(pCryptKey->abInitVector, 0, sizeof(pCryptKey->abInitVector)); - memset(&pCryptKey->siSChannelInfo.saEncAlg, 0, sizeof(pCryptKey->siSChannelInfo.saEncAlg)); - memset(&pCryptKey->siSChannelInfo.saMACAlg, 0, sizeof(pCryptKey->siSChannelInfo.saMACAlg)); - init_data_blob(&pCryptKey->siSChannelInfo.blobClientRandom); - init_data_blob(&pCryptKey->siSChannelInfo.blobServerRandom); - init_data_blob(&pCryptKey->blobHmacKey); - - switch(aiAlgid) - { - case CALG_PCT1_MASTER: - case CALG_SSL2_MASTER: - case CALG_SSL3_MASTER: - case CALG_TLS1_MASTER: - case CALG_RC4: - pCryptKey->dwBlockLen = 0; - pCryptKey->dwMode = 0; - break; - - case CALG_RC2: - case CALG_DES: - case CALG_3DES_112: - case CALG_3DES: - pCryptKey->dwBlockLen = 8; - pCryptKey->dwMode = CRYPT_MODE_CBC; - break; - - case CALG_AES_128: - case CALG_AES_192: - case CALG_AES_256: - pCryptKey->dwBlockLen = 16; - pCryptKey->dwMode = CRYPT_MODE_CBC; - break; - - case CALG_RSA_KEYX: - case CALG_RSA_SIGN: - pCryptKey->dwBlockLen = dwKeyLen >> 3; - pCryptKey->dwMode = 0; - break; - - case CALG_HMAC: - pCryptKey->dwBlockLen = 0; - pCryptKey->dwMode = 0; - break; - } - - *ppCryptKey = pCryptKey; - } - - return hCryptKey; + return alloc_key(hProv, aiAlgid, dwFlags, dwKeyLen, ppCryptKey); } /******************************************************************************

1 0

Paul Gofman : rsaenh: Store key state in hash data for _MAC hash algorithm.
by Alexandre Julliard 16 May '22

16 May '22

Module: wine Branch: master Commit: 4474004b8870445db720857fdb4d64d855fa3c1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4474004b8870445db720857f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 13 14:45:30 2022 -0500 rsaenh: Store key state in hash data for _MAC hash algorithm. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 72 +++++++++++++++++++++++++++------------------- dlls/rsaenh/tests/rsaenh.c | 27 +++++++++++++++-- 2 files changed, 68 insertions(+), 31 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 76122be2756..fd39a5b125e 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -39,6 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); +#define RSAENH_MAGIC_KEY 0x73620457u +#define RSAENH_MAX_KEY_SIZE 64 +#define RSAENH_MAX_BLOCK_SIZE 24 +#define RSAENH_KEYSTATE_IDLE 0 +#define RSAENH_KEYSTATE_ENCRYPTING 1 +#define RSAENH_KEYSTATE_MASTERKEY 2 + /****************************************************************************** * CRYPTHASH - hash objects */ @@ -64,17 +71,14 @@ typedef struct tagCRYPTHASH PHMAC_INFO pHMACInfo; RSAENH_TLS1PRF_PARAMS tpPRFParams; DWORD buffered_hash_bytes; + ALG_ID key_alg_id; + KEY_CONTEXT key_context; + BYTE abChainVector[RSAENH_MAX_BLOCK_SIZE]; } CRYPTHASH; /****************************************************************************** * CRYPTKEY - key objects */ -#define RSAENH_MAGIC_KEY 0x73620457u -#define RSAENH_MAX_KEY_SIZE 64 -#define RSAENH_MAX_BLOCK_SIZE 24 -#define RSAENH_KEYSTATE_IDLE 0 -#define RSAENH_KEYSTATE_ENCRYPTING 1 -#define RSAENH_KEYSTATE_MASTERKEY 2 typedef struct _RSAENH_SCHANNEL_INFO { SCHANNEL_ALG saEncAlg; @@ -271,18 +275,6 @@ RSAENH_CPGetKeyParam( DWORD dwFlags ); -BOOL WINAPI -RSAENH_CPEncrypt( - HCRYPTPROV hProv, - HCRYPTKEY hKey, - HCRYPTHASH hHash, - BOOL Final, - DWORD dwFlags, - BYTE *pbData, - DWORD *pdwDataLen, - DWORD dwBufLen -); - BOOL WINAPI RSAENH_CPCreateHash( HCRYPTPROV hProv, @@ -674,6 +666,8 @@ static void destroy_hash(OBJECTHDR *pObject) free_hmac_info(pCryptHash->pHMACInfo); free_data_blob(&pCryptHash->tpPRFParams.blobLabel); free_data_blob(&pCryptHash->tpPRFParams.blobSeed); + if (pCryptHash->aiAlgid == CALG_MAC) + free_key_impl(pCryptHash->key_alg_id, &pCryptHash->key_context); free(pCryptHash); } @@ -728,6 +722,7 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { */ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD dwDataLen) { + CRYPTKEY *key; BYTE *pbTemp; DWORD len; @@ -739,6 +734,11 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD break; case CALG_MAC: + if (!lookup_handle(&handle_table, pCryptHash->hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&key)) + { + FIXME("Key lookup failed.\n"); + return; + } if (pCryptHash->buffered_hash_bytes) { len = min(pCryptHash->dwHashSize - pCryptHash->buffered_hash_bytes, dwDataLen); @@ -750,10 +750,10 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD return; pCryptHash->buffered_hash_bytes = 0; len = pCryptHash->dwHashSize; - if (!RSAENH_CPEncrypt(pCryptHash->hProv, pCryptHash->hKey, 0, FALSE, 0, - pCryptHash->abHashValue, &len, len)) + if (!block_encrypt(key, pCryptHash->abHashValue, &len, len, FALSE, + &pCryptHash->key_context, pCryptHash->abChainVector)) { - FIXME("RSAENH_CPEncrypt failed.\n"); + FIXME("block_encrypt failed.\n"); return; } } @@ -769,10 +769,10 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD memcpy(pbTemp, pbData, len); pbData += len; dwDataLen -= len; - if (!RSAENH_CPEncrypt(pCryptHash->hProv, pCryptHash->hKey, 0, FALSE, 0, - pbTemp, &len, len)) + if (!block_encrypt(key, pbTemp, &len, len, FALSE, + &pCryptHash->key_context, pCryptHash->abChainVector)) { - FIXME("RSAENH_CPEncrypt failed.\n"); + FIXME("block_encrypt failed.\n"); return; } free(pbTemp); @@ -798,8 +798,10 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD * PARAMS * pCryptHash [I] Hash object to be finalized. */ -static inline void finalize_hash(CRYPTHASH *pCryptHash) { +static inline void finalize_hash(CRYPTHASH *pCryptHash) +{ DWORD dwDataLen; + CRYPTKEY *key; switch (pCryptHash->aiAlgid) { @@ -821,10 +823,15 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { break; case CALG_MAC: + if (!lookup_handle(&handle_table, pCryptHash->hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&key)) + { + FIXME("Key lookup failed.\n"); + return; + } dwDataLen = pCryptHash->buffered_hash_bytes; - if (!RSAENH_CPEncrypt(pCryptHash->hProv, pCryptHash->hKey, 0, TRUE, 0, - pCryptHash->abHashValue, &dwDataLen, pCryptHash->dwHashSize)) - FIXME("RSAENH_CPEncrypt failed.\n"); + if (!block_encrypt(key, pCryptHash->abHashValue, &dwDataLen, pCryptHash->dwHashSize, TRUE, + &pCryptHash->key_context, pCryptHash->abChainVector)) + FIXME("block_encrypt failed.\n"); break; default: @@ -2264,7 +2271,7 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer, BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, DWORD dwFlags, HCRYPTHASH *phHash) { - CRYPTKEY *pCryptKey; + CRYPTKEY *pCryptKey = NULL; CRYPTHASH *pCryptHash; const PROV_ENUMALGS_EX *peaAlgidInfo; @@ -2319,6 +2326,13 @@ BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, pCryptHash->aiAlgid = Algid; pCryptHash->hKey = hKey; + if (Algid == CALG_MAC) + { + pCryptHash->key_alg_id = pCryptKey->aiAlgid; + setup_key(pCryptKey); + duplicate_key_impl(pCryptKey->aiAlgid, &pCryptKey->context, &pCryptHash->key_context); + memcpy(pCryptHash->abChainVector, pCryptKey->abChainVector, sizeof(pCryptHash->abChainVector)); + } pCryptHash->hProv = hProv; pCryptHash->dwState = RSAENH_HASHSTATE_HASHING; pCryptHash->pHMACInfo = NULL; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index c9dbb72f427..30c56722c12 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1853,7 +1853,9 @@ static void test_mac(void) { DWORD dwLen; BYTE abData[256], abEnc[264]; static const BYTE mac_40[8] = { 0xb7, 0xa2, 0x46, 0xe9, 0x11, 0x31, 0xe0, 0xad}; + static const BYTE mac_40_old[8] = { 0x44, 0x78, 0x38, 0xad, 0x10, 0x13, 0x60, 0x8e}; static const BYTE mac_40_2[8] = { 0xef, 0x22, 0x0a, 0x3b, 0xd0, 0xab, 0x48, 0x49}; + static const BYTE mac_40_2_old[8] = { 0xa3, 0xf3, 0xfc, 0x70, 0xf4, 0xfa, 0xb0, 0x3e}; int i; for (i=0; i < ARRAY_SIZE(abData); i++) abData[i] = (BYTE)i; @@ -1869,6 +1871,10 @@ static void test_mac(void) { ok(result, "%08lx\n", GetLastError()); if (!result) return; + dwLen = 8; + result = CryptEncrypt(hKey, 0, FALSE, 0, abEnc, &dwLen, dwLen); + ok(result, "%08lx\n", GetLastError()); + result = CryptHashData(hHash, abData, sizeof(abData), 0); ok(result, "%08lx\n", GetLastError()); @@ -1876,7 +1882,9 @@ static void test_mac(void) { result = CryptGetHashParam(hHash, HP_HASHVAL, abData, &dwLen, 0); ok(result && dwLen == 8, "%08lx, dwLen: %ld\n", GetLastError(), dwLen); - ok(!memcmp(abData, mac_40, sizeof(mac_40)), "MAC failed!\n"); + /* Hash state is affected by key state before Win8. */ + ok(!memcmp(abData, mac_40, sizeof(mac_40)) || broken(!memcmp(abData, mac_40_old, sizeof(mac_40_old))), + "Hash does not match.\n"); for (i = 0; i < ARRAY_SIZE(abData); ++i) abData[i] = (BYTE)i; @@ -1890,8 +1898,17 @@ static void test_mac(void) { result = CryptCreateHash(hProv, CALG_MAC, hKey, 0, &hHash); ok(result, "%08lx\n", GetLastError()); + dwLen = 8; + result = CryptEncrypt(hKey, 0, FALSE, 0, abEnc, &dwLen, dwLen); + ok(result, "%08lx\n", GetLastError()); + result = CryptHashData(hHash, abData, 1, 0); ok(result, "%08lx\n", GetLastError()); + + dwLen = 8; + result = CryptDecrypt(hKey, 0, FALSE, 0, abEnc, &dwLen); + ok(result, "%08lx\n", GetLastError()); + result = CryptHashData(hHash, abData + 1, 1, 0); ok(result, "%08lx\n", GetLastError()); result = CryptHashData(hHash, abData + 2, 6, 0); @@ -1899,11 +1916,17 @@ static void test_mac(void) { result = CryptHashData(hHash, abData + 8, 9, 0); ok(result, "%08lx\n", GetLastError()); + dwLen = 8; + result = CryptDecrypt(hKey, 0, FALSE, 0, abEnc, &dwLen); + ok(result, "%08lx\n", GetLastError()); + dwLen = ARRAY_SIZE(abData); result = CryptGetHashParam(hHash, HP_HASHVAL, abData, &dwLen, 0); ok(result && dwLen == 8, "%08lx, dwLen %ld\n", GetLastError(), dwLen); - ok(!memcmp(abData, mac_40_2, sizeof(mac_40)), "Hash does not match.\n"); + /* Hash state is affected by key state before Win8. */ + ok(!memcmp(abData, mac_40_2, sizeof(mac_40_2)) + || broken(!memcmp(abData, mac_40_2_old, sizeof(mac_40_2_old))), "Hash does not match.\n"); result = CryptDestroyHash(hHash); ok(result, "%08lx\n", GetLastError());

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022