January 2020 - Wine-Commits

Nikolay Sivov : ole32: Remove some internal helpers for item moniker.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: e7ce88ab7cc1bec99523d67e4f3281693f9cc461 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7ce88ab7cc1bec99523d67e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 10:32:19 2020 +0300 ole32: Remove some internal helpers for item moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 132 ++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 83 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index c85e263774..7ebfaea6b6 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -137,8 +137,6 @@ static HRESULT set_container_lock(IOleItemContainer *container, IBindCtx *pbc) return hr; } -static HRESULT ItemMonikerImpl_Destroy(ItemMonikerImpl* iface); - /******************************************************************************* * ItemMoniker_QueryInterface *******************************************************************************/ @@ -195,17 +193,20 @@ static ULONG WINAPI ItemMonikerImpl_AddRef(IMoniker* iface) ******************************************************************************/ static ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface) { - ItemMonikerImpl *This = impl_from_IMoniker(iface); - ULONG ref; - - TRACE("(%p)\n",This); + ItemMonikerImpl *moniker = impl_from_IMoniker(iface); + ULONG refcount = InterlockedDecrement(&moniker->ref); - ref = InterlockedDecrement(&This->ref); + TRACE("%p, refcount %u.\n", iface, refcount); - /* destroy the object if there are no more references to it */ - if (ref == 0) ItemMonikerImpl_Destroy(This); + if (!refcount) + { + if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); + heap_free(moniker->itemName); + heap_free(moniker->itemDelimiter); + heap_free(moniker); + } - return ref; + return refcount; } /****************************************************************************** @@ -1008,107 +1009,72 @@ static const IROTDataVtbl VT_ROTDataImpl = }; /****************************************************************************** - * ItemMoniker_Construct (local function) - *******************************************************************************/ -static HRESULT ItemMonikerImpl_Construct(ItemMonikerImpl* This, const WCHAR *delimiter, const WCHAR *name) + * CreateItemMoniker [OLE32.@] + ******************************************************************************/ +HRESULT WINAPI CreateItemMoniker(const WCHAR *delimiter, const WCHAR *name, IMoniker **ret) { + ItemMonikerImpl *moniker; int str_len; + HRESULT hr; + + TRACE("%s, %s, %p.\n", debugstr_w(delimiter), debugstr_w(name), ret); - TRACE("(%p, %s, %s)\n", This, debugstr_w(delimiter), debugstr_w(name)); + if (!(moniker = heap_alloc_zero(sizeof(*moniker)))) + return E_OUTOFMEMORY; - /* Initialize the virtual function table. */ - This->IMoniker_iface.lpVtbl = &VT_ItemMonikerImpl; - This->IROTData_iface.lpVtbl = &VT_ROTDataImpl; - This->ref = 0; - This->pMarshal = NULL; - This->itemDelimiter = NULL; + moniker->IMoniker_iface.lpVtbl = &VT_ItemMonikerImpl; + moniker->IROTData_iface.lpVtbl = &VT_ROTDataImpl; + moniker->ref = 1; str_len = (lstrlenW(name) + 1) * sizeof(WCHAR); - This->itemName = heap_alloc(str_len); - if (!This->itemName) - return E_OUTOFMEMORY; - memcpy(This->itemName, name, str_len); + moniker->itemName = heap_alloc(str_len); + if (!moniker->itemName) + { + hr = E_OUTOFMEMORY; + goto failed; + } + memcpy(moniker->itemName, name, str_len); if (delimiter) { str_len = (lstrlenW(delimiter) + 1) * sizeof(WCHAR); - This->itemDelimiter = heap_alloc(str_len); - if (!This->itemDelimiter) + moniker->itemDelimiter = heap_alloc(str_len); + if (!moniker->itemDelimiter) { - heap_free(This->itemName); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto failed; } - memcpy(This->itemDelimiter, delimiter, str_len); + memcpy(moniker->itemDelimiter, delimiter, str_len); } - return S_OK; -} - -/****************************************************************************** - * ItemMoniker_Destroy (local function) - *******************************************************************************/ -static HRESULT ItemMonikerImpl_Destroy(ItemMonikerImpl* This) -{ - TRACE("(%p)\n",This); - - if (This->pMarshal) IUnknown_Release(This->pMarshal); - HeapFree(GetProcessHeap(),0,This->itemName); - HeapFree(GetProcessHeap(),0,This->itemDelimiter); - HeapFree(GetProcessHeap(),0,This); + *ret = &moniker->IMoniker_iface; return S_OK; -} - -/****************************************************************************** - * CreateItemMoniker [OLE32.@] - ******************************************************************************/ -HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim, LPCOLESTR lpszItem, IMoniker **ppmk) -{ - ItemMonikerImpl* newItemMoniker; - HRESULT hr; - - TRACE("(%s,%s,%p)\n",debugstr_w(lpszDelim),debugstr_w(lpszItem),ppmk); - - newItemMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(ItemMonikerImpl)); - if (!newItemMoniker) - return STG_E_INSUFFICIENTMEMORY; +failed: + IMoniker_Release(&moniker->IMoniker_iface); - hr = ItemMonikerImpl_Construct(newItemMoniker,lpszDelim,lpszItem); - - if (FAILED(hr)){ - HeapFree(GetProcessHeap(),0,newItemMoniker); - return hr; - } - - return ItemMonikerImpl_QueryInterface(&newItemMoniker->IMoniker_iface,&IID_IMoniker, - (void**)ppmk); + return hr; } -HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, - IUnknown *pUnk, REFIID riid, void **ppv) +HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { - ItemMonikerImpl* newItemMoniker; - HRESULT hr; - static const WCHAR wszEmpty[] = { 0 }; + static const WCHAR emptyW[] = { 0 }; + IMoniker *moniker; + HRESULT hr; - TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv); *ppv = NULL; - if (pUnk) + if (outer) return CLASS_E_NOAGGREGATION; - newItemMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(ItemMonikerImpl)); - if (!newItemMoniker) - return E_OUTOFMEMORY; - - hr = ItemMonikerImpl_Construct(newItemMoniker, wszEmpty, wszEmpty); + if (FAILED(hr = CreateItemMoniker(emptyW, emptyW, &moniker))) + return hr; - if (SUCCEEDED(hr)) - hr = ItemMonikerImpl_QueryInterface(&newItemMoniker->IMoniker_iface, riid, ppv); - if (FAILED(hr)) - HeapFree(GetProcessHeap(),0,newItemMoniker); + hr = IMoniker_QueryInterface(moniker, riid, ppv); + IMoniker_Release(moniker); return hr; }

1 0

Nikolay Sivov : ole32: Fix IsRunning() for item moniker.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 25ad349d30a4db3ac5f9f3b75740f1ab019df434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25ad349d30a4db3ac5f9f3b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 10:32:20 2020 +0300 ole32: Fix IsRunning() for item moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 70 ++++++++++++++++++++++------------------------ dlls/ole32/tests/moniker.c | 66 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 95 insertions(+), 41 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 7ebfaea6b6..111b111a1a 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -648,53 +648,51 @@ static HRESULT WINAPI ItemMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) /****************************************************************************** * ItemMoniker_IsRunning ******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_IsRunning(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - IMoniker* pmkNewlyRunning) +static HRESULT WINAPI ItemMonikerImpl_IsRunning(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, + IMoniker *pmkNewlyRunning) { - ItemMonikerImpl *This = impl_from_IMoniker(iface); + ItemMonikerImpl *moniker = impl_from_IMoniker(iface); + IOleItemContainer *container; IRunningObjectTable* rot; - HRESULT res; - IOleItemContainer *poic=0; + HRESULT hr; TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning); - /* If pmkToLeft is NULL, this method returns TRUE if pmkNewlyRunning is non-NULL and is equal to this */ - /* moniker. Otherwise, the method checks the ROT to see whether this moniker is running. */ - if (pmkToLeft==NULL) - if ((pmkNewlyRunning!=NULL)&&(IMoniker_IsEqual(pmkNewlyRunning,iface)==S_OK)) - return S_OK; - else { - if (pbc==NULL) - return E_INVALIDARG; - - res=IBindCtx_GetRunningObjectTable(pbc,&rot); - - if (FAILED(res)) - return res; - - res = IRunningObjectTable_IsRunning(rot,iface); + if (!pbc) + return E_INVALIDARG; - IRunningObjectTable_Release(rot); + if (!pmkToLeft) + { + if (pmkNewlyRunning) + { + return IMoniker_IsEqual(iface, pmkNewlyRunning); } - else{ - - /* If pmkToLeft is non-NULL, the method calls IMoniker::BindToObject on the pmkToLeft parameter, */ - /* requesting an IOleItemContainer interface pointer. The method then calls IOleItemContainer::IsRunning,*/ - /* passing the string contained within this moniker. */ - - res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)&poic); - - if (SUCCEEDED(res)){ - - res=IOleItemContainer_IsRunning(poic,This->itemName); + else + { + hr = IBindCtx_GetRunningObjectTable(pbc, &rot); + if (SUCCEEDED(hr)) + { + hr = IRunningObjectTable_IsRunning(rot, iface); + IRunningObjectTable_Release(rot); + } + } + } + else + { + /* Container itself must be running too. */ + hr = IMoniker_IsRunning(pmkToLeft, pbc, NULL, NULL); + if (hr != S_OK) + return hr; - IOleItemContainer_Release(poic); + hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IOleItemContainer, (void **)&container); + if (SUCCEEDED(hr)) + { + hr = IOleItemContainer_IsRunning(container, moniker->itemName); + IOleItemContainer_Release(container); } } - return res; + return hr; } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 8b150738b2..7d4c8224ad 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -385,6 +385,7 @@ static HRESULT WINAPI test_item_container_GetObjectStorage(IOleItemContainer *if static HRESULT WINAPI test_item_container_IsRunning(IOleItemContainer *iface, LPOLESTR item) { + ok(0, "Unexpected call.\n"); return E_NOTIMPL; } @@ -569,7 +570,7 @@ Moniker_IsRunning(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, IMoniker* pmkNewlyRunning) { CHECK_EXPECTED_METHOD("Moniker_IsRunning"); - return E_NOTIMPL; + return 0x8beef000; } static HRESULT WINAPI @@ -1999,6 +2000,11 @@ static void test_item_moniker(void) { L"%", L"A", 0x41 }, { L"%", L"a", 0x41 }, }; + static const char *methods_isrunning[] = + { + "Moniker_IsRunning", + NULL + }; IMoniker *moniker, *moniker2, *reduced; HRESULT hr; DWORD moniker_type, i; @@ -2012,10 +2018,12 @@ static void test_item_moniker(void) struct test_moniker *container_moniker; WCHAR displayname[16] = L"display name"; IEnumMoniker *enummoniker; + IRunningObjectTable *rot; WCHAR *display_name; BIND_OPTS bind_opts; LARGE_INTEGER pos; IStream *stream; + DWORD cookie; hr = CreateItemMoniker(NULL, wszObjectName, &moniker); ok(hr == S_OK, "Failed to create item moniker, hr %#x.\n", hr); @@ -2139,19 +2147,65 @@ todo_wine "dwMkSys != MKSYS_ITEMMONIKER, instead was 0x%08x\n", moniker_type); + container_moniker = create_test_moniker(); + /* IsRunning test */ hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "IMoniker_IsRunning should return E_INVALIDARG, not 0x%08x\n", hr); + hr = IMoniker_IsRunning(moniker, NULL, &container_moniker->IMoniker_iface, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); ok(hr == S_FALSE, "IMoniker_IsRunning should return S_FALSE, not 0x%08x\n", hr); + hr = CreateItemMoniker(wszDelimiter, wszObjectName, &moniker2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + hr = IMoniker_IsRunning(moniker, bindctx, NULL, moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker2); + + /* Different moniker as newly running. */ + hr = CreateItemMoniker(wszDelimiter, L"Item123", &moniker2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = IMoniker_IsRunning(moniker, bindctx, NULL, moniker2); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IBindCtx_GetRunningObjectTable(bindctx, &rot); + ok(hr == S_OK, "Failed to get ROT, hr %#x.\n", hr); + + hr = IRunningObjectTable_Register(rot, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)moniker, moniker, &cookie); + ok(hr == S_OK, "Failed to register, hr %#x.\n", hr); + + hr = IRunningObjectTable_IsRunning(rot, moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsRunning(moniker, bindctx, NULL, moniker2); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IRunningObjectTable_Revoke(rot, cookie); + ok(hr == S_OK, "Failed to revoke registration, hr %#x.\n", hr); + + IRunningObjectTable_Release(rot); + + expected_method_list = methods_isrunning; + hr = IMoniker_IsRunning(moniker, bindctx, &container_moniker->IMoniker_iface, NULL); + ok(hr == 0x8beef000, "Unexpected hr %#x.\n", hr); + + expected_method_list = methods_isrunning; + hr = IMoniker_IsRunning(moniker, bindctx, &container_moniker->IMoniker_iface, moniker2); + ok(hr == 0x8beef000, "Unexpected hr %#x.\n", hr); + + IMoniker_Release(moniker2); + /* BindToObject() */ hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); ok(hr == E_INVALIDARG, "IMoniker_BindToStorage should return E_INVALIDARG, not 0x%08x\n", hr); - container_moniker = create_test_moniker(); - hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); ok(hr == (0x8bee0000 | BINDSPEED_INDEFINITE), "Unexpected hr %#x.\n", hr); @@ -2275,6 +2329,9 @@ todo_wine expected_item_moniker_comparison_data6, sizeof(expected_item_moniker_comparison_data6), 34, L""); + hr = CoCreateInstance(&CLSID_ItemMoniker, (IUnknown *)moniker, CLSCTX_SERVER, &IID_IMoniker, (void **)&moniker2); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); } @@ -2622,8 +2679,7 @@ todo_wine ok(hr == E_INVALIDARG, "IMoniker_IsRunning should return E_INVALIDARG, not 0x%08x\n", hr); hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); - todo_wine - ok(hr == S_FALSE, "IMoniker_IsRunning should return S_FALSE, not 0x%08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); ok(hr == MK_E_NOTBINDABLE, "IMoniker_GetTimeOfLastChange should return MK_E_NOTBINDABLE, not 0x%08x\n", hr);

1 0

Jeff Smith : d3drm: Return D3DRMERR_BADOBJECT from d3drm_viewport2_SetProjection() for uninitialised viewports.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: afb09525b5b1e60cab22c3af648baef7ebeb1dec URL: https://source.winehq.org/git/wine.git/?a=commit;h=afb09525b5b1e60cab22c3af… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jan 28 16:35:42 2020 +0330 d3drm: Return D3DRMERR_BADOBJECT from d3drm_viewport2_SetProjection() for uninitialised viewports. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++-- dlls/d3drm/viewport.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 40237fc7a2..62194977d4 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2165,7 +2165,7 @@ static void test_Viewport(void) hr = IDirect3DRMViewport_SetBack(viewport, 100.0f); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_PERSPECTIVE); - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); /* Test all failures together */ hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom); @@ -2358,7 +2358,7 @@ static void test_Viewport(void) hr = IDirect3DRMViewport2_SetBack(viewport2, 100.0f); ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_PERSPECTIVE); - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr); hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 8e959d5f37..17b6f1df53 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -613,6 +613,9 @@ static HRESULT WINAPI d3drm_viewport2_SetProjection(IDirect3DRMViewport2 *iface, TRACE("iface %p, type %#x.\n", iface, type); + if (!viewport->d3d_viewport) + return D3DRMERR_BADOBJECT; + viewport->projection = type; return D3DRM_OK;

1 0

Zebediah Figura : winegstreamer: Correctly represent non-32-bit float types.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: aa7017510d507d8f0b2e4393f8ae05a80f9fecf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa7017510d507d8f0b2e4393… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 19:06:54 2020 -0600 winegstreamer: Correctly represent non-32-bit float types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index de508b4167..66557b63a5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -171,7 +171,6 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * if (GST_AUDIO_INFO_IS_FLOAT(&ainfo)) { amt->subtype = MEDIASUBTYPE_IEEE_FLOAT; wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; - wfx->wBitsPerSample = wfe->Samples.wValidBitsPerSample = 32; } else { wfe->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; if (wfx->nChannels <= 2 && bpp <= 16 && depth == bpp) {

1 0

Nikolay Sivov : ole32: Fix equality check in CommonPrefixWith() for pointer moniker.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 70f35c65ab2b50bf098c24ae2f15295eb485fd16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70f35c65ab2b50bf098c24ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 10:32:17 2020 +0300 ole32: Fix equality check in CommonPrefixWith() for pointer moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/pointermoniker.c | 49 ++++++++++++++++++++++++--------------------- dlls/ole32/tests/moniker.c | 41 ++++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index a62ce3e7b7..c1a0e2ae1c 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -48,9 +48,10 @@ typedef struct PointerMonikerImpl{ static inline PointerMonikerImpl *impl_from_IMoniker(IMoniker *iface) { -return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); + return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); } +static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface); static HRESULT WINAPI PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { @@ -58,7 +59,6 @@ PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); - /* Perform a sanity check on the parameters.*/ if ( (This==0) || (ppvObject==0) ) return E_INVALIDARG; @@ -337,26 +337,20 @@ PointerMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoni /****************************************************************************** * PointerMoniker_IsEqual ******************************************************************************/ -static HRESULT WINAPI -PointerMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) +static HRESULT WINAPI PointerMonikerImpl_IsEqual(IMoniker *iface, IMoniker *other) { - PointerMonikerImpl *This = impl_from_IMoniker(iface); - DWORD mkSys; + PointerMonikerImpl *moniker = impl_from_IMoniker(iface), *other_moniker; - TRACE("(%p,%p)\n",iface,pmkOtherMoniker); - - if (pmkOtherMoniker==NULL) - return S_FALSE; + TRACE("%p, %p.\n", iface, other); - IMoniker_IsSystemMoniker(pmkOtherMoniker,&mkSys); + if (!other) + return E_INVALIDARG; - if (mkSys==MKSYS_POINTERMONIKER) - { - PointerMonikerImpl *pOtherMoniker = impl_from_IMoniker(pmkOtherMoniker); - return This->pObject == pOtherMoniker->pObject ? S_OK : S_FALSE; - } - else + other_moniker = unsafe_impl_from_IMoniker(other); + if (!other_moniker) return S_FALSE; + + return moniker->pObject == other_moniker->pObject ? S_OK : S_FALSE; } /****************************************************************************** @@ -412,18 +406,20 @@ PointerMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) /****************************************************************************** * PointerMoniker_CommonPrefixWith ******************************************************************************/ -static HRESULT WINAPI -PointerMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) +static HRESULT WINAPI PointerMonikerImpl_CommonPrefixWith(IMoniker *iface, IMoniker *other, IMoniker **prefix) { - TRACE("(%p, %p)\n", pmkOther, ppmkPrefix); + TRACE("%p, %p, %p.\n", iface, other, prefix); + + if (!prefix || !other) + return E_INVALIDARG; - *ppmkPrefix = NULL; + *prefix = NULL; - if (PointerMonikerImpl_IsEqual(iface, pmkOther)) + if (PointerMonikerImpl_IsEqual(iface, other) == S_OK) { IMoniker_AddRef(iface); - *ppmkPrefix=iface; + *prefix = iface; return MK_S_US; } @@ -539,6 +535,13 @@ static const IMonikerVtbl VT_PointerMonikerImpl = PointerMonikerImpl_IsSystemMoniker }; +static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface) +{ + if (iface->lpVtbl != &VT_PointerMonikerImpl) + return NULL; + return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); +} + /****************************************************************************** * PointerMoniker_Construct (local function) *******************************************************************************/ diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 8c533d1ff7..bec5c76caa 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2625,7 +2625,7 @@ todo_wine static void test_pointer_moniker(void) { - IMoniker *moniker, *inverse; + IMoniker *moniker, *moniker2, *prefix, *inverse; IEnumMoniker *enummoniker; HRESULT hr; DWORD moniker_type; @@ -2748,6 +2748,45 @@ todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); IMoniker_Release(moniker); + + /* CommonPrefixWith() */ + hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, NULL, &prefix); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(prefix == moniker, "Unexpected pointer.\n"); + IMoniker_Release(prefix); + + IMoniker_Release(moniker2); + + hr = CreatePointerMoniker((IUnknown *)moniker, &moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + IMoniker_Release(moniker2); + + IMoniker_Release(moniker); } static void test_bind_context(void)

1 0

Stefan Dösinger : ddraw/tests: Changing only viewport Z range is broken on r500 on Win10.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: b5ddcf4126e95b6d7a6600ee4626fc2918285bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5ddcf4126e95b6d7a6600ee… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 27 22:45:26 2020 +0100 ddraw/tests: Changing only viewport Z range is broken on r500 on Win10. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c2a0ca7e3b..0efe241f32 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -14966,9 +14966,10 @@ static void test_viewport(void) tests[] = { {{ 0, 0, 640, 480}, 0.001f, { 0, 120, 479, 359}, "Viewport (0, 0) - (640, 480)"}, + {{ 0, 0, 320, 240}, 0.001f, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"}, + /* Don't run this right after the other 640x480 test, it breaks r500. */ {{ 0, 0, 640, 480, 0.5f, 0.0f}, 0.501f, {0, 120, 479, 359}, "Viewport (0, 0, 0.5) - (640, 480, 0.0)"}, - {{ 0, 0, 320, 240}, 0.001f, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"}, {{ 0, 0, 1280, 960}, 0.001f, { 0, 240, 639, 479}, "Viewport (0, 0) - (1280, 960)"}, {{ 0, 0, 2000, 1600}, 0.001f, {-10, -10, -10, -10}, "Viewport (0, 0) - (2000, 1600)"}, {{100, 100, 640, 480}, 0.001f, {100, 220, 579, 459}, "Viewport (100, 100) - (640, 480)"},

1 0

Stefan Dösinger : ddraw/tests: Dx9 and earlier cards have problems with HW blits to R5G5B5A1.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 0a8d7b533c7cc7b479aae0cd363b8f3c49fb12ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a8d7b533c7cc7b479aae0cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 27 22:45:24 2020 +0100 ddraw/tests: Dx9 and earlier cards have problems with HW blits to R5G5B5A1. My Geforce 7 sends R5G6B5 data to the R5G5B5A1 surface without any conversion. r200 and r500 set the alpha bit on the destination. This applies to sysmem->vidmem and vidmem->vidmem blits. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 7 +++++-- dlls/ddraw/tests/ddraw7.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 7ce33ab406..b6cb97c3c9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16719,7 +16719,7 @@ static void test_surface_format_conversion_alpha(void) const char *name; unsigned int block_size, x_blocks, y_blocks; DWORD support_flag; - BOOL broken_software_blit; + BOOL broken_software_blit, broken_hardware_blit; } formats[] = { @@ -16759,7 +16759,7 @@ static void test_surface_format_conversion_alpha(void) sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000} }, - "R5G5B5A1", 2, 4, 4, + "R5G5B5A1", 2, 4, 4, 0, FALSE, TRUE, }, { { @@ -16888,6 +16888,9 @@ static void test_surface_format_conversion_alpha(void) if (!is_wine && ((test_caps[j].src_caps | test_caps[j].dst_caps) & DDSCAPS_SYSTEMMEMORY) && (src_format->broken_software_blit || dst_format->broken_software_blit)) continue; + if (!is_wine && (test_caps[j].dst_caps & DDSCAPS_VIDEOMEMORY) + && dst_format->broken_hardware_blit) + continue; U4(surface_desc).ddpfPixelFormat = src_format->fmt; surface_desc.ddsCaps.dwCaps = test_caps[j].src_caps; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index cde5d2b5ba..c2a0ca7e3b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16695,7 +16695,7 @@ static void test_surface_format_conversion_alpha(void) const char *name; unsigned int block_size, x_blocks, y_blocks; DWORD support_flag; - BOOL broken_software_blit; + BOOL broken_software_blit, broken_hardware_blit; } formats[] = { @@ -16735,7 +16735,7 @@ static void test_surface_format_conversion_alpha(void) sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000} }, - "R5G5B5A1", 2, 4, 4, + "R5G5B5A1", 2, 4, 4, 0, FALSE, TRUE, }, { { @@ -16864,6 +16864,9 @@ static void test_surface_format_conversion_alpha(void) if (!is_wine && ((test_caps[j].src_caps | test_caps[j].dst_caps) & DDSCAPS_SYSTEMMEMORY) && (src_format->broken_software_blit || dst_format->broken_software_blit)) continue; + if (!is_wine && (test_caps[j].dst_caps & DDSCAPS_VIDEOMEMORY) + && dst_format->broken_hardware_blit) + continue; U4(surface_desc).ddpfPixelFormat = src_format->fmt; surface_desc.ddsCaps.dwCaps = test_caps[j].src_caps;

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetRenderState().
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 3d3de79741576ce77f7ed74fbaa113ecda7c7316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d3de79741576ce77f7ed74f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 09:23:15 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d08d052284..441bfd2f44 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2331,22 +2331,11 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi D3DRENDERSTATETYPE state, DWORD value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d_color factor; TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); wined3d_mutex_lock(); wined3d_stateblock_set_render_state(device->update_state, state, value); - if (!device->recording) - { - if (state == D3DRS_BLENDFACTOR) - { - wined3d_color_from_d3dcolor(&factor, value); - wined3d_device_set_blend_state(device->wined3d_device, NULL, &factor); - } - else - wined3d_device_set_render_state(device->wined3d_device, state, value); - } if (state == D3DRS_POINTSIZE && value == D3D9_RESZ_CODE) resolve_depth_buffer(device); wined3d_mutex_unlock();

1 0

Zebediah Figura : d3d9: Apply the device state before executing a draw call.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 7654d58b047be3a54d814d890bf1a26374559c83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7654d58b047be3a54d814d89… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 09:23:13 2020 -0600 d3d9: Apply the device state before executing a draw call. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 82fba25ce7..be9c2a9d5a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1821,6 +1821,7 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); rtv = d3d9_surface_acquire_rendertarget_view(surface_impl); hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, rtv, rect, WINED3DCLEAR_TARGET, &c, 0.0f, 0); @@ -2071,6 +2072,7 @@ static HRESULT WINAPI d3d9_device_Clear(IDirect3DDevice9Ex *iface, DWORD rect_co wined3d_color_from_d3dcolor(&c, color); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_clear(device->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -2654,6 +2656,7 @@ static HRESULT WINAPI d3d9_device_ValidateDevice(IDirect3DDevice9Ex *iface, DWOR TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_validate_device(device->wined3d_device, pass_count); wined3d_mutex_unlock(); @@ -2885,6 +2888,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, 0, start_vertex, vertex_count); d3d9_generate_auto_mipmaps(device); @@ -2917,6 +2921,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); @@ -3003,6 +3008,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d9_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -3119,6 +3125,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d9_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -3203,6 +3210,8 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + /* Note that an alternative approach would be to simply create these * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we * do for draws. In some regards that would be easier, but it seems less

1 0

Zebediah Figura : d3d9: Stop setting the device state when setting the default ZENABLE state.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 891a067760db00d972af8be09a13a33a85c7725b URL: https://source.winehq.org/git/wine.git/?a=commit;h=891a067760db00d972af8be0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 09:23:16 2020 -0600 d3d9: Stop setting the device state when setting the default ZENABLE state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 441bfd2f44..8122ab0a05 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1020,8 +1020,6 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, device->auto_mipmaps = 0; wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, - !!swapchain_desc.enable_auto_depth_stencil); device_reset_viewport_state(device); } @@ -4673,8 +4671,6 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil); device_reset_viewport_state(device); if (FAILED(hr = d3d9_device_get_swapchains(device)))

1 0