May 2015 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Split getAttribute into helper function and use it in IHTMLDOMAttribute:: get_nodeValue implementation.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: 8e0d6619276f3c139defc9461c294a49022d9fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0d6619276f3c139defc9461… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 19:14:13 2015 +0200 mshtml: Split getAttribute into helper function and use it in IHTMLDOMAttribute::get_nodeValue implementation. --- dlls/mshtml/htmlattr.c | 6 +---- dlls/mshtml/htmlelem.c | 59 +++++++++++++++++++++++--------------------- dlls/mshtml/mshtml_private.h | 6 +++++ 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 8359847..bd0630e 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -164,8 +164,6 @@ static HRESULT WINAPI HTMLDOMAttribute_put_nodeValue(IHTMLDOMAttribute *iface, V static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, VARIANT *p) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - DISPPARAMS dp = {NULL, NULL, 0, 0}; - EXCEPINFO ei; TRACE("(%p)->(%p)\n", This, p); @@ -174,9 +172,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, V return E_UNEXPECTED; } - memset(&ei, 0, sizeof(ei)); - return IDispatchEx_InvokeEx(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, LOCALE_SYSTEM_DEFAULT, - DISPATCH_PROPERTYGET, &dp, p, &ei, NULL); + return get_elem_attr_value_by_dispid(This->elem, This->dispid, 0, p); } static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d2e9f27..c70786b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -606,10 +606,6 @@ static HRESULT WINAPI HTMLElement_Invoke(IHTMLElement *iface, DISPID dispIdMembe wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } -#define ATTRFLAG_CASESENSITIVE 0x0001 -#define ATTRFLAG_ASSTRING 0x0002 -#define ATTRFLAG_EXPANDURL 0x0004 - static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttributeName, VARIANT AttributeValue, LONG lFlags) { @@ -640,14 +636,42 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dispParams, NULL, &excep, NULL); } +HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, DWORD flags, VARIANT *ret) +{ + DISPPARAMS dispParams = {NULL, NULL, 0, 0}; + EXCEPINFO excep; + HRESULT hres; + + hres = IDispatchEx_InvokeEx(&elem->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYGET, &dispParams, ret, &excep, NULL); + if(FAILED(hres)) + return hres; + + if(flags & ATTRFLAG_ASSTRING) { + switch(V_VT(ret)) { + case VT_BSTR: + break; + case VT_DISPATCH: + IDispatch_Release(V_DISPATCH(ret)); + V_VT(ret) = VT_BSTR; + V_BSTR(ret) = SysAllocString(NULL); + break; + default: + hres = VariantChangeType(ret, ret, 0, VT_BSTR); + if(FAILED(hres)) + return hres; + } + } + + return S_OK; +} + static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttributeName, LONG lFlags, VARIANT *AttributeValue) { HTMLElement *This = impl_from_IHTMLElement(iface); DISPID dispid; HRESULT hres; - DISPPARAMS dispParams = {NULL, NULL, 0, 0}; - EXCEPINFO excep; TRACE("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue); @@ -666,28 +690,7 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr return hres; } - hres = IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, - DISPATCH_PROPERTYGET, &dispParams, AttributeValue, &excep, NULL); - if(FAILED(hres)) - return hres; - - if(lFlags & ATTRFLAG_ASSTRING) { - switch(V_VT(AttributeValue)) { - case VT_BSTR: - break; - case VT_DISPATCH: - IDispatch_Release(V_DISPATCH(AttributeValue)); - V_VT(AttributeValue) = VT_BSTR; - V_BSTR(AttributeValue) = SysAllocString(NULL); - break; - default: - hres = VariantChangeType(AttributeValue, AttributeValue, 0, VT_BSTR); - if(FAILED(hres)) - return hres; - } - } - - return S_OK; + return get_elem_attr_value_by_dispid(This, dispid, lFlags, AttributeValue); } static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strAttributeName, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 22b8397..cc1d27b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -976,6 +976,12 @@ HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; 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; + +#define ATTRFLAG_CASESENSITIVE 0x0001 +#define ATTRFLAG_ASSTRING 0x0002 +#define ATTRFLAG_EXPANDURL 0x0004 + +HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,DWORD,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_source_index(HTMLElement*,LONG*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN;

1 0

Sebastian Lackner : ntdll: Return failure in NtProtectVirtualMemory when last argument is omitted.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: ee6a477cab209aa34787d4711123993eed380d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6a477cab209aa34787d4711… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:46:38 2015 +0200 ntdll: Return failure in NtProtectVirtualMemory when last argument is omitted. --- dlls/kernel32/tests/virtual.c | 5 ----- dlls/ntdll/virtual.c | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 2dea156..4f50df8 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2492,27 +2492,22 @@ static void test_VirtualProtect(void) SetLastError(0xdeadbeef); ret = VirtualProtect(base, si.dwPageSize, PAGE_READONLY, NULL); - todo_wine ok(!ret, "VirtualProtect should fail\n"); - todo_wine ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %d\n", GetLastError()); old_prot = 0xdeadbeef; ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); ok(ret, "VirtualProtect failed %d\n", GetLastError()); - todo_wine ok(old_prot == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", old_prot); addr = base; size = si.dwPageSize; status = pNtProtectVirtualMemory(GetCurrentProcess(), &addr, &size, PAGE_READONLY, NULL); - todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtProtectVirtualMemory should fail, got %08x\n", status); addr = base; size = si.dwPageSize; old_prot = 0xdeadbeef; status = pNtProtectVirtualMemory(GetCurrentProcess(), &addr, &size, PAGE_NOACCESS, &old_prot); ok(status == STATUS_SUCCESS, "NtProtectVirtualMemory should succeed, got %08x\n", status); - todo_wine ok(old_prot == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", old_prot); for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9d29c33..0629816 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2164,6 +2164,9 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T TRACE("%p %p %08lx %08x\n", process, addr, size, new_prot ); + if (!old_prot) + return STATUS_ACCESS_VIOLATION; + if (process != NtCurrentProcess()) { apc_call_t call;

1 0

Julian Rüger : German translation for release 1.7.42
by Jeremy Newman May 4, 2015

May 4, 2015

Module: website Branch: master Commit: eae33ce2acace70c542b888b6734f591d97cbf0a URL: http://source.winehq.org/git/website.git/?a=commit;h=eae33ce2acace70c542b88… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon May 4 16:54:01 2015 +0200 German translation for release 1.7.42 --- news/de/2015050101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2015050101.xml b/news/de/2015050101.xml new file mode 100644 index 0000000..5dd24e2 --- /dev/null +++ b/news/de/2015050101.xml @@ -0,0 +1,15 @@ +<news> +<date>1. Mai 2015</date> +<title>Wine 1.7.42 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.42 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.42">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von dynamischen Zeitzonen-Informationen.</li> + <li>Anfängliche Unterstützung des Desktopshell-Fensters.</li> + <li>Ein wenig mehr Direct2D-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.42.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.42
by Jeremy Newman May 4, 2015

May 4, 2015

Module: website Branch: master Commit: b972bc573f5a0f00c469e008a476fe9e1a3c2a71 URL: http://source.winehq.org/git/website.git/?a=commit;h=b972bc573f5a0f00c469e0… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri May 1 15:20:58 2015 +0200 Polish translation for release 1.7.42 --- news/pl/2015050101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2015050101.xml b/news/pl/2015050101.xml new file mode 100644 index 0000000..82ba472 --- /dev/null +++ b/news/pl/2015050101.xml @@ -0,0 +1,15 @@ +<news> +<date>Maj 1, 2015</date> +<title>Wydano Wine 1.7.42</title> +<body> + Wydanie rozwojowe Wine 1.7.42 jest już dostępne. + <a href="{$root}/announce/1.7.42">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa informacji o dynamicznej strefie czasowej.</li> + <li>Wstępna obsługa okna powłoki pulpitu.</li> + <li>Poszerzono obsługę Direct2D.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.42.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Nikolay Sivov : msdmo: Reg* API does not use HRESULT return codes.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: 49958f83f1caf983ca6ad7ce5a43b6c24bafffa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49958f83f1caf983ca6ad7ce5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 3 21:41:00 2015 +0300 msdmo: Reg* API does not use HRESULT return codes. --- dlls/msdmo/dmoreg.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index dea079a..67ba498 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -189,25 +189,26 @@ HRESULT WINAPI DMORegister( HKEY hkey = 0; HKEY hckey = 0; HKEY hclskey = 0; + LONG ret; TRACE("%s %s %s\n", debugstr_w(szName), debugstr_guid(clsidDMO), debugstr_guid(guidCategory)); if (IsEqualGUID(guidCategory, &GUID_NULL)) return E_INVALIDARG; - hres = RegCreateKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, NULL, + ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hrkey, NULL); - if (ERROR_SUCCESS != hres) - goto lend; + if (ret) + return HRESULT_FROM_WIN32(ret); /* Create clsidDMO key under MediaObjects */ - hres = RegCreateKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, NULL, + ret = RegCreateKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); - if (ERROR_SUCCESS != hres) + if (ret) goto lend; /* Set default Name value */ - hres = RegSetValueExW(hkey, NULL, 0, REG_SZ, (const BYTE*) szName, + ret = RegSetValueExW(hkey, NULL, 0, REG_SZ, (const BYTE*) szName, (strlenW(szName) + 1) * sizeof(WCHAR)); /* Set InputTypes */ @@ -219,28 +220,28 @@ HRESULT WINAPI DMORegister( if (dwFlags & DMO_REGISTERF_IS_KEYED) { /* Create Keyed key */ - hres = RegCreateKeyExW(hkey, szDMOKeyed, 0, NULL, + ret = RegCreateKeyExW(hkey, szDMOKeyed, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hckey, NULL); - if (ERROR_SUCCESS != hres) + if (ret) goto lend; RegCloseKey(hckey); } /* Register the category */ - hres = RegCreateKeyExW(hrkey, szDMOCategories, 0, NULL, + ret = RegCreateKeyExW(hrkey, szDMOCategories, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hckey, NULL); - if (ERROR_SUCCESS != hres) + if (ret) goto lend; RegCloseKey(hkey); - hres = RegCreateKeyExW(hckey, GUIDToString(szguid, guidCategory), 0, NULL, + ret = RegCreateKeyExW(hckey, GUIDToString(szguid, guidCategory), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); - if (ERROR_SUCCESS != hres) + if (ret) goto lend; - hres = RegCreateKeyExW(hkey, GUIDToString(szguid, clsidDMO), 0, NULL, + ret = RegCreateKeyExW(hkey, GUIDToString(szguid, clsidDMO), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hclskey, NULL); - if (ERROR_SUCCESS != hres) + if (ret) goto lend; lend: @@ -253,6 +254,7 @@ lend: if (hrkey) RegCloseKey(hrkey); + hres = HRESULT_FROM_WIN32(ret); TRACE(" hresult=0x%08x\n", hres); return hres; }

1 0

Nikolay Sivov : dwrite/tests: Test character spacing applied to cluster metrics.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: 47224510b466f8e9479ecacc50b3f0a5e4815d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47224510b466f8e9479ecacc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 12:52:50 2015 +0300 dwrite/tests: Test character spacing applied to cluster metrics. --- dlls/dwrite/tests/layout.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 57ae458..73296ba 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -994,6 +994,7 @@ static void test_GetClusterMetrics(void) static const WCHAR strW[] = {'a','b','c','d',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; DWRITE_CLUSTER_METRICS metrics[4]; + IDWriteTextLayout1 *layout1; IDWriteInlineObject *trimm; IDWriteTextFormat *format; IDWriteTextLayout *layout; @@ -1026,6 +1027,49 @@ static void test_GetClusterMetrics(void) ok(metrics[i].length == 1, "%u: got length %u\n", i, metrics[i].length); } + /* apply spacing and check widths again */ + if (IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout1, (void**)&layout1) == S_OK) { + DWRITE_CLUSTER_METRICS metrics2[4]; + FLOAT leading, trailing, min_advance; + DWRITE_TEXT_RANGE r; + + leading = trailing = min_advance = 2.0; + hr = IDWriteTextLayout1_GetCharacterSpacing(layout1, 0, &leading, &trailing, + &min_advance, NULL); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(leading == 0.0 && trailing == 0.0 && min_advance == 0.0, + "got %.2f, %.2f, %.2f\n", leading, trailing, min_advance); +} + r.startPosition = 0; + r.length = 4; + hr = IDWriteTextLayout1_SetCharacterSpacing(layout1, 10.0, 15.0, 0.0, r); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics2, sizeof(metrics2)/sizeof(metrics2[0]), &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 4, "got %u\n", count); + for (i = 0; i < count; i++) { +todo_wine + ok(metrics2[i].width > metrics[i].width, "%u: got width %.2f, was %.2f\n", i, metrics2[i].width, + metrics[i].width); + ok(metrics2[i].length == 1, "%u: got length %u\n", i, metrics2[i].length); + } + + /* back to defaults */ + r.startPosition = 0; + r.length = 4; + hr = IDWriteTextLayout1_SetCharacterSpacing(layout1, 0.0, 0.0, 0.0, r); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDWriteTextLayout1_Release(layout1); + } + else + win_skip("IDWriteTextLayout1 is not supported, cluster spacing test skipped.\n"); + hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &trimm); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Aaryaman Vasishta : d3drm/tests: Remove TODO' s from test_qi and TODO field from test tables.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: 33160f5221ad7796bbb0612b3341d6498afcd7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33160f5221ad7796bbb0612b3… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 30 14:29:40 2015 +0530 d3drm/tests: Remove TODO's from test_qi and TODO field from test tables. --- dlls/d3drm/tests/d3drm.c | 287 +++++++++++++++++++++++------------------------ 1 file changed, 139 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33160f5221ad7796bbb06…

1 0

Aaryaman Vasishta : d3drm: Fix refcounting for IDirect3DRM{1-3}.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: 844ce497171c9e82174a1e0da53809ca1833324e URL: http://source.winehq.org/git/wine.git/?a=commit;h=844ce497171c9e82174a1e0da… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 30 14:29:39 2015 +0530 d3drm: Fix refcounting for IDirect3DRM{1-3}. --- dlls/d3drm/d3drm.c | 54 +++++++++++++++++++++++++++++++++++++++--------- dlls/d3drm/tests/d3drm.c | 4 ++-- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 7b74cfb..9be9607 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -55,7 +55,7 @@ struct d3drm IDirect3DRM IDirect3DRM_iface; IDirect3DRM2 IDirect3DRM2_iface; IDirect3DRM3 IDirect3DRM3_iface; - LONG ref; + LONG ref1, ref2, ref3, iface_count; }; static inline struct d3drm *impl_from_IDirect3DRM(IDirect3DRM *iface) @@ -73,6 +73,12 @@ static inline struct d3drm *impl_from_IDirect3DRM3(IDirect3DRM3 *iface) return CONTAINING_RECORD(iface, struct d3drm, IDirect3DRM3_iface); } +static void d3drm_destroy(struct d3drm *d3drm) +{ + HeapFree(GetProcessHeap(), 0, d3drm); + TRACE("d3drm object %p is being destroyed.\n", d3drm); +} + static HRESULT WINAPI d3drm1_QueryInterface(IDirect3DRM *iface, REFIID riid, void **out) { struct d3drm *d3drm = impl_from_IDirect3DRM(iface); @@ -106,22 +112,25 @@ static HRESULT WINAPI d3drm1_QueryInterface(IDirect3DRM *iface, REFIID riid, voi static ULONG WINAPI d3drm1_AddRef(IDirect3DRM *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM(iface); - ULONG refcount = InterlockedIncrement(&d3drm->ref); + ULONG refcount = InterlockedIncrement(&d3drm->ref1); TRACE("%p increasing refcount to %u.\n", iface, refcount); + if (refcount == 1) + InterlockedIncrement(&d3drm->iface_count); + return refcount; } static ULONG WINAPI d3drm1_Release(IDirect3DRM *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM(iface); - ULONG refcount = InterlockedDecrement(&d3drm->ref); + ULONG refcount = InterlockedDecrement(&d3drm->ref1); TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!refcount) - HeapFree(GetProcessHeap(), 0, d3drm); + if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) + d3drm_destroy(d3drm); return refcount; } @@ -455,15 +464,27 @@ static HRESULT WINAPI d3drm2_QueryInterface(IDirect3DRM2 *iface, REFIID riid, vo static ULONG WINAPI d3drm2_AddRef(IDirect3DRM2 *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + ULONG refcount = InterlockedIncrement(&d3drm->ref2); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + if (refcount == 1) + InterlockedIncrement(&d3drm->iface_count); - return d3drm1_AddRef(&d3drm->IDirect3DRM_iface); + return refcount; } static ULONG WINAPI d3drm2_Release(IDirect3DRM2 *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + ULONG refcount = InterlockedDecrement(&d3drm->ref2); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - return d3drm1_Release(&d3drm->IDirect3DRM_iface); + if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) + d3drm_destroy(d3drm); + + return refcount; } static HRESULT WINAPI d3drm2_CreateObject(IDirect3DRM2 *iface, @@ -804,15 +825,27 @@ static HRESULT WINAPI d3drm3_QueryInterface(IDirect3DRM3 *iface, REFIID riid, vo static ULONG WINAPI d3drm3_AddRef(IDirect3DRM3 *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + ULONG refcount = InterlockedIncrement(&d3drm->ref3); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + if (refcount == 1) + InterlockedIncrement(&d3drm->iface_count); - return d3drm1_AddRef(&d3drm->IDirect3DRM_iface); + return refcount; } static ULONG WINAPI d3drm3_Release(IDirect3DRM3 *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + ULONG refcount = InterlockedDecrement(&d3drm->ref3); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - return d3drm1_Release(&d3drm->IDirect3DRM_iface); + if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) + d3drm_destroy(d3drm); + + return refcount; } static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, @@ -1488,7 +1521,8 @@ HRESULT WINAPI Direct3DRMCreate(IDirect3DRM **d3drm) object->IDirect3DRM_iface.lpVtbl = &d3drm1_vtbl; object->IDirect3DRM2_iface.lpVtbl = &d3drm2_vtbl; object->IDirect3DRM3_iface.lpVtbl = &d3drm3_vtbl; - object->ref = 1; + object->ref1 = 1; + object->iface_count = 1; *d3drm = &object->IDirect3DRM_iface; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 977c9c0..61f2cab 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1761,8 +1761,8 @@ static void test_d3drm_qi(void) { static const struct qi_test tests[] = { - { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, TRUE }, - { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, TRUE }, + { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, FALSE }, + { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, FALSE }, { &IID_IDirect3DRM, &IID_IDirect3DRM, S_OK, FALSE }, { &IID_IDirect3DRMDevice, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, { &IID_IDirect3DRMObject, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE },

1 0

Henri Verbeet : d3drm/tests: Release the material after a GetGroupMaterial () call in test_MeshBuilder() (Valgrind).
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: e2e1ac2bf64073997d490dfd15e6173531190178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e1ac2bf64073997d490dfd1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 4 13:21:32 2015 +0200 d3drm/tests: Release the material after a GetGroupMaterial() call in test_MeshBuilder() (Valgrind). --- dlls/d3drm/tests/d3drm.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8617a3d..5dcfddc 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -447,21 +447,19 @@ static void test_MeshBuilder(void) hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material); ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); ok(material != NULL, "No material present\n"); - if ((hr == D3DRM_OK) && material) - { - hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]); - ok(hr == D3DRM_OK, "GetMaterialEmissive failed returning hr = %x\n", hr); - ok(values[0] == 0.5f, "Emissive red component should be %f instead of %f\n", 0.5f, values[0]); - ok(values[1] == 0.5f, "Emissive green component should be %f instead of %f\n", 0.5f, values[1]); - ok(values[2] == 0.5f, "Emissive blue component should be %f instead of %f\n", 0.5f, values[2]); - hr = IDirect3DRMMaterial_GetSpecular(material, &values[0], &values[1], &values[2]); - ok(hr == D3DRM_OK, "GetMaterialEmissive failed returning hr = %x\n", hr); - ok(values[0] == 1.0f, "Specular red component should be %f instead of %f\n", 1.0f, values[0]); - ok(values[1] == 0.0f, "Specular green component should be %f instead of %f\n", 0.0f, values[1]); - ok(values[2] == 0.0f, "Specular blue component should be %f instead of %f\n", 0.0f, values[2]); - values[0] = IDirect3DRMMaterial_GetPower(material); - ok(values[0] == 30.0f, "Power value should be %f instead of %f\n", 30.0f, values[0]); - } + hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]); + ok(hr == D3DRM_OK, "Failed to get emissive color, hr %#x.\n", hr); + ok(values[0] == 0.5f, "Got unexpected red component %.8e.\n", values[0]); + ok(values[1] == 0.5f, "Got unexpected green component %.8e.\n", values[1]); + ok(values[2] == 0.5f, "Got unexpected blue component %.8e.\n", values[2]); + hr = IDirect3DRMMaterial_GetSpecular(material, &values[0], &values[1], &values[2]); + ok(hr == D3DRM_OK, "Failed to get specular color, hr %#x.\n", hr); + ok(values[0] == 1.0f, "Got unexpected red component %.8e.\n", values[0]); + ok(values[1] == 0.0f, "Got unexpected green component %.8e.\n", values[1]); + ok(values[2] == 0.0f, "Got unexpected blue component %.8e.\n", values[2]); + values[0] = IDirect3DRMMaterial_GetPower(material); + ok(values[0] == 30.0f, "Got unexpected power value %.8e.\n", values[0]); + IDirect3DRMMaterial_Release(material); IDirect3DRMMesh_Release(mesh); }

1 0

Henri Verbeet : d3drm: Also validate face indices against the vertex count in load_mesh_data() ( Valgrind).
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: e723d2a0793b23ad527b681d01ecbb39af757c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e723d2a0793b23ad527b681d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 4 13:21:31 2015 +0200 d3drm: Also validate face indices against the vertex count in load_mesh_data() (Valgrind). --- dlls/d3drm/meshbuilder.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c24d9dc..8bd5131 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1368,7 +1368,10 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, if (!This->nb_normals) { /* Compute face normal */ - if (nb_face_indexes > 2) + if (nb_face_indexes > 2 + && faces_vertex_idx_ptr[0] < This->nb_vertices + && faces_vertex_idx_ptr[1] < This->nb_vertices + && faces_vertex_idx_ptr[2] < This->nb_vertices) { D3DVECTOR a, b;

1 0