June 2013 - Wine-commits - list.winehq.org

Dmitry Timoshkov : oleaut32: Do not rely on vtable placement in the implementation structure.
by Alexandre Julliard 13 Jun '13

13 Jun '13

Module: wine Branch: master Commit: eca18b515264be5017e0e62a69807757e6cac298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca18b515264be5017e0e62a6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 13 11:28:21 2013 +0900 oleaut32: Do not rely on vtable placement in the implementation structure. --- dlls/oleaut32/typelib.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 024df0d..9502b3c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8358,13 +8358,13 @@ HRESULT WINAPI CreateTypeLib2(SYSKIND syskind, LPCOLESTR szFile, This->path = heap_alloc((lstrlenW(szFile) + 1) * sizeof(WCHAR)); if (!This->path) { - ITypeLib2_Release((ITypeLib2*)This); + ITypeLib2_Release(&This->ITypeLib2_iface); return E_OUTOFMEMORY; } lstrcpyW(This->path, szFile); - hres = ITypeLib2_QueryInterface((ITypeLib2*)This, &IID_ICreateTypeLib2, (LPVOID*)ppctlib); - ITypeLib2_Release((ITypeLib2*)This); + hres = ITypeLib2_QueryInterface(&This->ITypeLib2_iface, &IID_ICreateTypeLib2, (LPVOID*)ppctlib); + ITypeLib2_Release(&This->ITypeLib2_iface); return hres; } @@ -8373,21 +8373,21 @@ static HRESULT WINAPI ICreateTypeLib2_fnQueryInterface(ICreateTypeLib2 *iface, { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - return ITypeLib2_QueryInterface((ITypeLib2*)This, riid, object); + return ITypeLib2_QueryInterface(&This->ITypeLib2_iface, riid, object); } static ULONG WINAPI ICreateTypeLib2_fnAddRef(ICreateTypeLib2 *iface) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - return ITypeLib2_AddRef((ITypeLib2*)This); + return ITypeLib2_AddRef(&This->ITypeLib2_iface); } static ULONG WINAPI ICreateTypeLib2_fnRelease(ICreateTypeLib2 *iface) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - return ITypeLib2_Release((ITypeLib2*)This); + return ITypeLib2_Release(&This->ITypeLib2_iface); } static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface, @@ -9883,21 +9883,21 @@ static HRESULT WINAPI ICreateTypeInfo2_fnQueryInterface(ICreateTypeInfo2 *iface, { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - return ITypeInfo2_QueryInterface((ITypeInfo2*)This, riid, object); + return ITypeInfo2_QueryInterface(&This->ITypeInfo2_iface, riid, object); } static ULONG WINAPI ICreateTypeInfo2_fnAddRef(ICreateTypeInfo2 *iface) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - return ITypeInfo2_AddRef((ITypeInfo2*)This); + return ITypeInfo2_AddRef(&This->ITypeInfo2_iface); } static ULONG WINAPI ICreateTypeInfo2_fnRelease(ICreateTypeInfo2 *iface) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - return ITypeInfo2_Release((ITypeInfo2*)This); + return ITypeInfo2_Release(&This->ITypeInfo2_iface); } static HRESULT WINAPI ICreateTypeInfo2_fnSetGuid(ICreateTypeInfo2 *iface,

1 0

Christian Costa : d3dx9_36: Set compilation_errors to NULL when no error encountered + tests.
by Alexandre Julliard 13 Jun '13

13 Jun '13

Module: wine Branch: master Commit: fcb72f399d7df43934012fbb10ac339de73a67f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb72f399d7df43934012fbb1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jun 13 09:00:50 2013 +0200 d3dx9_36: Set compilation_errors to NULL when no error encountered + tests. --- dlls/d3dx9_36/effect.c | 3 +++ dlls/d3dx9_36/tests/effect.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1924c07..8ab1067 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5768,6 +5768,9 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s FIXME("(%p, %p, %u, %p, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include, skip_constants, flags, pool, effect, compilation_errors); + if (compilation_errors) + *compilation_errors = NULL; + if (!device || !srcdata) return D3DERR_INVALIDCALL; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 7f238be..c67e863 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2662,6 +2662,26 @@ static void test_effect_variable_names(IDirect3DDevice9 *device) ok(!count, "Release failed %u\n", count); } +static void test_effect_compilation_errors(IDirect3DDevice9 *device) +{ + ID3DXEffect *effect; + ID3DXBuffer *compilation_errors; + HRESULT hr; + + /* Test binary effect */ + compilation_errors = (ID3DXBuffer*)0xdeadbeef; + hr = D3DXCreateEffect(NULL, NULL, 0, NULL, NULL, 0, NULL, NULL, &compilation_errors); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateEffect failed, got %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + ok(!compilation_errors, "Returned %p\n", compilation_errors); + + compilation_errors = (ID3DXBuffer*)0xdeadbeef; + hr = D3DXCreateEffect(device, test_effect_variable_names_blob, + sizeof(test_effect_variable_names_blob), NULL, NULL, 0, NULL, &effect, &compilation_errors); + ok(hr == D3D_OK, "D3DXCreateEffect failed, got %#x, expected %#x\n", hr, D3D_OK); + ok(!compilation_errors, "Returned %p\n", compilation_errors); + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { HWND wnd; @@ -2698,6 +2718,7 @@ START_TEST(effect) test_create_effect_compiler(); test_effect_parameter_value(device); test_effect_variable_names(device); + test_effect_compilation_errors(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Alistair Leslie-Hughes : oledb32: Add remaining INIT Properties.
by Alexandre Julliard 13 Jun '13

13 Jun '13

Module: wine Branch: master Commit: 5e42382c31d70342d7885a8cfbb44fd28dfae9d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e42382c31d70342d7885a8cf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 11 14:18:31 2013 +1000 oledb32: Add remaining INIT Properties. --- dlls/oledb32/datainit.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index dba3087..13d9f55 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -296,34 +296,54 @@ struct dbproperty { VARTYPE type; }; +static const WCHAR asyncW[] = {'A','s','y','n','c','h','r','o','n','o','u','s',' ','P','r','o','c','e','s','s','i','n','g',0}; +static const WCHAR bindW[] = {'B','i','n','d',' ','F','l','a','g','s',0}; +static const WCHAR cacheW[] = {'C','a','c','h','e',' ','A','u','t','h','e','n','i','c','a','t','i','o','n',0}; static const WCHAR conn_timeout[] = {'C','o','n','n','e','c','t',' ','T','i','m','e','o','u','t',0}; static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; +static const WCHAR encryptW[] = {'E','n','c','r','y','p','t',' ','P','a','s','s','w','o','r','d',0}; static const WCHAR extendedW[] = {'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s',0}; static const WCHAR gen_timeout[] = {'G','e','n','e','r','a','l',' ','T','i','m','e','o','u','t',0}; +static const WCHAR impersonW[] = {'I','m','p','e','r','s','o','n','a','t','i','o','n',' ','L','e','v','e','l',0}; static const WCHAR initcatW[] = {'I','n','i','t','i','a','l',' ','C','a','t','a','l','o','g',0}; +static const WCHAR integratedW[] = {'I','n','t','e','g','r','a','t','e','d',' ','S','e','c','u','r','i','t','y',0}; static const WCHAR localeIDW[] = {'L','o','c','a','l','e',' ','I','d','e','n','t','i','f','i','e','r',0}; static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0}; +static const WCHAR lockownerW[] = {'L','o','c','k',' ','O','w','n','e','r',0}; +static const WCHAR maskpassW[] = {'M','a','s','k',' ','P','a','s','s','w','o','r','d',0}; static const WCHAR modeW[] = {'M','o','d','e',0}; static const WCHAR oledbservW[] = {'O','L','E',' ','D','B',' ','S','e','r','v','i','c','i','e','s',0}; static const WCHAR passwordW[] = {'P','a','s','s','w','o','r','d',0}; static const WCHAR persistW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; +static const WCHAR persistEncW[] = {'P','e','r','s','i','s','t',' ','E','n','c','r','y','p','t','e','d',0}; static const WCHAR promptW[] = {'P','r','o','m','p','t',0}; +static const WCHAR protectW[] = {'P','r','o','t','e','c','t','i','o','n',' ','l','e','v','e','l',0}; static const WCHAR useridW[] = {'U','s','e','r',' ','I','D',0}; static const WCHAR winhandleW[] = {'W','i','n','d','o','w',' ','H','a','n','d','l','e',0}; static const struct dbproperty dbproperties[] = { + { asyncW, DBPROP_INIT_ASYNCH, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { bindW, DBPROP_INIT_BINDFLAGS, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { cacheW, DBPROP_AUTH_CACHE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, { conn_timeout,DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, { extendedW, DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { encryptW, DBPROP_AUTH_ENCRYPT_PASSWORD, DBPROPOPTIONS_REQUIRED, VT_BOOL }, { gen_timeout, DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { impersonW, DBPROP_INIT_IMPERSONATION_LEVEL, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { initcatW, DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { integratedW, DBPROP_AUTH_INTEGRATED, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, { localeIDW, DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { locationW, DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { lockownerW, DBPROP_INIT_LOCKOWNER, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { maskpassW, DBPROP_AUTH_MASK_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, { modeW, DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { oledbservW, DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { passwordW, DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { persistEncW, DBPROP_AUTH_PERSIST_ENCRYPTED, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, { persistW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, { promptW, DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, + { protectW, DBPROP_INIT_PROTECTION_LEVEL, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { useridW, DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, #ifndef _WIN64 { winhandleW, DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I4 },

1 0

Aric Stewart : fonts: Include Arabic characters in Tahoma.
by Alexandre Julliard 13 Jun '13

13 Jun '13

Module: wine Branch: master Commit: 121f82bff7665794be6fee841ddfda6973cc7c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=121f82bff7665794be6fee841… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 10 18:38:28 2013 -0500 fonts: Include Arabic characters in Tahoma. Glyphs from Public Domain DejaVu Sans, a font based on Bitstream Vera. --- fonts/tahoma.sfd | 9969 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- fonts/tahoma.ttf | Bin 100420 -> 143904 bytes 2 files changed, 9647 insertions(+), 322 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=121f82bff7665794be6fe…

1 0

Aric Stewart : fonts: Include Arabic characters in Tahoma Bold.
by Alexandre Julliard 13 Jun '13

13 Jun '13

Module: wine Branch: master Commit: 2fd3ec7d068ef925e5720222e92cfda4f6badd2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd3ec7d068ef925e5720222e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 12 14:41:14 2013 -0500 fonts: Include Arabic characters in Tahoma Bold. Glyphs from Public Domain DejaVu Sans Bold, a font based on Bitstream Vera. --- fonts/tahomabd.sfd | 9376 +++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/tahomabd.ttf | Bin 92268 -> 135872 bytes 2 files changed, 9309 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fd3ec7d068ef925e5720…

1 0

Hans Leidekker : wininet/tests: Avoid proxy test failures on old wininet.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: 697cbc3605f0ea4b9ab1787e26663341ee6cf6dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=697cbc3605f0ea4b9ab1787e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 12 11:08:42 2013 +0200 wininet/tests: Avoid proxy test failures on old wininet. --- dlls/wininet/tests/http.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1682b05..5d4c28a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2465,6 +2465,11 @@ static void test_proxy_direct(int port) ok(sz == lstrlenW(passwordW), "got %u\n", sz); r = HttpSendRequest(hr, NULL, 0, NULL, 0); + if (!r) + { + win_skip("skipping proxy tests on broken wininet\n"); + goto done; + } ok(r, "HttpSendRequest failed %u\n", GetLastError()); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL);

1 0

Hans Leidekker : wbemprox/tests: Mark a test result as broken.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: 97cc8bfcc7a6117667168e40ab47941b2c977419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97cc8bfcc7a6117667168e40a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 12 11:09:06 2013 +0200 wbemprox/tests: Mark a test result as broken. --- dlls/wbemprox/tests/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 15fe6f8..f09da91 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -586,7 +586,7 @@ static void test_notification_query_async( IWbemServices *services ) ok( sink_refs > prev_sink_refs, "got %u refs\n", sink_refs ); hr = IWbemServices_CancelAsyncCall( services, &sink ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); SysFreeString( wql ); SysFreeString( query );

1 0

Nikolay Sivov : xmllite: It' s acceptable to have NULL length pointer in GetLocalName().
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: 9997ef3fbcac33f4005c91174c2a4e600dbef08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9997ef3fbcac33f4005c91174… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 12 13:06:24 2013 +0400 xmllite: It's acceptable to have NULL length pointer in GetLocalName(). --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/reader.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8276b85..5256c35 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2256,7 +2256,7 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U TRACE("(%p)->(%p %p)\n", This, name, len); *name = This->strvalues[StringValue_LocalName].str; - *len = This->strvalues[StringValue_LocalName].len; + if (len) *len = This->strvalues[StringValue_LocalName].len; return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index fad3d41..46c6edd 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1364,13 +1364,20 @@ static void test_read_cdata(void) ok(type == XmlNodeType_CDATA, "got %d for %s\n", type, test->xml); + str_exp = a2w(test->name); + len = 1; str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); len = 1;

1 0

Nikolay Sivov : riched20: Use helpers from header instead of internal functions.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: ed673ff947a330ed5755ac543816df09696ec028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed673ff947a330ed5755ac543… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 8 16:53:45 2013 +0400 riched20: Use helpers from header instead of internal functions. --- dlls/riched20/richole.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 9c74cfe..6805873 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -300,7 +300,7 @@ IRichEditOle_fnGetClientSite(IRichEditOle *me, if(!lplpolesite) return E_INVALIDARG; *lplpolesite = &This->clientSite->IOleClientSite_iface; - IOleClientSite_fnAddRef(*lplpolesite); + IOleClientSite_AddRef(*lplpolesite); return S_OK; } @@ -448,21 +448,21 @@ ITextDocument_fnQueryInterface(ITextDocument* me, REFIID riid, void** ppvObject) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - return IRichEditOle_fnQueryInterface(&This->IRichEditOle_iface, riid, ppvObject); + return IRichEditOle_QueryInterface(&This->IRichEditOle_iface, riid, ppvObject); } static ULONG WINAPI ITextDocument_fnAddRef(ITextDocument* me) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - return IRichEditOle_fnAddRef(&This->IRichEditOle_iface); + return IRichEditOle_AddRef(&This->IRichEditOle_iface); } static ULONG WINAPI ITextDocument_fnRelease(ITextDocument* me) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - return IRichEditOle_fnRelease(&This->IRichEditOle_iface); + return IRichEditOle_Release(&This->IRichEditOle_iface); } static HRESULT WINAPI

1 0

Nikolay Sivov : comdlg32: Store client GUID with SetClientGuid().
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: f92caf5ba77abadd8d8c67a14437e45184c5d175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92caf5ba77abadd8d8c67a14… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 8 16:55:00 2013 +0400 comdlg32: Store client GUID with SetClientGuid(). --- dlls/comdlg32/itemdlg.c | 9 +++++++-- dlls/comdlg32/tests/itemdlg.c | 26 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 33398b5..2313b0a 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -125,6 +125,8 @@ typedef struct FileDialogImpl { HWND cctrls_hwnd; struct list cctrls; UINT_PTR cctrl_next_dlgid; + + GUID client_guid; } FileDialogImpl; /************************************************************************** @@ -2032,8 +2034,9 @@ static HRESULT WINAPI IFileDialog2_fnClose(IFileDialog2 *iface, HRESULT hr) static HRESULT WINAPI IFileDialog2_fnSetClientGuid(IFileDialog2 *iface, REFGUID guid) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%s)\n", This, debugstr_guid(guid)); - return E_NOTIMPL; + TRACE("%p (%s)\n", This, debugstr_guid(guid)); + This->client_guid = *guid; + return S_OK; } static HRESULT WINAPI IFileDialog2_fnClearClientData(IFileDialog2 *iface) @@ -3627,6 +3630,8 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->default_ext = NULL; fdimpl->custom_cancelbutton = fdimpl->custom_filenamelabel = NULL; + fdimpl->client_guid = GUID_NULL; + /* FIXME: The default folder setting should be restored for the * application if it was previously set. */ SHGetDesktopFolder(&psf); diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 4e50926..bb7205f 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1392,6 +1392,7 @@ static void test_customize(void) if(FAILED(hr)) { skip("Skipping IFileDialogCustomize tests.\n"); + IFileDialog_Release(pfod); return; } @@ -1897,6 +1898,30 @@ static void test_customize(void) ok(!ref, "Refcount not zero (%d).\n", ref); } +static void test_persistent_state(void) +{ + IFileDialog *fd; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&fd); + ok(hr == S_OK, "got 0x%08x.\n", hr); + +if (0) +{ + /* crashes at least on Win8 */ + hr = IFileDialog_SetClientGuid(fd, NULL); +} + + hr = IFileDialog_SetClientGuid(fd, &IID_IUnknown); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IFileDialog_SetClientGuid(fd, &IID_NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IFileDialog_Release(fd); +} + START_TEST(itemdlg) { OleInitialize(NULL); @@ -1908,6 +1933,7 @@ START_TEST(itemdlg) test_advise(); test_filename(); test_customize(); + test_persistent_state(); } else skip("Skipping all Item Dialog tests.\n");

1 0