January 2020 - Wine-commits

Zebediah Figura : httpapi/tests: Avoid depending on the availability of specific ports.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 142585a1221a789b181e0d4c05d2b4162b9df23f URL: https://source.winehq.org/git/wine.git/?a=commit;h=142585a1221a789b181e0d4c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 10 15:15:27 2020 -0600 httpapi/tests: Avoid depending on the availability of specific ports. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 339 ++++++++++++++++++++++++++----------------- 1 file changed, 202 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=142585a1221a789b181e…

1 0

Zebediah Figura : netapi32/tests: Fix the size passed to GetUserNameW() and GetComputerNameW() (Coverity).
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 8341b51bf66a38b5d830931995b839cc99c00b42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8341b51bf66a38b5d8309319… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 12 14:27:06 2020 -0600 netapi32/tests: Fix the size passed to GetUserNameW() and GetComputerNameW() (Coverity). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/tests/access.c | 4 ++-- dlls/netapi32/tests/wksta.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 3cf6cb35dd..0f0ac5417f 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -494,10 +494,10 @@ START_TEST(access) pDavGetHTTPFromUNCPath = (void*)GetProcAddress(hnetapi32, "DavGetHTTPFromUNCPath"); pDavGetUNCFromHTTPPath = (void*)GetProcAddress(hnetapi32, "DavGetUNCFromHTTPPath"); - size = sizeof(user_name); + size = ARRAY_SIZE(user_name); ret = GetUserNameW(user_name, &size); ok(ret, "Failed to get user name, error %u.\n", GetLastError()); - size = sizeof(computer_name); + size = ARRAY_SIZE(computer_name); ret = GetComputerNameW(computer_name, &size); ok(ret, "Failed to get computer name, error %u.\n", GetLastError()); diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 684905c4dc..f53fcbbcce 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -175,10 +175,10 @@ START_TEST(wksta) pNetpGetComputerName = (void *)GetProcAddress(GetModuleHandleA("netapi32.dll"), "NetpGetComputerName"); - size = sizeof(user_name); + size = ARRAY_SIZE(user_name); ret = GetUserNameW(user_name, &size); ok(ret, "Failed to get user name, error %u.\n", GetLastError()); - size = sizeof(computer_name); + size = ARRAY_SIZE(computer_name); ret = GetComputerNameW(computer_name, &size); ok(ret, "Failed to get computer name, error %u.\n", GetLastError());

1 0

Chip Davis : dbghelp: Look for .eh_fram if no .eh_frame is found.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 8000b5415d2c249176bda3d8b49f8fc9978e1623 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8000b5415d2c249176bda3d8… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sat Jan 11 15:06:58 2020 -0600 dbghelp: Look for .eh_fram if no .eh_frame is found. lld produces these, because '.eh_frame' misses the eight-character limit by one character, but '.eh_fram' does not. This allows it to avoid producing a string table for this common section. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 26e2f42ba0..980e1d2178 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3516,7 +3516,9 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, BOOL ret = TRUE; struct module_format* dwarf2_modfmt; - dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect); + if (!dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect)) + /* lld produces .eh_fram to avoid generating a long name */ + dwarf2_init_section(&eh_frame, fmap, ".eh_fram", NULL, &eh_frame_sect); dwarf2_init_section(&section[section_debug], fmap, ".debug_info", ".zdebug_info", &debug_sect); dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", ".zdebug_abbrev", &debug_abbrev_sect); dwarf2_init_section(&section[section_string], fmap, ".debug_str", ".zdebug_str", &debug_str_sect);

1 0

Jeff Smith : user.exe16: Releasing DC does not disable it.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 0778945e34968c66ccbe8a8be1f9749b8383f55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0778945e34968c66ccbe8a8b… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jan 12 14:54:10 2020 -0600 user.exe16: Releasing DC does not disable it. ReleaseDC in user32 marks cache DCs as disabled. For user.exe (the 16-bit equivalent), this causes DCs to become inaccessible after release. On Windows, they are still accessible after release. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44408 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/window.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 10f1389f0a..bf86719325 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -23,6 +23,7 @@ #include "user_private.h" #include "wine/list.h" #include "wine/server.h" +#include "wine/gdi_driver.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); @@ -675,7 +676,9 @@ HDC16 WINAPI GetWindowDC16( HWND16 hwnd ) */ INT16 WINAPI ReleaseDC16( HWND16 hwnd, HDC16 hdc ) { - return (INT16)ReleaseDC( WIN_Handle32(hwnd), HDC_32(hdc) ); + INT16 ret = (INT16)ReleaseDC( WIN_Handle32(hwnd), HDC_32(hdc) ); + SetHookFlags( HDC_32(hdc), DCHF_ENABLEDC ); + return ret; }

1 0

Alexandre Julliard : kernel32: Catch stack overflow faults in IsBad*Ptr() functions.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 21876b998ce3dbb3245cc0a85aee80e0d6b03168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21876b998ce3dbb3245cc0a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 16:09:53 2020 +0100 kernel32: Catch stack overflow faults in IsBad*Ptr() functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48444 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 12 ++++++++++++ dlls/kernel32/virtual.c | 29 +++++++++++++++++++++++------ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 120e9f16f0..c534e310ef 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1533,6 +1533,12 @@ static void test_IsBadReadPtr(void) ret = IsBadReadPtr(&stackvar, sizeof(char)); ok(ret == FALSE, "Expected IsBadReadPtr to return FALSE, got %d\n", ret); + + ret = IsBadReadPtr((char *)NtCurrentTeb()->DeallocationStack + 4096, sizeof(DWORD)); + ok(ret == TRUE, "Expected IsBadReadPtr to return TRUE, got %d\n", ret); + + ret = IsBadReadPtr((char *)NtCurrentTeb()->DeallocationStack + 4096, sizeof(DWORD)); + ok(ret == TRUE, "Expected IsBadReadPtr to return TRUE, got %d\n", ret); } static void test_IsBadWritePtr(void) @@ -1558,6 +1564,12 @@ static void test_IsBadWritePtr(void) ret = IsBadWritePtr(&stackval, sizeof(char)); ok(ret == FALSE, "Expected IsBadWritePtr to return FALSE, got %d\n", ret); + + ret = IsBadWritePtr((char *)NtCurrentTeb()->DeallocationStack + 4096, sizeof(DWORD)); + ok(ret == TRUE, "Expected IsBadWritePtr to return TRUE, got %d\n", ret); + + ret = IsBadWritePtr((char *)NtCurrentTeb()->DeallocationStack + 4096, sizeof(DWORD)); + ok(ret == TRUE, "Expected IsBadWritePtr to return TRUE, got %d\n", ret); } static void test_IsBadCodePtr(void) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index b9b0e08653..a35471f526 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -48,6 +48,23 @@ WINE_DECLARE_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(file); +static LONG WINAPI badptr_handler( EXCEPTION_POINTERS *eptr ) +{ + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + + if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION) return EXCEPTION_EXECUTE_HANDLER; + if (rec->ExceptionCode == STATUS_STACK_OVERFLOW) + { + /* restore stack guard page */ + void *addr = (char *)NtCurrentTeb()->DeallocationStack + system_info.PageSize; + SIZE_T size = (char *)rec - (char *)addr; + ULONG old_prot; + NtProtectVirtualMemory( GetCurrentProcess(), &addr, &size, PAGE_GUARD|PAGE_READWRITE, &old_prot ); + return EXCEPTION_EXECUTE_HANDLER; + } + return EXCEPTION_CONTINUE_SEARCH; +} + /*********************************************************************** * IsBadReadPtr (KERNEL32.@) * @@ -79,7 +96,7 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT_PTR size ) dummy = p[0]; dummy = p[count - 1]; } - __EXCEPT_PAGE_FAULT + __EXCEPT( badptr_handler ) { TRACE_(seh)("%p caused page fault during read\n", ptr); return TRUE; @@ -120,7 +137,7 @@ BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT_PTR size ) p[0] |= 0; p[count - 1] |= 0; } - __EXCEPT_PAGE_FAULT + __EXCEPT( badptr_handler ) { TRACE_(seh)("%p caused page fault during write\n", ptr); return TRUE; @@ -202,13 +219,13 @@ BOOL WINAPI IsBadCodePtr( FARPROC ptr ) BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) { if (!str) return TRUE; - + __TRY { volatile const char *p = str; while (p != str + max) if (!*p++) break; } - __EXCEPT_PAGE_FAULT + __EXCEPT( badptr_handler ) { TRACE_(seh)("%p caused page fault during read\n", str); return TRUE; @@ -226,13 +243,13 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) { if (!str) return TRUE; - + __TRY { volatile const WCHAR *p = str; while (p != str + max) if (!*p++) break; } - __EXCEPT_PAGE_FAULT + __EXCEPT( badptr_handler ) { TRACE_(seh)("%p caused page fault during read\n", str); return TRUE;

1 0

Alistair Leslie-Hughes : dinput: Cap the buffer size to 20.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 8d052561724f9c8d9e7770964bfaebdd01e98e60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d052561724f9c8d9e777096… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jan 12 22:33:24 2020 +0000 dinput: Cap the buffer size to 20. When a program calls SetProperty with DIPROP_BUFFERSIZE, dinput records this value for GetProperty but only uses it when the device can support that number of buffers otherwise a max value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45732 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 10 ++++++---- dlls/dinput/device_private.h | 3 ++- dlls/dinput/tests/device.c | 25 +++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 28329d03b5..b778f6b3ea 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1307,7 +1307,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, if (pdiph->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; - pd->dwData = This->queue_len; + pd->dwData = This->buffersize; TRACE("buffersize = %d\n", pd->dwData); break; } @@ -1396,12 +1396,14 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( TRACE("buffersize = %d\n", pd->dwData); EnterCriticalSection(&This->crit); + + This->buffersize = pd->dwData; + This->queue_len = min(This->buffersize, 20); HeapFree(GetProcessHeap(), 0, This->data_queue); - This->data_queue = !pd->dwData ? NULL : HeapAlloc(GetProcessHeap(), 0, - pd->dwData * sizeof(DIDEVICEOBJECTDATA)); + This->data_queue = !This->queue_len ? NULL : HeapAlloc(GetProcessHeap(), 0, + This->queue_len * sizeof(DIDEVICEOBJECTDATA)); This->queue_head = This->queue_tail = This->overflow = 0; - This->queue_len = pd->dwData; LeaveCriticalSection(&This->crit); break; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 27e9c26286..23d9e2eebc 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -71,10 +71,11 @@ struct IDirectInputDeviceImpl DI_EVENT_PROC event_proc; /* function to receive mouse & keyboard events */ LPDIDEVICEOBJECTDATA data_queue; /* buffer for 'GetDeviceData'. */ - int queue_len; /* size of the queue - set in 'SetProperty' */ + int queue_len; /* valid size of the queue */ int queue_head; /* position to write new event into queue */ int queue_tail; /* next event to read from queue */ BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ + DWORD buffersize; /* size of the queue - set in 'SetProperty' */ DataFormat data_format; /* user data format and wine to user format converter */ diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index a2a5a65686..dcf8a37334 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -25,6 +25,8 @@ #include "windef.h" #include "dinput.h" +#include <limits.h> + static const DIOBJECTDATAFORMAT obj_data_format[] = { { &GUID_YAxis, 16, DIDFT_OPTIONAL|DIDFT_AXIS |DIDFT_MAKEINSTANCE(1), 0}, { &GUID_Button,15, DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(3), 0}, @@ -106,8 +108,22 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); dp.diph.dwHow = DIPH_DEVICE; dp.diph.dwObj = 0; + dp.dwData = UINT_MAX; + + hr = IDirectInputDevice_GetProperty(device, DIPROP_BUFFERSIZE, &dp.diph); + ok(hr == DI_OK, "Failed: %08x\n", hr); + ok(dp.dwData == 0, "got %d\n", dp.dwData); + + dp.dwData = UINT_MAX; + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + dp.dwData = 0; + hr = IDirectInputDevice_GetProperty(device, DIPROP_BUFFERSIZE, &dp.diph); + ok(hr == DI_OK, "Failed: %08x\n", hr); + ok(dp.dwData == UINT_MAX, "got %d\n", dp.dwData); + dp.dwData = 0; hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); cnt = 5; @@ -166,6 +182,15 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) hr = IDirectInputDevice_Unacquire(device); ok(hr == DI_OK, "Unacquire() failed: %08x\n", hr); } + + /* Reset buffer size */ + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + dp.diph.dwObj = 0; + dp.dwData = 0; + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); } struct enum_data

1 0

Piotr Caban : msvcrt: Pass catch_func_nested_frame struct to cxx_frame_handler.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: ea20974cdd7457715bf4d758818d03bff664f62b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea20974cdd7457715bf4d758… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 13 14:44:18 2020 +0100 msvcrt: Pass catch_func_nested_frame struct to cxx_frame_handler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 57 ++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index e2515c7778..b790047fe3 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -96,6 +96,16 @@ typedef struct __cxx_function_descr UINT flags; /* flags when magic >= VC8 */ } cxx_function_descr; +/* exception frame for nested exceptions in catch block */ +typedef struct +{ + EXCEPTION_REGISTRATION_RECORD frame; /* standard exception frame */ + cxx_exception_frame *cxx_frame; /* frame of parent exception */ + const cxx_function_descr *descr; /* descriptor of parent exception */ + int trylevel; /* current try level */ + cxx_frame_info frame_info; +} catch_func_nested_frame; + typedef struct { cxx_exception_frame *frame; @@ -135,7 +145,7 @@ typedef struct DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, - EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ) DECLSPEC_HIDDEN; + catch_func_nested_frame* nested_frame ) DECLSPEC_HIDDEN; /* call a copy constructor */ extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); @@ -332,21 +342,11 @@ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_des frame->trylevel = last_level; } -/* exception frame for nested exceptions in catch block */ -struct catch_func_nested_frame -{ - EXCEPTION_REGISTRATION_RECORD frame; /* standard exception frame */ - cxx_exception_frame *cxx_frame; /* frame of parent exception */ - const cxx_function_descr *descr; /* descriptor of parent exception */ - int trylevel; /* current try level */ - cxx_frame_info frame_info; -}; - /* handler for exceptions happening while calling a catch function */ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { - struct catch_func_nested_frame *nested_frame = (struct catch_func_nested_frame *)frame; + catch_func_nested_frame *nested_frame = (catch_func_nested_frame *)frame; if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) { @@ -382,8 +382,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG } return cxx_frame_handler( rec, nested_frame->cxx_frame, context, - NULL, nested_frame->descr, &nested_frame->frame, - nested_frame->trylevel ); + NULL, nested_frame->descr, nested_frame ); } /* find and call the appropriate catch block for an exception */ @@ -397,7 +396,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, UINT i; int j; void *addr, *object = (void *)rec->ExceptionInformation[1]; - struct catch_func_nested_frame nested_frame; + catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; DWORD save_esp = ((DWORD*)frame)[-1]; thread_data_t *data = msvcrt_get_thread_data(); @@ -560,8 +559,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, - EXCEPTION_REGISTRATION_RECORD* nested_frame, - int nested_trylevel ) + catch_func_nested_frame* nested_frame ) { cxx_exception_type *exc_type; @@ -577,7 +575,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { - if (descr->unwind_count && !nested_trylevel) cxx_local_unwind( frame, descr, -1 ); + if (descr->unwind_count && !nested_frame) cxx_local_unwind( frame, descr, -1 ); return ExceptionContinueSearch; } if (!descr->tryblock_count) return ExceptionContinueSearch; @@ -602,8 +600,9 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 && exc_type->custom_handler) { - return exc_type->custom_handler( rec, frame, context, dispatch, - descr, nested_trylevel, nested_frame, 0 ); + return exc_type->custom_handler( rec, frame, context, dispatch, descr, + nested_frame ? nested_frame->trylevel : 0, + nested_frame ? &nested_frame->frame : NULL, 0 ); } if (TRACE_ON(seh)) @@ -628,7 +627,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame ctx.frame = frame; ctx.descr = descr; - ctx.nested_frame = nested_frame; + ctx.nested_frame = nested_frame ? &nested_frame->frame : NULL; __TRY { except_ptrs.ExceptionRecord = rec; @@ -643,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } call_catch_block( rec, context, frame, descr, - frame->trylevel, nested_frame, exc_type ); + frame->trylevel, nested_frame ? &nested_frame->frame : NULL, exc_type ); return ExceptionContinueSearch; } @@ -654,23 +653,21 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame extern DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ); __ASM_GLOBAL_FUNC( __CxxFrameHandler, - "pushl $0\n\t" /* nested_trylevel */ - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl $0\n\t" /* nested_frame */ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl %eax\n\t" /* descr */ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "pushl 28(%esp)\n\t" /* dispatch */ + "pushl 24(%esp)\n\t" /* dispatch */ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "pushl 28(%esp)\n\t" /* context */ + "pushl 24(%esp)\n\t" /* context */ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "pushl 28(%esp)\n\t" /* frame */ + "pushl 24(%esp)\n\t" /* frame */ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - "pushl 28(%esp)\n\t" /* rec */ + "pushl 24(%esp)\n\t" /* rec */ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "call " __ASM_NAME("cxx_frame_handler") "\n\t" - "add $28,%esp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset -28\n\t") + "add $24,%esp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -24\n\t") "ret" )

1 0

Piotr Caban : msvcrt: Pass catch_func_nested_frame struct to call_catch_block.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 48a447c5eb238d673ce5db4eeacf3ba4c1a9da90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48a447c5eb238d673ce5db4e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 13 14:44:27 2020 +0100 msvcrt: Pass catch_func_nested_frame struct to call_catch_block. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index b790047fe3..63a04dbf78 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -110,7 +110,7 @@ typedef struct { cxx_exception_frame *frame; const cxx_function_descr *descr; - EXCEPTION_REGISTRATION_RECORD *nested_frame; + catch_func_nested_frame *nested_frame; } se_translator_ctx; typedef struct _SCOPETABLE @@ -390,7 +390,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, cxx_exception_frame *frame, const cxx_function_descr *descr, int nested_trylevel, - EXCEPTION_REGISTRATION_RECORD *catch_frame, + catch_func_nested_frame *catch_frame, cxx_exception_type *info ) { UINT i; @@ -440,7 +440,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, (void*)rec->ExceptionInformation[1]); /* unwind the stack */ - RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 ); + RtlUnwind( catch_frame ? &catch_frame->frame : &frame->frame, 0, rec, 0 ); cxx_local_unwind( frame, descr, tryblock->start_level ); frame->trylevel = tryblock->end_level + 1; @@ -627,7 +627,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame ctx.frame = frame; ctx.descr = descr; - ctx.nested_frame = nested_frame ? &nested_frame->frame : NULL; + ctx.nested_frame = nested_frame; __TRY { except_ptrs.ExceptionRecord = rec; @@ -642,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } call_catch_block( rec, context, frame, descr, - frame->trylevel, nested_frame ? &nested_frame->frame : NULL, exc_type ); + frame->trylevel, nested_frame, exc_type ); return ExceptionContinueSearch; }

1 0

Piotr Caban : msvcrt: Fix handling tryblocks inside current catch block on nested exception.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 6babdb5508bd2f1b659218483f5df76859898712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6babdb5508bd2f1b65921848… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 13 14:46:05 2020 +0100 msvcrt: Fix handling tryblocks inside current catch block on nested exception. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48335 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 63a04dbf78..ea5634aefb 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -389,7 +389,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG /* returns the address to continue execution to after the catch block was called */ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, cxx_exception_frame *frame, - const cxx_function_descr *descr, int nested_trylevel, + const cxx_function_descr *descr, catch_func_nested_frame *catch_frame, cxx_exception_type *info ) { @@ -407,7 +407,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, const tryblock_info *tryblock = &descr->tryblock[i]; /* only handle try blocks inside current catch block */ - if (catch_frame && nested_trylevel > tryblock->start_level) continue; + if (catch_frame && catch_frame->trylevel > tryblock->start_level) continue; if (trylevel < tryblock->start_level) continue; if (trylevel > tryblock->end_level) continue; @@ -458,7 +458,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, nested_frame.frame.Handler = catch_function_nested_handler; nested_frame.cxx_frame = frame; nested_frame.descr = descr; - nested_frame.trylevel = nested_trylevel + 1; + nested_frame.trylevel = tryblock->end_level + 1; __wine_push_frame( &nested_frame.frame ); addr = call_handler( catchblock->handler, &frame->ebp ); @@ -545,7 +545,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; call_catch_block( rec, ep->ContextRecord, ctx->frame, ctx->descr, - ctx->frame->trylevel, ctx->nested_frame, exc_type ); + ctx->nested_frame, exc_type ); __DestructExceptionObject( rec ); return ExceptionContinueSearch; @@ -642,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } call_catch_block( rec, context, frame, descr, - frame->trylevel, nested_frame, exc_type ); + nested_frame, exc_type ); return ExceptionContinueSearch; }

1 0

Michael Müller : setupapi: Add support for IDF_CHECKFIRST flag in SetupPromptForDiskW.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 0422c6c4d0224c4e619771a0d22f4a5a1575f3f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0422c6c4d0224c4e619771a0… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Jan 11 21:06:39 2020 +0100 setupapi: Add support for IDF_CHECKFIRST flag in SetupPromptForDiskW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20465 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/dialog.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c index fdabf887b0..494525f11a 100644 --- a/dlls/setupapi/dialog.c +++ b/dlls/setupapi/dialog.c @@ -241,6 +241,33 @@ UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR Disk SetLastError(ERROR_INVALID_PARAMETER); return DPROMPT_CANCEL; } + + if (PathToSource && (DiskPromptStyle & IDF_CHECKFIRST)) + { + WCHAR filepath[MAX_PATH]; + + if (lstrlenW(PathToSource) + 1 + lstrlenW(FileSought) < ARRAY_SIZE(filepath)) + { + swprintf(filepath, ARRAY_SIZE(filepath), L"%s\\%s", PathToSource, FileSought); + if (GetFileAttributesW(filepath) != INVALID_FILE_ATTRIBUTES) + { + if (PathRequiredSize) + *PathRequiredSize = lstrlenW(PathToSource) + 1; + + if (!PathBuffer) + return DPROMPT_SUCCESS; + + if (PathBufferSize >= lstrlenW(PathToSource) + 1) + { + lstrcpyW(PathBuffer, PathToSource); + return DPROMPT_SUCCESS; + } + else + return DPROMPT_BUFFERTOOSMALL; + } + } + } + params.DialogTitle = DialogTitle; params.DiskName = DiskName; params.PathToSource = PathToSource;

1 0