wine-commits June 2014

wine-commits@winehq.org

4 participants
378 discussions

Jacek Caban : mshtml: Added new helper for getting element attribute value and use it in script.c.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 39e24713e9f18e1216be7285b1f17fd8b9393364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e24713e9f18e1216be7285b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:28:56 2014 +0200 mshtml: Added new helper for getting element attribute value and use it in script.c. --- dlls/mshtml/htmlelem.c | 19 +++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/script.c | 18 +++++------------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 04ca05c..6a9d396 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -156,6 +156,25 @@ HRESULT replace_node_by_html(nsIDOMHTMLDocument *nsdoc, nsIDOMNode *nsnode, cons return hres; } +nsresult get_elem_attr_value(nsIDOMHTMLElement *nselem, const WCHAR *name, nsAString *val_str, const PRUnichar **val) +{ + nsAString name_str; + nsresult nsres; + + nsAString_InitDepend(&name_str, name); + nsAString_Init(val_str, NULL); + nsres = nsIDOMHTMLElement_GetAttribute(nselem, &name_str, val_str); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) { + ERR("GetAttribute(%s) failed: %08x\n", debugstr_w(name), nsres); + nsAString_Finish(val_str); + return nsres; + } + + nsAString_GetData(val_str, val); + return NS_OK; +} + typedef struct { DispatchEx dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 068c18e..3181ee2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -959,6 +959,8 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; +nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; + /* commands */ typedef struct { DWORD id; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4d49587..e5f4ab1 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -784,7 +784,7 @@ static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script return; } }else { - ERR("GetAttribute(event) failed: %08x\n", nsres); + ERR("GetEvent failed: %08x\n", nsres); } nsAString_Finish(&event_str); @@ -849,7 +849,8 @@ static BOOL get_guid_from_language(LPCWSTR type, GUID *guid) static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscript, GUID *guid) { - nsAString attr_str, val_str; + const PRUnichar *language; + nsAString val_str; BOOL ret = FALSE; nsresult nsres; @@ -871,26 +872,17 @@ static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *ns ERR("GetType failed: %08x\n", nsres); } - nsAString_InitDepend(&attr_str, languageW); - nsres = nsIDOMHTMLScriptElement_GetAttribute(nsscript, &attr_str, &val_str); - nsAString_Finish(&attr_str); + nsres = get_elem_attr_value((nsIDOMHTMLElement*)nsscript, languageW, &val_str, &language); if(NS_SUCCEEDED(nsres)) { - const PRUnichar *language; - - nsAString_GetData(&val_str, &language); - if(*language) { ret = get_guid_from_language(language, guid); }else { *guid = get_default_script_guid(window); ret = TRUE; } - }else { - ERR("GetAttribute(language) failed: %08x\n", nsres); + nsAString_Finish(&val_str); } - nsAString_Finish(&val_str); - return ret; }

1 0

Jacek Caban : mshtml: Call unlink from HTMLDOMNode::Release.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 4745fd03d4c246be377214fb6d7d39f599b9439d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4745fd03d4c246be377214fb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:28:44 2014 +0200 mshtml: Call unlink from HTMLDOMNode::Release. --- dlls/mshtml/htmldoc.c | 6 +----- dlls/mshtml/htmlnode.c | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index dd4949f..a9db920 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4330,11 +4330,7 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) This->nsnode_selector = NULL; } - if(This->nsdoc) { - assert(!This->window); - release_document_mutation(This); - nsIDOMHTMLDocument_Release(This->nsdoc); - }else if(This->window) { + if(!This->nsdoc && This->window) { /* document fragments own reference to inner window */ IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); This->window = NULL; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 42e7c6a..a89b0ca 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -492,6 +492,8 @@ static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->vtbl->unlink) + This->vtbl->unlink(This); This->vtbl->destructor(This); release_dispex(&This->dispex); heap_free(This);

1 0

Huw Davies : crypt32/tests: Fix test failure on win 8.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 54129a5171c7bd9f7f4a29bb6aec71b7d6ba54a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54129a5171c7bd9f7f4a29bb6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 27 13:25:02 2014 +0100 crypt32/tests: Fix test failure on win 8. --- dlls/crypt32/tests/sip.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 212c24b..0677903 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -119,6 +119,9 @@ static void test_AddRemoveProvider(void) newprov.pwszRemoveFuncName = dummyfunction; newprov.pwszIsFunctionNameFmt2 = dummyfunction; newprov.pwszIsFunctionName = dummyfunction; + /* If GetCapFuncName set to NULL, then CryptSIPRemoveProvider fails on win 8 */ + newprov.pwszGetCapFuncName = dummyfunction; + SetLastError(0xdeadbeef); ret = CryptSIPAddProvider(&newprov); ok ( ret, "CryptSIPAddProvider should have succeeded, last error %d\n", GetLastError());

1 0

Huw Davies : crypt32: Add a new element to SIP_ADD_NEWPROVIDER.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: f4f01301f0007442ae5f40650615f2e00a5fbc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f01301f0007442ae5f40650… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 27 13:25:01 2014 +0100 crypt32: Add a new element to SIP_ADD_NEWPROVIDER. --- dlls/crypt32/sip.c | 2 +- dlls/msisip/main.c | 1 + dlls/wintrust/register.c | 1 + include/mssip.h | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 4a32cad..8b561fd 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -210,7 +210,7 @@ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_NEWPROVIDER *psNewProv) TRACE("%p\n", psNewProv); if (!psNewProv || - psNewProv->cbStruct != sizeof(SIP_ADD_NEWPROVIDER) || + psNewProv->cbStruct < FIELD_OFFSET(SIP_ADD_NEWPROVIDER, pwszGetCapFuncName) || !psNewProv->pwszGetFuncName || !psNewProv->pwszPutFuncName || !psNewProv->pwszCreateFuncName || diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index 0b4d2c3..882db3d 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -81,6 +81,7 @@ HRESULT WINAPI DllRegisterServer(void) prov.pwszVerifyFuncName = verifyIndirectData; prov.pwszRemoveFuncName = removeSignedDataMsg; prov.pwszIsFunctionNameFmt2 = isMyTypeOfFile; + prov.pwszGetCapFuncName = NULL; return CryptSIPAddProvider(&prov) ? S_OK : S_FALSE; } diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index f039fbd..9981fbc 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -911,6 +911,7 @@ static BOOL WINTRUST_SIPPAddProvider(GUID* Subject, WCHAR* MagicNumber) NewProv.pwszVerifyFuncName = CryptSIPVerifyIndirectData; NewProv.pwszRemoveFuncName = CryptSIPRemoveSignedDataMsg; NewProv.pwszIsFunctionNameFmt2 = NULL; + NewProv.pwszGetCapFuncName = NULL; Ret = CryptSIPAddProvider(&NewProv); diff --git a/include/mssip.h b/include/mssip.h index b0b21a6..c14f02d 100644 --- a/include/mssip.h +++ b/include/mssip.h @@ -156,6 +156,9 @@ typedef struct SIP_ADD_NEWPROVIDER_ WCHAR *pwszRemoveFuncName; WCHAR *pwszIsFunctionNameFmt2; + + /* NTDDI_VERSION >= NTDDI_WIN8 */ + WCHAR *pwszGetCapFuncName; } SIP_ADD_NEWPROVIDER, *PSIP_ADD_NEWPROVIDER; #include <poppack.h>

1 0

Nikolay Sivov : propsys: Forward corresponding methods to exports.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 47de869fda08f564d45bb48ea2983458a1965de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47de869fda08f564d45bb48ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 27 15:13:49 2014 +0400 propsys: Forward corresponding methods to exports. --- dlls/propsys/propsys_main.c | 15 +++++---------- include/propsys.idl | 2 ++ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 4bb9d26..6713adf 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -166,8 +166,7 @@ static ULONG WINAPI propsys_Release(IPropertySystem *iface) static HRESULT WINAPI propsys_GetPropertyDescription(IPropertySystem *iface, REFPROPERTYKEY propkey, REFIID riid, void **ppv) { - FIXME("%p %s %p: stub\n", propkey, debugstr_guid(riid), ppv); - return E_NOTIMPL; + return PSGetPropertyDescription(propkey, riid, ppv); } static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *iface, @@ -180,8 +179,7 @@ static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *ifac static HRESULT WINAPI propsys_GetPropertyDescriptionListFromString(IPropertySystem *iface, LPCWSTR proplist, REFIID riid, void **ppv) { - FIXME("%s %s %p: stub\n", debugstr_w(proplist), debugstr_guid(riid), ppv); - return E_NOTIMPL; + return PSGetPropertyDescriptionListFromString(proplist, riid, ppv); } static HRESULT WINAPI propsys_EnumeratePropertyDescriptions(IPropertySystem *iface, @@ -209,20 +207,17 @@ static HRESULT WINAPI propsys_FormatForDisplayAlloc(IPropertySystem *iface, static HRESULT WINAPI propsys_RegisterPropertySchema(IPropertySystem *iface, LPCWSTR path) { - FIXME("%s: stub\n", debugstr_w(path)); - return E_NOTIMPL; + return PSRegisterPropertySchema(path); } static HRESULT WINAPI propsys_UnregisterPropertySchema(IPropertySystem *iface, LPCWSTR path) { - FIXME("%s: stub\n", debugstr_w(path)); - return E_NOTIMPL; + return PSUnregisterPropertySchema(path); } static HRESULT WINAPI propsys_RefreshPropertySchema(IPropertySystem *iface) { - FIXME("refresh: stub\n"); - return E_NOTIMPL; + return PSRefreshPropertySchema(); } static const IPropertySystemVtbl propsysvtbl = { diff --git a/include/propsys.idl b/include/propsys.idl index 0117090..04d3fbf 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -804,6 +804,8 @@ cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") cpp_quote("HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR,REFIID,void **);") cpp_quote("HRESULT WINAPI PSRefreshPropertySchema(void);") +cpp_quote("HRESULT WINAPI PSRegisterPropertySchema(LPCWSTR);") +cpp_quote("HRESULT WINAPI PSUnregisterPropertySchema(LPCWSTR);") /* TODO: Add remainder of the C api here */

1 0

Nikolay Sivov : propsys: Implement PSGetPropertySystem().
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: d897b32598db0864a2188adc12fb3cca66f648ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d897b32598db0864a2188adc1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 26 21:03:54 2014 +0400 propsys: Implement PSGetPropertySystem(). --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 108 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index a64d53a..92b6d7c 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -84,7 +84,7 @@ @ stdcall PSGetPropertyDescriptionListFromString(ptr ptr ptr) @ stub PSGetPropertyFromPropertyStorage @ stub PSGetPropertyKeyFromName -@ stub PSGetPropertySystem +@ stdcall PSGetPropertySystem(ptr ptr) @ stub PSGetPropertyValue @ stub PSLookupPropertyHandlerCLSID @ stdcall PSPropertyKeyFromString(wstr ptr) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index ad96aab..4bb9d26 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -139,6 +139,114 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } +static HRESULT WINAPI propsys_QueryInterface(IPropertySystem *iface, REFIID riid, void **obj) +{ + *obj = NULL; + + if (IsEqualIID(riid, &IID_IPropertySystem) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IPropertySystem_AddRef(iface); + return S_OK; + } + + FIXME("%s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI propsys_AddRef(IPropertySystem *iface) +{ + return 2; +} + +static ULONG WINAPI propsys_Release(IPropertySystem *iface) +{ + return 1; +} + +static HRESULT WINAPI propsys_GetPropertyDescription(IPropertySystem *iface, + REFPROPERTYKEY propkey, REFIID riid, void **ppv) +{ + FIXME("%p %s %p: stub\n", propkey, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *iface, + LPCWSTR canonical_name, REFIID riid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_w(canonical_name), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_GetPropertyDescriptionListFromString(IPropertySystem *iface, + LPCWSTR proplist, REFIID riid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_w(proplist), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_EnumeratePropertyDescriptions(IPropertySystem *iface, + PROPDESC_ENUMFILTER filter, REFIID riid, void **ppv) +{ + FIXME("%d %s %p: stub\n", filter, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_FormatForDisplay(IPropertySystem *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, + LPWSTR dest, DWORD destlen) +{ + FIXME("%p %p %x %p %d: stub\n", key, propvar, flags, dest, destlen); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_FormatForDisplayAlloc(IPropertySystem *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, + LPWSTR *text) +{ + FIXME("%p %p %x %p: stub\n", key, propvar, flags, text); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_RegisterPropertySchema(IPropertySystem *iface, LPCWSTR path) +{ + FIXME("%s: stub\n", debugstr_w(path)); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_UnregisterPropertySchema(IPropertySystem *iface, LPCWSTR path) +{ + FIXME("%s: stub\n", debugstr_w(path)); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_RefreshPropertySchema(IPropertySystem *iface) +{ + FIXME("refresh: stub\n"); + return E_NOTIMPL; +} + +static const IPropertySystemVtbl propsysvtbl = { + propsys_QueryInterface, + propsys_AddRef, + propsys_Release, + propsys_GetPropertyDescription, + propsys_GetPropertyDescriptionByName, + propsys_GetPropertyDescriptionListFromString, + propsys_EnumeratePropertyDescriptions, + propsys_FormatForDisplay, + propsys_FormatForDisplayAlloc, + propsys_RegisterPropertySchema, + propsys_UnregisterPropertySchema, + propsys_RefreshPropertySchema +}; + +static IPropertySystem propsys = { &propsysvtbl }; + +HRESULT WINAPI PSGetPropertySystem(REFIID riid, void **obj) +{ + return IPropertySystem_QueryInterface(&propsys, riid, obj); +} + HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) { FIXME("%s stub\n", debugstr_w(path));

1 0

Piotr Caban : msvcrt: Return string in _wcslwr and _wcslwr_l.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 28830b4b363111b9f04fbf1a336387ff107ca8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28830b4b363111b9f04fbf1a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 27 11:02:42 2014 +0200 msvcrt: Return string in _wcslwr and _wcslwr_l. --- dlls/msvcrt/wcs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 548c907..7c299a7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -273,17 +273,19 @@ int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) /****************************************************************** * _wcslwr_l (MSVCRT.@) */ -int CDECL MSVCRT__wcslwr_l( MSVCRT_wchar_t* str, MSVCRT__locale_t locale ) +MSVCRT_wchar_t* CDECL MSVCRT__wcslwr_l( MSVCRT_wchar_t* str, MSVCRT__locale_t locale ) { - return MSVCRT__wcslwr_s_l(str, -1, locale); + MSVCRT__wcslwr_s_l(str, -1, locale); + return str; } /****************************************************************** * _wcslwr (MSVCRT.@) */ -int CDECL MSVCRT__wcslwr( MSVCRT_wchar_t* str ) +MSVCRT_wchar_t* CDECL MSVCRT__wcslwr( MSVCRT_wchar_t* str ) { - return MSVCRT__wcslwr_s_l(str, -1, NULL); + MSVCRT__wcslwr_s_l(str, -1, NULL); + return str; } /*********************************************************************

1 0

Austin English : include: Add missing EntryInProgress member to _PEB_LDR_DATA struct.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: e63f0bf4b8656c73a26870005cd8694e50c4834a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e63f0bf4b8656c73a26870005… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 26 23:34:59 2014 -0700 include: Add missing EntryInProgress member to _PEB_LDR_DATA struct. --- include/winternl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winternl.h b/include/winternl.h index 886c2ea..d7f2f50 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -191,6 +191,7 @@ typedef struct _PEB_LDR_DATA LIST_ENTRY InLoadOrderModuleList; LIST_ENTRY InMemoryOrderModuleList; LIST_ENTRY InInitializationOrderModuleList; + PVOID EntryInProgress; } PEB_LDR_DATA, *PPEB_LDR_DATA; typedef struct _GDI_TEB_BATCH

1 0

Michael Stefaniuc : dmcompos/tests: Test some IPersistStream methods of DMChordMap.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: fa51f080a4fc7e0beb63c87accee134578a9050f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa51f080a4fc7e0beb63c87ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:50:52 2014 +0200 dmcompos/tests: Test some IPersistStream methods of DMChordMap. --- dlls/dmcompos/tests/dmcompos.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index ecb7745..aaaa4ac 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -230,6 +230,37 @@ static void test_COM_track(void) } } +static void test_chordmap(void) +{ + IDirectMusicChordMap *dmcm; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicChordMap, (void**)&dmcm); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicChordMap), + "Expected class CLSID_DirectMusicChordMap got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicChordMap_Release(dmcm)); +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -244,6 +275,7 @@ START_TEST(dmcompos) test_COM_chordmap(); test_COM_template(); test_COM_track(); + test_chordmap(); CoUninitialize(); }

1 0

Michael Stefaniuc : dswave/tests: Test some IPersistStream methods of DirectSoundWave.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 0ade62e03c62fb97e37eeec3aae932bec12a1df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ade62e03c62fb97e37eeec3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:43:58 2014 +0200 dswave/tests: Test some IPersistStream methods of DirectSoundWave. --- dlls/dswave/tests/dswave.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index 154c899..1a96548 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -86,6 +86,37 @@ static void test_COM(void) while (IDirectMusicObject_Release(dmo)); } +static void test_dswave(void) +{ + IDirectMusicObject *dmo; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectSoundWave, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "DirectSoundWave create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectSoundWave), + "Expected class CLSID_DirectSoundWave got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicObject_Release(dmo)); +} + START_TEST(dswave) { CoInitialize(NULL); @@ -97,6 +128,7 @@ START_TEST(dswave) return; } test_COM(); + test_dswave(); CoUninitialize(); }

1 0

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 June 2014