June 2014 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Use get_elem_attr_value helper in is_elem_name.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d0898685a686befe0fdcd8d0310f1a9b74906887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0898685a686befe0fdcd8d03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:28 2014 +0200 mshtml: Use get_elem_attr_value helper in is_elem_name. --- dlls/mshtml/htmlelemcol.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index cb7bad1..8fd61ed 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -368,7 +368,7 @@ static BOOL is_elem_id(HTMLElement *elem, LPCWSTR name) static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) { const PRUnichar *str; - nsAString nsstr, nsname; + nsAString nsstr; BOOL ret = FALSE; nsresult nsres; @@ -385,15 +385,12 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) return TRUE; } - nsAString_InitDepend(&nsname, nameW); - nsres = nsIDOMHTMLElement_GetAttribute(elem->nselem, &nsname, &nsstr); - nsAString_Finish(&nsname); + nsres = get_elem_attr_value(elem->nselem, nameW, &nsstr, &str); if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&nsstr, &str); ret = !strcmpiW(str, name); + nsAString_Finish(&nsstr); } - nsAString_Finish(&nsstr); return ret; }

1 0

Andrei Slăvoiu : wined3d: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don' t support EXT_GPU_SHADER4.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: fbdf618251c7d9c3f01f53bc53266d081089361c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdf618251c7d9c3f01f53bc5… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Fri May 23 01:23:30 2014 +0300 wined3d: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don't support EXT_GPU_SHADER4. --- dlls/wined3d/directx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 224992d..d6bb3836 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1667,7 +1667,8 @@ static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) if (level == 8 && gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[ARB_VERTEX_SHADER]) level = 9; - if (level == 9 && gl_info->supported[EXT_GPU_SHADER4]) + if (level == 9 && (gl_info->supported[EXT_GPU_SHADER4] + || gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30))) level = 10; return level;

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in get_font_size.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 3efaaacf3c5add5e99c689d40ddeea574c6dfd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3efaaacf3c5add5e99c689d40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:11 2014 +0200 mshtml: Use get_elem_attr_value helper in get_font_size. --- dlls/mshtml/editor.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index cfab2ed..14aab53 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -263,7 +263,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_ static void get_font_size(HTMLDocument *This, WCHAR *ret) { nsISelection *nsselection = get_ns_selection(This); - nsIDOMElement *elem = NULL; + nsIDOMHTMLElement *elem = NULL; nsIDOMNode *node = NULL, *tmp_node; nsAString tag_str; LPCWSTR tag; @@ -284,36 +284,29 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) break; if(node_type == ELEMENT_NODE) { - nsIDOMNode_QueryInterface(node, &IID_nsIDOMElement, (void**)&elem); + nsIDOMNode_QueryInterface(node, &IID_nsIDOMHTMLElement, (void**)&elem); nsAString_Init(&tag_str, NULL); - nsIDOMElement_GetTagName(elem, &tag_str); + nsIDOMHTMLElement_GetTagName(elem, &tag_str); nsAString_GetData(&tag_str, &tag); if(!strcmpiW(tag, fontW)) { - nsAString size_str, val_str; - LPCWSTR val; + nsAString val_str; + const PRUnichar *val; TRACE("found font tag %p\n", elem); - nsAString_InitDepend(&size_str, sizeW); - nsAString_Init(&val_str, NULL); - - nsIDOMElement_GetAttribute(elem, &size_str, &val_str); - nsAString_GetData(&val_str, &val); - + get_elem_attr_value(elem, sizeW, &val_str, &val); if(*val) { TRACE("found size %s\n", debugstr_w(val)); strcpyW(ret, val); } - nsAString_Finish(&size_str); nsAString_Finish(&val_str); } nsAString_Finish(&tag_str); - - nsIDOMElement_Release(elem); + nsIDOMHTMLElement_Release(elem); } if(*ret)

1 0

Michael Stefaniuc : dmusic: Return S_FALSE for the unimplemented IPersistStream_IsDirty().
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 5d7e93dc54d0b5ad86ad57ad7e8537ad0278d162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7e93dc54d0b5ad86ad57ad7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:06:00 2014 +0200 dmusic: Return S_FALSE for the unimplemented IPersistStream_IsDirty(). --- dlls/dmusic/collection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index acbc2a5..3d09815 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -499,7 +499,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetClassID(LPPER static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_IsDirty(LPPERSISTSTREAM iface) { - return E_NOTIMPL; + return S_FALSE; } static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTSTREAM iface, IStream* stream)

1 0

Michael Stefaniuc : dmstyle/tests: Test some IPersistStream methods of DMStyle.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 834bae99359bf122a9d0fa4ac4b034699723162e URL: http://source.winehq.org/git/wine.git/?a=commit;h=834bae99359bf122a9d0fa4ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:10:43 2014 +0200 dmstyle/tests: Test some IPersistStream methods of DMStyle. --- dlls/dmstyle/tests/dmstyle.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 58c15eb..be9de42 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -208,6 +208,37 @@ static void test_COM_track(void) } } +static void test_dmstyle(void) +{ + IDirectMusicStyle *dms; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicStyle, (void**)&dms); + ok(hr == S_OK, "DirectMusicStyle create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicStyle_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicStyle), + "Expected class CLSID_DirectMusicStyle got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods*/ + hr = IPersistStream_IsDirty(ps); + 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 (IDirectMusicStyle_Release(dms)); +} + START_TEST(dmstyle) { CoInitialize(NULL); @@ -221,6 +252,7 @@ START_TEST(dmstyle) test_COM(); test_COM_section(); test_COM_track(); + test_dmstyle(); CoUninitialize(); }

1 0

Huw Davies : crypt32/tests: Fix test failure on win 8.
by Alexandre Julliard June 11, 2014

June 11, 2014

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

Austin English : include: Add missing EntryInProgress member to _PEB_LDR_DATA struct.
by Alexandre Julliard June 11, 2014

June 11, 2014

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 : dmusic/tests: Test unimplemented IPersistStream methods in DMCollection.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 3115e4901709c6ff9a49fb4bb591c31532e0a1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3115e4901709c6ff9a49fb4bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:08:34 2014 +0200 dmusic/tests: Test unimplemented IPersistStream methods in DMCollection. --- dlls/dmusic/tests/dmusic.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 528d182..b28a187 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -314,7 +314,10 @@ static void test_dmcoll(void) { IDirectMusicCollection *dmc; IDirectMusicObject *dmo; + IPersistStream *ps; DMUS_OBJECTDESC desc; + CLSID class; + ULARGE_INTEGER size; HRESULT hr; hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER, @@ -347,6 +350,18 @@ static void test_dmcoll(void) ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicCollection), "guidClass changed, should be CLSID_DirectMusicCollection\n"); + /* Unimplemented IPersistStream methods*/ + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + hr = IPersistStream_IsDirty(ps); + 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 (IDirectMusicCollection_Release(dmc)); }

1 0