wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Frédéric Delanoy : setupapi: Use BOOL type where appropriate.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 9c76ccfda124ca471b3de4d8a04aed1e15a6b9f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c76ccfda124ca471b3de4d8a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 13 12:07:19 2014 +0100 setupapi: Use BOOL type where appropriate. --- dlls/setupapi/devinst.c | 2 +- dlls/setupapi/misc.c | 4 ++-- dlls/setupapi/parser.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5eaffd6..33dea82 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2887,7 +2887,7 @@ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo) } } - if (ret == FALSE) + if (!ret) SetLastError(ERROR_INVALID_HANDLE); return ret; diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 5f341cc..22e55d9 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1458,7 +1458,7 @@ static DWORD decompress_file_lz( LPCWSTR source, LPCWSTR target ) struct callback_context { - int has_extracted; + BOOL has_extracted; LPCWSTR target; }; @@ -1477,7 +1477,7 @@ static UINT CALLBACK decompress_or_copy_callback( PVOID context, UINT notificati TRACE("Requesting extraction of cabinet file %s\n", wine_dbgstr_w(info->NameInCabinet)); strcpyW( info->FullTargetName, context_info->target ); - context_info->has_extracted = 1; + context_info->has_extracted = TRUE; return FILEOP_DOIT; } default: return NO_ERROR; diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index cd101b7..e8c8fd3 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -370,7 +370,7 @@ static unsigned int PARSER_string_substW( const struct inf_file *file, const WCH { const WCHAR *start, *subst, *p; unsigned int len, total = 0; - int inside = 0; + BOOL inside = FALSE; if (!buffer) size = MAX_STRING_LEN + 1; for (p = start = text; *p; p++)

1 0

Francois Gouget : atl/registrar: Skip the test_registrar() tests if we don 't have elevated privileges.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 07ac635d287d0d0de1b6431c9242db37bccc441c URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ac635d287d0d0de1b6431c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 17:07:09 2014 +0100 atl/registrar: Skip the test_registrar() tests if we don't have elevated privileges. --- dlls/atl/tests/registrar.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index 68a8dd8..b9b62e7 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -37,6 +37,34 @@ #include <initguid.h> #include <atliface.h> + +static BOOL is_process_limited(void) +{ + static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; + HANDLE token; + + if (!pOpenProcessToken) + { + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + pOpenProcessToken = (void*)GetProcAddress(hadvapi32, "OpenProcessToken"); + if (!pOpenProcessToken) + return FALSE; + } + + if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) + { + BOOL ret; + TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; + DWORD size; + + ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + CloseHandle(token); + return (ret && type == TokenElevationTypeLimited); + } + return FALSE; +} + + static const char textA[] = "HKCR \n" "{ \n" @@ -84,7 +112,15 @@ static void test_registrar(void) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, count); hr = IRegistrar_StringRegister(registrar, textW); - ok(SUCCEEDED(hr), "IRegistrar_StringRegister failed, hr = 0x%08X\n", hr); + if (FAILED(hr)) + { + int is_limited = is_process_limited(); + ok(hr == DISP_E_EXCEPTION && is_limited, + "IRegistrar_StringRegister failed, hr = 0x%08X, is_limited=%d\n", hr, is_limited); + skip("Skipping registrar tests\n"); + IRegistrar_Release(registrar); + return; + } lret = RegOpenKeyA(HKEY_CLASSES_ROOT, "eebf73c4-50fd-478f-bbcf-db212221227a", &key); ok(lret == ERROR_SUCCESS, "error %d opening registry key\n", lret);

1 0

Dmitry Timoshkov : taskschd: Implement most of ITaskSettings get methods.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 7b089951417ab4e8743f81f4ef4ea5eb91c09f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b089951417ab4e8743f81f4e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 16:21:25 2014 +0900 taskschd: Implement most of ITaskSettings get methods. --- dlls/taskschd/task.c | 248 +++++++++++++++++++++++++++++++++------ dlls/taskschd/tests/scheduler.c | 5 +- 2 files changed, 216 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b089951417ab4e8743f8…

1 0

Dmitry Timoshkov : taskschd: Add ITaskSettings stub implementation.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 12e8a31e725478365d4854d90d4d4e43b0db2d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e8a31e725478365d4854d90… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 16:20:26 2014 +0900 taskschd: Add ITaskSettings stub implementation. --- dlls/taskschd/task.c | 392 ++++++++++++++++++++++++++++++++++++++- dlls/taskschd/tests/scheduler.c | 12 +- 2 files changed, 396 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12e8a31e725478365d485…

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

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

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

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_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_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

← Newer
1
...
24
25
26
27
28
29
30
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2014