wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Frédéric Delanoy : dmime/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: cd4cd7661469e93adbdc370cb1bf7d4cf1b663df URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4cd7661469e93adbdc370cb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:28 2014 +0100 dmime/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/dmime/tests/performance.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 591ae1f..143eeed 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -31,18 +31,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(GUID_Bunk,0xFFFFFFFF,0xFFFF,0xFFFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF); -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 test_InitAudio(void) { IDirectMusicPerformance8 *idmusicperformance; @@ -128,7 +116,7 @@ static void test_createport(void) ok(portcaps.dwSize == sizeof(portcaps), "Got unexpected portcaps struct size: %08x\n", portcaps.dwSize); trace("portcaps(%u).dwFlags: %08x\n", i, portcaps.dwFlags); - trace("portcaps(%u).guidPort: %s\n", i, debugstr_guid(&portcaps.guidPort)); + trace("portcaps(%u).guidPort: %s\n", i, wine_dbgstr_guid(&portcaps.guidPort)); trace("portcaps(%u).dwClass: %08x\n", i, portcaps.dwClass); trace("portcaps(%u).dwType: %08x\n", i, portcaps.dwType); trace("portcaps(%u).dwMemorySize: %08x\n", i, portcaps.dwMemorySize);

1 0

Frédéric Delanoy : d3dxof/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 82889a695002c49fef8e699518115f72178cc92b URL: http://source.winehq.org/git/wine.git/?a=commit;h=82889a695002c49fef8e69951… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:27 2014 +0100 d3dxof/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/d3dxof/tests/d3dxof.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 67baac0..0573e4a 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -40,14 +40,6 @@ #define SEMICOLON_5X TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON -static inline void debugstr_guid( char *buf, const GUID *id ) -{ - sprintf(buf, "{%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] ); -} - static HMODULE hd3dxof; static HRESULT (WINAPI *pDirectXFileCreate)(LPDIRECTXFILE*); @@ -1120,8 +1112,6 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) char name[100]; GUID clsid; const GUID *clsid_type = NULL; - char str_clsid[40]; - char str_clsid_type[40]; DWORD len = 100; LPDIRECTXFILEOBJECT pChildObj; int i; @@ -1139,9 +1129,8 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); for (i = 0; i < level; i++) printf(" "); - debugstr_guid(str_clsid, &clsid); - debugstr_guid(str_clsid_type, clsid_type); - printf("Found object '%s' - %s - %s - %d\n", len ? name : "", str_clsid, str_clsid_type, size); + printf("Found object '%s' - %s - %s - %d\n", + len ? name : "", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(clsid_type), size); if (EXPAND_STRING && size == 4) {

1 0

Frédéric Delanoy : d3dx9_36/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: e4a0da373c387dab71641db3f40380d273f60394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0da373c387dab71641db3f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:26 2014 +0100 d3dx9_36/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/d3dx9_36/tests/xfile.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index d105aee..1a56f20 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -244,22 +244,12 @@ static void test_type_index_color(void) d3dxfile->lpVtbl->Release(d3dxfile); } -static inline void debugstr_guid(char* buf, const GUID *id) -{ - sprintf(buf, "{%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] ); -} - static void process_data(ID3DXFileData *xfile_data, int level) { HRESULT ret; char name[100]; GUID clsid; GUID clsid_type; - char str_clsid[40]; - char str_clsid_type[40]; SIZE_T len = sizeof(name); int i; const BYTE *data; @@ -277,10 +267,9 @@ static void process_data(ID3DXFileData *xfile_data, int level) for (i = 0; i < level; i++) printf(" "); - debugstr_guid(str_clsid, &clsid); - debugstr_guid(str_clsid_type, &clsid_type); - printf("Found object '%s' - %s - %s - %lu\n", len ? name : "", str_clsid, str_clsid_type, size); + printf("Found object '%s' - %s - %s - %lu\n", + len ? name : "", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&clsid_type), size); if (size) {

1 0

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

28 Jan '14

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 28 Jan '14

28 Jan '14

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 : apphelp/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 1b27173579dbbd8c9a2677a3d779cdc2612eaba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b27173579dbbd8c9a2677a3d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:23 2014 +0100 apphelp/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/apphelp/tests/apphelp.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/apphelp/tests/apphelp.c b/dlls/apphelp/tests/apphelp.c index fb2e3a3..8b264e9 100644 --- a/dlls/apphelp/tests/apphelp.c +++ b/dlls/apphelp/tests/apphelp.c @@ -47,18 +47,6 @@ static const CLSID * objects[] = { &test_UserAssist, NULL,}; -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_ApphelpCheckShellObject(void) { ULONGLONG flags; @@ -77,20 +65,20 @@ static void test_ApphelpCheckShellObject(void) SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(objects[i], FALSE, &flags); ok(res && (flags == 0), "%s 0: got %d and 0x%x%08x with 0x%x (expected TRUE and 0)\n", - debugstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + wine_dbgstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); flags = 0xdeadbeef; SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(objects[i], TRUE, &flags); ok(res && (flags == 0), "%s 1: got %d and 0x%x%08x with 0x%x (expected TRUE and 0)\n", - debugstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + wine_dbgstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); } /* NULL as pointer to flags is checked */ SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(&GUID_NULL, FALSE, NULL); - ok(res, "%s 0: got %d with 0x%x (expected != FALSE)\n", debugstr_guid(&GUID_NULL), res, GetLastError()); + ok(res, "%s 0: got %d with 0x%x (expected != FALSE)\n", wine_dbgstr_guid(&GUID_NULL), res, GetLastError()); /* NULL as CLSID* crash on Windows */ if (0)

1 0

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

28 Jan '14

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: Add some tests for ITaskFolderCollection:: get__NewEnum.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 979e2d3a4e5648f25a23b3b49a808121d1bae863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=979e2d3a4e5648f25a23b3b49… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:56 2014 +0900 taskschd: Add some tests for ITaskFolderCollection::get__NewEnum. --- dlls/taskschd/tests/scheduler.c | 59 +++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index f30a1be..3499d5e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -414,7 +414,7 @@ static void test_FolderCollection(void) ITaskFolderCollection *folders; IUnknown *unknown; IEnumVARIANT *enumvar; - LONG count, i; + ULONG count, i; VARIANT idx; static const int vt[] = { VT_I1, VT_I2, VT_I4, VT_I8, VT_UI1, VT_UI2, VT_UI4, VT_UI8, VT_INT, VT_UINT }; @@ -459,7 +459,7 @@ static void test_FolderCollection(void) ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); count = 0; - hr = ITaskFolderCollection_get_Count(folders, &count); + hr = ITaskFolderCollection_get_Count(folders, (LONG *)&count); ok(hr == S_OK, "get_Count error %#x\n", hr); ok(count == 2, "expected 2, got %d\n", count); @@ -468,10 +468,14 @@ static void test_FolderCollection(void) ITaskFolder_Release(subfolder); count = 0; - hr = ITaskFolderCollection_get_Count(folders, &count); + hr = ITaskFolderCollection_get_Count(folders, (LONG *)&count); ok(hr == S_OK, "get_Count error %#x\n", hr); ok(count == 2, "expected 2, got %d\n", count); + set_var(VT_INT, &idx, 0); + hr = ITaskFolderCollection_get_Item(folders, idx, NULL); + ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + for (i = 0; i < sizeof(vt)/sizeof(vt[0]); i++) { set_var(vt[i], &idx, 1); @@ -543,6 +547,9 @@ static void test_FolderCollection(void) hr = ITaskFolderCollection_QueryInterface(folders, &IID_IEnumUnknown, (void **)&enumvar); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + hr = ITaskFolderCollection_get__NewEnum(folders, NULL); + ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + hr = ITaskFolderCollection_get__NewEnum(folders, &unknown); ok(hr == S_OK, "get__NewEnum error %#x\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumUnknown, (void **)&enumvar); @@ -554,9 +561,51 @@ static void test_FolderCollection(void) hr = IUnknown_QueryInterface(unknown, &IID_IUnknown, (void **)&enumvar); ok(hr == S_OK, "QueryInterface error %#x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 0); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 2); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 1); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + count = -1; + hr = IEnumVARIANT_Next(enumvar, 1, NULL, &count); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + memset(var, 0, sizeof(var)); - count = 0; - hr = IEnumVARIANT_Next(enumvar, 3, var, (ULONG *)&count); + count = -1; + hr = IEnumVARIANT_Next(enumvar, 1, var, &count); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(count == 1, "expected 1, got %d\n", count); + hr = ITaskFolder_get_Path((ITaskFolder *)V_DISPATCH(&var[0]), &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder2), "expected \\Wine\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Name((ITaskFolder *)V_DISPATCH(&var[0]), &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + IDispatch_Release(V_DISPATCH(&var[0])); + + memset(var, 0, sizeof(var)); + count = -1; + hr = IEnumVARIANT_Next(enumvar, 1, var, &count); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(count == 0, "expected 0, got %d\n", count); + + count = -1; + hr = IEnumVARIANT_Next(enumvar, 1, NULL, &count); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(count == 0, "expected 0, got %d\n", count); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + memset(var, 0, sizeof(var)); + count = -1; + hr = IEnumVARIANT_Next(enumvar, 3, var, &count); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 2, "expected 2, got %d\n", count); ok(V_VT(&var[0]) == VT_DISPATCH, "expected VT_DISPATCH, got %d\n", V_VT(&var[0]));

1 0

Dmitry Timoshkov : taskschd: Implement IEnumVARIANT:: Clone for a folder collection.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: b5ed10c5ca1532c4bd4786e6973e9ddfc3330bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ed10c5ca1532c4bd4786e69… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:52 2014 +0900 taskschd: Implement IEnumVARIANT::Clone for a folder collection. --- dlls/taskschd/folder_collection.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index c8cc89b..1b8c39d 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -438,8 +438,11 @@ static HRESULT WINAPI enumvar_Reset(IEnumVARIANT *iface) static HRESULT WINAPI enumvar_Clone(IEnumVARIANT *iface, IEnumVARIANT **penum) { - FIXME("%p,%p: stub\n", iface, penum); - return E_NOTIMPL; + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + + TRACE("%p,%p\n", iface, penum); + + return NewEnum_create(enumvar->folders, (IUnknown **)penum); } static const struct IEnumVARIANTVtbl EnumVARIANT_vtbl =

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolderCollection:: get__NewEnum.
by Alexandre Julliard 28 Jan '14

28 Jan '14

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

← Newer
1
...
10
11
12
13
14
15
16
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014