January 2015 - Wine-Commits

Matteo Bruni : wined3d: Use the core version of the gl*Buffer* functions.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 79a0dece8b2a27979835076914a21f468515d8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a0dece8b2a2797983507691… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 14 16:27:31 2015 +0100 wined3d: Use the core version of the gl*Buffer* functions. --- dlls/wined3d/buffer.c | 56 ++++++++++++++++---------------- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 26 ++++++++++++--- dlls/wined3d/state.c | 32 +++++++++---------- dlls/wined3d/surface.c | 86 +++++++++++++++++++++++++------------------------- dlls/wined3d/volume.c | 42 ++++++++++++------------ 6 files changed, 130 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79a0dece8b2a279798350…

1 0

Michael Stefaniuc : dmime/tests: Remove unused assigments (PVS-Studio).
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 4ffcae35d294a0133a83168641b0154e8034a2fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ffcae35d294a0133a8316864… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 12:09:15 2015 +0100 dmime/tests: Remove unused assigments (PVS-Studio). --- dlls/dmime/tests/dmime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 03b0a37..f7c018f 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -133,7 +133,7 @@ static void test_COM_audiopathconfig(void) ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IPersistStream_Release(ps); + IPersistStream_Release(ps); hr = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); @@ -358,7 +358,7 @@ static void test_COM_track(void) ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IPersistStream_Release(ps); + IPersistStream_Release(ps); hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmloader/tests: Test the return of CoCreateInstance ( PVS-Studio).
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 9d52d8c07dc6e6b50c48e7120f951bcb38000ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d52d8c07dc6e6b50c48e7120… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 12:14:10 2015 +0100 dmloader/tests: Test the return of CoCreateInstance (PVS-Studio). --- dlls/dmloader/tests/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 46a2b93..3083ac5 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -47,6 +47,7 @@ static void test_release_object(void) IDirectMusicLoader8* loader = NULL; hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); + ok(hr == S_OK, "Couldn't create Loader %08x\n", hr); hr = IDirectMusicLoader_ReleaseObject(loader, NULL); ok(hr == E_POINTER, "Expected E_POINTER, received %#x\n", hr);

1 0

Michael Müller : shlwapi: Correctly treat '.' when enumerating files in PathIsDirectoryEmptyW.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 8758a8a671c14d4e4c1303ea9dacd5e7066e5475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8758a8a671c14d4e4c1303ea9… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Sep 28 17:30:45 2014 +0200 shlwapi: Correctly treat '.' when enumerating files in PathIsDirectoryEmptyW. --- dlls/shlwapi/path.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index a3b462c..dae949a 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3872,13 +3872,13 @@ BOOL WINAPI PathIsDirectoryEmptyW(LPCWSTR lpszPath) WCHAR szSearch[MAX_PATH]; DWORD dwLen; HANDLE hfind; - BOOL retVal = FALSE; + BOOL retVal = TRUE; WIN32_FIND_DATAW find_data; TRACE("(%s)\n",debugstr_w(lpszPath)); if (!lpszPath || !PathIsDirectoryW(lpszPath)) - return FALSE; + return FALSE; lstrcpynW(szSearch, lpszPath, MAX_PATH); PathAddBackslashW(szSearch); @@ -3888,14 +3888,23 @@ BOOL WINAPI PathIsDirectoryEmptyW(LPCWSTR lpszPath) strcpyW(szSearch + dwLen, szAllFiles); hfind = FindFirstFileW(szSearch, &find_data); - if (hfind != INVALID_HANDLE_VALUE) + if (hfind == INVALID_HANDLE_VALUE) + return FALSE; + + do { - if (find_data.cFileName[0] == '.' && find_data.cFileName[1] == '.') - /* The only directory entry should be the parent */ - retVal = !FindNextFileW(hfind, &find_data); - FindClose(hfind); + if (find_data.cFileName[0] == '.') + { + if (find_data.cFileName[1] == '\0') continue; + if (find_data.cFileName[1] == '.' && find_data.cFileName[2] == '\0') continue; + } + + retVal = FALSE; + break; } + while (FindNextFileW(hfind, &find_data)); + FindClose(hfind); return retVal; }

1 0

Sebastian Lackner : ntoskrnl: Initialize irp.Tail.Overlay.OriginalFileObject with stub file object.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: cffe06af801471584344462e6118c8bc7ab73b6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cffe06af801471584344462e6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 10 23:48:14 2014 +0100 ntoskrnl: Initialize irp.Tail.Overlay.OriginalFileObject with stub file object. --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c10377a..af1626d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -143,6 +143,7 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, IRP irp; MDL mdl; IO_STACK_LOCATION irpsp; + FILE_OBJECT file; PDRIVER_DISPATCH dispatch = device->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL]; NTSTATUS status; LARGE_INTEGER count; @@ -153,6 +154,7 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, memset( &irp, 0x55, sizeof(irp) ); memset( &irpsp, 0x66, sizeof(irpsp) ); memset( &mdl, 0x77, sizeof(mdl) ); + memset( &file, 0x88, sizeof(file) ); irp.RequestorMode = UserMode; if ((code & 3) == METHOD_BUFFERED) @@ -167,6 +169,7 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, irp.UserBuffer = out_buff; irp.MdlAddress = &mdl; irp.Tail.Overlay.s.u2.CurrentStackLocation = &irpsp; + irp.Tail.Overlay.OriginalFileObject = &file; irp.UserIosb = NULL; irpsp.MajorFunction = IRP_MJ_DEVICE_CONTROL; @@ -183,6 +186,9 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, mdl.ByteCount = *out_size; mdl.ByteOffset = 0; + file.FsContext = NULL; + file.FsContext2 = NULL; + device->CurrentIrp = &irp; KeQueryTickCount( &count ); /* update the global KeTickCount */

1 0

Austin English : iphlpapi: Add FreeMibTable implementation.
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: 44933230f63402ad079c8d22c024119f8d5228e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44933230f63402ad079c8d22c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 12 14:50:43 2015 -0800 iphlpapi: Add FreeMibTable implementation. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index fcb6d72..228f64f 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -66,7 +66,7 @@ #@ stub FlushIpNetTable2 @ stub FlushIpNetTableFromStack #@ stub FlushIpPathTable -#@ stub FreeMibTable +@ stdcall FreeMibTable( ptr ) @ stdcall GetAdapterIndex( wstr ptr ) @ stub GetAdapterOrderMap @ stdcall GetAdaptersAddresses( long long ptr ptr ptr ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f04e12a..59f3593 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -442,6 +442,20 @@ DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex) return ERROR_NOT_SUPPORTED; } +/****************************************************************** + * FreeMibTable (IPHLPAPI.@) + * + * Free buffer allocated by network functions + * + * PARAMS + * ptr [In] pointer to the buffer to free + * + */ +void WINAPI FreeMibTable(void *ptr) +{ + TRACE("(%p)\n", ptr); + HeapFree(GetProcessHeap(), 0, ptr); +} /****************************************************************** * GetAdapterIndex (IPHLPAPI.@)

1 0

Qian Hong : atl100/tests: Added more tests for class AtlAxWin100 and AtlAxWinLic100.
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: 0486b4368d63aa6cb97727c4d97e6030dfab431f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0486b4368d63aa6cb97727c4d… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Jan 13 17:01:42 2015 +0800 atl100/tests: Added more tests for class AtlAxWin100 and AtlAxWinLic100. --- dlls/atl100/tests/atl.c | 170 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 156 insertions(+), 14 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 96abf57..dcc199f 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -591,28 +591,170 @@ static void test_source_iface(void) static void test_ax_win(void) { - BOOL ret; + DWORD ret, ret_size, i; + HRESULT res; + HWND hwnd; + HANDLE hfile; + IUnknown *control; + WNDPROC wndproc[2] = {NULL, NULL}; + WCHAR file_uri1W[MAX_PATH], pathW[MAX_PATH]; WNDCLASSEXW wcex; - static const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0}; - static const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0}; static HMODULE hinstance = 0; + static const WCHAR emptyW[] = {'\0'}; + static const WCHAR randomW[] = {'r','a','n','d','o','m','\0'}; + static const WCHAR progid1W[] = {'S','h','e','l','l','.','E','x','p','l','o','r','e','r','.','2','\0'}; + static const WCHAR clsid1W[] = {'{','8','8','5','6','f','9','6','1','-','3','4','0','a','-', + '1','1','d','0','-','a','9','6','b','-', + '0','0','c','0','4','f','d','7','0','5','a','2','}','\0'}; + static const WCHAR url1W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q', + '.','o','r','g','/','t','e','s','t','s','/','w','i','n','e','h','q','_', + 's','n','a','p','s','h','o','t','/','\0'}; + static const WCHAR mshtml1W[] = {'m','s','h','t','m','l',':','<','h','t','m','l','>','<','b','o','d','y','>', + 't','e','s','t','<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; + static const WCHAR mshtml2W[] = {'M','S','H','T','M','L',':','<','h','t','m','l','>','<','b','o','d','y','>', + 't','e','s','t','<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; + static const WCHAR mshtml3W[] = {'<','h','t','m','l','>','<','b','o','d','y','>', 't','e','s','t', + '<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; + static const WCHAR fileW[] = {'f','i','l','e',':','/','/','/','\0'}; + static const WCHAR html_fileW[] = {'t','e','s','t','.','h','t','m','l','\0'}; + static const char html_str[] = "<html><body>test</body><html>"; + static const WCHAR cls_names[][16] = + { + {'A','t','l','A','x','W','i','n','1','0','0',0}, + {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0} + }; ret = AtlAxWinInit(); ok(ret, "AtlAxWinInit failed\n"); hinstance = GetModuleHandleA(NULL); - memset(&wcex, 0, sizeof(wcex)); - wcex.cbSize = sizeof(wcex); - ret = GetClassInfoExW(hinstance, AtlAxWin100, &wcex); - ok(ret, "AtlAxWin100 has not registered\n"); - ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); - - memset(&wcex, 0, sizeof(wcex)); - wcex.cbSize = sizeof(wcex); - ret = GetClassInfoExW(hinstance, AtlAxWinLic100, &wcex); - ok(ret, "AtlAxWinLic100 has not registered\n"); - ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); + for (i = 0; i < 2; i++) + { + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, cls_names[i], &wcex); + ok(ret, "%s has not registered\n", wine_dbgstr_w(cls_names[i])); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); + wndproc[i] = wcex.lpfnWndProc; + + hwnd = CreateWindowW(cls_names[i], NULL, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = (IUnknown *)0xdeadbeef; + res = AtlAxGetControl(hwnd, &control); + todo_wine ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); + todo_wine ok(!control, "returned %p\n", control); + if (control) IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], emptyW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = (IUnknown *)0xdeadbeef; + res = AtlAxGetControl(hwnd, &control); + todo_wine ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); + todo_wine ok(!control, "returned %p\n", control); + if (control) IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], randomW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + todo_wine ok(!hwnd, "returned %p\n", hwnd); + if(hwnd) DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], progid1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], clsid1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], url1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + /* test html stream with "MSHTML:" prefix */ + hwnd = CreateWindowW(cls_names[i], mshtml1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + hwnd = CreateWindowW(cls_names[i], mshtml2W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + /* test html stream without "MSHTML:" prefix */ + hwnd = CreateWindowW(cls_names[i], mshtml3W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + todo_wine ok(!hwnd, "returned %p\n", hwnd); + if(hwnd) DestroyWindow(hwnd); + + ret = GetTempPathW(MAX_PATH, pathW); + ok(ret, "GetTempPath failed!\n"); + lstrcatW(pathW, html_fileW); + hfile = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); + ret = WriteFile(hfile, html_str, sizeof(html_str), &ret_size, NULL); + ok(ret, "WriteFile failed\n"); + CloseHandle(hfile); + + /* test C:// scheme */ + hwnd = CreateWindowW(cls_names[i], pathW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + /* test file:// scheme */ + lstrcpyW(file_uri1W, fileW); + lstrcatW(file_uri1W, pathW); + hwnd = CreateWindowW(cls_names[i], file_uri1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + + /* test file:// scheme on non-existent file */ + ret = DeleteFileW(pathW); + ok(ret, "DeleteFile failed!\n"); + hwnd = CreateWindowW(cls_names[i], file_uri1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed!\n"); + control = NULL; + res = AtlAxGetControl(hwnd, &control); + ok(res == S_OK, "AtlAxGetControl failed with res %08x\n", res); + ok(control != NULL, "AtlAxGetControl failed!\n"); + IUnknown_Release(control); + DestroyWindow(hwnd); + } + todo_wine ok(wndproc[0] != wndproc[1], "expected different proc!\n"); } START_TEST(atl)

1 0

Marcus Meissner : mshtml: Check for failed allocs (Coverity).
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: 76fef29cd3fc8283819b457882d5a5cf00a05255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fef29cd3fc8283819b45788… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 11 23:40:19 2015 +0100 mshtml: Check for failed allocs (Coverity). --- dlls/mshtml/dispex.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 7f6d5c5..a97f09d 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -345,9 +345,18 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) } data = heap_alloc(sizeof(dispex_data_t)); + if (!data) { + ERR("Out of memory\n"); + return NULL; + } data->func_cnt = 0; data->func_disp_cnt = 0; data->funcs = heap_alloc_zero(size*sizeof(func_info_t)); + if (!data->funcs) { + heap_free (data); + ERR("Out of memory\n"); + return NULL; + } list_add_tail(&dispex_data_list, &data->entry); while(*tid) {

1 0

Hans Leidekker : wbemdisp: Implement ISWbemObjectSet::get__NewEnum.
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: c245fb66f89da61818b743e1f1df9b00343968dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c245fb66f89da61818b743e1f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 14 15:36:16 2015 +0100 wbemdisp: Implement ISWbemObjectSet::get__NewEnum. --- dlls/wbemdisp/locator.c | 156 +++++++++++++++++++++++++++++++++++++++-- dlls/wbemdisp/tests/wbemdisp.c | 69 ++++++++++++++++++ 2 files changed, 221 insertions(+), 4 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 9731630..c3103fa 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); +static HRESULT EnumVARIANT_create( ISWbemObjectSet *, IEnumVARIANT ** ); + enum type_id { ISWbemLocator_tid, @@ -401,8 +403,11 @@ static HRESULT WINAPI objectset_get__NewEnum( ISWbemObjectSet *iface, IUnknown **pUnk ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + + TRACE( "%p, %p\n", objectset, pUnk ); + + return EnumVARIANT_create( iface, (IEnumVARIANT **)pUnk ); } static HRESULT WINAPI objectset_Item( @@ -420,12 +425,20 @@ static HRESULT WINAPI objectset_get_Count( LONG *iCount ) { struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + LONG count = 0, total = 0; TRACE( "%p, %p\n", objectset, iCount ); - *iCount = 0; + while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) count++; + IEnumWbemClassObject_Reset( objectset->objectenum ); - while (!IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 )) (*iCount)++; + while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) total++; + + count = total - count; + IEnumWbemClassObject_Reset( objectset->objectenum ); + while (count--) IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ); + + *iCount = total; return S_OK; } @@ -479,6 +492,141 @@ static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISW return S_OK; } +struct enumvar +{ + IEnumVARIANT IEnumVARIANT_iface; + LONG refs; + ISWbemObjectSet *objectset; +}; + +static inline struct enumvar *impl_from_IEnumVARIANT( + IEnumVARIANT *iface ) +{ + return CONTAINING_RECORD( iface, struct enumvar, IEnumVARIANT_iface ); +} + +static ULONG WINAPI enumvar_AddRef( + IEnumVARIANT *iface ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + return InterlockedIncrement( &enumvar->refs ); +} + +static ULONG WINAPI enumvar_Release( + IEnumVARIANT *iface ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + LONG refs = InterlockedDecrement( &enumvar->refs ); + if (!refs) + { + TRACE( "destroying %p\n", enumvar ); + ISWbemObjectSet_Release( enumvar->objectset ); + heap_free( enumvar ); + } + return refs; +} + +static HRESULT WINAPI enumvar_QueryInterface( + IEnumVARIANT *iface, + REFIID riid, + void **ppvObject ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + + TRACE( "%p %s %p\n", enumvar, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_IEnumVARIANT ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = enumvar; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + IEnumVARIANT_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI enumvar_Next( IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + struct objectset *objectset = impl_from_ISWbemObjectSet( enumvar->objectset ); + IWbemClassObject *obj; + ULONG count = 0; + + TRACE( "%p, %u, %p, %p\n", iface, celt, var, fetched ); + + if (celt) IEnumWbemClassObject_Next( objectset->objectenum, WBEM_INFINITE, 1, &obj, &count ); + if (count) + { + ISWbemObject *sobj; + HRESULT hr; + + hr = SWbemObject_create( obj, &sobj ); + IWbemClassObject_Release( obj ); + if (FAILED( hr )) return hr; + + V_VT( var ) = VT_DISPATCH; + V_DISPATCH( var ) = (IDispatch *)sobj; + } + if (fetched) *fetched = count; + return (count < celt) ? S_FALSE : S_OK; +} + +static HRESULT WINAPI enumvar_Skip( IEnumVARIANT *iface, ULONG celt ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + struct objectset *objectset = impl_from_ISWbemObjectSet( enumvar->objectset ); + + TRACE( "%p, %u\n", iface, celt ); + + return IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, celt ); +} + +static HRESULT WINAPI enumvar_Reset( IEnumVARIANT *iface ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + struct objectset *objectset = impl_from_ISWbemObjectSet( enumvar->objectset ); + + TRACE( "%p\n", iface ); + + return IEnumWbemClassObject_Reset( objectset->objectenum ); +} + +static HRESULT WINAPI enumvar_Clone( IEnumVARIANT *iface, IEnumVARIANT **penum ) +{ + FIXME( "%p, %p\n", iface, penum ); + return E_NOTIMPL; +} + +static const struct IEnumVARIANTVtbl enumvar_vtbl = +{ + enumvar_QueryInterface, + enumvar_AddRef, + enumvar_Release, + enumvar_Next, + enumvar_Skip, + enumvar_Reset, + enumvar_Clone +}; + +static HRESULT EnumVARIANT_create( ISWbemObjectSet *objectset, IEnumVARIANT **obj ) +{ + struct enumvar *enumvar; + + if (!(enumvar = heap_alloc( sizeof(*enumvar) ))) return E_OUTOFMEMORY; + enumvar->IEnumVARIANT_iface.lpVtbl = &enumvar_vtbl; + enumvar->refs = 1; + enumvar->objectset = objectset; + ISWbemObjectSet_AddRef( enumvar->objectset ); + + *obj = &enumvar->IEnumVARIANT_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + struct services { ISWbemServices ISWbemServices_iface; diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 8c0b628..863115b 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -29,6 +29,7 @@ DEFINE_GUID(CLSID_WINMGMTS,0x172bddf8,0xceea,0x11d1,0x8b,0x05,0x00,0x60,0x08,0x0 static void test_ParseDisplayName(void) { + static const WCHAR biosW[] = {'W','i','n','3','2','_','B','i','o','s',0}; static const WCHAR name1[] = {'w','i','n','m','g','m','t','s',':',0}; static const WCHAR name2[] = @@ -90,6 +91,74 @@ static void test_ParseDisplayName(void) } } + str = SysAllocString( name1 ); + eaten = 0xdeadbeef; + moniker = NULL; + hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); + SysFreeString( str ); + ok( hr == S_OK, "got %x\n", hr ); + ok( eaten == lstrlenW(name1), "got %u\n", eaten ); + if (moniker) + { + ISWbemServices *services = NULL; + + hr = IMoniker_BindToObject( moniker, ctx, NULL, &IID_IUnknown, (void **)&services ); + ok( hr == S_OK, "got %x\n", hr ); + if (services) + { + ISWbemObjectSet *objectset = NULL; + + str = SysAllocString( biosW ); + hr = ISWbemServices_InstancesOf( services, str, 0, NULL, &objectset ); + SysFreeString( str ); + ok( hr == S_OK, "got %x\n", hr ); + if (objectset) + { + hr = ISWbemObjectSet_get__NewEnum( objectset, &obj ); + ok( hr == S_OK, "got %x\n", hr ); + if (obj) + { + IEnumVARIANT *enumvar = NULL; + + hr = IUnknown_QueryInterface( obj, &IID_IEnumVARIANT, (void **)&enumvar ); + ok( hr == S_OK, "got %x\n", hr ); + + if (enumvar) + { + VARIANT var; + ULONG fetched; + + fetched = 0xdeadbeef; + hr = IEnumVARIANT_Next( enumvar, 0, &var, &fetched ); + ok( hr == S_OK, "got %x\n", hr ); + ok( !fetched, "got %u\n", fetched ); + + fetched = 0xdeadbeef; + V_VT( &var ) = VT_ERROR; + V_ERROR( &var ) = 0xdeadbeef; + hr = IEnumVARIANT_Next( enumvar, 1, &var, &fetched ); + ok( hr == S_OK, "got %x\n", hr ); + ok( fetched == 1, "got %u\n", fetched ); + ok( V_VT( &var ) == VT_DISPATCH, "got %u\n", V_VT( &var ) ); + ok( V_DISPATCH( &var ) != (IDispatch *)0xdeadbeef, "got %u\n", V_VT( &var ) ); + VariantClear( &var ); + + fetched = 0xdeadbeef; + hr = IEnumVARIANT_Next( enumvar, 1, &var, &fetched ); + ok( hr == S_FALSE, "got %x\n", hr ); + ok( !fetched, "got %u\n", fetched ); + + IEnumVARIANT_Release( enumvar ); + } + IUnknown_Release( obj ); + } + ISWbemObjectSet_Release( objectset ); + } + IUnknown_Release( services ); + } + IMoniker_Release( moniker ); + } + IBindCtx_Release( ctx ); IParseDisplayName_Release( displayname ); }

1 0

Nikolay Sivov : scrrun: Fix refcount on GetTypeInfo().
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: c1a3a1d5168ba5a4ba7704e5b7d275b005972729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a3a1d5168ba5a4ba7704e5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 14 15:23:06 2015 +0300 scrrun: Fix refcount on GetTypeInfo(). --- dlls/scrrun/scrrun.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index bad5b1c..3afcd50 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -152,6 +152,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) } *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(typeinfos[tid]); return S_OK; }

1 0