October 2015 - Wine-Commits

Michael Müller : wineconsole: Forward child process exitcode.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 5d4a9617898c898e9e095ee11d9430fcb48b27e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4a9617898c898e9e095ee11… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Sep 24 04:34:57 2015 +0200 wineconsole: Forward child process exitcode. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- programs/wineconsole/winecon_private.h | 1 + programs/wineconsole/wineconsole.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 2178dd0..5608f99 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -59,6 +59,7 @@ struct inner_data { HANDLE hConIn; /* console input handle */ HANDLE hConOut; /* screen buffer handle: has to be changed when active sb changes */ HANDLE hSynchro; /* waitable handle signalled by server when something in server has been modified */ + HANDLE hProcess; /* handle to the child process or NULL */ HWND hWnd; /* handle of 'user' window or NULL for 'curses' */ INT nCmdShow; /* argument of WinMain */ BOOL in_set_config; /* to handle re-entrant calls to WINECON_SetConfig */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index b8b517a..e1ee55b 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -541,6 +541,7 @@ static void WINECON_Delete(struct inner_data* data) if (data->hConIn) CloseHandle(data->hConIn); if (data->hConOut) CloseHandle(data->hConOut); if (data->hSynchro) CloseHandle(data->hSynchro); + if (data->hProcess) CloseHandle(data->hProcess); HeapFree(GetProcessHeap(), 0, data->curcfg.registry); HeapFree(GetProcessHeap(), 0, data->cells); HeapFree(GetProcessHeap(), 0, data); @@ -749,7 +750,7 @@ static int WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) done = CreateProcessW(NULL, cmdLine, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info); if (done) { - CloseHandle(info.hProcess); + data->hProcess = info.hProcess; CloseHandle(info.hThread); } @@ -892,8 +893,18 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh if (!ret) { - WINE_TRACE("calling MainLoop.\n"); - ret = data->fnMainLoop(data); + DWORD exitcode; + + WINE_TRACE("calling MainLoop.\n"); + ret = data->fnMainLoop(data); + + if (!ret && data->hProcess && + WaitForSingleObject(data->hProcess, INFINITE) == WAIT_OBJECT_0 && + GetExitCodeProcess(data->hProcess, &exitcode)) + { + WINE_TRACE("forwarding exitcode %u from child process\n", exitcode); + ret = exitcode; + } } WINECON_Delete(data);

1 0

Hans Leidekker : wininet/tests: Fix a couple of test failures.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 1a74ccc8c585ed3c0d5da70b389a8a589162d9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a74ccc8c585ed3c0d5da70b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 22 15:59:22 2015 +0200 wininet/tests: Fix a couple of test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/tests/http.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5f277d8..973413a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2153,6 +2153,8 @@ static DWORD CALLBACK server_thread(LPVOID param) { if (strstr(buffer, "Content-Length: 100")) { + if (strstr(buffer, "POST /test7b")) + recvfrom(c, buffer, sizeof buffer, 0, NULL, NULL); send(c, okmsg, sizeof okmsg-1, 0); send(c, page1, sizeof page1-1, 0); } @@ -2879,7 +2881,7 @@ static void test_header_handling_order(int port) connect = InternetConnectA(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(connect != NULL, "InternetConnect failed\n"); - request = HttpOpenRequestA(connect, "POST", "/test7b", NULL, NULL, types, 0, 0); + request = HttpOpenRequestA(connect, "POST", "/test7b", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0); ok(request != NULL, "HttpOpenRequest failed\n"); ret = HttpAddRequestHeadersA(request, "Content-Length: 100\r\n", ~0u, HTTP_ADDREQ_FLAG_ADD_IF_NEW); @@ -2887,7 +2889,7 @@ static void test_header_handling_order(int port) data_len = sizeof(data); memset(data, 'a', sizeof(data)); - ret = HttpSendRequestA(request, connection, ~0u, data, data_len); + ret = HttpSendRequestA(request, NULL, 0, data, data_len); ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); status = 0;

1 0

Hans Leidekker : msi: Set the PrimaryVolumeSpaceRequired and PrimaryVolumeSpaceRemaining properties.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 9a5788afc1464e8b8008dd561876f12fb6ad2979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5788afc1464e8b8008dd561… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 22 15:59:57 2015 +0200 msi: Set the PrimaryVolumeSpaceRequired and PrimaryVolumeSpaceRemaining properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/action.c | 34 ++++++++++++++++++++++++++++++---- dlls/msi/tests/install.c | 14 +++++++++++++- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 93e85c3..16c633b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2378,6 +2378,18 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa TRACE("%s resolves to %s\n", debugstr_w(name), debugstr_w(folder->ResolvedTarget)); } +static ULONGLONG get_volume_space_required( MSIPACKAGE *package ) +{ + MSICOMPONENT *comp; + ULONGLONG ret = 0; + + LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) + { + if (comp->Action == INSTALLSTATE_LOCAL) ret += comp->Cost; + } + return ret; +} + static UINT ACTION_CostFinalize(MSIPACKAGE *package) { static const WCHAR query[] = @@ -2392,6 +2404,12 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) static const WCHAR szPrimaryVolumeSpaceAvailable[] = {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', 'A','v','a','i','l','a','b','l','e',0}; + static const WCHAR szPrimaryVolumeSpaceRequired[] = + {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', + 'R','e','q','u','i','r','e','d',0}; + static const WCHAR szPrimaryVolumeSpaceRemaining[] = + {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', + 'R','e','m','a','i','n','i','n','g',0}; static const WCHAR szOutOfNoRbDiskSpace[] = {'O','u','t','O','f','N','o','R','b','D','i','s','k','S','p','a','c','e',0}; MSICOMPONENT *comp; @@ -2442,6 +2460,8 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) if (!level) msi_set_property( package->db, szInstallLevel, szOne, -1 ); msi_free(level); + if ((rc = MSI_SetFeatureStates( package ))) return rc; + if ((primary_key = msi_dup_property( package->db, szPrimaryFolder ))) { if ((primary_folder = msi_dup_property( package->db, primary_key ))) @@ -2449,17 +2469,23 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) if (((primary_folder[0] >= 'A' && primary_folder[0] <= 'Z') || (primary_folder[0] >= 'a' && primary_folder[0] <= 'z')) && primary_folder[1] == ':') { + static const WCHAR fmtW[] = {'%','l','u',0}; ULARGE_INTEGER free; + ULONGLONG required; + WCHAR buf[21]; primary_folder[2] = 0; if (GetDiskFreeSpaceExW( primary_folder, &free, NULL, NULL )) { - static const WCHAR fmtW[] = {'%','l','u',0}; - WCHAR buf[21]; - sprintfW( buf, fmtW, free.QuadPart / 512 ); msi_set_property( package->db, szPrimaryVolumeSpaceAvailable, buf, -1 ); } + required = get_volume_space_required( package ); + sprintfW( buf, fmtW, required / 512 ); + msi_set_property( package->db, szPrimaryVolumeSpaceRequired, buf, -1 ); + + sprintfW( buf, fmtW, (free.QuadPart - required) / 512 ); + msi_set_property( package->db, szPrimaryVolumeSpaceRemaining, buf, -1 ); msi_set_property( package->db, szPrimaryVolumePath, primary_folder, 2 ); } msi_free( primary_folder ); @@ -2471,7 +2497,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) msi_set_property( package->db, szOutOfDiskSpace, szZero, -1 ); msi_set_property( package->db, szOutOfNoRbDiskSpace, szZero, -1 ); - return MSI_SetFeatureStates(package); + return ERROR_SUCCESS; } static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD len, DWORD *type, DWORD *size ) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 86ad561..5eff29f 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1112,10 +1112,16 @@ static const char vp_custom_action_dat[] = "CustomAction\tAction\n" "TestPrimaryVolumePath0\t19\t\tPrimaryVolumePath set before CostFinalize\t\n" "TestPrimaryVolumeSpaceAvailable0\t19\t\tPrimaryVolumeSpaceAvailable set before CostFinalize\t\n" + "TestPrimaryVolumeSpaceRequired0\t19\t\tPrimaryVolumeSpaceRequired set before CostFinalize\t\n" + "TestPrimaryVolumeSpaceRemaining0\t19\t\tPrimaryVolumeSpaceRemaining set before CostFinalize\t\n" "TestPrimaryVolumePath1\t19\t\tPrimaryVolumePath set before InstallValidate\t\n" "TestPrimaryVolumeSpaceAvailable1\t19\t\tPrimaryVolumeSpaceAvailable not set before InstallValidate\t\n" + "TestPrimaryVolumeSpaceRequired1\t19\t\tPrimaryVolumeSpaceRequired not set before InstallValidate\t\n" + "TestPrimaryVolumeSpaceRemaining1\t19\t\tPrimaryVolumeSpaceRemaining not set before InstallValidate\t\n" "TestPrimaryVolumePath2\t19\t\tPrimaryVolumePath not set after InstallValidate\t\n" - "TestPrimaryVolumeSpaceAvailable2\t19\t\tPrimaryVolumeSpaceAvailable not set after InstallValidate\t\n"; + "TestPrimaryVolumeSpaceAvailable2\t19\t\tPrimaryVolumeSpaceAvailable not set after InstallValidate\t\n" + "TestPrimaryVolumeSpaceRequired2\t19\t\tPrimaryVolumeSpaceRequired not set after InstallValidate\t\n" + "TestPrimaryVolumeSpaceRemaining2\t19\t\tPrimaryVolumeSpaceRemaining not set after InstallValidate\t\n"; static const char vp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -1126,12 +1132,18 @@ static const char vp_install_exec_seq_dat[] = "FileCost\t\t300\n" "TestPrimaryVolumePath0\tPrimaryVolumePath AND NOT REMOVE\t400\n" "TestPrimaryVolumeSpaceAvailable0\tPrimaryVolumeSpaceAvailable AND NOT REMOVE\t500\n" + "TestPrimaryVolumeSpaceRequired0\tPrimaryVolumeSpaceRequired AND NOT REMOVE\t510\n" + "TestPrimaryVolumeSpaceRemaining0\tPrimaryVolumeSpaceRemaining AND NOT REMOVE\t520\n" "CostFinalize\t\t600\n" "TestPrimaryVolumePath1\tPrimaryVolumePath AND NOT REMOVE\t600\n" "TestPrimaryVolumeSpaceAvailable1\tNOT PrimaryVolumeSpaceAvailable AND NOT REMOVE\t800\n" + "TestPrimaryVolumeSpaceRequired1\tNOT PrimaryVolumeSpaceRequired AND NOT REMOVE\t810\n" + "TestPrimaryVolumeSpaceRemaining1\tNOT PrimaryVolumeSpaceRemaining AND NOT REMOVE\t820\n" "InstallValidate\t\t900\n" "TestPrimaryVolumePath2\tNOT PrimaryVolumePath AND NOT REMOVE\t1000\n" "TestPrimaryVolumeSpaceAvailable2\tNOT PrimaryVolumeSpaceAvailable AND NOT REMOVE\t1100\n" + "TestPrimaryVolumeSpaceRequired2\tNOT PrimaryVolumeSpaceRequired AND NOT REMOVE\t1110\n" + "TestPrimaryVolumeSpaceRemaining2\tNOT PrimaryVolumeSpaceRemaining AND NOT REMOVE\t1120\n" "InstallInitialize\t\t1200\n" "ProcessComponents\t\t1300\n" "RemoveFiles\t\t1400\n"

1 0

Jacek Caban : esen: Added stub DLL.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 205799d131920128cf277c36385454011cb45dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=205799d131920128cf277c363… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 18:20:09 2015 +0200 esen: Added stub DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure | 2 + configure.ac | 1 + dlls/esent/Makefile.in | 4 + dlls/esent/esent.spec | 336 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/esent/esent_main.c | 37 ++++++ 5 files changed, 380 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=205799d131920128cf277…

1 0

Józef Kucia : d3d11: Rename d3d10_device_inner to d3d_device_inner.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 9754cda53bdeb2354a75711fba27df15cfaf259c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9754cda53bdeb2354a75711fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:50:00 2015 +0200 d3d11: Rename d3d10_device_inner to d3d_device_inner. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/device.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index efa52ee..f56d3a9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -563,7 +563,7 @@ static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner); } -static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **out) +static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct d3d_device *device = impl_from_IUnknown(iface); @@ -598,17 +598,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *ifa return S_OK; } -static ULONG STDMETHODCALLTYPE d3d10_device_inner_AddRef(IUnknown *iface) +static ULONG STDMETHODCALLTYPE d3d_device_inner_AddRef(IUnknown *iface) { - struct d3d_device *This = impl_from_IUnknown(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_device *device = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", device, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) +static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) { struct d3d_device *device = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&device->refcount); @@ -2786,12 +2786,12 @@ static const struct ID3D10Device1Vtbl d3d10_device1_vtbl = d3d10_device_GetFeatureLevel, }; -static const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl = +static const struct IUnknownVtbl d3d_device_inner_unknown_vtbl = { /* IUnknown methods */ - d3d10_device_inner_QueryInterface, - d3d10_device_inner_AddRef, - d3d10_device_inner_Release, + d3d_device_inner_QueryInterface, + d3d_device_inner_AddRef, + d3d_device_inner_Release, }; /* ID3D10Multithread methods */ @@ -3125,7 +3125,7 @@ static const struct wine_rb_functions d3d_rasterizer_state_rb_ops = HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) { - device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl; + device->IUnknown_inner.lpVtbl = &d3d_device_inner_unknown_vtbl; device->ID3D11Device_iface.lpVtbl = &d3d11_device_vtbl; device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl; device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl;

1 0

Józef Kucia : d3d11/tests: Port test_create_shader() from d3d10core.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: dc54d70207d47f31ff62ac81400684dd8185e2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc54d70207d47f31ff62ac814… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:53 2015 +0200 d3d11/tests: Port test_create_shader() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 207 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 194 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc54d70207d47f31ff62a…

1 0

Andrey Gusev : wined3d: TRACE fixes.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 3c8635c8d7ef9a6f4c522f931c2be757022556fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8635c8d7ef9a6f4c522f931… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Sep 18 16:54:41 2015 +0300 wined3d: TRACE fixes. --- dlls/wined3d/buffer.c | 3 ++- dlls/wined3d/device.c | 3 ++- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/palette.c | 4 ++-- dlls/wined3d/query.c | 4 ++-- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/view.c | 8 ++++---- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 689bb5d..19df398 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1236,7 +1236,8 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct struct wined3d_buffer *object; HRESULT hr; - TRACE("device %p, desc %p, data %p, parent %p, buffer %p\n", device, desc, data, parent, buffer); + TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p\n", + device, desc, data, parent, parent_ops, buffer); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 88f0038..def042a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4503,7 +4503,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, HRESULT hr = WINED3D_OK; unsigned int i; - TRACE("device %p, swapchain_desc %p, mode %p, callback %p.\n", device, swapchain_desc, mode, callback); + TRACE("device %p, swapchain_desc %p, mode %p, callback %p, reset_state %#x.\n", + device, swapchain_desc, mode, callback, reset_state); if (!(swapchain = wined3d_device_get_swapchain(device, 0))) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5ac3ca7..6801bcc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5451,8 +5451,8 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, e struct wined3d_device *object; HRESULT hr; - TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, device_parent %p, device %p.\n", - wined3d, adapter_idx, device_type, focus_window, flags, device_parent, device); + TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, surface_alignment %u, device_parent %p, device %p.\n", + wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, device_parent, device); /* Validate the adapter number. If no adapters are available(no GL), ignore the adapter * number and create a device without a 3D adapter for 2D only operation. */ diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 1ebeb11..0d7bfa4 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -157,8 +157,8 @@ HRESULT CDECL wined3d_palette_create(struct wined3d_device *device, DWORD flags, struct wined3d_palette *object; HRESULT hr; - TRACE("device %p, flags %#x, entries %p, palette %p.\n", - device, flags, entries, palette); + TRACE("device %p, flags %#x, entry_count %u, entries %p, palette %p.\n", + device, flags, entry_count, entries, palette); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9e6f21a..b86adf1 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -114,7 +114,7 @@ enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_ const struct wined3d_gl_info *gl_info; enum wined3d_event_query_result ret; - TRACE("(%p)\n", query); + TRACE("query %p, device %p.\n", query, device); if (!query->context) { @@ -812,7 +812,7 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, struct wined3d_query *object; HRESULT hr; - TRACE("device %p, type %#x, query %p.\n", device, type, query); + TRACE("device %p, type %#x, parent %p, query %p.\n", device, type, parent, query); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6e9fa9e..2d80877 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2037,8 +2037,8 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b unsigned int backend_version; const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info; - TRACE("shader %p, byte_code %p, output_signature %p, float_const_count %u.\n", - shader, byte_code, output_signature, float_const_count); + TRACE("shader %p, byte_code %p, output_signature %p, float_const_count %u, type %#x, max_version %u.\n", + shader, byte_code, output_signature, float_const_count, type, max_version); list_init(&shader->constantsF); list_init(&shader->constantsB); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 999423d8..b5133b0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3557,7 +3557,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co struct wined3d_device *device = surface->resource.device; GLsizei w, h; - TRACE("surface %p, new location %#x.\n", surface, location); + TRACE("surface %p, context %p, new location %#x.\n", surface, context, location); /* TODO: Make this work for modes other than FBO */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return; @@ -4980,7 +4980,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC | WINEDDBLT_DEPTHFILL | WINEDDBLT_DONOTWAIT; - TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", + TRACE("dst_surface %p, dst_rect_in %s, src_surface %p, src_rect_in %s, flags %#x, fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect_in), src_surface, wine_dbgstr_rect(src_rect_in), flags, fx, debug_d3dtexturefiltertype(filter)); TRACE("Usage is %s.\n", debug_d3dusage(dst_surface->resource.usage)); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b369809..fdce24d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -443,7 +443,7 @@ void wined3d_texture_load(struct wined3d_texture *texture, DWORD flag; UINT i; - TRACE("texture %p, srgb %#x.\n", texture, srgb); + TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) srgb = FALSE; @@ -826,7 +826,7 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi GLenum internal; UINT i; - TRACE("texture %p, format %s.\n", texture, debug_d3dformat(format->id)); + TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); if (format->convert) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1ff36da..846f7fd 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -131,8 +131,8 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget { struct wined3d_rendertarget_view *object; - TRACE("desc %p, resource %p, parent %p, view %p.\n", - desc, resource, parent, view); + TRACE("desc %p, resource %p, parent %p, parent_ops %p, view %p.\n", + desc, resource, parent, parent_ops, view); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; @@ -150,7 +150,7 @@ HRESULT CDECL wined3d_rendertarget_view_create_from_surface(struct wined3d_surfa { struct wined3d_rendertarget_view_desc desc; - TRACE("surface %p, view %p.\n", surface, view); + TRACE("surface %p, parent %p, parent_ops %p, view %p.\n", surface, parent, parent_ops, view); desc.format_id = surface->resource.format->id; desc.u.texture.level_idx = surface->texture_level; @@ -199,7 +199,7 @@ HRESULT CDECL wined3d_shader_resource_view_create(struct wined3d_resource *resou { struct wined3d_shader_resource_view *object; - TRACE("parent %p, parent_ops %p, view %p.\n", parent, parent_ops, view); + TRACE("resource %p, parent %p, parent_ops %p, view %p.\n", resource, parent, parent_ops, view); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Józef Kucia : d3d11: Rename d3d10_rasterizer_state to d3d_rasterizer_state.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 84efabb6c37d8456a0eb83b22f808d18d839edb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84efabb6c37d8456a0eb83b22… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:54 2015 +0200 d3d11: Rename d3d10_rasterizer_state to d3d_rasterizer_state. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 8 ++++---- dlls/d3d11/device.c | 16 ++++++++-------- dlls/d3d11/state.c | 22 +++++++++++----------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e76ce6d..13126a1 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -307,7 +307,7 @@ struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( ID3D10DepthStencilState *iface) DECLSPEC_HIDDEN; /* ID3D10RasterizerState */ -struct d3d10_rasterizer_state +struct d3d_rasterizer_state { ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; @@ -318,9 +318,9 @@ struct d3d10_rasterizer_state ID3D10Device1 *device; }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d_device *device, +HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D10_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; -struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; +struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; /* ID3D10SamplerState */ struct d3d10_sampler_state @@ -378,7 +378,7 @@ struct d3d_device float blend_factor[4]; struct d3d10_depthstencil_state *depth_stencil_state; UINT stencil_ref; - struct d3d10_rasterizer_state *rasterizer_state; + struct d3d_rasterizer_state *rasterizer_state; }; static inline struct d3d_device *impl_from_ID3D10Device(ID3D10Device1 *iface) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index eb605aa..ee492ca 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2439,7 +2439,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device const D3D10_RASTERIZER_DESC *desc, ID3D10RasterizerState **rasterizer_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_rasterizer_state *object; + struct d3d_rasterizer_state *object; struct wine_rb_entry *entry; HRESULT hr; @@ -2451,7 +2451,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->rasterizer_states, desc))) { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_rasterizer_state, entry); + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry); TRACE("Returning existing rasterizer state %p.\n", object); *rasterizer_state = &object->ID3D10RasterizerState_iface; @@ -2466,7 +2466,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device if (!object) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_rasterizer_state_init(object, device, desc))) + if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) { WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -3102,20 +3102,20 @@ static const struct wine_rb_functions d3d10_depthstencil_state_rb_ops = d3d10_depthstencil_state_compare, }; -static int d3d10_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) +static int d3d_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) { const D3D10_RASTERIZER_DESC *ka = key; - const D3D10_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d10_rasterizer_state, entry)->desc; + const D3D10_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_rasterizer_state, entry)->desc; return memcmp(ka, kb, sizeof(*ka)); } -static const struct wine_rb_functions d3d10_rasterizer_state_rb_ops = +static const struct wine_rb_functions d3d_rasterizer_state_rb_ops = { d3d10_rb_alloc, d3d10_rb_realloc, d3d10_rb_free, - d3d10_rasterizer_state_compare, + d3d_rasterizer_state_compare, }; HRESULT d3d10_device_init(struct d3d_device *device, void *outer_unknown) @@ -3147,7 +3147,7 @@ HRESULT d3d10_device_init(struct d3d_device *device, void *outer_unknown) return E_FAIL; } - if (wine_rb_init(&device->rasterizer_states, &d3d10_rasterizer_state_rb_ops) == -1) + if (wine_rb_init(&device->rasterizer_states, &d3d_rasterizer_state_rb_ops) == -1) { WARN("Failed to initialize rasterizer state rbtree.\n"); wine_rb_destroy(&device->depthstencil_states, NULL, NULL); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 000e367..0ab9e98 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -354,9 +354,9 @@ struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState(ID3D10 return impl_from_ID3D10DepthStencilState(iface); } -static inline struct d3d10_rasterizer_state *impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) +static inline struct d3d_rasterizer_state *impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) { - return CONTAINING_RECORD(iface, struct d3d10_rasterizer_state, ID3D10RasterizerState_iface); + return CONTAINING_RECORD(iface, struct d3d_rasterizer_state, ID3D10RasterizerState_iface); } /* IUnknown methods */ @@ -383,7 +383,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10Ras static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerState *iface) { - struct d3d10_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -393,7 +393,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerSta static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface) { - struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); ULONG refcount = InterlockedDecrement(&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); @@ -416,7 +416,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerSt static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDevice(ID3D10RasterizerState *iface, ID3D10Device **device) { - struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -427,7 +427,7 @@ static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDevice(ID3D10RasterizerS static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10RasterizerState *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -438,7 +438,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10Ras static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10RasterizerState *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -449,7 +449,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10Ras static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface(ID3D10RasterizerState *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -461,7 +461,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface( static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDesc(ID3D10RasterizerState *iface, D3D10_RASTERIZER_DESC *desc) { - struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); TRACE("iface %p, desc %p.\n", iface, desc); @@ -483,7 +483,7 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = d3d10_rasterizer_state_GetDesc, }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d_device *device, +HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D10_RASTERIZER_DESC *desc) { state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; @@ -507,7 +507,7 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct return S_OK; } -struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) +struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) { if (!iface) return NULL;

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateRasterizerState().
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: b8bcac51003f45f21a54fc16b5f4c78d466c5086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8bcac51003f45f21a54fc16b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:57 2015 +0200 d3d11: Implement d3d11_device_CreateRasterizerState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 4 +-- dlls/d3d11/device.c | 84 ++++++++++++++++++++++++++-------------------- dlls/d3d11/state.c | 10 ++++-- 3 files changed, 56 insertions(+), 42 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 0743123..671a5b5 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -314,13 +314,13 @@ struct d3d_rasterizer_state LONG refcount; struct wined3d_private_store private_store; - D3D10_RASTERIZER_DESC desc; + D3D11_RASTERIZER_DESC desc; struct wine_rb_entry entry; ID3D11Device *device; }; HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, - const D3D10_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; + const D3D11_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; /* ID3D10SamplerState */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4d4cd6c..ed45ebe 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -309,9 +309,44 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Devi static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device *iface, const D3D11_RASTERIZER_DESC *desc, ID3D11RasterizerState **rasterizer_state) { - FIXME("iface %p, desc %p, rasterizer_state %p stub!\n", iface, desc, rasterizer_state); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_rasterizer_state *object; + struct wine_rb_entry *entry; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); + + if (!desc) + return E_INVALIDARG; + + wined3d_mutex_lock(); + if ((entry = wine_rb_get(&device->rasterizer_states, desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry); + + TRACE("Returning existing rasterizer state %p.\n", object); + *rasterizer_state = &object->ID3D11RasterizerState_iface; + ID3D11RasterizerState_AddRef(*rasterizer_state); + wined3d_mutex_unlock(); + + return S_OK; + } + wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) + { + WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created rasterizer state %p.\n", object); + *rasterizer_state = &object->ID3D11RasterizerState_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device *iface, @@ -1106,7 +1141,7 @@ static void STDMETHODCALLTYPE d3d10_device_DrawAuto(ID3D10Device1 *iface) static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device1 *iface, ID3D10RasterizerState *rasterizer_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - const D3D10_RASTERIZER_DESC *desc; + const D3D11_RASTERIZER_DESC *desc; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); @@ -2434,44 +2469,19 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device const D3D10_RASTERIZER_DESC *desc, ID3D10RasterizerState **rasterizer_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d_rasterizer_state *object; - struct wine_rb_entry *entry; + ID3D11RasterizerState *d3d11_rasterizer_state; HRESULT hr; TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); - if (!desc) - return E_INVALIDARG; - - wined3d_mutex_lock(); - if ((entry = wine_rb_get(&device->rasterizer_states, desc))) - { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry); - - TRACE("Returning existing rasterizer state %p.\n", object); - *rasterizer_state = &object->ID3D10RasterizerState_iface; - ID3D10RasterizerState_AddRef(*rasterizer_state); - wined3d_mutex_unlock(); - - return S_OK; - } - wined3d_mutex_unlock(); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) - { - WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d11_device_CreateRasterizerState(&device->ID3D11Device_iface, + (const D3D11_RASTERIZER_DESC *)desc, &d3d11_rasterizer_state))) return hr; - } - TRACE("Created rasterizer state %p.\n", object); - *rasterizer_state = &object->ID3D10RasterizerState_iface; - - return S_OK; + hr = ID3D11RasterizerState_QueryInterface(d3d11_rasterizer_state, + &IID_ID3D10RasterizerState, (void **)rasterizer_state); + ID3D11RasterizerState_Release(d3d11_rasterizer_state); + return hr; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device1 *iface, @@ -3099,8 +3109,8 @@ static const struct wine_rb_functions d3d10_depthstencil_state_rb_ops = static int d3d_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) { - const D3D10_RASTERIZER_DESC *ka = key; - const D3D10_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_rasterizer_state, entry)->desc; + const D3D11_RASTERIZER_DESC *ka = key; + const D3D11_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_rasterizer_state, entry)->desc; return memcmp(ka, kb, sizeof(*ka)); } diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index ac50acf..1adcdbd 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -466,7 +466,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateDataInterface( static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc(ID3D11RasterizerState *iface, D3D11_RASTERIZER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state->desc; } static const struct ID3D11RasterizerStateVtbl d3d11_rasterizer_state_vtbl = @@ -573,7 +577,7 @@ static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDesc(ID3D10RasterizerSta TRACE("iface %p, desc %p.\n", iface, desc); - *desc = state->desc; + memcpy(desc, &state->desc, sizeof(*desc)); } static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = @@ -592,7 +596,7 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = }; HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, - const D3D10_RASTERIZER_DESC *desc) + const D3D11_RASTERIZER_DESC *desc) { state->ID3D11RasterizerState_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl;

1 0

Józef Kucia : d3d11/tests: Port test_create_rasterizer_state() from d3d10core.
by Alexandre Julliard Oct. 1, 2015

Oct. 1, 2015

Module: wine Branch: master Commit: 934e4d1852dcadf0fa80d798ccb5ff7cf345ecfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=934e4d1852dcadf0fa80d798c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:58 2015 +0200 d3d11/tests: Port test_create_rasterizer_state() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d5b46a4..d2deffd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1469,6 +1469,86 @@ static void test_create_shader(void) } } +static void test_create_rasterizer_state(void) +{ + ID3D11RasterizerState *rast_state1, *rast_state2; + ID3D10RasterizerState *d3d10_rast_state; + ULONG refcount, expected_refcount; + D3D10_RASTERIZER_DESC d3d10_desc; + D3D11_RASTERIZER_DESC desc; + ID3D11Device *device, *tmp; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D11Device_CreateRasterizerState(device, NULL, &rast_state1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + desc.FillMode = D3D11_FILL_SOLID; + desc.CullMode = D3D11_CULL_BACK; + desc.FrontCounterClockwise = FALSE; + desc.DepthBias = 0; + desc.DepthBiasClamp = 0.0f; + desc.SlopeScaledDepthBias = 0.0f; + desc.DepthClipEnable = TRUE; + desc.ScissorEnable = FALSE; + desc.MultisampleEnable = FALSE; + desc.AntialiasedLineEnable = FALSE; + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateRasterizerState(device, &desc, &rast_state1); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + hr = ID3D11Device_CreateRasterizerState(device, &desc, &rast_state2); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ok(rast_state1 == rast_state2, "Got different rasterizer state objects.\n"); + 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; + ID3D11RasterizerState_GetDevice(rast_state1, &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); + ID3D11Device_Release(tmp); + + hr = ID3D11RasterizerState_QueryInterface(rast_state1, &IID_ID3D10RasterizerState, (void **)&d3d10_rast_state); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Rasterizer state should implement ID3D10RasterizerState.\n"); + if (SUCCEEDED(hr)) + { + ID3D10RasterizerState_GetDesc(d3d10_rast_state, &d3d10_desc); + ok(d3d10_desc.FillMode == D3D10_FILL_SOLID, "Got unexpected fill mode %u.\n", d3d10_desc.FillMode); + ok(d3d10_desc.CullMode == D3D10_CULL_BACK, "Got unexpected cull mode %u.\n", d3d10_desc.CullMode); + ok(!d3d10_desc.FrontCounterClockwise, "Got unexpected front counter clockwise %#x.\n", + d3d10_desc.FrontCounterClockwise); + ok(!d3d10_desc.DepthBias, "Got unexpected depth bias %d.\n", d3d10_desc.DepthBias); + ok(!d3d10_desc.DepthBiasClamp, "Got unexpected depth bias clamp %f.\n", d3d10_desc.DepthBiasClamp); + ok(!d3d10_desc.SlopeScaledDepthBias, "Got unexpected slope scaled depth bias %f.\n", + d3d10_desc.SlopeScaledDepthBias); + ok(!!d3d10_desc.DepthClipEnable, "Got unexpected depth clip enable %#x.\n", d3d10_desc.DepthClipEnable); + ok(!d3d10_desc.ScissorEnable, "Got unexpected scissor enable %#x.\n", d3d10_desc.ScissorEnable); + ok(!d3d10_desc.MultisampleEnable, "Got unexpected multisample enable %#x.\n", + d3d10_desc.MultisampleEnable); + ok(!d3d10_desc.AntialiasedLineEnable, "Got unexpected antialiased line enable %#x.\n", + d3d10_desc.AntialiasedLineEnable); + + refcount = ID3D10RasterizerState_Release(d3d10_rast_state); + ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + } + + refcount = ID3D11RasterizerState_Release(rast_state2); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + refcount = ID3D11RasterizerState_Release(rast_state1); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -1483,4 +1563,5 @@ START_TEST(d3d11) test_create_rendertarget_view(); test_create_shader_resource_view(); test_create_shader(); + test_create_rasterizer_state(); }

1 0