May 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : user32: Factor GetKeyboardLayoutNameW implementations.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: c4e6d16271f7b05f5d7c88544b049daaa5c7a3b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4e6d16271f7b05f5d7c8854… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:03:12 2021 +0200 user32: Factor GetKeyboardLayoutNameW implementations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 ------------- dlls/user32/input.c | 20 ++++++++++++++++---- dlls/user32/user_private.h | 1 - dlls/winemac.drv/keyboard.c | 15 --------------- dlls/winemac.drv/winemac.drv.spec | 1 - dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/winex11.drv.spec | 1 - 7 files changed, 17 insertions(+), 36 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index c213f6ecb10..0d0133fe9f5 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -109,7 +109,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(Beep); GET_USER_FUNC(GetKeyNameText); GET_USER_FUNC(GetKeyboardLayoutList); - GET_USER_FUNC(GetKeyboardLayoutName); GET_USER_FUNC(LoadKeyboardLayout); GET_USER_FUNC(MapVirtualKeyEx); GET_USER_FUNC(RegisterHotKey); @@ -205,11 +204,6 @@ static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) return -1; /* use default implementation */ } -static BOOL CDECL nulldrv_GetKeyboardLayoutName( LPWSTR name ) -{ - return FALSE; -} - static HKL CDECL nulldrv_LoadKeyboardLayout( LPCWSTR name, UINT flags ) { return 0; @@ -422,7 +416,6 @@ static USER_DRIVER null_driver = nulldrv_Beep, nulldrv_GetKeyNameText, nulldrv_GetKeyboardLayoutList, - nulldrv_GetKeyboardLayoutName, nulldrv_LoadKeyboardLayout, nulldrv_MapVirtualKeyEx, nulldrv_RegisterHotKey, @@ -500,11 +493,6 @@ static UINT CDECL loaderdrv_GetKeyboardLayoutList( INT size, HKL *layouts ) return load_driver()->pGetKeyboardLayoutList( size, layouts ); } -static BOOL CDECL loaderdrv_GetKeyboardLayoutName( LPWSTR name ) -{ - return load_driver()->pGetKeyboardLayoutName( name ); -} - static HKL CDECL loaderdrv_LoadKeyboardLayout( LPCWSTR name, UINT flags ) { return load_driver()->pLoadKeyboardLayout( name, flags ); @@ -631,7 +619,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_Beep, loaderdrv_GetKeyNameText, loaderdrv_GetKeyboardLayoutList, - loaderdrv_GetKeyboardLayoutName, loaderdrv_LoadKeyboardLayout, loaderdrv_MapVirtualKeyEx, loaderdrv_RegisterHotKey, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index bebdc3e012b..70eca90b425 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1108,14 +1108,26 @@ BOOL WINAPI GetKeyboardLayoutNameA(LPSTR pszKLID) /**************************************************************************** * GetKeyboardLayoutNameW (USER32.@) */ -BOOL WINAPI GetKeyboardLayoutNameW(LPWSTR pwszKLID) +BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name ) { - if (!pwszKLID) + DWORD tmp; + HKL layout; + + TRACE_(keyboard)( "name %p\n", name ); + + if (!name) { - SetLastError(ERROR_NOACCESS); + SetLastError( ERROR_NOACCESS ); return FALSE; } - return USER_Driver->pGetKeyboardLayoutName(pwszKLID); + + layout = GetKeyboardLayout( 0 ); + tmp = HandleToUlong( layout ); + if (HIWORD( tmp ) == LOWORD( tmp )) tmp = LOWORD( tmp ); + swprintf( name, KL_NAMELENGTH, L"%08X", tmp ); + + TRACE_(keyboard)( "ret %s\n", debugstr_w( name ) ); + return TRUE; } /**************************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 48aea824351..c31281b43e5 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -66,7 +66,6 @@ typedef struct tagUSER_DRIVER { void (CDECL *pBeep)(void); INT (CDECL *pGetKeyNameText)(LONG, LPWSTR, INT); UINT (CDECL *pGetKeyboardLayoutList)(INT, HKL *); - BOOL (CDECL *pGetKeyboardLayoutName)(LPWSTR); HKL (CDECL *pLoadKeyboardLayout)(LPCWSTR, UINT); UINT (CDECL *pMapVirtualKeyEx)(UINT, UINT, HKL); BOOL (CDECL *pRegisterHotKey)(HWND, UINT, UINT); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index bdf01e115a0..f4b955cd46a 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1327,21 +1327,6 @@ UINT CDECL macdrv_GetKeyboardLayoutList(INT size, HKL *list) return count; } -/*********************************************************************** - * GetKeyboardLayoutName (MACDRV.@) - */ -BOOL CDECL macdrv_GetKeyboardLayoutName(LPWSTR name) -{ - static const WCHAR formatW[] = {'%','0','8','x',0}; - DWORD layout; - - layout = HandleToUlong(GetKeyboardLayout(0)); - if (HIWORD(layout) == LOWORD(layout)) layout = LOWORD(layout); - sprintfW(name, formatW, layout); - TRACE("returning %s\n", debugstr_w(name)); - return TRUE; -} - /*********************************************************************** * MapVirtualKeyEx (MACDRV.@) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 18efd03319c..14667011213 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -15,7 +15,6 @@ @ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx @ cdecl GetCursorPos(ptr) macdrv_GetCursorPos @ cdecl GetKeyboardLayoutList(long ptr) macdrv_GetKeyboardLayoutList -@ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText @ cdecl MapVirtualKeyEx(long long long) macdrv_MapVirtualKeyEx @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index ce10f6ee1a3..d189f95a7d1 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1566,7 +1566,7 @@ static HKL get_locale_kbd_layout(void) /*********************************************************************** * GetKeyboardLayoutName (X11DRV.@) */ -BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name) +static BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name) { static const WCHAR formatW[] = {'%','0','8','x',0}; DWORD layout; diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 809105f3b4f..eb5f7cecc6c 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -7,7 +7,6 @@ @ cdecl ActivateKeyboardLayout(long long) X11DRV_ActivateKeyboardLayout @ cdecl Beep() X11DRV_Beep @ cdecl GetKeyNameText(long ptr long) X11DRV_GetKeyNameText -@ cdecl GetKeyboardLayoutName(ptr) X11DRV_GetKeyboardLayoutName @ cdecl LoadKeyboardLayout(wstr long) X11DRV_LoadKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) X11DRV_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) X11DRV_ToUnicodeEx

1 0

Rémi Bernon : user32: Return success in nulldrv cursor callbacks.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: a64861fb66be722f3a93ab73152c5d477ba3bd3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a64861fb66be722f3a93ab73… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:03:16 2021 +0200 user32: Return success in nulldrv cursor callbacks. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 0d0133fe9f5..36438fa44c8 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -249,17 +249,17 @@ static void CDECL nulldrv_SetCursor( HCURSOR cursor ) static BOOL CDECL nulldrv_GetCursorPos( LPPOINT pt ) { - return FALSE; + return TRUE; } static BOOL CDECL nulldrv_SetCursorPos( INT x, INT y ) { - return FALSE; + return TRUE; } static BOOL CDECL nulldrv_ClipCursor( LPCRECT clip ) { - return FALSE; + return TRUE; } static void CDECL nulldrv_UpdateClipboard(void)

1 0

Rémi Bernon : user32: Set keyboard layout preload key on init.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 512112ebd5bc9db55c1e2da6dc1605804a0e5fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=512112ebd5bc9db55c1e2da6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:03:14 2021 +0200 user32: Set keyboard layout preload key on init. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 19 +++++++++++++++++++ dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 2 ++ dlls/winex11.drv/keyboard.c | 39 --------------------------------------- 4 files changed, 22 insertions(+), 39 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c447cb4b407..2ee1df729a5 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -114,6 +114,25 @@ static HKL get_locale_kbd_layout(void) } +/********************************************************************** + * keyboard_init + */ +void keyboard_init(void) +{ + WCHAR layout[KL_NAMELENGTH]; + HKEY hkey; + + if (RegCreateKeyExW( HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hkey, NULL )) + return; + + if (GetKeyboardLayoutNameW( layout )) + RegSetValueExW( hkey, L"1", 0, REG_SZ, (const BYTE *)layout, sizeof(layout) ); + + RegCloseKey( hkey ); +} + + /********************************************************************** * set_capture_window */ diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index c4c4853c213..303f19accfc 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -331,6 +331,7 @@ static BOOL process_attach(void) /* Setup palette function pointers */ palette_init(); + keyboard_init(); return TRUE; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index c31281b43e5..1c7ac3355bc 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -242,6 +242,8 @@ struct hardware_msg_data; extern BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_msg_data *msg_data); extern struct rawinput_thread_data *rawinput_thread_data(void); +extern void keyboard_init(void) DECLSPEC_HIDDEN; + extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index d189f95a7d1..7cf2d84ac3c 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1563,43 +1563,6 @@ static HKL get_locale_kbd_layout(void) return (HKL)layout; } -/*********************************************************************** - * GetKeyboardLayoutName (X11DRV.@) - */ -static BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name) -{ - static const WCHAR formatW[] = {'%','0','8','x',0}; - DWORD layout; - - layout = HandleToUlong( get_locale_kbd_layout() ); - if (HIWORD(layout) == LOWORD(layout)) layout = LOWORD(layout); - sprintfW(name, formatW, layout); - TRACE("returning %s\n", debugstr_w(name)); - return TRUE; -} - -static void set_kbd_layout_preload_key(void) -{ - static const WCHAR preload[] = - {'K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','\\','P','r','e','l','o','a','d',0}; - static const WCHAR one[] = {'1',0}; - - HKEY hkey; - WCHAR layout[KL_NAMELENGTH]; - - if (RegCreateKeyExW(HKEY_CURRENT_USER, preload, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL)) - return; - - if (!RegQueryValueExW(hkey, one, NULL, NULL, NULL, NULL)) - { - RegCloseKey(hkey); - return; - } - if (X11DRV_GetKeyboardLayoutName(layout)) - RegSetValueExW(hkey, one, 0, REG_SZ, (const BYTE *)layout, sizeof(layout)); - - RegCloseKey(hkey); -} /********************************************************************** * X11DRV_InitKeyboard @@ -1634,8 +1597,6 @@ void X11DRV_InitKeyboard( Display *display ) }; int vkey_range; - set_kbd_layout_preload_key(); - EnterCriticalSection( &kbd_section ); XDisplayKeycodes(display, &min_keycode, &max_keycode); if (key_mapping) XFree( key_mapping );

1 0

Rémi Bernon : user32: Read "Layout Id" from registry in GetKeyboardLayoutNameW.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 8ec1206ba011554608b0ef4448e6a04deaca551f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ec1206ba011554608b0ef44… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:03:13 2021 +0200 user32: Read "Layout Id" from registry in GetKeyboardLayoutNameW. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 70eca90b425..c447cb4b407 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1110,7 +1110,9 @@ BOOL WINAPI GetKeyboardLayoutNameA(LPSTR pszKLID) */ BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name ) { - DWORD tmp; + WCHAR klid[KL_NAMELENGTH], value[5]; + DWORD value_size, tmp, i = 0; + HKEY hkey; HKL layout; TRACE_(keyboard)( "name %p\n", name ); @@ -1126,6 +1128,25 @@ BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name ) if (HIWORD( tmp ) == LOWORD( tmp )) tmp = LOWORD( tmp ); swprintf( name, KL_NAMELENGTH, L"%08X", tmp ); + if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Keyboard Layouts", &hkey )) + { + while (!RegEnumKeyW( hkey, i++, klid, ARRAY_SIZE(klid) )) + { + value_size = sizeof(value); + if (!RegGetValueW( hkey, klid, L"Layout Id", RRF_RT_REG_SZ, NULL, (void *)&value, &value_size )) + tmp = 0xf000 | (wcstoul( value, NULL, 16 ) & 0xfff); + else + tmp = wcstoul( klid, NULL, 16 ); + + if (HIWORD( layout ) == tmp) + { + lstrcpynW( name, klid, KL_NAMELENGTH ); + break; + } + } + RegCloseKey( hkey ); + } + TRACE_(keyboard)( "ret %s\n", debugstr_w( name ) ); return TRUE; }

1 0

Rémi Bernon : user32: Adjust ToUnicodeEx control code translation.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: e2cc12132765c41442fc0657927cf2e83ae690c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2cc12132765c41442fc0657… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 6 12:03:15 2021 +0200 user32: Adjust ToUnicodeEx control code translation. To match VkKeyScanW and pass corresponding tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 2ee1df729a5..adeb4f66804 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1323,8 +1323,11 @@ INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, case VK_OEM_4: buffer[0] = 0x1b; break; case VK_OEM_5: buffer[0] = 0x1c; break; case VK_OEM_6: buffer[0] = 0x1d; break; - case VK_SUBTRACT: buffer[0] = 0x1e; break; + case '6': buffer[0] = shift ? 0x1e : 0; break; + case VK_OEM_MINUS: buffer[0] = shift ? 0x1f : 0; break; + case VK_BACK: buffer[0] = 0x7f; break; case VK_RETURN: buffer[0] = shift ? 0 : '\n'; break; + case '2': buffer[0] = shift ? 0xffff : 0xf000; break; case VK_SPACE: buffer[0] = ' '; break; default: if (virt >= 'A' && virt <= 'Z') buffer[0] = virt - 'A' + 1; @@ -1335,6 +1338,7 @@ INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, else buffer[0] = 0; buffer[1] = 0; len = wcslen( buffer ); + if (buffer[0] == 0xffff) buffer[0] = 0; lstrcpynW( str, buffer, size ); TRACE_(keyboard)( "ret %d, str %s.\n", len, debugstr_w(str) );

1 0

Francois Gouget : wined3d: Add a trailing linefeed to a couple of FIXME().
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 7a94687f46c731de3c847ce67597c8da37f90b8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a94687f46c731de3c847ce6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 6 19:13:58 2021 +0200 wined3d: Add a trailing linefeed to a couple of FIXME(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2caad29d369..638d0288e60 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -416,7 +416,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont } if (src_location == WINED3D_LOCATION_DRAWABLE) - FIXME("WINED3D_LOCATION_DRAWABLE not supported for the source of a typeless resolve."); + FIXME("WINED3D_LOCATION_DRAWABLE not supported for the source of a typeless resolve.\n"); device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_RAW_BLIT, context, src_texture, src_sub_resource_idx, src_location, src_rect, @@ -554,7 +554,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont if (dst_texture != dst_save_texture) { if (dst_location == WINED3D_LOCATION_DRAWABLE) - FIXME("WINED3D_LOCATION_DRAWABLE not supported for the destination of a typeless resolve."); + FIXME("WINED3D_LOCATION_DRAWABLE not supported for the destination of a typeless resolve.\n"); device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_RAW_BLIT, context, dst_texture, 0, dst_location, dst_rect,

1 0

Francois Gouget : mfplat: Fix the spelling of a comment.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: aec8bc3cba63727a970ef186bfe6ff891cede1c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aec8bc3cba63727a970ef186… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 6 19:13:48 2021 +0200 mfplat: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f1d0aaad94d..c8d74b5d42c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -9034,7 +9034,7 @@ static void llmult128(ULARGE_INTEGER *c1, ULARGE_INTEGER *c0, LONGLONG val, LONG b0.QuadPart = (ULONGLONG)v.HighPart * n.LowPart; /* add the high word of a0 to the low words of a1 and b0 using c1 as - * scrach space to capture the carry. the low word of the result becomes + * scratch space to capture the carry. the low word of the result becomes * the final high word of c0 */ c1->QuadPart = (ULONGLONG)c0->HighPart + a1.LowPart + b0.LowPart; c0->HighPart = c1->LowPart;

1 0

Francois Gouget : msvcp140_1/tests: Fix the spelling of test_get_set_default_resource().
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 088045beb9969fb156b1e5c7b6b782067f89cb77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=088045beb9969fb156b1e5c7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 6 19:24:29 2021 +0200 msvcp140_1/tests: Fix the spelling of test_get_set_default_resource(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_1/tests/msvcp140_1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140_1/tests/msvcp140_1.c b/dlls/msvcp140_1/tests/msvcp140_1.c index a773e4a236c..115e870031d 100644 --- a/dlls/msvcp140_1/tests/msvcp140_1.c +++ b/dlls/msvcp140_1/tests/msvcp140_1.c @@ -259,7 +259,7 @@ static void test_null_memory_resource(void) "Resource should not be equal to a random pointer.\n"); } -static void test_get_set_defult_resource( +static void test_get_set_default_resource( memory_resource *(__cdecl *new_delete_resource)(void), memory_resource *(__cdecl *set_default_resource)(memory_resource*)) { @@ -295,9 +295,9 @@ START_TEST(msvcp140_1) test_null_memory_resource(); - test_get_set_defult_resource(p__Aligned_new_delete_resource, + test_get_set_default_resource(p__Aligned_new_delete_resource, p__Aligned_set_default_resource); - test_get_set_defult_resource(p__Unaligned_new_delete_resource, + test_get_set_default_resource(p__Unaligned_new_delete_resource, p__Unaligned_set_default_resource); FreeLibrary(msvcp);

1 0

Hugh McMaster : reg: Avoid allocating zero bytes of memory when handling REG_BINARY data.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 1dd785d1490f64c33e89003453f7c82292d185d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dd785d1490f64c33e890034… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu May 6 22:47:54 2021 +1000 reg: Avoid allocating zero bytes of memory when handling REG_BINARY data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/reg/add.c b/programs/reg/add.c index cb26c232de3..0236dfb4742 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -89,6 +89,8 @@ static BOOL get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, BYTE hex0, hex1, *ptr; int i = 0, destByteIndex = 0, datalen = lstrlenW(data); + if (!datalen) return TRUE; + *size_bytes = ((datalen + datalen % 2) / 2) * sizeof(BYTE); *data_bytes = malloc(*size_bytes);

1 0

Hugh McMaster : reg: Prevent buffer over-read when querying REG_NONE values with no data.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 60c8dfdd0bbaff4a2369f884ec1a553a06735676 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60c8dfdd0bbaff4a2369f884… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu May 6 22:47:55 2021 +1000 reg: Prevent buffer over-read when querying REG_NONE values with no data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/reg/query.c b/programs/reg/query.c index 7e42719faf9..4886fb84bc1 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -50,7 +50,15 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) WCHAR *ptr; buffer = malloc((size_bytes * 2 + 1) * sizeof(WCHAR)); + + if (!size_bytes) + { + *buffer = 0; + break; + } + ptr = buffer; + for (i = 0; i < size_bytes; i++) ptr += swprintf(ptr, 3, L"%02X", src[i]); break;

1 0