November 2018 - Wine-Devel - list.winehq.org

[PATCH v4 1/3] setupapi/tests: Remove workarounds in testSetupDiGetINFClassA().
by Zebediah Figura Nov. 25, 2018

Nov. 25, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 55 ++++++++++--------------------------------- 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c58e35f482..b24480ce1a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -37,7 +37,6 @@ static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); -static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); /* This is a unique guid for testing purposes */ @@ -52,7 +51,6 @@ static void init_function_pointers(void) pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); - pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); } static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) @@ -1157,7 +1155,7 @@ todo_wine } } -static void testSetupDiGetINFClassA(void) +static void test_get_inf_class(void) { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; @@ -1171,19 +1169,7 @@ static void testSetupDiGetINFClassA(void) HANDLE h; int i; - if(!pSetupDiGetINFClassA) - { - win_skip("SetupDiGetINFClassA not present\n"); - return; - } - - count = GetTempPathA(MAX_PATH, filename); - if(!count) - { - win_skip("GetTempPathA failed\n"); - return; - } - + GetTempPathA(MAX_PATH, filename); strcat(filename, inffile); DeleteFileA(filename); @@ -1191,11 +1177,6 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) - { - skip("SetupDiGetINFClassA is not implemented\n"); - return; - } ok(ERROR_FILE_NOT_FOUND == GetLastError(), "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); @@ -1227,12 +1208,8 @@ static void testSetupDiGetINFClassA(void) /* test file content */ h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1242,13 +1219,9 @@ static void testSetupDiGetINFClassA(void) trace("testing signature %s\n", signatures[i]); h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + WriteFile(h, content, sizeof(content), &count, NULL); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1300,10 +1273,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_INVALID_PARAMETER /* 2k3+ */, + "Got unexpected error %#x.\n", GetLastError()); DeleteFileA(filename); @@ -1313,10 +1284,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == RPC_S_INVALID_STRING_UUID || GetLastError() == ERROR_INVALID_PARAMETER /* 7+ */, + "Got unexpected error %#x.\n", GetLastError()); /* network adapter guid */ WritePrivateProfileStringA("Version", "ClassGUID", @@ -1440,7 +1409,7 @@ START_TEST(devinst) test_register_device_iface(); test_registry_property_a(); test_registry_property_w(); - testSetupDiGetINFClassA(); + test_get_inf_class(); test_devnode(); test_device_interface_key(); } -- 2.14.1

1 2

[PATCH 3/3] comsvcs: Add initial tests
by Alistair Leslie-Hughes Nov. 25, 2018

Nov. 25, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 1 + configure.ac | 1 + dlls/comsvcs/tests/Makefile.in | 5 + dlls/comsvcs/tests/dispenser.c | 250 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 257 insertions(+) create mode 100644 dlls/comsvcs/tests/Makefile.in create mode 100644 dlls/comsvcs/tests/dispenser.c diff --git a/configure b/configure index 3c235e3..7384978 100755 --- a/configure +++ b/configure @@ -19255,6 +19255,7 @@ wine_fn_config_makefile dlls/commdlg.dll16 enable_win16 wine_fn_config_makefile dlls/compobj.dll16 enable_win16 wine_fn_config_makefile dlls/compstui enable_compstui wine_fn_config_makefile dlls/comsvcs enable_comsvcs +wine_fn_config_makefile dlls/comsvcs/tests enable_tests wine_fn_config_makefile dlls/concrt140 enable_concrt140 wine_fn_config_makefile dlls/connect enable_connect wine_fn_config_makefile dlls/credui enable_credui diff --git a/configure.ac b/configure.ac index 294fe4b..a6b7916 100644 --- a/configure.ac +++ b/configure.ac @@ -3110,6 +3110,7 @@ WINE_CONFIG_MAKEFILE(dlls/commdlg.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compobj.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compstui) WINE_CONFIG_MAKEFILE(dlls/comsvcs) +WINE_CONFIG_MAKEFILE(dlls/comsvcs/tests) WINE_CONFIG_MAKEFILE(dlls/concrt140) WINE_CONFIG_MAKEFILE(dlls/connect) WINE_CONFIG_MAKEFILE(dlls/credui) diff --git a/dlls/comsvcs/tests/Makefile.in b/dlls/comsvcs/tests/Makefile.in new file mode 100644 index 0000000..c89c193 --- /dev/null +++ b/dlls/comsvcs/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = comsvcs.dll +IMPORTS = ole32 uuid oleaut32 + +C_SRCS = \ + dispenser.c diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c new file mode 100644 index 0000000..86a947e --- /dev/null +++ b/dlls/comsvcs/tests/dispenser.c @@ -0,0 +1,250 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "comsvcs.h" + +#include "wine/test.h" + +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + trace(#func "\n"); \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +DEFINE_EXPECT(driver_CreateResource); +DEFINE_EXPECT(driver_DestroyResource); +DEFINE_EXPECT(driver_ResetResource); +DEFINE_EXPECT(driver_Release); + +HRESULT driver_DestroyResource_ret = S_OK; + +static HRESULT WINAPI driver_QueryInterface(IDispenserDriver *iface, REFIID riid, void **object) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispenserDriver)) + { + *object = iface; + + return S_OK; + } + + ok(0, "Unknown iterface %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI driver_AddRef(IDispenserDriver *iface) +{ + trace("AddRef\n"); + return 2; +} + +static ULONG WINAPI driver_Release(IDispenserDriver *iface) +{ + CHECK_EXPECT2(driver_Release); + return 1; +} + +static HRESULT WINAPI driver_CreateResource(IDispenserDriver *iface, const RESTYPID restypid, RESID *resid, TIMEINSECS *destroy) +{ + CHECK_EXPECT2(driver_CreateResource); + + *resid = 10; + return S_OK; +} + +static HRESULT WINAPI driver_RateResource(IDispenserDriver *iface, const RESTYPID restypid, const RESID resid, + const BOOL requires, RESOURCERATING *rating) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI driver_EnlistResource(IDispenserDriver *iface, const RESID resid, const TRANSID transid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI driver_ResetResource(IDispenserDriver *iface, const RESID resid) +{ + CHECK_EXPECT2(driver_ResetResource); + ok((int)resid == 10, "RESID %d\n", (int)resid); + return S_OK; +} + +static HRESULT WINAPI driver_DestroyResource(IDispenserDriver *iface, const RESID resid) +{ + todo_wine CHECK_EXPECT2(driver_DestroyResource); + return driver_DestroyResource_ret; +} + +static HRESULT WINAPI driver_DestroyResourceS(IDispenserDriver *iface, const SRESID resid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + + +static const struct IDispenserDriverVtbl driver_vtbl = +{ + driver_QueryInterface, + driver_AddRef, + driver_Release, + driver_CreateResource, + driver_RateResource, + driver_EnlistResource, + driver_ResetResource, + driver_DestroyResource, + driver_DestroyResourceS +}; + +static IDispenserDriver DispenserDriver = { &driver_vtbl }; + +static void create_dispenser(void) +{ + static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0}; + static const WCHAR pool1[] = {'S','C','.','P','o','o','l',' ','1',' ','1',0}; + static const WCHAR data[] = {'d','a','t','a','1',0}; + HRESULT hr; + IDispenserManager *dispenser = NULL; + IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL; + RESID resid; + BSTR str; + + hr = CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)&dispenser); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("DispenserManager not available\n"); + return; + } + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(holder1 != holder2, "same holder object returned\n"); + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool1, &holder3); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if(holder1) + { + SET_EXPECT(driver_CreateResource); + SET_EXPECT(driver_Release); + + str = SysAllocString(data); + hr = IHolder_AllocResource(holder1, (RESTYPID)str, &resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resid == 10, "got %d\n", (int)resid); + SysFreeString(str); + + CHECK_CALLED(driver_CreateResource); + todo_wine CHECK_CALLED(driver_Release); + + SET_EXPECT(driver_ResetResource); + hr = IHolder_FreeResource(holder1, resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(driver_ResetResource); + + SET_EXPECT(driver_DestroyResource); + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder1); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + CHECK_CALLED(driver_DestroyResource); + + IHolder_Release(holder1); + } + if(holder2) + { + SET_EXPECT(driver_CreateResource); + SET_EXPECT(driver_Release); + + str = SysAllocString(data); + hr = IHolder_AllocResource(holder2, (RESTYPID)str, &resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resid == 10, "got %d\n", (int)resid); + SysFreeString(str); + + CHECK_CALLED(driver_CreateResource); + todo_wine CHECK_CALLED(driver_Release); + + SET_EXPECT(driver_ResetResource); + hr = IHolder_FreeResource(holder2, resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(driver_ResetResource); + + /* DestroyResource return doesn't directly affect the Holder Close return value */ + driver_DestroyResource_ret = E_FAIL; + SET_EXPECT(driver_DestroyResource); + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + CHECK_CALLED(driver_DestroyResource); + driver_DestroyResource_ret = S_OK; + IHolder_Release(holder2); + } + if(holder3) + { + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder3); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + IHolder_Release(holder3); + } + + IDispenserManager_Release(dispenser); +} + + +START_TEST(dispenser) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok( hr == S_OK, "failed to init com\n"); + if (hr != S_OK) + return; + + create_dispenser(); + + CoUninitialize(); +} -- 1.9.1

2 1

[PATCH 2/3] comsvcs: Implement IHolder Alloc/Free Resource
by Alistair Leslie-Hughes Nov. 25, 2018

Nov. 25, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comsvcs/main.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 21bdd67..d7831cf 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -107,19 +107,29 @@ static ULONG WINAPI holder_Release(IHolder *iface) static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid, RESID *resid) { holder *This = impl_from_IHolder(iface); + HRESULT hr; + TIMEINSECS secs; - FIXME("(%p)->(%08lx, %p) stub\n", This, typeid, resid); + TRACE("(%p)->(%08lx, %p) stub\n", This, typeid, resid); - return E_NOTIMPL; + hr = IDispenserDriver_CreateResource(This->driver, typeid, resid, &secs); + + TRACE("<- 0x%08x\n", hr); + return hr; } static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid) { holder *This = impl_from_IHolder(iface); + HRESULT hr; - FIXME("(%p)->(%08lx) stub\n", This, resid); + TRACE("(%p)->(%08lx) stub\n", This, resid); - return E_NOTIMPL; + hr = IDispenserDriver_DestroyResource(This->driver, resid); + + TRACE("<- 0x%08x\n", hr); + + return hr; } static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid) -- 1.9.1

1 0

[PATCH 1/3] comsvcs: Implement IDispenserManager RegisterDispenser
by Alistair Leslie-Hughes Nov. 25, 2018

Nov. 25, 2018

The Document states the caller of RegisterDispenser is responsible for calling AddRef on the driver and that Release will called on Holder_Close. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comsvcs/main.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 179 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 6b7ec14..21bdd67 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -43,11 +43,180 @@ typedef struct dispensermanager } dispensermanager; +typedef struct holder +{ + IHolder IHolder_iface; + LONG ref; + + IDispenserDriver *driver; +} holder; + static inline dispensermanager *impl_from_IDispenserManager(IDispenserManager *iface) { return CONTAINING_RECORD(iface, dispensermanager, IDispenserManager_iface); } +static inline holder *impl_from_IHolder(IHolder *iface) +{ + return CONTAINING_RECORD(iface, holder, IHolder_iface); +} + +static HRESULT WINAPI holder_QueryInterface(IHolder *iface, REFIID riid, void **object) +{ + holder *This = impl_from_IHolder(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), object); + + *object = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IHolder)) + { + *object = &This->IHolder_iface; + IUnknown_AddRef( (IUnknown*)*object); + + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),object); + return E_NOINTERFACE; +} + +static ULONG WINAPI holder_AddRef(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI holder_Release(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid, RESID *resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx, %p) stub\n", This, typeid, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_TrackResourceS(IHolder *iface, const SRESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(resid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_UntrackResource(IHolder *iface, const RESID resid, const BOOL value) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx, %d) stub\n", This, resid, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_UntrackResourceS(IHolder *iface, const SRESID resid, const BOOL value) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%s, %d) stub\n", This, debugstr_w(resid), value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_Close(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p) stub\n", This); + + IDispenserDriver_Release(This->driver); + + return S_OK; +} + +static HRESULT WINAPI holder_RequestDestroyResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +struct IHolderVtbl holder_vtbl = +{ + holder_QueryInterface, + holder_AddRef, + holder_Release, + holder_AllocResource, + holder_FreeResource, + holder_TrackResource, + holder_TrackResourceS, + holder_UntrackResource, + holder_UntrackResourceS, + holder_Close, + holder_RequestDestroyResource +}; + +static HRESULT create_holder(IDispenserDriver *driver, IHolder **object) +{ + holder *hold; + HRESULT ret; + + TRACE("(%p)\n", object); + + hold = heap_alloc(sizeof(*hold)); + if (!hold) + { + *object = NULL; + return E_OUTOFMEMORY; + } + + hold->IHolder_iface.lpVtbl = &holder_vtbl; + hold->ref = 1; + hold->driver = driver; + + ret = holder_QueryInterface(&hold->IHolder_iface, &IID_IHolder, (void**)object); + holder_Release(&hold->IHolder_iface); + + return ret; +} + static HRESULT WINAPI dismanager_QueryInterface(IDispenserManager *iface, REFIID riid, void **object) { dispensermanager *This = impl_from_IDispenserManager(iface); @@ -95,10 +264,18 @@ static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDi LPCOLESTR name, IHolder **dispenser) { dispensermanager *This = impl_from_IDispenserManager(iface); + HRESULT hr; - FIXME("(%p)->(%p, %s, %p) stub\n", This, driver, debugstr_w(name), dispenser); + TRACE("(%p)->(%p, %s, %p)\n", This, driver, debugstr_w(name), dispenser); - return E_NOTIMPL; + if(!dispenser) + return E_INVALIDARG; + + hr = create_holder(driver, dispenser); + + TRACE("<-- 0x%08x, %p\n", hr, *dispenser); + + return hr; } static HRESULT WINAPI dismanager_GetContext(IDispenserManager *iface, INSTID *id, TRANSID *transid) -- 1.9.1

1 0

[PATCH v3 1/3] setupapi/tests: Remove workarounds in testSetupDiGetINFClassA().
by Zebediah Figura Nov. 25, 2018

Nov. 25, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 55 ++++++++++--------------------------------- 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c58e35f482..b24480ce1a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -37,7 +37,6 @@ static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); -static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); /* This is a unique guid for testing purposes */ @@ -52,7 +51,6 @@ static void init_function_pointers(void) pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); - pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); } static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) @@ -1157,7 +1155,7 @@ todo_wine } } -static void testSetupDiGetINFClassA(void) +static void test_get_inf_class(void) { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; @@ -1171,19 +1169,7 @@ static void testSetupDiGetINFClassA(void) HANDLE h; int i; - if(!pSetupDiGetINFClassA) - { - win_skip("SetupDiGetINFClassA not present\n"); - return; - } - - count = GetTempPathA(MAX_PATH, filename); - if(!count) - { - win_skip("GetTempPathA failed\n"); - return; - } - + GetTempPathA(MAX_PATH, filename); strcat(filename, inffile); DeleteFileA(filename); @@ -1191,11 +1177,6 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) - { - skip("SetupDiGetINFClassA is not implemented\n"); - return; - } ok(ERROR_FILE_NOT_FOUND == GetLastError(), "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); @@ -1227,12 +1208,8 @@ static void testSetupDiGetINFClassA(void) /* test file content */ h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1242,13 +1219,9 @@ static void testSetupDiGetINFClassA(void) trace("testing signature %s\n", signatures[i]); h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + WriteFile(h, content, sizeof(content), &count, NULL); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1300,10 +1273,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_INVALID_PARAMETER /* 2k3+ */, + "Got unexpected error %#x.\n", GetLastError()); DeleteFileA(filename); @@ -1313,10 +1284,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == RPC_S_INVALID_STRING_UUID || GetLastError() == ERROR_INVALID_PARAMETER /* 7+ */, + "Got unexpected error %#x.\n", GetLastError()); /* network adapter guid */ WritePrivateProfileStringA("Version", "ClassGUID", @@ -1440,7 +1409,7 @@ START_TEST(devinst) test_register_device_iface(); test_registry_property_a(); test_registry_property_w(); - testSetupDiGetINFClassA(); + test_get_inf_class(); test_devnode(); test_device_interface_key(); } -- 2.14.1

2 4

[PATCH v2 1/3] setupapi/tests: Remove workarounds in testSetupDiGetINFClassA().
by Zebediah Figura Nov. 25, 2018

Nov. 25, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 55 ++++++++++--------------------------------- 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c58e35f482..b24480ce1a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -37,7 +37,6 @@ static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); -static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); /* This is a unique guid for testing purposes */ @@ -52,7 +51,6 @@ static void init_function_pointers(void) pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); - pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); } static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) @@ -1157,7 +1155,7 @@ todo_wine } } -static void testSetupDiGetINFClassA(void) +static void test_get_inf_class(void) { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; @@ -1171,19 +1169,7 @@ static void testSetupDiGetINFClassA(void) HANDLE h; int i; - if(!pSetupDiGetINFClassA) - { - win_skip("SetupDiGetINFClassA not present\n"); - return; - } - - count = GetTempPathA(MAX_PATH, filename); - if(!count) - { - win_skip("GetTempPathA failed\n"); - return; - } - + GetTempPathA(MAX_PATH, filename); strcat(filename, inffile); DeleteFileA(filename); @@ -1191,11 +1177,6 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) - { - skip("SetupDiGetINFClassA is not implemented\n"); - return; - } ok(ERROR_FILE_NOT_FOUND == GetLastError(), "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); @@ -1227,12 +1208,8 @@ static void testSetupDiGetINFClassA(void) /* test file content */ h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1242,13 +1219,9 @@ static void testSetupDiGetINFClassA(void) trace("testing signature %s\n", signatures[i]); h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + WriteFile(h, content, sizeof(content), &count, NULL); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1300,10 +1273,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_INVALID_PARAMETER /* 2k3+ */, + "Got unexpected error %#x.\n", GetLastError()); DeleteFileA(filename); @@ -1313,10 +1284,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == RPC_S_INVALID_STRING_UUID || GetLastError() == ERROR_INVALID_PARAMETER /* 7+ */, + "Got unexpected error %#x.\n", GetLastError()); /* network adapter guid */ WritePrivateProfileStringA("Version", "ClassGUID", @@ -1440,7 +1409,7 @@ START_TEST(devinst) test_register_device_iface(); test_registry_property_a(); test_registry_property_w(); - testSetupDiGetINFClassA(); + test_get_inf_class(); test_devnode(); test_device_interface_key(); } -- 2.14.1

2 4

[PATCH 1/4] dbghelp: Avoid using inline assembly in do_x86cpuid().
by Zebediah Figura Nov. 25, 2018

Nov. 25, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dbghelp/minidump.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 975bb45c9a..6829a700ac 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -542,20 +542,27 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) return sz; } -/* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p - * We are compiled with -fPIC, so we can't clobber ebx. - */ -static inline void do_x86cpuid(unsigned int ax, unsigned int *p) +extern void do_x86cpuid(unsigned int ax, unsigned int *p); + +#ifdef __i386__ +__ASM_GLOBAL_FUNC( do_x86cpuid, + "pushl %edi\n\t" + "pushl %ebx\n\t" + "movl 4(%esp),%eax\n\t" + "movl 8(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %edi\n\t" + "ret" ); +#else +void do_x86cpuid(unsigned int ax, unsigned int *p) { -#if defined(__GNUC__) && defined(__i386__) - __asm__("pushl %%ebx\n\t" - "cpuid\n\t" - "movl %%ebx, %%esi\n\t" - "popl %%ebx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -#endif } +#endif /* From xf86info havecpuid.c 1.11 */ static inline int have_x86cpuid(void) -- 2.14.1

3 9

[PATCH 1/3] setupapi/tests: Remove workarounds in testSetupDiGetINFClassA().
by Zebediah Figura Nov. 25, 2018

Nov. 25, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 55 ++++++++++--------------------------------- 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c58e35f482..b24480ce1a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -37,7 +37,6 @@ static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); -static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); /* This is a unique guid for testing purposes */ @@ -52,7 +51,6 @@ static void init_function_pointers(void) pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); - pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); } static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) @@ -1157,7 +1155,7 @@ todo_wine } } -static void testSetupDiGetINFClassA(void) +static void test_get_inf_class(void) { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; @@ -1171,19 +1169,7 @@ static void testSetupDiGetINFClassA(void) HANDLE h; int i; - if(!pSetupDiGetINFClassA) - { - win_skip("SetupDiGetINFClassA not present\n"); - return; - } - - count = GetTempPathA(MAX_PATH, filename); - if(!count) - { - win_skip("GetTempPathA failed\n"); - return; - } - + GetTempPathA(MAX_PATH, filename); strcat(filename, inffile); DeleteFileA(filename); @@ -1191,11 +1177,6 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) - { - skip("SetupDiGetINFClassA is not implemented\n"); - return; - } ok(ERROR_FILE_NOT_FOUND == GetLastError(), "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); @@ -1227,12 +1208,8 @@ static void testSetupDiGetINFClassA(void) /* test file content */ h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1242,13 +1219,9 @@ static void testSetupDiGetINFClassA(void) trace("testing signature %s\n", signatures[i]); h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + WriteFile(h, content, sizeof(content), &count, NULL); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1300,10 +1273,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_INVALID_PARAMETER /* 2k3+ */, + "Got unexpected error %#x.\n", GetLastError()); DeleteFileA(filename); @@ -1313,10 +1284,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == RPC_S_INVALID_STRING_UUID || GetLastError() == ERROR_INVALID_PARAMETER /* 7+ */, + "Got unexpected error %#x.\n", GetLastError()); /* network adapter guid */ WritePrivateProfileStringA("Version", "ClassGUID", @@ -1440,7 +1409,7 @@ START_TEST(devinst) test_register_device_iface(); test_registry_property_a(); test_registry_property_w(); - testSetupDiGetINFClassA(); + test_get_inf_class(); test_devnode(); test_device_interface_key(); } -- 2.14.1

2 4

[PATCH 5/5] kernelbase: Implement PathCchAppend.
by Zhiyi Zhang Nov. 25, 2018

Nov. 25, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 7 +++ dlls/kernelbase/tests/path.c | 50 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 796b57f457..4f375e0c30 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -3,7 +3,7 @@ @ stdcall PathCchAddBackslash(wstr long) kernelbase.PathCchAddBackslash @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) kernelbase.PathCchAddBackslashEx @ stdcall PathCchAddExtension(wstr long wstr) kernelbase.PathCchAddExtension -@ stub PathCchAppend +@ stdcall PathCchAppend(wstr long wstr) kernelbase.PathCchAppend @ stdcall PathCchAppendEx(wstr long wstr long) kernelbase.PathCchAppendEx @ stdcall PathCchCanonicalize(ptr long wstr) kernelbase.PathCchCanonicalize @ stdcall PathCchCanonicalizeEx(ptr long wstr long) kernelbase.PathCchCanonicalizeEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 04023e31b6..d1bff9fec5 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1032,7 +1032,7 @@ @ stdcall PathCchAddBackslash(wstr long) @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) @ stdcall PathCchAddExtension(wstr long wstr) -# @ stub PathCchAppend +@ stdcall PathCchAppend(wstr long wstr) @ stdcall PathCchAppendEx(wstr long wstr long) @ stdcall PathCchCanonicalize(ptr long wstr) @ stdcall PathCchCanonicalizeEx(ptr long wstr long) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index c5817e26fd..bcd129cce9 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -446,6 +446,13 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens return S_OK; } +HRESULT WINAPI PathCchAppend(WCHAR *path1, SIZE_T size, const WCHAR *path2) +{ + TRACE("%s %lu %s\n", wine_dbgstr_w(path1), size, wine_dbgstr_w(path2)); + + return PathCchAppendEx(path1, size, path2, PATHCCH_NONE); +} + HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags) { HRESULT hr; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 0b9b8683da..7b24f00178 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -35,6 +35,7 @@ HRESULT (WINAPI *pPathAllocCombine)(const WCHAR *path1, const WCHAR *path2, DWOR HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT (WINAPI *pPathCchAppend)(WCHAR *path1, SIZE_T size, const WCHAR *path2); HRESULT (WINAPI *pPathCchAppendEx)(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags); HRESULT (WINAPI *pPathCchCanonicalize)(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT (WINAPI *pPathCchCanonicalizeEx)(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); @@ -855,6 +856,53 @@ static const struct append_test append_tests[] = {"a", "b", "a\\b"} }; +static void test_PathCchAppend(void) +{ + WCHAR path1W[PATHCCH_MAX_CCH]; + WCHAR path2W[PATHCCH_MAX_CCH]; + CHAR path1A[PATHCCH_MAX_CCH]; + HRESULT hr; + INT i; + + if (!pPathCchAppend) + { + win_skip("PathCchAppend() is not available.\n"); + return; + } + + MultiByteToWideChar(CP_ACP, 0, "\\a", -1, path1W, ARRAY_SIZE(path1W)); + MultiByteToWideChar(CP_ACP, 0, "\\b", -1, path2W, ARRAY_SIZE(path2W)); + hr = pPathCchAppend(NULL, PATHCCH_MAX_CCH, path2W); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAppend(path1W, 0, path2W); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAppend(path1W, PATHCCH_MAX_CCH + 1, path2W); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAppend(path1W, PATHCCH_MAX_CCH, NULL); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + WideCharToMultiByte(CP_ACP, 0, path1W, -1, path1A, ARRAY_SIZE(path1A), NULL, NULL); + ok(!lstrcmpA(path1A, "\\a"), "expect \\a, got %s\n", path1A); + + for (i = 0; i < ARRAY_SIZE(append_tests); i++) + { + const struct append_test *t = append_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path1, -1, path1W, ARRAY_SIZE(path1W)); + MultiByteToWideChar(CP_ACP, 0, t->path2, -1, path2W, ARRAY_SIZE(path2W)); + hr = pPathCchAppend(path1W, PATHCCH_MAX_CCH, path2W); + ok(hr == S_OK, "append \"%s\" \"%s\" expect hr %#x, got %#x\n", t->path1, t->path2, S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path1W, -1, path1A, ARRAY_SIZE(path1A), NULL, NULL); + ok(!lstrcmpA(path1A, t->result), "append \"%s\" \"%s\" expect result \"%s\", got \"%s\"\n", t->path1, + t->path2, t->result, path1A); + } + } +} + static void test_PathCchAppendEx(void) { WCHAR path1W[PATHCCH_MAX_CCH]; @@ -2230,6 +2278,7 @@ START_TEST(path) pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); + pPathCchAppend = (void *)GetProcAddress(hmod, "PathCchAppend"); pPathCchAppendEx = (void *)GetProcAddress(hmod, "PathCchAppendEx"); pPathCchCanonicalize = (void *)GetProcAddress(hmod, "PathCchCanonicalize"); pPathCchCanonicalizeEx = (void *)GetProcAddress(hmod, "PathCchCanonicalizeEx"); @@ -2252,6 +2301,7 @@ START_TEST(path) test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); test_PathCchAddExtension(); + test_PathCchAppend(); test_PathCchAppendEx(); test_PathCchCanonicalize(); test_PathCchCanonicalizeEx(); diff --git a/include/pathcch.h b/include/pathcch.h index 18f065c4c6..0c2dc63c41 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -31,6 +31,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT WINAPI PathCchAppend(WCHAR *path1, SIZE_T size, const WCHAR *path2); HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags); HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); -- 2.19.1

1 0

[PATCH 4/5] kernelbase: Implement PathCchAppendEx.
by Zhiyi Zhang Nov. 25, 2018

Nov. 25, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 25 ++++ dlls/kernelbase/tests/path.c | 123 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 151 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index a722f24443..796b57f457 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -4,7 +4,7 @@ @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) kernelbase.PathCchAddBackslashEx @ stdcall PathCchAddExtension(wstr long wstr) kernelbase.PathCchAddExtension @ stub PathCchAppend -@ stub PathCchAppendEx +@ stdcall PathCchAppendEx(wstr long wstr long) kernelbase.PathCchAppendEx @ stdcall PathCchCanonicalize(ptr long wstr) kernelbase.PathCchCanonicalize @ stdcall PathCchCanonicalizeEx(ptr long wstr long) kernelbase.PathCchCanonicalizeEx @ stdcall PathCchCombine(ptr long wstr wstr) kernelbase.PathCchCombine diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index bad32e8db4..04023e31b6 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1033,7 +1033,7 @@ @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) @ stdcall PathCchAddExtension(wstr long wstr) # @ stub PathCchAppend -# @ stub PathCchAppendEx +@ stdcall PathCchAppendEx(wstr long wstr long) @ stdcall PathCchCanonicalize(ptr long wstr) @ stdcall PathCchCanonicalizeEx(ptr long wstr long) @ stdcall PathCchCombine(ptr long wstr wstr) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index a9186a1156..c5817e26fd 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -446,6 +446,31 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens return S_OK; } +HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags) +{ + HRESULT hr; + WCHAR *result; + + TRACE("%s %lu %s %#x\n", wine_dbgstr_w(path1), size, wine_dbgstr_w(path2), flags); + + if (!path1 || !size) return E_INVALIDARG; + + /* Create a temporary buffer for result because we need to keep path1 unchanged if error occurs. + * And PathCchCombineEx writes empty result if there is error so we can't just use path1 as output + * buffer for PathCchCombineEx */ + result = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!result) return E_OUTOFMEMORY; + + /* Avoid the single backslash behavior with PathCchCombineEx when appending */ + if (path2 && path2[0] == '\\' && path2[1] != '\\') path2++; + + hr = PathCchCombineEx(result, size, path1, path2, flags); + if (SUCCEEDED(hr)) memcpy(path1, result, size * sizeof(WCHAR)); + + HeapFree(GetProcessHeap(), 0, result); + return hr; +} + HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in) { TRACE("%p %lu %s\n", out, size, wine_dbgstr_w(in)); diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 30528b7768..0b9b8683da 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -35,6 +35,7 @@ HRESULT (WINAPI *pPathAllocCombine)(const WCHAR *path1, const WCHAR *path2, DWOR HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT (WINAPI *pPathCchAppendEx)(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags); HRESULT (WINAPI *pPathCchCanonicalize)(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT (WINAPI *pPathCchCanonicalizeEx)(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); HRESULT (WINAPI *pPathCchCombine)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2); @@ -786,6 +787,126 @@ static const struct addextension_test addextension_tests[] = {"C:\\1.exe", " ", NULL, E_INVALIDARG} }; +struct append_test +{ + const CHAR *path1; + const CHAR *path2; + const CHAR *result; +}; + +static const struct append_test append_tests[] = +{ + /* normal paths */ + {"C:\\", "a", "C:\\a"}, + {"C:\\b", "..\\a", "C:\\a"}, + {"C:", "a", "C:\\a"}, + {"C:\\", ".", "C:\\"}, + {"C:\\", "..", "C:\\"}, + {"C:\\a", "", "C:\\a"}, + + /* normal UNC paths */ + {"\\\\192.168.1.1\\test", "a", "\\\\192.168.1.1\\test\\a"}, + {"\\\\192.168.1.1\\test", "..", "\\\\192.168.1.1"}, + {"\\a", "b", "\\a\\b"}, + {"\\", "a", "\\a"}, + {"\\\\", "a", "\\\\a"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", "a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a"}, + + /* NT paths */ + {"\\\\?\\C:\\", "a", "C:\\a"}, + {"\\\\?\\C:\\", "..", "C:\\"}, + {"\\\\?\\C:", "a", "C:\\a"}, + + /* NT UNC path */ + {"\\\\?\\UNC\\", "a", "\\\\a"}, + {"\\\\?\\UNC\\192.168.1.1\\test", "a", "\\\\192.168.1.1\\test\\a"}, + {"\\\\?\\UNC\\192.168.1.1\\test", "..", "\\\\192.168.1.1"}, + + /* Second path begins with a single backslash */ + {"C:a\\b", "\\1", "C:a\\b\\1"}, + {"C:\\a\\b", "\\1", "C:\\a\\b\\1"}, + {"\\a\\b", "\\1", "\\a\\b\\1"}, + {"\\\\a\\b", "\\1", "\\\\a\\b\\1"}, + {"\\\\a\\b\\c", "\\1", "\\\\a\\b\\c\\1"}, + {"\\\\?\\UNC\\a", "\\1", "\\\\a\\1"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a", "\\1", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a\\1"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", "\\1", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a\\1"}, + {"C:\\a\\b", "\\", "C:\\a\\b"}, + + /* Second path is fully qualified */ + {"X:\\", "C:", "C:\\"}, + {"X:\\", "C:\\", "C:\\"}, + {"X:\\", "\\\\", "\\\\"}, + {"X:\\", "\\\\?\\C:", "C:\\"}, + {"X:\\", "\\\\?\\C:\\", "C:\\"}, + {"X:\\", "\\\\?\\UNC\\", "\\\\"}, + {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\"}, + + /* Canonicalization */ + {"C:\\a", ".\\b", "C:\\a\\b"}, + {"C:\\a", "..\\b", "C:\\b"}, + + /* Other */ + {"", "", "\\"}, + {"a", "b", "a\\b"} +}; + +static void test_PathCchAppendEx(void) +{ + WCHAR path1W[PATHCCH_MAX_CCH]; + WCHAR path2W[PATHCCH_MAX_CCH]; + CHAR path1A[PATHCCH_MAX_CCH]; + HRESULT hr; + INT i; + + if (!pPathCchAppendEx) + { + win_skip("PathCchAppendEx() is not available.\n"); + return; + } + + MultiByteToWideChar(CP_ACP, 0, "\\a", -1, path1W, ARRAY_SIZE(path1W)); + MultiByteToWideChar(CP_ACP, 0, "\\b", -1, path2W, ARRAY_SIZE(path2W)); + hr = pPathCchAppendEx(NULL, ARRAY_SIZE(path1W), path2W, 0); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAppendEx(path1W, 0, path2W, 0); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + ok(path1W[0] == '\\', "expect path1 unchanged\n"); + + hr = pPathCchAppendEx(path1W, PATHCCH_MAX_CCH + 1, path2W, 0); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + ok(path1W[0] == '\\', "expect path1 unchanged\n"); + + hr = pPathCchAppendEx(path1W, ARRAY_SIZE(path1W), NULL, 0); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + WideCharToMultiByte(CP_ACP, 0, path1W, -1, path1A, ARRAY_SIZE(path1A), NULL, NULL); + ok(!lstrcmpA(path1A, "\\a"), "expect \\a, got %s\n", path1A); + + hr = pPathCchAppendEx(path1W, PATHCCH_MAX_CCH, path2W, 0); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(append_tests); i++) + { + const struct append_test *t = append_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path1, -1, path1W, ARRAY_SIZE(path1W)); + MultiByteToWideChar(CP_ACP, 0, t->path2, -1, path2W, ARRAY_SIZE(path2W)); + hr = pPathCchAppendEx(path1W, PATHCCH_MAX_CCH, path2W, 0); + ok(hr == S_OK, "append \"%s\" \"%s\" expect hr %#x, got %#x\n", t->path1, t->path2, S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path1W, -1, path1A, ARRAY_SIZE(path1A), NULL, NULL); + ok(!lstrcmpA(path1A, t->result), "append \"%s\" \"%s\" expect result \"%s\", got \"%s\"\n", t->path1, + t->path2, t->result, path1A); + } + } +} + static void test_PathCchAddExtension(void) { WCHAR pathW[PATHCCH_MAX_CCH + 1]; @@ -2109,6 +2230,7 @@ START_TEST(path) pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); + pPathCchAppendEx = (void *)GetProcAddress(hmod, "PathCchAppendEx"); pPathCchCanonicalize = (void *)GetProcAddress(hmod, "PathCchCanonicalize"); pPathCchCanonicalizeEx = (void *)GetProcAddress(hmod, "PathCchCanonicalizeEx"); pPathCchCombine = (void *)GetProcAddress(hmod, "PathCchCombine"); @@ -2130,6 +2252,7 @@ START_TEST(path) test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); test_PathCchAddExtension(); + test_PathCchAppendEx(); test_PathCchCanonicalize(); test_PathCchCanonicalizeEx(); test_PathCchCombine(); diff --git a/include/pathcch.h b/include/pathcch.h index 205d4a23a3..18f065c4c6 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -31,6 +31,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags); HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); HRESULT WINAPI PathCchCombine(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2); -- 2.19.1

1 0