January 2014 - Wine-Commits

André Hentschel : user32/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: c855459a403d7cff8446ffd057372f4682b6b66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c855459a403d7cff8446ffd05… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 27 22:21:43 2014 +0100 user32/tests: Avoid preprocessor check to ensure it compiles. --- dlls/user32/tests/broadcast.c | 18 ++++++++++-------- dlls/user32/tests/menu.c | 12 ++++++------ dlls/user32/tests/win.c | 5 +++-- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 0476c99..322fbd0 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -119,7 +119,8 @@ static void test_parameters(PBROADCAST broadcast, const char *functionname) ok(!ret || broken(ret), "Returned: %d\n", ret); if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error: %08x\n", GetLastError()); -#if 0 /* TODO: Check the hang flags */ +if (0) /* TODO: Check the hang flags */ +{ SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; ret = broadcast( BSF_QUERY|(BSF_NOHANG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0 ); @@ -143,7 +144,7 @@ static void test_parameters(PBROADCAST broadcast, const char *functionname) ret = broadcast( BSF_POSTMESSAGE|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0 ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); -#endif +} recips = BSM_APPLICATIONS; ResetEvent(hevent); @@ -204,31 +205,32 @@ static void test_parametersEx(PBROADCASTEX broadcastex) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error: %08x\n", GetLastError()); ok(!ret, "Returned: %d\n", ret); -#if 0 /* TODO: Check the hang flags */ +if (0) /* TODO: Check the hang flags */ +{ SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; - ret = broadcast( BSF_QUERY|(BSF_NOHANG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); + ret = broadcastex( BSF_QUERY|(BSF_NOHANG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; - ret = broadcast( BSF_QUERY|(BSF_NOHANG|BSF_NOTIMEOUTIFNOTHUNG), &recips, WM_NULL, 30000, 0, NULL ); + ret = broadcastex( BSF_QUERY|(BSF_NOHANG|BSF_NOTIMEOUTIFNOTHUNG), &recips, WM_NULL, 30000, 0, NULL ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; - ret = broadcast( BSF_QUERY|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); + ret = broadcastex( BSF_QUERY|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; - ret = broadcast( BSF_POSTMESSAGE|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); + ret = broadcastex( BSF_POSTMESSAGE|(BSF_NOTIMEOUTIFNOTHUNG|BSF_FORCEIFHUNG), &recips, WM_NULL, 30000, 0, NULL ); ok(0, "Last error: %08x\n", GetLastError()); ok(0, "Returned: %d\n", ret); -#endif +} recips = BSM_APPLICATIONS; ResetEvent(hevent); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index d02eb91..3334a8a 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2498,10 +2498,10 @@ static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type, mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_SUBMENU; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -#if 0 +if (0) trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n", i, mii.fType, mii.fState, mii.wID, mii.hSubMenu); -#endif + if (mii.hSubMenu) { ok(mii.wID == (UINT_PTR)mii.hSubMenu, "id %u: wID should be equal to hSubMenu\n", checked_cmd); @@ -2657,10 +2657,10 @@ static void test_menu_resource_layout(void) mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_STRING; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -#if 0 +if (0) trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n", i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData); -#endif + ok(mii.fType == menu_data[i].type, "%u: expected fType %04x, got %04x\n", i, menu_data[i].type, mii.fType); ok(mii.fState == menu_data[i].state, @@ -2763,10 +2763,10 @@ static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT ite mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_BITMAP; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -#if 0 +if (0) trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n", i, mii.fType, mii.fState, mii.wID, mii.hbmpItem); -#endif + ok(mii.fType == item[i].type, "%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType); ok(mii.wID == item[i].id, diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index dfcad52..3c63c8a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -895,14 +895,15 @@ static void verify_window_info(const char *hook, HWND hwnd, const WINDOWINFO *in /* win2k and XP return broken border info in GetWindowInfo most of * the time, so there is no point in testing it. */ -#if 0 +if (0) +{ UINT border; ok(info->cxWindowBorders == (unsigned)(rcClient.left - rcWindow.left), "wrong cxWindowBorders %d != %d\n", info->cxWindowBorders, rcClient.left - rcWindow.left); border = min(rcWindow.bottom - rcClient.bottom, rcClient.top - rcWindow.top); ok(info->cyWindowBorders == border, "wrong cyWindowBorders %d != %d\n", info->cyWindowBorders, border); -#endif +} ok(info->atomWindowType == GetClassLongA(hwnd, GCW_ATOM), "wrong atomWindowType for %p in hook %s\n", hwnd, hook); ok(info->wCreatorVersion == 0x0400 /* NT4, Win2000, XP, Win2003 */ ||

1 0

André Hentschel : user32/tests: Remove #if 1.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: fc185ccd9bebf2de9857136abd859ceac38d4bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc185ccd9bebf2de9857136ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 27 22:22:27 2014 +0100 user32/tests: Remove #if 1. --- dlls/user32/tests/msg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index dffaa8d..8cc431c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14329,7 +14329,6 @@ START_TEST(msg) test_winevents(); /* Fix message sequences before removing 4 lines below */ -#if 1 if (pUnhookWinEvent && hEvent_hook) { ret = pUnhookWinEvent(hEvent_hook); @@ -14337,7 +14336,6 @@ START_TEST(msg) pUnhookWinEvent = 0; } hEvent_hook = 0; -#endif test_SetFocus(); test_SetParent();

1 0

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

Jan. 28, 2014

Module: wine Branch: master Commit: 3e8fa4c7641a0a862ccc44ebba64883ac60db370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8fa4c7641a0a862ccc44ebb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:31 2014 +0100 hlink/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/hlink/tests/hlink.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index f4e3d5c..0b01aef 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -79,18 +79,6 @@ DEFINE_EXPECT(HLF_UpdateHlink); DEFINE_GUID(IID_IHlinkHistory,0x79eac9c8,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); -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 void test_HlinkIsShortcut(void) { UINT i; @@ -707,7 +695,7 @@ static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { - ok(0, "unexpected service %s\n", debugstr_guid(guidService)); + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); return E_NOINTERFACE; } @@ -729,7 +717,7 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa return S_OK; } - ok(0, "unexpected interface %s\n", debugstr_guid(riid)); + ok(0, "unexpected interface %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -820,7 +808,7 @@ static HRESULT WINAPI HlinkBrowseContext_QueryInterface( return E_NOINTERFACE; } - ok(0, "unexpected interface: %s\n", debugstr_guid(riid)); + ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -964,7 +952,7 @@ static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID rii return S_OK; } - ok(0, "unexpected interface: %s\n", debugstr_guid(riid)); + ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -1037,7 +1025,7 @@ static HRESULT WINAPI Moniker_QueryInterface(IMoniker *iface, REFIID riid, void { *ppv = NULL; - ok(0, "unexpected riid: %s\n", debugstr_guid(riid)); + ok(0, "unexpected riid: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -1089,7 +1077,7 @@ static HRESULT WINAPI Moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, IMoni ok(pbc != _bctx, "pbc != _bctx\n"); ok(pmkToLeft == NULL, "pmkToLeft = %p\n", pmkToLeft); - ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", debugstr_guid(riid)); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); ok(ppv != NULL, "ppv == NULL\n"); ok(*ppv == NULL, "*ppv = %p\n", *ppv); @@ -1109,7 +1097,7 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon ok(pbc == _bctx, "pbc != _bctx\n"); ok(pmkToLeft == NULL, "pmkToLeft=%p\n", pmkToLeft); - ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", debugstr_guid(riid)); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); ok(ppv != NULL, "ppv == NULL\n"); ok(*ppv == NULL, "*ppv=%p\n", *ppv); @@ -1832,7 +1820,7 @@ static IMoniker hls_ref_Moniker = { &hls_ref_MonikerVtbl }; static HRESULT WINAPI hls_QueryInterface(IHlinkSite *iface, REFGUID iid, void **obj) { - ok(0, "QI: %p %s %p\n", iface, debugstr_guid(iid), obj); + ok(0, "QI: %p %s %p\n", iface, wine_dbgstr_guid(iid), obj); return E_NOTIMPL; } @@ -1849,8 +1837,8 @@ static ULONG WINAPI hls_Release(IHlinkSite *iface) static HRESULT WINAPI hls_QueryService(IHlinkSite *iface, DWORD siteData, REFGUID service, REFIID riid, IUnknown **punk) { - ok(0, "QS: %p %x %s %s %p\n", iface, siteData, debugstr_guid(service), - debugstr_guid(riid), punk); + ok(0, "QS: %p %x %s %s %p\n", iface, siteData, wine_dbgstr_guid(service), + wine_dbgstr_guid(riid), punk); return E_NOTIMPL; }

1 0

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

Jan. 28, 2014

Module: wine Branch: master Commit: a5f20b31731c943ba7c345673469aa7bd313135b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f20b31731c943ba7c345673… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:25 2014 +0100 comdlg32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/comdlg32/tests/printdlg.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 9dec1e2..871807b 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -52,18 +52,6 @@ static HRESULT (WINAPI * pPrintDlgExW)(LPPRINTDLGEXW); static const CHAR emptyA[] = ""; static const CHAR PrinterPortsA[] = "PrinterPorts"; -static const char *debugstr_guid(const GUID *guid) -{ - static char buf[50]; - - if (!guid) return "(null)"; - 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; -} - /* ########################### */ static void test_PageSetupDlgA(void) @@ -289,7 +277,7 @@ static void test_PrintDlgA(void) static HRESULT WINAPI callback_QueryInterface(IPrintDialogCallback *iface, REFIID riid, void **ppv) { - ok(0, "callback_QueryInterface(%s): unexpected call\n", debugstr_guid(riid)); + ok(0, "callback_QueryInterface(%s): unexpected call\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -339,7 +327,7 @@ static IPrintDialogCallback callback = { &callback_Vtbl }; static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - trace("unknown_QueryInterface %s\n", debugstr_guid(riid)); + trace("unknown_QueryInterface %s\n", wine_dbgstr_guid(riid)); if (IsEqualGUID(riid, &IID_IPrintDialogCallback)) { @@ -352,7 +340,7 @@ static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID riid, void return E_NOINTERFACE; } - ok(0, "unexpected IID %s\n", debugstr_guid(riid)); + ok(0, "unexpected IID %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; }

1 0

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

Jan. 28, 2014

Module: wine Branch: master Commit: 0bdd0465c12b84b6b524bba37a005806ecbec8a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bdd0465c12b84b6b524bba37… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:24 2014 +0100 atl100/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/atl100/tests/atl.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 4cf4a62..383dbe4 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -43,21 +43,6 @@ static const GUID CATID_CatTest2 = {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x46}}; #define CATID_CATTEST2_STR "178fc163-0000-0000-0000-000000000246" -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - 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 void test_winmodule(void) { _AtlCreateWndData create_data[3]; @@ -469,7 +454,7 @@ static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, voi return S_OK; } - ok(0, "unexpected riid: %s\n", debugstr_guid(riid)); + ok(0, "unexpected riid: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -548,8 +533,8 @@ static void test_source_iface(void) maj_ver = min_ver = 0xdead; hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); - ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); - ok(IsEqualGUID(&iid, &DIID_DispHTMLBody), "iid = %s\n", debugstr_guid(&iid)); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", wine_dbgstr_guid(&libid)); + ok(IsEqualGUID(&iid, &DIID_DispHTMLBody), "iid = %s\n", wine_dbgstr_guid(&iid)); ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); support_classinfo2 = FALSE; @@ -558,8 +543,8 @@ static void test_source_iface(void) maj_ver = min_ver = 0xdead; hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); - ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); - ok(IsEqualGUID(&iid, &DIID_HTMLDocumentEvents), "iid = %s\n", debugstr_guid(&iid)); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", wine_dbgstr_guid(&libid)); + ok(IsEqualGUID(&iid, &DIID_HTMLDocumentEvents), "iid = %s\n", wine_dbgstr_guid(&iid)); ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); persist_clsid = CLSID_HTMLStyle; @@ -567,8 +552,8 @@ static void test_source_iface(void) maj_ver = min_ver = 0xdead; hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); - ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); - ok(IsEqualGUID(&iid, &IID_NULL), "iid = %s\n", debugstr_guid(&iid)); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", wine_dbgstr_guid(&libid)); + ok(IsEqualGUID(&iid, &IID_NULL), "iid = %s\n", wine_dbgstr_guid(&iid)); ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); }

1 0

Frédéric Delanoy : include: Make wine_dbgstr_guid available in test.h for all tests.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 9134a24e87b4b024311e8749f147e400dbe25a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9134a24e87b4b024311e8749f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:22 2014 +0100 include: Make wine_dbgstr_guid available in test.h for all tests. --- include/wine/test.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index ab10399..f8b608f 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -65,6 +65,7 @@ extern void winetest_add_failures( LONG new_failures ); extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); +extern const char *wine_dbgstr_guid( const GUID *guid ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } /* strcmpW is available for tests compiled under Wine, but not in standalone @@ -523,6 +524,19 @@ const char *wine_dbgstr_wn( const WCHAR *str, int n ) return res; } +const char *wine_dbgstr_guid( const GUID *guid ) +{ + char *res; + + if (!guid) return "(null)"; + res = get_temp_buffer( 39 ); /* CHARS_IN_GUID */ + sprintf( res, "{%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 res; +} + /* Find a test by name */ static const struct test *find_test( const char *name ) {

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolderCollection:: get__NewEnum.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: d33c0e14ae7088e608a6bfb30008774f1905eb1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33c0e14ae7088e608a6bfb30… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:48 2014 +0900 taskschd: Implement ITaskFolderCollection::get__NewEnum. --- dlls/taskschd/folder_collection.c | 157 ++++++++++++++++++++++++++++++++++++- dlls/taskschd/tests/scheduler.c | 4 - 2 files changed, 155 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index e8e4933..c8cc89b 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -42,6 +42,8 @@ typedef struct LONG count; } TaskFolderCollection; +static HRESULT NewEnum_create(TaskFolderCollection *folders, IUnknown **obj); + static inline TaskFolderCollection *impl_from_ITaskFolderCollection(ITaskFolderCollection *iface) { return CONTAINING_RECORD(iface, TaskFolderCollection, ITaskFolderCollection_iface); @@ -190,8 +192,13 @@ static HRESULT WINAPI folders_get_Item(ITaskFolderCollection *iface, VARIANT ind static HRESULT WINAPI folders_get__NewEnum(ITaskFolderCollection *iface, IUnknown **penum) { - FIXME("%p,%p: stub\n", iface, penum); - return E_NOTIMPL; + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + + TRACE("%p,%p\n", iface, penum); + + if (!penum) return E_POINTER; + + return NewEnum_create(folders, penum); } static const ITaskFolderCollectionVtbl TaskFolderCollection_vtbl = @@ -319,3 +326,149 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o return S_OK; } + +typedef struct +{ + IEnumVARIANT IEnumVARIANT_iface; + LONG ref, pos; + TaskFolderCollection *folders; +} EnumVARIANT; + +static inline EnumVARIANT *impl_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, EnumVARIANT, IEnumVARIANT_iface); +} + +static HRESULT WINAPI enumvar_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IEnumVARIANT) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IEnumVARIANT_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI enumvar_AddRef(IEnumVARIANT *iface) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + return InterlockedIncrement(&enumvar->ref); +} + +static ULONG WINAPI enumvar_Release(IEnumVARIANT *iface) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&enumvar->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + ITaskFolderCollection_Release(&enumvar->folders->ITaskFolderCollection_iface); + heap_free(enumvar); + } + + return ref; +} + +static HRESULT WINAPI enumvar_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + LONG i; + + TRACE("%p,%u,%p,%p\n", iface, celt, var, fetched); + + for (i = 0; i < celt && enumvar->pos < enumvar->folders->count; i++) + { + ITaskFolder *folder; + HRESULT hr; + + hr = TaskFolder_create(enumvar->folders->path, enumvar->folders->list[enumvar->pos++], &folder, FALSE); + if (hr) return hr; + + if (!var) + { + ITaskFolder_Release(folder); + return E_POINTER; + } + + V_VT(&var[i]) = VT_DISPATCH; + V_DISPATCH(&var[i]) = (IDispatch *)folder; + } + + if (fetched) *fetched = i; + + return i == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI enumvar_Skip(IEnumVARIANT *iface, ULONG celt) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + + TRACE("%p,%u\n", iface, celt); + + enumvar->pos += celt; + + if (enumvar->pos > enumvar->folders->count) + { + enumvar->pos = enumvar->folders->count; + return S_FALSE; + } + + return S_OK; +} + +static HRESULT WINAPI enumvar_Reset(IEnumVARIANT *iface) +{ + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + + TRACE("%p\n", iface); + + enumvar->pos = 0; + + return S_OK; +} + +static HRESULT WINAPI enumvar_Clone(IEnumVARIANT *iface, IEnumVARIANT **penum) +{ + FIXME("%p,%p: stub\n", iface, penum); + return E_NOTIMPL; +} + +static const struct IEnumVARIANTVtbl EnumVARIANT_vtbl = +{ + enumvar_QueryInterface, + enumvar_AddRef, + enumvar_Release, + enumvar_Next, + enumvar_Skip, + enumvar_Reset, + enumvar_Clone +}; + +static HRESULT NewEnum_create(TaskFolderCollection *folders, IUnknown **obj) +{ + EnumVARIANT *enumvar; + + enumvar = heap_alloc(sizeof(*enumvar)); + if (!enumvar) return E_OUTOFMEMORY; + + enumvar->IEnumVARIANT_iface.lpVtbl = &EnumVARIANT_vtbl; + enumvar->ref = 1; + enumvar->pos = 0; + enumvar->folders = folders; + ITaskFolderCollection_AddRef(&folders->ITaskFolderCollection_iface); + + *obj = (IUnknown *)&enumvar->IEnumVARIANT_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d9f622e..f30a1be 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -544,10 +544,7 @@ static void test_FolderCollection(void) ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); hr = ITaskFolderCollection_get__NewEnum(folders, &unknown); -todo_wine ok(hr == S_OK, "get__NewEnum error %#x\n", hr); - /* FIXME: remove once implemented */ - if (hr != S_OK) goto failed; hr = IUnknown_QueryInterface(unknown, &IID_IEnumUnknown, (void **)&enumvar); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void **)&enumvar); @@ -592,7 +589,6 @@ todo_wine IDispatch_Release(V_DISPATCH(&var[0])); IDispatch_Release(V_DISPATCH(&var[1])); -failed: ITaskFolderCollection_Release(folders); hr = ITaskFolder_DeleteFolder(root, Wine_Folder1, 0);

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolderCollection::get_Item.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: eeffc8f073522c2ceb5f34a6c8618c625d68ede5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeffc8f073522c2ceb5f34a6c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:45 2014 +0900 taskschd: Implement ITaskFolderCollection::get_Item. --- dlls/taskschd/folder_collection.c | 59 ++++++++++++++++++++++++++++++++++--- dlls/taskschd/tests/scheduler.c | 12 ++++---- 2 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index f1a3f3f..e8e4933 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -127,14 +127,65 @@ static HRESULT WINAPI folders_Invoke(ITaskFolderCollection *iface, DISPID dispid static HRESULT WINAPI folders_get_Count(ITaskFolderCollection *iface, LONG *count) { - FIXME("%p,%p: stub\n", iface, count); - return E_NOTIMPL; + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + + TRACE("%p,%p\n", iface, count); + + if (!count) return E_POINTER; + + *count = folders->count; + + return S_OK; +} + +static LONG get_var_int(const VARIANT *var) +{ + switch(V_VT(var)) + { + case VT_I1: + case VT_UI1: + return V_UI1(var); + + case VT_I2: + case VT_UI2: + return V_UI2(var); + + case VT_I4: + case VT_UI4: + return V_UI4(var); + + case VT_I8: + case VT_UI8: + return V_UI8(var); + + case VT_INT: + case VT_UINT: + return V_UINT(var); + + default: + FIXME("unsupported variant type %d\n", V_VT(var)); + return 0; + } } static HRESULT WINAPI folders_get_Item(ITaskFolderCollection *iface, VARIANT index, ITaskFolder **folder) { - FIXME("%p,%s,%p: stub\n", iface, debugstr_variant(&index), folder); - return E_NOTIMPL; + TaskFolderCollection *folders = impl_from_ITaskFolderCollection(iface); + LONG idx; + + TRACE("%p,%s,%p\n", iface, debugstr_variant(&index), folder); + + if (!folder) return E_POINTER; + + if (V_VT(&index) == VT_BSTR) + return TaskFolder_create(folders->path, V_BSTR(&index), folder, FALSE); + + idx = get_var_int(&index); + /* collections are 1 based */ + if (idx < 1 || idx > folders->count) + return E_INVALIDARG; + + return TaskFolder_create(folders->path, folders->list[idx - 1], folder, FALSE); } static HRESULT WINAPI folders_get__NewEnum(ITaskFolderCollection *iface, IUnknown **penum) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 700fab2..d9f622e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -455,11 +455,12 @@ static void test_FolderCollection(void) ITaskFolder_Release(folder); + hr = ITaskFolderCollection_get_Count(folders, NULL); + ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + count = 0; hr = ITaskFolderCollection_get_Count(folders, &count); -todo_wine ok(hr == S_OK, "get_Count error %#x\n", hr); -todo_wine ok(count == 2, "expected 2, got %d\n", count); hr = ITaskFolder_CreateFolder(root, Wine_Folder3, v_null, &subfolder); @@ -468,12 +469,8 @@ todo_wine count = 0; hr = ITaskFolderCollection_get_Count(folders, &count); -todo_wine ok(hr == S_OK, "get_Count error %#x\n", hr); -todo_wine ok(count == 2, "expected 2, got %d\n", count); - /* FIXME: remove once implemented */ - if (!count) goto failed; for (i = 0; i < sizeof(vt)/sizeof(vt[0]); i++) { @@ -547,7 +544,10 @@ todo_wine ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); hr = ITaskFolderCollection_get__NewEnum(folders, &unknown); +todo_wine ok(hr == S_OK, "get__NewEnum error %#x\n", hr); + /* FIXME: remove once implemented */ + if (hr != S_OK) goto failed; hr = IUnknown_QueryInterface(unknown, &IID_IEnumUnknown, (void **)&enumvar); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void **)&enumvar);

1 0

Piotr Caban : msvcm90: Share the source code with msvcm80.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 0e658d111c41da4188f393fd2a1b06b25de6a7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e658d111c41da4188f393fd2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 10:10:01 2014 +0100 msvcm90: Share the source code with msvcm80. --- dlls/msvcm80/Makefile.in | 2 +- dlls/msvcm80/{msvcm80_main.c => msvcm_main.c} | 0 dlls/msvcm90/Makefile.in | 3 +- dlls/msvcm90/msvcm90_main.c | 43 ------------------------- 4 files changed, 3 insertions(+), 45 deletions(-) diff --git a/dlls/msvcm80/Makefile.in b/dlls/msvcm80/Makefile.in index bbef214..c3bf20e 100644 --- a/dlls/msvcm80/Makefile.in +++ b/dlls/msvcm80/Makefile.in @@ -1,4 +1,4 @@ MODULE = msvcm80.dll C_SRCS = \ - msvcm80_main.c + msvcm_main.c diff --git a/dlls/msvcm80/msvcm80_main.c b/dlls/msvcm80/msvcm_main.c similarity index 100% rename from dlls/msvcm80/msvcm80_main.c rename to dlls/msvcm80/msvcm_main.c diff --git a/dlls/msvcm90/Makefile.in b/dlls/msvcm90/Makefile.in index a543df3..6b03a53 100644 --- a/dlls/msvcm90/Makefile.in +++ b/dlls/msvcm90/Makefile.in @@ -1,4 +1,5 @@ MODULE = msvcm90.dll +PARENTSRC = ../msvcm80 C_SRCS = \ - msvcm90_main.c + msvcm_main.c diff --git a/dlls/msvcm90/msvcm90_main.c b/dlls/msvcm90/msvcm90_main.c deleted file mode 100644 index 6019afd..0000000 --- a/dlls/msvcm90/msvcm90_main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2012 Vincent Povirk for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcm90); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Henri Verbeet : dxgi: Implement IDXGIAdapter1.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: ac84e9b726873687c1efb3a08ea6ed9395a8e920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac84e9b726873687c1efb3a08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:25 2014 +0100 dxgi: Implement IDXGIAdapter1. --- dlls/dxgi/adapter.c | 64 ++++++++++++++++++++++++++++++--------------- dlls/dxgi/tests/device.c | 29 ++++++++++++++++++++ include/wine/winedxgi.idl | 2 +- 3 files changed, 73 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 87d886b..d18db85 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -38,6 +38,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *i if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IDXGIAdapter) + || IsEqualGUID(riid, &IID_IDXGIAdapter1) || IsEqualGUID(riid, &IID_IWineDXGIAdapter)) { IUnknown_AddRef(iface); @@ -135,9 +136,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC1 *desc) { - struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct wined3d_adapter_identifier adapter_id; char description[128]; struct wined3d *wined3d; @@ -145,38 +146,57 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, D TRACE("iface %p, desc %p.\n", iface, desc); - if (!desc) return E_INVALIDARG; + if (!desc) + return E_INVALIDARG; - wined3d = IWineDXGIFactory_get_wined3d(This->parent); + wined3d = IWineDXGIFactory_get_wined3d(adapter->parent); adapter_id.driver_size = 0; adapter_id.description = description; adapter_id.description_size = sizeof(description); adapter_id.device_name_size = 0; EnterCriticalSection(&dxgi_cs); - hr = wined3d_get_adapter_identifier(wined3d, This->ordinal, 0, &adapter_id); + hr = wined3d_get_adapter_identifier(wined3d, adapter->ordinal, 0, &adapter_id); wined3d_decref(wined3d); LeaveCriticalSection(&dxgi_cs); - if (SUCCEEDED(hr)) + if (FAILED(hr)) + return hr; + + if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, 128)) { - if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, 128)) - { - DWORD err = GetLastError(); - ERR("Failed to translate description %s (%#x).\n", debugstr_a(description), err); - hr = E_FAIL; - } - - desc->VendorId = adapter_id.vendor_id; - desc->DeviceId = adapter_id.device_id; - desc->SubSysId = adapter_id.subsystem_id; - desc->Revision = adapter_id.revision; - desc->DedicatedVideoMemory = adapter_id.video_memory; - desc->DedicatedSystemMemory = 0; /* FIXME */ - desc->SharedSystemMemory = 0; /* FIXME */ - memcpy(&desc->AdapterLuid, &adapter_id.adapter_luid, sizeof(desc->AdapterLuid)); + DWORD err = GetLastError(); + ERR("Failed to translate description %s (%#x).\n", debugstr_a(description), err); + hr = E_FAIL; } + desc->VendorId = adapter_id.vendor_id; + desc->DeviceId = adapter_id.device_id; + desc->SubSysId = adapter_id.subsystem_id; + desc->Revision = adapter_id.revision; + desc->DedicatedVideoMemory = adapter_id.video_memory; + desc->DedicatedSystemMemory = 0; /* FIXME */ + desc->SharedSystemMemory = 0; /* FIXME */ + memcpy(&desc->AdapterLuid, &adapter_id.adapter_luid, sizeof(desc->AdapterLuid)); + desc->Flags = 0; + + return hr; +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) +{ + DXGI_ADAPTER_DESC1 desc1; + HRESULT hr; + + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return E_INVALIDARG; + + if (FAILED(hr = dxgi_adapter_GetDesc1(iface, &desc1))) + return hr; + memcpy(desc, &desc1, sizeof(*desc)); + return hr; } @@ -214,6 +234,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_EnumOutputs, dxgi_adapter_GetDesc, dxgi_adapter_CheckInterfaceSupport, + /* IDXGIAdapter1 methods */ + dxgi_adapter_GetDesc1, /* IWineDXGIAdapter methods */ dxgi_adapter_get_ordinal, }; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 9be59db..b8e7b33 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -101,6 +101,8 @@ static void test_device_interfaces(IDXGIDevice *device) static void test_adapter_desc(IDXGIDevice *device) { + DXGI_ADAPTER_DESC1 desc1; + IDXGIAdapter1 *adapter1; DXGI_ADAPTER_DESC desc; IDXGIAdapter *adapter; HRESULT hr; @@ -126,6 +128,33 @@ static void test_adapter_desc(IDXGIDevice *device) desc.SharedSystemMemory, desc.SharedSystemMemory / (1024 * 1024)); trace("LUID: %08x:%08x.\n", desc.AdapterLuid.HighPart, desc.AdapterLuid.LowPart); + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + if (hr == E_NOINTERFACE) + goto done; + + hr = IDXGIAdapter1_GetDesc1(adapter1, &desc1); + ok(SUCCEEDED(hr), "GetDesc1 failed, hr %#x.\n", hr); + + ok(!lstrcmpW(desc.Description, desc1.Description), + "Got unexpected description %s.\n", wine_dbgstr_w(desc1.Description)); + ok(desc1.VendorId == desc.VendorId, "Got unexpected vendor ID %04x.\n", desc1.VendorId); + ok(desc1.DeviceId == desc.DeviceId, "Got unexpected device ID %04x.\n", desc1.DeviceId); + ok(desc1.SubSysId == desc.SubSysId, "Got unexpected sub system ID %04x.\n", desc1.SubSysId); + ok(desc1.Revision == desc.Revision, "Got unexpected revision %02x.\n", desc1.Revision); + ok(desc1.DedicatedVideoMemory == desc.DedicatedVideoMemory, + "Got unexpected dedicated video memory %lu.\n", desc1.DedicatedVideoMemory); + ok(desc1.DedicatedSystemMemory == desc.DedicatedSystemMemory, + "Got unexpected dedicated system memory %lu.\n", desc1.DedicatedSystemMemory); + ok(desc1.SharedSystemMemory == desc.SharedSystemMemory, + "Got unexpected shared system memory %lu.\n", desc1.SharedSystemMemory); + ok(!memcmp(&desc.AdapterLuid, &desc1.AdapterLuid, sizeof(desc.AdapterLuid)), + "Got unexpected adapter LUID %08x:%08x.\n", desc1.AdapterLuid.HighPart, desc1.AdapterLuid.LowPart); + trace("Flags: %08x.\n", desc1.Flags); + + IDXGIAdapter1_Release(adapter1); + +done: IDXGIAdapter_Release(adapter); } diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 363030a..a3baece 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -33,7 +33,7 @@ interface IWineDXGIFactory : IDXGIFactory local, uuid(ab1de34c-2963-4ffd-8493-40f580e510e5) ] -interface IWineDXGIAdapter : IDXGIAdapter +interface IWineDXGIAdapter : IDXGIAdapter1 { UINT get_ordinal(); }

1 0