August 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : qcap: Always return S_FALSE from DllCanUnloadNow().
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: d3cd3ebc3cba2fae5a7fe3a41597db10580bae22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3cd3ebc3cba2fae5a7fe3a4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 25 17:10:37 2021 -0500 qcap: Always return S_FALSE from DllCanUnloadNow(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 2 -- dlls/qcap/capturegraph.c | 2 -- dlls/qcap/qcap_main.c | 24 ------------------------ dlls/qcap/qcap_private.h | 2 -- dlls/qcap/vfwcapture.c | 2 -- 5 files changed, 32 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 5cc7d55bdf1..c3dbf71d2da 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -131,7 +131,6 @@ static void avi_mux_destroy(struct strmbase_filter *iface) free(filter->idx1); strmbase_filter_cleanup(&filter->filter); free(filter); - ObjectRefCount(FALSE); } static HRESULT avi_mux_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) @@ -1851,7 +1850,6 @@ HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) avimux->interleave = 10000000; TRACE("Created AVI mux %p.\n", avimux); - ObjectRefCount(TRUE); *out = &avimux->filter.IUnknown_inner; return S_OK; } diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index e5c7d9c1120..157cfc6178d 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -66,7 +66,6 @@ HRESULT capture_graph_create(IUnknown *outer, IUnknown **out) object->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CaptureGraphImpl.csFilter"); TRACE("Created capture graph builder %p.\n", object); - ObjectRefCount(TRUE); *out = (IUnknown *)&object->ICaptureGraphBuilder_iface; return S_OK; } @@ -123,7 +122,6 @@ static ULONG WINAPI fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface if (This->mygraph) IGraphBuilder_Release(This->mygraph); free(This); - ObjectRefCount(FALSE); } return ref; } diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index ac7ac6a26aa..3a8c89fe077 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); HINSTANCE qcap_instance; -static LONG objects_ref = 0; - struct class_factory { IClassFactory IClassFactory_iface; @@ -91,11 +89,6 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknow static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock) { TRACE("iface %p, lock %d.\n", iface, lock); - - if (lock) - InterlockedIncrement(&objects_ref); - else - InterlockedDecrement(&objects_ref); return S_OK; } @@ -274,20 +267,3 @@ HRESULT WINAPI DllUnregisterServer(void) IFilterMapper2_Release(mapper); return S_OK; } - -/*********************************************************************** - * DllCanUnloadNow (QCAP.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - TRACE(".\n"); - - return objects_ref ? S_FALSE : S_OK; -} - -DWORD ObjectRefCount(BOOL increment) -{ - if (increment) - return InterlockedIncrement(&objects_ref); - return InterlockedDecrement(&objects_ref); -} diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 104dba6a649..2db3c509062 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -30,8 +30,6 @@ extern HINSTANCE qcap_instance DECLSPEC_HIDDEN; -extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN; - HRESULT audio_record_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index fd5434434f2..504d41b5814 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -107,7 +107,6 @@ static void vfw_capture_destroy(struct strmbase_filter *iface) strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); free(filter); - ObjectRefCount(FALSE); } static HRESULT vfw_capture_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) @@ -861,7 +860,6 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) object->state_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": vfw_capture.state_cs"); TRACE("Created VFW capture filter %p.\n", object); - ObjectRefCount(TRUE); *out = &object->filter.IUnknown_inner; return S_OK; }

1 0

Nikolay Sivov : d3dx10/tests: Add some tests for sprite object.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 8b6be4426a4b624aa7eee9c2f151f509f4d157e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6be4426a4b624aa7eee9c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 25 19:36:52 2021 +0200 d3dx10/tests: Add some tests for sprite object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 195 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index b7834fb6f8a..1b875e4fc09 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2973,6 +2973,200 @@ todo_wine ID3DX10Font_Release(font); } +static void test_sprite(void) +{ + ID3D10ShaderResourceView *srv1, *srv2; + ID3D10Texture2D *texture1, *texture2; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Device *device, *device2; + D3DX10_SPRITE sprite_desc; + ID3DX10Sprite *sprite; + D3DXMATRIX mat, mat2; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + texture_desc.Width = 64; + texture_desc.Height = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture1); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture2); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture1, NULL, &srv1); + ok(SUCCEEDED(hr), "Failed to create srv, hr %#x.\n", hr); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture1, NULL, &srv2); + ok(SUCCEEDED(hr), "Failed to create srv, hr %#x.\n", hr); + + hr = D3DX10CreateSprite(device, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + hr = D3DX10CreateSprite(NULL, 0, &sprite); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + hr = D3DX10CreateSprite(device, 0, &sprite); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* GetDevice */ + hr = ID3DX10Sprite_GetDevice(sprite, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = ID3DX10Sprite_GetDevice(sprite, &device2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device == device2, "Unexpected device.\n"); + + ID3D10Device_Release(device2); + + /* Projection transform */ + hr = ID3DX10Sprite_GetProjectionTransform(sprite, NULL); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + hr = ID3DX10Sprite_GetProjectionTransform(sprite, &mat); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Set a transform and test if it gets returned correctly */ + mat.m[0][0] = 2.1f; mat.m[0][1] = 6.5f; mat.m[0][2] =-9.6f; mat.m[0][3] = 1.7f; + mat.m[1][0] = 4.2f; mat.m[1][1] =-2.5f; mat.m[1][2] = 2.1f; mat.m[1][3] = 5.5f; + mat.m[2][0] =-2.6f; mat.m[2][1] = 0.3f; mat.m[2][2] = 8.6f; mat.m[2][3] = 8.4f; + mat.m[3][0] = 6.7f; mat.m[3][1] =-5.1f; mat.m[3][2] = 6.1f; mat.m[3][3] = 2.2f; + + hr = ID3DX10Sprite_SetProjectionTransform(sprite, NULL); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = ID3DX10Sprite_SetProjectionTransform(sprite, &mat); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ID3DX10Sprite_GetProjectionTransform(sprite, &mat2); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!memcmp(&mat, &mat2, sizeof(mat)), "Unexpected matrix.\n"); +} + + /* View transform */ + hr = ID3DX10Sprite_SetViewTransform(sprite, NULL); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = ID3DX10Sprite_SetViewTransform(sprite, &mat); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Begin */ + hr = ID3DX10Sprite_Begin(sprite, 0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Flush/End */ + hr = ID3DX10Sprite_Flush(sprite); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ID3DX10Sprite_End(sprite); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* May not be called before next Begin */ + hr = ID3DX10Sprite_Flush(sprite); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + hr = ID3DX10Sprite_End(sprite); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + /* Draw */ + hr = ID3DX10Sprite_DrawSpritesBuffered(sprite, NULL, 0); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + memset(&sprite_desc, 0, sizeof(sprite_desc)); + hr = ID3DX10Sprite_DrawSpritesBuffered(sprite, &sprite_desc, 0); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = ID3DX10Sprite_DrawSpritesBuffered(sprite, &sprite_desc, 1); +todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = ID3DX10Sprite_Begin(sprite, 0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + memset(&sprite_desc, 0, sizeof(sprite_desc)); + hr = ID3DX10Sprite_DrawSpritesBuffered(sprite, &sprite_desc, 1); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + sprite_desc.pTexture = srv1; + hr = ID3DX10Sprite_DrawSpritesBuffered(sprite, &sprite_desc, 1); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ID3DX10Sprite_Flush(sprite); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ID3DX10Sprite_Flush(sprite); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ID3DX10Sprite_End(sprite); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* D3DX10_SPRITE_ADDREF_TEXTURES */ + hr = ID3DX10Sprite_Begin(sprite, D3DX10_SPRITE_ADDREF_TEXTURES); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + memset(&sprite_desc, 0, sizeof(sprite_desc)); + sprite_desc.pTexture = srv1; + + refcount = get_refcount(srv1); + hr = ID3DX10Sprite_DrawSpritesBuffered(sprite, &sprite_desc, 1); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(get_refcount(srv1) > refcount, "Unexpected refcount.\n"); +} + + hr = ID3DX10Sprite_Flush(sprite); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(get_refcount(srv1) == refcount, "Unexpected refcount.\n"); + + hr = ID3DX10Sprite_End(sprite); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ID3DX10Sprite_Release(sprite); + ID3D10Texture2D_Release(texture1); + ID3D10Texture2D_Release(texture2); + ID3D10ShaderResourceView_Release(srv1); + ID3D10ShaderResourceView_Release(srv2); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Unexpected refcount.\n"); +} + START_TEST(d3dx10) { test_D3DX10UnsetAllDeviceObjects(); @@ -2982,4 +3176,5 @@ START_TEST(d3dx10) test_get_image_info(); test_create_texture(); test_font(); + test_sprite(); }

1 0

Zebediah Figura : ntoskrnl/tests: Add some tests for IRP pending flags.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: b332f9620888a565bb5f348d0db2f85780e244a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b332f9620888a565bb5f348d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 16:11:43 2021 -0500 ntoskrnl/tests: Add some tests for IRP pending flags. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 109 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 102 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 7ee48696c09..65c7860e786 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1737,11 +1737,44 @@ static void test_stack_limits(void) ok(low < (ULONG_PTR)&low && (ULONG_PTR)&low < high, "stack variable is not in stack limits\n"); } -static unsigned int got_completion; +static unsigned int got_completion, completion_lower_pending, completion_upper_pending; static NTSTATUS WINAPI completion_cb(DEVICE_OBJECT *device, IRP *irp, void *context) { + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); ok(device == context, "Got device %p; expected %p.\n", device, context); + + if (device == upper_device) + { + todo_wine_if (completion_lower_pending) + ok(irp->PendingReturned == completion_lower_pending, "Got PendingReturned %u, expected %u.\n", + irp->PendingReturned, completion_lower_pending); + + ok(irp->CurrentLocation == 2, "Got current location %u.\n", irp->CurrentLocation); + ok(stack->Control == (SL_INVOKE_ON_CANCEL | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_SUCCESS), + "Got control flags %#x.\n", stack->Control); + stack = IoGetNextIrpStackLocation(irp); + todo_wine ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + stack = irp->Tail.Overlay.CurrentStackLocation + 1; /* previous location */ + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + + if (irp->PendingReturned && completion_upper_pending) + IoMarkIrpPending(irp); + } + else + { + todo_wine_if (completion_upper_pending) + ok(irp->PendingReturned == completion_upper_pending, "Got PendingReturned %u, expected %u.\n", + irp->PendingReturned, completion_upper_pending); + + ok(irp->CurrentLocation == 3, "Got current location %u.\n", irp->CurrentLocation); + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + stack = IoGetNextIrpStackLocation(irp); + todo_wine ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + stack = irp->Tail.Overlay.CurrentStackLocation - 2; /* lowest location */ + todo_wine ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + } + ++got_completion; return STATUS_SUCCESS; } @@ -1753,15 +1786,50 @@ static void test_completion(void) KEVENT event; IRP *irp; + completion_lower_pending = completion_upper_pending = FALSE; + KeInitializeEvent(&event, NotificationEvent, FALSE); irp = IoBuildDeviceIoControlRequest(IOCTL_WINETEST_COMPLETION, upper_device, NULL, 0, NULL, 0, FALSE, &event, &io); - IoSetCompletionRoutine(irp, completion_cb, NULL, TRUE, TRUE, TRUE); ret = IoCallDriver(upper_device, irp); ok(ret == STATUS_SUCCESS, "IoCallDriver returned %#x\n", ret); ok(got_completion == 2, "got %u calls to completion routine\n", got_completion); + + completion_lower_pending = TRUE; + got_completion = 0; + + irp = IoBuildDeviceIoControlRequest(IOCTL_WINETEST_COMPLETION, upper_device, + NULL, 0, NULL, 0, FALSE, &event, &io); + IoSetCompletionRoutine(irp, completion_cb, NULL, TRUE, TRUE, TRUE); + ret = IoCallDriver(upper_device, irp); + ok(ret == STATUS_PENDING, "IoCallDriver returned %#x\n", ret); + ok(!got_completion, "got %u calls to completion routine\n", got_completion); + + ok(irp->CurrentLocation == 1, "Got current location %u.\n", irp->CurrentLocation); + ok(!irp->PendingReturned, "Got pending flag %u.\n", irp->PendingReturned); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + ok(got_completion == 2, "got %u calls to completion routine\n", got_completion); + + completion_upper_pending = TRUE; + got_completion = 0; + + irp = IoBuildDeviceIoControlRequest(IOCTL_WINETEST_COMPLETION, upper_device, + NULL, 0, NULL, 0, FALSE, &event, &io); + IoSetCompletionRoutine(irp, completion_cb, NULL, TRUE, TRUE, TRUE); + ret = IoCallDriver(upper_device, irp); + ok(ret == STATUS_PENDING, "IoCallDriver returned %#x\n", ret); + ok(!got_completion, "got %u calls to completion routine\n", got_completion); + + ok(irp->CurrentLocation == 1, "Got current location %u.\n", irp->CurrentLocation); + ok(!irp->PendingReturned, "Got pending flag %u.\n", irp->PendingReturned); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + ok(got_completion == 2, "got %u calls to completion routine\n", got_completion); } static void test_IoAttachDeviceToDeviceStack(void) @@ -2392,10 +2460,19 @@ static NTSTATUS test_mismatched_status_ioctl(IRP *irp, IO_STACK_LOCATION *stack, return STATUS_SUCCESS; } -static NTSTATUS test_completion_ioctl(DEVICE_OBJECT *device, IRP *irp) +static NTSTATUS completion_ioctl(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { if (device == upper_device) { + ok(irp->CurrentLocation == 2, "Got current location %u.\n", irp->CurrentLocation); + ok(!irp->PendingReturned, "Got pending flag %u.\n", irp->PendingReturned); + ok(stack->Control == (SL_INVOKE_ON_CANCEL | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_SUCCESS), + "Got control flags %#x.\n", stack->Control); + stack = IoGetNextIrpStackLocation(irp); + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + stack = irp->Tail.Overlay.CurrentStackLocation + 1; /* previous location */ + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + IoCopyCurrentIrpStackLocationToNext(irp); IoSetCompletionRoutine(irp, completion_cb, upper_device, TRUE, TRUE, TRUE); return IoCallDriver(lower_device, irp); @@ -2403,9 +2480,27 @@ static NTSTATUS test_completion_ioctl(DEVICE_OBJECT *device, IRP *irp) else { ok(device == lower_device, "Got wrong device.\n"); - irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + ok(irp->CurrentLocation == 1, "Got current location %u.\n", irp->CurrentLocation); + ok(!irp->PendingReturned, "Got pending flag %u.\n", irp->PendingReturned); + ok(stack->Control == (SL_INVOKE_ON_CANCEL | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_SUCCESS), + "Got control flags %#x.\n", stack->Control); + stack = irp->Tail.Overlay.CurrentStackLocation + 1; /* previous location */ + ok(stack->Control == (SL_INVOKE_ON_CANCEL | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_SUCCESS), + "Got control flags %#x.\n", stack->Control); + stack = irp->Tail.Overlay.CurrentStackLocation + 2; /* top location */ + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + + if (completion_lower_pending) + { + IoMarkIrpPending(irp); + return STATUS_PENDING; + } + else + { + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } } } @@ -2481,7 +2576,7 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_MISMATCHED_STATUS: return test_mismatched_status_ioctl(irp, stack, &irp->IoStatus.Information); case IOCTL_WINETEST_COMPLETION: - return test_completion_ioctl(device, irp); + return completion_ioctl(device, irp, stack); default: break; }

1 0

Nikolay Sivov : d3dx10: Check device in d3dx10_sprite_GetDevice().
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: fa2658499e0bb9d73fc22ce41d545e2f60279f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa2658499e0bb9d73fc22ce4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 25 19:36:51 2021 +0200 d3dx10: Check device in d3dx10_sprite_GetDevice(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/sprite.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx10_43/sprite.c b/dlls/d3dx10_43/sprite.c index c90185e0c0a..5fc9b9edaa2 100644 --- a/dlls/d3dx10_43/sprite.c +++ b/dlls/d3dx10_43/sprite.c @@ -157,6 +157,9 @@ static HRESULT WINAPI d3dx10_sprite_GetDevice(ID3DX10Sprite *iface, ID3D10Device TRACE("iface %p, device %p.\n", iface, device); + if (!device) + return E_FAIL; + *device = sprite->device; ID3D10Device_AddRef(*device);

1 0

Nikolay Sivov : d3d10/effect: Use shader reflection to return output signature description.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 4d135986a35b70c52b178d69670f4a601dc246f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d135986a35b70c52b178d69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 23 11:23:03 2021 +0300 d3d10/effect: Use shader reflection to return output signature description. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 54 ++++++++++------------------------------------ dlls/d3d10/tests/effect.c | 37 ++++++++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 45 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 249d4ea384a..359c1f017f7 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -106,7 +106,7 @@ struct d3d10_effect_shader_signature struct d3d10_effect_shader_variable { struct d3d10_effect_shader_signature input_signature; - struct d3d10_effect_shader_signature output_signature; + ID3D10ShaderReflection *reflection; union { ID3D10VertexShader *vs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 520f816098f..3f0916e60d5 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -599,16 +599,12 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag switch(tag) { case TAG_ISGN: - case TAG_OSGN: { /* 32 (DXBC header) + 1 * 4 (chunk index) + 2 * 4 (chunk header) + data_size (chunk data) */ UINT size = 44 + data_size; - struct d3d10_effect_shader_signature *sig; + struct d3d10_effect_shader_signature *sig = &s->input_signature; char *ptr; - if (tag == TAG_ISGN) sig = &s->input_signature; - else sig = &s->output_signature; - if (!(sig->signature = heap_alloc_zero(size))) { ERR("Failed to allocate input signature data\n"); @@ -666,28 +662,22 @@ static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const struct d3d10_effect_shader_variable *sv = &v->u.shader; struct d3d10_effect_shader_resource *sr; D3D10_SHADER_INPUT_BIND_DESC bind_desc; - ID3D10ShaderReflection *reflection; struct d3d10_effect_variable *var; D3D10_SHADER_DESC desc; unsigned int i, y; - HRESULT hr; - - if (FAILED(hr = D3D10ReflectShader(data, data_size, &reflection))) - return hr; - reflection->lpVtbl->GetDesc(reflection, &desc); + sv->reflection->lpVtbl->GetDesc(sv->reflection, &desc); sv->resource_count = desc.BoundResources; if (!(sv->resources = heap_calloc(sv->resource_count, sizeof(*sv->resources)))) { ERR("Failed to allocate shader resource binding information memory.\n"); - reflection->lpVtbl->Release(reflection); return E_OUTOFMEMORY; } for (i = 0; i < desc.BoundResources; ++i) { - reflection->lpVtbl->GetResourceBindingDesc(reflection, i, &bind_desc); + sv->reflection->lpVtbl->GetResourceBindingDesc(sv->reflection, i, &bind_desc); sr = &sv->resources[i]; sr->in_type = bind_desc.Type; @@ -731,7 +721,6 @@ static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const if (!sr->variable) { WARN("Failed to find shader resource.\n"); - reflection->lpVtbl->Release(reflection); return E_FAIL; } } @@ -774,6 +763,9 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse /* We got a shader VertexShader vs = NULL, so it is fine to skip this. */ if (!dxbc_size) return S_OK; + if (FAILED(hr = D3D10ReflectShader(ptr, dxbc_size, &v->u.shader.reflection))) + return hr; + if (FAILED(hr = get_fx10_shader_resources(v, ptr, dxbc_size))) return hr; @@ -2747,8 +2739,9 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_variable *s, D3D10_SHADER_VARIABLE_TYPE type) { + if (s->reflection) + s->reflection->lpVtbl->Release(s->reflection); shader_free_signature(&s->input_signature); - shader_free_signature(&s->output_signature); switch (type) { @@ -7068,7 +7061,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature { struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); struct d3d10_effect_shader_variable *s; - D3D10_SIGNATURE_PARAMETER_DESC *d; TRACE("iface %p, shader_index %u, element_index %u, desc %p\n", iface, shader_index, element_index, desc); @@ -7087,35 +7079,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature } s = &v->effect->used_shaders[shader_index]->u.shader; - if (!s->output_signature.signature) - { - WARN("No shader signature\n"); - return D3DERR_INVALIDCALL; - } - - /* Check desc for NULL, this crashes on W7/DX10 */ - if (!desc) - { - WARN("This should crash on W7/DX10!\n"); - return E_FAIL; - } - - if (element_index >= s->output_signature.element_count) - { - WARN("Invalid element index specified\n"); - return E_INVALIDARG; - } - d = &s->output_signature.elements[element_index]; - desc->SemanticName = d->SemanticName; - desc->SemanticIndex = d->SemanticIndex; - desc->SystemValueType = d->SystemValueType; - desc->ComponentType = d->ComponentType; - desc->Register = d->Register; - desc->ReadWriteMask = d->ReadWriteMask; - desc->Mask = d->Mask; + if (!s->reflection) + return D3DERR_INVALIDCALL; - return S_OK; + return s->reflection->lpVtbl->GetOutputParameterDesc(s->reflection, element_index, desc); } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 9a217993e7e..df0d1a99ef4 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -23,6 +23,8 @@ #include <float.h> +#define D3DERR_INVALIDCALL 0x8876086c + static ID3D10Device *create_device(void) { ID3D10Device *device; @@ -2796,8 +2798,9 @@ static void test_effect_local_shader(void) D3D10_EFFECT_TYPE_DESC typedesc; D3D10_EFFECT_DESC effect_desc; ID3D10EffectShaderVariable *null_shader, *null_anon_vs, *null_anon_ps, *null_anon_gs, - *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs; + *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs, *ps, *vs; D3D10_EFFECT_SHADER_DESC shaderdesc; + D3D10_SIGNATURE_PARAMETER_DESC sign; ID3D10Device *device; ULONG refcount; @@ -3648,6 +3651,38 @@ todo_wine shaderdesc.SODecl); } + /* Output signature description */ + v = effect->lpVtbl->GetVariableByName(effect, "p"); + ps = v->lpVtbl->AsShader(v); + + hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 0, 0, &sign); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); + + v = effect->lpVtbl->GetVariableByName(effect, "v"); + vs = v->lpVtbl->AsShader(v); + + hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + + hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + + /* NULL shader variable */ + v = effect->lpVtbl->GetVariableByName(effect, "v0"); + vs = v->lpVtbl->AsShader(v); + + hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device);

1 0

Nikolay Sivov : d3d10/effect: Fix indexing in GetOutputSignatureElementDesc().
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: b31236922454dccef014f8acb190ee7a247e1b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b31236922454dccef014f8ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 23 11:23:04 2021 +0300 d3d10/effect: Fix indexing in GetOutputSignatureElementDesc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 52 ++++++++++++++++++++++++++++++++++------------- dlls/d3d10/tests/effect.c | 26 ++++++++++++++++-------- 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3f0916e60d5..e261e5a7cd7 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6999,6 +6999,43 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader( return S_OK; } +static HRESULT d3d10_get_shader_variable_signature(struct d3d10_effect_variable *v, + UINT shader_index, UINT element_index, BOOL output, D3D10_SIGNATURE_PARAMETER_DESC *desc) +{ + struct d3d10_effect_shader_variable *s; + unsigned int i; + + if (v->type->element_count) + v = &v->elements[0]; + + if (shader_index == 0) + { + s = &v->u.shader; + } + else + { + /* Index is used as an offset from this variable. */ + + for (i = 0; i < v->effect->used_shader_count; ++i) + { + if (v == v->effect->used_shaders[i]) break; + } + + if (i + shader_index >= v->effect->used_shader_count) + { + WARN("This should crash!\n"); + return E_FAIL; + } + + s = &v->effect->used_shaders[i + shader_index]->u.shader; + } + + if (!s->reflection) + return D3DERR_INVALIDCALL; + + return s->reflection->lpVtbl->GetOutputParameterDesc(s->reflection, element_index, desc); +} + static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureElementDesc( ID3D10EffectShaderVariable *iface, UINT shader_index, UINT element_index, D3D10_SIGNATURE_PARAMETER_DESC *desc) @@ -7060,7 +7097,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature D3D10_SIGNATURE_PARAMETER_DESC *desc) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); - struct d3d10_effect_shader_variable *s; TRACE("iface %p, shader_index %u, element_index %u, desc %p\n", iface, shader_index, element_index, desc); @@ -7071,19 +7107,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature return E_FAIL; } - /* Check shader_index, this crashes on W7/DX10 */ - if (shader_index >= v->effect->used_shader_count) - { - WARN("This should crash on W7/DX10!\n"); - return E_FAIL; - } - - s = &v->effect->used_shaders[shader_index]->u.shader; - - if (!s->reflection) - return D3DERR_INVALIDCALL; - - return s->reflection->lpVtbl->GetOutputParameterDesc(s->reflection, element_index, desc); + return d3d10_get_shader_variable_signature(v, shader_index, element_index, TRUE, desc); } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index df0d1a99ef4..1b8e765a8e6 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3656,25 +3656,23 @@ todo_wine ps = v->lpVtbl->AsShader(v); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 0, 0, &sign); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); + + hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 4, 0, &sign); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); v = effect->lpVtbl->GetVariableByName(effect, "v"); vs = v->lpVtbl->AsShader(v); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); /* NULL shader variable */ v = effect->lpVtbl->GetVariableByName(effect, "v0"); @@ -3683,6 +3681,16 @@ todo_wine hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 2, 0, &sign); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 3, 0, &sign); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device);

1 0

Nikolay Sivov : d3d10/effect: Use shader reflection to return input signature description.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: ce6cb0de2f06ede70e76f24e71a58410b463db01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce6cb0de2f06ede70e76f24e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 23 11:23:05 2021 +0300 d3d10/effect: Use shader reflection to return input signature description. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 45 +++++---------------------------------------- dlls/d3d10/tests/effect.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 41 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e261e5a7cd7..b3a027a5962 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -7033,7 +7033,10 @@ static HRESULT d3d10_get_shader_variable_signature(struct d3d10_effect_variable if (!s->reflection) return D3DERR_INVALIDCALL; - return s->reflection->lpVtbl->GetOutputParameterDesc(s->reflection, element_index, desc); + if (output) + return s->reflection->lpVtbl->GetOutputParameterDesc(s->reflection, element_index, desc); + else + return s->reflection->lpVtbl->GetInputParameterDesc(s->reflection, element_index, desc); } static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureElementDesc( @@ -7041,8 +7044,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureE D3D10_SIGNATURE_PARAMETER_DESC *desc) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); - struct d3d10_effect_shader_variable *s; - D3D10_SIGNATURE_PARAMETER_DESC *d; TRACE("iface %p, shader_index %u, element_index %u, desc %p\n", iface, shader_index, element_index, desc); @@ -7053,43 +7054,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureE return E_FAIL; } - /* Check shader_index, this crashes on W7/DX10 */ - if (shader_index >= v->effect->used_shader_count) - { - WARN("This should crash on W7/DX10!\n"); - return E_FAIL; - } - - s = &v->effect->used_shaders[shader_index]->u.shader; - if (!s->input_signature.signature) - { - WARN("No shader signature\n"); - return D3DERR_INVALIDCALL; - } - - /* Check desc for NULL, this crashes on W7/DX10 */ - if (!desc) - { - WARN("This should crash on W7/DX10!\n"); - return E_FAIL; - } - - if (element_index >= s->input_signature.element_count) - { - WARN("Invalid element index specified\n"); - return E_INVALIDARG; - } - - d = &s->input_signature.elements[element_index]; - desc->SemanticName = d->SemanticName; - desc->SemanticIndex = d->SemanticIndex; - desc->SystemValueType = d->SystemValueType; - desc->ComponentType = d->ComponentType; - desc->Register = d->Register; - desc->ReadWriteMask = d->ReadWriteMask; - desc->Mask = d->Mask; - - return S_OK; + return d3d10_get_shader_variable_signature(v, shader_index, element_index, FALSE, desc); } static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignatureElementDesc( diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 1b8e765a8e6..3bcb0e80546 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3651,7 +3651,7 @@ todo_wine shaderdesc.SODecl); } - /* Output signature description */ + /* Signature description */ v = effect->lpVtbl->GetVariableByName(effect, "p"); ps = v->lpVtbl->AsShader(v); @@ -3663,6 +3663,14 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 0, 0, &sign); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + + hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 4, 0, &sign); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + v = effect->lpVtbl->GetVariableByName(effect, "v"); vs = v->lpVtbl->AsShader(v); @@ -3674,6 +3682,14 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + + hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + /* NULL shader variable */ v = effect->lpVtbl->GetVariableByName(effect, "v0"); vs = v->lpVtbl->AsShader(v); @@ -3691,6 +3707,19 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 2, 0, &sign); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 3, 0, &sign); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device);

1 0

Nikolay Sivov : d3d10/effect: Store input signature as a blob part.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: ad9c2b8beb9b6c116b553427c4779eca691fb178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad9c2b8beb9b6c116b553427… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 23 11:23:06 2021 +0300 d3d10/effect: Store input signature as a blob part. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 181 ++++----------------------------------------- dlls/d3d10/tests/effect.c | 7 ++ 3 files changed, 23 insertions(+), 167 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 359c1f017f7..751c39dc895 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -105,8 +105,8 @@ struct d3d10_effect_shader_signature struct d3d10_effect_shader_variable { - struct d3d10_effect_shader_signature input_signature; ID3D10ShaderReflection *reflection; + ID3D10Blob *input_signature; union { ID3D10VertexShader *vs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index b3a027a5962..ae709b91759 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -320,12 +320,6 @@ static void read_dword(const char **ptr, DWORD *d) *ptr += sizeof(*d); } -static void write_dword(char **ptr, DWORD d) -{ - memcpy(*ptr, &d, sizeof(d)); - *ptr += sizeof(d); -} - static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) { return !count || (data_size - offset) / count >= size; @@ -344,12 +338,6 @@ static void skip_dword_unknown(const char *location, const char **ptr, unsigned } } -static void write_dword_unknown(char **ptr, DWORD d) -{ - FIXME("Writing unknown DWORD 0x%08x\n", d); - write_dword(ptr, d); -} - static HRESULT parse_dxbc(const char *data, SIZE_T data_size, HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) { @@ -507,156 +495,6 @@ static BOOL copy_name(const char *ptr, char **name) return TRUE; } -static const char *shader_get_string(const char *data, size_t data_size, DWORD offset) -{ - const char *s; - size_t l; - - if (!fx10_get_string(data, data_size, offset, &s, &l)) - return NULL; - - return l ? s : ""; -} - -static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct d3d10_effect_shader_signature *s) -{ - D3D10_SIGNATURE_PARAMETER_DESC *e; - const char *ptr = data; - unsigned int i; - DWORD count; - - if (!require_space(0, 2, sizeof(DWORD), data_size)) - { - WARN("Invalid data size %#x.\n", data_size); - return E_INVALIDARG; - } - - read_dword(&ptr, &count); - TRACE("%u elements\n", count); - - skip_dword_unknown("shader signature", &ptr, 1); - - if (!require_space(ptr - data, count, 6 * sizeof(DWORD), data_size)) - { - WARN("Invalid count %#x (data size %#x).\n", count, data_size); - return E_INVALIDARG; - } - - if (!(e = heap_calloc(count, sizeof(*e)))) - { - ERR("Failed to allocate signature memory.\n"); - return E_OUTOFMEMORY; - } - - for (i = 0; i < count; ++i) - { - UINT name_offset; - UINT mask; - - read_dword(&ptr, &name_offset); - if (!(e[i].SemanticName = shader_get_string(data, data_size, name_offset))) - { - WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); - heap_free(e); - return E_INVALIDARG; - } - read_dword(&ptr, &e[i].SemanticIndex); - read_dword(&ptr, &e[i].SystemValueType); - read_dword(&ptr, &e[i].ComponentType); - read_dword(&ptr, &e[i].Register); - read_dword(&ptr, &mask); - - e[i].ReadWriteMask = mask >> 8; - e[i].Mask = mask & 0xff; - - TRACE("semantic: %s, semantic idx: %u, sysval_semantic %#x, " - "type %u, register idx: %u, use_mask %#x, input_mask %#x\n", - debugstr_a(e[i].SemanticName), e[i].SemanticIndex, e[i].SystemValueType, - e[i].ComponentType, e[i].Register, e[i].Mask, e[i].ReadWriteMask); - } - - s->elements = e; - s->element_count = count; - - return S_OK; -} - -static void shader_free_signature(struct d3d10_effect_shader_signature *s) -{ - heap_free(s->signature); - heap_free(s->elements); -} - -static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) -{ - struct d3d10_effect_shader_variable *s = ctx; - HRESULT hr; - - TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); - - TRACE("chunk size: %#x\n", data_size); - - switch(tag) - { - case TAG_ISGN: - { - /* 32 (DXBC header) + 1 * 4 (chunk index) + 2 * 4 (chunk header) + data_size (chunk data) */ - UINT size = 44 + data_size; - struct d3d10_effect_shader_signature *sig = &s->input_signature; - char *ptr; - - if (!(sig->signature = heap_alloc_zero(size))) - { - ERR("Failed to allocate input signature data\n"); - return E_OUTOFMEMORY; - } - sig->signature_size = size; - - ptr = sig->signature; - - write_dword(&ptr, TAG_DXBC); - - /* signature(?) */ - write_dword_unknown(&ptr, 0); - write_dword_unknown(&ptr, 0); - write_dword_unknown(&ptr, 0); - write_dword_unknown(&ptr, 0); - - /* seems to be always 1 */ - write_dword_unknown(&ptr, 1); - - /* DXBC size */ - write_dword(&ptr, size); - - /* chunk count */ - write_dword(&ptr, 1); - - /* chunk index */ - write_dword(&ptr, (ptr - sig->signature) + 4); - - /* chunk */ - write_dword(&ptr, tag); - write_dword(&ptr, data_size); - memcpy(ptr, data, data_size); - - hr = shader_parse_signature(ptr, data_size, sig); - if (FAILED(hr)) - { - ERR("Failed to parse shader, hr %#x\n", hr); - shader_free_signature(sig); - } - - break; - } - - default: - FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); - break; - } - - return S_OK; -} - static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const void *data, size_t data_size) { struct d3d10_effect_shader_variable *sv = &v->u.shader; @@ -766,6 +604,8 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse if (FAILED(hr = D3D10ReflectShader(ptr, dxbc_size, &v->u.shader.reflection))) return hr; + D3DGetInputSignatureBlob(ptr, dxbc_size, &v->u.shader.input_signature); + if (FAILED(hr = get_fx10_shader_resources(v, ptr, dxbc_size))) return hr; @@ -793,7 +633,7 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse return E_FAIL; } - return parse_dxbc(ptr, dxbc_size, shader_chunk_handler, &v->u.shader); + return hr; } static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c, BOOL is_column_major) @@ -2741,7 +2581,8 @@ static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_vari { if (s->reflection) s->reflection->lpVtbl->Release(s->reflection); - shader_free_signature(&s->input_signature); + if (s->input_signature) + ID3D10Blob_Release(s->input_signature); switch (type) { @@ -3597,8 +3438,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa desc->Name = pass->name; desc->Annotations = pass->annotation_count; - desc->pIAInputSignature = (BYTE *)s->input_signature.signature; - desc->IAInputSignatureSize = s->input_signature.signature_size; + if (s->input_signature) + { + desc->pIAInputSignature = ID3D10Blob_GetBufferPointer(s->input_signature); + desc->IAInputSignatureSize = ID3D10Blob_GetBufferSize(s->input_signature); + } + else + { + desc->pIAInputSignature = NULL; + desc->IAInputSignatureSize = 0; + } desc->StencilRef = pass->stencil_ref; desc->SampleMask = pass->sample_mask; memcpy(desc->BlendFactor, pass->blend_factor, 4 * sizeof(float)); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 3bcb0e80546..5fcece4695b 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5740,6 +5740,7 @@ static void test_effect_resource_variable(void) ID3D10EffectTechnique *technique; ID3D10Texture2D *tex0, *tex_a[2]; D3D10_EFFECT_DESC effect_desc; + D3D10_PASS_DESC pass_desc; ID3D10EffectVariable *var; ID3D10EffectPass *pass; ID3D10Device *device; @@ -5795,6 +5796,12 @@ static void test_effect_resource_variable(void) ok(!!technique, "Got unexpected technique %p.\n", technique); pass = technique->lpVtbl->GetPassByName(technique, "p0"); ok(!!pass, "Got unexpected pass %p.\n", pass); + hr = pass->lpVtbl->GetDesc(pass, &pass_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!pass_desc.pIAInputSignature, "Unexpected input signature.\n"); + ok(pass_desc.IAInputSignatureSize == 88, "Unexpected input signature size %lu.\n", + pass_desc.IAInputSignatureSize); + hr = pass->lpVtbl->Apply(pass, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : d3d10/effect: Give a name to value assignment type field.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 9e59a12fac2aa388bc076f1f68f1275dc77aa8c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e59a12fac2aa388bc076f1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 23 11:23:07 2021 +0300 d3d10/effect: Give a name to value assignment type field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ae709b91759..3b3d48c50a8 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1408,7 +1408,7 @@ static BOOL parse_fx10_state_group(const char *data, size_t data_size, const char **ptr, D3D_SHADER_VARIABLE_TYPE container_type, void *container) { const struct d3d10_effect_state_property_info *property_info; - UINT value_offset; + UINT value_offset, operation; unsigned int i; DWORD count; UINT idx; @@ -1421,7 +1421,7 @@ static BOOL parse_fx10_state_group(const char *data, size_t data_size, { read_dword(ptr, &id); read_dword(ptr, &idx); - skip_dword_unknown("read property", ptr, 1); + read_dword(ptr, &operation); read_dword(ptr, &value_offset); if (!(property_info = get_property_info(id)))

1 0

Nikolay Sivov : d3dx10_41/tests: Enable tests.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: afd08e82cf3c86ab9720a1a96775149c7339738b URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd08e82cf3c86ab9720a1a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 23 11:26:27 2021 +0300 d3dx10_41/tests: Enable tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_41/Makefile.in | 1 + dlls/d3dx10_41/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index a53367f0172..020ca989d4f 100755 --- a/configure +++ b/configure @@ -20387,6 +20387,7 @@ wine_fn_config_makefile dlls/d3dx10_38 enable_d3dx10_38 wine_fn_config_makefile dlls/d3dx10_39 enable_d3dx10_39 wine_fn_config_makefile dlls/d3dx10_40 enable_d3dx10_40 wine_fn_config_makefile dlls/d3dx10_41 enable_d3dx10_41 +wine_fn_config_makefile dlls/d3dx10_41/tests enable_tests wine_fn_config_makefile dlls/d3dx10_42 enable_d3dx10_42 wine_fn_config_makefile dlls/d3dx10_42/tests enable_tests wine_fn_config_makefile dlls/d3dx10_43 enable_d3dx10_43 diff --git a/configure.ac b/configure.ac index 837f41c34aa..f139c59be74 100644 --- a/configure.ac +++ b/configure.ac @@ -3087,6 +3087,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_41/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43) diff --git a/dlls/d3dx10_41/Makefile.in b/dlls/d3dx10_41/Makefile.in index 41ebda9892c..a3a64fef6d8 100644 --- a/dlls/d3dx10_41/Makefile.in +++ b/dlls/d3dx10_41/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_41.dll +IMPORTLIB = d3dx10_41 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_41/tests/Makefile.in b/dlls/d3dx10_41/tests/Makefile.in new file mode 100644 index 00000000000..bde10a26ea7 --- /dev/null +++ b/dlls/d3dx10_41/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_41.dll +IMPORTS = d3dx10_41 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c

1 0