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

Alexandre Julliard : kernel32: Simplify GetGeoInfoA() implementation.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: bf83236b2f36c6222ba0acde3a13737cd4c4599d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf83236b2f36c6222ba0acde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 6 10:10:17 2022 +0200 kernel32: Simplify GetGeoInfoA() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 020ec3d843d..4c815be43cc 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -381,30 +381,10 @@ BOOL WINAPI EnumUILanguagesA( UILANGUAGE_ENUMPROCA proc, DWORD flags, LONG_PTR p */ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, LANGID lang) { - WCHAR *buffW; - INT len; + WCHAR buffer[256]; TRACE("%ld %ld %p %d %d\n", geoid, geotype, data, data_len, lang); - len = GetGeoInfoW(geoid, geotype, NULL, 0, lang); - if (!len) - return 0; - - buffW = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - if (!buffW) - return 0; - - GetGeoInfoW(geoid, geotype, buffW, len, lang); - len = WideCharToMultiByte(CP_ACP, 0, buffW, -1, NULL, 0, NULL, NULL); - if (!data || !data_len) { - HeapFree(GetProcessHeap(), 0, buffW); - return len; - } - - len = WideCharToMultiByte(CP_ACP, 0, buffW, -1, data, data_len, NULL, NULL); - HeapFree(GetProcessHeap(), 0, buffW); - - if (data_len < len) - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return data_len < len ? 0 : len; + if (!GetGeoInfoW( geoid, geotype, buffer, ARRAY_SIZE(buffer), lang )) return 0; + return WideCharToMultiByte( CP_ACP, 0, buffer, -1, data, data_len, NULL, NULL ); }

1 0

Alexandre Julliard : kernel32: Simplify Get/SetCalendarInfoA() implementation.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 80445efa9048e885df0ad77ce1fa9825acfa7694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80445efa9048e885df0ad77c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 6 10:16:41 2022 +0200 kernel32: Simplify Get/SetCalendarInfoA() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 32 -------------------------------- dlls/kernel32/locale.c | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 2c53f5dfde9..e029f328544 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1754,35 +1754,3 @@ int WINAPI GetCurrencyFormatEx(LPCWSTR localename, DWORD flags, LPCWSTR value, return GetCurrencyFormatW( LocaleNameToLCID(localename, 0), flags, value, format, str, len); } - -/********************************************************************* - * GetCalendarInfoA (KERNEL32.@) - */ -int WINAPI GetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPSTR data, int size, DWORD *val ) -{ - int ret, sizeW = size; - LPWSTR dataW = NULL; - - if (type & CAL_RETURN_NUMBER) - return GetCalendarInfoW( lcid, id, type, (WCHAR *)data, size, val ) * sizeof(WCHAR); - - if (!size) sizeW = GetCalendarInfoW( lcid, id, type, NULL, 0, NULL ); - if (!(dataW = HeapAlloc(GetProcessHeap(), 0, sizeW * sizeof(WCHAR)))) return 0; - - ret = GetCalendarInfoW( lcid, id, type, dataW, sizeW, val ); - if(ret && dataW && data) - ret = WideCharToMultiByte( CP_ACP, 0, dataW, -1, data, size, NULL, NULL ); - else if (type & CAL_RETURN_NUMBER) - ret *= sizeof(WCHAR); - HeapFree( GetProcessHeap(), 0, dataW ); - return ret; -} - -/********************************************************************* - * SetCalendarInfoA (KERNEL32.@) - */ -int WINAPI SetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPCSTR data) -{ - FIXME("(%08lx,%08lx,%08lx,%s): stub\n", lcid, id, type, debugstr_a(data)); - return 0; -} diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 4c815be43cc..d46a2aa1580 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -63,11 +63,13 @@ extern BOOL WINAPI Internal_EnumUILanguages( UILANGUAGE_ENUMPROCW proc, DWORD fl * * Retrieve the ANSI codepage for a given locale. */ -static inline UINT get_lcid_codepage( LCID lcid ) +static UINT get_lcid_codepage( LCID lcid, UINT flags ) { - UINT ret; - if (!GetLocaleInfoW( lcid, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, (WCHAR *)&ret, - sizeof(ret)/sizeof(WCHAR) )) ret = 0; + UINT ret = 0; + + if (flags & LOCALE_USE_CP_ACP) return CP_ACP; + GetLocaleInfoW( lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&ret, sizeof(ret)/sizeof(WCHAR) ); return ret; } @@ -98,13 +100,11 @@ static inline UINT get_lcid_codepage( LCID lcid ) */ BOOL WINAPI SetLocaleInfoA(LCID lcid, LCTYPE lctype, LPCSTR data) { - UINT codepage = CP_ACP; + UINT codepage = get_lcid_codepage( lcid, lctype ); WCHAR *strW; DWORD len; BOOL ret; - if (!(lctype & LOCALE_USE_CP_ACP)) codepage = get_lcid_codepage( lcid ); - if (!data) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -376,6 +376,34 @@ BOOL WINAPI EnumUILanguagesA( UILANGUAGE_ENUMPROCA proc, DWORD flags, LONG_PTR p } +/********************************************************************* + * GetCalendarInfoA (KERNEL32.@) + */ +int WINAPI GetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPSTR data, int data_len, DWORD *val ) +{ + WCHAR buffer[256]; + + if (type & CAL_RETURN_NUMBER) + return GetCalendarInfoW( lcid, id, type, (WCHAR *)data, data_len, val ) * sizeof(WCHAR); + + if (!GetCalendarInfoW( lcid, id, type, buffer, ARRAY_SIZE(buffer), val )) return 0; + return WideCharToMultiByte( get_lcid_codepage(lcid, type), 0, buffer, -1, data, data_len, NULL, NULL ); +} + + +/********************************************************************* + * SetCalendarInfoA (KERNEL32.@) + */ +int WINAPI SetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPCSTR data ) +{ + WCHAR buffer[256]; + + if (!MultiByteToWideChar( get_lcid_codepage(lcid, type), 0, data, -1, buffer, ARRAY_SIZE(buffer) )) + return 0; + return SetCalendarInfoW( lcid, id, type, buffer ); +} + + /****************************************************************************** * GetGeoInfoA (KERNEL32.@) */

1 0

Mohamad Al-Jaf : wusa: Support wow64 architecture identifier.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 3b851296026e63d33ee7cec38eed4bc24abeeade URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b851296026e63d33ee7cec3… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 6 13:18:07 2022 +0200 wusa: Support wow64 architecture identifier. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/main.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 74dfeb68d5f..53534628c31 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -477,6 +477,14 @@ static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) return TRUE; } +static BOOL assembly_is_wow64(const struct assembly_entry *assembly) +{ +#ifdef __x86_64__ + return !wcsicmp(assembly->identity.architecture, L"x86") || !wcsicmp(assembly->identity.architecture, L"wow64"); +#endif + return FALSE; +} + static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *key) { WCHAR path[MAX_PATH]; @@ -484,25 +492,19 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke if (!wcsicmp(key, L"runtime.system32") || !wcsicmp(key, L"runtime.drivers") || !wcsicmp(key, L"runtime.wbem")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_SYSTEMX86; -#endif - if (!csidl) csidl = CSIDL_SYSTEM; + if (assembly_is_wow64(assembly)) csidl = CSIDL_SYSTEMX86; + else csidl = CSIDL_SYSTEM; } else if (!wcsicmp(key, L"runtime.windows") || !wcsicmp(key, L"runtime.inf")) csidl = CSIDL_WINDOWS; else if (!wcsicmp(key, L"runtime.programfiles")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILESX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES; + if (assembly_is_wow64(assembly)) csidl = CSIDL_PROGRAM_FILESX86; + else csidl = CSIDL_PROGRAM_FILES; } else if (!wcsicmp(key, L"runtime.commonfiles")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES_COMMON; + if (assembly_is_wow64(assembly)) csidl = CSIDL_PROGRAM_FILES_COMMONX86; + else csidl = CSIDL_PROGRAM_FILES_COMMON; } #ifdef __x86_64__ else if (!wcsicmp(key, L"runtime.programfilesx86")) csidl = CSIDL_PROGRAM_FILESX86;

1 0

Jacek Caban : win32u: Move NtUserCloseClipboard implementation from user32.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 22de82978eafef97b84248203503e284ca557783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22de82978eafef97b8424820… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 11:11:25 2022 +0200 win32u: Move NtUserCloseClipboard 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/clipboard.c | 25 ------------------------- dlls/user32/edit.c | 4 ++-- dlls/user32/user32.spec | 2 +- dlls/win32u/clipboard.c | 25 +++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 9 files changed, 38 insertions(+), 29 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index b45ddf9c7c0..64b1ba2fe17 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -674,31 +674,6 @@ BOOL WINAPI OpenClipboard( HWND hwnd ) } -/************************************************************************** - * CloseClipboard (USER32.@) - */ -BOOL WINAPI CloseClipboard(void) -{ - HWND viewer = 0, owner = 0; - BOOL ret; - - TRACE( "\n" ); - - SERVER_START_REQ( close_clipboard ) - { - if ((ret = !wine_server_call_err( req ))) - { - viewer = wine_server_ptr_handle( reply->viewer ); - owner = wine_server_ptr_handle( reply->owner ); - } - } - SERVER_END_REQ; - - if (viewer) SendNotifyMessageW( viewer, WM_DRAWCLIPBOARD, (WPARAM)owner, 0 ); - return ret; -} - - /************************************************************************** * EmptyClipboard (USER32.@) * Empties and acquires ownership of the clipboard diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 02ed19dffd5..4037ea7b1c1 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3107,7 +3107,7 @@ static void EDIT_WM_Paste(EDITSTATE *es) /* clear selected text in password edit box even with empty clipboard */ EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); } - CloseClipboard(); + NtUserCloseClipboard(); } @@ -3136,7 +3136,7 @@ static void EDIT_WM_Copy(EDITSTATE *es) OpenClipboard(es->hwndSelf); EmptyClipboard(); SetClipboardData(CF_UNICODETEXT, hdst); - CloseClipboard(); + NtUserCloseClipboard(); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 2c4dba5cd86..b8b27ff49ba 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -73,7 +73,7 @@ @ stub ClientThreadSetup @ stdcall ClientToScreen(long ptr) @ stdcall -import ClipCursor(ptr) NtUserClipCursor -@ stdcall CloseClipboard() +@ stdcall CloseClipboard() NtUserCloseClipboard @ stdcall CloseDesktop(long) NtUserCloseDesktop @ stdcall CloseTouchInputHandle(long) @ stdcall CloseWindow(long) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 585a2aae631..8ab915d5931 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -76,6 +76,31 @@ static const char *debugstr_format( UINT id ) } } +/************************************************************************** + * NtUserCloseClipboard (win32u.@) + */ +BOOL WINAPI NtUserCloseClipboard(void) +{ + HWND viewer = 0, owner = 0; + BOOL ret; + + TRACE( "\n" ); + + SERVER_START_REQ( close_clipboard ) + { + if ((ret = !wine_server_call_err( req ))) + { + viewer = wine_server_ptr_handle( reply->viewer ); + owner = wine_server_ptr_handle( reply->owner ); + } + } + SERVER_END_REQ; + + if (viewer) NtUserMessageCall( viewer, WM_DRAWCLIPBOARD, (WPARAM)owner, 0, + 0, FNID_SENDNOTIFYMESSAGE, FALSE ); + return ret; +} + /************************************************************************** * NtUserCountClipboardFormats (win32u.@) */ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 1a569048f69..0679715c8fd 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1159,6 +1159,7 @@ static struct unix_funcs unix_funcs = NtUserCallTwoParam, NtUserChangeDisplaySettings, NtUserClipCursor, + NtUserCloseClipboard, NtUserCountClipboardFormats, NtUserCreateWindowEx, NtUserDeferWindowPosAndBand, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 295f4780d71..6f75b802a51 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -793,7 +793,7 @@ @ stub NtUserChildWindowFromPointEx @ stub NtUserClearForeground @ stdcall NtUserClipCursor(ptr) -@ stub NtUserCloseClipboard +@ stdcall NtUserCloseClipboard() @ stdcall -syscall NtUserCloseDesktop(long) @ stdcall -syscall NtUserCloseWindowStation(long) @ stub NtUserCompositionInputSinkLuidFromPoint diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 7677747b6f0..874cc92f4d4 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -194,6 +194,7 @@ struct unix_funcs LONG (WINAPI *pNtUserChangeDisplaySettings)( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); BOOL (WINAPI *pNtUserClipCursor)( const RECT *rect ); + BOOL (WINAPI *pNtUserCloseClipboard)(void); INT (WINAPI *pNtUserCountClipboardFormats)(void); HWND (WINAPI *pNtUserCreateWindowEx)( DWORD ex_style, UNICODE_STRING *class_name, UNICODE_STRING *version, UNICODE_STRING *window_name, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 63018dcb063..4a4ed00ef58 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -749,6 +749,12 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return unix_funcs->pNtUserCallHwndParam( hwnd, param, code ); } +BOOL WINAPI NtUserCloseClipboard(void) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserCloseClipboard(); +} + LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ) { diff --git a/include/ntuser.h b/include/ntuser.h index 3de271a7174..53c8fb17139 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -507,6 +507,7 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); BOOL WINAPI NtUserClipCursor( const RECT *rect ); +BOOL WINAPI NtUserCloseClipboard(void); BOOL WINAPI NtUserCloseDesktop( HDESK handle ); BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); INT WINAPI NtUserCopyAcceleratorTable( HACCEL src, ACCEL *dst, INT count );

1 0

Jacek Caban : user.exe: Remove no longer used wait_message16.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: d513eee3ee4e9107c0b433bf9182155022fdf8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d513eee3ee4e9107c0b433bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 11:11:07 2022 +0200 user.exe: Remove no longer used wait_message16. 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/user.exe16/message.c | 15 --------------- dlls/user.exe16/user_private.h | 2 -- dlls/user32/controls.h | 2 -- dlls/user32/driver.c | 11 +---------- dlls/user32/winproc.c | 10 ---------- 5 files changed, 1 insertion(+), 39 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 05285d55eb5..f6730fcee7b 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -2563,20 +2563,6 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, } -/*********************************************************************** - * wait_message16 - */ -static DWORD wait_message16( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) -{ - DWORD lock, ret; - - ReleaseThunkLock( &lock ); - ret = wow_handlers32.wait_message( count, handles, timeout, mask, flags ); - RestoreThunkLock( lock ); - return ret; -} - - /*********************************************************************** * create_window16 */ @@ -2621,7 +2607,6 @@ void register_wow_handlers(void) mdiclient_proc16, scrollbar_proc16, static_proc16, - wait_message16, create_window16, call_window_proc_Ato16, call_dialog_proc_Ato16, diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 83c57379d35..8a325cf9fb2 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -41,7 +41,6 @@ struct wow_handlers16 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); - DWORD (*wait_message)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); LRESULT (*call_dialog_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); @@ -56,7 +55,6 @@ struct wow_handlers32 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); - DWORD (*wait_message)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index ffa131e9d63..5e762e10a7c 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -69,7 +69,6 @@ struct wow_handlers16 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); - DWORD (*wait_message)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); LRESULT (*call_dialog_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); @@ -84,7 +83,6 @@ struct wow_handlers32 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); - DWORD (*wait_message)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 0c3a1b62575..f4516a2f9da 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -69,14 +69,6 @@ static void CDECL nulldrv_UpdateClipboard(void) { } -static DWORD CDECL nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, - DWORD mask, DWORD flags ) -{ - if (!count && !timeout) return WAIT_TIMEOUT; - return WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, - timeout, flags & MWMO_ALERTABLE ); -} - static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) { } @@ -134,7 +126,7 @@ static struct user_driver_funcs lazy_load_driver = NULL, NULL, NULL, - nulldrv_MsgWaitForMultipleObjectsEx, + NULL, NULL, NULL, NULL, @@ -178,7 +170,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v do { if (!driver->p##name) driver->p##name = nulldrv_##name; } while(0) SET_USER_FUNC(UpdateClipboard); - SET_USER_FUNC(MsgWaitForMultipleObjectsEx); SET_USER_FUNC(SetWindowIcon); SET_USER_FUNC(SetWindowText); SET_USER_FUNC(SysCommand); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 51c89111202..ebbb25e92dc 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1482,14 +1482,6 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM return wow_handlers.static_proc( hwnd, msg, wParam, lParam, TRUE ); } -static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) -{ - DWORD ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); - if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution(); - if ((mask & QS_INPUT) == QS_INPUT) get_user_thread_info()->message_count = 0; - return ret; -} - /********************************************************************** * UserRegisterWowHandlers (USER32.@) * @@ -1505,7 +1497,6 @@ void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wo orig->mdiclient_proc = MDIClientWndProc_common; orig->scrollbar_proc = ScrollBarWndProc_common; orig->static_proc = StaticWndProc_common; - orig->wait_message = wait_message; orig->create_window = WIN_CreateWindowEx; orig->get_win_handle = WIN_GetFullHandle; orig->alloc_winproc = WINPROC_AllocProc; @@ -1524,7 +1515,6 @@ struct wow_handlers16 wow_handlers = MDIClientWndProc_common, ScrollBarWndProc_common, StaticWndProc_common, - wait_message, WIN_CreateWindowEx, NULL, /* call_window_proc */ NULL, /* call_dialog_proc */

1 0

Jacek Caban : win32u: Move NtUserPostThreadMessage implementation from user32.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: e1db9fef05154f59f21d199a6a9691ae9c81144c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1db9fef05154f59f21d199a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 11:05:19 2022 +0200 win32u: Move NtUserPostThreadMessage 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/message.c | 29 ++--------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 24 ++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ 7 files changed, 36 insertions(+), 29 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 2255e0ee4ba..dff7ca24786 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1807,7 +1807,7 @@ BOOL WINAPI PostMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) return TRUE; } - if (!hwnd) return PostThreadMessageW( GetCurrentThreadId(), msg, wparam, lparam ); + if (!hwnd) return NtUserPostThreadMessage( GetCurrentThreadId(), msg, wparam, lparam ); if (!(info.dest_tid = GetWindowThreadProcessId( hwnd, NULL ))) return FALSE; @@ -1823,32 +1823,7 @@ BOOL WINAPI PostMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) BOOL WINAPI PostThreadMessageA( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ) { if (!map_wparam_AtoW( msg, &wparam, WMCHAR_MAP_POSTMESSAGE )) return TRUE; - return PostThreadMessageW( thread, msg, wparam, lparam ); -} - - -/********************************************************************** - * PostThreadMessageW (USER32.@) - */ -BOOL WINAPI PostThreadMessageW( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ) -{ - struct send_message_info info; - - if (is_pointer_message( msg, wparam )) - { - SetLastError( ERROR_MESSAGE_SYNC_ONLY ); - return FALSE; - } - if (USER_IsExitingThread( thread )) return TRUE; - - info.type = MSG_POSTED; - info.dest_tid = thread; - info.hwnd = 0; - info.msg = msg; - info.wparam = wparam; - info.lparam = lparam; - info.flags = 0; - return put_message_in_queue( &info, NULL ); + return NtUserPostThreadMessage( thread, msg, wparam, lparam ); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 89c9d76f568..2c4dba5cd86 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -571,7 +571,7 @@ @ stdcall PostMessageW(long long long long) @ stdcall PostQuitMessage(long) @ stdcall PostThreadMessageA(long long long long) -@ stdcall PostThreadMessageW(long long long long) +@ stdcall PostThreadMessageW(long long long long) NtUserPostThreadMessage @ stdcall PrintWindow(long long long) @ stdcall PrivateExtractIconExA(str long ptr ptr long) @ stdcall PrivateExtractIconExW(wstr long ptr ptr long) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 4d78c99bbc7..645e29305e8 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1193,6 +1193,7 @@ static struct unix_funcs unix_funcs = NtUserMoveWindow, NtUserMsgWaitForMultipleObjectsEx, NtUserPeekMessage, + NtUserPostThreadMessage, NtUserRedrawWindow, NtUserRegisterClassExWOW, NtUserRegisterHotKey, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 73312424283..f3e695ea16a 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2407,6 +2407,30 @@ BOOL WINAPI NtUserPostMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam return user_callbacks->pPostMessageW( hwnd, msg, wparam, lparam ); } +/********************************************************************** + * NtUserPostThreadMessage (win32u.@) + */ +BOOL WINAPI NtUserPostThreadMessage( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + struct send_message_info info; + + if (is_pointer_message( msg, wparam )) + { + SetLastError( ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } + if (is_exiting_thread( thread )) return TRUE; + + info.type = MSG_POSTED; + info.dest_tid = thread; + info.hwnd = 0; + info.msg = msg; + info.wparam = wparam; + info.lparam = lparam; + info.flags = 0; + return put_message_in_queue( &info, NULL ); +} + LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, void *result_info, DWORD type, BOOL ansi ) { diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 31561cb3a1c..7670e1a5310 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1104,7 +1104,7 @@ @ stub NtUserPhysicalToLogicalPoint @ stub NtUserPostKeyboardInputMessage @ stub NtUserPostMessage -@ stub NtUserPostThreadMessage +@ stdcall NtUserPostThreadMessage(long long long long) @ stub NtUserPrintWindow @ stub NtUserProcessConnect @ stub NtUserProcessInkFeedbackCommand diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c844603640e..ffd050adbcf 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -242,6 +242,7 @@ struct unix_funcs DWORD (WINAPI *pNtUserMsgWaitForMultipleObjectsEx)( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ); BOOL (WINAPI *pNtUserPeekMessage)( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT flags ); + BOOL (WINAPI *pNtUserPostThreadMessage)( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ); BOOL (WINAPI *pNtUserRedrawWindow)( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ); ATOM (WINAPI *pNtUserRegisterClassExWOW)( const WNDCLASSEXW *wc, UNICODE_STRING *name, UNICODE_STRING *version, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 4f7c6191df8..159cade9aea 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -977,6 +977,12 @@ BOOL WINAPI NtUserPeekMessage( MSG *msg_out, HWND hwnd, UINT first, UINT last, U return unix_funcs->pNtUserPeekMessage( msg_out, hwnd, first, last, flags ); } +BOOL WINAPI NtUserPostThreadMessage( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserPostThreadMessage( thread, msg, wparam, lparam ); +} + BOOL WINAPI NtUserRedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) { if (!unix_funcs) return FALSE;

1 0

Mohamad Al-Jaf : ncrypt: Warn on invalid flags in NCryptImportKey.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 807d368f1d3707ccc4682c7fcd1e871ec34aafe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=807d368f1d3707ccc4682c7f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 6 03:19:53 2022 -0400 ncrypt: Warn on invalid flags in NCryptImportKey. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 13909a2dd9e..e12284e0867 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -374,7 +374,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H } else if (flags) { - ERR("Invalid flags %#lx\n", flags); + WARN("Invalid flags %#lx\n", flags); return NTE_BAD_FLAGS; }

1 0

Hans Leidekker : bcrypt: Implement BCryptFreeBuffer().
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 2ad18d3992832de1762a1599bcaae79ed35c9259 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ad18d3992832de1762a1599… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 10:38:39 2022 +0200 bcrypt: Implement BCryptFreeBuffer(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 98ae8c97e3a..2c0d2f8f965 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -75,7 +75,7 @@ NTSTATUS WINAPI BCryptEnumContextFunctions( ULONG table, const WCHAR *ctx, ULONG void WINAPI BCryptFreeBuffer( void *buffer ) { - FIXME( "%p\n", buffer ); + free( buffer ); } NTSTATUS WINAPI BCryptRegisterProvider( const WCHAR *provider, ULONG flags, CRYPT_PROVIDER_REG *reg )

1 0

Jacek Caban : win32u: Move NtUserPostMessage implementation from user32.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 4072ba5d8a893df73cc1f3ce48f290d07643a109 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4072ba5d8a893df73cc1f3ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 11:05:31 2022 +0200 win32u: Move NtUserPostMessage 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/message.c | 673 +------------------------------------------ dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 30 +- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 + 8 files changed, 37 insertions(+), 678 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4072ba5d8a893df73cc1…

1 0

Hans Leidekker : cryptnet: Support verifying certificate revocation with OCSP.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 60e10a057168847fadf0fd70e0bc49f53ebcc052 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60e10a057168847fadf0fd70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:15:32 2022 +0200 cryptnet: Support verifying certificate revocation with OCSP. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/Makefile.in | 2 +- dlls/cryptnet/cryptnet_main.c | 391 +++++++++++++++++++++++++++++++++++++++--- include/wincrypt.h | 4 + 3 files changed, 375 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60e10a057168847fadf0…

1 0