November 2015 - Wine-commits

Piotr Caban : shell32: Improved IDataObject::QueryGetData implementation.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: 3a6ac6055511b14a7e26ba0200f36da418f80723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a6ac6055511b14a7e26ba020… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 24 15:34:17 2015 +0100 shell32: Improved IDataObject::QueryGetData implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dataobject.c | 2 +- dlls/shell32/tests/shlfolder.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 64a9401..cc7b63e 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -349,7 +349,7 @@ static HRESULT WINAPI IDataObject_fnQueryGetData(IDataObject *iface, LPFORMATETC for (i=0; i<MAX_FORMATS; i++) { if ((This->pFormatEtc[i].cfFormat == pformatetc->cfFormat) - && (This->pFormatEtc[i].tymed == pformatetc->tymed)) + && (This->pFormatEtc[i].tymed & pformatetc->tymed)) { return S_OK; } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 822acf6..7a53621 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5224,6 +5224,63 @@ static void test_SHCreateShellFolderViewEx(void) IShellFolder_Release(desktop); } +static void test_DataObject(void) +{ + IShellFolder *desktop; + IDataObject *data_obj; + HRESULT hres; + IEnumIDList *peidl; + LPITEMIDLIST apidl; + FORMATETC fmt; + DWORD cf_shellidlist; + STGMEDIUM medium; + + SHGetDesktopFolder(&desktop); + + hres = IShellFolder_EnumObjects(desktop, NULL, + SHCONTF_NONFOLDERS|SHCONTF_FOLDERS|SHCONTF_INCLUDEHIDDEN, &peidl); + ok(hres == S_OK, "got %x\n", hres); + + if(IEnumIDList_Next(peidl, 1, &apidl, NULL) != S_OK) { + skip("no files on desktop - skipping GetDataObject tests\n"); + IEnumIDList_Release(peidl); + IShellFolder_Release(desktop); + return; + } + IEnumIDList_Release(peidl); + + hres = IShellFolder_GetUIObjectOf(desktop, NULL, 1, (LPCITEMIDLIST*)&apidl, + &IID_IDataObject, NULL, (void**)&data_obj); + ok(hres == S_OK, "got %x\n", hres); + pILFree(apidl); + IShellFolder_Release(desktop); + + cf_shellidlist = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); + fmt.cfFormat = cf_shellidlist; + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + fmt.tymed = TYMED_HGLOBAL; + hres = IDataObject_QueryGetData(data_obj, &fmt); + ok(hres == S_OK, "got %x\n", hres); + + fmt.tymed = TYMED_HGLOBAL | TYMED_ISTREAM; + hres = IDataObject_QueryGetData(data_obj, &fmt); + ok(hres == S_OK, "got %x\n", hres); + + fmt.tymed = TYMED_ISTREAM; + hres = IDataObject_QueryGetData(data_obj, &fmt); + todo_wine ok(hres == S_FALSE, "got %x\n", hres); + + fmt.tymed = TYMED_HGLOBAL | TYMED_ISTREAM; + hres = IDataObject_GetData(data_obj, &fmt, &medium); + ok(hres == S_OK, "got %x\n", hres); + ok(medium.tymed == TYMED_HGLOBAL, "medium.tymed = %x\n", medium.tymed); + ReleaseStgMedium(&medium); + + IDataObject_Release(data_obj); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5264,6 +5321,7 @@ START_TEST(shlfolder) test_SHCreateDefaultContextMenu(); test_SHCreateShellFolderView(); test_SHCreateShellFolderViewEx(); + test_DataObject(); OleUninitialize(); }

1 0

Svante Signell : winepulse.drv: Avoid PATH_MAX in Windows code.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: 9d5173f77ddb95b7ed192015302786f82516c540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5173f77ddb95b7ed1920153… Author: Svante Signell <svante.signell(a)gmail.com> Date: Mon Nov 23 16:59:39 2015 +0100 winepulse.drv: Avoid PATH_MAX in Windows code. Signed-off-by: Svante Signell <svante.signell(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 215a53e..24972ab 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -442,7 +442,7 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { static HRESULT pulse_connect(void) { int len; - WCHAR path[PATH_MAX], *name; + WCHAR path[MAX_PATH], *name; char *str; if (!pulse_thread) @@ -521,7 +521,7 @@ static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol static HRESULT pulse_test_connect(void) { int len, ret; - WCHAR path[PATH_MAX], *name; + WCHAR path[MAX_PATH], *name; char *str; pa_operation *o;

1 0

Michael Müller : msvcp90: Basic_string_wchar_dtor should set EAX to 0 on i386.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: 27b5c93609ee3dad24d4fa7aeaaf1d4ba2d2ae4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b5c93609ee3dad24d4fa7ae… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Nov 24 05:17:12 2015 +0100 msvcp90: Basic_string_wchar_dtor should set EAX to 0 on i386. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp90.h | 4 ++-- dlls/msvcp90/string.c | 6 ++++-- dlls/msvcp90/tests/string.c | 25 +++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index e098c3d..2d0f4f8 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -94,7 +94,7 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor(basic_string_char*); basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr_len(basic_string_char*, const char*, MSVCP_size_t); basic_string_char* __thiscall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); -void __thiscall MSVCP_basic_string_char_dtor(basic_string_char*); +void* __thiscall MSVCP_basic_string_char_dtor(basic_string_char*); const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char*); void __thiscall MSVCP_basic_string_char_clear(basic_string_char*); basic_string_char* __thiscall MSVCP_basic_string_char_append_ch(basic_string_char*, char); @@ -123,7 +123,7 @@ typedef struct basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor(basic_string_wchar*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr_len(basic_string_wchar*, const wchar_t*, MSVCP_size_t); -void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar*); +void* __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar*); const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wchar*); void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_ch(basic_string_wchar*, wchar_t); diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 21c2c4f..9f0d7fe 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -973,10 +973,11 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor_ptr_ptr(basic_string_ /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4) -void __thiscall MSVCP_basic_string_char_dtor(basic_string_char *this) +void* __thiscall MSVCP_basic_string_char_dtor(basic_string_char *this) { TRACE("%p\n", this); basic_string_char_tidy(this, TRUE, 0); + return NULL; /* FEAR 1 installer expects EAX set to 0 */ } /* ?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ */ @@ -2785,10 +2786,11 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_ptr_ptr(basic_strin /* ??1?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE(a)XZ */ /* ??1?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_dtor, 4) -void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar *this) +void* __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar *this) { TRACE("%p\n", this); basic_string_wchar_tidy(this, TRUE, 0); + return NULL; /* FEAR 1 installer expects EAX set to 0 */ } /* ?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ */ diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index f1aa92a..5f8fcd2 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -63,7 +63,7 @@ static basic_string_char* (__cdecl *p_basic_string_char_concatenate_cstr)(basic_ static basic_string_char* (__thiscall *p_basic_string_char_ctor)(basic_string_char*); static basic_string_char* (__thiscall *p_basic_string_char_copy_ctor)(basic_string_char*, basic_string_char*); static basic_string_char* (__thiscall *p_basic_string_char_ctor_cstr)(basic_string_char*, const char*); -static void (__thiscall *p_basic_string_char_dtor)(basic_string_char*); +static void* (__thiscall *p_basic_string_char_dtor)(basic_string_char*); static basic_string_char* (__thiscall *p_basic_string_char_erase)(basic_string_char*, size_t, size_t); static basic_string_char* (__thiscall *p_basic_string_char_assign_cstr_len)(basic_string_char*, const char*, size_t); static const char* (__thiscall *p_basic_string_char_cstr)(basic_string_char*); @@ -85,7 +85,7 @@ static size_t *p_basic_string_char_npos; static basic_string_wchar* (__thiscall *p_basic_string_wchar_ctor)(basic_string_wchar*); static basic_string_wchar* (__thiscall *p_basic_string_wchar_copy_ctor)(basic_string_wchar*, basic_string_wchar*); static basic_string_wchar* (__thiscall *p_basic_string_wchar_ctor_cstr)(basic_string_wchar*, const wchar_t*); -static void (__thiscall *p_basic_string_wchar_dtor)(basic_string_wchar*); +static void* (__thiscall *p_basic_string_wchar_dtor)(basic_string_wchar*); static basic_string_wchar* (__thiscall *p_basic_string_wchar_erase)(basic_string_wchar*, size_t, size_t); static basic_string_wchar* (__thiscall *p_basic_string_wchar_assign_cstr_len)(basic_string_wchar*, const wchar_t*, size_t); static const wchar_t* (__thiscall *p_basic_string_wchar_cstr)(basic_string_wchar*); @@ -767,6 +767,26 @@ static void test_basic_string_char_find_last_not_of(void) { } } +static void test_basic_string_dtor(void) { +#ifdef __i386__ + static const wchar_t qwerty[] = { 'q','w','e','r','t','y',0 }; + basic_string_wchar str1; + basic_string_char str2; + void *ret; + + /* FEAR 1 installer expects that string destructors set EAX to + * zero on return (see bug 37358). */ + + call_func2(p_basic_string_wchar_ctor_cstr, &str1, qwerty); + ret = call_func1(p_basic_string_wchar_dtor, &str1); + ok(ret == NULL, "expected NULL, got %p\n", ret); + + call_func2(p_basic_string_char_ctor_cstr, &str2, "qwerty"); + ret = call_func1(p_basic_string_char_dtor, &str2); + ok(ret == NULL, "expected NULL, got %p\n", ret); +#endif +} + START_TEST(string) { if(!init()) @@ -783,6 +803,7 @@ START_TEST(string) test_basic_string_wchar(); test_basic_string_wchar_swap(); test_basic_string_char_find_last_not_of(); + test_basic_string_dtor(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Alexandre Julliard : explorer: Treat unrecognized options as a file to open.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: 9db3444e4070025162a87cce49ca7fe9ef44ce56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db3444e4070025162a87cce4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 24 17:36:53 2015 +0900 explorer: Treat unrecognized options as a file to open. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 4f82ded..c178017 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -683,12 +683,11 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) static const WCHAR arg_select[] = {'/','s','e','l','e','c','t',','}; static const WCHAR arg_desktop[] = {'/','d','e','s','k','t','o','p'}; - LPWSTR p, p2; + LPWSTR p = commandline; - p2 = commandline; - p = strchrW(commandline,'/'); - while(p) + while (*p) { + while (isspaceW(*p)) p++; if (strncmpW(p, arg_n, sizeof(arg_n)/sizeof(WCHAR))==0) { parameters->explorer_mode = FALSE; @@ -717,15 +716,12 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) p += sizeof(arg_desktop)/sizeof(WCHAR); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } - else p++; - - p2 = p; - p = strchrW(p,'/'); - } - if (p2 && *p2) - { - /* left over command line is generally the path to be opened */ - copy_path_string(parameters->root,p2); + else + { + /* left over command line is generally the path to be opened */ + copy_path_string(parameters->root,p); + break; + } } }

1 0

Nikolay Sivov : user32: Don't overwrite 'cb' field with uninitialized data in DdeQueryConvInfo() (Coverity).
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: 19d29f3ca58f4f574747ff7e6aadb20160b4bebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d29f3ca58f4f574747ff7e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 17:31:21 2015 +0300 user32: Don't overwrite 'cb' field with uninitialized data in DdeQueryConvInfo() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dde_misc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index d66d2e0..175d9e3 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -2468,7 +2468,10 @@ UINT WINAPI DdeQueryConvInfo(HCONV hConv, DWORD id, PCONVINFO lpConvInfo) } if (ret != 0) + { + ci.cb = lpConvInfo->cb; memcpy(lpConvInfo, &ci, min((size_t)lpConvInfo->cb, sizeof(ci))); + } return ret; }

1 0

Nikolay Sivov : crypt32: Fix key name null termination (Coverity).
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: 53a065ae0a2f0381f71f21f7d3897ff3f33eb295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a065ae0a2f0381f71f21f7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 15:29:06 2015 +0300 crypt32: Fix key name null termination (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/str.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 7b52731..3fa5a97 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -769,7 +769,7 @@ struct KeynameKeeper { WCHAR buf[10]; /* big enough for L"GivenName" */ LPWSTR keyName; /* usually = buf, but may be allocated */ - DWORD keyLen; + DWORD keyLen; /* full available buffer size in WCHARs */ }; static void CRYPT_InitializeKeynameKeeper(struct KeynameKeeper *keeper) @@ -795,17 +795,13 @@ static void CRYPT_KeynameKeeperFromTokenW(struct KeynameKeeper *keeper, { DWORD len = key->end - key->start; - if (len > keeper->keyLen) + if (len >= keeper->keyLen) { - if (keeper->keyName == keeper->buf) - keeper->keyName = CryptMemAlloc(len * sizeof(WCHAR)); - else - keeper->keyName = CryptMemRealloc(keeper->keyName, - len * sizeof(WCHAR)); - keeper->keyLen = len; + CRYPT_FreeKeynameKeeper( keeper ); + keeper->keyLen = len + 1; + keeper->keyName = CryptMemAlloc(keeper->keyLen * sizeof(WCHAR)); } - memcpy(keeper->keyName, key->start, (key->end - key->start) * - sizeof(WCHAR)); + memcpy(keeper->keyName, key->start, len * sizeof(WCHAR)); keeper->keyName[len] = '\0'; TRACE("Keyname is %s\n", debugstr_w(keeper->keyName)); }

1 0

Nikolay Sivov : sc: Fix service handle leak on error path (Coverity).
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: 0a3e54480a509d5d323a31440af67a63a990d80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3e54480a509d5d323a31440… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 22 17:48:04 2015 +0300 sc: Fix service handle leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 2cfe91c..0bf5d06 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -285,15 +285,14 @@ int wmain( int argc, const WCHAR *argv[] ) if (service) { SERVICE_FAILURE_ACTIONSW sfa; - if (!parse_failure_params( argc - 3, argv + 3, &sfa )) + if (parse_failure_params( argc - 3, argv + 3, &sfa )) { - WINE_WARN("failed to parse failure parameters\n"); - CloseServiceHandle( manager ); - return 1; + ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); + if (!ret) WINE_TRACE("failed to set service failure actions %u\n", GetLastError()); + HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); } - ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); - if (!ret) WINE_TRACE("failed to set service failure actions %u\n", GetLastError()); - HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); + else + WINE_WARN("failed to parse failure parameters\n"); CloseServiceHandle( service ); } else WINE_TRACE("failed to open service %u\n", GetLastError());

1 0

Thomas Faber : quartz: Fix IEnumMoniker reference leak in FilterGraph2_Connect.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: b700634b0c20d40aa993416e16fdd0c4b820e271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b700634b0c20d40aa993416e1… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 20 15:38:35 2015 +0100 quartz: Fix IEnumMoniker reference leak in FilterGraph2_Connect. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0b25259..495f4be 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1169,6 +1169,8 @@ error: CoTaskMemFree(ppins); } + IEnumMoniker_Release(pEnumMoniker); + out: if (penummt) IEnumMediaTypes_Release(penummt);

1 0

Thomas Faber : quartz/tests: Test aggregation with CLSID_FilterMapper2.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: fecb862cfff48429757f859d40d4ad61304265c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecb862cfff48429757f859d4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 20 13:20:47 2015 +0100 quartz/tests: Test aggregation with CLSID_FilterMapper2. MPC-HC v1.7.10's CFGManager class creates a filter graph object during its constructor, which means it passes in an outer object with a zero reference count. Wine does an AddRef/Release on this object when constructing the filter graph, thus its reference count drops back to 0 and the CFGManager object gets freed prematurely. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtermapper.c | 93 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index aee2310..fe23a72 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -541,6 +541,98 @@ out: IFilterMapper2_Release(pMapper); } +typedef struct IUnknownImpl +{ + IUnknown IUnknown_iface; + int AddRef_called; + int Release_called; +} IUnknownImpl; + +static IUnknownImpl *IUnknownImpl_from_iface(IUnknown * iface) +{ + return CONTAINING_RECORD(iface, IUnknownImpl, IUnknown_iface); +} + +static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) +{ + ok(0, "QueryInterface should not be called for %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI IUnknownImpl_AddRef(IUnknown * iface) +{ + IUnknownImpl *This = IUnknownImpl_from_iface(iface); + This->AddRef_called++; + return 2; +} + +static ULONG WINAPI IUnknownImpl_Release(IUnknown * iface) +{ + IUnknownImpl *This = IUnknownImpl_from_iface(iface); + This->Release_called++; + return 1; +} + +static CONST_VTBL IUnknownVtbl IUnknownImpl_Vtbl = +{ + IUnknownImpl_QueryInterface, + IUnknownImpl_AddRef, + IUnknownImpl_Release +}; + +static void test_aggregate_filter_mapper(void) +{ + HRESULT hr; + IUnknown *pmapper; + IUnknown *punk; + IUnknownImpl unk_outer = { { &IUnknownImpl_Vtbl }, 0, 0 }; + + hr = CoCreateInstance(&CLSID_FilterMapper2, &unk_outer.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&pmapper); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(pmapper != &unk_outer.IUnknown_iface, "pmapper = %p, expected not %p\n", pmapper, &unk_outer.IUnknown_iface); + + hr = IUnknown_QueryInterface(pmapper, &IID_IUnknown, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 0, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 0, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper2, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper3, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + + IUnknown_Release(pmapper); +} + START_TEST(filtermapper) { CoInitialize(NULL); @@ -550,6 +642,7 @@ START_TEST(filtermapper) test_ifiltermapper_from_filtergraph(); test_register_filter_with_null_clsMinorType(); test_parse_filter_data(); + test_aggregate_filter_mapper(); CoUninitialize(); }

1 0

Thomas Faber : quartz/tests: Test aggregation with CLSID_FilterGraph.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: e0d8003a9abdcf63242d95b74e5b972a2206636a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d8003a9abdcf63242d95b74… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 20 13:20:58 2015 +0100 quartz/tests: Test aggregation with CLSID_FilterGraph. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 95 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index b42aea8..f3af03e 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1886,6 +1886,100 @@ static void test_render_filter_priority(void) ok(hr == S_OK, "CoRevokeClassObject failed with %08x\n", hr); } +typedef struct IUnknownImpl +{ + IUnknown IUnknown_iface; + int AddRef_called; + int Release_called; +} IUnknownImpl; + +static IUnknownImpl *IUnknownImpl_from_iface(IUnknown * iface) +{ + return CONTAINING_RECORD(iface, IUnknownImpl, IUnknown_iface); +} + +static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) +{ + ok(0, "QueryInterface should not be called for %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI IUnknownImpl_AddRef(IUnknown * iface) +{ + IUnknownImpl *This = IUnknownImpl_from_iface(iface); + This->AddRef_called++; + return 2; +} + +static ULONG WINAPI IUnknownImpl_Release(IUnknown * iface) +{ + IUnknownImpl *This = IUnknownImpl_from_iface(iface); + This->Release_called++; + return 1; +} + +static CONST_VTBL IUnknownVtbl IUnknownImpl_Vtbl = +{ + IUnknownImpl_QueryInterface, + IUnknownImpl_AddRef, + IUnknownImpl_Release +}; + +static void test_aggregate_filter_graph(void) +{ + HRESULT hr; + IUnknown *pgraph; + IUnknown *punk; + IUnknownImpl unk_outer = { { &IUnknownImpl_Vtbl }, 0, 0 }; + + hr = CoCreateInstance(&CLSID_FilterGraph, &unk_outer.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&pgraph); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(pgraph != &unk_outer.IUnknown_iface, "pgraph = %p, expected not %p\n", pgraph, &unk_outer.IUnknown_iface); + + hr = IUnknown_QueryInterface(pgraph, &IID_IUnknown, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + +todo_wine + ok(unk_outer.AddRef_called == 0, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); +todo_wine + ok(unk_outer.Release_called == 0, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pgraph, &IID_IFilterMapper, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pgraph, &IID_IFilterMapper2, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + unk_outer.AddRef_called = 0; + unk_outer.Release_called = 0; + + hr = IUnknown_QueryInterface(pgraph, &IID_IFilterMapper3, (void **)&punk); + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); + IUnknown_Release(punk); + + ok(unk_outer.AddRef_called == 1, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); + ok(unk_outer.Release_called == 1, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); + + IUnknown_Release(pgraph); +} + START_TEST(filtergraph) { HRESULT hr; @@ -1904,5 +1998,6 @@ START_TEST(filtergraph) test_mediacontrol(); test_filter_graph2(); test_render_filter_priority(); + test_aggregate_filter_graph(); CoUninitialize(); }

1 0