August 2016 - Wine-commits - list.winehq.org

Hugh McMaster : reg: Simplify help handling by removing an if-else if-else block.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: 68c1765a5d281bb51e0eff6bea2d97286176c122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c1765a5d281bb51e0eff6be… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Aug 18 11:54:27 2016 +0000 reg: Simplify help handling by removing an if-else if-else block. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6522fe6..0975acd 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -902,23 +902,32 @@ static const WCHAR addW[] = {'a','d','d',0}; static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; static const WCHAR queryW[] = {'q','u','e','r','y',0}; -static enum operations get_operation(const WCHAR *str) +static enum operations get_operation(const WCHAR *str, int *op_help) { if (!lstrcmpiW(str, addW)) + { + *op_help = STRING_ADD_USAGE; return REG_ADD; + } if (!lstrcmpiW(str, deleteW)) + { + *op_help = STRING_DELETE_USAGE; return REG_DELETE; + } if (!lstrcmpiW(str, queryW)) + { + *op_help = STRING_QUERY_USAGE; return REG_QUERY; + } return REG_INVALID; } int wmain(int argc, WCHAR *argvW[]) { - int i, op, ret; + int i, op, op_help, ret; BOOL show_op_help = FALSE; static const WCHAR switchVAW[] = {'v','a',0}; static const WCHAR switchVEW[] = {'v','e',0}; @@ -939,7 +948,7 @@ int wmain(int argc, WCHAR *argvW[]) return 0; } - op = get_operation(argvW[1]); + op = get_operation(argvW[1], &op_help); if (op == REG_INVALID) { @@ -959,12 +968,7 @@ int wmain(int argc, WCHAR *argvW[]) } else if (show_op_help) { - if (op == REG_ADD) - output_message(STRING_ADD_USAGE); - else if (op == REG_DELETE) - output_message(STRING_DELETE_USAGE); - else - output_message(STRING_QUERY_USAGE); + output_message(op_help); return 0; }

1 0

Sebastian Lackner : services: Return an error instead of BOOL from process_send_start_message.
by Alexandre Julliard 19 Aug '16

19 Aug '16

Module: wine Branch: master Commit: 51f36c220e4c2f936fd4e5c7bbdfafd4ba09b24a URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f36c220e4c2f936fd4e5c7b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 19 08:00:41 2016 +0200 services: Return an error instead of BOOL from process_send_start_message. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 36ceae8..6164c45 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -838,14 +838,13 @@ static DWORD service_is_running(struct service_entry *service) /****************************************************************************** * process_send_start_message */ -static BOOL process_send_start_message(struct process_entry *process, const WCHAR *name, - LPCWSTR *argv, DWORD argc) +static DWORD process_send_start_message(struct process_entry *process, const WCHAR *name, + const WCHAR **argv, DWORD argc) { OVERLAPPED overlapped; DWORD i, len, result; service_start_info *ssi; LPWSTR p; - BOOL r; WINE_TRACE("%p %s %p %d\n", process, wine_dbgstr_w(name), argv, argc); @@ -862,13 +861,13 @@ static BOOL process_send_start_message(struct process_entry *process, const WCHA if (!HasOverlappedIoCompleted( &overlapped )) { WINE_ERR("service %s failed to start\n", wine_dbgstr_w(name)); - return FALSE; + return ERROR_SERVICE_REQUEST_TIMEOUT; } } else if (GetLastError() != ERROR_PIPE_CONNECTED) { WINE_ERR("pipe connect failed\n"); - return FALSE; + return ERROR_SERVICE_REQUEST_TIMEOUT; } } @@ -894,16 +893,11 @@ static BOOL process_send_start_message(struct process_entry *process, const WCHA } *p=0; - r = process_send_command( process, ssi, ssi->total_size, &result ); - if (r && result) - { - SetLastError(result); - r = FALSE; - } - - HeapFree(GetProcessHeap(),0,ssi); + if (!process_send_command(process, ssi, ssi->total_size, &result)) + result = ERROR_SERVICE_REQUEST_TIMEOUT; - return r; + HeapFree(GetProcessHeap(), 0, ssi); + return result; } DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv) @@ -914,8 +908,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * err = service_start_process(service, &process); if (err == ERROR_SUCCESS) { - if (!process_send_start_message(process, service->name, service_argv, service_argc)) - err = ERROR_SERVICE_REQUEST_TIMEOUT; + err = process_send_start_message(process, service->name, service_argv, service_argc); if (err == ERROR_SUCCESS) err = process_wait_for_startup(process);

1 0

Sebastian Lackner : services: Use threadpool API instead of custom wait implementation.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: 9dfa1022e9fd9f31ffbe3cfc61cc75dd1e2954a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dfa1022e9fd9f31ffbe3cfc6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 18 09:38:24 2016 +0200 services: Use threadpool API instead of custom wait implementation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 6 ++ programs/services/rpc.c | 177 +++++++++++++------------------------------ programs/services/services.c | 9 ++- programs/services/services.h | 5 +- 4 files changed, 66 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9dfa1022e9fd9f31ffbe3…

1 0

Huw Davies : ntdll/tests: Skip broken SYSTEM_HANDLE_INFORMATION behaviour.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: 92fe612acb65b81b0038ef0c0555356cfcba7f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92fe612acb65b81b0038ef0c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 18 09:22:58 2016 +0100 ntdll/tests: Skip broken SYSTEM_HANDLE_INFORMATION behaviour. Vista and 2008 only copy the first handle's information into the buffer. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index ea1f3ef..448bc64 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -504,6 +504,7 @@ static void test_query_handle(void) SystemInformationLength = ReturnLength; shi = HeapReAlloc(GetProcessHeap(), 0, shi , SystemInformationLength); + memset(shi, 0x55, SystemInformationLength); ReturnLength = 0xdeadbeef; status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); @@ -511,6 +512,7 @@ static void test_query_handle(void) { SystemInformationLength *= 2; shi = HeapReAlloc(GetProcessHeap(), 0, shi, SystemInformationLength); + memset(shi, 0x55, SystemInformationLength); status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); } ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); @@ -518,6 +520,15 @@ static void test_query_handle(void) ok( ReturnLength == ExpectedLength || broken(ReturnLength == ExpectedLength - sizeof(DWORD)), /* Vista / 2008 */ "Expected length %u, got %u\n", ExpectedLength, ReturnLength ); ok( shi->Count > 1, "Expected more than 1 handle, got %u\n", shi->Count ); + ok( shi->Handle[1].HandleValue != 0x5555 || broken( shi->Handle[1].HandleValue == 0x5555 ), /* Vista / 2008 */ + "Uninitialized second handle\n" ); + if (shi->Handle[1].HandleValue == 0x5555) + { + win_skip("Skipping broken SYSTEM_HANDLE_INFORMATION\n"); + CloseHandle(EventHandle); + goto done; + } + for (i = 0, found = FALSE; i < shi->Count && !found; i++) found = (shi->Handle[i].OwnerPid == GetCurrentProcessId()) && ((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle); @@ -546,6 +557,7 @@ static void test_query_handle(void) status = pNtQuerySystemInformation(SystemHandleInformation, NULL, SystemInformationLength, &ReturnLength); ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); +done: HeapFree( GetProcessHeap(), 0, shi); }

1 0

Bernhard Übelacker : msvcrt: Fix strtok_s and _mbstok_s for empty strings.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: 4fa616c37cbaafdb4c9d973de81689c215601229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fa616c37cbaafdb4c9d973de… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Thu Aug 18 11:49:04 2016 +0200 msvcrt: Fix strtok_s and _mbstok_s for empty strings. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/mbcs.c | 3 ++ dlls/msvcrt/string.c | 3 ++ 3 files changed, 94 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index ecf25ec..a4bcdc5 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -92,8 +92,10 @@ static int* (__cdecl *p_errno)(void); static __msvcrt_ulong* (__cdecl *p_doserrno)(void); static void (__cdecl *p_srand)(unsigned int); static char* (__cdecl *p_strtok)(char*, const char*); +static char* (__cdecl *p_strtok_s)(char*, const char*, char**); static wchar_t* (__cdecl *p_wcstok)(wchar_t*, const wchar_t*); static unsigned char* (__cdecl *p__mbstok)(unsigned char*, const unsigned char*); +static unsigned char* (__cdecl *p__mbstok_s)(unsigned char*, const unsigned char*, unsigned char**); static char* (__cdecl *p_strerror)(int); static wchar_t* (__cdecl *p_wcserror)(int); static char* (__cdecl *p_tmpnam)(char*); @@ -355,8 +357,10 @@ static BOOL init(void) SET(p_doserrno, "__doserrno"); SET(p_srand, "srand"); SET(p_strtok, "strtok"); + SET(p_strtok_s, "strtok_s"); SET(p_wcstok, "wcstok"); SET(p__mbstok, "_mbstok"); + SET(p__mbstok_s, "_mbstok_s"); SET(p_strerror, "strerror"); SET(p_wcserror, "_wcserror"); SET(p_tmpnam, "tmpnam"); @@ -1547,6 +1551,88 @@ static void test_mbstowcs(void) p_setlocale(LC_ALL, "C"); } +static void test_strtok_s(void) +{ + char test[] = "a/b"; + char empty[] = ""; + char space[] = " "; + char delim[] = "/"; + char *strret; + char *context; + + context = (char*)0xdeadbeef; + strret = p_strtok_s( test, delim, &context); + ok(strret == test, "Expected test, got %p.\n", strret); + ok(context == test+2, "Expected test+2, got %p.\n", context); + + strret = p_strtok_s( NULL, delim, &context); + ok(strret == test+2, "Expected test+2, got %p.\n", strret); + ok(context == test+3, "Expected test+3, got %p.\n", context); + + strret = p_strtok_s( NULL, delim, &context); + ok(strret == NULL, "Expected NULL, got %p.\n", strret); + ok(context == test+3, "Expected test+3, got %p.\n", context); + + context = NULL; + strret = p_strtok_s( empty, delim, &context); + ok(strret == NULL, "Expected NULL, got %p.\n", strret); + ok(context == empty, "Expected empty, got %p.\n", context); + + strret = p_strtok_s( NULL, delim, &context); + ok(strret == NULL, "Expected NULL, got %p.\n", strret); + ok(context == empty, "Expected empty, got %p.\n", context); + + context = NULL; + strret = p_strtok_s( space, delim, &context); + ok(strret == space, "Expected space, got %p.\n", strret); + ok(context == space+1, "Expected space+1, got %p.\n", context); + + strret = p_strtok_s( NULL, delim, &context); + ok(strret == NULL, "Expected NULL, got %p.\n", strret); + ok(context == space+1, "Expected space+1, got %p.\n", context); +} + +static void test__mbstok_s(void) +{ + unsigned char test[] = "a/b"; + unsigned char empty[] = ""; + unsigned char space[] = " "; + unsigned char delim[] = "/"; + unsigned char *strret; + unsigned char *context; + + context = (unsigned char*)0xdeadbeef; + strret = p__mbstok_s( test, delim, &context); + ok(strret == test, "Expected test, got %p.\n", strret); + ok(context == test+2, "Expected test+2, got %p.\n", context); + + strret = p__mbstok_s( NULL, delim, &context); + ok(strret == test+2, "Expected test+2, got %p.\n", strret); + ok(context == test+3, "Expected test+3, got %p.\n", context); + + strret = p__mbstok_s( NULL, delim, &context); + ok(strret == NULL, "Expected NULL, got %p.\n", strret); + ok(context == test+3, "Expected test+3, got %p.\n", context); + + context = NULL; + strret = p__mbstok_s( empty, delim, &context); + ok(strret == NULL, "Expected NULL, got %p.\n", strret); + ok(context == empty, "Expected empty, got %p.\n", context); + + strret = p__mbstok_s( NULL, delim, &context); + ok(strret == NULL, "Expected NULL, got %p.\n", strret); + ok(context == empty, "Expected empty, got %p.\n", context); + + context = NULL; + strret = p__mbstok_s( space, delim, &context); + ok(strret == space, "Expected space, got %p.\n", strret); + ok(context == space+1, "Expected space+1, got %p.\n", context); + + strret = p__mbstok_s( NULL, delim, &context); + ok(strret == NULL, "Expected NULL, got %p.\n", strret); + ok(context == space+1, "Expected space+1, got %p.\n", context); +} + START_TEST(msvcr90) { if(!init()) @@ -1576,4 +1662,6 @@ START_TEST(msvcr90) test_is_exception_typeof(); test__AdjustPointer(); test_mbstowcs(); + test_strtok_s(); + test__mbstok_s(); } diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index fe88cc7..93bb1a7 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1205,7 +1205,10 @@ unsigned char* CDECL _mbstok_s_l(unsigned char *str, const unsigned char *delim, while((c=_mbsnextc(str)) && _mbschr(delim, c)) str += c>255 ? 2 : 1; if(!*str) + { + *ctx = str; return NULL; + } *ctx = str + (c>255 ? 2 : 1); while((c=_mbsnextc(*ctx)) && !_mbschr(delim, c)) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 85f09ad..3e765d0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -274,7 +274,10 @@ char * CDECL MSVCRT_strtok_s(char *str, const char *delim, char **ctx) while(*str && strchr(delim, *str)) str++; if(!*str) + { + *ctx = str; return NULL; + } *ctx = str+1; while(**ctx && !strchr(delim, **ctx))

1 0

Alexandre Julliard : winex11: Correctly free CF_DIB format, and don' t free unknown GDI formats.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: 228d855907e8b26b186413a4175c185405cb2e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=228d855907e8b26b186413a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 18 18:24:28 2016 +0900 winex11: Correctly free CF_DIB format, and don't free unknown GDI formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 9b6c749..460440d 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -577,38 +577,30 @@ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData) { TRACE("%04x\n", lpData->wFormatID); - if ((lpData->wFormatID >= CF_GDIOBJFIRST && - lpData->wFormatID <= CF_GDIOBJLAST) || - lpData->wFormatID == CF_BITMAP || - lpData->wFormatID == CF_DIB || - lpData->wFormatID == CF_PALETTE) - { - if (lpData->hData) - DeleteObject(lpData->hData); + if (!lpData->hData) return; - if ((lpData->wFormatID == CF_DIB) && lpData->drvData) - XFreePixmap(gdi_display, lpData->drvData); - } - else if (lpData->wFormatID == CF_METAFILEPICT) + switch (lpData->wFormatID) { - if (lpData->hData) - { + case CF_BITMAP: + case CF_PALETTE: + DeleteObject(lpData->hData); + break; + case CF_DIB: + if (lpData->drvData) XFreePixmap(gdi_display, lpData->drvData); + GlobalFree(lpData->hData); + break; + case CF_METAFILEPICT: DeleteMetaFile(((METAFILEPICT *)GlobalLock( lpData->hData ))->hMF ); GlobalFree(lpData->hData); - } - } - else if (lpData->wFormatID == CF_ENHMETAFILE) - { - if (lpData->hData) - DeleteEnhMetaFile(lpData->hData); - } - else if (lpData->wFormatID < CF_PRIVATEFIRST || - lpData->wFormatID > CF_PRIVATELAST) - { - if (lpData->hData) + break; + case CF_ENHMETAFILE: + DeleteEnhMetaFile(lpData->hData); + break; + default: + if (lpData->wFormatID >= CF_PRIVATEFIRST && lpData->wFormatID <= CF_PRIVATELAST) break; GlobalFree(lpData->hData); + break; } - lpData->hData = 0; lpData->drvData = 0; }

1 0

Alexandre Julliard : user32/tests: Add some tests for GDI clipboard formats.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: a96b01707039aa0427ed12698b298f3df26328bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96b01707039aa0427ed12698… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 18 20:51:16 2016 +0900 user32/tests: Add some tests for GDI clipboard formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 107 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 100 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index d218941..2e9cd24 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -754,6 +754,10 @@ static BOOL is_freed( HANDLE handle ) } static UINT format_id; +static HBITMAP bitmap, bitmap2; +static HPALETTE palette; +static HPEN pen; +static const LOGPALETTE logpalette = { 0x300, 1 }; static void test_handles( HWND hwnd ) { @@ -766,6 +770,10 @@ static void test_handles( HWND hwnd ) trace( "hwnd %p\n", hwnd ); htext = create_text(); htext2 = create_text(); + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + bitmap2 = CreateBitmap( 10, 10, 1, 1, NULL ); + palette = CreatePalette( &logpalette ); + pen = CreatePen( PS_SOLID, 1, 0 ); r = OpenClipboard( hwnd ); ok( r, "gle %d\n", GetLastError() ); @@ -778,6 +786,18 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( format_id, htext2 ); ok( h == htext2, "got %p\n", h ); ok( is_moveable( h ), "expected moveable mem %p\n", h ); + h = SetClipboardData( CF_BITMAP, bitmap ); + ok( h == bitmap, "got %p\n", h ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + h = SetClipboardData( CF_PALETTE, palette ); + ok( h == palette, "got %p\n", h ); + ok( GetObjectType( h ) == OBJ_PAL, "expected palette %p\n", h ); + h = SetClipboardData( CF_GDIOBJFIRST + 1, bitmap2 ); + ok( h == bitmap2, "got %p\n", h ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + h = SetClipboardData( CF_GDIOBJFIRST + 2, pen ); + ok( h == pen, "got %p\n", h ); + ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); data = GetClipboardData( CF_TEXT ); ok( data == htext, "wrong data %p\n", data ); @@ -793,6 +813,10 @@ static void test_handles( HWND hwnd ) /* data handles are still valid */ ok( is_moveable( htext ), "expected moveable mem %p\n", htext ); ok( is_moveable( htext2 ), "expected moveable mem %p\n", htext ); + ok( GetObjectType( bitmap ) == OBJ_BITMAP, "expected bitmap %p\n", bitmap ); + ok( GetObjectType( bitmap2 ) == OBJ_BITMAP, "expected bitmap %p\n", bitmap2 ); + ok( GetObjectType( palette ) == OBJ_PAL, "expected palette %p\n", palette ); + ok( GetObjectType( pen ) == OBJ_PEN, "expected pen %p\n", pen ); r = OpenClipboard( hwnd ); ok( r, "gle %d\n", GetLastError() ); @@ -806,12 +830,6 @@ static void test_handles( HWND hwnd ) data = GetClipboardData( CF_TEXT ); todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); - data = GetClipboardData( CF_OEMTEXT ); - todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); - - data = GetClipboardData( CF_UNICODETEXT ); - todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); - data = GetClipboardData( format_id ); todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); } @@ -827,12 +845,38 @@ static void test_handles( HWND hwnd ) ok( data == htext2, "wrong data %p, cf %08x\n", data, format_id ); } + data = GetClipboardData( CF_OEMTEXT ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + data = GetClipboardData( CF_UNICODETEXT ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + data = GetClipboardData( CF_BITMAP ); + ok( data == bitmap, "expected bitmap %p\n", data ); + data = GetClipboardData( CF_PALETTE ); + ok( data == palette, "expected palette %p\n", data ); + data = GetClipboardData( CF_GDIOBJFIRST + 1 ); + ok( data == bitmap2, "expected bitmap2 %p\n", data ); + data = GetClipboardData( CF_GDIOBJFIRST + 2 ); + ok( data == pen, "expected pen %p\n", data ); + data = GetClipboardData( CF_DIB ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + data = GetClipboardData( CF_DIBV5 ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + + ok( GetObjectType( bitmap ) == OBJ_BITMAP, "expected bitmap %p\n", bitmap ); + ok( GetObjectType( bitmap2 ) == OBJ_BITMAP, "expected bitmap %p\n", bitmap2 ); + ok( GetObjectType( palette ) == OBJ_PAL, "expected palette %p\n", palette ); + ok( GetObjectType( pen ) == OBJ_PEN, "expected pen %p\n", pen ); + r = EmptyClipboard(); ok( r, "gle %d\n", GetLastError() ); /* w2003, w2008 don't seem to free the data here */ ok( is_freed( htext ) || broken( !is_freed( htext )), "expected freed mem %p\n", htext ); ok( is_freed( htext2 ) || broken( !is_freed( htext2 )), "expected freed mem %p\n", htext ); + ok( !GetObjectType( bitmap ), "expected freed handle %p\n", bitmap ); + ok( !GetObjectType( palette ), "expected freed handle %p\n", palette ); + ok( GetObjectType( bitmap2 ) == OBJ_BITMAP, "expected bitmap2 %p\n", bitmap2 ); + ok( GetObjectType( pen ) == OBJ_PEN, "expected pen %p\n", pen ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); @@ -863,6 +907,26 @@ static DWORD WINAPI test_handles_thread2( void *arg ) ptr = GlobalLock( h ); if (ptr) ok( !strcmp( "test", ptr ), "wrong data '%.5s'\n", ptr ); GlobalUnlock( h ); + h = GetClipboardData( CF_BITMAP ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + ok( h == bitmap, "different bitmap %p / %p\n", h, bitmap ); + trace( "bitmap %p\n", h ); + h = GetClipboardData( CF_PALETTE ); + ok( GetObjectType( h ) == OBJ_PAL, "expected palette %p\n", h ); + ok( h == palette, "different palette %p / %p\n", h, palette ); + trace( "palette %p\n", h ); + h = GetClipboardData( CF_GDIOBJFIRST + 1 ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + ok( h == bitmap2, "different bitmap %p / %p\n", h, bitmap2 ); + trace( "bitmap2 %p\n", h ); + h = GetClipboardData( CF_GDIOBJFIRST + 2 ); + ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); + ok( h == pen, "different pen %p / %p\n", h, pen ); + trace( "pen %p\n", h ); + h = GetClipboardData( CF_DIB ); + todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); + h = GetClipboardData( CF_DIBV5 ); + todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); return 0; @@ -887,6 +951,22 @@ static void test_handles_process( const char *str ) ptr = GlobalLock( h ); if (ptr) ok( !strcmp( str, ptr ), "wrong data '%.5s'\n", ptr ); GlobalUnlock( h ); + h = GetClipboardData( CF_BITMAP ); + todo_wine ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + trace( "bitmap %p\n", h ); + h = GetClipboardData( CF_PALETTE ); + todo_wine ok( GetObjectType( h ) == OBJ_PAL, "expected palette %p\n", h ); + trace( "palette %p\n", h ); + h = GetClipboardData( CF_GDIOBJFIRST + 1 ); + ok( !GetObjectType( h ), "expected invalid %p\n", h ); + trace( "bitmap2 %p\n", h ); + h = GetClipboardData( CF_GDIOBJFIRST + 2 ); + ok( !GetObjectType( h ), "expected invalid %p\n", h ); + trace( "pen %p\n", h ); + h = GetClipboardData( CF_DIB ); + todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); + h = GetClipboardData( CF_DIBV5 ); + todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); } @@ -897,13 +977,18 @@ static void test_data_handles(void) HANDLE h; HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); - format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); ok( hwnd != 0, "window creation failed\n" ); + format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); test_handles( 0 ); test_handles( GetDesktopWindow() ); test_handles( hwnd ); run_thread( test_handles_thread, hwnd, __LINE__ ); + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + bitmap2 = CreateBitmap( 10, 10, 1, 1, NULL ); + palette = CreatePalette( &logpalette ); + pen = CreatePen( PS_SOLID, 1, 0 ); + r = OpenClipboard( hwnd ); ok( r, "gle %d\n", GetLastError() ); r = EmptyClipboard(); @@ -912,6 +997,14 @@ static void test_data_handles(void) ok( is_moveable( h ), "expected moveable mem %p\n", h ); h = SetClipboardData( format_id, create_text() ); ok( is_moveable( h ), "expected moveable mem %p\n", h ); + h = SetClipboardData( CF_BITMAP, bitmap ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + h = SetClipboardData( CF_PALETTE, palette ); + ok( GetObjectType( h ) == OBJ_PAL, "expected palette %p\n", h ); + h = SetClipboardData( CF_GDIOBJFIRST + 1, bitmap2 ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + h = SetClipboardData( CF_GDIOBJFIRST + 2, pen ); + ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() );

1 0

Alexandre Julliard : winex11: Allocate clipboard data as GMEM_FIXED.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: 60f8b516e2a6233eaee8ae58cd2eccce998dd81f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f8b516e2a6233eaee8ae58c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 18 20:57:51 2016 +0900 winex11: Allocate clipboard data as GMEM_FIXED. Based on a patch by Rafał Harabień. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 10 +++++----- dlls/winex11.drv/clipboard.c | 24 ++++++++++-------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 2e9cd24..4fac7c6 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -846,9 +846,9 @@ static void test_handles( HWND hwnd ) } data = GetClipboardData( CF_OEMTEXT ); - todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( CF_UNICODETEXT ); - todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( CF_BITMAP ); ok( data == bitmap, "expected bitmap %p\n", data ); data = GetClipboardData( CF_PALETTE ); @@ -858,7 +858,7 @@ static void test_handles( HWND hwnd ) data = GetClipboardData( CF_GDIOBJFIRST + 2 ); ok( data == pen, "expected pen %p\n", data ); data = GetClipboardData( CF_DIB ); - todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( CF_DIBV5 ); todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); @@ -924,7 +924,7 @@ static DWORD WINAPI test_handles_thread2( void *arg ) ok( h == pen, "different pen %p / %p\n", h, pen ); trace( "pen %p\n", h ); h = GetClipboardData( CF_DIB ); - todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); + ok( is_fixed( h ), "expected fixed mem %p\n", h ); h = GetClipboardData( CF_DIBV5 ); todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); r = CloseClipboard(); @@ -942,7 +942,7 @@ static void test_handles_process( const char *str ) r = OpenClipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); h = GetClipboardData( CF_TEXT ); - todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); + ok( is_fixed( h ), "expected fixed mem %p\n", h ); ptr = GlobalLock( h ); if (ptr) todo_wine ok( !strcmp( str, ptr ), "wrong data '%.5s'\n", ptr ); GlobalUnlock( h ); diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 460440d..9b8ff65 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -863,8 +863,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wForma else alloc_size = dst_chars; - hData = GlobalAlloc(GMEM_ZEROINIT | GMEM_MOVEABLE | - GMEM_DDESHARE, alloc_size); + hData = GlobalAlloc(GMEM_ZEROINIT | GMEM_FIXED, alloc_size); lpstrT = GlobalLock(hData); @@ -941,8 +940,7 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) /* Allocate the packed DIB */ TRACE("\tAllocating packed DIB of size %d\n", cPackedSize); - hPackedDIB = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE /*| GMEM_ZEROINIT*/, - cPackedSize ); + hPackedDIB = GlobalAlloc( GMEM_FIXED, cPackedSize ); if ( !hPackedDIB ) { WARN("Could not allocate packed DIB!\n"); @@ -1233,7 +1231,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAString(Display *display, Window w, Atom p inlcount++; } - if ((hText = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cbytes + inlcount + 1))) + if ((hText = GlobalAlloc(GMEM_FIXED, cbytes + inlcount + 1))) { lpstr = GlobalLock(hText); @@ -1290,7 +1288,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportUTF8(Display *display, Window w, Atom prop) } count = MultiByteToWideChar(CP_UTF8, 0, lpstr, -1, NULL, 0); - hUnicodeText = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, count * sizeof(WCHAR)); + hUnicodeText = GlobalAlloc(GMEM_FIXED, count * sizeof(WCHAR)); if (hUnicodeText) { @@ -1348,7 +1346,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportCompoundText(Display *display, Window w, At TRACE("lcount = %d, destlen=%d, srcstr %s\n", lcount, destlen, srcstr[0]); - if ((hUnicodeText = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (destlen + lcount + 1) * sizeof(WCHAR)))) + if ((hUnicodeText = GlobalAlloc(GMEM_FIXED, (destlen + lcount + 1) * sizeof(WCHAR)))) { WCHAR *deststr = GlobalLock(hUnicodeText); MultiByteToWideChar(CP_UNIXCP, 0, srcstr[0], -1, deststr, destlen); @@ -1432,8 +1430,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom p DWORD info_size = bitmap_info_size( info, DIB_RGB_COLORS ); BYTE *ptr; - hClipData = GlobalAlloc( GMEM_MOVEABLE | GMEM_DDESHARE, - info_size + info->bmiHeader.biSizeImage ); + hClipData = GlobalAlloc( GMEM_FIXED, info_size + info->bmiHeader.biSizeImage ); if (hClipData) { ptr = GlobalLock( hClipData ); @@ -1614,7 +1611,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportTextUriList(Display *display, Window w, Ato if (out && end >= len) { DROPFILES *dropFiles; - handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); + handle = GlobalAlloc(GMEM_FIXED, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); if (handle) { dropFiles = (DROPFILES*) GlobalLock(handle); @@ -1650,8 +1647,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, A { if (cbytes) { - /* Turn on the DDESHARE flag to enable shared 32 bit memory */ - hClipData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cbytes); + hClipData = GlobalAlloc(GMEM_FIXED, cbytes); if (hClipData == 0) { HeapFree(GetProcessHeap(), 0, lpdata); @@ -1716,7 +1712,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportClipboardData(Display *display, Window requ { datasize = GlobalSize(lpData->hData); - hClipData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, datasize); + hClipData = GlobalAlloc(GMEM_FIXED, datasize); if (hClipData == 0) return NULL; if ((lpClipData = GlobalLock(hClipData))) @@ -2182,7 +2178,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportHDROP(Display *display, Window requestor, A ERR("Failed to export %04x format\n", lpdata->wFormatID); return 0; } - hClipData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, textUriListSize); + hClipData = GlobalAlloc(GMEM_FIXED, textUriListSize); if (hClipData == NULL) return 0; hDrop = (HDROP) lpdata->hData;

1 0

Piotr Caban : ntdll: Add support for collided unwinds.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: 66567dbdf183d8a08453a3efb2fd87527ec0d9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=66567dbdf183d8a08453a3efb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 17 12:48:00 2016 +0200 ntdll: Add support for collided unwinds. Based on work by Alexandre Julliard. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 90 +++++++++++++++++++++++++++++++++++++--------- include/wine/exception.h | 1 + 2 files changed, 75 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 4c88536..79ca846 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3376,35 +3376,69 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, return (char *)base + handler_data->handler; } +struct unwind_exception_frame +{ + EXCEPTION_REGISTRATION_RECORD frame; + DISPATCHER_CONTEXT *dispatch; +}; + +/********************************************************************** + * unwind_exception_handler + * + * Handler for exceptions happening while calling an unwind handler. + */ +static DWORD unwind_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + struct unwind_exception_frame *unwind_frame = (struct unwind_exception_frame *)frame; + DISPATCHER_CONTEXT *dispatch = (DISPATCHER_CONTEXT *)dispatcher; + + /* copy the original dispatcher into the current one, except for the TargetIp */ + dispatch->ControlPc = unwind_frame->dispatch->ControlPc; + dispatch->ImageBase = unwind_frame->dispatch->ImageBase; + dispatch->FunctionEntry = unwind_frame->dispatch->FunctionEntry; + dispatch->EstablisherFrame = unwind_frame->dispatch->EstablisherFrame; + dispatch->ContextRecord = unwind_frame->dispatch->ContextRecord; + dispatch->LanguageHandler = unwind_frame->dispatch->LanguageHandler; + dispatch->HandlerData = unwind_frame->dispatch->HandlerData; + dispatch->HistoryTable = unwind_frame->dispatch->HistoryTable; + dispatch->ScopeIndex = unwind_frame->dispatch->ScopeIndex; + TRACE( "detected collided unwind\n" ); + return ExceptionCollidedUnwind; +} /********************************************************************** * call_unwind_handler * * Call a single unwind handler. - * FIXME: Handle nested exceptions. */ -static void call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ) +static DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ) { + struct unwind_exception_frame frame; DWORD res; - dispatch->ControlPc = dispatch->ContextRecord->Rip; + frame.frame.Handler = unwind_exception_handler; + frame.dispatch = dispatch; + __wine_push_frame( &frame.frame ); TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); TRACE( "handler %p returned %x\n", dispatch->LanguageHandler, res ); + __wine_pop_frame( &frame.frame ); + switch (res) { case ExceptionContinueSearch: - break; case ExceptionCollidedUnwind: - FIXME( "ExceptionCollidedUnwind not supported yet\n" ); break; default: raise_status( STATUS_INVALID_DISPOSITION, rec ); break; } + + return res; } @@ -3412,30 +3446,28 @@ static void call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *disp * call_teb_unwind_handler * * Call a single unwind handler from the TEB chain. - * FIXME: Handle nested exceptions. */ -static void call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, +static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, EXCEPTION_REGISTRATION_RECORD *teb_frame ) { - EXCEPTION_REGISTRATION_RECORD *dispatcher; DWORD res; - TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatcher=%p)\n", - teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, &dispatcher ); - res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, &dispatcher ); + TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); + res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); TRACE( "handler at %p returned %u\n", teb_frame->Handler, res ); switch (res) { case ExceptionContinueSearch: - break; case ExceptionCollidedUnwind: - FIXME( "ExceptionCollidedUnwind not supported yet\n" ); break; default: raise_status( STATUS_INVALID_DISPOSITION, rec ); break; } + + return res; } @@ -3588,7 +3620,8 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec /* FIXME: should use the history table to make things faster */ dispatch.ImageBase = 0; - dispatch.ScopeIndex = 0; /* FIXME */ + dispatch.ScopeIndex = 0; + dispatch.ControlPc = context->Rip; /* first look for PE exception information */ @@ -3674,7 +3707,19 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); } if (dispatch.EstablisherFrame == (ULONG64)end_frame) rec->ExceptionFlags |= EH_TARGET_UNWIND; - call_unwind_handler( rec, &dispatch ); + if (call_unwind_handler( rec, &dispatch ) == ExceptionCollidedUnwind) + { + ULONG64 frame; + + *context = new_context = *dispatch.ContextRecord; + dispatch.ContextRecord = context; + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, + dispatch.ControlPc, dispatch.FunctionEntry, + &new_context, NULL, &frame, NULL ); + rec->ExceptionFlags |= EH_COLLIDED_UNWIND; + goto unwind_done; + } + rec->ExceptionFlags &= ~EH_COLLIDED_UNWIND; } else /* hack: call builtin handlers registered in the tib list */ { @@ -3683,7 +3728,20 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec { TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; - call_teb_unwind_handler( rec, &dispatch, teb_frame ); + if (call_teb_unwind_handler( rec, &dispatch, teb_frame ) == ExceptionCollidedUnwind) + { + ULONG64 frame; + + teb_frame = __wine_pop_frame( teb_frame ); + + *context = new_context = *dispatch.ContextRecord; + dispatch.ContextRecord = context; + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, + dispatch.ControlPc, dispatch.FunctionEntry, + &new_context, NULL, &frame, NULL ); + rec->ExceptionFlags |= EH_COLLIDED_UNWIND; + goto unwind_done; + } teb_frame = __wine_pop_frame( teb_frame ); } if ((ULONG64)teb_frame == (ULONG64)end_frame && (ULONG64)end_frame < new_context.Rsp) break; diff --git a/include/wine/exception.h b/include/wine/exception.h index 8b807c1..f275568 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -253,6 +253,7 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) #define EH_STACK_INVALID 0x08 #define EH_NESTED_CALL 0x10 #define EH_TARGET_UNWIND 0x20 +#define EH_COLLIDED_UNWIND 0x40 /* Wine-specific exceptions codes */

1 0

Piotr Caban : ntdll: Add support for ExceptionCollidedUnwind return from exception handler.
by Alexandre Julliard 18 Aug '16

18 Aug '16

Module: wine Branch: master Commit: abebb8141264ee5e1b701f4e28f5275426ed0a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=abebb8141264ee5e1b701f4e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 17 12:48:05 2016 +0200 ntdll: Add support for ExceptionCollidedUnwind return from exception handler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 99 +++++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 79ca846..e54f162 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2256,31 +2256,15 @@ static RUNTIME_FUNCTION *lookup_function_info( ULONG64 pc, ULONG64 *base, LDR_MO * Call a single exception handler. * FIXME: Handle nested exceptions. */ -static NTSTATUS call_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, CONTEXT *orig_context ) +static DWORD call_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ) { DWORD res; - dispatch->ControlPc = dispatch->ContextRecord->Rip; - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); - - switch (res) - { - case ExceptionContinueExecution: - if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; - *orig_context = *dispatch->ContextRecord; - return STATUS_SUCCESS; - case ExceptionContinueSearch: - break; - case ExceptionNestedException: - break; - default: - return STATUS_INVALID_DISPOSITION; - } - return STATUS_UNHANDLED_EXCEPTION; + return res; } @@ -2290,31 +2274,16 @@ static NTSTATUS call_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatc * Call a single exception handler from the TEB chain. * FIXME: Handle nested exceptions. */ -static NTSTATUS call_teb_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, - EXCEPTION_REGISTRATION_RECORD *teb_frame, CONTEXT *orig_context ) +static DWORD call_teb_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, + EXCEPTION_REGISTRATION_RECORD *teb_frame ) { - EXCEPTION_REGISTRATION_RECORD *dispatcher; DWORD res; - TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatcher=%p)\n", - teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, &dispatcher ); - res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, &dispatcher ); + TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); + res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); TRACE( "handler at %p returned %u\n", teb_frame->Handler, res ); - - switch (res) - { - case ExceptionContinueExecution: - if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; - *orig_context = *dispatch->ContextRecord; - return STATUS_SUCCESS; - case ExceptionContinueSearch: - break; - case ExceptionNestedException: - break; - default: - return STATUS_INVALID_DISPOSITION; - } - return STATUS_UNHANDLED_EXCEPTION; + return res; } @@ -2336,7 +2305,6 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex dispatch.TargetIp = 0; dispatch.ContextRecord = &context; dispatch.HistoryTable = &table; - dispatch.ScopeIndex = 0; /* FIXME */ for (;;) { new_context = context; @@ -2344,6 +2312,8 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex /* FIXME: should use the history table to make things faster */ dispatch.ImageBase = 0; + dispatch.ControlPc = context.Rip; + dispatch.ScopeIndex = 0; /* first look for PE exception information */ @@ -2415,8 +2385,28 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex if (dispatch.LanguageHandler) { - status = call_handler( rec, &dispatch, orig_context ); - if (status != STATUS_UNHANDLED_EXCEPTION) return status; + switch (call_handler( rec, &dispatch )) + { + case ExceptionContinueExecution: + if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; + *orig_context = *dispatch.ContextRecord; + return STATUS_SUCCESS; + case ExceptionContinueSearch: + case ExceptionNestedException: + break; + case ExceptionCollidedUnwind: { + ULONG64 frame; + + context = *dispatch.ContextRecord; + dispatch.ContextRecord = &context; + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, + dispatch.ControlPc, dispatch.FunctionEntry, + &context, NULL, &frame, NULL ); + goto unwind_done; + } + default: + return STATUS_INVALID_DISPOSITION; + } } /* hack: call wine handlers registered in the tib list */ else while ((ULONG64)teb_frame < new_context.Rsp) @@ -2425,8 +2415,29 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex teb_frame, new_context.Rsp, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; context = *orig_context; - status = call_teb_handler( rec, &dispatch, teb_frame, orig_context ); - if (status != STATUS_UNHANDLED_EXCEPTION) return status; + switch (call_teb_handler( rec, &dispatch, teb_frame )) + { + case ExceptionContinueExecution: + if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; + *orig_context = *dispatch.ContextRecord; + return STATUS_SUCCESS; + case ExceptionContinueSearch: + case ExceptionNestedException: + break; + case ExceptionCollidedUnwind: { + ULONG64 frame; + + context = *dispatch.ContextRecord; + dispatch.ContextRecord = &context; + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, + dispatch.ControlPc, dispatch.FunctionEntry, + &context, NULL, &frame, NULL ); + teb_frame = teb_frame->Prev; + goto unwind_done; + } + default: + return STATUS_INVALID_DISPOSITION; + } teb_frame = teb_frame->Prev; }

1 0