November 2021 - Wine-Commits

Chilung Chan : po: Update Traditional Chinese translation.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

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

Zhiyi Zhang : uxtheme: Support more progress bar parts.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

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

Jacek Caban : win32u: Move NtUserUnregisterHotKey implementation from user32.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

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 NtUserGetMouseMovePointsEx implementation from user32.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

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

Louis Lenders : msctfmonitor: Add stub dll.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

Module: wine Branch: master Commit: f1a831c6d324d7610bff58cf2f41e4ab340c36e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1a831c6d324d7610bff58cf… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Nov 16 10:48:11 2021 +0100 msctfmonitor: Add stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52044 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/msctfmonitor/Makefile.in | 3 +++ dlls/msctfmonitor/msctfmonitor.spec | 7 +++++++ 4 files changed, 13 insertions(+) diff --git a/configure b/configure index 39c96a4e504..b442f084a96 100755 --- a/configure +++ b/configure @@ -1480,6 +1480,7 @@ enable_mscms enable_mscoree enable_mscorwks enable_msctf +enable_msctfmonitor enable_msctfp enable_msdaps enable_msdasql @@ -21551,6 +21552,7 @@ wine_fn_config_makefile dlls/mscoree/tests enable_tests wine_fn_config_makefile dlls/mscorwks enable_mscorwks wine_fn_config_makefile dlls/msctf enable_msctf wine_fn_config_makefile dlls/msctf/tests enable_tests +wine_fn_config_makefile dlls/msctfmonitor enable_msctfmonitor wine_fn_config_makefile dlls/msctfp enable_msctfp wine_fn_config_makefile dlls/msdaps enable_msdaps wine_fn_config_makefile dlls/msdasql enable_msdasql diff --git a/configure.ac b/configure.ac index ce401a47ebd..6631d2f42fc 100644 --- a/configure.ac +++ b/configure.ac @@ -3091,6 +3091,7 @@ WINE_CONFIG_MAKEFILE(dlls/mscoree/tests) WINE_CONFIG_MAKEFILE(dlls/mscorwks) WINE_CONFIG_MAKEFILE(dlls/msctf) WINE_CONFIG_MAKEFILE(dlls/msctf/tests) +WINE_CONFIG_MAKEFILE(dlls/msctfmonitor) WINE_CONFIG_MAKEFILE(dlls/msctfp) WINE_CONFIG_MAKEFILE(dlls/msdaps) WINE_CONFIG_MAKEFILE(dlls/msdasql) diff --git a/dlls/msctfmonitor/Makefile.in b/dlls/msctfmonitor/Makefile.in new file mode 100644 index 00000000000..8c21056333f --- /dev/null +++ b/dlls/msctfmonitor/Makefile.in @@ -0,0 +1,3 @@ +MODULE = msctfmonitor.dll + +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msctfmonitor/msctfmonitor.spec b/dlls/msctfmonitor/msctfmonitor.spec new file mode 100644 index 00000000000..1922714a4ff --- /dev/null +++ b/dlls/msctfmonitor/msctfmonitor.spec @@ -0,0 +1,7 @@ +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub DoMsCtfMonitor +@ stub InitLocalMsCtfMonitor +@ stub UnInitLocalMsCtfMonitor

1 0

Jinoh Kang : winedbg: Report current thread ID to GDB for all stop replies.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

Module: wine Branch: master Commit: 829c06741bacfedb815d340e106371f6140bb79f URL: https://source.winehq.org/git/wine.git/?a=commit;h=829c06741bacfedb815d340e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Nov 17 01:37:42 2021 +0900 winedbg: Report current thread ID to GDB for all stop replies. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 522e4fdb506..a4f5bd1387e 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -867,6 +867,22 @@ static void packet_reply_status_xpoints(struct gdb_context* gdbctx, struct dbg_t } } +static void packet_reply_begin_stop_reply(struct gdb_context* gdbctx, unsigned char signal) +{ + packet_reply_add(gdbctx, "T"); + packet_reply_val(gdbctx, signal, 1); + + /* We should always report the current thread ID for all stop replies. + * Otherwise, GDB complains with the following message: + * + * Warning: multi-threaded target stopped without sending a thread-id, + * using first non-exited thread + */ + packet_reply_add(gdbctx, "thread:"); + packet_reply_val(gdbctx, gdbctx->de.dwThreadId, 4); + packet_reply_add(gdbctx, ";"); +} + static enum packet_return packet_reply_status(struct gdb_context* gdbctx) { struct dbg_process *process = gdbctx->process; @@ -885,11 +901,7 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) return packet_error; packet_reply_open(gdbctx); - packet_reply_add(gdbctx, "T"); - packet_reply_val(gdbctx, signal_from_debug_event(&gdbctx->de), 1); - packet_reply_add(gdbctx, "thread:"); - packet_reply_val(gdbctx, gdbctx->de.dwThreadId, 4); - packet_reply_add(gdbctx, ";"); + packet_reply_begin_stop_reply(gdbctx, signal_from_debug_event(&gdbctx->de)); packet_reply_status_xpoints(gdbctx, thread, &ctx); for (i = 0; i < backend->gdb_num_regs; i++) @@ -913,8 +925,7 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) case LOAD_DLL_DEBUG_EVENT: case UNLOAD_DLL_DEBUG_EVENT: packet_reply_open(gdbctx); - packet_reply_add(gdbctx, "T"); - packet_reply_val(gdbctx, HOST_SIGTRAP, 1); + packet_reply_begin_stop_reply(gdbctx, HOST_SIGTRAP); packet_reply_add(gdbctx, "library:;"); packet_reply_close(gdbctx); return packet_done;

1 0

Alistair Leslie-Hughes : msdasql: Move ICommandWithParameters to the correct interface.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

Module: wine Branch: master Commit: fbca126660c86039b1cd6a576c7d77963e6d3d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbca126660c86039b1cd6a57… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 17 21:23:25 2021 +1100 msdasql: Move ICommandWithParameters to the correct interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 126 ++++++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index df394264bf7..44f36f0e591 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -293,6 +293,7 @@ struct command IColumnsInfo IColumnsInfo_iface; IConvertType IConvertType_iface; ICommandPrepare ICommandPrepare_iface; + ICommandWithParameters ICommandWithParameters_iface; LONG refs; WCHAR *query; IUnknown *session; @@ -323,6 +324,11 @@ static inline struct command *impl_from_ICommandPrepare( ICommandPrepare *iface return CONTAINING_RECORD( iface, struct command, ICommandPrepare_iface ); } +static inline struct command *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandWithParameters_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -352,6 +358,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->ICommandPrepare_iface; } + else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) + { + *ppv = &command->ICommandWithParameters_iface; + } if(*ppv) { @@ -426,7 +436,6 @@ struct msdasql_rowset IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; IColumnsRowset IColumnsRowset_iface; - ICommandWithParameters ICommandWithParameters_iface; IUnknown *caller; LONG refs; }; @@ -456,11 +465,6 @@ static inline struct msdasql_rowset *impl_from_IColumnsRowset ( IColumnsRowset * return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsRowset_iface ); } -static inline struct msdasql_rowset *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) -{ - return CONTAINING_RECORD( iface, struct msdasql_rowset, ICommandWithParameters_iface ); -} - static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -489,10 +493,6 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsRowset_iface; } - else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) - { - *ppv = &rowset->ICommandWithParameters_iface; - } else if (IsEqualGUID(&IID_IRowsetChange, riid)) { TRACE("IID_IRowsetChange not supported\n"); @@ -801,58 +801,6 @@ struct IColumnsRowsetVtbl columnrs_rs_vtbl = column_rs_GetColumnsRowset }; -static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); -} - -static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_AddRef(&rowset->IRowset_iface); -} - -static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_Release(&rowset->IRowset_iface); -} - -static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, - DBPARAMINFO **info, OLECHAR **buffer) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %p, %p, %p\n", rowset, uparams, info, buffer); - return E_NOTIMPL; -} - -static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, - LPCWSTR names[], DB_LPARAMS ordinals[]) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", rowset, uparams, names, ordinals); - return E_NOTIMPL; -} - -static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, - const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", rowset, uparams, ordinals, bindinfo); - return E_NOTIMPL; -} - -struct ICommandWithParametersVtbl command_with_params_vtbl = -{ - cmd_with_params_QueryInterface, - cmd_with_params_AddRef, - cmd_with_params_Release, - cmd_with_params_GetParameterInfo, - cmd_with_params_MapParameterNames, - cmd_with_params_SetParameterInfo -}; - static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -871,7 +819,6 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; - msrowset->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; msrowset->refs = 1; ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); @@ -1116,6 +1063,58 @@ struct ICommandPrepareVtbl commandprepareVtbl = commandprepare_Unprepare }; +static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, + DBPARAMINFO **info, OLECHAR **buffer) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %p, %p, %p\n", command, uparams, info, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, + LPCWSTR names[], DB_LPARAMS ordinals[]) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", command, uparams, names, ordinals); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, + const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", command, uparams, ordinals, bindinfo); + return E_NOTIMPL; +} + +struct ICommandWithParametersVtbl command_with_params_vtbl = +{ + cmd_with_params_QueryInterface, + cmd_with_params_AddRef, + cmd_with_params_Release, + cmd_with_params_GetParameterInfo, + cmd_with_params_MapParameterNames, + cmd_with_params_SetParameterInfo +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -1137,6 +1136,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; command->IConvertType_iface.lpVtbl = &converttypeVtbl; command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; + command->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; command->refs = 1; command->query = NULL;

1 0

Nikolay Sivov : d3d10core/tests: Add a test for DXGI_FORMAT_R8G8_UINT support in vertex buffers.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

Module: wine Branch: master Commit: c536da7fe0c3f4d6e67e28792562be18e405a9a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c536da7fe0c3f4d6e67e2879… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 17 15:00:08 2021 +0300 d3d10core/tests: Add a test for DXGI_FORMAT_R8G8_UINT support in vertex buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b8338152bb7..73151f2296c 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -13645,6 +13645,10 @@ static void test_format_support(void) {DXGI_FORMAT_R32_UINT}, {DXGI_FORMAT_R16_UINT}, }; + static const struct format_support vertex_buffers[] = + { + {DXGI_FORMAT_R8G8_UINT}, + }; if (!(device = create_device())) { @@ -13685,6 +13689,9 @@ static void test_format_support(void) check_format_support(format_support, index_buffers, ARRAY_SIZE(index_buffers), D3D10_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); + check_format_support(format_support, vertex_buffers, ARRAY_SIZE(vertex_buffers), + D3D10_FORMAT_SUPPORT_IA_VERTEX_BUFFER, "vertex buffer"); + check_format_support(format_support, display_format_support, ARRAY_SIZE(display_format_support), D3D10_FORMAT_SUPPORT_DISPLAY, "display");

1 0

Jacek Caban : win32u: Move NtUserActivateKeyboardLayout implementation from user32.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

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

Alexandre Julliard : msvcrt: Don't forward string functions to ntdll.
by Alexandre Julliard Nov. 17, 2021

Nov. 17, 2021

Module: wine Branch: master Commit: 68559674e7441d62e8b72503d557bed892b6004f URL: https://source.winehq.org/git/wine.git/?a=commit;h=68559674e7441d62e8b72503… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 11:08:38 2021 +0100 msvcrt: Don't forward string functions to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 10 +++++----- dlls/msvcr100/msvcr100.spec | 10 +++++----- dlls/msvcr110/msvcr110.spec | 10 +++++----- dlls/msvcr120/msvcr120.spec | 10 +++++----- dlls/msvcr70/msvcr70.spec | 10 +++++----- dlls/msvcr71/msvcr71.spec | 10 +++++----- dlls/msvcr80/msvcr80.spec | 10 +++++----- dlls/msvcr90/msvcr90.spec | 10 +++++----- dlls/msvcrt/msvcrt.spec | 10 +++++----- dlls/msvcrt/string.c | 22 ++++++++++++++++++++++ dlls/msvcrt/wcs.c | 32 ++++++++++++++++++++++++++++++++ dlls/msvcrtd/msvcrtd.spec | 10 +++++----- dlls/ucrtbase/ucrtbase.spec | 10 +++++----- 13 files changed, 109 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68559674e7441d62e8b7…

1 0