June 2019 - Wine-Devel - list.winehq.org

[PATCH v3 1/3] user32/tests: Test restore window messages.
by Zhiyi Zhang June 4, 2019

June 4, 2019

Mostly to show that there is a WM_ACTIVATE message before WM_SYSCOMMAND SC_RESTORE and after WM_WINDOWPOSCHANGED This test won't work on non-Windows because the emulated key inputs doesn't reach the host, unless we required user interaction, e.g., clicking on the taskbar icon or Alt+Tab manually. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: SetActiveWindow only when restoring from iconic state and window is visible. v3: Add a test to verify message sequence. Previous comments say the fix is for Mirror's Edge, but in fact it is for Project CARS. I remember incorrectly. Supersede 165435~165436 dlls/user32/tests/msg.c | 91 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d0f0637ee..71b7f9f156 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17522,6 +17522,96 @@ static void test_DoubleSetCapture(void) DestroyWindow(hwnd); } +static const struct message WmRestoreMinimizedSeq[] = { + {HCBT_ACTIVATE, hook}, + {WM_WINDOWPOSCHANGING, sent | wparam, SWP_NOSIZE | SWP_NOMOVE}, + {WM_WINDOWPOSCHANGED, sent | wparam, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE}, + {WM_ACTIVATEAPP, sent | wparam, 1}, + {WM_NCACTIVATE, sent | wparam, 0x200001}, + {WM_GETTEXT, sent | defwinproc | optional}, + {WM_ACTIVATE, sent | wparam, 0x200001}, /* Note that activate messages are after WM_WINDOWPOSCHANGED and before WM_SYSCOMMAND */ + {HCBT_KEYSKIPPED, hook | optional}, + {WM_SYSKEYUP, sent | optional}, + {WM_SYSCOMMAND, sent | wparam, SC_RESTORE}, + {HCBT_SYSCOMMAND, hook | wparam, SC_RESTORE}, + {HCBT_SYSCOMMAND, hook | wparam | optional, SC_RESTORE}, + {HCBT_MINMAX, hook}, + {HCBT_MINMAX, hook | optional}, + {WM_QUERYOPEN, sent | defwinproc}, + {WM_QUERYOPEN, sent | optional}, + {WM_GETTEXT, sent | defwinproc | optional}, + {WM_WINDOWPOSCHANGING, sent | wparam | defwinproc, SWP_FRAMECHANGED | SWP_NOCOPYBITS | SWP_STATECHANGED}, + {WM_GETMINMAXINFO, sent | defwinproc}, + {WM_NCCALCSIZE, sent | wparam | defwinproc, 1}, + {WM_NCPAINT, sent | wparam | defwinproc | optional, 1}, + {WM_GETTEXT, sent | defwinproc | optional}, + {WM_ERASEBKGND, sent | defwinproc}, + {WM_WINDOWPOSCHANGED, sent | wparam | defwinproc, SWP_FRAMECHANGED | SWP_NOCOPYBITS | SWP_STATECHANGED}, + {WM_MOVE, sent | defwinproc}, + {WM_SIZE, sent | defwinproc}, + {WM_NCCALCSIZE, sent | wparam | defwinproc | optional, 1}, + {WM_NCPAINT, sent | wparam | defwinproc | optional, 1}, + {WM_ERASEBKGND, sent | defwinproc | optional}, + {HCBT_SETFOCUS, hook}, + {WM_SETFOCUS, sent | defwinproc}, + {WM_ACTIVATE, sent | wparam | defwinproc, 1}, + {WM_PAINT, sent| optional}, + {WM_SETFOCUS, sent | defwinproc | optional}, + {HCBT_KEYSKIPPED, hook | optional}, + {WM_KEYUP, sent | optional}, + {HCBT_KEYSKIPPED, hook | optional}, + {WM_SYSKEYUP, sent | optional}, + {HCBT_KEYSKIPPED, hook | optional}, + {WM_KEYUP, sent | optional}, + {WM_PAINT, sent| optional}, + {0} +}; + +static void test_restore_messages(void) +{ + INPUT ip = {0}; + HWND hwnd; + INT i; + + hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, + 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + SetForegroundWindow(hwnd); + ShowWindow(hwnd, SW_MINIMIZE); + flush_events(); + flush_sequence(); + + for (i = 0; i < 5; i++) + { + /* Send Alt+Tab to restore test window from minimized state */ + ip.type = INPUT_KEYBOARD; + ip.ki.wVk = VK_MENU; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_TAB; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_MENU; + ip.ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_TAB; + ip.ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(1, &ip, sizeof(INPUT)); + flush_events(); + if (!IsIconic(hwnd)) + break; + Sleep(500); + } + + if (IsIconic(hwnd)) + { + skip("Alt+Tab failed to bring up test window.\n"); + goto done; + } + ok_sequence(WmRestoreMinimizedSeq, "Restore minimized window", TRUE); + +done: + DestroyWindow(hwnd); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -17646,6 +17736,7 @@ START_TEST(msg) test_quit_message(); test_notify_message(); test_SetActiveWindow(); + test_restore_messages(); if (!pTrackMouseEvent) win_skip("TrackMouseEvent is not available\n"); -- 2.20.1

2 1

[PATCH 1/3] ole32: Add VT_ARRAY support to PropVariant.
by Sven Baars June 4, 2019

June 4, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This should fix some memory leaks where PropVariantClear is expected to destroy the safearray. dlls/ole32/ole2.c | 26 ++++++++++++++ dlls/ole32/tests/propvariant.c | 63 ++++++++++++++++++++++++---------- 2 files changed, 70 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 2de9edbb80..fa39abe2de 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2797,6 +2797,25 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_FILETIME|VT_VECTOR: case VT_CF|VT_VECTOR: case VT_CLSID|VT_VECTOR: + case VT_ARRAY|VT_I1: + case VT_ARRAY|VT_UI1: + case VT_ARRAY|VT_I2: + case VT_ARRAY|VT_UI2: + case VT_ARRAY|VT_I4: + case VT_ARRAY|VT_UI4: + case VT_ARRAY|VT_INT: + case VT_ARRAY|VT_UINT: + case VT_ARRAY|VT_R4: + case VT_ARRAY|VT_R8: + case VT_ARRAY|VT_CY: + case VT_ARRAY|VT_DATE: + case VT_ARRAY|VT_BSTR: + case VT_ARRAY|VT_BOOL: + case VT_ARRAY|VT_DECIMAL: + case VT_ARRAY|VT_DISPATCH: + case VT_ARRAY|VT_UNKNOWN: + case VT_ARRAY|VT_ERROR: + case VT_ARRAY|VT_VARIANT: return S_OK; } WARN("Bad type %d\n", vt); @@ -2908,6 +2927,8 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ CoTaskMemFree(pvar->u.capropvar.pElems); } } + else if (pvar->vt & VT_ARRAY) + hr = SafeArrayDestroy(pvar->u.parray); else { WARN("Invalid/unsupported type %d\n", pvar->vt); @@ -3088,6 +3109,11 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ else CopyMemory(pvarDest->u.capropvar.pElems, pvarSrc->u.capropvar.pElems, len * elemSize); } + else if (pvarSrc->vt & VT_ARRAY) + { + pvarDest->u.uhVal.QuadPart = 0; + return SafeArrayCopy(pvarSrc->u.parray, &pvarDest->u.parray); + } else WARN("Invalid/unsupported type %d\n", pvarSrc->vt); } diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 8c9f79e8d6..18ecfa6528 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -46,28 +46,28 @@ static const struct valid_mapping { { PROP_V0 , PROP_INV, PROP_INV, PROP_INV }, /* VT_EMPTY */ { PROP_V0 , PROP_INV, PROP_INV, PROP_INV }, /* VT_NULL */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I2 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I4 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R4 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R8 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_CY */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_DATE */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BSTR */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DISPATCH */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_ERROR */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BOOL */ - { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_VARIANT */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I2 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I4 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R4 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R8 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_CY */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_DATE */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BSTR */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DISPATCH */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_ERROR */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BOOL */ + { PROP_V1 | PROP_TODO , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_VARIANT */ + { PROP_V1 , PROP_V1, PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* 15 */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_I1 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI1 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI2 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */ + { PROP_V1 , PROP_V1 , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_I1 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI1 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI2 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */ { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_I8 */ { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_UI8 */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_INT */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UINT */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_INT */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UINT */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_VOID */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_HRESULT */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_PTR */ @@ -351,6 +351,9 @@ static void test_copy(void) struct unk_impl unk_obj = {{&unk_vtbl}, 1}; PROPVARIANT propvarSrc; PROPVARIANT propvarDst; + SAFEARRAY *sa; + SAFEARRAYBOUND sabound; + LONG saindex; HRESULT hr; propvarSrc.vt = VT_BSTR; @@ -392,6 +395,28 @@ static void test_copy(void) ok(hr == S_OK, "PropVariantClear(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); memset(&propvarSrc, 0, sizeof(propvarSrc)); + + sabound.lLbound = 0; + sabound.cElements = 2; + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sabound); + saindex = 0; + SafeArrayPutElement(sa, &saindex, &unk_obj.IUnknown_iface); + saindex = 1; + SafeArrayPutElement(sa, &saindex, &unk_obj.IUnknown_iface); + ok(unk_obj.ref == 3, "got wrong refcount: %d.\n", unk_obj.ref); + + propvarSrc.vt = VT_ARRAY | VT_UNKNOWN; + U(propvarSrc).parray = sa; + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == S_OK, "PropVariantCopy(...VT_ARRAY|VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 5, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarDst); + ok(hr == S_OK, "PropVariantClear(...VT_ARRAY|VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 3, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarSrc); + ok(hr == S_OK, "PropVariantClear(...VT_ARRAY|VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); + memset(&propvarSrc, 0, sizeof(propvarSrc)); } struct _PMemoryAllocator_vtable { -- 2.17.1

2 3

[PATCH v3 3/3] winemac.drv: Activate window when restoring from iconic state.
by Zhiyi Zhang June 4, 2019

June 4, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index b7a09634ee..605c0c87f1 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2452,6 +2452,7 @@ void macdrv_window_did_unminimize(HWND hwnd) { TRACE("restoring win %p/%p\n", hwnd, data->cocoa_window); release_win_data(data); + SetActiveWindow(hwnd); SendMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); return; } -- 2.20.1

1 0

[PATCH] dbghelp: Add SymGetExtendedOption/SymSetExtendedOption stubs
by Alistair Leslie-Hughes June 4, 2019

June 4, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/dbghelp.c | 20 ++++++++++++++++++++ dlls/dbghelp/dbghelp.spec | 2 ++ include/dbghelp.h | 8 ++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index ed4d5f4321..5a0d10d4bd 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -451,6 +451,26 @@ DWORD WINAPI SymGetOptions(void) return dbghelp_options; } +/****************************************************************** + * SymSetExtendedOption (DBGHELP.@) + * + */ +BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value) +{ + FIXME("%d, %d\n", option, value); + return FALSE; +} + +/****************************************************************** + * SymGetExtendedOption (DBGHELP.@) + * + */ +BOOL WINAPI SymGetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option) +{ + FIXME("%d\n", option); + return FALSE; +} + /****************************************************************** * SymSetParentWindow (DBGHELP.@) * diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 3655f8ca95..4c06f87d12 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -83,6 +83,7 @@ @ stub SymGetFileLineOffsets64 @ stub SymGetHomeDirectory @ stub SymGetHomeDirectoryW +@ stdcall SymGetExtendedOption(long) @ stdcall SymGetLineFromAddr(long long ptr ptr) @ stdcall SymGetLineFromAddr64(long int64 ptr ptr) @ stdcall SymGetLineFromAddrW64(long int64 ptr ptr) @@ -153,6 +154,7 @@ @ stdcall SymSearch(long int64 long long str int64 ptr ptr long) @ stdcall SymSearchW(long int64 long long wstr int64 ptr ptr long) @ stdcall SymSetContext(long ptr ptr) +@ stdcall SymSetExtendedOption(long long) @ stdcall SymSetHomeDirectory(long str) @ stdcall SymSetHomeDirectoryW(long wstr) @ stdcall SymSetOptions(long) diff --git a/include/dbghelp.h b/include/dbghelp.h index df105a8c5e..a319385b4a 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1424,6 +1424,11 @@ typedef struct _IMAGE_DEBUG_INFORMATION DWORD Reserved[ 2 ]; } IMAGE_DEBUG_INFORMATION, *PIMAGE_DEBUG_INFORMATION; +typedef enum +{ + SYMOPT_EX_DISABLEACCESSTIMEUPDATE, + SYMOPT_EX_MAX +} IMAGEHLP_EXTENDED_OPTIONS; PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(HANDLE, PCSTR, PCSTR, ULONG); @@ -1432,6 +1437,9 @@ BOOL WINAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION); DWORD WINAPI SymGetOptions(void); DWORD WINAPI SymSetOptions(DWORD); +BOOL WINAPI SymGetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option); +BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value); + BOOL WINAPI SymSetParentWindow(HWND); /************************* -- 2.17.1

1 0

[PATCH v2 2/2] winedbg: Replace magic number
by Alistair Leslie-Hughes June 3, 2019

June 3, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/winedbg/info.c | 2 +- programs/winedbg/symbol.c | 6 +++--- programs/winedbg/tgt_module.c | 4 ++-- programs/winedbg/winedbg.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 72c57a29b4..11c141314a 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -228,7 +228,7 @@ void info_win32_module(DWORD64 base) /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); SymSetOptions(opt); diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index aa88ffcbc7..81fad51b64 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -394,7 +394,7 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv); if (!sgv.num) @@ -655,7 +655,7 @@ BOOL symbol_get_line(const char* filename, const char* name, /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); if (!SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv)) { SymSetOptions(opt); @@ -808,7 +808,7 @@ void symbol_info(const char* str) /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); SymEnumSymbols(dbg_curr_process->handle, 0, buffer, symbols_info_cb, NULL); SymSetOptions(opt); } diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 58c4282689..7230658e25 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -51,7 +51,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) unsigned len; SymSetOptions((opts & ~(SYMOPT_UNDNAME|SYMOPT_DEFERRED_LOADS)) | - SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | 0x40000000); + SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); if (!dbg_init(hDummy, NULL, FALSE)) return start_error_init; len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); @@ -76,7 +76,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) { dbg_printf("Non supported mode... errors may occur\n" "Use at your own risks\n"); - SymSetOptions(SymGetOptions() | 0x40000000); + SymSetOptions(SymGetOptions() | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); dbg_curr_process = dbg_add_process(&be_process_module_io, 1, hDummy); dbg_curr_pid = 1; dbg_curr_thread = dbg_add_thread(dbg_curr_process, 2, NULL, NULL); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 5aeaa0d4a2..cb34684277 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -447,7 +447,7 @@ BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); SymEnumerateModules64(hProcess, mod_loader_cb, &mli); SymSetOptions(opt); -- 2.17.1

1 1

[PATCH v2 1/2] include: Add missing SYMOPT_* defines
by Alistair Leslie-Hughes June 3, 2019

June 3, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbghelp.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index 42106165ca..df105a8c5e 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -500,8 +500,16 @@ typedef struct _IMAGEHLP_DUPLICATE_SYMBOL64 #define SYMOPT_NO_PROMPTS 0x00080000 #define SYMOPT_OVERWRITE 0x00100000 #define SYMOPT_IGNORE_IMAGEDIR 0x00200000 - -#define SYMOPT_DEBUG 0x80000000 +#define SYMOPT_FLAT_DIRECTORY 0x00400000 +#define SYMOPT_FAVOR_COMPRESSED 0x00800000 +#define SYMOPT_ALLOW_ZERO_ADDRESS 0x01000000 +#define SYMOPT_DISABLE_SYMSRV_AUTODETECT 0x02000000 +#define SYMOPT_READONLY_CACHE 0x04000000 +#define SYMOPT_SYMPATH_LAST 0x08000000 +#define SYMOPT_DISABLE_FAST_SYMBOLS 0x10000000 +#define SYMOPT_DISABLE_SYMSRV_TIMEOUT 0x20000000 +#define SYMOPT_DISABLE_SRVSTAR_ON_STARTUP 0x40000000 +#define SYMOPT_DEBUG 0x80000000 typedef struct _IMAGEHLP_STACK_FRAME { -- 2.17.1

1 0

[PATCH 2/2] winedbg: Replace magic number
by Alistair Leslie-Hughes June 3, 2019

June 3, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/winedbg/tgt_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 58c4282689..1e21e6b4b7 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -51,7 +51,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) unsigned len; SymSetOptions((opts & ~(SYMOPT_UNDNAME|SYMOPT_DEFERRED_LOADS)) | - SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | 0x40000000); + SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); if (!dbg_init(hDummy, NULL, FALSE)) return start_error_init; len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); -- 2.17.1

1 0

[PATCH 1/2] include: Add missing SYMOPT_* defines
by Alistair Leslie-Hughes June 3, 2019

June 3, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbghelp.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index 42106165ca..df105a8c5e 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -500,8 +500,16 @@ typedef struct _IMAGEHLP_DUPLICATE_SYMBOL64 #define SYMOPT_NO_PROMPTS 0x00080000 #define SYMOPT_OVERWRITE 0x00100000 #define SYMOPT_IGNORE_IMAGEDIR 0x00200000 - -#define SYMOPT_DEBUG 0x80000000 +#define SYMOPT_FLAT_DIRECTORY 0x00400000 +#define SYMOPT_FAVOR_COMPRESSED 0x00800000 +#define SYMOPT_ALLOW_ZERO_ADDRESS 0x01000000 +#define SYMOPT_DISABLE_SYMSRV_AUTODETECT 0x02000000 +#define SYMOPT_READONLY_CACHE 0x04000000 +#define SYMOPT_SYMPATH_LAST 0x08000000 +#define SYMOPT_DISABLE_FAST_SYMBOLS 0x10000000 +#define SYMOPT_DISABLE_SYMSRV_TIMEOUT 0x20000000 +#define SYMOPT_DISABLE_SRVSTAR_ON_STARTUP 0x40000000 +#define SYMOPT_DEBUG 0x80000000 typedef struct _IMAGEHLP_STACK_FRAME { -- 2.17.1

1 0

[PATCH] dbghelp: Support S_HEAPALLOCSITE entry
by Alistair Leslie-Hughes June 3, 2019

June 3, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/msc.c | 5 +++++ include/wine/mscvpdb.h | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 54fbe36596..4be0cb244d 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2011,6 +2011,11 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo case S_ALIGN_V1: TRACE("S-Align V1\n"); break; + case S_HEAPALLOCSITE: + TRACE("heap site: offset=0x%08x at sect_idx 0x%04x, inst_len 0x%08x, index 0x%08x\n", + sym->heap_alloc_site.offset, sym->heap_alloc_site.sect_idx, + sym->heap_alloc_site.inst_len, sym->heap_alloc_site.index); + break; /* the symbols we can safely ignore for now */ case S_TRAMPOLINE: diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index a44331bb5c..2301e80d86 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1644,6 +1644,16 @@ union codeview_symbol unsigned short eh_sect; /* section for exception handler */ unsigned int flags; } frame_info_v2; + + struct + { + unsigned short len; + unsigned short id; + unsigned int offset; + unsigned short sect_idx; + unsigned short inst_len; + unsigned int index; + } heap_alloc_site; }; #define S_COMPILAND_V1 0x0001 -- 2.17.1

1 0

[PATCH] taskschd: Fix some server binding handle leaks (Valgrind).
by Sven Baars June 3, 2019

June 3, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/taskschd/task.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 54b678244b..2a1d0d42b3 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3691,6 +3691,8 @@ static ULONG WINAPI TaskService_Release(ITaskService *iface) { TRACE("destroying %p\n", iface); heap_free(task_svc); + if (rpc_handle) + RpcBindingFree(&rpc_handle); } return ref; @@ -3881,11 +3883,14 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V hr = start_schedsvc(); if (hr != S_OK) return hr; - hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); - if (hr != RPC_S_OK) return hr; - hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); - RpcStringFreeW(&binding_str); - if (hr != RPC_S_OK) return hr; + if (!rpc_handle) + { + hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); + if (hr != RPC_S_OK) return hr; + hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); + RpcStringFreeW(&binding_str); + if (hr != RPC_S_OK) return hr; + } /* Make sure that the connection works */ hr = SchRpcHighestVersion(&task_svc->version); -- 2.17.1

2 2