December 2015 - Wine-commits

Austin English : kernel32: Make CompareStringEx semi-stub flag FIXME only show once.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 5d186034c14d7e424e5f07e8e4ca0eb492453ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d186034c14d7e424e5f07e8e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 00:13:40 2015 -0600 kernel32: Make CompareStringEx semi-stub flag FIXME only show once. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 3b632b4..5e7ca90 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3265,6 +3265,7 @@ INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000; /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */ INT ret; + static int once; if (version) FIXME("unexpected version parameter\n"); if (reserved) FIXME("unexpected reserved value\n"); @@ -3283,7 +3284,10 @@ INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, } if (flags & semistub_flags) - FIXME("semi-stub behavor for flag(s) 0x%x\n", flags & semistub_flags); + { + if (!once++) + FIXME("semi-stub behavior for flag(s) 0x%x\n", flags & semistub_flags); + } if (len1 < 0) len1 = strlenW(str1); if (len2 < 0) len2 = strlenW(str2);

1 0

Austin English : pdh: Add PdhGetLogFileTypeA/W stubs.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: a0e2a3f20a472a642ad85111ad06eb5436a28146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e2a3f20a472a642ad85111a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 00:31:20 2015 -0600 pdh: Add PdhGetLogFileTypeA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index fc1aa4f..529b92d 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -62,8 +62,8 @@ @ stub PdhGetFormattedCounterArrayW @ stdcall PdhGetFormattedCounterValue(ptr long ptr ptr) @ stub PdhGetLogFileSize -@ stub PdhGetLogFileTypeA -@ stub PdhGetLogFileTypeW +@ stdcall PdhGetLogFileTypeA(ptr ptr) +@ stdcall PdhGetLogFileTypeW(ptr ptr) @ stub PdhGetLogSetGUID @ stub PdhGetRawCounterArrayA @ stub PdhGetRawCounterArrayW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 2631fe1..036d28b 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1269,3 +1269,21 @@ PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource( DWORD source ) FIXME("%u\n", source); return ERROR_SUCCESS; } + +/*********************************************************************** + * PdhGetLogFileTypeA (PDH.@) + */ +PDH_STATUS WINAPI PdhGetLogFileTypeA(PDH_HLOG log, DWORD *type) +{ + FIXME("%p, %p: stub\n", log, type); + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PdhGetLogFileTypeW (PDH.@) + */ +PDH_STATUS WINAPI PdhGetLogFileTypeW(PDH_HLOG log, DWORD *type) +{ + FIXME("%p, %p: stub\n", log, type); + return PDH_NOT_IMPLEMENTED; +}

1 0

Austin English : setupapi: Add SetupDiSelectBestCompatDrv stubs.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 9ad0bc63725bc32176b5bb75b58c7341c7bdebcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad0bc63725bc32176b5bb75b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 00:39:14 2015 -0600 setupapi: Add SetupDiSelectBestCompatDrv stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupapi.spec | 1 + dlls/setupapi/stubs.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index c1dbed5..4486994 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -381,6 +381,7 @@ @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) @ stdcall SetupDiRemoveDevice(ptr ptr) @ stub SetupDiRemoveDeviceInterface +@ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index a57f5fe..ffc766b 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -594,6 +594,17 @@ BOOL WINAPI SetupDiLoadClassIcon(const GUID *ClassGuid, HICON *LargeIcon, PINT M } /*********************************************************************** + * SetupDiSelectBestCompatDrv (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME(": stub %p, %p\n", DeviceInfoSet, DeviceInfoData); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * SetupDiSetSelectedDevice (SETUPAPI.@) */ BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO SetupDiSetSelectedDevice, PSP_DEVINFO_DATA DeviceInfoData)

1 0

Nikolay Sivov : ole32/tests: Some tests for OleRegGetUserType().
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 7ad896d54169ef14e4619bfd2cdcca53f3d271e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad896d54169ef14e4619bfd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:55 2015 +0300 ole32/tests: Some tests for OleRegGetUserType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 3 +++ dlls/ole32/tests/compobj.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 41fe4bd..7f532c3 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -685,6 +685,9 @@ HRESULT WINAPI OleRegGetUserType( TRACE("(%s, %d, %p)\n", debugstr_guid(clsid), dwFormOfType, pszUserType); + if (!pszUserType) + return E_INVALIDARG; + *pszUserType = NULL; hres = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &clsidKey); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 1913e1f..792d7dc 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -271,12 +271,12 @@ static const char actctx_manifest[] = " progid=\"ProgId.ProgId\"" " miscStatusIcon=\"recomposeonresize\"" " />" -" <comClass clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb851}\"" +" <comClass description=\"CustomFont Description\" clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb851}\"" " progid=\"CustomFont\"" " miscStatusIcon=\"recomposeonresize\"" " miscStatusContent=\"insideout\"" " />" -" <comClass clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb852}\"" +" <comClass description=\"StdFont Description\" clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb852}\"" " progid=\"StdFont\"" " />" " <comClass clsid=\"{62222222-1234-1234-1234-56789abcdef0}\" >" @@ -2225,6 +2225,55 @@ static void test_OleRegGetMiscStatus(void) } } +static void test_OleRegGetUserType(void) +{ + static const WCHAR stdfont_usertypeW[] = {'S','t','a','n','d','a','r','d',' ','F','o','n','t',0}; + static const WCHAR stdfont2_usertypeW[] = {'C','L','S','I','D','_','S','t','d','F','o','n','t',0}; + ULONG_PTR cookie; + HANDLE handle; + HRESULT hr; + WCHAR *str; + DWORD form; + + for (form = 0; form <= USERCLASSTYPE_APPNAME+1; form++) { + hr = OleRegGetUserType(&CLSID_Testclass, form, NULL); + ok(hr == E_INVALIDARG, "form %u: got 0x%08x\n", form, hr); + + str = (void*)0xdeadbeef; + hr = OleRegGetUserType(&CLSID_Testclass, form, &str); + ok(hr == REGDB_E_CLASSNOTREG, "form %u: got 0x%08x\n", form, hr); + ok(str == NULL, "form %u: got %p\n", form, str); + + /* same string returned for StdFont for all form types */ + str = NULL; + hr = OleRegGetUserType(&CLSID_StdFont, form, &str); + ok(hr == S_OK, "form %u: got 0x%08x\n", form, hr); + ok(!lstrcmpW(str, stdfont_usertypeW) || !lstrcmpW(str, stdfont2_usertypeW) /* winxp */, + "form %u, got %s\n", form, wine_dbgstr_w(str)); + CoTaskMemFree(str); + } + + if ((handle = activate_context(actctx_manifest, &cookie))) + { + for (form = 0; form <= USERCLASSTYPE_APPNAME+1; form++) { + str = (void*)0xdeadbeef; + hr = OleRegGetUserType(&CLSID_Testclass, form, &str); + ok(hr == REGDB_E_CLASSNOTREG, "form %u: got 0x%08x\n", form, hr); + ok(str == NULL, "form %u: got %s\n", form, wine_dbgstr_w(str)); + + /* same string returned for StdFont for all form types */ + str = NULL; + hr = OleRegGetUserType(&CLSID_StdFont, form, &str); + ok(hr == S_OK, "form %u: got 0x%08x\n", form, hr); + ok(!lstrcmpW(str, stdfont_usertypeW) || !lstrcmpW(str, stdfont2_usertypeW) /* winxp */, + "form %u, got %s\n", form, wine_dbgstr_w(str)); + CoTaskMemFree(str); + } + + pDeactivateActCtx(0, cookie); + pReleaseActCtx(handle); + } +} static void test_CoCreateGuid(void) { HRESULT hr; @@ -2722,4 +2771,5 @@ START_TEST(compobj) test_CoCreateGuid(); test_CoWaitForMultipleHandles(); test_CoGetMalloc(); + test_OleRegGetUserType(); }

1 0

Nikolay Sivov : ole32: Ignore GetMiscStatus() returned value in OleCreate( ).
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 73008a6c04e9284e617bd4007491c304b8efd2c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73008a6c04e9284e617bd4007… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:56 2015 +0300 ole32: Ignore GetMiscStatus() returned value in OleCreate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 2 +- dlls/ole32/tests/ole2.c | 56 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 7f532c3..5bfd8a3 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2545,7 +2545,7 @@ HRESULT WINAPI OleCreate( if (SUCCEEDED(hres)) { DWORD dwStatus; - hres = IOleObject_GetMiscStatus(pOleObject, DVASPECT_CONTENT, &dwStatus); + IOleObject_GetMiscStatus(pOleObject, DVASPECT_CONTENT, &dwStatus); } } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 08253a1..28370ca 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -111,7 +111,7 @@ static FORMATETC *g_expected_fetc = NULL; static BOOL g_showRunnable = TRUE; static BOOL g_isRunning = TRUE; -static BOOL g_failGetMiscStatus; +static HRESULT g_GetMiscStatusFailsWith = S_OK; static HRESULT g_QIFailsWith; static UINT cf_test_1, cf_test_2, cf_test_3; @@ -421,12 +421,15 @@ static HRESULT WINAPI OleObject_EnumAdvise static HRESULT WINAPI OleObject_GetMiscStatus ( IOleObject *iface, - DWORD dwAspect, + DWORD aspect, DWORD *pdwStatus ) { CHECK_EXPECTED_METHOD("OleObject_GetMiscStatus"); - if(!g_failGetMiscStatus) + + ok(aspect == DVASPECT_CONTENT, "got aspect %d\n", aspect); + + if (g_GetMiscStatusFailsWith == S_OK) { *pdwStatus = OLEMISC_RECOMPOSEONRESIZE; return S_OK; @@ -434,7 +437,7 @@ static HRESULT WINAPI OleObject_GetMiscStatus else { *pdwStatus = 0x1234; - return E_FAIL; + return g_GetMiscStatusFailsWith; } } @@ -917,6 +920,30 @@ static void test_OleCreate(IStorage *pStorage) { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; + static const struct expected_method methods_olerender_draw_with_site[] = + { + { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", 0 }, + { "OleObject_GetMiscStatus", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObjectPersistStg_AddRef", 0 }, + { "OleObjectPersistStg_InitNew", 0 }, + { "OleObjectPersistStg_Release", 0 }, + { "OleObject_SetClientSite", 0 }, + { "OleObject_Release", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObjectRunnable_AddRef", 0 }, + { "OleObjectRunnable_Run", 0 }, + { "OleObjectRunnable_Release", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObjectCache_AddRef", 0 }, + { "OleObjectCache_Cache", 0 }, + { "OleObjectCache_Release", 0 }, + { "OleObject_Release", 0 }, + { NULL, 0 } + }; static const struct expected_method methods_olerender_format[] = { { "OleObject_QueryInterface", 0 }, @@ -1019,6 +1046,23 @@ static void test_OleCreate(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + expected_method_list = methods_olerender_draw_with_site; + trace("OleCreate with OLERENDER_DRAW, with site:\n"); + hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, (IOleClientSite*)0xdeadbeef, pStorage, (void **)&pObject); + ok_ole_success(hr, "OleCreate"); + IOleObject_Release(pObject); + CHECK_NO_EXTRA_METHODS(); + + /* GetMiscStatus fails */ + g_GetMiscStatusFailsWith = 0x8fafefaf; + expected_method_list = methods_olerender_draw_with_site; + trace("OleCreate with OLERENDER_DRAW, with site:\n"); + hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, (IOleClientSite*)0xdeadbeef, pStorage, (void **)&pObject); + ok_ole_success(hr, "OleCreate"); + IOleObject_Release(pObject); + CHECK_NO_EXTRA_METHODS(); + g_GetMiscStatusFailsWith = S_OK; + formatetc.cfFormat = CF_TEXT; formatetc.ptd = NULL; formatetc.dwAspect = DVASPECT_CONTENT; @@ -1092,7 +1136,7 @@ static void test_OleLoad(IStorage *pStorage) /* Test once with IOleObject_GetMiscStatus failing */ expected_method_list = methods_oleload; - g_failGetMiscStatus = TRUE; + g_GetMiscStatusFailsWith = E_FAIL; trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); ok(hr == S_OK || @@ -1108,9 +1152,9 @@ static void test_OleLoad(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + g_GetMiscStatusFailsWith = S_OK; /* Test again, let IOleObject_GetMiscStatus succeed. */ - g_failGetMiscStatus = FALSE; expected_method_list = methods_oleload; trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject);

1 0

Nikolay Sivov : ole32: Use OleRun() in OleCreate() instead of unrolling what it does.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: b19ad3af80684b92e5555284d57e78d0bcdec226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b19ad3af80684b92e5555284d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:57 2015 +0300 ole32: Use OleRun() in OleCreate() instead of unrolling what it does. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 5bfd8a3..cec8c00 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2574,21 +2574,12 @@ HRESULT WINAPI OleCreate( if (((renderopt == OLERENDER_DRAW) || (renderopt == OLERENDER_FORMAT)) && SUCCEEDED(hres)) { - IRunnableObject *pRunnable; - IOleCache *pOleCache; - HRESULT hres2; - - hres2 = IUnknown_QueryInterface(pUnk, &IID_IRunnableObject, (void **)&pRunnable); - if (SUCCEEDED(hres2)) - { - hres = IRunnableObject_Run(pRunnable, NULL); - IRunnableObject_Release(pRunnable); - } - + hres = OleRun(pUnk); if (SUCCEEDED(hres)) { - hres2 = IUnknown_QueryInterface(pUnk, &IID_IOleCache, (void **)&pOleCache); - if (SUCCEEDED(hres2)) + IOleCache *pOleCache; + + if (SUCCEEDED(IUnknown_QueryInterface(pUnk, &IID_IOleCache, (void **)&pOleCache))) { DWORD dwConnection; if (renderopt == OLERENDER_DRAW && !pFormatEtc) {

1 0

Nikolay Sivov : ole32/tests: Remove some casts we don't need, fix a couple of others.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 88111ca2c03570f85f9bda94e1ac22f679c2c9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88111ca2c03570f85f9bda94e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:58 2015 +0300 ole32/tests: Remove some casts we don't need, fix a couple of others. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 28370ca..058e5ec 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -484,7 +484,7 @@ static IOleObject OleObject = { &OleObjectVtbl }; static HRESULT WINAPI OleObjectPersistStg_QueryInterface(IPersistStorage *iface, REFIID riid, void **ppv) { trace("OleObjectPersistStg_QueryInterface\n"); - return IUnknown_QueryInterface((IUnknown *)&OleObject, riid, ppv); + return IOleObject_QueryInterface(&OleObject, riid, ppv); } static ULONG WINAPI OleObjectPersistStg_AddRef(IPersistStorage *iface) @@ -582,7 +582,7 @@ static IPersistStorage OleObjectPersistStg = { &OleObjectPersistStgVtbl }; static HRESULT WINAPI OleObjectCache_QueryInterface(IOleCache *iface, REFIID riid, void **ppv) { - return IUnknown_QueryInterface((IUnknown *)&OleObject, riid, ppv); + return IOleObject_QueryInterface(&OleObject, riid, ppv); } static ULONG WINAPI OleObjectCache_AddRef(IOleCache *iface) @@ -708,7 +708,7 @@ static ULONG WINAPI OleObjectCF_Release(IClassFactory *iface) static HRESULT WINAPI OleObjectCF_CreateInstance(IClassFactory *iface, IUnknown *punkOuter, REFIID riid, void **ppv) { - return IUnknown_QueryInterface((IUnknown *)&OleObject, riid, ppv); + return IOleObject_QueryInterface(&OleObject, riid, ppv); } static HRESULT WINAPI OleObjectCF_LockServer(IClassFactory *iface, BOOL lock) @@ -729,7 +729,7 @@ static IClassFactory OleObjectCF = { &OleObjectCFVtbl }; static HRESULT WINAPI OleObjectRunnable_QueryInterface(IRunnableObject *iface, REFIID riid, void **ppv) { - return IUnknown_QueryInterface((IUnknown *)&OleObject, riid, ppv); + return IOleObject_QueryInterface(&OleObject, riid, ppv); } static ULONG WINAPI OleObjectRunnable_AddRef(IRunnableObject *iface) @@ -1912,13 +1912,13 @@ static void test_data_cache_dib_contents_stream(int num) CLSID cls; SIZEL sz; - hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void *)&unk ); + hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void **)&unk ); ok( SUCCEEDED(hr), "got %08x\n", hr ); - hr = IUnknown_QueryInterface( unk, &IID_IPersistStorage, (void *)&persist ); + hr = IUnknown_QueryInterface( unk, &IID_IPersistStorage, (void **)&persist ); ok( SUCCEEDED(hr), "got %08x\n", hr ); - hr = IUnknown_QueryInterface( unk, &IID_IDataObject, (void *)&data ); + hr = IUnknown_QueryInterface( unk, &IID_IDataObject, (void **)&data ); ok( SUCCEEDED(hr), "got %08x\n", hr ); - hr = IUnknown_QueryInterface( unk, &IID_IViewObject2, (void *)&view ); + hr = IUnknown_QueryInterface( unk, &IID_IViewObject2, (void **)&view ); ok( SUCCEEDED(hr), "got %08x\n", hr ); stg = create_storage( num ); @@ -2333,7 +2333,7 @@ static void test_OleLockRunning(void) { HRESULT hr; - hr = OleLockRunning((LPUNKNOWN)&unknown, TRUE, FALSE); + hr = OleLockRunning(&unknown, TRUE, FALSE); ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr); }

1 0

Nikolay Sivov : ole32/tests: Simple test for aggregation in CreateDataCache().
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: d66af9c185985bae3fc804c2adff7ceb7ec91f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66af9c185985bae3fc804c2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:59 2015 +0300 ole32/tests: Simple test for aggregation in CreateDataCache(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 73 +++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 058e5ec..3845ec2 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1496,6 +1496,39 @@ static IDataObjectVtbl DataObjectVtbl = static IDataObject DataObject = { &DataObjectVtbl }; +static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) *ppv = iface; + if (*ppv) + { + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI Unknown_AddRef(IUnknown *iface) +{ + ok(0, "unexpected AddRef\n"); + return 2; +} + +static ULONG WINAPI Unknown_Release(IUnknown *iface) +{ + ok(0, "unexpected Release\n"); + return 1; +} + +static const IUnknownVtbl UnknownVtbl = +{ + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release +}; + +static IUnknown unknown = { &UnknownVtbl }; + static void test_data_cache(void) { HRESULT hr; @@ -1566,6 +1599,17 @@ static void test_data_cache(void) hr = StgCreateDocfile(NULL, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, 0, &pStorage); ok_ole_success(hr, "StgCreateDocfile"); + /* aggregation */ + + /* requested is not IUnknown */ + hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IOleCache2, (void**)&pOleCache); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&pOleCache); + ok(hr == S_OK, "got 0x%08x\n", hr); + IOleCache2_Release(pOleCache); + /* Test with new data */ hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IOleCache2, (LPVOID *)&pOleCache); @@ -2214,34 +2258,6 @@ static void test_runnable(void) g_showRunnable = TRUE; } -static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) *ppv = iface; - if (*ppv) - { - IUnknown_AddRef((IUnknown *)*ppv); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI Unknown_AddRef(IUnknown *iface) -{ - return 2; -} - -static ULONG WINAPI Unknown_Release(IUnknown *iface) -{ - return 1; -} - -static const IUnknownVtbl UnknownVtbl = -{ - Unknown_QueryInterface, - Unknown_AddRef, - Unknown_Release -}; static HRESULT WINAPI OleRun_QueryInterface(IRunnableObject *iface, REFIID riid, void **ppv) { @@ -2314,7 +2330,6 @@ static const IRunnableObjectVtbl oleruntestvtbl = OleRun_SetContainedObject }; -static IUnknown unknown = { &UnknownVtbl }; static IRunnableObject testrunnable = { &oleruntestvtbl }; static void test_OleRun(void)

1 0

Austin English : ntoskrnl.exe: Add RtlInitializeGenericTableAvl/ RtlInsertElementGenericTableAvl stubs.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: f12241ae143fe5725cfddb276e9ad4ff80237bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12241ae143fe5725cfddb276… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 18 19:10:36 2015 -0600 ntoskrnl.exe: Add RtlInitializeGenericTableAvl/RtlInsertElementGenericTableAvl stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 18 +++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- include/ddk/ntddk.h | 39 +++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c3b6bf0..8cabf95 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -686,7 +686,7 @@ @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) @ stdcall RtlInitializeCriticalSectionEx(ptr long long) @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) -# @ stub RtlInitializeGenericTableAvl +@ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeHandleTable(long long ptr) @ stub RtlInitializeRXact # @ stub RtlInitializeRangeList @@ -696,7 +696,7 @@ @ stdcall RtlInitializeSid(ptr ptr long) # @ stub RtlInitializeStackTraceDataBase @ stub RtlInsertElementGenericTable -# @ stub RtlInsertElementGenericTableAvl +@ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) @ stdcall RtlInt64ToUnicodeString(int64 long ptr) @ stdcall RtlIntegerToChar(long long long ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 8eb3e9f..74ad35a 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -45,6 +45,7 @@ #include "wine/unicode.h" #include "ntdll_misc.h" #include "inaddr.h" +#include "ddk/ntddk.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -1595,3 +1596,20 @@ void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor) processor->Number = NtGetCurrentProcessorNumber(); processor->Reserved = 0; } + +/*********************************************************************** + * RtlInitializeGenericTableAvl (NTDLL.@) + */ +void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE table, PRTL_AVL_COMPARE_ROUTINE compare, + PRTL_AVL_ALLOCATE_ROUTINE allocate, PRTL_AVL_FREE_ROUTINE free, void *context) +{ + FIXME("%p %p %p %p %p: stub\n", table, compare, allocate, free, context); +} + +/*********************************************************************** + * RtlInsertElementGenericTableAvl (NTDLL.@) + */ +void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer, ULONG size, BOOL *element) +{ + FIXME("%p %p %u %p: stub\n", table, buffer, size, element); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index db15265..1319ada 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1055,12 +1055,12 @@ @ stdcall RtlInitUnicodeString(ptr wstr) ntdll.RtlInitUnicodeString @ stdcall RtlInitializeBitMap(ptr long long) ntdll.RtlInitializeBitMap @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) ntdll.RtlInitializeGenericTable -@ stub RtlInitializeGenericTableAvl +@ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) ntdll.RtlInitializeGenericTableAvl @ stub RtlInitializeRangeList @ stdcall RtlInitializeSid(ptr ptr long) ntdll.RtlInitializeSid @ stub RtlInitializeUnicodePrefix @ stub RtlInsertElementGenericTable -@ stub RtlInsertElementGenericTableAvl +@ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) ntdll.RtlInsertElementGenericTableAvl @ stub RtlInsertElementGenericTableFull @ stub RtlInsertElementGenericTableFullAvl @ stub RtlInsertUnicodePrefix diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index bccfd39..6aae257 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -149,6 +149,43 @@ typedef struct _KWAIT_BLOCK { USHORT WaitType; } KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; +typedef struct _RTL_BALANCED_LINKS { + struct _RTL_BALANCED_LINKS *Parent; + struct _RTL_BALANCED_LINKS *LeftChild; + struct _RTL_BALANCED_LINKS *RightChild; + CHAR Balance; + UCHAR Reserved[3]; +} RTL_BALANCED_LINKS; +typedef RTL_BALANCED_LINKS *PRTL_BALANCED_LINKS; + +struct _RTL_AVL_TABLE; + +typedef enum _RTL_GENERIC_COMPARE_RESULTS { + GenericLessThan, + GenericGreaterThan, + GenericEqual +} RTL_GENERIC_COMPARE_RESULTS; + +typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *); + +typedef void (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); + +typedef void (WINAPI *PRTL_AVL_FREE_ROUTINE )(struct _RTL_AVL_TABLE *, void *buffer); + +typedef struct _RTL_AVL_TABLE { + RTL_BALANCED_LINKS BalancedRoot; + void *OrderedPointer; + ULONG WhichOrderedElement; + ULONG NumberGenericTableElements; + ULONG DepthOfTree; + PRTL_BALANCED_LINKS RestartKey; + ULONG DeleteCount; + PRTL_AVL_COMPARE_ROUTINE CompareRoutine; + PRTL_AVL_ALLOCATE_ROUTINE AllocateRoutine; + PRTL_AVL_FREE_ROUTINE FreeRoutine; + void *TableContext; +} RTL_AVL_TABLE, *PRTL_AVL_TABLE; + typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); @@ -160,5 +197,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); +void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); +void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); #endif

1 0

Austin English : api-ms-win-security-lsalookup-l1-1-0: New dll.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 6767ac4bb79ad774f0c850a8c4753a2e6fdea75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6767ac4bb79ad774f0c850a8c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 19:16:16 2015 -0600 api-ms-win-security-lsalookup-l1-1-0: New dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-lsalookup-l1-1-0/Makefile.in | 1 + .../api-ms-win-security-lsalookup-l1-1-0.spec | 11 +++++++++++ tools/make_specfiles | 1 + 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 4d513c2..287f4ab 100755 --- a/configure +++ b/configure @@ -956,6 +956,7 @@ enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 +enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_sddl_l1_1_0 enable_api_ms_win_service_core_l1_1_1 enable_api_ms_win_service_management_l1_1_0 @@ -17350,6 +17351,7 @@ wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventin wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 +wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 wine_fn_config_dll api-ms-win-service-management-l1-1-0 enable_api_ms_win_service_management_l1_1_0 diff --git a/configure.ac b/configure.ac index 02eb144..a1d3f97 100644 --- a/configure.ac +++ b/configure.ac @@ -2688,6 +2688,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-0/Makefile.in b/dlls/api-ms-win-security-lsalookup-l1-1-0/Makefile.in new file mode 100644 index 0000000..f686396 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-l1-1-0.dll diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec new file mode 100644 index 0000000..9b45265 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec @@ -0,0 +1,11 @@ +@ stub LookupAccountNameLocalA +@ stub LookupAccountNameLocalW +@ stub LookupAccountSidLocalA +@ stub LookupAccountSidLocalW +@ stub LsaLookupClose +@ stub LsaLookupFreeMemory +@ stub LsaLookupGetDomainInfo +@ stub LsaLookupManageSidNameMapping +@ stub LsaLookupOpenLocalPolicy +@ stub LsaLookupTranslateNames +@ stub LsaLookupTranslateSids diff --git a/tools/make_specfiles b/tools/make_specfiles index 986070f..16db908 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -153,6 +153,7 @@ my @dll_groups = "api-ms-win-core-registry-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-security-base-l1-2-0", + "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-sddl-l1-1-0", "api-ms-win-service-core-l1-1-1", "api-ms-win-service-management-l1-1-0",

1 0