February 2019 - Wine-Commits

Nikolay Sivov : mfreadwrite: Add CreateInstanceFromObject() stub for source reader.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 50cef89646ca838175ce45eb05c9fedcf45a6f2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=50cef89646ca838175ce45eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 22 10:36:49 2019 +0300 mfreadwrite: Add CreateInstanceFromObject() stub for source reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 98 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 79 insertions(+), 19 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 77dbd7b..dcacd9a 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -28,10 +28,14 @@ #include "ole2.h" #include "rpcproxy.h" #include "mfreadwrite.h" +#include "mfidl.h" #include "wine/debug.h" +#include "wine/heap.h" DEFINE_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f); +DEFINE_GUID(CLSID_MFSourceReader, 0x1777133c, 0x0881, 0x411b, 0xa5, 0x77, 0xad, 0x54, 0x5f, 0x07, 0x14, 0xc4); +DEFINE_GUID(CLSID_MFSinkWriter, 0xa3bbfb17, 0x8273, 0x4e52, 0x9e, 0x0e, 0x97, 0x39, 0xdc, 0x88, 0x79, 0x90); WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -52,15 +56,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } - -HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, - IMFSourceReader **reader) -{ - FIXME("%p %p %p stub.\n", source, attributes, reader); - - return E_NOTIMPL; -} - HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; @@ -228,21 +223,52 @@ struct IMFSourceReaderVtbl srcreader_vtbl = src_reader_GetPresentationAttribute }; -HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes, IMFSourceReader **reader) +static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttributes *attributes, + REFIID riid, void **out) { srcreader *object; + HRESULT hr; - TRACE("%p, %p, %p\n", stream, attributes, reader); - - object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); - if(!object) + object = heap_alloc(sizeof(*object)); + if (!object) return E_OUTOFMEMORY; - object->ref = 1; object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; + object->ref = 1; - *reader = &object->IMFSourceReader_iface; - return S_OK; + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); + IMFSourceReader_Release(&object->IMFSourceReader_iface); + return hr; +} + +static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttributes *attributes, + REFIID riid, void **out) +{ + /* FIXME: resolve bytestream to media source */ + + return create_source_reader_from_source(NULL, attributes, riid, out); +} + +/*********************************************************************** + * MFCreateSourceReaderFromByteStream (mfreadwrite.@) + */ +HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes, + IMFSourceReader **reader) +{ + TRACE("%p, %p, %p.\n", stream, attributes, reader); + + return create_source_reader_from_stream(stream, attributes, &IID_IMFSourceReader, (void **)reader); +} + +/*********************************************************************** + * MFCreateSourceReaderFromMediaSource (mfreadwrite.@) + */ +HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, + IMFSourceReader **reader) +{ + TRACE("%p, %p, %p.\n", source, attributes, reader); + + return create_source_reader_from_source(source, attributes, &IID_IMFSourceReader, (void **)reader); } static HRESULT WINAPI readwrite_factory_QueryInterface(IMFReadWriteClassFactory *iface, REFIID riid, void **out) @@ -281,9 +307,43 @@ static HRESULT WINAPI readwrite_factory_CreateInstanceFromURL(IMFReadWriteClassF static HRESULT WINAPI readwrite_factory_CreateInstanceFromObject(IMFReadWriteClassFactory *iface, REFCLSID clsid, IUnknown *unk, IMFAttributes *attributes, REFIID riid, void **out) { - FIXME("%s, %p, %p, %s, %p.\n", debugstr_guid(clsid), unk, attributes, debugstr_guid(riid), out); + HRESULT hr; - return E_NOTIMPL; + TRACE("%s, %p, %p, %s, %p.\n", debugstr_guid(clsid), unk, attributes, debugstr_guid(riid), out); + + if (IsEqualGUID(clsid, &CLSID_MFSourceReader)) + { + IMFMediaSource *source = NULL; + IMFByteStream *stream = NULL; + + hr = IUnknown_QueryInterface(unk, &IID_IMFByteStream, (void **)&stream); + if (FAILED(hr)) + hr = IUnknown_QueryInterface(unk, &IID_IMFMediaSource, (void **)&source); + + if (stream) + hr = create_source_reader_from_stream(stream, attributes, riid, out); + else if (source) + hr = create_source_reader_from_source(source, attributes, riid, out); + + if (source) + IMFMediaSource_Release(source); + if (stream) + IMFByteStream_Release(stream); + + return hr; + } + else if (IsEqualGUID(clsid, &CLSID_MFSinkWriter)) + { + FIXME("MFSinkWriter is not supported.\n"); + *out = NULL; + return E_NOTIMPL; + } + else + { + WARN("Unsupported class %s.\n", debugstr_guid(clsid)); + *out = NULL; + return E_FAIL; + } } static const IMFReadWriteClassFactoryVtbl readwrite_factory_vtbl =

1 0

Michael Stefaniuc : ddraw/tests: Remove redundant not NULL check ( coccinellery).
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 74111f38829e0c92c7b5f3f748518a20973fc0ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=74111f38829e0c92c7b5f3f7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 20 20:54:24 2019 +0100 ddraw/tests: Remove redundant not NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ceb1f83..d0ed33d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5246,7 +5246,7 @@ cleanup: if (gl) FreeLibrary(gl); if (hdc) ReleaseDC(window, hdc); if (hdc2) ReleaseDC(window2, hdc2); - if (window) DestroyWindow(window); + DestroyWindow(window); if (window2) DestroyWindow(window2); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index db67afa..37238e1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6271,7 +6271,7 @@ cleanup: if (gl) FreeLibrary(gl); if (hdc) ReleaseDC(window, hdc); if (hdc2) ReleaseDC(window2, hdc2); - if (window) DestroyWindow(window); + DestroyWindow(window); if (window2) DestroyWindow(window2); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index dbba9b5..b60606f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7785,7 +7785,7 @@ cleanup: if (gl) FreeLibrary(gl); if (hdc) ReleaseDC(window, hdc); if (hdc2) ReleaseDC(window2, hdc2); - if (window) DestroyWindow(window); + DestroyWindow(window); if (window2) DestroyWindow(window2); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 215e1c7..3339b32 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7615,7 +7615,7 @@ cleanup: if (gl) FreeLibrary(gl); if (hdc) ReleaseDC(window, hdc); if (hdc2) ReleaseDC(window2, hdc2); - if (window) DestroyWindow(window); + DestroyWindow(window); if (window2) DestroyWindow(window2); }

1 0

Matteo Bruni : d3d9/tests: Fix device tests on Windows 10.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: f3ca766ec31da204b93d76d89a8c30a3c3575e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3ca766ec31da204b93d76d8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 20 18:41:12 2019 +0100 d3d9/tests: Fix device tests on Windows 10. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 17e3b5d..7d8b4fd 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4085,8 +4085,12 @@ static void test_wndproc(void) flush_events(); /* Releasing a device in lost state breaks follow-up tests on native. */ - hr = reset_device(device, &device_desc); - ok(SUCCEEDED(hr), "Failed to reset device, hr %#x, i=%u.\n", hr, i); + hr = IDirect3DDevice9_TestCooperativeLevel(device); + if (hr == D3DERR_DEVICENOTRESET) + { + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x, i=%u.\n", hr, i); + } filter_messages = focus_window; @@ -4184,7 +4188,8 @@ static void test_wndproc(void) "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); expect_messages = NULL; - filter_messages = focus_window; + /* On Windows 10 style change messages are delivered both on reset and + * on release. */ hr = IDirect3DDevice9_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); @@ -4194,6 +4199,7 @@ static void test_wndproc(void) ref = IDirect3DDevice9_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u, i=%u.\n", ref, i); + filter_messages = focus_window; device_desc.device_window = device_window; if (!(device = create_device(d3d9, focus_window, &device_desc))) { @@ -4828,11 +4834,13 @@ static void test_window_style(void) style = GetWindowLongA(device_window, GWL_STYLE); expected_style = device_style | tests[i].style; - todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", + todo_wine ok(style == expected_style || broken(style == (expected_style & 0xff000000)), + "Expected device window style %#x, got %#x, i=%u.\n", expected_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); expected_style = device_exstyle | tests[i].exstyle; - todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", + todo_wine ok(style == expected_style || broken(style == (expected_style & 0xff)), + "Expected device window extended style %#x, got %#x, i=%u.\n", expected_style, style, i); style = GetWindowLongA(focus_window, GWL_STYLE); @@ -4850,7 +4858,8 @@ static void test_window_style(void) ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s, i=%u.\n", wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r), i); GetClientRect(device_window, &r2); - todo_wine ok(!EqualRect(&r, &r2), "Client rect and window rect are equal.\n"); + todo_wine ok(!EqualRect(&r, &r2) || broken(!(style & WS_THICKFRAME)), + "Client rect and window rect are equal, i=%u.\n", i); GetWindowRect(focus_window, &r); ok(EqualRect(&r, &focus_rect), "Expected %s, got %s, i=%u.\n", wine_dbgstr_rect(&focus_rect), wine_dbgstr_rect(&r), i);

1 0

Matteo Bruni : d3d8/tests: Add a test for Reset() with bound DEFAULT resources.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: e2ffbf2e483889d4429bd2405c79875245a0a8b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2ffbf2e483889d4429bd240… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 20 18:41:10 2019 +0100 d3d8/tests: Add a test for Reset() with bound DEFAULT resources. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 39a2359..4dbe168 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1327,6 +1327,7 @@ static void test_reset(void) IDirect3D8 *d3d8; RECT winrect, client_rect; D3DVIEWPORT8 vp; + ULONG refcount; D3DCAPS8 caps; DWORD shader; DWORD value; @@ -1695,6 +1696,46 @@ static void test_reset(void) skip("Volume textures not supported.\n"); } + /* Test with DEFAULT pool resources bound but otherwise not referenced. */ + hr = IDirect3DDevice8_CreateVertexBuffer(device1, 16, 0, + D3DFVF_XYZ, D3DPOOL_DEFAULT, &vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device1, 0, vb, 16); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDirect3DVertexBuffer8_Release(vb); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + hr = IDirect3DDevice8_CreateIndexBuffer(device1, 16, 0, + D3DFMT_INDEX16, D3DPOOL_DEFAULT, &ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetIndices(device1, ib, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDirect3DIndexBuffer8_Release(ib); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + hr = IDirect3DDevice8_CreateTexture(device1, 16, 16, 0, 0, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device1, i, (IDirect3DBaseTexture8 *)texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device1); + ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + + /* Crashes on Windows. */ + if (0) + { + hr = IDirect3DDevice8_GetIndices(device1, &ib, &i); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + refcount = IDirect3DTexture8_Release(texture); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + /* Scratch, sysmem and managed pool resources are fine. */ hr = IDirect3DDevice8_CreateTexture(device1, 16, 16, 1, 0, D3DFMT_R5G6B5, D3DPOOL_SCRATCH, &texture); ok(SUCCEEDED(hr), "CreateTexture failed, hr %#x.\n", hr);

1 0

Matteo Bruni : d3d9/tests: Add a D3D9Ex test for Reset() with bound resources.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 1b8c864cfe9c7c5236cb72219c17daf6caf38968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b8c864cfe9c7c5236cb7221… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 20 18:41:11 2019 +0100 d3d9/tests: Add a D3D9Ex test for Reset() with bound resources. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 132ce03..81dd591 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -922,13 +922,16 @@ static void test_reset(void) DWORD height, orig_height = GetSystemMetrics(SM_CYSCREEN); DWORD width, orig_width = GetSystemMetrics(SM_CXSCREEN); + UINT i, adapter_mode_count, offset, stride; + IDirect3DVertexBuffer9 *vb, *cur_vb; + IDirect3DIndexBuffer9 *ib, *cur_ib; IDirect3DVertexShader9 *shader; IDirect3DSwapChain9 *swapchain; D3DDISPLAYMODE d3ddm, d3ddm2; D3DPRESENT_PARAMETERS d3dpp; IDirect3DDevice9Ex *device; IDirect3DSurface9 *surface; - UINT i, adapter_mode_count; + IDirect3DTexture9 *texture; DEVMODEW devmode; IDirect3D9 *d3d9; D3DVIEWPORT9 vp; @@ -1303,6 +1306,45 @@ static void test_reset(void) skip("Volume textures not supported.\n"); } + /* Test with resources bound but otherwise not referenced. */ + hr = IDirect3DDevice9Ex_CreateVertexBuffer(device, 16, 0, + D3DFVF_XYZ, D3DPOOL_DEFAULT, &vb, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_SetStreamSource(device, 0, vb, 0, 16); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDirect3DVertexBuffer9_Release(vb); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + hr = IDirect3DDevice9Ex_CreateIndexBuffer(device, 16, 0, + D3DFMT_INDEX16, D3DPOOL_DEFAULT, &ib, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_SetIndices(device, ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDirect3DIndexBuffer9_Release(ib); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + hr = IDirect3DDevice9Ex_CreateTexture(device, 16, 16, 0, 0, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_SetTexture(device, i, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_Reset(device, &d3dpp); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_GetIndices(device, &cur_ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(cur_ib == ib, "Unexpected index buffer %p.\n", cur_ib); + refcount = IDirect3DIndexBuffer9_Release(ib); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + hr = IDirect3DDevice9Ex_GetStreamSource(device, 0, &cur_vb, &offset, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(cur_vb == vb, "Unexpected index buffer %p.\n", cur_ib); + ok(!offset, "Unexpected offset %u.\n", offset); + ok(stride == 16, "Unexpected stride %u.\n", stride); + refcount = IDirect3DVertexBuffer9_Release(vb); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + refcount = IDirect3DTexture9_Release(texture); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + /* Scratch and sysmem pools are fine too. */ hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 16, 16, D3DFMT_R5G6B5, D3DPOOL_SCRATCH, &surface, NULL);

1 0

Sven Baars : wined3d: Remove a redundant adapter_count check (Coverity).
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 236d3c5df8e0aa209652598e7d93ce0e5c162ccf URL: https://source.winehq.org/git/wine.git/?a=commit;h=236d3c5df8e0aa209652598e… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Feb 20 19:26:52 2019 +0100 wined3d: Remove a redundant adapter_count check (Coverity). It is already tested that adapter_idx < wined3d->adapter_count before calling device_init, so adapter_count can never be zero. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d9d6cf2..67680ac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5336,7 +5336,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->ref = 1; device->wined3d = wined3d; wined3d_incref(device->wined3d); - device->adapter = wined3d->adapter_count ? adapter : NULL; + device->adapter = adapter; device->device_parent = device_parent; list_init(&device->resources); list_init(&device->shaders);

1 0

Zebediah Figura : wined3d: Rename MAX_STREAMS to WINED3D_MAX_STREAMS.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 7561ded004d88d397934b201d7762a82a86e2093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7561ded004d88d397934b201… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 20 14:53:56 2019 -0600 wined3d: Rename MAX_STREAMS to WINED3D_MAX_STREAMS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/directx.c | 2 +- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 67680ac..774d713 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1368,7 +1368,7 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI TRACE("device %p, stream_idx %u, buffer %p, offset %u, stride %u.\n", device, stream_idx, buffer, offset, stride); - if (stream_idx >= MAX_STREAMS) + if (stream_idx >= WINED3D_MAX_STREAMS) { WARN("Stream index %u out of range.\n", stream_idx); return WINED3DERR_INVALIDCALL; @@ -1423,7 +1423,7 @@ HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *devi TRACE("device %p, stream_idx %u, buffer %p, offset %p, stride %p.\n", device, stream_idx, buffer, offset, stride); - if (stream_idx >= MAX_STREAMS) + if (stream_idx >= WINED3D_MAX_STREAMS) { WARN("Stream index %u out of range.\n", stream_idx); return WINED3DERR_INVALIDCALL; @@ -5249,7 +5249,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso break; case WINED3D_RTYPE_BUFFER: - for (i = 0; i < MAX_STREAMS; ++i) + for (i = 0; i < WINED3D_MAX_STREAMS; ++i) { if (&device->state.streams[i].buffer->resource == resource) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 827d4f6..0c70f04 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2210,7 +2210,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxPrimitiveCount = 0x555555; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ caps->MaxVertexIndex = 0xffffff; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ - caps->MaxStreams = MAX_STREAMS; + caps->MaxStreams = WINED3D_MAX_STREAMS; caps->MaxStreamStride = 1024; /* d3d9.dll sets D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES here because StretchRects is implemented in d3d9 */ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index cd72209..3dfd368 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -457,7 +457,7 @@ void state_unbind_resources(struct wined3d_state *state) } } - for (i = 0; i < MAX_STREAMS; ++i) + for (i = 0; i < WINED3D_MAX_STREAMS; ++i) { if ((buffer = state->streams[i].buffer)) { @@ -535,7 +535,7 @@ void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) wined3d_vertex_declaration_decref(decl); } - for (i = 0; i < MAX_STREAMS; ++i) + for (i = 0; i < WINED3D_MAX_STREAMS; ++i) { if ((buffer = state->streams[i].buffer)) { @@ -1480,7 +1480,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->blend_factor.b = 1.0f; state->blend_factor.a = 1.0f; - for (i = 0; i < MAX_STREAMS; ++i) + for (i = 0; i < WINED3D_MAX_STREAMS; ++i) state->streams[i].frequency = 1; } @@ -1531,7 +1531,7 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state state->blend_factor.b = 1.0f; state->blend_factor.a = 1.0f; - for (i = 0; i < MAX_STREAMS; ++i) + for (i = 0; i < WINED3D_MAX_STREAMS; ++i) state->streams[i].frequency = 1; } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 863366b..cd8bb5e 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -217,7 +217,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara /* Find the streams used in the declaration. The vertex buffers have * to be loaded when drawing, but filter tesselation pseudo streams. */ - if (e->input_slot >= MAX_STREAMS) + if (e->input_slot >= WINED3D_MAX_STREAMS) continue; if (!(e->format->flags[WINED3D_GL_RES_TYPE_BUFFER] & WINED3DFMT_FLAG_VERTEX_ATTRIBUTE)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a8ba1d0..76aedd5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -258,7 +258,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup } /* Device caps */ -#define MAX_STREAMS 16 +#define WINED3D_MAX_STREAMS 16 #define MAX_TEXTURES 8 #define MAX_FRAGMENT_SAMPLERS 16 #define MAX_VERTEX_SAMPLERS 4 @@ -2909,7 +2909,7 @@ struct wined3d_state struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; - struct wined3d_stream_state streams[MAX_STREAMS + 1 /* tesselated pseudo-stream */]; + struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1 /* tesselated pseudo-stream */]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; unsigned int index_offset; @@ -2978,7 +2978,7 @@ struct wined3d_dummy_textures struct wined3d_stateblock_state { struct wined3d_vertex_declaration *vertex_declaration; - struct wined3d_stream_state streams[MAX_STREAMS + 1]; + struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; int base_vertex_index; @@ -3566,8 +3566,8 @@ struct wined3d_vertex_declaration struct wined3d_saved_states { DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1]; - WORD streamSource; /* MAX_STREAMS, 16 */ - WORD streamFreq; /* MAX_STREAMS, 16 */ + WORD streamSource; /* WINED3D_MAX_STREAMS, 16 */ + WORD streamFreq; /* WINED3D_MAX_STREAMS, 16 */ DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1]; DWORD textureState[MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ WORD samplerState[MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */

1 0

Zebediah Figura : wined3d: Rename MAX_TEXTURES to WINED3D_MAX_TEXTURES.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 0be165a7cdf918a2bca3b0250e407ddc60bb43a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0be165a7cdf918a2bca3b025… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 20 14:53:57 2019 -0600 wined3d: Rename MAX_TEXTURES to WINED3D_MAX_TEXTURES. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 14 +++---- dlls/wined3d/arb_program_shader.c | 32 +++++++-------- dlls/wined3d/ati_fragment_shader.c | 18 ++++----- dlls/wined3d/context.c | 14 +++---- dlls/wined3d/glsl_shader.c | 76 ++++++++++++++++++------------------ dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader.c | 6 +-- dlls/wined3d/state.c | 8 ++-- dlls/wined3d/stateblock.c | 12 +++--- dlls/wined3d/utils.c | 24 ++++++------ dlls/wined3d/wined3d_private.h | 34 ++++++++-------- 11 files changed, 120 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0be165a7cdf918a2bca3…

1 0

Józef Kucia : vkd3d-shader: Simplify vkd3d_dxbc_compiler_get_register_id().
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: vkd3d Branch: master Commit: 9c46011b4304420f9cb0715d57609a0309a9a36e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9c46011b4304420f9cb0715… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 21 12:32:49 2019 +0100 vkd3d-shader: Simplify vkd3d_dxbc_compiler_get_register_id(). Special casing is not needed. 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> --- libs/vkd3d-shader/spirv.c | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2c58a47..510fcd3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2605,40 +2605,14 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler * struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_register_info register_info; - switch (reg->type) + if (vkd3d_dxbc_compiler_get_register_info(compiler, reg, &register_info)) { - case VKD3DSPR_COLOROUT: - case VKD3DSPR_CONSTBUFFER: - case VKD3DSPR_DEPTHOUT: - case VKD3DSPR_DEPTHOUTGE: - case VKD3DSPR_DEPTHOUTLE: - case VKD3DSPR_IDXTEMP: - case VKD3DSPR_IMMCONSTBUFFER: - case VKD3DSPR_INCONTROLPOINT: - case VKD3DSPR_INPUT: - case VKD3DSPR_LOCALTHREADID: - case VKD3DSPR_LOCALTHREADINDEX: - case VKD3DSPR_OUTPUT: - case VKD3DSPR_SAMPLER: - case VKD3DSPR_TEMP: - case VKD3DSPR_THREADGROUPID: - case VKD3DSPR_THREADID: - if (vkd3d_dxbc_compiler_get_register_info(compiler, reg, &register_info)) - { - vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &register_info); - return register_info.id; - } - return vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - SpvStorageClassPrivate, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); - case VKD3DSPR_IMMCONST: - ERR("Unexpected register type %#x.\n", reg->type); - return vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - SpvStorageClassPrivate, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); - default: - FIXME("Unhandled register type %#x.\n", reg->type); - return vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - SpvStorageClassPrivate, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &register_info); + return register_info.id; } + + return vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + SpvStorageClassPrivate, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); } static bool vkd3d_swizzle_is_equal(unsigned int dst_write_mask,

1 0

Józef Kucia : vkd3d-shader: Use correct base index for relative addressing of aggregates.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: vkd3d Branch: master Commit: a0069d9fb758e8724fe27356d29c5e98c1a5397c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a0069d9fb758e8724fe2735… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 21 12:32:51 2019 +0100 vkd3d-shader: Use correct base index for relative addressing of aggregates. 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> --- libs/vkd3d-shader/spirv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9838b7c..8cbd8da 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2571,13 +2571,13 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp } else if (register_info->is_aggregate) { + struct vkd3d_shader_register_index reg_idx = reg->idx[0]; + if (reg->idx[1].rel_addr) FIXME("Relative addressing not implemented.\n"); - if (reg->idx[0].rel_addr) - indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[0]); - else - indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); + reg_idx.offset = register_info->member_idx; + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg_idx); } else {

1 0