October 2021 - Wine-Commits

Piotr Caban : msvcrt: Fix _unDName crash when demangling class function pointer.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: 1d23985d6407746141ace4d160f94452a755ce00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d23985d6407746141ace4d1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 30 20:50:59 2021 +0200 msvcrt: Fix _unDName crash when demangling class function pointer. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7a1e7cbeee94756f3c474ba63b9fe9db8bddde3a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 2 ++ dlls/msvcrt/undname.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 4d3a5f8d96f..5eef5bdd93c 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1096,6 +1096,8 @@ static void test_demangle_datatype(void) "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,32256>",TRUE}, { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE}, + { "P8test@@AACXZ", "signed char (__cdecl test::*)(void)", TRUE}, + { "P8test@@BACXZ", "signed char (__cdecl test::*)(void)const ", TRUE}, }; int i, num_test = ARRAY_SIZE(demangle); diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 51ce1d25665..a8e2ef2bd08 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -879,7 +879,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, goto done; if (modifier) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); - else if(ptr_modif[0]) + else if(ptr_modif) modifier = str_printf(sym, " %s", ptr_modif); if (!get_calling_convention(*sym->current++, &call_conv, &exported,

1 0

Nikolay Sivov : gdi32: Enumerate scalable fonts with zero charset mask as OEM.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: 499448fb21bbcd85a3bd224edc280c5ab57d4a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=499448fb21bbcd85a3bd224e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 28 00:03:51 2021 +0300 gdi32: Enumerate scalable fonts with zero charset mask as OEM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51041 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8241d21ae0d385bb436930320056d16a8906caf5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 814c6153b89..b6840d8d809 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2816,7 +2816,7 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi for (i = 0; i < count; i++) { - if (!face->scalable && face->fs.fsCsb[0] == 0) /* OEM bitmap */ + if (face->fs.fsCsb[0] == 0) /* OEM */ { elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; load_script_name( IDS_OEM_DOS - IDS_FIRST_SCRIPT, elf.elfScript );

1 0

Paul Gofman : ddraw/tests: Also test RT caps for software device.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: d312b7ac50efdf1854a19a284d336cf885daaa48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d312b7ac50efdf1854a19a28… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 18 00:52:06 2021 +0300 ddraw/tests: Also test RT caps for software device. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6991d7befa869d76511e0dea2c9e9bed6e34b628) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 137 +++++++++++++++++++++++---------- dlls/ddraw/tests/ddraw2.c | 166 +++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw4.c | 170 ++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw7.c | 191 +++++++++++++++++++++++++++++++--------------- 4 files changed, 453 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d312b7ac50efdf1854a1…

1 0

Damjan Jovanovic : shell32: Implement IID_IContextMenu in CreateViewObject() methods for shell folders that support it.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: 26c1f7c83bba9e42e98c174b74fc7fafd9c77126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c1f7c83bba9e42e98c174b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 3 03:12:07 2021 +0200 shell32: Implement IID_IContextMenu in CreateViewObject() methods for shell folders that support it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39841 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ad412b11a7ea17b708994ed6609f8ed0cbfb169b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/cpanelfolder.c | 6 ++-- dlls/shell32/recyclebin.c | 2 ++ dlls/shell32/shfldr_desktop.c | 3 +- dlls/shell32/shfldr_fs.c | 3 +- dlls/shell32/shfldr_mycomp.c | 3 +- dlls/shell32/shfldr_netplaces.c | 10 +++--- dlls/shell32/shfldr_printers.c | 5 ++- dlls/shell32/shfldr_unixfs.c | 2 ++ dlls/shell32/tests/shlfolder.c | 72 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 91 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 114eb6babd3..f2e845e5dab 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -524,15 +524,15 @@ static HRESULT WINAPI ISF_ControlPanel_fnCreateViewObject(IShellFolder2 *iface, if (IsEqualIID(riid, &IID_IDropTarget)) { WARN("IDropTarget not implemented\n"); hr = E_NOTIMPL; - } else if (IsEqualIID(riid, &IID_IContextMenu)) { - WARN("IContextMenu not implemented\n"); - hr = E_NOTIMPL; } else if (IsEqualIID(riid, &IID_IShellView)) { pShellView = IShellView_Constructor((IShellFolder *) iface); if (pShellView) { hr = IShellView_QueryInterface(pShellView, riid, ppvOut); IShellView_Release(pShellView); } + } else { + FIXME("invalid/unsupported interface %s\n", shdebugstr_guid(riid)); + hr = E_NOINTERFACE; } } TRACE("--(%p)->(interface=%p)\n", This, ppvOut); diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 49e7f5da322..971239a5f20 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -490,6 +490,8 @@ static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwn *ppv = tmp; return ret; } + else + FIXME("invalid/unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 938871ee066..26f8c8cbd06 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -428,8 +428,7 @@ static HRESULT WINAPI ISF_Desktop_fnCreateViewObject (IShellFolder2 * iface, } else if (IsEqualIID (riid, &IID_IContextMenu)) { - WARN ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; + hr = BackgroundMenu_Constructor((IShellFolder*)iface, TRUE, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IShellView)) { diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 22f568a592f..5b616c5242e 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -467,8 +467,7 @@ IShellFolder_fnCreateViewObject (IShellFolder2 * iface, HWND hwndOwner, if (IsEqualIID (riid, &IID_IDropTarget)) { hr = IShellFolder2_QueryInterface (iface, &IID_IDropTarget, ppvOut); } else if (IsEqualIID (riid, &IID_IContextMenu)) { - FIXME ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; + hr = BackgroundMenu_Constructor((IShellFolder*)iface, FALSE, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IShellView)) { pShellView = IShellView_Constructor ((IShellFolder *) iface); if (pShellView) { diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 6a31e8ce1e6..7f5aaeb13fc 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -438,8 +438,7 @@ static HRESULT WINAPI ISF_MyComputer_fnCreateViewObject (IShellFolder2 *iface, } else if (IsEqualIID (riid, &IID_IContextMenu)) { - WARN ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; + hr = BackgroundMenu_Constructor((IShellFolder*)iface, FALSE, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IShellView)) { diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 71b21c5e73d..e74336544f3 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -321,11 +321,6 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnCreateViewObject (IShellFolder2 * ifac WARN ("IDropTarget not implemented\n"); hr = E_NOTIMPL; } - else if (IsEqualIID (riid, &IID_IContextMenu)) - { - WARN ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; - } else if (IsEqualIID (riid, &IID_IShellView)) { pShellView = IShellView_Constructor ((IShellFolder *) iface); @@ -335,6 +330,11 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnCreateViewObject (IShellFolder2 * ifac IShellView_Release (pShellView); } } + else + { + FIXME ("invalid/unsupported interface %s\n", shdebugstr_guid (riid)); + hr = E_NOINTERFACE; + } TRACE ("-- (%p)->(interface=%p)\n", This, ppvOut); return hr; } diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 8e25e58857b..76375525c52 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -195,7 +195,10 @@ static HRESULT WINAPI IShellFolder_Printers_fnCreateViewObject(IShellFolder2 *if } } else - WARN("unsupported interface %s\n", shdebugstr_guid (riid)); + { + FIXME("unsupported interface %s\n", shdebugstr_guid (riid)); + hr = E_NOINTERFACE; + } return hr; } diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 48d5fe4ecb6..cdd3951efb0 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1117,6 +1117,8 @@ static HRESULT WINAPI ShellFolder2_CreateViewObject(IShellFolder2* iface, HWND h } } else if (IsEqualIID(&IID_IDropTarget, riid)) { hr = IShellFolder2_QueryInterface(iface, &IID_IDropTarget, ppv); + } else if (IsEqualIID(&IID_IContextMenu, riid)) { + hr = BackgroundMenu_Constructor((IShellFolder*)iface, FALSE, riid, ppv); } return hr; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index a2c15d9f40e..cb238c959cd 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4471,6 +4471,77 @@ static void test_GetUIObject(void) Cleanup(); } +static void test_CreateViewObject_contextmenu(void) +{ + IShellFolder *desktop; + IShellFolder *folder; + IContextMenu *cmenu; + WCHAR path[MAX_PATH]; + LPITEMIDLIST pidl; + HRESULT hr; + DWORD ret; + + hr = CoCreateInstance(&CLSID_ControlPanel, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = CoCreateInstance(&CLSID_MyComputer, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = CoCreateInstance(&CLSID_NetworkPlaces, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = CoCreateInstance(&CLSID_Printers, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = CoCreateInstance(&CLSID_RecycleBin, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + ret = GetCurrentDirectoryW(MAX_PATH, path); + ok(ret, "got %d\n", GetLastError()); + hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, path, NULL, &pidl, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder, (void**)&folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + ILFree(pidl); + IShellFolder_Release(desktop); +} + #define verify_pidl(i,p) r_verify_pidl(__LINE__, i, p) static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) { @@ -5313,6 +5384,7 @@ START_TEST(shlfolder) test_ShellItemArrayEnumItems(); test_desktop_IPersist(); test_GetUIObject(); + test_CreateViewObject_contextmenu(); test_SHSimpleIDListFromPath(); test_ParseDisplayNamePBC(); test_SHGetNameFromIDList();

1 0

Piotr Caban : msvcrt/tests: Link to malloc/free functions in cpp tests.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: 53ee588abb519036ed951dddba797a7298d7bd3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ee588abb519036ed951ddd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 30 20:50:47 2021 +0200 msvcrt/tests: Link to malloc/free functions in cpp tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d7cc3d6583bade120639d30cbc374692731858d2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 07b49ae755d..24e50196035 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -44,12 +44,8 @@ typedef struct __type_info #endif /* Function pointers. We need to use these to call these funcs as __thiscall */ -static HMODULE hMsvcrt; - -static void* (__cdecl *poperator_new)(unsigned int); +static void* (__cdecl *poperator_new)(size_t); static void (__cdecl *poperator_delete)(void*); -static void* (__cdecl *pmalloc)(unsigned int); -static void (__cdecl *pfree)(void*); /* exception */ static void (__thiscall *pexception_ctor)(exception*,LPCSTR*); @@ -157,23 +153,12 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ /* Some exports are only available in later versions */ -#define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(hmsvcrt,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL InitFunctionPtrs(void) { - hMsvcrt = GetModuleHandleA("msvcrt.dll"); - if (!hMsvcrt) - hMsvcrt = GetModuleHandleA("msvcrtd.dll"); - ok(hMsvcrt != 0, "GetModuleHandleA failed\n"); - if (!hMsvcrt) - { - win_skip("Could not load msvcrt.dll\n"); - return FALSE; - } - - SET(pmalloc, "malloc"); - SET(pfree, "free"); + HMODULE hmsvcrt = GetModuleHandleA("msvcrt.dll"); SET(pexception_vtable, "??_7exception@@6B@"); SET(pbad_typeid_vtable, "??_7bad_typeid@@6B@"); @@ -338,9 +323,9 @@ static BOOL InitFunctionPtrs(void) } if (!poperator_new) - poperator_new = pmalloc; + poperator_new = malloc; if (!poperator_delete) - poperator_delete = pfree; + poperator_delete = free; init_thiscall_thunk(); return TRUE; @@ -818,14 +803,14 @@ static void test_type_info(void) char* name; int res; - if (!pmalloc || !pfree || !ptype_info_dtor || !ptype_info_raw_name || + if (!ptype_info_dtor || !ptype_info_raw_name || !ptype_info_name || !ptype_info_before || !ptype_info_opequals_equals || !ptype_info_opnot_equals) return; /* Test calling the dtors */ call_func1(ptype_info_dtor, &t1); /* No effect, since name is NULL */ - t1.name = pmalloc(64); + t1.name = malloc(64); strcpy(t1.name, "foo"); call_func1(ptype_info_dtor, &t1); /* Frees t1.name using 'free' */ @@ -1112,11 +1097,11 @@ static void test_demangle_datatype(void) for (i = 0; i < num_test; i++) { - name = p__unDName(0, demangle[i].mangled, 0, pmalloc, pfree, 0x2800); + name = p__unDName(0, demangle[i].mangled, 0, malloc, free, 0x2800); todo_wine_if (!demangle[i].test_in_wine) ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); if(name) - pfree(name); + free(name); } } @@ -1331,7 +1316,7 @@ static void test_demangle(void) for (i = 0; i < num_test; i++) { - name = p__unDName(0, test[i].in, 0, pmalloc, pfree, test[i].flags); + name = p__unDName(0, test[i].in, 0, malloc, free, test[i].flags); ok(name != NULL, "%u: unDName failed\n", i); if (!name) continue; ok( !strcmp_space(test[i].out, name) || @@ -1340,7 +1325,7 @@ static void test_demangle(void) ok( !strcmp_space(test[i].out, name) || broken(test[i].broken && !strcmp_space(test[i].broken, name)), "%u: Expected \"%s\"\n", i, test[i].out ); - pfree(name); + free(name); } }

1 0

Qian Hong : atl: Implement AtlAxDialogBox().
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: 1abbaaa221ce79426c8270384bf6d6b7d026ce18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1abbaaa221ce79426c827038… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat May 1 21:47:55 2021 -0500 atl: Implement AtlAxDialogBox(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32749 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f987d8ac3b6bf2fb027196162985477c8daf27d2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/atl/atl_ax.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 69d42f55813..fe70d0a3229 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1404,22 +1404,52 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk) * AtlAxDialogBoxW [atl100.35] * */ -INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInstance, LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, - LPARAM dwInitParam) +INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE instance, const WCHAR *name, + HWND owner, DLGPROC proc, LPARAM param) { - FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_w(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); - return 0; + HRSRC resource; + HGLOBAL global; + DLGTEMPLATE *template; + INT_PTR ret; + + TRACE("instance %p, name %s, owner %p, proc %p, param %#Ix\n", + instance, debugstr_w(name), owner, proc, param); + + if (!(resource = FindResourceW(instance, name, (const WCHAR *)RT_DIALOG))) + return 0; + + if (!(global = LoadResource(instance, resource))) + return 0; + + if (!(template = AX_ConvertDialogTemplate(LockResource(global)))) + return 0; + + ret = DialogBoxIndirectParamW(instance, template, owner, proc, param); + HeapFree(GetProcessHeap(), 0, template); + return ret; } /*********************************************************************** * AtlAxDialogBoxA [atl100.36] * */ -INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, - LPARAM dwInitParam) +INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE instance, const char *name, + HWND owner, DLGPROC proc, LPARAM param) { - FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); - return 0; + WCHAR *nameW; + int len; + INT_PTR ret; + + if (IS_INTRESOURCE(name)) + return AtlAxDialogBoxW(instance, (const WCHAR *)name, owner, proc, param); + + len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); + if (!(nameW = malloc(len * sizeof(WCHAR)))) + return 0; + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, len); + ret = AtlAxDialogBoxW(instance, nameW, owner, proc, param); + free(nameW); + return ret; } /***********************************************************************

1 0

Zebediah Figura : include: Factor out winetest_printf().
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: f78df1dd43605317a56da1f277a5e215125ff97b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f78df1dd43605317a56da1f2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 25 15:09:31 2021 -0500 include: Factor out winetest_printf(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2cdf6f0f303d8fb10b7f004857613cb87d304991) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/test.h | 59 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 078b0147c4f..25a3222664b 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -295,19 +295,32 @@ const char *winetest_elapsed(void) return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); } -void winetest_subtest( const char* name ) +static void winetest_vprintf( const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); - printf( "%s:%d:%s Subtest %s\n", - data->current_file, data->current_line, winetest_elapsed(), name ); + + printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); + vprintf( msg, args ); +} + +static void __winetest_cdecl winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static void __winetest_cdecl winetest_printf( const char *msg, ... ) +{ + __winetest_va_list valist; + + __winetest_va_start( valist, msg ); + winetest_vprintf( msg, valist ); + __winetest_va_end( valist ); +} + +void winetest_subtest( const char* name ) +{ + winetest_printf( "Subtest %s\n", name ); } void winetest_ignore_exceptions( BOOL ignore ) { - struct tls_data *data = get_tls_data(); - printf( "%s:%d:%s IgnoreExceptions=%d\n", - data->current_file, data->current_line, winetest_elapsed(), - ignore ? 1 : 0 ); + winetest_printf( "IgnoreExceptions=%d\n", ignore ? 1 : 0 ); } int broken( int condition ) @@ -327,9 +340,7 @@ static LONG winetest_add_line( void ) index = data->current_line % ARRAY_SIZE(line_counters); count = InterlockedIncrement(line_counters + index) - 1; if (count == winetest_mute_threshold) - printf( "%s:%d:%s Line has been silenced after %d occurrences\n", - data->current_file, data->current_line, winetest_elapsed(), - winetest_mute_threshold ); + winetest_printf( "Line has been silenced after %d occurrences\n", winetest_mute_threshold ); return count; } @@ -352,8 +363,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (condition) { - printf( "%s:%d:%s Test succeeded inside todo block: ", - data->current_file, data->current_line, winetest_elapsed() ); + winetest_printf( "Test succeeded inside todo block: " ); vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; @@ -365,8 +375,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - printf( "%s:%d:%s Test marked todo: ", - data->current_file, data->current_line, winetest_elapsed() ); + winetest_printf( "Test marked todo: " ); vprintf(msg, args); } InterlockedIncrement(&todo_successes); @@ -380,8 +389,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { - printf( "%s:%d:%s Test failed: ", - data->current_file, data->current_line, winetest_elapsed() ); + winetest_printf( "Test failed: " ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; @@ -391,8 +399,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) if (winetest_report_success || (winetest_time && GetTickCount() >= winetest_last_time + 1000)) { - printf( "%s:%d:%s Test succeeded\n", - data->current_file, data->current_line, winetest_elapsed() ); + winetest_printf( "Test succeeded\n" ); } InterlockedIncrement(&successes); return 1; @@ -417,10 +424,8 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) return; if (winetest_add_line() < winetest_mute_threshold) { - struct tls_data *data = get_tls_data(); - printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); __winetest_va_start(valist, msg); - vprintf(msg, valist); + winetest_vprintf( msg, valist ); __winetest_va_end(valist); } else @@ -431,8 +436,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { - struct tls_data *data = get_tls_data(); - printf( "%s:%d:%s Tests skipped: ", data->current_file, data->current_line, winetest_elapsed() ); + winetest_printf( "Tests skipped: " ); vprintf(msg, args); InterlockedIncrement(&skipped); } @@ -513,21 +517,16 @@ void winetest_wait_child_process( HANDLE process ) else { DWORD exit_code; - struct tls_data *data = get_tls_data(); GetExitCodeProcess( process, &exit_code ); if (exit_code > 255) { DWORD pid = GetProcessId( process ); - printf( "%s:%d:%s unhandled exception %08x in child process %04x\n", - data->current_file, data->current_line, winetest_elapsed(), - exit_code, pid ); + winetest_printf( "unhandled exception %08x in child process %04x\n", exit_code, pid ); InterlockedIncrement( &failures ); } else if (exit_code) { - printf( "%s:%d:%s %u failures in child process\n", - data->current_file, data->current_line, winetest_elapsed(), - exit_code ); + winetest_printf( "%u failures in child process\n", exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); }

1 0

Francois Gouget : tests: Trace the filename in winetest_wait_child_process().
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: 0aabd08c53807008e47649d04bf43100d1b9d7e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aabd08c53807008e47649d0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 12 17:11:49 2021 +0100 tests: Trace the filename in winetest_wait_child_process(). We want the filename next to the line number, just like in every other trace. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 092130e2aa53bce72c2a38cb90906c6c01c4867d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 787fea0ba24..c10050012b6 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -507,14 +507,14 @@ void winetest_wait_child_process( HANDLE process ) { DWORD pid = GetProcessId( process ); printf( "%s:%d:%s unhandled exception %08x in child process %04x\n", - current_test->name, data->current_line, winetest_elapsed(), + data->current_file, data->current_line, winetest_elapsed(), exit_code, pid ); InterlockedIncrement( &failures ); } else if (exit_code) { printf( "%s:%d:%s %u failures in child process\n", - current_test->name, data->current_line, winetest_elapsed(), + data->current_file, data->current_line, winetest_elapsed(), exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures);

1 0

Francois Gouget : tests: Add ignore_exceptions().
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: 598a21be9cabd215d0d595b0ca768b795e321f8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=598a21be9cabd215d0d595b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 12 17:14:29 2021 +0100 tests: Add ignore_exceptions(). This lets tests signal that for a while exceptions are expected and should not be counted as test failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4ac37c4e24cf980717a982c22076cc4a5adffdd5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/test.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index c10050012b6..078b0147c4f 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -61,6 +61,7 @@ extern const char *winetest_platform; extern void winetest_set_location( const char* file, int line ); extern void winetest_subtest( const char* name ); +extern void winetest_ignore_exceptions( BOOL ignore ); extern void winetest_start_todo( int is_todo ); extern int winetest_loop_todo(void); extern void winetest_end_todo(void); @@ -97,6 +98,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT #ifdef WINETEST_NO_LINE_NUMBERS # define subtest_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ignore_exceptions # define ok_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip @@ -104,6 +106,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT # define wait_child_process_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_wait_child_process #else # define subtest_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ignore_exceptions # define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip @@ -112,6 +115,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT #endif #define subtest subtest_(__FILE__, __LINE__) +#define ignore_exceptions ignore_exceptions_(__FILE__, __LINE__) #define ok ok_(__FILE__, __LINE__) #define skip skip_(__FILE__, __LINE__) #define win_skip win_skip_(__FILE__, __LINE__) @@ -298,6 +302,14 @@ void winetest_subtest( const char* name ) data->current_file, data->current_line, winetest_elapsed(), name ); } +void winetest_ignore_exceptions( BOOL ignore ) +{ + struct tls_data *data = get_tls_data(); + printf( "%s:%d:%s IgnoreExceptions=%d\n", + data->current_file, data->current_line, winetest_elapsed(), + ignore ? 1 : 0 ); +} + int broken( int condition ) { return (strcmp(winetest_platform, "windows") == 0) && condition;

1 0

Damjan Jovanovic : shell32/tests: Fix test failures from ad412b11a7ea17b708994ed6609f8ed0cbfb169b.
by Alexandre Julliard Oct. 26, 2021

Oct. 26, 2021

Module: wine Branch: stable Commit: 94254f4a14a1619a2ec9105faa6a7830834826d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94254f4a14a1619a2ec9105f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 4 21:31:06 2021 +0200 shell32/tests: Fix test failures from ad412b11a7ea17b708994ed6609f8ed0cbfb169b. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a3295e383116f1644cad88519c05e6c2ac7f3200) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 66 +++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index cb238c959cd..5d8b0ccc2b7 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4480,46 +4480,38 @@ static void test_CreateViewObject_contextmenu(void) LPITEMIDLIST pidl; HRESULT hr; DWORD ret; + int i; - hr = CoCreateInstance(&CLSID_ControlPanel, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); - - hr = CoCreateInstance(&CLSID_MyComputer, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); - - hr = CoCreateInstance(&CLSID_NetworkPlaces, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); + static const CLSID *folders[] = + { + &CLSID_MyComputer, + &CLSID_MyDocuments, + &CLSID_ControlPanel, + &CLSID_NetworkPlaces, + &CLSID_Printers, + &CLSID_RecycleBin + }; - hr = CoCreateInstance(&CLSID_Printers, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); + for (i = 0; i < ARRAY_SIZE(folders); i++) + { + hr = CoCreateInstance(folders[i], NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + if (hr != S_OK) + { + win_skip("Failed to create folder %s, hr %#x.\n", wine_dbgstr_guid(folders[i]), hr); + continue; + } - hr = CoCreateInstance(&CLSID_RecycleBin, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); - ok(SUCCEEDED(hr), "got 0x%08x\n", hr); - hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - if (SUCCEEDED(hr)) - IContextMenu_Release(cmenu); - IShellFolder_Release(folder); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + if (IsEqualIID(folders[i], &CLSID_MyDocuments)) + ok(hr == S_OK, "got 0x%08x\n", hr); + else if (IsEqualIID(folders[i], &CLSID_MyComputer)) + ok(hr == S_OK || broken(hr == E_NOINTERFACE /* win10 */), "got 0x%08x\n", hr); + else + ok(hr == E_NOINTERFACE || broken(FAILED(hr)), "got 0x%08x for %s\n", hr, wine_dbgstr_guid(folders[i])); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + } hr = SHGetDesktopFolder(&desktop); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0