November 2020 - Wine-Commits

Nikolay Sivov : comctl32/listview: Do no alter custom draw text colors between notification stages.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 382627446a16e9ec0c6c7a00dc8854a4140f2f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=382627446a16e9ec0c6c7a00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 21 15:00:18 2020 +0300 comctl32/listview: Do no alter custom draw text colors between notification stages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c32720349cd4a6f4c32fdcff6a4cce054fbfe33e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 23 +++++++++-------------- dlls/comctl32/tests/listview.c | 14 ++++---------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6cee291dd69..dba16d13a4c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1055,31 +1055,31 @@ static inline DWORD notify_customdraw (const LISTVIEW_INFO *infoPtr, DWORD dwDra return result; } -static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd, BOOL SubItem) +static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, const NMLVCUSTOMDRAW *cd, BOOL SubItem) { COLORREF backcolor, textcolor; + backcolor = cd->clrTextBk; + textcolor = cd->clrText; + /* apparently, for selected items, we have to override the returned values */ if (!SubItem) { - if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) + if (cd->nmcd.uItemState & CDIS_SELECTED) { if (infoPtr->bFocus) { - lpnmlvcd->clrTextBk = comctl32_color.clrHighlight; - lpnmlvcd->clrText = comctl32_color.clrHighlightText; + backcolor = comctl32_color.clrHighlight; + textcolor = comctl32_color.clrHighlightText; } else if (infoPtr->dwStyle & LVS_SHOWSELALWAYS) { - lpnmlvcd->clrTextBk = comctl32_color.clr3dFace; - lpnmlvcd->clrText = comctl32_color.clrBtnText; + backcolor = comctl32_color.clr3dFace; + textcolor = comctl32_color.clrBtnText; } } } - backcolor = lpnmlvcd->clrTextBk; - textcolor = lpnmlvcd->clrText; - if (backcolor == CLR_DEFAULT) backcolor = comctl32_color.clrWindow; if (textcolor == CLR_DEFAULT) @@ -4812,11 +4812,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT if (cdsubitemmode & CDRF_NOTIFYSUBITEMDRAW) subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); - else - { - nmlvcd.clrTextBk = infoPtr->clrTextBk; - nmlvcd.clrText = infoPtr->clrText; - } if (subitems->nItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c19de7f03f9..a9b853eda85 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1941,11 +1941,8 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM return CDRF_NOTIFYSUBITEMDRAW|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine_if(showsel_always && is_selected && nmlvcd->iSubItem) - { - ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background %#x.\n", nmlvcd->clrTextBk); - ok(nmlvcd->clrText == RGB(0, 255, 0), "Unexpected text color %#x.\n", nmlvcd->clrText); - } + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background %#x.\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "Unexpected text color %#x.\n", nmlvcd->clrText); if (showsel_always && is_selected && nmlvcd->iSubItem) ok(clr == GetSysColor(COLOR_3DFACE), "Unexpected background color %#x.\n", clr); else @@ -1962,11 +1959,8 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM ok(clr == c0ffee, "Unexpected background color %#x.\n", clr); } - todo_wine_if(showsel_always) - { - ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background color %#x.\n", nmlvcd->clrTextBk); - ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); - } + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background color %#x.\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); return CDRF_DODEFAULT; } return CDRF_DODEFAULT;

1 0

Jacek Caban : urlmon: Remove unused flags argument from parse_host.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 348bb6c26996dafe57ad07d3ad898bb8b4d82738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=348bb6c26996dafe57ad07d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 12 14:09:42 2020 +0200 urlmon: Remove unused flags argument from parse_host. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e03d7ca900d9eed1a78504b96bb7a82f69a6ca05) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/uri.c | 95 ++++++++++++++++++++++++------------------------------- 1 file changed, 42 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=348bb6c26996dafe57ad…

1 0

Louis Lenders : where.exe: Add stub program.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 36d9aa31c1b5a8f9e415e9a12e5c754bbe1a397b URL: https://source.winehq.org/git/wine.git/?a=commit;h=36d9aa31c1b5a8f9e415e9a1… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Jul 1 13:58:01 2020 +0200 where.exe: Add stub program. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49460 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 10b17932fa829fac10a5e6717d96ed5d56de80fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/where/Makefile.in | 6 ++++++ programs/where/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/configure b/configure index 454cf7b4d35..8ae79bf336d 100755 --- a/configure +++ b/configure @@ -1785,6 +1785,7 @@ enable_uninstaller enable_unlodctr enable_view enable_wevtutil +enable_where enable_whoami enable_wineboot enable_winebrowser @@ -21149,6 +21150,7 @@ wine_fn_config_makefile programs/uninstaller enable_uninstaller wine_fn_config_makefile programs/unlodctr enable_unlodctr wine_fn_config_makefile programs/view enable_view wine_fn_config_makefile programs/wevtutil enable_wevtutil +wine_fn_config_makefile programs/where enable_where wine_fn_config_makefile programs/whoami enable_whoami wine_fn_config_makefile programs/wineboot enable_wineboot wine_fn_config_makefile programs/winebrowser enable_winebrowser diff --git a/configure.ac b/configure.ac index abcaaa50f78..6a28988a542 100644 --- a/configure.ac +++ b/configure.ac @@ -3959,6 +3959,7 @@ WINE_CONFIG_MAKEFILE(programs/uninstaller) WINE_CONFIG_MAKEFILE(programs/unlodctr) WINE_CONFIG_MAKEFILE(programs/view) WINE_CONFIG_MAKEFILE(programs/wevtutil) +WINE_CONFIG_MAKEFILE(programs/where) WINE_CONFIG_MAKEFILE(programs/whoami) WINE_CONFIG_MAKEFILE(programs/wineboot) WINE_CONFIG_MAKEFILE(programs/winebrowser) diff --git a/programs/where/Makefile.in b/programs/where/Makefile.in new file mode 100644 index 00000000000..109261c379a --- /dev/null +++ b/programs/where/Makefile.in @@ -0,0 +1,6 @@ +MODULE = where.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c diff --git a/programs/where/main.c b/programs/where/main.c new file mode 100644 index 00000000000..6f90a222dce --- /dev/null +++ b/programs/where/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2020 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(where); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Rémi Bernon : kernel32: Catch process creation breakpoint exceptions.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: cf293599e06c78607bacb547c93558f389a971b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf293599e06c78607bacb547… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 3 10:13:30 2020 +0200 kernel32: Catch process creation breakpoint exceptions. Metal Gear Solid V: Ground Zeroes attaches itself and continues this specific breakpoint with DBG_EXCEPTION_NOT_HANDLED. It crashes the child process and the game terminates. It is correct for old Windows versions, but more recent versions are apparently catching exceptions here, and the process should continue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44127 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ceeb11d2a6545ae9db0c6825fb8d26b5cfe71889) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 9 +++++++++ dlls/kernel32/tests/debugger.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 58bbbac522a..ac9dd9c5b26 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -156,6 +156,15 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) SetLastError( 0 ); /* clear error code */ if (being_debugged) DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY + + __TRY + { ExitThread( call_process_entry( peb, entry )); } __EXCEPT(UnhandledExceptionFilter) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index a2b5d1f410e..d68a9e021b9 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1059,15 +1059,46 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, if (flag) { + DWORD last_thread; + next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); ok(ctx.pid == pi.dwProcessId, "unexpected dwProcessId %x\n", ctx.ev.dwProcessId == ctx.pid); next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + last_thread = ctx.ev.dwThreadId; wait_for_breakpoint(&ctx); ok(ctx.dll_cnt > 2, "dll_cnt = %d\n", ctx.dll_cnt); + + ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwThreadId == last_thread, "unexpected thread\n"); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); + + /* Except for wxppro and w2008, the initial breakpoint is now somewhere else, possibly within LdrInitShimEngineDynamic, + * It's also catching exceptions and ContinueDebugEvent(DBG_EXCEPTION_NOT_HANDLED) should not crash the child now */ + if (broken(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint)) + { + win_skip("Ignoring initial breakpoint address check\n"); + pass_exception = FALSE; + } + else + { + todo_wine + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress != pDbgBreakPoint, "ExceptionAddress == pDbgBreakPoint\n"); + } + + if (pass_exception) + { + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); + ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ctx.ev.dwDebugEventCode = -1; + + next_event(&ctx, WAIT_EVENT_TIMEOUT); + ok(ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + } } else { @@ -1478,6 +1509,7 @@ START_TEST(debugger) test_debug_children(myARGV[0], DEBUG_PROCESS|DEBUG_ONLY_THIS_PROCESS, FALSE, FALSE); test_debug_children(myARGV[0], 0, FALSE, FALSE); test_debug_children(myARGV[0], 0, FALSE, TRUE); + test_debug_children(myARGV[0], DEBUG_ONLY_THIS_PROCESS, FALSE, TRUE); test_debugger(myARGV[0]); } }

1 0

Brendan Shanks : winevulkan: Don't initialize the Vulkan driver in DllMain().
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 1f2416e842a25d8faf0efc3679e7348c219f5738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f2416e842a25d8faf0efc36… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jun 26 16:21:54 2020 -0700 winevulkan: Don't initialize the Vulkan driver in DllMain(). Fixes an issue where winevulkan would not be registered if no Vulkan driver was present during prefix creation (such as in a build VM). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aec196878875e92d0b404a6f982cea6667768696) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winevulkan/vulkan.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 59472bcef89..72fb622b347 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -298,7 +298,7 @@ static void wine_vk_device_free(struct VkDevice_T *device) heap_free(device); } -static BOOL wine_vk_init(void) +static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) { HDC hdc; @@ -306,16 +306,20 @@ static BOOL wine_vk_init(void) vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); ReleaseDC(0, hdc); if (!vk_funcs) - { ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); - return FALSE; - } - - p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); + else + p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); return TRUE; } +static void wine_vk_init_once(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + InitOnceExecuteOnce(&init_once, wine_vk_init, NULL, NULL); +} + /* Helper function for converting between win32 and host compatible VkInstanceCreateInfo. * This function takes care of extensions handled at winevulkan layer, a Wine graphics * driver is responsible for handling e.g. surface extensions. @@ -645,6 +649,10 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); + wine_vk_init_once(); + if (!vk_funcs) + return VK_ERROR_INITIALIZATION_FAILED; + if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -771,6 +779,10 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na return VK_ERROR_LAYER_NOT_PRESENT; } + wine_vk_init_once(); + if (!vk_funcs) + return VK_ERROR_INITIALIZATION_FAILED; + res = vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &num_host_properties, NULL); if (res != VK_SUCCESS) return res; @@ -839,6 +851,8 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) TRACE("%p\n", version); + wine_vk_init_once(); + if (p_vkEnumerateInstanceVersion) { res = p_vkEnumerateInstanceVersion(version); @@ -1269,13 +1283,14 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinst); - return wine_vk_init(); + break; } return TRUE; } static const struct vulkan_func vk_global_dispatch_table[] = { + /* These functions must call wine_vk_init_once() before accessing vk_funcs. */ {"vkCreateInstance", &wine_vkCreateInstance}, {"vkEnumerateInstanceExtensionProperties", &wine_vkEnumerateInstanceExtensionProperties}, {"vkEnumerateInstanceLayerProperties", &wine_vkEnumerateInstanceLayerProperties},

1 0

Matteo Bruni : user32: Make sure update_window_state() is always executed on the owner thread.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 8971e0019f47938912a15271140a566121912a40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8971e0019f47938912a15271… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 11:47:30 2020 +0200 user32: Make sure update_window_state() is always executed on the owner thread. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f0e9cf11450e569b86174314f39dc687d41278c4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/message.c | 3 +++ dlls/user32/spy.c | 3 ++- dlls/user32/user_private.h | 2 ++ dlls/user32/win.c | 8 +++++++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 1336865112a..2ab82837d1b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1890,6 +1890,9 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return USER_Driver->pClipCursor( &rect ); } return USER_Driver->pClipCursor( NULL ); + case WM_WINE_UPDATEWINDOWSTATE: + update_window_state( hwnd ); + return 0; default: if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG) return USER_Driver->pWindowMessage( hwnd, msg, wparam, lparam ); diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 8a2fa430b5d..dea97547b38 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1150,7 +1150,7 @@ static const char * const CCMMessageTypeNames[SPY_MAX_CCMMSGNUM + 1] = "CCM_SETNOTIFYWINDOW" }; -#define SPY_MAX_WINEMSGNUM (WM_WINE_CLIPCURSOR - WM_WINE_DESTROYWINDOW) +#define SPY_MAX_WINEMSGNUM (WM_WINE_UPDATEWINDOWSTATE - WM_WINE_DESTROYWINDOW) static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = { "WM_WINE_DESTROYWINDOW", @@ -1163,6 +1163,7 @@ static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = "WM_WINE_KEYBOARD_LL_HOOK", "WM_WINE_MOUSE_LL_HOOK", "WM_WINE_CLIPCURSOR", + "WM_WINE_UPDATEWINDOWSTATE", }; /* Virtual key names */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7e294558ef1..0230dd45001 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -56,6 +56,7 @@ enum wine_internal_message WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, WM_WINE_CLIPCURSOR, + WM_WINE_UPDATEWINDOWSTATE, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ WM_WINE_LAST_DRIVER_MSG = 0x80001fff }; @@ -243,6 +244,7 @@ extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, const RECT *window_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; extern void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; +extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3323ed3e41b..49cebe99790 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -445,11 +445,17 @@ static void send_parent_notify( HWND hwnd, UINT msg ) * * Trigger an update of the window's driver state and surface. */ -static void update_window_state( HWND hwnd ) +void update_window_state( HWND hwnd ) { DPI_AWARENESS_CONTEXT context; RECT window_rect, client_rect, valid_rects[2]; + if (!WIN_IsCurrentThread( hwnd )) + { + PostMessageW( hwnd, WM_WINE_UPDATEWINDOWSTATE, 0, 0 ); + return; + } + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); valid_rects[0] = valid_rects[1] = client_rect;

1 0

Hans Leidekker : ws2_32: Avoid a crash in WS_getaddrinfo when the specified service doesn't exist.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: f1ad73a2c3f18f1f434aa2e3fd9649ab1bb121fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ad73a2c3f18f1f434aa2e3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 11 14:11:05 2020 +0200 ws2_32: Avoid a crash in WS_getaddrinfo when the specified service doesn't exist. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49656 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6d9f46b25a481648a2a06ed8d1594fc59a4e313) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1ca750764a9..374eec37f2e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6854,7 +6854,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr result = getaddrinfo(node, servname, punixhints, &unixaires); if (result && (!hints || !(hints->ai_flags & WS_AI_NUMERICHOST)) - && (!strcmp(fqdn, node) || (!strncmp(fqdn, node, hostname_len) && !node[hostname_len]))) + && node && (!strcmp(fqdn, node) || (!strncmp(fqdn, node, hostname_len) && !node[hostname_len]))) { /* If it didn't work it means the host name IP is not in /etc/hosts, try again * by sending a NULL host and avoid sending a NULL servname too because that diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 60c5dfc63fb..bf1aeefb852 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8070,6 +8070,10 @@ static void test_getaddrinfo(void) ok(0, "test %d: getaddrinfo failed with %d (err %d)\n", i, ret, err); } } + + memset(&hint, 0, sizeof(hint)); + ret = pgetaddrinfo(NULL, "nonexistentservice", &hint, &result); + ok(ret == WSATYPE_NOT_FOUND, "got %d\n", ret); } static void test_ConnectEx(void)

1 0

Zebediah Figura : wbemprox: Return WBEM_E_NOT_FOUND from get_object() if no object is available.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 8a1a8865bc92b0a069cf1350a3cec4560e930cab URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a1a8865bc92b0a069cf1350… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Aug 9 19:30:09 2020 -0500 wbemprox: Return WBEM_E_NOT_FOUND from get_object() if no object is available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49685 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a0c9aab5deffcdf30826574ba331ea8f18616ce3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/services.c | 4 +++- dlls/wbemprox/tests/query.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 5909c02e61f..8b3a3b1af42 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -456,6 +456,7 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) { IEnumWbemClassObject *iter; struct path *path; + ULONG count; HRESULT hr; hr = parse_path( object_path, &path ); @@ -467,7 +468,8 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) free_path( path ); return hr; } - hr = create_class_object( path->class, iter, 0, NULL, obj ); + hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, obj, &count ); + if (hr == WBEM_S_FALSE) hr = WBEM_E_NOT_FOUND; IEnumWbemClassObject_Release( iter ); free_path( path ); return hr; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 0212cdcb69e..a3a3565759f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -271,7 +271,9 @@ static void test_Win32_Service( IWbemServices *services ) if (hr != S_OK) { win_skip( "Win32_Service not available\n" ); - goto out; + SysFreeString( empty ); + SysFreeString( class ); + return; } check_property( service, processidW, VT_I4, CIM_UINT32 ); @@ -347,9 +349,13 @@ static void test_Win32_Service( IWbemServices *services ) ok( hr == S_OK, "got %08x\n", hr ); if (service) IWbemClassObject_Release( service ); -out: SysFreeString( empty ); SysFreeString( class ); + + class = SysAllocString( L"Win32_Service.Name=\"nonexistent\"" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + ok( hr == WBEM_E_NOT_FOUND, "got %#08x\n", hr ); + SysFreeString( class ); } static void test_Win32_Bios( IWbemServices *services )

1 0

Louis Lenders : sc.exe: Fake succes for the SdSet argument.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: cd9d439a8dea41f6555c9e4abdd78b320eaa78b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd9d439a8dea41f6555c9e4a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Jul 27 11:26:30 2020 +0200 sc.exe: Fake succes for the SdSet argument. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49620 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a22b295cc30d89e446038c4e677f8ea6fef159e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/sc/sc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 1976c38a782..c9744afee36 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -220,6 +220,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; static const WCHAR startW[] = {'s','t','a','r','t',0}; static const WCHAR stopW[] = {'s','t','o','p',0}; + static const WCHAR sdsetW[] = {'s','d','s','e','t',0}; SC_HANDLE manager, service; SERVICE_STATUS status; BOOL ret = FALSE; @@ -328,6 +329,11 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } + else if (!wcsicmp( argv[1], sdsetW )) + { + WINE_FIXME("SdSet command not supported, faking success\n"); + ret = TRUE; + } else WINE_FIXME("command not supported\n");

1 0

Dmitry Kislyuk : vbscript: Parse empty CASE ELSE clause.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 70299c76d16da9dec74a1bbfb305e737344b5bea URL: https://source.winehq.org/git/wine.git/?a=commit;h=70299c76d16da9dec74a1bbf… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Thu Jun 25 00:50:46 2020 -0500 vbscript: Parse empty CASE ELSE clause. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49439 Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 18e7e07a77a754c4b48c6c9bde225ad5c7295944) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index df2c72da959..e5f436bf6db 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -300,7 +300,7 @@ Else_opt CaseClausules : /* empty */ { $$ = NULL; } - | tCASE tELSE StSep StatementsNl { $$ = new_case_clausule(ctx, NULL, $4, NULL); } + | tCASE tELSE StSep StatementsNl_opt { $$ = new_case_clausule(ctx, NULL, $4, NULL); } | tCASE ExpressionList StSep StatementsNl_opt CaseClausules { $$ = new_case_clausule(ctx, $2, $4, $5); } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index fb9f96e4277..eeab0bc5787 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -673,6 +673,14 @@ select case 1 : end select Call ok(x, "wrong case") +select case 0 + case 1 + case else + 'empty else with comment test +end select + +select case 0 : case 1 : case else : end select + if false then Sub testsub x = true

1 0