February 2014 - Wine-commits

Jacek Caban : atl: Share sources with atl100 instead of forwarding calls.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: f285b06738676856487a5a0a8756716e10abb9fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f285b06738676856487a5a0a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 16:00:27 2014 +0100 atl: Share sources with atl100 instead of forwarding calls. --- dlls/atl/Makefile.in | 6 ++++-- dlls/atl/atl.spec | 34 +++++++++++++++++----------------- dlls/atl/atl_main.c | 45 +++------------------------------------------ dlls/atl100/atl.c | 25 ++++++++++++++++++++----- tools/make_specfiles | 4 ---- 5 files changed, 44 insertions(+), 70 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 3fc9591..cf61896 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -1,11 +1,13 @@ MODULE = atl.dll IMPORTLIB = atl -IMPORTS = uuid atl80 atl100 oleaut32 ole32 user32 +IMPORTS = uuid atl80 oleaut32 ole32 user32 gdi32 advapi32 EXTRADEFS = -D_ATL_VER=_ATL_VER_30 PARENTSRC = ../atl100 C_SRCS = \ + atl.c \ atl_ax.c \ - atl_main.c + atl_main.c \ + registrar.c IDL_SRCS = atl_classes.idl diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 2dca559..aa0f44b 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -2,11 +2,11 @@ 2 stdcall -private DllGetClassObject(ptr ptr ptr) 3 stdcall -private DllRegisterServer() 4 stdcall -private DllUnregisterServer() -10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise -11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise -12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream -13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc -14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr +10 stdcall AtlAdvise(ptr ptr ptr ptr) +11 stdcall AtlUnadvise(ptr ptr long) +12 stdcall AtlFreeMarshalStream(ptr) +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) 15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) 16 stdcall AtlModuleInit(ptr long long) 17 stdcall AtlModuleRegisterClassObjects(ptr long long) @@ -16,15 +16,15 @@ 21 stdcall AtlModuleTerm(ptr) 22 stdcall AtlModuleUnregisterServer(ptr ptr) 23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) -24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo -26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC -27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel -28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +26 stdcall AtlCreateTargetDC(long ptr) +27 stdcall AtlHiMetricToPixel(ptr ptr) +28 stdcall AtlPixelToHiMetric(ptr ptr) 29 stub AtlDevModeW2A -30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign -31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign -32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +30 stdcall AtlComPtrAssign(ptr ptr) +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stdcall AtlGetVersion(ptr) 35 stdcall AtlAxDialogBoxW(long wstr long ptr long) 36 stdcall AtlAxDialogBoxA(long str long ptr long) @@ -40,12 +40,12 @@ 46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) -49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper -50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load -51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) 53 stub AtlIPersistPropertyBag_Save -54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 55 stub AtlModuleUnRegisterTypeLib 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 6288ff8..d89cf06 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -33,18 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); -static HINSTANCE hInst; - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - - if (fdwReason == DLL_PROCESS_ATTACH) { - DisableThreadLibraryCalls(hinstDLL); - hInst = hinstDLL; - } - return TRUE; -} +extern HINSTANCE atl_instance; #define ATLVer1Size FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer) @@ -142,25 +131,6 @@ HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM) return S_OK; } -HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw) -{ - _ATL_TERMFUNC_ELEM *termfunc_elem; - - TRACE("version %04x (%p %p %ld)\n", _ATL_VER, pM, pFunc, dw); - - if (pM->cbSize > ATLVer1Size) - { - termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); - termfunc_elem->pFunc = pFunc; - termfunc_elem->dw = dw; - termfunc_elem->pNext = pM->m_pTermFuncs; - - pM->m_pTermFuncs = termfunc_elem; - } - - return S_OK; -} - HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContext, DWORD dwFlags) { @@ -566,7 +536,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) */ HRESULT WINAPI DllRegisterServer(void) { - return __wine_register_resources( hInst ); + return __wine_register_resources( atl_instance ); } /*********************************************************************** @@ -574,7 +544,7 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - return __wine_unregister_resources( hInst ); + return __wine_unregister_resources( atl_instance ); } /*********************************************************************** @@ -584,12 +554,3 @@ HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; } - -/*********************************************************************** - * AtlGetVersion [ATL.@] - */ -DWORD WINAPI AtlGetVersion(void *pReserved) -{ - TRACE("version %04x (%p)\n", _ATL_VER, pReserved); - return _ATL_VER; -} diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 82412b7..afd8f77 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -26,6 +26,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); +#define ATLVer1Size FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer) + +HINSTANCE atl_instance; + typedef unsigned char cpp_bool; static inline void *heap_alloc(size_t len) @@ -301,16 +305,20 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD TRACE("version %04x (%p %p %ld)\n", _ATL_VER, pM, pFunc, dw); - termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); - termfunc_elem->pFunc = pFunc; - termfunc_elem->dw = dw; - termfunc_elem->pNext = pM->m_pTermFuncs; + if (_ATL_VER > _ATL_VER_30 || pM->cbSize > ATLVer1Size) { + termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); + termfunc_elem->pFunc = pFunc; + termfunc_elem->dw = dw; + termfunc_elem->pNext = pM->m_pTermFuncs; - pM->m_pTermFuncs = termfunc_elem; + pM->m_pTermFuncs = termfunc_elem; + } return S_OK; } +#if _ATL_VER > _ATL_VER_30 + /*********************************************************************** * AtlCallTermFunc [atl100.@] */ @@ -330,6 +338,8 @@ void WINAPI AtlCallTermFunc(_ATL_MODULE *pM) pM->m_pTermFuncs = NULL; } +#endif + /*********************************************************************** * AtlLoadTypeLib [atl100.56] */ @@ -386,6 +396,8 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, return S_OK; } +#if _ATL_VER > _ATL_VER_30 + /*********************************************************************** * AtlWinModuleInit [atl100.65] */ @@ -578,6 +590,8 @@ HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeL return S_OK; } +#endif + /*********************************************************************** * AtlRegisterClassCategoriesHelper [atl100.49] */ @@ -819,6 +833,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch(fdwReason) { case DLL_PROCESS_ATTACH: + atl_instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: diff --git a/tools/make_specfiles b/tools/make_specfiles index 2ae321a..a525e0c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -119,10 +119,6 @@ my @dll_groups = "vcomp90", ], [ - "atl100", - "atl", - ], - [ "advapi32", "api-ms-win-core-localregistry-l1-1-0", "api-ms-win-downlevel-advapi32-l1-1-0",

1 0

Jacek Caban : atl: Moved AtlRegisterTypeLib to atl.c to avoid importing atl80.dll in atl.dll.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 16acd97eb0f82c1ee7d40d1a2b105845d0b06528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16acd97eb0f82c1ee7d40d1a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 16:00:42 2014 +0100 atl: Moved AtlRegisterTypeLib to atl.c to avoid importing atl80.dll in atl.dll. --- dlls/atl/Makefile.in | 2 +- dlls/atl100/atl.c | 25 +++++++++++++++++++++++++ dlls/atl80/atl80.c | 21 --------------------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index cf61896..396b9d6 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -1,6 +1,6 @@ MODULE = atl.dll IMPORTLIB = atl -IMPORTS = uuid atl80 oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 EXTRADEFS = -D_ATL_VER=_ATL_VER_30 PARENTSRC = ../atl100 diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index afd8f77..53c7181 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -396,6 +396,31 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, return S_OK; } +#if _ATL_VER <= _ATL_VER_80 + +/*********************************************************************** + * AtlRegisterTypeLib [atl80.19] + */ +HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE inst, const WCHAR *index) +{ + ITypeLib *typelib; + BSTR path; + HRESULT hres; + + TRACE("(%p %s)\n", inst, debugstr_w(index)); + + hres = AtlLoadTypeLib(inst, index, &path, &typelib); + if(FAILED(hres)) + return hres; + + hres = RegisterTypeLib(typelib, path, NULL); /* FIXME: pass help directory */ + ITypeLib_Release(typelib); + SysFreeString(path); + return hres; +} + +#endif + #if _ATL_VER > _ATL_VER_30 /*********************************************************************** diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index b6aedda..ec1d4c8 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -68,24 +68,3 @@ HRESULT WINAPI AtlComModuleRegisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib return S_OK; } - -/*********************************************************************** - * AtlRegisterTypeLib [atl80.19] - */ -HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE inst, const WCHAR *index) -{ - ITypeLib *typelib; - BSTR path; - HRESULT hres; - - TRACE("(%p %s)\n", inst, debugstr_w(index)); - - hres = AtlLoadTypeLib(inst, index, &path, &typelib); - if(FAILED(hres)) - return hres; - - hres = RegisterTypeLib(typelib, path, NULL); /* FIXME: pass help directory */ - ITypeLib_Release(typelib); - SysFreeString(path); - return hres; -}

1 0

Jacek Caban : urlmon: Unregister window class on DLL unload.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 9ca4f9b65a2aa28c0a00a729efcb36bafc20d666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca4f9b65a2aa28c0a00a729e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 18:02:24 2014 +0100 urlmon: Unregister window class on DLL unload. --- dlls/urlmon/bindprot.c | 50 +++++++++++++++++++++++++++------------------ dlls/urlmon/urlmon_main.c | 1 + dlls/urlmon/urlmon_main.h | 1 + 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index b11856b..7f2bea1 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -83,14 +83,36 @@ static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM return DefWindowProcW(hwnd, msg, wParam, lParam); } +static const WCHAR wszURLMonikerNotificationWindow[] = + {'U','R','L',' ','M','o','n','i','k','e','r',' ', + 'N','o','t','i','f','i','c','a','t','i','o','n',' ','W','i','n','d','o','w',0}; + +static ATOM notif_wnd_class; + +static BOOL WINAPI register_notif_wnd_class(INIT_ONCE *once, void *param, void **context) +{ + static WNDCLASSEXW wndclass = { + sizeof(wndclass), 0, notif_wnd_proc, 0, 0, + NULL, NULL, NULL, NULL, NULL, + wszURLMonikerNotificationWindow, NULL + }; + + wndclass.hInstance = hProxyDll; + notif_wnd_class = RegisterClassExW(&wndclass); + return TRUE; +} + +void unregister_notif_wnd_class(void) +{ + if(notif_wnd_class) + UnregisterClassW(MAKEINTRESOURCEW(notif_wnd_class), hProxyDll); +} + HWND get_notif_hwnd(void) { - static ATOM wnd_class = 0; tls_data_t *tls_data; - static const WCHAR wszURLMonikerNotificationWindow[] = - {'U','R','L',' ','M','o','n','i','k','e','r',' ', - 'N','o','t','i','f','i','c','a','t','i','o','n',' ','W','i','n','d','o','w',0}; + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; tls_data = get_tls_data(); if(!tls_data) @@ -101,23 +123,11 @@ HWND get_notif_hwnd(void) return tls_data->notif_hwnd; } - if(!wnd_class) { - static WNDCLASSEXW wndclass = { - sizeof(wndclass), 0, - notif_wnd_proc, 0, 0, - NULL, NULL, NULL, NULL, NULL, - wszURLMonikerNotificationWindow, - NULL - }; - - wndclass.hInstance = hProxyDll; - - wnd_class = RegisterClassExW(&wndclass); - if (!wnd_class && GetLastError() == ERROR_CLASS_ALREADY_EXISTS) - wnd_class = 1; - } + InitOnceExecuteOnce(&init_once, register_notif_wnd_class, NULL, NULL); + if(!notif_wnd_class) + return NULL; - tls_data->notif_hwnd = CreateWindowExW(0, wszURLMonikerNotificationWindow, + tls_data->notif_hwnd = CreateWindowExW(0, MAKEINTRESOURCEW(notif_wnd_class), wszURLMonikerNotificationWindow, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, hProxyDll, NULL); if(tls_data->notif_hwnd) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 7b3f1fd..1204a62 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -139,6 +139,7 @@ static void process_detach(void) free_session(); free_tls_list(); + unregister_notif_wnd_class(); } /*********************************************************************** diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index faab45a..14a4f08 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -225,6 +225,7 @@ typedef struct { tls_data_t *get_tls_data(void) DECLSPEC_HIDDEN; +void unregister_notif_wnd_class(void) DECLSPEC_HIDDEN; HWND get_notif_hwnd(void) DECLSPEC_HIDDEN; void release_notif_hwnd(HWND) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_GetDevice().
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 01d435288f35d94316d4f91ae1faf6421b4e3b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=01d435288f35d94316d4f91ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 13 10:14:22 2014 +0100 d3d10core: Implement d3d10_depthstencil_view_GetDevice(). --- dlls/d3d10core/d3d10core_private.h | 3 ++- dlls/d3d10core/device.c | 6 +++--- dlls/d3d10core/tests/device.c | 14 ++++++++++++-- dlls/d3d10core/view.c | 12 ++++++++++-- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 012c884..c548c4a 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -123,9 +123,10 @@ struct d3d10_depthstencil_view D3D10_DEPTH_STENCIL_VIEW_DESC desc; ID3D10Resource *resource; + ID3D10Device1 *device; }; -HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, +HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN; /* ID3D10RenderTargetView */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 9c1467f..8b3e19c 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1214,16 +1214,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Device1 *iface, ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3D10DepthStencilView **view) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_depthstencil_view *object; HRESULT hr; TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_depthstencil_view_init(object, resource, desc))) + if (FAILED(hr = d3d10_depthstencil_view_init(object, device, resource, desc))) { WARN("Failed to initialize depthstencil view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 429869d..e5e1803 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -213,10 +213,10 @@ static void test_create_depthstencil_view(void) { D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; D3D10_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; ID3D10DepthStencilView *dsview; + ID3D10Device *device, *tmp; ID3D10Texture2D *texture; - ID3D10Device *device; - ULONG refcount; HRESULT hr; if (!(device = create_device())) @@ -240,8 +240,18 @@ static void test_create_depthstencil_view(void) hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsview); ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10DepthStencilView_GetDevice(dsview, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 98ba776..c3333c8 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -425,6 +425,7 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_Release(ID3D10DepthStenci if (!refcount) { ID3D10Resource_Release(This->resource); + ID3D10Device1_Release(This->device); HeapFree(GetProcessHeap(), 0, This); } @@ -435,7 +436,12 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_Release(ID3D10DepthStenci static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDevice(ID3D10DepthStencilView *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)view->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_GetPrivateData(ID3D10DepthStencilView *iface, @@ -506,7 +512,7 @@ static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = d3d10_depthstencil_view_GetDesc, }; -HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, +HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) { HRESULT hr; @@ -526,6 +532,8 @@ HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, view->resource = resource; ID3D10Resource_AddRef(resource); + view->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(view->device); return S_OK; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_rendertarget_view_GetDevice().
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 40686f48cb352ab5e89cd0a37037b6c48842c259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40686f48cb352ab5e89cd0a37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 13 10:14:23 2014 +0100 d3d10core: Implement d3d10_rendertarget_view_GetDevice(). --- dlls/d3d10core/d3d10core_private.h | 3 ++- dlls/d3d10core/device.c | 9 ++++----- dlls/d3d10core/tests/device.c | 10 ++++++++++ dlls/d3d10core/view.c | 12 ++++++++++-- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index c548c4a..2a4245e 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -138,9 +138,10 @@ struct d3d10_rendertarget_view struct wined3d_rendertarget_view *wined3d_view; D3D10_RENDER_TARGET_VIEW_DESC desc; ID3D10Resource *resource; + ID3D10Device1 *device; }; -HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, +HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 8b3e19c..5a23e8f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1188,17 +1188,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Device1 *iface, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10RenderTargetView **view) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_rendertarget_view *object; HRESULT hr; - TRACE("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); + TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - hr = d3d10_rendertarget_view_init(object, resource, desc); - if (FAILED(hr)) + if (FAILED(hr = d3d10_rendertarget_view_init(object, device, resource, desc))) { WARN("Failed to initialize rendertarget view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e5e1803..80b7e7d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -308,8 +308,18 @@ static void test_create_rendertarget_view(void) U(rtv_desc).Buffer.ElementOffset = 0; U(rtv_desc).Buffer.ElementWidth = 64; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)buffer, &rtv_desc, &rtview); ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10RenderTargetView_GetDevice(rtview, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); ID3D10RenderTargetView_Release(rtview); ID3D10Buffer_Release(buffer); diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index c3333c8..999009c 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -587,6 +587,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTarge { wined3d_rendertarget_view_decref(This->wined3d_view); ID3D10Resource_Release(This->resource); + ID3D10Device1_Release(This->device); HeapFree(GetProcessHeap(), 0, This); } @@ -597,7 +598,12 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTarge static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTargetView *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)view->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10RenderTargetView *iface, @@ -668,7 +674,7 @@ static const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl = d3d10_rendertarget_view_GetDesc, }; -HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, +HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) { struct wined3d_resource *wined3d_resource; @@ -703,6 +709,8 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, view->resource = resource; ID3D10Resource_AddRef(resource); + view->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(view->device); return S_OK; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_shader_resource_view_GetDevice( ).
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 539a579d54b6ec66d624f0678d076c76124442e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=539a579d54b6ec66d624f0678… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 13 10:14:24 2014 +0100 d3d10core: Implement d3d10_shader_resource_view_GetDevice(). --- dlls/d3d10core/d3d10core_private.h | 3 ++- dlls/d3d10core/device.c | 6 +++--- dlls/d3d10core/tests/device.c | 14 ++++++++++++-- dlls/d3d10core/view.c | 12 ++++++++++-- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 2a4245e..4439254 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -153,9 +153,10 @@ struct d3d10_shader_resource_view D3D10_SHADER_RESOURCE_VIEW_DESC desc; ID3D10Resource *resource; + ID3D10Device1 *device; }; -HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, +HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; /* ID3D10InputLayout */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 5a23e8f..8085e56 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1163,16 +1163,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device1 *ifa static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Device1 *iface, ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10ShaderResourceView **view) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_shader_resource_view *object; HRESULT hr; TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_shader_resource_view_init(object, resource, desc))) + if (FAILED(hr = d3d10_shader_resource_view_init(object, device, resource, desc))) { WARN("Failed to initialize shader resource view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 80b7e7d..b284180 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -360,12 +360,12 @@ static void test_create_shader_resource_view(void) { D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; D3D10_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; ID3D10ShaderResourceView *srview; D3D10_BUFFER_DESC buffer_desc; + ID3D10Device *device, *tmp; ID3D10Texture2D *texture; ID3D10Buffer *buffer; - ID3D10Device *device; - ULONG refcount; HRESULT hr; if (!(device = create_device())) @@ -391,8 +391,18 @@ static void test_create_shader_resource_view(void) U(srv_desc).Buffer.ElementOffset = 0; U(srv_desc).Buffer.ElementWidth = 64; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srview); ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10ShaderResourceView_GetDevice(srview, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); ID3D10ShaderResourceView_Release(srview); ID3D10Buffer_Release(buffer); diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 999009c..4282f1a 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -772,6 +772,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderRe if (!refcount) { ID3D10Resource_Release(This->resource); + ID3D10Device1_Release(This->device); HeapFree(GetProcessHeap(), 0, This); } @@ -783,7 +784,12 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderRe static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderResourceView *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)view->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D10ShaderResourceView *iface, @@ -854,7 +860,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl d3d10_shader_resource_view_GetDesc, }; -HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, +HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) { HRESULT hr; @@ -874,6 +880,8 @@ HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, view->resource = resource; ID3D10Resource_AddRef(resource); + view->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(view->device); return S_OK; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_vertex_shader_GetDevice().
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 687c1c73581284abd1fe13e2c1f5577a839090b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=687c1c73581284abd1fe13e2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 13 10:14:25 2014 +0100 d3d10core: Implement d3d10_vertex_shader_GetDevice(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/shader.c | 20 +++++++++++++++++++- dlls/d3d10core/tests/device.c | 17 +++++++++++++---- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 4439254..381ddf8 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -181,6 +181,7 @@ struct d3d10_vertex_shader struct wined3d_shader *wined3d_shader; struct wined3d_shader_signature output_signature; + ID3D10Device1 *device; }; HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d10_device *device, diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 4f189e9..15e884c 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -167,7 +167,10 @@ static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_AddRef(ID3D10VertexShader *if TRACE("%p increasing refcount to %u\n", This, refcount); if (refcount == 1) + { + ID3D10Device1_AddRef(This->device); wined3d_shader_incref(This->wined3d_shader); + } return refcount; } @@ -180,7 +183,14 @@ static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_Release(ID3D10VertexShader *i TRACE("%p decreasing refcount to %u\n", This, refcount); if (!refcount) + { + ID3D10Device1 *device = This->device; + wined3d_shader_decref(This->wined3d_shader); + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D10Device1_Release(device); + } return refcount; } @@ -189,7 +199,12 @@ static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_Release(ID3D10VertexShader *i static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)shader->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10VertexShader *iface, @@ -270,6 +285,9 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 return hr; } + shader->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(shader->device); + return S_OK; } diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b284180..458e3f5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -549,10 +549,10 @@ float4 main(const float4 color : COLOR) : SV_TARGET 0x00000000, 0x00000000, }; + ULONG refcount, expected_refcount; ID3D10VertexShader *vs = NULL; ID3D10PixelShader *ps = NULL; - ID3D10Device *device; - ULONG refcount; + ID3D10Device *device, *tmp; HRESULT hr; if (!(device = create_device())) @@ -561,10 +561,19 @@ float4 main(const float4 color : COLOR) : SV_TARGET return; } + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateVertexShader(device, vs_4_0, sizeof(vs_4_0), &vs); ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); - if (vs) - ID3D10VertexShader_Release(vs); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10VertexShader_GetDevice(vs, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); + ID3D10VertexShader_Release(vs); hr = ID3D10Device_CreateVertexShader(device, vs_2_0, sizeof(vs_2_0), &vs); ok(hr == E_INVALIDARG, "Created a SM2 vertex shader, hr %#x\n", hr);

1 0

Henri Verbeet : d3d10core: Implement d3d10_pixel_shader_GetDevice().
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: e4eee4ddb951b10ad9004ade3fb0fa2278257f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4eee4ddb951b10ad9004ade3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 13 10:14:26 2014 +0100 d3d10core: Implement d3d10_pixel_shader_GetDevice(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/shader.c | 20 +++++++++++++++++++- dlls/d3d10core/tests/device.c | 13 +++++++++++-- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 381ddf8..8fdef8a 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -210,6 +210,7 @@ struct d3d10_pixel_shader struct wined3d_shader *wined3d_shader; struct wined3d_shader_signature output_signature; + ID3D10Device1 *device; }; HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_device *device, diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 15e884c..007dfc2 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -482,7 +482,10 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *ifac TRACE("%p increasing refcount to %u\n", This, refcount); if (refcount == 1) + { + ID3D10Device1_AddRef(This->device); wined3d_shader_incref(This->wined3d_shader); + } return refcount; } @@ -495,7 +498,14 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *ifa TRACE("%p decreasing refcount to %u\n", This, refcount); if (!refcount) + { + ID3D10Device1 *device = This->device; + wined3d_shader_decref(This->wined3d_shader); + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D10Device1_Release(device); + } return refcount; } @@ -504,7 +514,12 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *ifa static void STDMETHODCALLTYPE d3d10_pixel_shader_GetDevice(ID3D10PixelShader *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)shader->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelShader *iface, @@ -585,6 +600,9 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ return hr; } + shader->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(shader->device); + return S_OK; } diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 458e3f5..7eef19a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -584,10 +584,19 @@ float4 main(const float4 color : COLOR) : SV_TARGET hr = ID3D10Device_CreateVertexShader(device, ps_4_0, sizeof(ps_4_0), &vs); ok(hr == E_INVALIDARG, "Created a SM4 vertex shader from a pixel shader source, hr %#x\n", hr); + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), &ps); ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); - if (ps) - ID3D10PixelShader_Release(ps); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10PixelShader_GetDevice(ps, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); + ID3D10PixelShader_Release(ps); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Dmitry Timoshkov : taskschd: Forward ITaskFolder:: RegisterTask to IRegisterTask constructor.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: a20b10e445c638b4957ec87aff8c59db1b710803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20b10e445c638b4957ec87af… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 16:18:58 2014 +0900 taskschd: Forward ITaskFolder::RegisterTask to IRegisterTask constructor. --- dlls/taskschd/folder.c | 32 ++++++++++++++++++++++++++------ dlls/taskschd/regtask.c | 3 ++- dlls/taskschd/taskschd_private.h | 8 +++++++- dlls/taskschd/tests/scheduler.c | 8 ++++---- 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index c5f8010..9e57e07 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -287,13 +287,15 @@ static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LON return reg_delete_folder(folder->path, name); } -static HRESULT WINAPI TaskFolder_GetTask(ITaskFolder *iface, BSTR path, IRegisteredTask **task) +static HRESULT WINAPI TaskFolder_GetTask(ITaskFolder *iface, BSTR name, IRegisteredTask **task) { - TRACE("%p,%s,%p\n", iface, debugstr_w(path), task); + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%s,%p\n", iface, debugstr_w(name), task); if (!task) return E_POINTER; - return RegisteredTask_create(path, task); + return RegisteredTask_create(folder->path, name, NULL, 0, task, FALSE); } static HRESULT WINAPI TaskFolder_GetTasks(ITaskFolder *iface, LONG flags, IRegisteredTaskCollection **tasks) @@ -313,13 +315,31 @@ static HRESULT WINAPI TaskFolder_DeleteTask(ITaskFolder *iface, BSTR name, LONG return E_NOTIMPL; } -static HRESULT WINAPI TaskFolder_RegisterTask(ITaskFolder *iface, BSTR path, BSTR xml, LONG flags, +static HRESULT WINAPI TaskFolder_RegisterTask(ITaskFolder *iface, BSTR name, BSTR xml, LONG flags, VARIANT user, VARIANT password, TASK_LOGON_TYPE logon, VARIANT sddl, IRegisteredTask **task) { - FIXME("%p,%s,%s,%x,%s,%s,%d,%s,%p: stub\n", iface, debugstr_w(path), debugstr_w(xml), flags, + TaskFolder *folder = impl_from_ITaskFolder(iface); + IRegisteredTask *regtask = NULL; + HRESULT hr; + + FIXME("%p,%s,%s,%x,%s,%s,%d,%s,%p: stub\n", iface, debugstr_w(name), debugstr_w(xml), flags, debugstr_variant(&user), debugstr_variant(&password), logon, debugstr_variant(&sddl), task); - return E_NOTIMPL; + + if (!is_variant_null(&sddl)) + FIXME("security descriptor %s is ignored\n", debugstr_variant(&sddl)); + + if (!is_variant_null(&user) || !is_variant_null(&password)) + FIXME("user/password are ignored\n"); + + if (!task) task = &regtask; + + hr = RegisteredTask_create(folder->path, name, xml, logon, task, TRUE); + + if (regtask) + IRegisteredTask_Release(regtask); + + return hr; } static HRESULT WINAPI TaskFolder_RegisterTaskDefinition(ITaskFolder *iface, BSTR path, ITaskDefinition *definition, LONG flags, diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 5252670..bab50e3 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -251,7 +251,8 @@ static const IRegisteredTaskVtbl RegisteredTask_vtbl = regtask_GetRunTimes }; -HRESULT RegisteredTask_create(const WCHAR *path, IRegisteredTask **obj) +HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, const WCHAR *xml, + TASK_LOGON_TYPE logon, IRegisteredTask **obj, BOOL create) { RegisteredTask *regtask; diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index df15903..b5e0cf1 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -16,12 +16,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WINE_TASKSCHD_PRIVATE_H__ +#define __WINE_TASKSCHD_PRIVATE_H__ + #include "wine/unicode.h" HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN; HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) DECLSPEC_HIDDEN; -HRESULT RegisteredTask_create(const WCHAR *path, IRegisteredTask **obj) DECLSPEC_HIDDEN; +HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, const WCHAR *xml, TASK_LOGON_TYPE logon, + IRegisteredTask **obj, BOOL create) DECLSPEC_HIDDEN; HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollection **obj) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN; @@ -52,3 +56,5 @@ static inline WCHAR *heap_strdupW(const WCHAR *src) if ((dst = heap_alloc(len))) memcpy(dst, src, len); return dst; } + +#endif /* __WINE_TASKSCHD_PRIVATE_H__ */ diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index ac1eb98..8ecd98a 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -734,7 +734,6 @@ static void test_GetTask(void) MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); -todo_wine ok(hr == S_OK, "RegisterTask error %#x\n", hr); hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); @@ -742,16 +741,17 @@ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE_OR_UPDATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); -todo_wine ok(hr == S_OK, "RegisterTask error %#x\n", hr); - /* FIXME: Remove once implemented */ - if (hr != S_OK) goto failed; hr = IRegisteredTask_get_Name(task1, NULL); +todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); hr = IRegisteredTask_get_Name(task1, &bstr); +todo_wine ok(hr == S_OK, "get_Name error %#x\n", hr); + /* FIXME: Remove once implemented */ + if (hr != S_OK) goto failed; ok(!lstrcmpW(bstr, Task1), "expected Task1, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IRegisteredTask_get_Path(task1, &bstr);

1 0

Dmitry Timoshkov : taskschd/tests: Add some ITaskDefinition tests.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 83e0fb8a5f9909489de9d4161fe036c2732bd493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e0fb8a5f9909489de9d4161… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 16:19:47 2014 +0900 taskschd/tests: Add some ITaskDefinition tests. --- dlls/taskschd/tests/scheduler.c | 282 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 282 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83e0fb8a5f9909489de9d…

1 0