January 2014 - Wine-Commits

Frédéric Delanoy : ole32/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 86a9e6a366dd8f41871b81aa15ec85b76a559b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a9e6a366dd8f41871b81aa1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:39 2014 +0100 ole32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/ole32/tests/compobj.c | 26 +++++++------------------- dlls/ole32/tests/defaulthandler.c | 16 ++-------------- dlls/ole32/tests/ole_server.c | 7 +------ 3 files changed, 10 insertions(+), 39 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b615034..c23a4d7 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -77,18 +77,6 @@ static const WCHAR progidW[] = {'P','r','o','g','I','d','.','P','r','o','g','I', DEFINE_GUID(IID_IWineTest, 0x5201163f, 0x8164, 0x4fd0, 0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd); DEFINE_GUID(CLSID_WineOOPTest, 0x5201163f, 0x8164, 0x4fd0, 0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd); -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static LONG cLocks; static void LockModule(void) @@ -381,7 +369,7 @@ static void test_CLSIDFromProgID(void) hr = CLSIDFromProgID(progidW, &clsid); /* it returns generated CLSID here */ ok(!IsEqualCLSID(&clsid, &CLSID_non_existent) && !IsEqualCLSID(&clsid, &CLSID_NULL), - "got wrong clsid %s\n", debugstr_guid(&clsid)); + "got wrong clsid %s\n", wine_dbgstr_guid(&clsid)); /* duplicate progid present in context - returns generated guid here too */ clsid = CLSID_NULL; @@ -391,7 +379,7 @@ static void test_CLSIDFromProgID(void) /* that's where it differs from StdFont */ clsid1.Data4[7] = 0x52; ok(!IsEqualCLSID(&clsid, &CLSID_StdFont) && !IsEqualCLSID(&clsid, &CLSID_NULL) && !IsEqualCLSID(&clsid, &clsid1), - "got %s\n", debugstr_guid(&clsid)); + "got %s\n", wine_dbgstr_guid(&clsid)); pDeactivateActCtx(0, cookie); pReleaseActCtx(handle); @@ -1034,22 +1022,22 @@ static void test_CoGetPSClsid(void) memset(&clsid, 0, sizeof(clsid)); hr = CoGetPSClsid(&IID_Testiface, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualGUID(&clsid, &IID_Testiface), "got clsid %s\n", debugstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &IID_Testiface), "got clsid %s\n", wine_dbgstr_guid(&clsid)); memset(&clsid, 0, sizeof(clsid)); hr = CoGetPSClsid(&IID_Testiface2, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualGUID(&clsid, &IID_Testiface2), "got clsid %s\n", debugstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &IID_Testiface2), "got clsid %s\n", wine_dbgstr_guid(&clsid)); memset(&clsid, 0, sizeof(clsid)); hr = CoGetPSClsid(&IID_Testiface3, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualGUID(&clsid, &IID_TestPS), "got clsid %s\n", debugstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &IID_TestPS), "got clsid %s\n", wine_dbgstr_guid(&clsid)); memset(&clsid, 0xaa, sizeof(clsid)); hr = CoGetPSClsid(&IID_Testiface4, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualGUID(&clsid, &GUID_NULL), "got clsid %s\n", debugstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &GUID_NULL), "got clsid %s\n", wine_dbgstr_guid(&clsid)); /* register same interface and try to get CLSID back */ hr = CoRegisterPSClsid(&IID_Testiface, &IID_Testiface4); @@ -1057,7 +1045,7 @@ static void test_CoGetPSClsid(void) memset(&clsid, 0, sizeof(clsid)); hr = CoGetPSClsid(&IID_Testiface, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualGUID(&clsid, &IID_Testiface4), "got clsid %s\n", debugstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &IID_Testiface4), "got clsid %s\n", wine_dbgstr_guid(&clsid)); pDeactivateActCtx(0, cookie); pReleaseActCtx(handle); diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index efbd431..60bc29c 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -64,18 +64,6 @@ DEFINE_EXPECT(CF_QueryInterface_ClassFactory); DEFINE_EXPECT(CF_CreateInstance); DEFINE_EXPECT(CF_QueryInterface_IMarshal); -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static HRESULT create_storage(IStorage **stg) { HRESULT hr; @@ -194,7 +182,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r return S_OK; } - ok(0, "unexpected interface: %s\n", debugstr_guid(riid)); + ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -215,7 +203,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, CHECK_EXPECT(CF_CreateInstance); ok(pUnkOuter == NULL, "pUnkOuter != NULL\n"); - todo_wine ok(IsEqualGUID(riid, &IID_IUnknown), "riid = %s\n", debugstr_guid(riid)); + todo_wine ok(IsEqualGUID(riid, &IID_IUnknown), "riid = %s\n", wine_dbgstr_guid(riid)); if(IsEqualGUID(riid, &IID_IOleObject)) { *ppv = NULL; return E_NOINTERFACE; diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index 7a9dc30..77abda4 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -65,7 +65,6 @@ static LONG obj_ref, class_ref, server_locks; static const char *debugstr_guid(const GUID *guid) { - static char buf[50]; int i; if (!guid) return "(null)"; @@ -76,11 +75,7 @@ static const char *debugstr_guid(const GUID *guid) return guid_name[i].name; } - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], - guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], - guid->Data4[5], guid->Data4[6], guid->Data4[7]); - return buf; + return wine_dbgstr_guid(guid); } /******************************* OLE server *******************************/

1 0

Frédéric Delanoy : kernel32/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 3201f970b62e4e1e360270afd1799b2150bd26fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3201f970b62e4e1e360270afd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:34 2014 +0100 kernel32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/kernel32/tests/actctx.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 46b6a44..8499333 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -49,18 +49,6 @@ static const char* strw(LPCWSTR x) return buffer; } -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - #ifdef __i386__ #define ARCH "x86" #elif defined __x86_64__ @@ -1222,7 +1210,7 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU clsid, &data); if (!ret) { - skip("failed for guid %s\n", debugstr_guid(clsid)); + skip("failed for guid %s\n", wine_dbgstr_guid(clsid)); return; } ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); @@ -1242,10 +1230,10 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU ok_(__FILE__, line)(comclass->res1[0] == 0, "got res1[0] as %02x\n", comclass->res1[0]); ok_(__FILE__, line)(comclass->res1[1] == 0, "got res1[1] as %02x\n", comclass->res1[1]); ok_(__FILE__, line)(comclass->model == ThreadingModel_Neutral, "got model %d\n", comclass->model); - ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid, clsid), "got wrong clsid %s\n", debugstr_guid(&comclass->clsid)); - ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid2, clsid), "got wrong clsid2 %s\n", debugstr_guid(&comclass->clsid2)); + ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid, clsid), "got wrong clsid %s\n", wine_dbgstr_guid(&comclass->clsid)); + ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid2, clsid), "got wrong clsid2 %s\n", wine_dbgstr_guid(&comclass->clsid2)); if (tlid) - ok_(__FILE__, line)(IsEqualGUID(&comclass->tlid, tlid), "got wrong tlid %s\n", debugstr_guid(&comclass->tlid)); + ok_(__FILE__, line)(IsEqualGUID(&comclass->tlid, tlid), "got wrong tlid %s\n", wine_dbgstr_guid(&comclass->tlid)); ok_(__FILE__, line)(comclass->name_len > 0, "got modulename len %d\n", comclass->name_len); if (progid) @@ -1393,12 +1381,12 @@ static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const /* for external proxy stubs it contains a value from 'proxyStubClsid32' */ if (ps32) { - ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, ps32), "got wrong iid %s\n", debugstr_guid(&ifaceps->iid)); + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, ps32), "got wrong iid %s\n", wine_dbgstr_guid(&ifaceps->iid)); } else - ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, iid), "got wrong iid %s\n", debugstr_guid(&ifaceps->iid)); + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, iid), "got wrong iid %s\n", wine_dbgstr_guid(&ifaceps->iid)); - ok_(__FILE__, line)(IsEqualGUID(&ifaceps->tlbid, tlbid), "got wrong tlid %s\n", debugstr_guid(&ifaceps->tlbid)); + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->tlbid, tlbid), "got wrong tlid %s\n", wine_dbgstr_guid(&ifaceps->tlbid)); ok_(__FILE__, line)(ifaceps->name_len > 0, "got modulename len %d\n", ifaceps->name_len); ok_(__FILE__, line)(ifaceps->name_offset == ifaceps->size, "got progid offset %d\n", ifaceps->name_offset); @@ -1411,7 +1399,7 @@ static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const if (ifaceps->mask & NumMethods) ok_(__FILE__, line)(ifaceps->nummethods != 0, "got nummethods %d\n", ifaceps->nummethods); if (ifaceps->mask & BaseIface) - ok_(__FILE__, line)(IsEqualGUID(&ifaceps->base, base), "got base %s\n", debugstr_guid(&ifaceps->base)); + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->base, base), "got base %s\n", wine_dbgstr_guid(&ifaceps->base)); } ok_(__FILE__, line)(data.lpSectionGlobalData == NULL, "data.lpSectionGlobalData != NULL\n"); @@ -1468,7 +1456,7 @@ static void test_find_surrogate(HANDLE handle, const GUID *clsid, const WCHAR *n ULONG len; ok_(__FILE__, line)(surrogate->res == 0, "invalid res value %d\n", surrogate->res); - ok_(__FILE__, line)(IsEqualGUID(&surrogate->clsid, clsid), "got wrong clsid %s\n", debugstr_guid(&surrogate->clsid)); + ok_(__FILE__, line)(IsEqualGUID(&surrogate->clsid, clsid), "got wrong clsid %s\n", wine_dbgstr_guid(&surrogate->clsid)); ok_(__FILE__, line)(surrogate->version_len == lstrlenW(version)*sizeof(WCHAR), "got version len %d\n", surrogate->version_len); ok_(__FILE__, line)(surrogate->version_offset == surrogate->size, "got version offset %d\n", surrogate->version_offset); @@ -1537,8 +1525,8 @@ static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); comclass = (struct comclassredirect_data*)data2.lpData; - ok_(__FILE__, line)(IsEqualGUID(guid, &comclass->alias), "got wrong alias referenced from progid %s, %s\n", progid, debugstr_guid(guid)); - ok_(__FILE__, line)(IsEqualGUID(clsid, &comclass->clsid), "got wrong class referenced from progid %s, %s\n", progid, debugstr_guid(clsid)); + ok_(__FILE__, line)(IsEqualGUID(guid, &comclass->alias), "got wrong alias referenced from progid %s, %s\n", progid, wine_dbgstr_guid(guid)); + ok_(__FILE__, line)(IsEqualGUID(clsid, &comclass->clsid), "got wrong class referenced from progid %s, %s\n", progid, wine_dbgstr_guid(clsid)); } header = (struct strsection_header*)data.lpSectionBase;

1 0

Hans Leidekker : winhttp/tests: Only advance to the next notification test if the function is ok.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 21ff41341325310b63cd8111cdb9f0845d87a3fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ff41341325310b63cd8111c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 29 12:05:02 2014 +0100 winhttp/tests: Only advance to the next notification test if the function is ok. --- dlls/winhttp/tests/notification.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index cc375e6..f2a3692 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -107,7 +107,7 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW todo_wine ok(function_ok, "%u: expected function %u got %u\n", info->line, info->test[i].function, info->function); } } - if (status_ok) info->index++; + if (status_ok && function_ok) info->index++; if (proxy_active()) { while (info->test[info->index].skipped_for_proxy)

1 0

Piotr Caban : msvcm90: Don't forward to msvcm80.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 965987bb59ffbd2e531a3a8e71fbce4baaa59865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965987bb59ffbd2e531a3a8e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 10:32:28 2014 +0100 msvcm90: Don't forward to msvcm80. --- dlls/msvcm90/msvcm90.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcm90/msvcm90.spec b/dlls/msvcm90/msvcm90.spec index 319e506..9d57dc7 100644 --- a/dlls/msvcm90/msvcm90.spec +++ b/dlls/msvcm90/msvcm90.spec @@ -1,8 +1,8 @@ @ stub -arch=win32 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6GJPAX(a)Z0@Z @ stub -arch=win64 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6AJPEAX(a)Z0@Z -@ cdecl ?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ() msvcm80.?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ -@ cdecl -arch=win32 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler(a)System@@@Z(ptr) msvcm80.?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler(a)System@@@Z -@ cdecl -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler(a)System@@@Z(ptr) msvcm80.?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler(a)System@@@Z +@ cdecl ?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ() CrtImplementationDetails_DoDllLanguageSupportValidation +@ cdecl -arch=win32 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler(a)System@@@Z(ptr) CrtImplementationDetails_RegisterModuleUninitializer +@ cdecl -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler(a)System@@@Z(ptr) CrtImplementationDetails_RegisterModuleUninitializer @ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@@Z @ stub -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@@Z @ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@P$AAVException(a)3@@Z @@ -175,7 +175,7 @@ @ stub -arch=win64 ?setw(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z @ stub ?signal@@YAP6MXH(a)ZHH@Z @ stub ?signal@@YAP6MXH(a)ZHP6MXH@Z(a)Z -@ cdecl __setusermatherr_m(ptr) msvcm80.__setusermatherr_m +@ cdecl __setusermatherr_m(ptr) @ stub towctrans @ stub wctrans @ stub wctype

1 0

Jacek Caban : atl80: Share atl.c with atl100.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 61051202a184280a15acb32e4615d3c0609f745d URL: http://source.winehq.org/git/wine.git/?a=commit;h=61051202a184280a15acb32e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 10:24:44 2014 +0100 atl80: Share atl.c with atl100. --- dlls/atl100/atl.c | 4 ++++ dlls/atl80/Makefile.in | 3 ++- dlls/atl80/atl80.c | 9 -------- dlls/atl80/atl80.spec | 54 ++++++++++++++++++++++++------------------------ 4 files changed, 33 insertions(+), 37 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 058fa22..82412b7 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -781,6 +781,8 @@ HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown *unk, GUID *libid, IID *iid, return hres; } +#if _ATL_VER >= _ATL_VER90 + /*********************************************************************** * AtlSetPerUserRegistration [atl100.67] */ @@ -800,6 +802,8 @@ HRESULT WINAPI AtlGetPerUserRegistration(cpp_bool *pbEnabled) return S_OK; } +#endif + /*********************************************************************** * AtlGetVersion [atl100.@] */ diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 65f8055..e05e197 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,10 +1,11 @@ MODULE = atl80.dll IMPORTLIB = atl80 -IMPORTS = atl100 oleaut32 user32 ole32 uuid +IMPORTS = atl100 oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_80 PARENTSRC = ../atl100 C_SRCS = \ + atl.c \ atl80.c \ atl_ax.c diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index d39819a..b6aedda 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -89,12 +89,3 @@ HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE inst, const WCHAR *index) SysFreeString(path); return hres; } - -/*********************************************************************** - * AtlGetVersion [atl80.@] - */ -DWORD WINAPI AtlGetVersion(void *pReserved) -{ - TRACE("version %04x (%p)\n", _ATL_VER, pReserved); - return _ATL_VER; -} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index a595681..88d74ed 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -1,24 +1,24 @@ -10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise -11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise -12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream -13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc -14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr -15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject -17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects +10 stdcall AtlAdvise(ptr ptr ptr ptr) +11 stdcall AtlUnadvise(ptr ptr long) +12 stdcall AtlFreeMarshalStream(ptr) +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) 18 stdcall AtlComModuleRegisterServer(ptr long ptr) 19 stdcall AtlRegisterTypeLib(ptr wstr) -20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects -22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer +20 stdcall AtlComModuleRevokeClassObjects(ptr) +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD -24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo -26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC -27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel -28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +26 stdcall AtlCreateTargetDC(long ptr) +27 stdcall AtlHiMetricToPixel(ptr ptr) +28 stdcall AtlPixelToHiMetric(ptr ptr) 29 stub AtlDevModeW2A -30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign -31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign -32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +30 stdcall AtlComPtrAssign(ptr ptr) +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stdcall AtlGetVersion(ptr) 35 stdcall AtlAxDialogBoxW(long wstr long ptr long) 36 stdcall AtlAxDialogBoxA(long str long ptr long) @@ -28,26 +28,26 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) 41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() -43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData -44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) +44 stdcall AtlWinModuleExtractCreateWndData(ptr) 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) -49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper -50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load -51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) 53 stub AtlIPersistPropertyBag_Save -54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 55 stub AtlUnRegisterTypeLib -56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib -58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) +58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx 61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA -64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc -65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit +64 stdcall AtlCallTermFunc(ptr) +65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm

1 0

Nikolay Sivov : oleaut32: Fix parameter validation in CreateStdDispatch().
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: e9debeb642cd193a1aaea6b96eef85816a9f6463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9debeb642cd193a1aaea6b96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 08:19:33 2014 +0400 oleaut32: Fix parameter validation in CreateStdDispatch(). --- dlls/oleaut32/dispatch.c | 65 ++++++++++++++++--------------------- dlls/oleaut32/tests/dispatch.c | 70 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 37 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 760f8aa..f743bcb 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static IDispatch * StdDispatch_Construct(IUnknown * punkOuter, void * pvThis, ITypeInfo * pTypeInfo); - /****************************************************************************** * DispInvoke (OLEAUT32.30) * @@ -169,32 +167,6 @@ done: return hr; } -/****************************************************************************** - * CreateStdDispatch [OLEAUT32.32] - * - * Create and return a standard IDispatch object. - * - * RETURNS - * Success: S_OK. ppunkStdDisp contains the new object. - * Failure: An HRESULT error code. - * - * NOTES - * Outer unknown appears to be completely ignored. - */ -HRESULT WINAPI CreateStdDispatch( - IUnknown* punkOuter, - void* pvThis, - ITypeInfo* ptinfo, - IUnknown** ppunkStdDisp) -{ - TRACE("(%p, %p, %p, %p)\n", punkOuter, pvThis, ptinfo, ppunkStdDisp); - - *ppunkStdDisp = (LPUNKNOWN)StdDispatch_Construct(punkOuter, pvThis, ptinfo); - if (!*ppunkStdDisp) - return E_OUTOFMEMORY; - return S_OK; -} - /****************************************************************************** * IDispatch {OLEAUT32} @@ -451,25 +423,44 @@ static const IDispatchVtbl StdDispatch_VTable = StdDispatch_Invoke }; -static IDispatch * StdDispatch_Construct( - IUnknown * punkOuter, - void * pvThis, - ITypeInfo * pTypeInfo) +/****************************************************************************** + * CreateStdDispatch [OLEAUT32.32] + * + * Create and return a standard IDispatch object. + * + * RETURNS + * Success: S_OK. ppunkStdDisp contains the new object. + * Failure: An HRESULT error code. + * + * NOTES + * Outer unknown appears to be completely ignored. + */ +HRESULT WINAPI CreateStdDispatch( + IUnknown* punkOuter, + void* pvThis, + ITypeInfo* ptinfo, + IUnknown** stddisp) { - StdDispatch * pStdDispatch; + StdDispatch *pStdDispatch; + + TRACE("(%p, %p, %p, %p)\n", punkOuter, pvThis, ptinfo, stddisp); + + if (!pvThis || !ptinfo || !stddisp) + return E_INVALIDARG; pStdDispatch = CoTaskMemAlloc(sizeof(StdDispatch)); if (!pStdDispatch) - return &pStdDispatch->IDispatch_iface; + return E_OUTOFMEMORY; pStdDispatch->IDispatch_iface.lpVtbl = &StdDispatch_VTable; pStdDispatch->pvThis = pvThis; - pStdDispatch->pTypeInfo = pTypeInfo; + pStdDispatch->pTypeInfo = ptinfo; pStdDispatch->ref = 1; /* we keep a reference to the type info so prevent it from * being destroyed until we are done with it */ - ITypeInfo_AddRef(pTypeInfo); + ITypeInfo_AddRef(ptinfo); + *stddisp = (IUnknown*)&pStdDispatch->IDispatch_iface; - return &pStdDispatch->IDispatch_iface; + return S_OK; } diff --git a/dlls/oleaut32/tests/dispatch.c b/dlls/oleaut32/tests/dispatch.c index 0f52241..ff63a7d 100644 --- a/dlls/oleaut32/tests/dispatch.c +++ b/dlls/oleaut32/tests/dispatch.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS +#define CONST_VTABLE + #include <wine/test.h> #include <windef.h> #include <winbase.h> @@ -267,7 +270,74 @@ static void test_DispGetParam(void) VariantClear(&result); } +static HRESULT WINAPI unk_QI(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + else + { + *obj = NULL; + return E_NOINTERFACE; + } +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl unkvtbl = +{ + unk_QI, + unk_AddRef, + unk_Release +}; + +static IUnknown test_unk = { &unkvtbl }; + +static void test_CreateStdDispatch(void) +{ + static const WCHAR stdole2W[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; + ITypeLib *tl; + ITypeInfo *ti; + IUnknown *unk; + HRESULT hr; + + hr = CreateStdDispatch(NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = CreateStdDispatch(NULL, NULL, NULL, &unk); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = LoadTypeLib(stdole2W, &tl); + ok(hr == S_OK, "got %08x\n", hr); + hr = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IUnknown, &ti); + ok(hr == S_OK, "got %08x\n", hr); + ITypeLib_Release(tl); + + hr = CreateStdDispatch(NULL, &test_unk, NULL, &unk); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = CreateStdDispatch(NULL, NULL, ti, &unk); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = CreateStdDispatch(NULL, &test_unk, ti, &unk); + ok(hr == S_OK, "got %08x\n", hr); + IUnknown_Release(unk); + + ITypeInfo_Release(ti); +} + START_TEST(dispatch) { test_DispGetParam(); + test_CreateStdDispatch(); }

1 0

Ken Thomases : winemac: Ignore window dragging if window is disabled, maximized, minimized, or hidden.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 0d23637e0d53df541862d7c3d89a3ef8a884e7b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d23637e0d53df541862d7c3d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 28 15:50:52 2014 -0600 winemac: Ignore window dragging if window is disabled, maximized, minimized, or hidden. --- dlls/winemac.drv/window.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 838a1b6..259552e 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2153,11 +2153,15 @@ void macdrv_window_restore_requested(HWND hwnd) */ void macdrv_window_drag_begin(HWND hwnd) { + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); struct macdrv_win_data *data; MSG msg; TRACE("win %p\n", hwnd); + if (style & (WS_DISABLED | WS_MAXIMIZE | WS_MINIMIZE)) return; + if (!(style & WS_VISIBLE)) return; + if (!(data = get_win_data(hwnd))) return; if (data->being_dragged) goto done;

1 0

Nikolay Sivov : oleaut32: Remove useless NULL checks.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: cb74cd3e48aa01ac36156a97fab08f6ff113422e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb74cd3e48aa01ac36156a97f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 08:19:53 2014 +0400 oleaut32: Remove useless NULL checks. --- dlls/oleaut32/dispatch.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index f743bcb..a666d3d 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -226,13 +226,15 @@ static HRESULT WINAPI StdDispatch_QueryInterface( void** ppvObject) { StdDispatch *This = impl_from_IDispatch(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); + + *ppvObject = NULL; if (IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { - *ppvObject = This; - IUnknown_AddRef((LPUNKNOWN)*ppvObject); + *ppvObject = iface; + IDispatch_AddRef(iface); return S_OK; } return E_NOINTERFACE; @@ -293,10 +295,8 @@ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface) */ static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pctinfo) { - StdDispatch *This = impl_from_IDispatch(iface); TRACE("(%p)\n", pctinfo); - - *pctinfo = This->pTypeInfo ? 1 : 0; + *pctinfo = 1; return S_OK; } @@ -327,11 +327,9 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI if (iTInfo != 0) return DISP_E_BADINDEX; - if (This->pTypeInfo) - { - *ppTInfo = This->pTypeInfo; - ITypeInfo_AddRef(*ppTInfo); - } + *ppTInfo = This->pTypeInfo; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; }

1 0

Hans Leidekker : winhttp/tests: Ignore some missing notifications.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 513372f04417c7f12d98a7d1f7a6862102b46ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=513372f04417c7f12d98a7d1f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 29 12:04:18 2014 +0100 winhttp/tests: Ignore some missing notifications. --- dlls/winhttp/tests/notification.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 9fcc64c..cc375e6 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -377,8 +377,8 @@ static const struct notification async_test[] = { { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, TRUE }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, TRUE }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST },

1 0

Frédéric Delanoy : mmdevapi/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: d22a32b514811f8d237733323296dc6ab00314f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22a32b514811f8d237733323… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:35 2014 +0100 mmdevapi/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/mmdevapi/tests/dependency.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c index 6744b63..8780565 100644 --- a/dlls/mmdevapi/tests/dependency.c +++ b/dlls/mmdevapi/tests/dependency.c @@ -30,17 +30,6 @@ #include "dshow.h" #include "dsound.h" -static inline const char *dump_guid( const GUID *id ) -{ - static char data[39]; - if (!id) return "(null)"; - wsprintfA( data, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); - return data; -} - START_TEST(dependency) { HRESULT hr; @@ -93,7 +82,7 @@ START_TEST(dependency) hr = IBaseFilter_GetClassID(bf, &clsid); ok(hr == S_OK, "GetClassId failed with 0x%08x\n", hr); if (hr == S_OK) - ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s\n", dump_guid(&clsid)); + ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s\n", wine_dbgstr_guid(&clsid)); } }

1 0

Michael Stefaniuc : dmstyle: Do not use method implementations directly.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: e383cc393a586f7f788aa5ff8ccc4eb0ce5f08b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e383cc393a586f7f788aa5ff8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 28 23:13:07 2014 +0100 dmstyle: Do not use method implementations directly. --- dlls/dmstyle/style.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 077ed06..7e27934 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -23,11 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -static ULONG WINAPI IDirectMusicStyle8Impl_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef (LPDIRECTMUSICSTYLE8 iface); -static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface); -static ULONG WINAPI IDirectMusicStyle8Impl_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicStyleImpl implementation */ @@ -38,23 +33,20 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IUnknown_QueryInterface (LPUNKNOWN if (IsEqualIID (riid, &IID_IUnknown)) { *ppobj = &This->UnknownVtbl; - IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + IUnknown_AddRef((LPUNKNOWN)&This->UnknownVtbl); return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicStyle)) { - *ppobj = &This->StyleVtbl; - IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef ((LPDIRECTMUSICSTYLE8)&This->StyleVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicStyle8)) { + } else if (IsEqualIID(riid, &IID_IDirectMusicStyle) || + IsEqualIID(riid, &IID_IDirectMusicStyle8)) { *ppobj = &This->StyleVtbl; - IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef ((LPDIRECTMUSICSTYLE8)&This->StyleVtbl); + IDirectMusicStyle8_AddRef((LPDIRECTMUSICSTYLE8)&This->StyleVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { *ppobj = &This->ObjectVtbl; - IDirectMusicStyle8Impl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); + IDirectMusicObject_AddRef((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { *ppobj = &This->PersistStreamVtbl; - IDirectMusicStyle8Impl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); + IPersistStream_AddRef((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; }

1 0

Michael Stefaniuc : dmstyle: COM cleanup for IDirectMusicStyle8.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 8e6a15ffd78501884023be6d154812075b3c7e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6a15ffd78501884023be6d1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 28 23:16:19 2014 +0100 dmstyle: COM cleanup for IDirectMusicStyle8. --- dlls/dmstyle/dmstyle_private.h | 2 +- dlls/dmstyle/style.c | 43 ++++++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 7ac9fac..3ecb95c 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -105,7 +105,7 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { struct IDirectMusicStyle8Impl { /* IUnknown fields */ const IUnknownVtbl *UnknownVtbl; - const IDirectMusicStyle8Vtbl *StyleVtbl; + IDirectMusicStyle8 IDirectMusicStyle8_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index c1c2a7b..dc0e1cf 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -26,6 +26,11 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicStyleImpl implementation */ +static inline IDirectMusicStyle8Impl *impl_from_IDirectMusicStyle8(IDirectMusicStyle8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicStyle8Impl, IDirectMusicStyle8_iface); +} + /* IDirectMusicStyleImpl IUnknown part: */ static HRESULT WINAPI IDirectMusicStyle8Impl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, UnknownVtbl, iface); @@ -37,8 +42,8 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IUnknown_QueryInterface (LPUNKNOWN return S_OK; } else if (IsEqualIID(riid, &IID_IDirectMusicStyle) || IsEqualIID(riid, &IID_IDirectMusicStyle8)) { - *ppobj = &This->StyleVtbl; - IDirectMusicStyle8_AddRef((LPDIRECTMUSICSTYLE8)&This->StyleVtbl); + *ppobj = &This->IDirectMusicStyle8_iface; + IDirectMusicStyle8_AddRef(&This->IDirectMusicStyle8_iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { *ppobj = &This->ObjectVtbl; @@ -90,19 +95,19 @@ static const IUnknownVtbl DirectMusicStyle8_Unknown_Vtbl = { static HRESULT WINAPI IDirectMusicStyle8Impl_QueryInterface(IDirectMusicStyle8 *iface, REFIID riid, void **ppobj) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); return IDirectMusicStyle8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicStyle8Impl_AddRef(IDirectMusicStyle8 *iface) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); return IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); return IDirectMusicStyle8Impl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } @@ -110,7 +115,7 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) static HRESULT WINAPI IDirectMusicStyle8Impl_GetBand(IDirectMusicStyle8 *iface, WCHAR *pwszName, IDirectMusicBand **ppBand) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p, %p): stub\n", This, pwszName, ppBand); return S_OK; } @@ -118,7 +123,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetBand(IDirectMusicStyle8 *iface, static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, DWORD dwIndex, WCHAR *pwszName) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } @@ -126,7 +131,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 *iface, IDirectMusicBand **ppBand) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p): stub\n", This, ppBand); return S_OK; } @@ -134,7 +139,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 * static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD dwIndex, WCHAR *pwszName) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } @@ -142,7 +147,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, WCHAR *pwszName, IDirectMusicSegment **ppSegment) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p, %p): stub\n", This, pwszName, ppSegment); return S_OK; } @@ -150,7 +155,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyle8 *iface, IDirectMusicChordMap **ppChordMap) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p): stub\n", This, ppChordMap); return S_OK; } @@ -158,7 +163,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyl static HRESULT WINAPI IDirectMusicStyle8Impl_EnumChordMap(IDirectMusicStyle8 *iface, DWORD dwIndex, WCHAR *pwszName) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } @@ -166,7 +171,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumChordMap(IDirectMusicStyle8 *if static HRESULT WINAPI IDirectMusicStyle8Impl_GetChordMap(IDirectMusicStyle8 *iface, WCHAR *pwszName, IDirectMusicChordMap **ppChordMap) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p, %p): stub\n", This, pwszName, ppChordMap); return S_OK; } @@ -174,7 +179,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetChordMap(IDirectMusicStyle8 *ifa static HRESULT WINAPI IDirectMusicStyle8Impl_GetTimeSignature(IDirectMusicStyle8 *iface, DMUS_TIMESIGNATURE *pTimeSig) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p): stub\n", This, pTimeSig); return S_OK; } @@ -182,14 +187,14 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetTimeSignature(IDirectMusicStyle8 static HRESULT WINAPI IDirectMusicStyle8Impl_GetEmbellishmentLength(IDirectMusicStyle8 *iface, DWORD dwType, DWORD dwLevel, DWORD *pdwMin, DWORD *pdwMax) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %d, %d, %p, %p): stub\n", This, dwType, dwLevel, pdwMin, pdwMax); return S_OK; } static HRESULT WINAPI IDirectMusicStyle8Impl_GetTempo(IDirectMusicStyle8 *iface, double *pTempo) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p): stub\n", This, pTempo); return S_OK; } @@ -197,12 +202,12 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetTempo(IDirectMusicStyle8 *iface, static HRESULT WINAPI IDirectMusicStyle8Impl_EnumPattern(IDirectMusicStyle8 *iface, DWORD dwIndex, DWORD dwPatternType, WCHAR *pwszName) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %d, %d, %p): stub\n", This, dwIndex, dwPatternType, pwszName); return S_OK; } -static const IDirectMusicStyle8Vtbl DirectMusicStyle8_Style_Vtbl = { +static const IDirectMusicStyle8Vtbl dmstyle8_vtbl = { IDirectMusicStyle8Impl_QueryInterface, IDirectMusicStyle8Impl_AddRef, IDirectMusicStyle8Impl_Release, @@ -1115,7 +1120,7 @@ HRESULT WINAPI create_dmstyle(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } obj->UnknownVtbl = &DirectMusicStyle8_Unknown_Vtbl; - obj->StyleVtbl = &DirectMusicStyle8_Style_Vtbl; + obj->IDirectMusicStyle8_iface.lpVtbl = &dmstyle8_vtbl; obj->ObjectVtbl = &DirectMusicStyle8_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicStyle8_PersistStream_Vtbl; obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));

1 0

Jacek Caban : atl110: Share atl_ax.c with atl100.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: a9a3e3957d56685aa4eeb45ef1568ef6ea8770fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a3e3957d56685aa4eeb45ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 14:49:37 2014 +0100 atl110: Share atl_ax.c with atl100. --- dlls/atl100/atl_ax.c | 2 ++ dlls/atl110/Makefile.in | 7 +++++-- dlls/atl110/atl110.c | 53 ----------------------------------------------- dlls/atl110/atl110.spec | 18 ++++++++-------- 4 files changed, 16 insertions(+), 64 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index be0b836..be52917 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -93,6 +93,8 @@ BOOL WINAPI AtlAxWinInit(void) #define ATL_NAME_SUFFIX '9','0',0 #elif _ATL_VER == _ATL_VER_100 #define ATL_NAME_SUFFIX '1','0','0',0 +#elif _ATL_VER == _ATL_VER_110 +#define ATL_NAME_SUFFIX '1','1','0',0 #else #error Unsupported version #endif diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index 8160d64..e8d340f 100644 --- a/dlls/atl110/Makefile.in +++ b/dlls/atl110/Makefile.in @@ -1,5 +1,8 @@ MODULE = atl110.dll -IMPORTS = atl100 ole32 user32 +IMPORTS = atl100 oleaut32 ole32 user32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_110 +PARENTSRC = ../atl100 -C_SRCS = atl110.c +C_SRCS = \ + atl110.c \ + atl_ax.c diff --git a/dlls/atl110/atl110.c b/dlls/atl110/atl110.c index 707b43b..9386812 100644 --- a/dlls/atl110/atl110.c +++ b/dlls/atl110/atl110.c @@ -40,56 +40,3 @@ DWORD WINAPI AtlGetVersion(void *pReserved) TRACE("version %04x (%p)\n", _ATL_VER, pReserved); return _ATL_VER; } - -/********************************************************************** - * AtlAxWin class window procedure - */ -static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) -{ - if ( wMsg == WM_CREATE ) - { - DWORD len = GetWindowTextLengthW( hWnd ) + 1; - WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); - if (!ptr) - return 1; - GetWindowTextW( hWnd, ptr, len ); - AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, ptr ); - return 0; - } - return DefWindowProcW( hWnd, wMsg, wParam, lParam ); -} - -BOOL WINAPI AtlAxWinInit(void) -{ - WNDCLASSEXW wcex; - const WCHAR AtlAxWin110[] = {'A','t','l','A','x','W','i','n','1','1','0',0}; - const WCHAR AtlAxWinLic110[] = {'A','t','l','A','x','W','i','n','L','i','c','1','1','0',0}; - - FIXME("version %04x semi-stub\n", _ATL_VER); - - if ( FAILED( OleInitialize(NULL) ) ) - return FALSE; - - wcex.cbSize = sizeof(wcex); - wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = GetModuleHandleW( NULL ); - wcex.hIcon = NULL; - wcex.hCursor = NULL; - wcex.hbrBackground = NULL; - wcex.lpszMenuName = NULL; - wcex.hIconSm = 0; - - wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin110; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - wcex.lpszClassName = AtlAxWinLic110; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - return TRUE; -} diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec index 045969e..35facf8 100644 --- a/dlls/atl110/atl110.spec +++ b/dlls/atl110/atl110.spec @@ -18,20 +18,20 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW -36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA -37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW -38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA -39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl -40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx -41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) +36 stdcall AtlAxDialogBoxA(long str long ptr long) +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) +38 stdcall AtlAxCreateDialogA(long str long ptr long) +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) +41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData 44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA -47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl -48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +47 stdcall AtlAxGetControl(long ptr) +48 stdcall AtlAxGetHost(long ptr) 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save

1 0

Michael Stefaniuc : dmstyle: Remove the extraneous IUnknown from DirectMusicStyle8.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 97428376efb03aa0ff5d5c668c63953edb9b2219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97428376efb03aa0ff5d5c668… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 28 23:19:07 2014 +0100 dmstyle: Remove the extraneous IUnknown from DirectMusicStyle8. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmstyle/dmstyle_private.h | 2 - dlls/dmstyle/style.c | 124 ++++++++++++++++------------------------ 2 files changed, 50 insertions(+), 76 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 3ecb95c..bae61a0 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -103,8 +103,6 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { * IDirectMusicStyle8Impl implementation structure */ struct IDirectMusicStyle8Impl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; IDirectMusicStyle8 IDirectMusicStyle8_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index dc0e1cf..2945e5d 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -31,84 +31,56 @@ static inline IDirectMusicStyle8Impl *impl_from_IDirectMusicStyle8(IDirectMusicS return CONTAINING_RECORD(iface, IDirectMusicStyle8Impl, IDirectMusicStyle8_iface); } -/* IDirectMusicStyleImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID(riid, &IID_IDirectMusicStyle) || - IsEqualIID(riid, &IID_IDirectMusicStyle8)) { - *ppobj = &This->IDirectMusicStyle8_iface; - IDirectMusicStyle8_AddRef(&This->IDirectMusicStyle8_iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - IDirectMusicObject_AddRef((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IPersistStream_AddRef((LPPERSISTSTREAM)&This->PersistStreamVtbl); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicStyle8Impl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMSTYLE_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicStyle8Impl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicStyle8Impl, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); +/* DirectMusicStyle8Impl IDirectMusicStyle8 part: */ +static HRESULT WINAPI IDirectMusicStyle8Impl_QueryInterface(IDirectMusicStyle8 *iface, REFIID riid, + void **ret_iface) +{ + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - TRACE("(%p): ReleaseRef to %d\n", This, ref); + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMSTYLE_UnlockModule(); - - return ref; -} + *ret_iface = NULL; -static const IUnknownVtbl DirectMusicStyle8_Unknown_Vtbl = { - IDirectMusicStyle8Impl_IUnknown_QueryInterface, - IDirectMusicStyle8Impl_IUnknown_AddRef, - IDirectMusicStyle8Impl_IUnknown_Release -}; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicStyle) || + IsEqualIID(riid, &IID_IDirectMusicStyle8)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IDirectMusicObject)) + *ret_iface = &This->ObjectVtbl; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } -/* IDirectMusicStyle8Impl IDirectMusicStyle8 part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_QueryInterface(IDirectMusicStyle8 *iface, REFIID riid, - void **ppobj) -{ - IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - return IDirectMusicStyle8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicStyle8Impl_AddRef(IDirectMusicStyle8 *iface) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - return IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - return IDirectMusicStyle8Impl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This->pDesc); + HeapFree(GetProcessHeap(), 0, This); + DMSTYLE_UnlockModule(); + } + + return ref; } /* IDirectMusicStyle8Impl IDirectMusicStyle(8) part: */ @@ -228,17 +200,17 @@ static const IDirectMusicStyle8Vtbl dmstyle8_vtbl = { /* IDirectMusicStyle8Impl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, ObjectVtbl, iface); - return IDirectMusicStyle8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicStyle8_QueryInterface(&This->IDirectMusicStyle8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, ObjectVtbl, iface); - return IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicStyle8_AddRef(&This->IDirectMusicStyle8_iface); } static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, ObjectVtbl, iface); - return IDirectMusicStyle8Impl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicStyle8_Release(&This->IDirectMusicStyle8_iface); } static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -443,17 +415,17 @@ static const IDirectMusicObjectVtbl DirectMusicStyle8_Object_Vtbl = { /* IDirectMusicStyle8Impl IPersistStream part: */ static HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface); - return IDirectMusicStyle8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicStyle8_QueryInterface(&This->IDirectMusicStyle8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicStyle8Impl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface); - return IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicStyle8_AddRef(&This->IDirectMusicStyle8_iface); } static ULONG WINAPI IDirectMusicStyle8Impl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface); - return IDirectMusicStyle8Impl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicStyle8_Release(&This->IDirectMusicStyle8_iface); } static HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -1113,13 +1085,13 @@ static const IPersistStreamVtbl DirectMusicStyle8_PersistStream_Vtbl = { HRESULT WINAPI create_dmstyle(REFIID lpcGUID, void **ppobj) { IDirectMusicStyle8Impl* obj; - + HRESULT hr; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyle8Impl)); if (NULL == obj) { *ppobj = NULL; return E_OUTOFMEMORY; } - obj->UnknownVtbl = &DirectMusicStyle8_Unknown_Vtbl; obj->IDirectMusicStyle8_iface.lpVtbl = &dmstyle8_vtbl; obj->ObjectVtbl = &DirectMusicStyle8_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicStyle8_PersistStream_Vtbl; @@ -1127,9 +1099,13 @@ HRESULT WINAPI create_dmstyle(REFIID lpcGUID, void **ppobj) DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicStyle; - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; list_init (&obj->Bands); list_init (&obj->Motifs); - return IDirectMusicStyle8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + DMSTYLE_LockModule(); + hr = IDirectMusicStyle8_QueryInterface(&obj->IDirectMusicStyle8_iface, lpcGUID, ppobj); + IDirectMusicStyle8_Release(&obj->IDirectMusicStyle8_iface); + + return hr; }

1 0

Ken Thomases : winemac: Reset cursor clipping and capture when window dragging begins.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: a86cfc683de19a099a43e1ee45febc77c230df14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86cfc683de19a099a43e1ee4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 28 15:50:35 2014 -0600 winemac: Reset cursor clipping and capture when window dragging begins. --- dlls/winemac.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index d63e83f..838a1b6 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2164,7 +2164,9 @@ void macdrv_window_drag_begin(HWND hwnd) data->being_dragged = TRUE; release_win_data(data); + ClipCursor(NULL); SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); + ReleaseCapture(); while (GetMessageW(&msg, 0, 0, 0)) {

1 0

Frédéric Delanoy : oleaut32/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: f4fa510ea00c350a8f0767d105295f685736d5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4fa510ea00c350a8f0767d10… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:40 2014 +0100 oleaut32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/oleaut32/tests/vartype.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 035502a..8ec56c7 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -510,18 +510,6 @@ static HRESULT (WINAPI *pVarBstrCat)(BSTR,BSTR,BSTR*); static INT (WINAPI *pSystemTimeToVariantTime)(LPSYSTEMTIME,double*); static void (WINAPI *pClearCustData)(LPCUSTDATA); -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - /* Internal representation of a BSTR */ typedef struct tagINTERNAL_BSTR { @@ -602,7 +590,7 @@ static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, CHECK_EXPECT(dispatch_invoke); ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); - ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", debugstr_guid(riid)); + ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", wine_dbgstr_guid(riid)); ok(wFlags == DISPATCH_PROPERTYGET, "Flags wrong\n"); ok(params->rgvarg == NULL, "got %p\n", params->rgvarg);

1 0

Ken Thomases : winemac: Ignore mouse capture during window drags for routing click and move events.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 70c4f43ed365c368ae83857550ff335280fe93e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c4f43ed365c368ae8385755… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 28 15:50:15 2014 -0600 winemac: Ignore mouse capture during window drags for routing click and move events. --- dlls/winemac.drv/cocoa_app.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index d499fd1..dff6977 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1857,14 +1857,14 @@ int macdrv_err_on; type == NSRightMouseDragged || type == NSOtherMouseDragged) { [self handleMouseMove:anEvent]; - ret = mouseCaptureWindow != nil; + ret = mouseCaptureWindow && ![windowsBeingDragged count]; } else if (type == NSLeftMouseDown || type == NSLeftMouseUp || type == NSRightMouseDown || type == NSRightMouseUp || type == NSOtherMouseDown || type == NSOtherMouseUp) { [self handleMouseButton:anEvent]; - ret = mouseCaptureWindow != nil; + ret = mouseCaptureWindow && ![windowsBeingDragged count]; } else if (type == NSScrollWheel) {

1 0

Vincent Povirk : gdiplus: Move metafile functions to metafile.c.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 2d487e22d6faa3f851804d5e4064206311303d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d487e22d6faa3f851804d5e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jan 28 13:42:39 2014 -0600 gdiplus: Move metafile functions to metafile.c. --- dlls/gdiplus/gdiplus_private.h | 1 - dlls/gdiplus/graphics.c | 127 -------------------- dlls/gdiplus/image.c | 132 -------------------- dlls/gdiplus/metafile.c | 259 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 259 insertions(+), 260 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d487e22d6faa3f851804…

1 0

Alexandre Julliard : configure: Build makedep at configure time.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 5114deda9c9bf17636460547bcea543316ebb03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5114deda9c9bf17636460547b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 28 15:14:00 2014 +0100 configure: Build makedep at configure time. --- configure | 30 ++++++++++++++++++++---------- configure.ac | 24 +++++++++++++++++------- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/configure b/configure index 9939a69..5f8bbf5 100755 --- a/configure +++ b/configure @@ -16471,8 +16471,8 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c .INIT: Makefile .MAKEFILEDEPS: all: Makefile -Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status - @./config.status Make.tmp Makefile" +Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) + @./config.status Make.tmp Makefile && \$(MAKEDEP) ." test "$srcdir" = . && wine_fn_append_rule "all: .gitignore .gitignore: config.status @@ -17296,6 +17296,13 @@ wine_fn_ignore_file "include/config.h" wine_fn_ignore_file "include/stamp-h" test "$wine_binary" = wine || wine_fn_ignore_file "loader/wine" +if test "x$enable_tools" != xno +then + wine_fn_ignore_file "tools/makedep$ac_exeext" + ac_config_commands="$ac_config_commands tools/makedep" + +fi + ac_config_commands="$ac_config_commands Makefile" @@ -17343,12 +17350,10 @@ fi if test "x$enable_tools" != xno then - ac_config_commands="$ac_config_commands tools" - - wine_fn_ignore_file "tools/makedep$ac_exeext" - wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h - \$(CC) -Iinclude -I$srcdir/include -D__WINESRC__ \$(EXTRACFLAGS) \$(CPPFLAGS) \$(CFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) -clean:: __clean__ + wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status + @./config.status tools/makedep +Makefile: tools/makedep$ac_exeext +distclean:: clean \$(RM) tools/makedep$ac_exeext" else wine_fn_append_rule "\$(MAKEDEP): @@ -18079,6 +18084,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # +wine_fn_output_makedep () +{ + as_dir=tools; as_fn_mkdir_p + $CC -Iinclude -I$srcdir/include -D__WINESRC__ $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext $srcdir/tools/makedep.c $LDFLAGS +} wine_fn_output_makefile () { cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$1 && rm -f Make.tmp && return @@ -18112,9 +18122,9 @@ do "po/LINGUAS") CONFIG_LINKS="$CONFIG_LINKS po/LINGUAS:po/LINGUAS" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "wine64") CONFIG_LINKS="$CONFIG_LINKS wine64:tools/winewrapper" ;; + "tools/makedep") CONFIG_COMMANDS="$CONFIG_COMMANDS tools/makedep" ;; "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; "Make.tmp") CONFIG_FILES="$CONFIG_FILES Make.tmp:Make.vars.in:Makefile.in" ;; - "tools") CONFIG_COMMANDS="$CONFIG_COMMANDS tools" ;; ".gitignore") CONFIG_COMMANDS="$CONFIG_COMMANDS .gitignore" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -18699,8 +18709,8 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "include/stamp-h":C) echo timestamp > include/stamp-h ;; + "tools/makedep":C) wine_fn_output_makedep || as_fn_exit $? ;; "Makefile":C) wine_fn_output_makefile Makefile ;; - "tools":C) as_dir=tools; as_fn_mkdir_p ;; ".gitignore":C) wine_fn_output_gitignore .gitignore ;; esac diff --git a/configure.ac b/configure.ac index 81bdb81..1a39337 100644 --- a/configure.ac +++ b/configure.ac @@ -2603,8 +2603,8 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[[ch]] *.yy.c .INIT: Makefile .MAKEFILEDEPS: all: Makefile -Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status - @./config.status Make.tmp Makefile]) +Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) + @./config.status Make.tmp Makefile && \$(MAKEDEP) .]) test "$srcdir" = . && WINE_APPEND_RULE( [all: .gitignore @@ -3419,6 +3419,17 @@ WINE_IGNORE_FILE("include/config.h") WINE_IGNORE_FILE("include/stamp-h") test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine") +if test "x$enable_tools" != xno +then + WINE_IGNORE_FILE("tools/makedep$ac_exeext") + AC_CONFIG_COMMANDS([tools/makedep],[wine_fn_output_makedep || AS_EXIT], +[wine_fn_output_makedep () +{ + AS_MKDIR_P(tools) + $CC -Iinclude -I$srcdir/include -D__WINESRC__ $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext $srcdir/tools/makedep.c $LDFLAGS +}]) +fi + AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], [wine_fn_output_makefile () { @@ -3476,12 +3487,11 @@ fi if test "x$enable_tools" != xno then - AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)]) - WINE_IGNORE_FILE("tools/makedep$ac_exeext") WINE_APPEND_RULE( -[tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h - \$(CC) -Iinclude -I$srcdir/include -D__WINESRC__ \$(EXTRACFLAGS) \$(CPPFLAGS) \$(CFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) -clean:: __clean__ +[tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status + @./config.status tools/makedep +Makefile: tools/makedep$ac_exeext +distclean:: clean \$(RM) tools/makedep$ac_exeext]) else WINE_APPEND_RULE(

1 0

Ken Thomases : d3d9/tests: Improve testing of display formats and IDirect3D9_CheckDeviceType().
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 6f498c4946087337956a60eb499559b061b015c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f498c4946087337956a60eb4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 27 13:37:48 2014 -0600 d3d9/tests: Improve testing of display formats and IDirect3D9_CheckDeviceType(). Tests every combination of display format and backbuffer format from (D3DFMT_R5G6B5, D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_A2R10G10B10, D3DFMT_UNKNOWN). Tests the behavior of CheckDeviceType() with display formats for which there are no adapter modes, rather than skipping those. Tests windowed mode. --- dlls/d3d9/tests/device.c | 159 ++++++++++++++++++---------------------------- 1 file changed, 63 insertions(+), 96 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ed99f16..eeb2b07 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2271,54 +2271,25 @@ cleanup: if(d3d9) IDirect3D9_Release(d3d9); } -struct formats { - D3DFORMAT DisplayFormat; - D3DFORMAT BackBufferFormat; - BOOL shouldPass; +struct format { + D3DFORMAT format; + D3DFORMAT alpha_format; + const char* name; + BOOL display; + BOOL windowed; }; -static const struct formats r5g6b5_format_list[] = +static const struct format formats[] = { - { D3DFMT_R5G6B5, D3DFMT_R5G6B5, TRUE }, - { D3DFMT_R5G6B5, D3DFMT_X1R5G5B5, FALSE }, - { D3DFMT_R5G6B5, D3DFMT_A1R5G5B5, FALSE }, - { D3DFMT_R5G6B5, D3DFMT_X8R8G8B8, FALSE }, - { D3DFMT_R5G6B5, D3DFMT_A8R8G8B8, FALSE }, - { 0, 0, 0} -}; - -static const struct formats x1r5g5b5_format_list[] = -{ - { D3DFMT_X1R5G5B5, D3DFMT_R5G6B5, FALSE }, - { D3DFMT_X1R5G5B5, D3DFMT_X1R5G5B5, TRUE }, - { D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5, TRUE }, - { D3DFMT_X1R5G5B5, D3DFMT_X8R8G8B8, FALSE }, - { D3DFMT_X1R5G5B5, D3DFMT_A8R8G8B8, FALSE }, - - /* A1R5G5B5 should not be usable as a display format, it is backbuffer-only */ - { D3DFMT_A1R5G5B5, D3DFMT_R5G6B5, FALSE }, - { D3DFMT_A1R5G5B5, D3DFMT_X1R5G5B5, FALSE }, - { D3DFMT_A1R5G5B5, D3DFMT_A1R5G5B5, FALSE }, - { D3DFMT_A1R5G5B5, D3DFMT_X8R8G8B8, FALSE }, - { D3DFMT_A1R5G5B5, D3DFMT_A8R8G8B8, FALSE }, - { 0, 0, 0} -}; - -static const struct formats x8r8g8b8_format_list[] = -{ - { D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, FALSE }, - { D3DFMT_X8R8G8B8, D3DFMT_X1R5G5B5, FALSE }, - { D3DFMT_X8R8G8B8, D3DFMT_A1R5G5B5, FALSE }, - { D3DFMT_X8R8G8B8, D3DFMT_X8R8G8B8, TRUE }, - { D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, TRUE }, - - /* A1R8G8B8 should not be usable as a display format, it is backbuffer-only */ - { D3DFMT_A8R8G8B8, D3DFMT_R5G6B5, FALSE }, - { D3DFMT_A8R8G8B8, D3DFMT_X1R5G5B5, FALSE }, - { D3DFMT_A8R8G8B8, D3DFMT_A1R5G5B5, FALSE }, - { D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, FALSE }, - { D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE }, - { 0, 0, 0} +#define FORMAT(f, a, d, w) { f, a, #f, d, w } + FORMAT(D3DFMT_R5G6B5, 0, TRUE, TRUE), + FORMAT(D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5, TRUE, TRUE), + FORMAT(D3DFMT_A1R5G5B5, D3DFMT_A1R5G5B5, FALSE, FALSE), + FORMAT(D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, TRUE, TRUE), + FORMAT(D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE, FALSE), + FORMAT(D3DFMT_A2R10G10B10, 0, TRUE, FALSE), + FORMAT(D3DFMT_UNKNOWN, 0, FALSE, FALSE), +#undef FORMAT }; static void test_display_formats(void) @@ -2326,71 +2297,67 @@ static void test_display_formats(void) /* Direct3D9 offers 4 display formats R5G6B5, X1R5G5B5, X8R8G8B8 and A2R10G10B10. * Next to these there are 6 different backbuffer formats. Only a fixed number of * combinations are possible in FULLSCREEN mode. In windowed mode more combinations are - * allowed due to depth conversion and this is likely driver dependent. - * This test checks which combinations are possible in fullscreen mode and this should not be driver dependent. - * TODO: handle A2R10G10B10 but what hardware supports it? Parhelia? It is very rare. */ + * allowed due to depth conversion and this is likely driver dependent. */ UINT Adapter = D3DADAPTER_DEFAULT; D3DDEVTYPE DeviceType = D3DDEVTYPE_HAL; - int i, nmodes; - HRESULT hr; + int display; IDirect3D9 *d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); if(!d3d9) return; - nmodes = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, D3DFMT_R5G6B5); - if(!nmodes) { - skip("Display format R5G6B5 not supported, skipping\n"); - } else { - trace("Testing display format R5G6B5\n"); - for(i=0; r5g6b5_format_list[i].DisplayFormat != 0; i++) - { - hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat, FALSE); + for (display = 0; display < sizeof(formats) / sizeof(formats[0]); display++) + { + int nmodes, windowed; - if(r5g6b5_format_list[i].shouldPass) - ok(hr == D3D_OK || - broken(hr == D3DERR_NOTAVAILABLE) /* Windows VGA driver */, - "format %d %d didn't pass with hr=%#08x\n", r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat, hr); - else - ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat); - } - } + nmodes = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, formats[display].format); - nmodes = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, D3DFMT_X1R5G5B5); - if(!nmodes) { - skip("Display format X1R5G5B5 not supported, skipping\n"); - } else { - trace("Testing display format X1R5G5B5\n"); - for(i=0; x1r5g5b5_format_list[i].DisplayFormat != 0; i++) + for (windowed = 0; windowed <= 1; windowed++) { - hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat, FALSE); + int backbuffer; + for (backbuffer = 0; backbuffer < sizeof(formats) / sizeof(formats[0]); backbuffer++) + { + BOOL shouldPass; + HRESULT hr; - if(x1r5g5b5_format_list[i].shouldPass) - ok(hr == D3D_OK || - broken(hr == D3DERR_NOTAVAILABLE) /* Spice QXL driver */, - "format %d %d didn't pass with hr=%#08x\n", x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat, hr); - else - ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat); - } - } + if (!formats[display].display || (windowed && !formats[display].windowed) || (!windowed && !nmodes)) + shouldPass = FALSE; + else + { + D3DFORMAT backbuffer_format; - nmodes = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, D3DFMT_X8R8G8B8); - if(!nmodes) { - skip("Display format X8R8G8B8 not supported, skipping\n"); - } else { - trace("Testing display format X8R8G8B8\n"); - for(i=0; x8r8g8b8_format_list[i].DisplayFormat != 0; i++) - { - hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, FALSE); - trace("CheckDeviceType(%d %d) = %08x shouldPass = %d\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, hr, x8r8g8b8_format_list[i].shouldPass); + if (windowed && formats[backbuffer].format == D3DFMT_UNKNOWN) + backbuffer_format = formats[display].format; + else + backbuffer_format = formats[backbuffer].format; - if(x8r8g8b8_format_list[i].shouldPass) - ok(hr == D3D_OK || - broken(hr == D3DERR_NOTAVAILABLE) /* Windows VGA driver */, - "format %d %d didn't pass with hr=%#08x\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, hr); - else - ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat); + hr = IDirect3D9_CheckDeviceFormat(d3d9, Adapter, DeviceType, formats[display].format, D3DUSAGE_RENDERTARGET, + D3DRTYPE_SURFACE, backbuffer_format); + if (hr == D3D_OK) + { + if (windowed) + { + hr = IDirect3D9_CheckDeviceFormatConversion(d3d9, Adapter, DeviceType, backbuffer_format, formats[display].format); + shouldPass = (hr == D3D_OK); + } + else + shouldPass = (formats[display].format == formats[backbuffer].format || + (formats[display].alpha_format && formats[display].alpha_format == formats[backbuffer].alpha_format)); + } + else + shouldPass = FALSE; + } + + hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, formats[display].format, formats[backbuffer].format, windowed); + + if (shouldPass) + ok(hr == D3D_OK, "CheckDeviceType(..., %s, %s, windowed=%d) failed with hr=%#08x\n", formats[display].name, + formats[backbuffer].name, windowed, hr); + else + ok(hr != D3D_OK, "CheckDeviceType(..., %s, %s, windowed=%d) succeeded when it was expected to fail\n", formats[display].name, + formats[backbuffer].name, windowed); + } } }

1 0

Hans Leidekker : wbemprox: Add a couple of network properties.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: b5073646c6c4469577f200e9c672b3ba8dbc9187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5073646c6c4469577f200e9c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 28 13:26:57 2014 +0100 wbemprox: Add a couple of network properties. --- dlls/wbemprox/builtin.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3086a4f..afa32b5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -165,6 +165,8 @@ static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; static const WCHAR prop_intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; +static const WCHAR prop_ipconnectionmetricW[] = + {'I','P','C','o','n','n','e','c','t','i','o','n','M','e','t','r','i','c',0}; static const WCHAR prop_ipenabledW[] = {'I','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_lastbootuptimeW[] = @@ -341,9 +343,11 @@ static const struct column col_networkadapter[] = { { prop_adaptertypeW, CIM_STRING }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_indexW, CIM_UINT32, VT_I4 }, { prop_interfaceindexW, CIM_UINT32, VT_I4 }, { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_manufacturerW, CIM_STRING }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_netconnectionstatusW, CIM_UINT16, VT_I4 }, { prop_physicaladapterW, CIM_BOOLEAN }, { prop_pnpdeviceidW, CIM_STRING }, @@ -351,9 +355,10 @@ static const struct column col_networkadapter[] = }; static const struct column col_networkadapterconfig[] = { - { prop_indexW, CIM_UINT32|COL_FLAG_KEY }, - { prop_ipenabledW, CIM_BOOLEAN }, - { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_indexW, CIM_UINT32|COL_FLAG_KEY }, + { prop_ipconnectionmetricW, CIM_UINT32 }, + { prop_ipenabledW, CIM_BOOLEAN }, + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_os[] = { @@ -616,9 +621,11 @@ struct record_networkadapter { const WCHAR *adaptertype; const WCHAR *device_id; - INT32 interface_index; + UINT32 index; + UINT32 interface_index; const WCHAR *mac_address; const WCHAR *manufacturer; + const WCHAR *name; UINT16 netconnection_status; int physicaladapter; const WCHAR *pnpdevice_id; @@ -627,6 +634,7 @@ struct record_networkadapter struct record_networkadapterconfig { UINT32 index; + UINT32 ipconnectionmetric; int ipenabled; const WCHAR *mac_address; }; @@ -1620,9 +1628,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e sprintfW( device_id, fmtW, aa->u.s.IfIndex ); rec->adaptertype = get_adaptertype( aa->IfType, &physical ); rec->device_id = heap_strdupW( device_id ); + rec->index = aa->u.s.IfIndex; rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->manufacturer = compsys_manufacturerW; + rec->name = heap_strdupW( aa->FriendlyName ); rec->netconnection_status = get_connection_status( aa->OperStatus ); rec->physicaladapter = physical; rec->pnpdevice_id = networkadapter_pnpdeviceidW; @@ -1668,9 +1678,10 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st for (aa = buffer; aa; aa = aa->Next) { rec = (struct record_networkadapterconfig *)(table->data + offset); - rec->index = aa->u.s.IfIndex; - rec->ipenabled = -1; - rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + rec->index = aa->u.s.IfIndex; + rec->ipconnectionmetric = 20; + rec->ipenabled = -1; + rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

1 0

Ken Thomases : d3d9: Make CheckDeviceType() fail for display formats other than D3DFMT_X8R8G8B8 and D3DFMT_R5G6B5 in full-screen.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 35d8c5633332d6175ea3925b7df3d7f7d9921083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d8c5633332d6175ea3925b7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 27 13:32:02 2014 -0600 d3d9: Make CheckDeviceType() fail for display formats other than D3DFMT_X8R8G8B8 and D3DFMT_R5G6B5 in full-screen. The adapter mode functions already enforce this, and tests show CheckDeviceType() should fail for full-screen mode with display formats for which there are no adapter modes. --- dlls/d3d9/directx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 537e6af..e73051d 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -232,6 +232,10 @@ static HRESULT WINAPI d3d9_CheckDeviceType(IDirect3D9Ex *iface, UINT adapter, D3 TRACE("iface %p, adapter %u, device_type %#x, display_format %#x, backbuffer_format %#x, windowed %#x.\n", iface, adapter, device_type, display_format, backbuffer_format, windowed); + /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out. */ + if (!windowed && display_format != D3DFMT_X8R8G8B8 && display_format != D3DFMT_R5G6B5) + return WINED3DERR_NOTAVAILABLE; + wined3d_mutex_lock(); hr = wined3d_check_device_type(d3d9->wined3d, adapter, device_type, wined3dformat_from_d3dformat(display_format), wined3dformat_from_d3dformat(backbuffer_format), windowed);

1 0

Jacek Caban : secur32: Ignore GNUTLS_A_UNRECOGNIZED_NAME warning alert.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: e3fa52a636384197fa900427a42a8616246f599b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3fa52a636384197fa900427a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 28 15:37:37 2014 +0100 secur32: Ignore GNUTLS_A_UNRECOGNIZED_NAME warning alert. --- dlls/secur32/schannel_gnutls.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 17b4b77..1b19544 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -193,9 +193,11 @@ void schan_imp_set_session_target(schan_imp_session session, const char *target) SECURITY_STATUS schan_imp_handshake(schan_imp_session session) { gnutls_session_t s = (gnutls_session_t)session; - int err = pgnutls_handshake(s); - switch(err) - { + int err; + + while(1) { + err = pgnutls_handshake(s); + switch(err) { case GNUTLS_E_SUCCESS: TRACE("Handshake completed\n"); return SEC_E_OK; @@ -205,17 +207,31 @@ SECURITY_STATUS schan_imp_handshake(schan_imp_session session) return SEC_I_CONTINUE_NEEDED; case GNUTLS_E_WARNING_ALERT_RECEIVED: + { + gnutls_alert_description_t alert = pgnutls_alert_get(s); + + WARN("WARNING ALERT: %d %s\n", alert, pgnutls_alert_get_name(alert)); + + switch(alert) { + case GNUTLS_A_UNRECOGNIZED_NAME: + TRACE("Ignoring\n"); + continue; + default: + return SEC_E_INTERNAL_ERROR; + } + } + case GNUTLS_E_FATAL_ALERT_RECEIVED: { gnutls_alert_description_t alert = pgnutls_alert_get(s); - const char *alert_name = pgnutls_alert_get_name(alert); - WARN("ALERT: %d %s\n", alert, alert_name); + WARN("FATAL ALERT: %d %s\n", alert, pgnutls_alert_get_name(alert)); return SEC_E_INTERNAL_ERROR; } default: pgnutls_perror(err); return SEC_E_INTERNAL_ERROR; + } } /* Never reached */

1 0

Alexandre Julliard : makedep: Add a helper function for computing base dir paths.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: dc24a92f5bbba97398049b408ddb99f242457330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc24a92f5bbba97398049b408… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 28 15:08:28 2014 +0100 makedep: Add a helper function for computing base dir paths. --- tools/makedep.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 56c42a6..ff76d3e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -99,7 +99,7 @@ static struct strarray imports; static struct strarray make_vars; static struct strarray cmdline_vars; -static const char *base_dir = "."; +static const char *base_dir; static const char *src_dir; static const char *top_src_dir; static const char *top_obj_dir; @@ -449,6 +449,16 @@ static char *get_relative_path( const char *from, const char *dest ) /******************************************************************* + * base_dir_path + */ +static char *base_dir_path( const char *path ) +{ + if (base_dir && path[0] != '/') return strmake( "%s/%s", base_dir, path ); + return xstrdup( path ); +} + + +/******************************************************************* * src_dir_path */ static char *src_dir_path( const char *path ) @@ -629,17 +639,7 @@ found: */ static FILE *open_file( const char *path ) { - FILE *ret; - - if (path[0] != '/' && strcmp( base_dir, "." )) - { - char *full_path = strmake( "%s/%s", base_dir, path ); - ret = fopen( full_path, "r" ); - free( full_path ); - } - else ret = fopen( path, "r" ); - - return ret; + return fopen( base_dir_path( path ), "r" ); } /******************************************************************* @@ -1230,7 +1230,7 @@ static void parse_makefile(void) char *buffer; FILE *file; - input_file_name = strmake( "%s/%s", base_dir, makefile_name ); + input_file_name = base_dir_path( makefile_name ); if (!(file = fopen( input_file_name, "r" ))) { fatal_perror( "open" ); @@ -1419,7 +1419,7 @@ static struct strarray output_sources(void) for (i = 0; i < extradllflags.count; i++) if (!strcmp( extradllflags.str[i], "-m16" )) is_win16 = 1; for (i = 0; i < linguas.count; i++) - strarray_add( &mo_files, strmake( "%s/po/%s.mo", top_obj_dir, linguas.str[i] )); + strarray_add( &mo_files, strmake( "%s/%s.mo", top_obj_dir_path( "po" ), linguas.str[i] )); strarray_add( &includes, "-I." ); if (src_dir) strarray_add( &includes, strmake( "-I%s", src_dir )); @@ -1438,7 +1438,7 @@ static struct strarray output_sources(void) if (src_dir && strchr( obj, '/' )) { - char *subdir = strmake( "%s/%s", base_dir, obj ); + char *subdir = base_dir_path( obj ); *strrchr( subdir, '/' ) = 0; strarray_add_uniq( &subdirs, subdir ); } @@ -1491,7 +1491,7 @@ static struct strarray output_sources(void) if (mo_files.count && (source->flags & FLAG_RC_PO)) { strarray_add( &po_files, source->filename ); - output_filename( strmake( "--po-dir=%s/po", top_obj_dir )); + output_filename( strmake( "--po-dir=%s", top_obj_dir_path( "po" ))); output( "\n" ); output( "%s.res:", obj ); output_filenames( mo_files ); @@ -1509,7 +1509,7 @@ static struct strarray output_sources(void) if (mo_files.count) { strarray_add( &mc_files, source->filename ); - output_filename( strmake( "--po-dir=%s/po", top_obj_dir )); + output_filename( strmake( "--po-dir=%s", top_obj_dir_path( "po" ))); output( "\n" ); output( "%s.res:", obj ); output_filenames( mo_files ); @@ -1974,7 +1974,7 @@ static struct strarray output_sources(void) if (top_obj_dir) { output( "depend:\n" ); - output( "\t(a)cd %s && $(MAKE) %s/depend\n", top_obj_dir, base_dir ); + output( "\t(a)cd %s && $(MAKE) %s\n", top_obj_dir, base_dir_path( "depend" )); strarray_add( &phony_targets, "depend" ); } @@ -2093,7 +2093,7 @@ static void output_dependencies( const char *path ) output_file = NULL; if (temp_file_name) rename_temp_file( path ); - if (!src_dir) output_gitignore( strmake( "%s/.gitignore", base_dir ), &targets ); + if (!src_dir && base_dir) output_gitignore( base_dir_path( ".gitignore" ), &targets ); } @@ -2125,7 +2125,8 @@ static void update_makefile( const char *path ) struct incl_file *file; base_dir = path; - output_file_name = strmake( "%s/%s", base_dir, makefile_name ); + if (!strcmp( base_dir, "." )) base_dir = NULL; + output_file_name = base_dir_path( makefile_name ); parse_makefile(); src_dir = get_expanded_make_variable( "srcdir" ); @@ -2139,6 +2140,7 @@ static void update_makefile( const char *path ) if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL; + if (top_obj_dir && !strcmp( top_obj_dir, "." )) top_obj_dir = NULL; appmode = get_expanded_make_var_array( "APPMODE" ); dllflags = get_expanded_make_var_array( "DLLFLAGS" );

1 0

Hans Leidekker : wbemprox: Allow string values in boolean comparisons.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 6a042307a56270e1bd5fe6ad6a53d6cc68942d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a042307a56270e1bd5fe6ad6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 28 13:26:16 2014 +0100 wbemprox: Allow string values in boolean comparisons. --- dlls/wbemprox/builtin.c | 4 +- dlls/wbemprox/query.c | 113 ++++++++++++++++++++++++++++++++++---- dlls/wbemprox/wbemprox_private.h | 2 +- 3 files changed, 107 insertions(+), 12 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 58054de..3086a4f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -806,12 +806,14 @@ static const struct record_stdregprov data_stdregprov[] = static BOOL match_row( const struct table *table, UINT row, const struct expr *cond, enum fill_status *status ) { LONGLONG val; + UINT type; + if (!cond) { *status = FILL_STATUS_UNFILTERED; return TRUE; } - if (eval_cond( table, row, cond, &val ) != S_OK) + if (eval_cond( table, row, cond, &val, &type ) != S_OK) { *status = FILL_STATUS_FAILED; return FALSE; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 5134d5b..bd68560 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -114,16 +114,93 @@ static inline BOOL is_strcmp( const struct complex_expr *expr ) (expr->left->type == EXPR_SVAL && expr->right->type == EXPR_PROPVAL)); } +static inline BOOL is_boolcmp( const struct complex_expr *expr, UINT ltype, UINT rtype ) +{ + if (ltype == CIM_BOOLEAN && expr->left->type == EXPR_PROPVAL && + (expr->right->type == EXPR_SVAL || expr->right->type == EXPR_BVAL)) return TRUE; + else if (rtype == CIM_BOOLEAN && expr->right->type == EXPR_PROPVAL && + (expr->left->type == EXPR_SVAL || expr->left->type == EXPR_BVAL)) return TRUE; + return FALSE; +} + +static HRESULT eval_boolcmp( UINT op, LONGLONG lval, LONGLONG rval, UINT ltype, UINT rtype, LONGLONG *val ) +{ + static const WCHAR trueW[] = {'T','r','u','e',0}; + + if (ltype == CIM_STRING) lval = !strcmpiW( (const WCHAR *)(INT_PTR)lval, trueW ) ? -1 : 0; + else if (rtype == CIM_STRING) rval = !strcmpiW( (const WCHAR *)(INT_PTR)rval, trueW ) ? -1 : 0; + + switch (op) + { + case OP_EQ: + *val = (lval == rval); + break; + case OP_NE: + *val = (lval != rval); + break; + default: + ERR("unhandled operator %u\n", op); + return WBEM_E_INVALID_QUERY; + } + return S_OK; +} + +static UINT resolve_type( UINT left, UINT right ) +{ + switch (left) + { + case CIM_SINT8: + case CIM_SINT16: + case CIM_SINT32: + case CIM_SINT64: + case CIM_UINT8: + case CIM_UINT16: + case CIM_UINT32: + case CIM_UINT64: + switch (right) + { + case CIM_SINT8: + case CIM_SINT16: + case CIM_SINT32: + case CIM_SINT64: + case CIM_UINT8: + case CIM_UINT16: + case CIM_UINT32: + case CIM_UINT64: + return CIM_UINT64; + default: break; + } + + case CIM_STRING: + if (right == CIM_STRING) return CIM_STRING; + break; + + case CIM_BOOLEAN: + if (right == CIM_BOOLEAN) return CIM_BOOLEAN; + break; + + default: + break; + } + return CIM_ILLEGAL; +} + static HRESULT eval_binary( const struct table *table, UINT row, const struct complex_expr *expr, - LONGLONG *val ) + LONGLONG *val, UINT *type ) { HRESULT lret, rret; LONGLONG lval, rval; + UINT ltype, rtype; - lret = eval_cond( table, row, expr->left, &lval ); - rret = eval_cond( table, row, expr->right, &rval ); + lret = eval_cond( table, row, expr->left, &lval, &ltype ); + rret = eval_cond( table, row, expr->right, &rval, &rtype ); if (lret != S_OK || rret != S_OK) return WBEM_E_INVALID_QUERY; + *type = resolve_type( ltype, rtype ); + + if (is_boolcmp( expr, ltype, rtype )) + return eval_boolcmp( expr->op, lval, rval, ltype, rtype, val ); + if (is_strcmp( expr )) { const WCHAR *lstr = (const WCHAR *)(INT_PTR)lval; @@ -165,7 +242,7 @@ static HRESULT eval_binary( const struct table *table, UINT row, const struct co } static HRESULT eval_unary( const struct table *table, UINT row, const struct complex_expr *expr, - LONGLONG *val ) + LONGLONG *val, UINT *type ) { HRESULT hr; @@ -192,11 +269,13 @@ static HRESULT eval_unary( const struct table *table, UINT row, const struct com ERR("unknown operator %u\n", expr->op); return WBEM_E_INVALID_QUERY; } + + *type = table->columns[column].type & CIM_TYPE_MASK; return S_OK; } static HRESULT eval_propval( const struct table *table, UINT row, const struct property *propval, - LONGLONG *val ) + LONGLONG *val, UINT *type ) { HRESULT hr; @@ -206,31 +285,44 @@ static HRESULT eval_propval( const struct table *table, UINT row, const struct p if (hr != S_OK) return hr; + *type = table->columns[column].type & CIM_TYPE_MASK; return get_value( table, row, column, val ); } -HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, LONGLONG *val ) +HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, LONGLONG *val, UINT *type ) { if (!cond) { *val = 1; + *type = CIM_UINT64; return S_OK; } switch (cond->type) { case EXPR_COMPLEX: - return eval_binary( table, row, &cond->u.expr, val ); + return eval_binary( table, row, &cond->u.expr, val, type ); + case EXPR_UNARY: - return eval_unary( table, row, &cond->u.expr, val ); + return eval_unary( table, row, &cond->u.expr, val, type ); + case EXPR_PROPVAL: - return eval_propval( table, row, cond->u.propval, val ); + return eval_propval( table, row, cond->u.propval, val, type ); + case EXPR_SVAL: *val = (INT_PTR)cond->u.sval; + *type = CIM_STRING; return S_OK; + case EXPR_IVAL: + *val = cond->u.ival; + *type = CIM_UINT64; + return S_OK; + case EXPR_BVAL: *val = cond->u.ival; + *type = CIM_BOOLEAN; return S_OK; + default: ERR("invalid expression type\n"); break; @@ -257,6 +349,7 @@ HRESULT execute_view( struct view *view ) { HRESULT hr; LONGLONG val = 0; + UINT type; if (j >= len) { @@ -265,7 +358,7 @@ HRESULT execute_view( struct view *view ) if (!(tmp = heap_realloc( view->result, len * sizeof(UINT) ))) return E_OUTOFMEMORY; view->result = tmp; } - if ((hr = eval_cond( view->table, i, view->cond, &val )) != S_OK) return hr; + if ((hr = eval_cond( view->table, i, view->cond, &val, &type )) != S_OK) return hr; if (val) view->result[j++] = i; } view->count = j; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 81c0fcc..0e39d00 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -186,7 +186,7 @@ void free_row_values( const struct table *, UINT ) DECLSPEC_HIDDEN; void clear_table( struct table * ) DECLSPEC_HIDDEN; void free_table( struct table * ) DECLSPEC_HIDDEN; UINT get_type_size( CIMTYPE ) DECLSPEC_HIDDEN; -HRESULT eval_cond( const struct table *, UINT, const struct expr *, LONGLONG * ) DECLSPEC_HIDDEN; +HRESULT eval_cond( const struct table *, UINT, const struct expr *, LONGLONG *, UINT * ) DECLSPEC_HIDDEN; HRESULT get_column_index( const struct table *, const WCHAR *, UINT * ) DECLSPEC_HIDDEN; HRESULT get_value( const struct table *, UINT, UINT, LONGLONG * ) DECLSPEC_HIDDEN; BSTR get_value_bstr( const struct table *, UINT, UINT ) DECLSPEC_HIDDEN;

1 0