October 2015 - Wine-Commits

Andrew Eikum : xaudio2_8: Add 3D audio function stubs.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: f9860002f45e159f704af3dd41b6b24e1879c796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9860002f45e159f704af3dd4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 26 14:20:43 2015 -0500 xaudio2_8: Add 3D audio function stubs. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 ++-- dlls/x3daudio1_0/x3daudio1_0.spec | 4 ++-- dlls/x3daudio1_1/x3daudio1_1.spec | 4 ++-- dlls/x3daudio1_2/x3daudio1_2.spec | 4 ++-- dlls/x3daudio1_3/x3daudio1_3.spec | 4 ++-- dlls/x3daudio1_4/x3daudio1_4.spec | 4 ++-- dlls/x3daudio1_5/x3daudio1_5.spec | 4 ++-- dlls/x3daudio1_6/Makefile.in | 1 - dlls/x3daudio1_6/main.c | 7 ------- dlls/x3daudio1_6/x3daudio1_6.spec | 4 ++-- dlls/x3daudio1_7/Makefile.in | 2 +- dlls/x3daudio1_7/main.c | 26 +++----------------------- dlls/x3daudio1_7/x3daudio1_7.spec | 4 ++-- dlls/xaudio2_8/Makefile.in | 1 + dlls/xaudio2_8/xaudio2_8.spec | 2 ++ dlls/xaudio2_8/xaudio_dll.c | 28 ++++++++++++++++++++++++++++ 17 files changed, 55 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9860002f45e159f704af…

1 0

Ken Thomases : winemac: Fix how the user' s default display mode is determined.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: dbb0bacf6731304f074f492438982949449a5266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbb0bacf6731304f074f49243… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 26 23:39:06 2015 -0500 winemac: Fix how the user's default display mode is determined. The code had been checking the kDisplayModeDefaultFlag in the mode's IOFlags, but that doesn't do what I thought. That indicates which mode the driver considers to be the default for the hardware. It turns out there's no way to query the user's default mode. So, at the first opportunity during a given Wine session, the Mac driver queries the current display mode and assumes that's the user's default mode. It records that in a volatile registry key for use by subsequent processes during that same session. This doesn't use the existing registry key under HKEY_CURRENT_CONFIG\System\CurrentControlSet\Control\Video that records the mode when CDS_UPDATEREGISTRY is used with ChangeDisplaySettingsEx() -- which explorer.exe does during start-up -- because a) that doesn't support the distinction between pixel size and point size for Retina modes, and b) in theory, apps could overwrite that. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 282 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 278 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbb0bacf6731304f074f4…

1 0

Gediminas Jakutis : d3dx9: Add adjacency generation for D3DXCreateCylinder ().
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: 329fb2f72890b3f283b8d0d4e0e3cbb16a4b5a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=329fb2f72890b3f283b8d0d4e… Author: Gediminas Jakutis <gediminas(a)varciai.lt> Date: Mon Oct 26 20:15:50 2015 +0200 d3dx9: Add adjacency generation for D3DXCreateCylinder(). Signed-off-by: Gediminas Jakutis <gediminas(a)varciai.lt> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 39d279d..6294036 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4986,12 +4986,6 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1 return D3DERR_INVALIDCALL; } - if (adjacency) - { - FIXME("Case of adjacency != NULL not implemented.\n"); - return E_NOTIMPL; - } - number_of_vertices = 2 + (slices * (3 + stacks)); number_of_faces = 2 * slices + stacks * (2 * slices); @@ -5143,6 +5137,23 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1 free_sincos_table(&theta); cylinder->lpVtbl->UnlockIndexBuffer(cylinder); cylinder->lpVtbl->UnlockVertexBuffer(cylinder); + + if (adjacency) + { + if (FAILED(hr = D3DXCreateBuffer(number_of_faces * sizeof(DWORD) * 3, adjacency))) + { + cylinder->lpVtbl->Release(cylinder); + return hr; + } + + if (FAILED(hr = cylinder->lpVtbl->GenerateAdjacency(cylinder, 0.0f, (*adjacency)->lpVtbl->GetBufferPointer(*adjacency)))) + { + (*adjacency)->lpVtbl->Release(*adjacency); + cylinder->lpVtbl->Release(cylinder); + return hr; + } + } + *mesh = cylinder; return D3D_OK;

1 0

Andrew Eikum : mmdevapi: Fix win10 test failures.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: b1821266ca93af5e0a66986b0b3fadfb4a2072d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1821266ca93af5e0a66986b0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 26 08:37:38 2015 -0500 mmdevapi: Fix win10 test failures. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 35 ++++++----------------------------- dlls/mmdevapi/tests/render.c | 36 ++++++++++++++++++++++++------------ include/winerror.h | 1 + 3 files changed, 31 insertions(+), 41 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 702843c..afb99fc 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -38,6 +38,9 @@ #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) +/* undocumented error code */ +#define D3D11_ERROR_4E MAKE_HRESULT(SEVERITY_ERROR, FACILITY_DIRECT3D11, 0x4e) + static IMMDevice *dev = NULL; static const LARGE_INTEGER ullZero; @@ -83,7 +86,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) HRESULT hr; UINT32 frames, next, pad, sum = 0; BYTE *data; - DWORD flags, r; + DWORD flags; UINT64 pos, qpc; REFERENCE_TIME period; @@ -417,32 +420,6 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) IAudioCaptureClient_ReleaseBuffer(acc, frames); } - hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); - - ok(ResetEvent(handle), "ResetEvent\n"); - - /* Still receiving events! */ - r = WaitForSingleObject(handle, 20); - ok(r == WAIT_OBJECT_0, "Wait(event) after Stop gave %x\n", r); - - hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset failed: %08x\n", hr); - - ok(ResetEvent(handle), "ResetEvent\n"); - - r = WaitForSingleObject(handle, 120); - ok(r == WAIT_OBJECT_0, "Wait(event) after Reset gave %x\n", r); - - hr = IAudioClient_SetEventHandle(ac, NULL); - ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); - - r = WaitForSingleObject(handle, 70); - ok(r == WAIT_OBJECT_0, "Wait(NULL event) gave %x\n", r); - - hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); - IAudioCaptureClient_Release(acc); } @@ -593,7 +570,8 @@ static void test_audioclient(void) ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET, "Start before SetEventHandle returns %08x\n", hr); + ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET || + hr == D3D11_ERROR_4E /* win10 */, "Start before SetEventHandle returns %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, handle); ok(hr == S_OK, "SetEventHandle returns %08x\n", hr); @@ -847,7 +825,6 @@ static void test_simplevolume(void) hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); - ok(vol == 1.f, "Master volume wasn't 1: %f\n", vol); hr = ISimpleAudioVolume_SetMasterVolume(sav, -1.f, NULL); ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08x\n", hr); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 3a48c8d..be17a0d 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -54,9 +54,13 @@ static const unsigned int win_formats[][4] = { #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) +/* undocumented error code */ +#define D3D11_ERROR_4E MAKE_HRESULT(SEVERITY_ERROR, FACILITY_DIRECT3D11, 0x4e) + static IMMDeviceEnumerator *mme = NULL; static IMMDevice *dev = NULL; static HRESULT hexcl = S_OK; /* or AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED */ +static BOOL win10 = FALSE; static const LARGE_INTEGER ullZero; @@ -281,7 +285,8 @@ static void test_audioclient(void) fmtex->dwChannelMask = 0xffff; hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); + ok(hr == S_OK || + hr == AUDCLNT_E_UNSUPPORTED_FORMAT /* win10 */, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); IAudioClient_Release(ac); @@ -330,9 +335,12 @@ static void test_audioclient(void) ok(hr == S_OK, "Valid GetStreamLatency call returns %08x\n", hr); trace("Returned latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); - ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000), - "Latency < default period, delta %ldus\n", (long)((t2-t1)/10)); + ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000) || + broken(t2 == 0) /* (!) win10 */, + "Latency < default period, delta %ldus (%llu vs %llu)\n", (long)((t2-t1)/10), t2, t1); /* Native appears to add the engine period to the HW latency in shared mode */ + if(t2 == 0) + win10 = TRUE; hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); @@ -627,13 +635,15 @@ static void test_event(void) ok(event != NULL, "CreateEvent failed\n"); hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET, "Start failed: %08x\n", hr); + ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET || + hr == D3D11_ERROR_4E /* win10 */, "Start failed: %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, event); ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, event); - ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "SetEventHandle returns %08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || + hr == E_UNEXPECTED /* win10 */, "SetEventHandle returns %08x\n", hr); r = WaitForSingleObject(event, 40); ok(r == WAIT_TIMEOUT, "Wait(event) before Start gave %x\n", r); @@ -733,10 +743,13 @@ static void test_padding(void) hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); ok(buf != NULL, "NULL buffer returned\n"); - for(i = 0; i < psize * pwfx->nBlockAlign; ++i){ - if(buf[i] != silence){ - ok(0, "buffer has data in it already\n"); - break; + if(!win10){ + /* win10 appears not to clear the buffer */ + for(i = 0; i < psize * pwfx->nBlockAlign; ++i){ + if(buf[i] != silence){ + ok(0, "buffer has data in it already, i: %u, valu: %f\n", i, *((float*)buf)); + break; + } } } @@ -910,7 +923,8 @@ static void test_clock(int share) hr = IAudioClient_GetStreamLatency(ac, &t2); ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); trace("Latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); - ok(t2 >= period || broken(t2 >= period/2 && share && pwfx->nSamplesPerSec > 48000), + ok(t2 >= period || broken(t2 >= period/2 && share && pwfx->nSamplesPerSec > 48000) || + broken(t2 == 0) /* win10 */, "Latency < default period, delta %ldus\n", (long)((t2-period)/10)); /** GetBufferSize @@ -1972,7 +1986,6 @@ static void test_session_creation(void) vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); - ok(vol == 1.f, "Got wrong volume: %f\n", vol); ISimpleAudioVolume_Release(cap_sav); IAudioSessionManager_Release(cap_sesm); @@ -2001,7 +2014,6 @@ static void test_session_creation(void) vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); - ok(vol == 1.f, "Got wrong volume: %f\n", vol); ISimpleAudioVolume_Release(cap_sav); } diff --git a/include/winerror.h b/include/winerror.h index e9cc7be..ba9e245 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -59,6 +59,7 @@ #define FACILITY_PLA 48 #define FACILITY_FVE 49 #define FACILITY_WINDOWS_DEFENDER 80 +#define FACILITY_DIRECT3D11 0x87c #define SEVERITY_SUCCESS 0 #define SEVERITY_ERROR 1

1 0

Francois Gouget : oleaut32: Add V_RECORD() and V_RECORDINFO() and use them for wine_dbgstr_variant().
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: be3fea546d2c0c99726074326e0189ddd829e792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3fea546d2c0c99726074326… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 27 11:58:14 2015 +0100 oleaut32: Add V_RECORD() and V_RECORDINFO() and use them for wine_dbgstr_variant(). This fixes the wine_dbgstr_variant() compatibility with non __STDC__ compilers and source code that defines _FORCENAMELESSUNION. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oleauto.h | 12 ++++++++---- include/wine/debug.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/oleauto.h b/include/oleauto.h index f9862e7..07c46ad 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -105,11 +105,15 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFGUID,IRecordIn /* Macros for accessing the fields of the VARIANT type */ #if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) -#define V_UNION(A,B) ((A)->n1.n2.n3.B) -#define V_VT(A) ((A)->n1.n2.vt) +#define V_VT(A) ((A)->n1.n2.vt) +#define V_UNION(A,B) ((A)->n1.n2.n3.B) +#define V_RECORD(A) (V_UNION(A,brecVal).pvRecord) +#define V_RECORDINFO(A) (V_UNION(A,brecVal).pRecInfo) #else -#define V_UNION(A,B) ((A)->B) -#define V_VT(A) ((A)->vt) +#define V_VT(A) ((A)->vt) +#define V_UNION(A,B) ((A)->B) +#define V_RECORD(A) ((A)->pvRecord) +#define V_RECORDINFO(A) ((A)->pRecInfo) #endif #define V_ISBYREF(A) (V_VT(A) & VT_BYREF) diff --git a/include/wine/debug.h b/include/wine/debug.h index 241e79b..af5483c 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -331,7 +331,7 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) case VT_VOID: return wine_dbg_sprintf( "%p {VT_VOID}", v ); case VT_RECORD: - return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo ); + return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_RECORD(v), V_RECORDINFO(v) ); default: return wine_dbg_sprintf( "%p {vt %s}", v, wine_dbgstr_vt(V_VT(v)) ); }

1 0

Józef Kucia : include: Add D3D11_QUERY_MISC_FLAG declaration.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: dd2c14462e341f3488d06fa69e1e6a4bd3dd7d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2c14462e341f3488d06fa69… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:34 2015 +0100 include: Add D3D11_QUERY_MISC_FLAG declaration. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 991070e..cf8d93d 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -528,6 +528,11 @@ typedef enum D3D11_QUERY D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3, } D3D11_QUERY; +typedef enum D3D11_QUERY_MISC_FLAG +{ + D3D11_QUERY_MISC_PREDICATEHINT = 0x1, +} D3D11_QUERY_MISC_FLAG; + typedef enum D3D11_ASYNC_GETDATA_FLAG { D3D11_ASYNC_GETDATA_DONOTFLUSH = 0x0001,

1 0

Francois Gouget : oleview: Remove an unneeded NONAMELESSUNION define.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: a96f7f13ced34c693c94a2b18f26c2188a3fa9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96f7f13ced34c693c94a2b18… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 27 11:58:32 2015 +0100 oleview: Remove an unneeded NONAMELESSUNION define. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/typelib.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 3a60348..04b9067 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "main.h" #include "wine/debug.h"

1 0

Alexandre Julliard : makefiles: Generate rules for building tool binaries.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: 7626728b562fae32f6d0f0c5d01589e5861f09dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7626728b562fae32f6d0f0c5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 12:13:26 2015 +0900 makefiles: Generate rules for building tool binaries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 ++- configure.ac | 3 ++- server/Makefile.in | 4 +++- tools/Makefile.in | 8 ++------ tools/make_makefiles | 1 + tools/makedep.c | 46 ++++++++++++++++++++++++++++++++++++++++++--- tools/sfnt2fon/Makefile.in | 7 ++----- tools/widl/Makefile.in | 9 +++------ tools/winebuild/Makefile.in | 9 ++------- tools/winedump/Makefile.in | 9 ++------- tools/winegcc/Makefile.in | 12 +++++------- tools/wmc/Makefile.in | 8 ++------ tools/wrc/Makefile.in | 8 ++------ 13 files changed, 71 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7626728b562fae32f6d0f…

1 0

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

Oct. 27, 2015

Module: wine Branch: master Commit: e958d49b067fad4c562fdb09d3444b3ebebff097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e958d49b067fad4c562fdb09d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:30 2015 +0100 d3d11: Implement d3d11_device_CreatePredicate(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 55 ++++++++++++++++++++++++++++++++++++++-------- dlls/d3d11/d3d11_private.h | 4 +++- dlls/d3d11/device.c | 34 +++++++++++----------------- 3 files changed, 62 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 172a7e6..3b9bb81 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -304,20 +304,20 @@ struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) } HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, - const D3D10_QUERY_DESC *desc, BOOL predicate) + const D3D11_QUERY_DESC *desc, BOOL predicate) { HRESULT hr; static const enum wined3d_query_type query_type_map[] = { - /* D3D10_QUERY_EVENT */ WINED3D_QUERY_TYPE_EVENT, - /* D3D10_QUERY_OCCLUSION */ WINED3D_QUERY_TYPE_OCCLUSION, - /* D3D10_QUERY_TIMESTAMP */ WINED3D_QUERY_TYPE_TIMESTAMP, - /* D3D10_QUERY_TIMESTAMP_DISJOINT */ WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT, - /* D3D10_QUERY_PIPELINE_STATISTICS */ WINED3D_QUERY_TYPE_PIPELINE_STATISTICS, - /* D3D10_QUERY_OCCLUSION_PREDICATE */ WINED3D_QUERY_TYPE_OCCLUSION, - /* D3D10_QUERY_SO_STATISTICS */ WINED3D_QUERY_TYPE_SO_STATISTICS, - /* D3D10_QUERY_SO_OVERFLOW_PREDICATE */ WINED3D_QUERY_TYPE_SO_OVERFLOW, + /* D3D11_QUERY_EVENT */ WINED3D_QUERY_TYPE_EVENT, + /* D3D11_QUERY_OCCLUSION */ WINED3D_QUERY_TYPE_OCCLUSION, + /* D3D11_QUERY_TIMESTAMP */ WINED3D_QUERY_TYPE_TIMESTAMP, + /* D3D11_QUERY_TIMESTAMP_DISJOINT */ WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT, + /* D3D11_QUERY_PIPELINE_STATISTICS */ WINED3D_QUERY_TYPE_PIPELINE_STATISTICS, + /* D3D11_QUERY_OCCLUSION_PREDICATE */ WINED3D_QUERY_TYPE_OCCLUSION, + /* D3D11_QUERY_SO_STATISTICS */ WINED3D_QUERY_TYPE_SO_STATISTICS, + /* D3D11_QUERY_SO_OVERFLOW_PREDICATE */ WINED3D_QUERY_TYPE_SO_OVERFLOW, }; if (desc->Query >= sizeof(query_type_map) / sizeof(*query_type_map)) @@ -351,3 +351,40 @@ HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, return S_OK; } + +HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate, + struct d3d_query **query) +{ + struct d3d_query *object; + HRESULT hr; + + if (!desc) + return E_INVALIDARG; + + if (predicate + && desc->Query != D3D11_QUERY_OCCLUSION_PREDICATE + && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE + && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0 + && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1 + && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 + && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3) + { + WARN("Query type %u is not a predicate.\n", desc->Query); + return E_INVALIDARG; + } + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_query_init(object, device, desc, predicate))) + { + WARN("Failed to initialize predicate, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created predicate %p.\n", object); + *query = object; + + return S_OK; +} diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 7cb9ca6..722f266 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -364,7 +364,9 @@ struct d3d_query }; HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, - const D3D10_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN; + const D3D11_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN; +HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate, + struct d3d_query **query) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; /* ID3D11DeviceContext - immediate context */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 58269d3..f5aca82 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1593,9 +1593,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device *iface, static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device *iface, const D3D11_QUERY_DESC *desc, ID3D11Predicate **predicate) { - FIXME("iface %p, desc %p, predicate %p stub!\n", iface, desc, predicate); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_query *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, predicate %p.\n", iface, desc, predicate); + + if (FAILED(hr = d3d_query_create(device, desc, TRUE, &object))) + return hr; + + *predicate = (ID3D11Predicate *)&object->ID3D11Query_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device *iface, const D3D11_COUNTER_DESC *desc, @@ -3720,7 +3729,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d_query_init(object, device, desc, FALSE))) + if (FAILED(hr = d3d_query_init(object, device, (const D3D11_QUERY_DESC *)desc, FALSE))) { WARN("Failed to initialize query, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -3742,26 +3751,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa TRACE("iface %p, desc %p, predicate %p.\n", iface, desc, predicate); - if (!desc) - return E_INVALIDARG; - - if (desc->Query != D3D10_QUERY_OCCLUSION_PREDICATE && desc->Query != D3D10_QUERY_SO_OVERFLOW_PREDICATE) - { - WARN("Query type %#x is not a predicate.\n", desc->Query); - return E_INVALIDARG; - } - - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_query_init(object, device, desc, TRUE))) - { - WARN("Failed to initialize predicate, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_query_create(device, (const D3D11_QUERY_DESC *)desc, TRUE, &object))) return hr; - } - TRACE("Created predicate %p.\n", object); *predicate = (ID3D10Predicate *)&object->ID3D10Query_iface; return S_OK;

1 0

Józef Kucia : d3d11: Add ID3D11Query interface stub.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: d86ee74b80d02c0f2278efaa07629ebebb499413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d86ee74b80d02c0f2278efaa0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:29 2015 +0100 d3d11: Add ID3D11Query interface stub. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 157 +++++++++++++++++++++++++++++++++++++++------ dlls/d3d11/d3d11_private.h | 5 +- 2 files changed, 139 insertions(+), 23 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 8f691a2..172a7e6 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -24,27 +24,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static inline struct d3d_query *impl_from_ID3D10Query(ID3D10Query *iface) +/* ID3D11Query methods */ + +static inline struct d3d_query *impl_from_ID3D11Query(ID3D11Query *iface) { - return CONTAINING_RECORD(iface, struct d3d_query, ID3D10Query_iface); + return CONTAINING_RECORD(iface, struct d3d_query, ID3D11Query_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE d3d11_query_QueryInterface(ID3D11Query *iface, REFIID riid, void **object) { - struct d3d_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D11Query(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + if ((IsEqualGUID(riid, &IID_ID3D11Predicate) && query->predicate) + || IsEqualGUID(riid, &IID_ID3D11Query) + || IsEqualGUID(riid, &IID_ID3D11Asynchronous) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11Query_AddRef(iface); + *object = iface; + return S_OK; + } + if ((IsEqualGUID(riid, &IID_ID3D10Predicate) && query->predicate) || IsEqualGUID(riid, &IID_ID3D10Query) || IsEqualGUID(riid, &IID_ID3D10Asynchronous) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) - || IsEqualGUID(riid, &IID_IUnknown)) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) { - IUnknown_AddRef(iface); - *object = iface; + ID3D10Query_AddRef(&query->ID3D10Query_iface); + *object = &query->ID3D10Query_iface; return S_OK; } @@ -54,26 +64,26 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) +static ULONG STDMETHODCALLTYPE d3d11_query_AddRef(ID3D11Query *iface) { - struct d3d_query *This = impl_from_ID3D10Query(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_query *query = impl_from_ID3D11Query(iface); + ULONG refcount = InterlockedIncrement(&query->refcount); - TRACE("%p increasing refcount to %u.\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", query, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) +static ULONG STDMETHODCALLTYPE d3d11_query_Release(ID3D11Query *iface) { - struct d3d_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D11Query(iface); ULONG refcount = InterlockedDecrement(&query->refcount); TRACE("%p decreasing refcount to %u.\n", query, refcount); if (!refcount) { - ID3D10Device1_Release(query->device); + ID3D11Device_Release(query->device); wined3d_mutex_lock(); wined3d_query_decref(query->wined3d_query); wined3d_private_store_cleanup(&query->private_store); @@ -84,6 +94,111 @@ static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) return refcount; } +static void STDMETHODCALLTYPE d3d11_query_GetDevice(ID3D11Query *iface, ID3D11Device **device) +{ + struct d3d_query *query = impl_from_ID3D11Query(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = query->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_query_GetPrivateData(ID3D11Query *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_query *query = impl_from_ID3D11Query(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&query->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_query_SetPrivateData(ID3D11Query *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_query *query = impl_from_ID3D11Query(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&query->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_query_SetPrivateDataInterface(ID3D11Query *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_query *query = impl_from_ID3D11Query(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&query->private_store, guid, data); +} + +static UINT STDMETHODCALLTYPE d3d11_query_GetDataSize(ID3D11Query *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static void STDMETHODCALLTYPE d3d11_query_GetDesc(ID3D11Query *iface, D3D11_QUERY_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D11QueryVtbl d3d11_query_vtbl = +{ + /* IUnknown methods */ + d3d11_query_QueryInterface, + d3d11_query_AddRef, + d3d11_query_Release, + /* ID3D11DeviceChild methods */ + d3d11_query_GetDevice, + d3d11_query_GetPrivateData, + d3d11_query_SetPrivateData, + d3d11_query_SetPrivateDataInterface, + /* ID3D11Asynchronous methods */ + d3d11_query_GetDataSize, + /* ID3D11Query methods */ + d3d11_query_GetDesc, +}; + +/* ID3D10Query methods */ + +static inline struct d3d_query *impl_from_ID3D10Query(ID3D10Query *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_query, ID3D10Query_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object) +{ + struct d3d_query *query = impl_from_ID3D10Query(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_query_QueryInterface(&query->ID3D11Query_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) +{ + struct d3d_query *query = impl_from_ID3D10Query(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_query_AddRef(&query->ID3D11Query_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) +{ + struct d3d_query *query = impl_from_ID3D10Query(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_query_Release(&query->ID3D11Query_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10Device **device) @@ -92,8 +207,7 @@ static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10De TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)query->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(query->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, @@ -215,6 +329,7 @@ HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, if (desc->MiscFlags) FIXME("Ignoring MiscFlags %#x.\n", desc->MiscFlags); + query->ID3D11Query_iface.lpVtbl = &d3d11_query_vtbl; query->ID3D10Query_iface.lpVtbl = &d3d10_query_vtbl; query->refcount = 1; wined3d_mutex_lock(); @@ -231,8 +346,8 @@ HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, wined3d_mutex_unlock(); query->predicate = predicate; - query->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(query->device); + query->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(query->device); return S_OK; } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 104b898..7cb9ca6 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -350,16 +350,17 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic const D3D11_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; -/* ID3D10Query */ +/* ID3D11Query, ID3D10Query */ struct d3d_query { + ID3D11Query ID3D11Query_iface; ID3D10Query ID3D10Query_iface; LONG refcount; struct wined3d_private_store private_store; struct wined3d_query *wined3d_query; BOOL predicate; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device,

1 0