wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Zhiyi Zhang : light.msstyles: Add more progress bar parts.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 7143c458f9b5e5b907fa5a8e591d393c6b128086 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7143c458f9b5e5b907fa5a8e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Nov 17 14:30:44 2021 +0800 light.msstyles: Add more progress bar parts. Fix Nokia SDK 2.0 for Java installer showing artifacts on its progress bar. The application queries for these Vista+ progress bar parts because Wine's default system version is set to Windows 7. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/light.rc | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 87b5c26e617..ba27c9461bc 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -486,6 +486,55 @@ BLUE_INI TEXTFILE "SizingMargins = 1, 1, 1, 1\r\n" "SizingType = Stretch\r\n" +"[Progress.Fill]\r\n" +"FillColor = 48 150 250\r\n" + +"[Progress.FillVert]\r\n" +"FillColor = 48 150 250\r\n" + +"[Progress.Fill(Error)]\r\n" +"FillColor = 213 0 0\r\n" + +"[Progress.FillVert(Error)]\r\n" +"FillColor = 213 0 0\r\n" + +"[Progress.Fill(Paused)]\r\n" +"FillColor = 255 238 88\r\n" + +"[Progress.FillVert(Paused)]\r\n" +"FillColor = 255 238 88\r\n" + +"[Progress.Fill(Partial)]\r\n" +"FillColor = 189 189 189\r\n" + +"[Progress.FillVert(Partial)]\r\n" +"FillColor = 189 189 189\r\n" + +"[Progress.PulseOverlay]\r\n" +"BgType = None\r\n" + +"[Progress.MoveOverlay]\r\n" +"BgType = None\r\n" + +"[Progress.PulseOverlayVert]\r\n" +"BgType = None\r\n" + +"[Progress.MoveOverlayVert]\r\n" +"BgType = None\r\n" + +"[Progress.TransparentBar]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_horizontal.bmp\r\n" +"MinSize = 10, 10\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.TransparentBarVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_vertical.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + "\r\n; Rebar\r\n" "[Rebar]\r\n" "BgType = ImageFile\r\n"

1 0

Zhiyi Zhang : light.msstyles: Fix incorrect progress bar chunk color.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 9cdb11dcd934c3f4891ef7d2078d9ae594d88da4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cdb11dcd934c3f4891ef7d2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Nov 17 14:30:37 2021 +0800 light.msstyles: Fix incorrect progress bar chunk color. Fix Nokia SDK 2.0 for Java installer not showing progress chunks. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/light.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index aad8aa51d09..87b5c26e617 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -457,7 +457,7 @@ BLUE_INI TEXTFILE "ProgressSpaceSize = 0\r\n" "BgType = BorderFill\r\n" "FillType = Solid\r\n" -"FillColor = 255 255 255\r\n" +"FillColor = 48 150 250\r\n" "BorderSize = 1\r\n" "BorderColor = 174 174 174\r\n"

1 0

Zhiyi Zhang : uxtheme: Support more progress bar parts.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: bb116c4b77dbbac33c237863e92018ec22c648ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb116c4b77dbbac33c237863… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Nov 17 14:30:29 2021 +0800 uxtheme: Support more progress bar parts. These parts are available on Vista+. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/stylemap.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index c9a23429511..afeda659a36 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -526,6 +526,26 @@ static const MSSTYLES_CLASS_MAP classProgress[] = { {PP_BARVERT, 0, L"BARVERT"}, {PP_CHUNK, 0, L"CHUNK"}, {PP_CHUNKVERT, 0, L"CHUNKVERT"}, + {PP_FILL, 0, L"FILL"}, + {PP_FILL, PBFS_NORMAL, L"NORMAL"}, + {PP_FILL, PBFS_ERROR, L"ERROR"}, + {PP_FILL, PBFS_PAUSED, L"PAUSED"}, + {PP_FILL, PBFS_PARTIAL, L"PARTIAL"}, + {PP_FILLVERT, 0, L"FILLVERT"}, + {PP_FILLVERT, PBFVS_NORMAL, L"NORMAL"}, + {PP_FILLVERT, PBFVS_ERROR, L"ERROR"}, + {PP_FILLVERT, PBFVS_PAUSED, L"PAUSED"}, + {PP_FILLVERT, PBFVS_PARTIAL, L"PARTIAL"}, + {PP_PULSEOVERLAY, 0, L"PULSEOVERLAY"}, + {PP_MOVEOVERLAY, 0, L"MOVEOVERLAY"}, + {PP_PULSEOVERLAYVERT, 0, L"PULSEOVERLAYVERT"}, + {PP_MOVEOVERLAYVERT, 0, L"MOVEOVERLAYVERT"}, + {PP_TRANSPARENTBAR, 0, L"TRANSPARENTBAR"}, + {PP_TRANSPARENTBAR, PBBS_NORMAL, L"NORMAL"}, + {PP_TRANSPARENTBAR, PBBS_PARTIAL, L"PARTIAL"}, + {PP_TRANSPARENTBARVERT, 0, L"TRANSPARENTBARVERT"}, + {PP_TRANSPARENTBARVERT, PBBVS_NORMAL, L"NORMAL"}, + {PP_TRANSPARENTBARVERT, PBBVS_PARTIAL, L"PARTIAL"}, {0, 0, L""} };

1 0

Chilung Chan : po: Update Traditional Chinese translation.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 3eb36d6dbcf6c72c90514266ca0bfa0c2b52bdd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eb36d6dbcf6c72c90514266… Author: Chilung Chan <eason066(a)gmail.com> Date: Wed Nov 17 12:13:56 2021 +0800 po: Update Traditional Chinese translation. Signed-off-by: Chilung Chan <eason066(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_TW.po | 1357 ++++++++++++++++++++++++++--------------------------------- 1 file changed, 599 insertions(+), 758 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3eb36d6dbcf6c72c9051…

1 0

Jacek Caban : win32u: Move NtUserScrollDC implementation from user32.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 5204622efa684219936486cfca8bffdbc7d5b006 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5204622efa684219936486cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 17 12:49:37 2021 +0100 win32u: Move NtUserScrollDC implementation from user32. 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/user32/driver.c | 11 +---- dlls/user32/painting.c | 115 +------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 1 + dlls/win32u/font.c | 5 -- dlls/win32u/gdiobj.c | 1 + dlls/win32u/painting.c | 112 +++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 7 +++ dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 2 + 11 files changed, 133 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5204622efa6842199364…

1 0

Jacek Caban : win32u: Move NtUserGetMouseMovePointsEx implementation from user32.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: d60708a17f9171dbeead597895d8cd88124236b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d60708a17f9171dbeead5978… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 17 12:48:53 2021 +0100 win32u: Move NtUserGetMouseMovePointsEx implementation from user32. 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/user32/input.c | 67 ------------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/input.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 11 ++++++++ 7 files changed, 79 insertions(+), 69 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 3de25f4218a..7349d865f01 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1217,73 +1217,6 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) return TRUE; } -/*********************************************************************** - * GetMouseMovePointsEx [USER32] - * - * RETURNS - * Success: count of point set in the buffer - * Failure: -1 - */ -int WINAPI GetMouseMovePointsEx( UINT size, LPMOUSEMOVEPOINT ptin, LPMOUSEMOVEPOINT ptout, int count, DWORD resolution ) -{ - cursor_pos_t *pos, positions[64]; - int copied; - unsigned int i; - - - TRACE( "%d, %p, %p, %d, %d\n", size, ptin, ptout, count, resolution ); - - if ((size != sizeof(MOUSEMOVEPOINT)) || (count < 0) || (count > ARRAY_SIZE( positions ))) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return -1; - } - - if (!ptin || (!ptout && count)) - { - SetLastError( ERROR_NOACCESS ); - return -1; - } - - if (resolution != GMMP_USE_DISPLAY_POINTS) - { - FIXME( "only GMMP_USE_DISPLAY_POINTS is supported for now\n" ); - SetLastError( ERROR_POINT_NOT_FOUND ); - return -1; - } - - SERVER_START_REQ( get_cursor_history ) - { - wine_server_set_reply( req, &positions, sizeof(positions) ); - if (wine_server_call_err( req )) return -1; - } - SERVER_END_REQ; - - for (i = 0; i < ARRAY_SIZE( positions ); i++) - { - pos = &positions[i]; - if (ptin->x == pos->x && ptin->y == pos->y && (!ptin->time || ptin->time == pos->time)) - break; - } - - if (i == ARRAY_SIZE( positions )) - { - SetLastError( ERROR_POINT_NOT_FOUND ); - return -1; - } - - for (copied = 0; copied < count && i < ARRAY_SIZE( positions ); copied++, i++) - { - pos = &positions[i]; - ptout[copied].x = pos->x; - ptout[copied].y = pos->y; - ptout[copied].time = pos->time; - ptout[copied].dwExtraInfo = pos->info; - } - - return copied; -} - /*********************************************************************** * EnableMouseInPointer (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 2b022d931aa..0e9d98164b5 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -349,7 +349,7 @@ @ stdcall GetMessageW(ptr long long long) @ stdcall GetMonitorInfoA(long ptr) @ stdcall GetMonitorInfoW(long ptr) -@ stdcall GetMouseMovePointsEx(long ptr ptr long long) +@ stdcall GetMouseMovePointsEx(long ptr ptr long long) NtUserGetMouseMovePointsEx @ stdcall GetNextDlgGroupItem(long long long) @ stdcall GetNextDlgTabItem(long long long) # @ stub GetNextQueueWindow diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index e1c8595ac07..bc3cd17a29e 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -698,3 +698,67 @@ BOOL WINAPI NtUserUnregisterHotKey( HWND hwnd, INT id ) return ret; } + +/*********************************************************************** + * NtUserGetMouseMovePointsEx (win32u.@) + */ +int WINAPI NtUserGetMouseMovePointsEx( UINT size, MOUSEMOVEPOINT *ptin, MOUSEMOVEPOINT *ptout, + int count, DWORD resolution ) +{ + cursor_pos_t *pos, positions[64]; + int copied; + unsigned int i; + + + TRACE( "%d, %p, %p, %d, %d\n", size, ptin, ptout, count, resolution ); + + if ((size != sizeof(MOUSEMOVEPOINT)) || (count < 0) || (count > ARRAY_SIZE( positions ))) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return -1; + } + + if (!ptin || (!ptout && count)) + { + SetLastError( ERROR_NOACCESS ); + return -1; + } + + if (resolution != GMMP_USE_DISPLAY_POINTS) + { + FIXME( "only GMMP_USE_DISPLAY_POINTS is supported for now\n" ); + SetLastError( ERROR_POINT_NOT_FOUND ); + return -1; + } + + SERVER_START_REQ( get_cursor_history ) + { + wine_server_set_reply( req, &positions, sizeof(positions) ); + if (wine_server_call_err( req )) return -1; + } + SERVER_END_REQ; + + for (i = 0; i < ARRAY_SIZE( positions ); i++) + { + pos = &positions[i]; + if (ptin->x == pos->x && ptin->y == pos->y && (!ptin->time || ptin->time == pos->time)) + break; + } + + if (i == ARRAY_SIZE( positions )) + { + SetLastError( ERROR_POINT_NOT_FOUND ); + return -1; + } + + for (copied = 0; copied < count && i < ARRAY_SIZE( positions ); copied++, i++) + { + pos = &positions[i]; + ptout[copied].x = pos->x; + ptout[copied].y = pos->y; + ptout[copied].time = pos->time; + ptout[copied].dwExtraInfo = pos->info; + } + + return copied; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 26471718e51..e07fdcc6953 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -115,6 +115,7 @@ static void * const syscalls[] = NtUserGetKeyboardLayout, NtUserGetKeyboardState, NtUserGetLayeredWindowAttributes, + NtUserGetMouseMovePointsEx, NtUserGetObjectInformation, NtUserGetOpenClipboardWindow, NtUserGetProcessWindowStation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 47e352c2f27..7ae65b09279 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -956,7 +956,7 @@ @ stub NtUserGetMenuIndex @ stub NtUserGetMenuItemRect @ stub NtUserGetMessage -@ stub NtUserGetMouseMovePointsEx +@ stdcall -syscall NtUserGetMouseMovePointsEx(long ptr ptr long long) @ stdcall -syscall NtUserGetObjectInformation(long long long long ptr) @ stub NtUserGetOemBitmapSize @ stdcall -syscall NtUserGetOpenClipboardWindow() diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index d97563427ce..9a267025527 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -101,6 +101,7 @@ SYSCALL_ENTRY( NtUserGetKeyState ) \ SYSCALL_ENTRY( NtUserGetKeyboardState ) \ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ + SYSCALL_ENTRY( NtUserGetMouseMovePointsEx ) \ SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetOpenClipboardWindow ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 39f54ae82ba..1c667889252 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -263,3 +263,14 @@ NTSTATUS WINAPI wow64_NtUserSetKeyboardState( UINT *args ) return NtUserSetKeyboardState( state ); } + +NTSTATUS WINAPI wow64_NtUserGetMouseMovePointsEx( UINT *args ) +{ + UINT size = get_ulong( &args ); + MOUSEMOVEPOINT *ptin = get_ptr( &args ); + MOUSEMOVEPOINT *ptout = get_ptr( &args ); + int count = get_ulong( &args ); + DWORD resolution = get_ulong( &args ); + + return NtUserGetMouseMovePointsEx( size, ptin, ptout, count, resolution ); +}

1 0

Jacek Caban : win32u: Move NtUserUnregisterHotKey implementation from user32.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: dc03ca3baf4ed8ff6483b9285019b00d9ae78eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc03ca3baf4ed8ff6483b928… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 17 12:48:13 2021 +0100 win32u: Move NtUserUnregisterHotKey implementation from user32. 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/user32/input.c | 28 ---------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 +++++ 8 files changed, 43 insertions(+), 30 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c62ac755bb8..3de25f4218a 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -919,34 +919,6 @@ BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) return ret; } -/*********************************************************************** - * UnregisterHotKey (USER32.@) - */ -BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) -{ - BOOL ret; - UINT modifiers, vk; - - TRACE_(keyboard)("(%p,%d)\n",hwnd,id); - - SERVER_START_REQ( unregister_hotkey ) - { - req->window = wine_server_user_handle( hwnd ); - req->id = id; - if ((ret = !wine_server_call_err( req ))) - { - modifiers = reply->flags; - vk = reply->vkey; - } - } - SERVER_END_REQ; - - if (ret) - USER_Driver->pUnregisterHotKey(hwnd, modifiers, vk); - - return ret; -} - /*********************************************************************** * LoadKeyboardLayoutW (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 6aa71f814b6..2b022d931aa 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -780,7 +780,7 @@ @ stdcall UnregisterClassA(str long) @ stdcall UnregisterClassW(wstr long) @ stdcall UnregisterDeviceNotification(long) -@ stdcall UnregisterHotKey(long long) +@ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey # @ stub UnregisterMessagePumpHook @ stdcall UnregisterPowerSettingNotification(ptr) @ stdcall UnregisterTouchWindow(long) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index ad2f4887198..f8cce32b5f3 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1029,6 +1029,11 @@ static INT CDECL loaderdrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, return load_driver()->pToUnicodeEx( virt, scan, state, str, size, flags, layout ); } +static void CDECL loaderdrv_UnregisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) +{ + load_driver()->pUnregisterHotKey( hwnd, modifiers, vk ); +} + static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) { return load_driver()->pVkKeyScanEx( ch, layout ); @@ -1046,6 +1051,7 @@ static const struct user_driver_funcs lazy_load_driver = .pGetKeyboardLayoutList = loaderdrv_GetKeyboardLayoutList, .pMapVirtualKeyEx = loaderdrv_MapVirtualKeyEx, .pToUnicodeEx = loaderdrv_ToUnicodeEx, + .pUnregisterHotKey = loaderdrv_UnregisterHotKey, .pVkKeyScanEx = loaderdrv_VkKeyScanEx, .pUpdateClipboard = loaderdrv_UpdateClipboard, }; diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 0303e5acd42..39186cc94a7 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1176,6 +1176,7 @@ static struct unix_funcs unix_funcs = NtUserIsClipboardFormatAvailable, NtUserMapVirtualKeyEx, NtUserToUnicodeEx, + NtUserUnregisterHotKey, NtUserVkKeyScanEx, GDIRealizePalette, diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index a1249b505f6..e1c8595ac07 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -670,3 +670,31 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts ) return count; } + +/*********************************************************************** + * NtUserUnregisterHotKey (win32u.@) + */ +BOOL WINAPI NtUserUnregisterHotKey( HWND hwnd, INT id ) +{ + BOOL ret; + UINT modifiers, vk; + + TRACE_(keyboard)("(%p,%d)\n",hwnd,id); + + SERVER_START_REQ( unregister_hotkey ) + { + req->window = wine_server_user_handle( hwnd ); + req->id = id; + if ((ret = !wine_server_call_err( req ))) + { + modifiers = reply->flags; + vk = reply->vkey; + } + } + SERVER_END_REQ; + + if (ret) + user_driver->pUnregisterHotKey(hwnd, modifiers, vk); + + return ret; +} diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 99b09b23201..47e352c2f27 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1289,7 +1289,7 @@ @ stub NtUserUnloadKeyboardLayout @ stub NtUserUnlockWindowStation @ stub NtUserUnregisterClass -@ stub NtUserUnregisterHotKey +@ stdcall NtUserUnregisterHotKey(long long) @ stub NtUserUnregisterSessionPort @ stub NtUserUnregisterUserApiHook @ stub NtUserUpdateDefaultDesktopThumbnail diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 13b75b91a7c..ecc9833a037 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -204,6 +204,7 @@ struct unix_funcs UINT (WINAPI *pNtUserMapVirtualKeyEx)( UINT code, UINT type, HKL layout ); INT (WINAPI *pNtUserToUnicodeEx)( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ); + BOOL (WINAPI *pNtUserUnregisterHotKey)( HWND hwnd, INT id ); WORD (WINAPI *pNtUserVkKeyScanEx)( WCHAR chr, HKL layout ); /* Wine-specific functions */ diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 1f5bef4e4b8..63866ac451c 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -642,6 +642,11 @@ INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, return unix_funcs->pNtUserToUnicodeEx( virt, scan, state, str, size, flags, layout ); } +BOOL WINAPI NtUserUnregisterHotKey( HWND hwnd, INT id ) +{ + return unix_funcs->pNtUserUnregisterHotKey( hwnd, id ); +} + WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ) { return unix_funcs->pNtUserVkKeyScanEx( chr, layout );

1 0

Jacek Caban : win32u: Move NtUserGetKeyboardLayoutList implementation from user32.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: f65fa2f019a5f23ecbe6225a7c838a141cc6445a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65fa2f019a5f23ecbe6225a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 17 12:47:38 2021 +0100 win32u: Move NtUserGetKeyboardLayoutList implementation from user32. 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/user32/driver.c | 7 +---- dlls/user32/input.c | 51 -------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 47 +++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 5 ++++ 9 files changed, 132 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f65fa2f019a5f23ecbe6…

1 0

Jacek Caban : win32u: Move NtUserActivateKeyboardLayout implementation from user32.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: a32f044154db8f81509cbabbe885fcac85ec0130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a32f044154db8f81509cbabb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 17 12:47:04 2021 +0100 win32u: Move NtUserActivateKeyboardLayout implementation from user32. 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/user32/defwnd.c | 2 +- dlls/user32/driver.c | 7 +------ dlls/user32/input.c | 32 +------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 30 ++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 +++++ 10 files changed, 48 insertions(+), 40 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 916029c2579..8cd9047f02b 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -734,7 +734,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } case WM_INPUTLANGCHANGEREQUEST: - ActivateKeyboardLayout( (HKL)lParam, 0 ); + NtUserActivateKeyboardLayout( (HKL)lParam, 0 ); break; case WM_INPUTLANGCHANGE: diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index b92d74443f3..fb0ed54bc80 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -233,11 +233,6 @@ static void CDECL nulldrv_ThreadDetach( void ) * Each entry point simply loads the real driver and chains to it. */ -static BOOL CDECL loaderdrv_ActivateKeyboardLayout( HKL layout, UINT flags ) -{ - return load_driver()->pActivateKeyboardLayout( layout, flags ); -} - static void CDECL loaderdrv_Beep(void) { load_driver()->pBeep(); @@ -345,7 +340,7 @@ static struct user_driver_funcs lazy_load_driver = { { NULL }, /* keyboard functions */ - loaderdrv_ActivateKeyboardLayout, + NULL, loaderdrv_Beep, NULL, loaderdrv_GetKeyboardLayoutList, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 3f41f09d4e2..369c024a1d4 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -872,36 +872,6 @@ INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, return ret; } -/********************************************************************** - * ActivateKeyboardLayout (USER32.@) - */ -HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT flags ) -{ - struct user_thread_info *info = get_user_thread_info(); - HKL old_layout; - - TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags ); - - if (flags) FIXME_(keyboard)( "flags %x not supported\n", flags ); - - if (layout == (HKL)HKL_NEXT || layout == (HKL)HKL_PREV) - { - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - FIXME_(keyboard)( "HKL_NEXT and HKL_PREV not supported\n" ); - return 0; - } - - if (!USER_Driver->pActivateKeyboardLayout( layout, flags )) - return 0; - - old_layout = info->kbd_layout; - info->kbd_layout = layout; - if (old_layout != layout) info->kbd_layout_id = 0; - - if (!old_layout) return get_locale_kbd_layout(); - return old_layout; -} - /********************************************************************** * BlockInput (USER32.@) */ @@ -1056,7 +1026,7 @@ HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags ) RegCloseKey( hkey ); } - if ((flags & KLF_ACTIVATE) && ActivateKeyboardLayout( layout, 0 )) return layout; + if ((flags & KLF_ACTIVATE) && NtUserActivateKeyboardLayout( layout, 0 )) return layout; /* FIXME: semi-stub: returning default layout */ return get_locale_kbd_layout(); diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 71830f41574..7d88bd14c99 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -1,4 +1,4 @@ -@ stdcall ActivateKeyboardLayout(long long) +@ stdcall ActivateKeyboardLayout(long long) NtUserActivateKeyboardLayout @ stdcall AddClipboardFormatListener(long) NtUserAddClipboardFormatListener @ stdcall AdjustWindowRect(ptr long long) @ stdcall AdjustWindowRectEx(ptr long long long) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index f7f3f3cf5f7..6e7a5c715c8 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1003,6 +1003,11 @@ static const struct user_driver_funcs *load_driver(void) return user_driver; } +static BOOL CDECL loaderdrv_ActivateKeyboardLayout( HKL layout, UINT flags ) +{ + return load_driver()->pActivateKeyboardLayout( layout, flags ); +} + static INT CDECL loaderdrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) { return load_driver()->pGetKeyNameText( lparam, buffer, size ); @@ -1031,6 +1036,7 @@ static void CDECL loaderdrv_UpdateClipboard(void) static const struct user_driver_funcs lazy_load_driver = { + .pActivateKeyboardLayout = loaderdrv_ActivateKeyboardLayout, .pGetKeyNameText = loaderdrv_GetKeyNameText, .pMapVirtualKeyEx = loaderdrv_MapVirtualKeyEx, .pToUnicodeEx = loaderdrv_ToUnicodeEx, diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 82d94435bf1..29750c6bbf7 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1167,6 +1167,7 @@ static struct unix_funcs unix_funcs = NtGdiUnrealizeObject, NtGdiUpdateColors, NtGdiWidenPath, + NtUserActivateKeyboardLayout, NtUserCountClipboardFormats, NtUserGetKeyNameText, NtUserGetPriorityClipboardFormat, diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 0f41dbb46ad..9af1a81492d 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -570,3 +570,33 @@ INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, TRACE_(keyboard)( "ret %d, str %s.\n", len, debugstr_w(str) ); return len; } + +/********************************************************************** + * NtUserActivateKeyboardLayout (win32u.@) + */ +HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) +{ + struct user_thread_info *info = get_user_thread_info(); + HKL old_layout; + + TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags ); + + if (flags) FIXME_(keyboard)( "flags %x not supported\n", flags ); + + if (layout == (HKL)HKL_NEXT || layout == (HKL)HKL_PREV) + { + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + FIXME_(keyboard)( "HKL_NEXT and HKL_PREV not supported\n" ); + return 0; + } + + if (!user_driver->pActivateKeyboardLayout( layout, flags )) + return 0; + + old_layout = info->kbd_layout; + info->kbd_layout = layout; + if (old_layout != layout) info->kbd_layout_id = 0; + + if (!old_layout) return get_locale_kbd_layout(); + return old_layout; +} diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 9439aa21a29..df5f4fb843f 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -749,7 +749,7 @@ @ stub NtUpdateInputSinkTransforms @ stub NtUserAcquireIAMKey @ stub NtUserAcquireInteractiveControlBackgroundAccess -@ stub NtUserActivateKeyboardLayout +@ stdcall NtUserActivateKeyboardLayout(long long) @ stdcall -syscall NtUserAddClipboardFormatListener(long) @ stub NtUserAddVisualIdentifier @ stub NtUserAlterWindowStyle diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 4219ffa5bbc..c2b35fc53b1 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -194,6 +194,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj ); BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); + HKL (WINAPI *pNtUserActivateKeyboardLayout)( HKL layout, UINT flags ); INT (WINAPI *pNtUserCountClipboardFormats)(void); INT (WINAPI *pNtUserGetKeyNameText)( LONG lparam, WCHAR *buffer, INT size ); INT (WINAPI *pNtUserGetPriorityClipboardFormat)( UINT *list, INT count ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 04019de036b..b8bd5ec225e 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -596,6 +596,11 @@ NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER return unix_funcs->pNtGdiDdDDISetVidPnSourceOwner( desc ); } +HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) +{ + return unix_funcs->pNtUserActivateKeyboardLayout( layout, flags ); +} + INT WINAPI NtUserCountClipboardFormats(void) { return unix_funcs->pNtUserCountClipboardFormats();

1 0

Jacek Caban : win32u: Move NtUserToUnicodeEx implementation from user32.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 8932c8678c6561510c47d78b4c5d916811e4994a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8932c8678c6561510c47d78b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 17 12:46:39 2021 +0100 win32u: Move NtUserToUnicodeEx implementation from user32. 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/user32/driver.c | 8 +--- dlls/user32/input.c | 99 ++------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 7 ++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 92 ++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 8 ++++ 10 files changed, 122 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8932c8678c6561510c47…

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
96
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 November 2021