February 2015 - Wine-commits

Michael Stefaniuc : riched20: IDC_IBEAM is already an int resource ( PVS-Studio).
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 54d3816eb835d73c1c68f8201cc68883e96bcaa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d3816eb835d73c1c68f8201… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 00:06:55 2015 +0100 riched20: IDC_IBEAM is already an int resource (PVS-Studio). --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ca316d2..7632d47 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4818,7 +4818,7 @@ static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) wcW.cbWndExtra = sizeof(ME_TextEditor *); wcW.hInstance = NULL; /* hInstance would register DLL-local class */ wcW.hIcon = NULL; - wcW.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); + wcW.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_IBEAM); wcW.hbrBackground = GetStockObject(NULL_BRUSH); wcW.lpszMenuName = NULL; @@ -4844,7 +4844,7 @@ static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) wcA.cbWndExtra = sizeof(ME_TextEditor *); wcA.hInstance = NULL; /* hInstance would register DLL-local class */ wcA.hIcon = NULL; - wcA.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); + wcA.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_IBEAM); wcA.hbrBackground = GetStockObject(NULL_BRUSH); wcA.lpszMenuName = NULL; wcA.lpszClassName = RICHEDIT_CLASS20A;

1 0

Michael Stefaniuc : user32: IDI_WINLOGO is already an int resource ( PVS-Studio).
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 63174c2f3616af55449a861cf24557d0ac9ab85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=63174c2f3616af55449a861cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 00:08:39 2015 +0100 user32: IDI_WINLOGO is already an int resource (PVS-Studio). --- dlls/user32/mdi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 8ef7214..11d5679 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -866,7 +866,8 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) if (!hIcon) hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_BIG, 0); if (!hIcon) - hIcon = LoadImageW(0, MAKEINTRESOURCEW(IDI_WINLOGO), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); if (hIcon) { HDC hMemDC;

1 0

Michael Stefaniuc : ole32: Remove an always true conditional subexpression (PVS-Studio).
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 73019d5e208d8efc8848ad5a67b7af8979966811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73019d5e208d8efc8848ad5a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 00:09:03 2015 +0100 ole32: Remove an always true conditional subexpression (PVS-Studio). --- dlls/ole32/storage32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 26fc0d8..5e434e0 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2969,7 +2969,7 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) hr = S_OK; /* First check for any conflicting locks. */ - if (SUCCEEDED(hr) && (openFlags & STGM_PRIORITY) == STGM_PRIORITY) + if ((openFlags & STGM_PRIORITY) == STGM_PRIORITY) hr = StorageImpl_CheckLockRange(This, RANGELOCK_COMMIT, RANGELOCK_COMMIT, STG_E_LOCKVIOLATION); if (SUCCEEDED(hr) && (STGM_ACCESS_MODE(openFlags) != STGM_WRITE))

1 0

Michael Stefaniuc : quartz: Remove an always true conditional subexpression (PVS-Studio).
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 2e54309f39821f88eca80ad79068cc3df135af60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e54309f39821f88eca80ad79… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 18 00:11:40 2015 +0100 quartz: Remove an always true conditional subexpression (PVS-Studio). --- dlls/quartz/pin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 78b6fa2..8377be5 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -268,7 +268,7 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const props.cbAlign = 1; props.cbPrefix = 0; - if (SUCCEEDED(hr) && (This->fnQueryAccept(This->pUserData, pmt) != S_OK)) + if (This->fnQueryAccept(This->pUserData, pmt) != S_OK) hr = VFW_E_TYPE_NOT_ACCEPTED; /* FIXME: shouldn't we just map common errors onto * VFW_E_TYPE_NOT_ACCEPTED and pass the value on otherwise? */

1 0

Alistair Leslie-Hughes : shell32: Implement IApplicationAssociationRegistration QueryCurrentDefault.
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 31219559568fbf88db8fd704792ba59cc28076cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=31219559568fbf88db8fd7047… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 25 11:36:06 2014 +1100 shell32: Implement IApplicationAssociationRegistration QueryCurrentDefault. --- dlls/shell32/assoc.c | 90 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/shell32/tests/assoc.c | 67 ++++++++++++++++++++++++++-------- 2 files changed, 140 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index f3c8e65..528666e 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -873,11 +873,95 @@ static ULONG WINAPI ApplicationAssociationRegistration_Release(IApplicationAssoc return ref; } -static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IApplicationAssociationRegistration* This, LPCWSTR query, +static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IApplicationAssociationRegistration *iface, LPCWSTR query, ASSOCIATIONTYPE type, ASSOCIATIONLEVEL level, LPWSTR *association) { - FIXME("(%p)->(%s, %d, %d, %p)\n", This, debugstr_w(query), type, level, association); - return E_NOTIMPL; + IApplicationAssociationRegistrationImpl *This = impl_from_IApplicationAssociationRegistration(iface); + static WCHAR urlassoc[] = {'U','r','l','A','s','s','o','c','i','a','t','i','o','n','s',0}; + static WCHAR mimeassoc[] = {'M','I','M','E','A','s','s','o','c','i','a','t','i','o','n','s',0}; + static WCHAR assocations[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','S','h','e','l','l','\\', + 'A','s','s','o','c','i','a','t','i','o','n','s',0}; + static WCHAR slash[] = {'\\',0}; + static WCHAR choice[] = {'U','s','e','r','C','h','o','i','c','e',0}; + static WCHAR propid[] = {'P','r','o','g','i','d',0}; + WCHAR path[MAX_PATH] = {0}; + DWORD ret, keytype, size; + HKEY hkey = NULL; + HRESULT hr = HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); + + TRACE("(%p)->(%s, %d, %d, %p)\n", This, debugstr_w(query), type, level, association); + + if(!association) + return E_INVALIDARG; + + *association = NULL; + + if((type == AT_URLPROTOCOL || type == AT_FILEEXTENSION) && !lstrlenW(query)) + return E_INVALIDARG; + else if(type == AT_FILEEXTENSION && query[0] != '.') + return E_INVALIDARG; + + if(type == AT_FILEEXTENSION) + { + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, query, 0, KEY_READ, &hkey); + if(ret == ERROR_SUCCESS) + { + ret = RegGetValueW(hkey, NULL, NULL, RRF_RT_REG_SZ, &keytype, NULL, &size); + if(ret == ERROR_SUCCESS) + { + *association = CoTaskMemAlloc(size); + if(*association) + { + ret = RegGetValueW(hkey, NULL, NULL, RRF_RT_REG_SZ, &keytype, *association, &size); + if(ret == ERROR_SUCCESS) + hr = S_OK; + } + else + hr = E_OUTOFMEMORY; + } + } + } + else + { + ret = RegOpenKeyExW(HKEY_CURRENT_USER, assocations, 0, KEY_READ, &hkey); + if(ret == ERROR_SUCCESS) + { + if(type == AT_URLPROTOCOL) + lstrcpyW(path, urlassoc); + else if(type == AT_MIMETYPE) + lstrcpyW(path, mimeassoc); + else + { + WARN("Unsupported type (%d).\n", type); + RegCloseKey(hkey); + return hr; + } + + lstrcatW(path, slash); + lstrcatW(path, query); + lstrcatW(path, slash); + lstrcatW(path, choice); + + ret = RegGetValueW(hkey, path, propid, RRF_RT_REG_SZ, &keytype, NULL, &size); + if(ret == ERROR_SUCCESS) + { + *association = CoTaskMemAlloc(size); + if(*association) + { + ret = RegGetValueW(hkey, path, propid, RRF_RT_REG_SZ, &keytype, *association, &size); + if(ret == ERROR_SUCCESS) + hr = S_OK; + } + else + hr = E_OUTOFMEMORY; + } + } + } + + RegCloseKey(hkey); + + return hr; } static HRESULT WINAPI ApplicationAssociationRegistration_QueryAppIsDefault(IApplicationAssociationRegistration* This, LPCWSTR query, diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index f35938b..8aa2535 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -57,22 +57,12 @@ static void test_IQueryAssociations_QueryInterface(void) } -static void test_IApplicationAssociationRegistration_QueryInterface(void) +static void test_IApplicationAssociationRegistration_QueryInterface(IApplicationAssociationRegistration *appreg) { - IApplicationAssociationRegistration *appreg; IApplicationAssociationRegistration *appreg2; IUnknown *unk; HRESULT hr; - /* this works since Vista */ - hr = CoCreateInstance(&CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC_SERVER, - &IID_IApplicationAssociationRegistration, (LPVOID*)&appreg); - - if (FAILED(hr)) { - skip("IApplicationAssociationRegistration not created: 0x%x\n", hr); - return; - } - hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IApplicationAssociationRegistration, (void**)&appreg2); ok(hr == S_OK, "QueryInterface (IApplicationAssociationRegistration) returned 0x%x\n", hr); @@ -88,8 +78,6 @@ static void test_IApplicationAssociationRegistration_QueryInterface(void) hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); - - IApplicationAssociationRegistration_Release(appreg); } struct assoc_getstring_test @@ -189,9 +177,49 @@ static void test_IQueryAssociations_Init(void) IQueryAssociations_Release(assoc); } +static void test_IApplicationAssociationRegistration_QueryCurrentDefault(IApplicationAssociationRegistration *appreg) +{ + static const WCHAR emptyW[] = {0}; + static const WCHAR txtW[] = {'.','t','x','t',0}; + static const WCHAR spacetxtW[] = {' ','.','t','x','t',0}; + HRESULT hr; + LPWSTR assocprog = NULL; + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, emptyW, AT_URLPROTOCOL, AL_EFFECTIVE, &assocprog); + ok(hr == E_INVALIDARG, "got 0x%x\n", hr); + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, emptyW, AT_FILEEXTENSION, AL_EFFECTIVE, &assocprog); + ok(hr == E_INVALIDARG, "got 0x%x\n", hr); + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, spacetxtW, AT_FILEEXTENSION, AL_EFFECTIVE, &assocprog); + ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /*Win8*/, "got 0x%x\n", hr); + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, httpW, AT_URLPROTOCOL, AL_EFFECTIVE, NULL); + ok(hr == E_INVALIDARG, "got 0x%x\n", hr); + + /* AT_FILEEXTENSION must start with a period */ + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, txtW, AT_FILEEXTENSION, AL_EFFECTIVE, &assocprog); + ok(hr == S_OK, "got 0x%x\n", hr); + trace("%s\n", wine_dbgstr_w(assocprog)); + CoTaskMemFree(assocprog); + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, emptyW, AT_STARTMENUCLIENT, AL_EFFECTIVE, &assocprog); + ok(hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), "got 0x%x\n", hr); + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, emptyW, AT_MIMETYPE, AL_EFFECTIVE, &assocprog); + ok(hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), "got 0x%x\n", hr); + + hr = IApplicationAssociationRegistration_QueryCurrentDefault(appreg, httpW, AT_URLPROTOCOL, AL_EFFECTIVE, &assocprog); + todo_wine ok(hr == S_OK, "got 0x%x\n", hr); + trace("%s\n", wine_dbgstr_w(assocprog)); + + CoTaskMemFree(assocprog); +} + START_TEST(assoc) { IQueryAssociations *qa; + IApplicationAssociationRegistration *appreg = NULL; HRESULT hr; CoInitialize(NULL); @@ -209,7 +237,18 @@ START_TEST(assoc) else win_skip("IQueryAssociations not supported, 0x%x\n", hr); - test_IApplicationAssociationRegistration_QueryInterface(); + /* this works since Vista */ + hr = CoCreateInstance(&CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC_SERVER, + &IID_IApplicationAssociationRegistration, (LPVOID*)&appreg); + if (hr == S_OK) + { + test_IApplicationAssociationRegistration_QueryInterface(appreg); + test_IApplicationAssociationRegistration_QueryCurrentDefault(appreg); + + IApplicationAssociationRegistration_Release(appreg); + } + else + win_skip("IApplicationAssociationRegistration not supported: 0x%x\n", hr); CoUninitialize(); }

1 0

Nikolay Sivov : wshom.ocx: Implement RegRead().
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: 41c44f918504cc0aefc3a54625d2b87b349593cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c44f918504cc0aefc3a5462… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 16 11:26:24 2015 +0300 wshom.ocx: Implement RegRead(). --- dlls/wshom.ocx/shell.c | 177 ++++++++++++++++++++++++++++++++- dlls/wshom.ocx/tests/Makefile.in | 2 +- dlls/wshom.ocx/tests/wshom.c | 205 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 376 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41c44f918504cc0aefc3a…

1 0

Henri Verbeet : dxgi: Implement dxgi_surface_SetPrivateData().
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: 64b23f6ca7f3674cb55b4d468065f1b377206bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b23f6ca7f3674cb55b4d468… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 17 10:15:37 2015 +0100 dxgi: Implement dxgi_surface_SetPrivateData(). --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/surface.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 727a75f..206fce6 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -157,6 +157,7 @@ struct dxgi_surface IUnknown IUnknown_iface; IUnknown *outer_unknown; LONG refcount; + struct wined3d_private_store private_store; IDXGIDevice *device; DXGI_SURFACE_DESC desc; diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 10daff7..1a6ee7e 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -71,7 +71,10 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) TRACE("%p decreasing refcount to %u.\n", surface, refcount); if (!refcount) + { + wined3d_private_store_cleanup(&surface->private_store); HeapFree(GetProcessHeap(), 0, surface); + } return refcount; } @@ -110,9 +113,11 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface *iface) static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateData(IDXGISurface *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_surface *surface = impl_from_IDXGISurface(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_set_private_data(&surface->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateDataInterface(IDXGISurface *iface, @@ -210,6 +215,7 @@ HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; + wined3d_private_store_init(&surface->private_store); surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; surface->desc = *desc;

1 0

Henri Verbeet : dxgi: Implement dxgi_surface_SetPrivateDataInterface().
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: 1c9016c70375db79a43565ea2a0503b1f0a8f9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c9016c70375db79a43565ea2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 17 10:15:38 2015 +0100 dxgi: Implement dxgi_surface_SetPrivateDataInterface(). --- dlls/dxgi/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 1a6ee7e..5d9dc2a 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -123,9 +123,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateData(IDXGISurface *iface static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateDataInterface(IDXGISurface *iface, REFGUID guid, const IUnknown *object) { - FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + struct dxgi_surface *surface = impl_from_IDXGISurface(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); + + return dxgi_set_private_data_interface(&surface->private_store, guid, object); } static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface *iface,

1 0

Henri Verbeet : dxgi: Implement dxgi_surface_GetPrivateData().
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: 9bdc1533132be21e90439fd2ce8e9422597ffbdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdc1533132be21e90439fd2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 17 10:15:39 2015 +0100 dxgi: Implement dxgi_surface_GetPrivateData(). --- dlls/dxgi/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 5d9dc2a..f961de5 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -133,9 +133,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateDataInterface(IDXGISurfa static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_surface *surface = impl_from_IDXGISurface(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_get_private_data(&surface->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REFIID riid, void **parent)

1 0

Henri Verbeet : dxgi: Implement dxgi_swapchain_SetPrivateData().
by Alexandre Julliard 17 Feb '15

17 Feb '15

Module: wine Branch: master Commit: 59ffc7bc8d3ca0df113a334da0eec390a025559c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ffc7bc8d3ca0df113a334da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 17 10:15:40 2015 +0100 dxgi: Implement dxgi_swapchain_SetPrivateData(). --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 206fce6..8703158 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -144,6 +144,7 @@ struct dxgi_swapchain { IDXGISwapChain IDXGISwapChain_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_swapchain *wined3d_swapchain; }; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 437537a..4ac3421 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -82,9 +82,11 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetPrivateData(IDXGISwapChain *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_set_private_data(&swapchain->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetPrivateDataInterface(IDXGISwapChain *iface, @@ -276,6 +278,9 @@ static const struct IDXGISwapChainVtbl dxgi_swapchain_vtbl = static void STDMETHODCALLTYPE dxgi_swapchain_wined3d_object_released(void *parent) { + struct dxgi_swapchain *swapchain = parent; + + wined3d_private_store_cleanup(&swapchain->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -291,11 +296,13 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; swapchain->refcount = 1; + wined3d_private_store_init(&swapchain->private_store); if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, &dxgi_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); + wined3d_private_store_cleanup(&swapchain->private_store); return hr; }

1 0