wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Jacek Caban : hidclass.sys: Support canceling read IRPs.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: f7bc64959886e585aced90688036a59a907b9743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7bc64959886e585aced9068… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 23:09:16 2019 +0200 hidclass.sys: Support canceling read IRPs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index fcdb1b8..1fb3bbc 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -134,14 +134,44 @@ static IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); - entry = RemoveHeadList(&ext->irp_queue); - if (entry != &ext->irp_queue) + while (!irp && (entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) + { irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); + if (!IoSetCancelRoutine(irp, NULL)) + { + /* cancel routine is already cleared, meaning that it was called. let it handle completion. */ + InitializeListHead(&irp->Tail.Overlay.s.ListEntry); + irp = NULL; + } + } KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); return irp; } +static void WINAPI read_cancel_routine(DEVICE_OBJECT *device, IRP *irp) +{ + BASE_DEVICE_EXTENSION *ext; + KIRQL old_irql; + + TRACE("cancel %p IRP on device %p\n", irp, device); + + ext = device->DeviceExtension; + + IoReleaseCancelSpinLock(irp->CancelIrql); + + KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); + + RemoveEntryList(&irp->Tail.Overlay.s.ListEntry); + + KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); + + irp->IoStatus.u.Status = STATUS_CANCELLED; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + + void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) { BASE_DEVICE_EXTENSION *ext; @@ -669,10 +699,20 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); + IoSetCancelRoutine(irp, read_cancel_routine); + if (irp->Cancel && !IoSetCancelRoutine(irp, NULL)) + { + /* IRP was canceled before we set cancel routine */ + InitializeListHead(&irp->Tail.Overlay.s.ListEntry); + KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); + return STATUS_CANCELLED; + } + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); - rc = STATUS_PENDING; + IoMarkIrpPending(irp); KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); + rc = STATUS_PENDING; } else {

1 0

Jacek Caban : hidclass.sys: Make read IRP queue thread safe.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 85082e8bd3c9bcb0b45fc56b55cc7c88c653d028 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85082e8bd3c9bcb0b45fc56b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 23:09:03 2019 +0200 hidclass.sys: Make read IRP queue thread safe. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 2 +- dlls/hidclass.sys/device.c | 34 ++++++++++++++++++++++++---------- dlls/hidclass.sys/hid.h | 1 + dlls/hidclass.sys/pnp.c | 1 + 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index e942217..209c2df 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = hidclass.sys IMPORTLIB = hidclass -IMPORTS = ntoskrnl +IMPORTS = hal ntoskrnl DELAYIMPORTS = setupapi hid C_SRCS = \ diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 81d5c3c..fcdb1b8 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -126,10 +126,25 @@ error: return STATUS_UNSUCCESSFUL; } +static IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) +{ + LIST_ENTRY *entry; + KIRQL old_irql; + IRP *irp = NULL; + + KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); + + entry = RemoveHeadList(&ext->irp_queue); + if (entry != &ext->irp_queue) + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); + + KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); + return irp; +} + void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) { BASE_DEVICE_EXTENSION *ext; - LIST_ENTRY *entry; IRP *irp; ext = device->DeviceExtension; @@ -145,13 +160,10 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device if (ext->ring_buffer) RingBuffer_Destroy(ext->ring_buffer); - entry = RemoveHeadList(&ext->irp_queue); - while(entry != &ext->irp_queue) + while((irp = pop_irp_from_queue(ext))) { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irp->IoStatus.u.Status = STATUS_DEVICE_REMOVED; IoCompleteRequest(irp, IO_NO_INCREMENT); - entry = RemoveHeadList(&ext->irp_queue); } TRACE("Delete device(%p) %s\n", device, debugstr_w(ext->device_name)); @@ -189,7 +201,6 @@ static NTSTATUS copy_packet_into_buffer(HID_XFER_PACKET *packet, BYTE* buffer, U static void HID_Device_processQueue(DEVICE_OBJECT *device) { - LIST_ENTRY *entry; IRP *irp; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; UINT buffer_size = RingBuffer_GetBufferSize(ext->ring_buffer); @@ -197,11 +208,9 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); - entry = RemoveHeadList(&ext->irp_queue); - while(entry != &ext->irp_queue) + while((irp = pop_irp_from_queue(ext))) { int ptr; - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); @@ -222,7 +231,6 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) irp->IoStatus.u.Status = STATUS_UNSUCCESSFUL; } IoCompleteRequest( irp, IO_NO_INCREMENT ); - entry = RemoveHeadList(&ext->irp_queue); } HeapFree(GetProcessHeap(), 0, packet); } @@ -656,9 +664,15 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) BASE_DEVICE_EXTENSION *extension = device->DeviceExtension; if (extension->poll_interval) { + KIRQL old_irql; TRACE_(hid_report)("Queue irp\n"); + + KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); rc = STATUS_PENDING; + + KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); } else { diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 769b715..ff2e7ef 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -54,6 +54,7 @@ typedef struct _BASE_DEVICE_EXTENSION { HANDLE halt_event; HANDLE thread; + KSPIN_LOCK irp_queue_lock; LIST_ENTRY irp_queue; /* Minidriver Specific stuff will end up here */ diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 08aae15..a283d63 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -114,6 +114,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ext = device->DeviceExtension; InitializeListHead(&ext->irp_queue); + KeInitializeSpinLock(&ext->irp_queue_lock); TRACE("Created device %p\n",device); status = minidriver->AddDevice(minidriver->minidriver.DriverObject, device);

1 0

Rosanne DiMesio : about.template: remove dead links
by Jeremy Newman 09 May '19

09 May '19

Module: website Branch: master Commit: 75648dc5899e4816f16a9f5ce8017dfc48b7cbb7 URL: https://source.winehq.org/git/website.git/?a=commit;h=75648dc5899e4816f16a9… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu May 9 13:05:09 2019 -0500 about.template: remove dead links Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/en/about.template | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/en/about.template b/templates/en/about.template index ac7afd3..60ab646 100644 --- a/templates/en/about.template +++ b/templates/en/about.template @@ -24,8 +24,7 @@ user-experience.</p> continue for 15 years before the program finally reached v1.0, the first stable release, in 2008. Several releases later, Wine is still under active development today, and although there is more work to be done, -<a href="https://wiki.winehq.org/UsageStatistics" title="Wine Usage -Statistics">millions of people</a> are estimated to use Wine to run +millions of people are estimated to use Wine to run their Windows software on the OS of their choice.</p> <h3>Open Source and User Driven</h3> @@ -56,9 +55,6 @@ may not be up-to-date)</i></p> <li><a href="https://wiki.winehq.org/ImportanceOfWine">Why Wine is so Important</a> </li> - <li><a href="https://wiki.winehq.org/Debunking_Wine_Myths">Common - Myths about Wine</a> - </li> <li><a href="https://wiki.winehq.org/WineHistory">History of the Wine Project</a> </li>

1 0

Józef Kucia : tests: Add VKD3D_TEST_BUG env var to control bug_if() conditions.
by Alexandre Julliard 09 May '19

09 May '19

Module: vkd3d Branch: master Commit: 6f960f20967d1d8e631a212229596c6db3c79b73 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6f960f20967d1d8e631a212… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 7 15:37:06 2019 +0200 tests: Add VKD3D_TEST_BUG env var to control bug_if() conditions. Run tests with VKD3D_TEST_BUG=0 to disable bug_if() conditions. 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/private/vkd3d_test.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 53afdd9..a37f6ff 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -116,6 +116,7 @@ static struct unsigned int bug_level; bool bug_do_loop; + bool bug_enabled; char context[1024]; } vkd3d_test_state; @@ -165,7 +166,7 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg bool is_todo = vkd3d_test_state.todo_level && !vkd3d_test_platform_is_windows(); bool is_bug = vkd3d_test_state.bug_level && !vkd3d_test_platform_is_windows(); - if (is_bug) + if (is_bug && vkd3d_test_state.bug_enabled) { InterlockedIncrement(&vkd3d_test_state.bug_count); if (is_todo) @@ -255,9 +256,11 @@ int main(int argc, char **argv) { const char *debug_level = getenv("VKD3D_TEST_DEBUG"); char *test_platform = getenv("VKD3D_TEST_PLATFORM"); + const char *bug = getenv("VKD3D_TEST_BUG"); memset(&vkd3d_test_state, 0, sizeof(vkd3d_test_state)); - vkd3d_test_state.debug_level = !debug_level ? 0 : atoi(debug_level); + vkd3d_test_state.debug_level = debug_level ? atoi(debug_level) : 0; + vkd3d_test_state.bug_enabled = bug ? atoi(bug) : true; if (test_platform) {

1 0

Józef Kucia : vkd3d: Use D32_SFLOAT_S8_UINT when D24_UNORM_S8_UINT is not supported.
by Alexandre Julliard 09 May '19

09 May '19

Module: vkd3d Branch: master Commit: e01eae5b8a1603d2e62272ed94b4d85cd002d350 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e01eae5b8a1603d2e62272e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 7 15:37:03 2019 +0200 vkd3d: Use D32_SFLOAT_S8_UINT when D24_UNORM_S8_UINT is not supported. Fixes rendering in UE4 Infiltrator Demo on AMD. Adjustments for depth bias aren't implemented yet. 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/command.c | 12 +++++++++++ libs/vkd3d/device.c | 8 ++++++- libs/vkd3d/utils.c | 53 ++++++++++++++++++++++++++++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 5 +++++ tests/d3d12.c | 7 ------ 5 files changed, 75 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 57415de..abe4f27 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3233,6 +3233,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic return; } + if (dst_format->is_emulated) + { + FIXME("Format %#x is not supported yet.\n", dst_format->dxgi_format); + return; + } + if ((dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) && (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) FIXME("Depth-stencil format %#x not fully supported yet.\n", dst_format->dxgi_format); @@ -3256,6 +3262,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic return; } + if (src_format->is_emulated) + { + FIXME("Format %#x is not supported yet.\n", src_format->dxgi_format); + return; + } + if ((src_format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) && (src_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) FIXME("Depth-stencil format %#x not fully supported yet.\n", src_format->dxgi_format); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index f1ad090..a107e1e 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1897,6 +1897,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_private_store_destroy(&device->private_store); + vkd3d_cleanup_depth_stencil_formats(device); vkd3d_destroy_null_resources(&device->null_resources, device); vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_render_pass_cache_cleanup(&device->render_pass_cache, device); @@ -3090,9 +3091,12 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) goto out_free_private_store; - if (FAILED(hr = vkd3d_init_null_resources(&device->null_resources, device))) + if (FAILED(hr = vkd3d_init_depth_stencil_formats(device))) goto out_stop_fence_worker; + if (FAILED(hr = vkd3d_init_null_resources(&device->null_resources, device))) + goto out_cleanup_depth_stencil_formats; + vkd3d_render_pass_cache_init(&device->render_pass_cache); vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); @@ -3101,6 +3105,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, return S_OK; +out_cleanup_depth_stencil_formats: + vkd3d_cleanup_depth_stencil_formats(device); out_stop_fence_worker: vkd3d_fence_worker_stop(&device->fence_worker, device); out_free_private_store: diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 06a958d..ea468b3 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -132,6 +132,53 @@ static const struct vkd3d_format vkd3d_depth_stencil_formats[] = #undef STENCIL #undef DEPTH_STENCIL +HRESULT vkd3d_init_depth_stencil_formats(struct d3d12_device *device) +{ + const unsigned int count = ARRAY_SIZE(vkd3d_depth_stencil_formats); + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkFormatProperties properties; + struct vkd3d_format *formats; + unsigned int i; + + VK_CALL(vkGetPhysicalDeviceFormatProperties(device->vk_physical_device, + VK_FORMAT_D24_UNORM_S8_UINT, &properties)); + + if (properties.optimalTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) + { + device->depth_stencil_formats = vkd3d_depth_stencil_formats; + } + else + { + /* AMD doesn't support VK_FORMAT_D24_UNORM_S8_UINT. */ + WARN("Mapping VK_FORMAT_D24_UNORM_S8_UINT to VK_FORMAT_D32_SFLOAT_S8_UINT.\n"); + + if (!(formats = vkd3d_calloc(count, sizeof(*formats)))) + return E_OUTOFMEMORY; + + memcpy(formats, vkd3d_depth_stencil_formats, sizeof(vkd3d_depth_stencil_formats)); + for (i = 0; i < count; ++i) + { + if (formats[i].vk_format == VK_FORMAT_D24_UNORM_S8_UINT) + { + formats[i].vk_format = VK_FORMAT_D32_SFLOAT_S8_UINT; + formats[i].is_emulated = true; + } + } + + device->depth_stencil_formats = formats; + } + + return S_OK; +} + +void vkd3d_cleanup_depth_stencil_formats(struct d3d12_device *device) +{ + if (vkd3d_depth_stencil_formats != device->depth_stencil_formats) + vkd3d_free((void *)device->depth_stencil_formats); + + device->depth_stencil_formats = NULL; +} + /* We use overrides for depth/stencil formats. This is required in order to * properly support typeless formats because depth/stencil formats are only * compatible with themselves in Vulkan. @@ -139,14 +186,16 @@ static const struct vkd3d_format vkd3d_depth_stencil_formats[] = static const struct vkd3d_format *vkd3d_get_depth_stencil_format(const struct d3d12_device *device, DXGI_FORMAT dxgi_format) { + const struct vkd3d_format *formats; unsigned int i; assert(device); + formats = device->depth_stencil_formats; for (i = 0; i < ARRAY_SIZE(vkd3d_depth_stencil_formats); ++i) { - if (vkd3d_depth_stencil_formats[i].dxgi_format == dxgi_format) - return &vkd3d_depth_stencil_formats[i]; + if (formats[i].dxgi_format == dxgi_format) + return &formats[i]; } return NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 915f634..057a0a7 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1006,6 +1006,7 @@ struct d3d12_device HRESULT removed_reason; + const struct vkd3d_format *depth_stencil_formats; struct vkd3d_null_resources null_resources; }; @@ -1027,6 +1028,7 @@ struct vkd3d_format size_t block_height; size_t block_byte_count; VkImageAspectFlags vk_aspect_mask; + bool is_emulated; }; static inline bool vkd3d_format_is_compressed(const struct vkd3d_format *format) @@ -1037,6 +1039,9 @@ static inline bool vkd3d_format_is_compressed(const struct vkd3d_format *format) const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, DXGI_FORMAT dxgi_format, bool depth_stencil) DECLSPEC_HIDDEN; +HRESULT vkd3d_init_depth_stencil_formats(struct d3d12_device *device) DECLSPEC_HIDDEN; +void vkd3d_cleanup_depth_stencil_formats(struct d3d12_device *device) DECLSPEC_HIDDEN; + bool dxgi_format_is_typeless(DXGI_FORMAT dxgi_format) DECLSPEC_HIDDEN; static inline const struct vkd3d_format *vkd3d_format_from_d3d12_resource_desc( diff --git a/tests/d3d12.c b/tests/d3d12.c index d5f491e..c1992a8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -17749,13 +17749,6 @@ static void test_depth_stencil_sampling(void) { vkd3d_test_set_context("Test %u", i); - /* FIXME: Implement format substitution. */ - if (tests[i].typeless_format == DXGI_FORMAT_R24G8_TYPELESS && is_radv_device(device)) - { - skip("radv doesn't support VK_FORMAT_D24_UNORM_S8_UINT.\n"); - continue; - } - reset_command_list(command_list, context.allocator); init_depth_stencil(&ds, device, context.render_target_desc.Width,

1 0

Józef Kucia : vkd3d: Pass device to vkd3d_get_format( ).
by Alexandre Julliard 09 May '19

09 May '19

Module: vkd3d Branch: master Commit: 9536f103837aa3d954fe208f8beec5e705755592 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9536f103837aa3d954fe208… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 7 15:37:02 2019 +0200 vkd3d: Pass device to vkd3d_get_format(). 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/device.c | 8 ++++---- libs/vkd3d/resource.c | 12 ++++++------ libs/vkd3d/state.c | 14 +++++++------- libs/vkd3d/utils.c | 12 ++++++++---- libs/vkd3d/vkd3d_private.h | 5 +++-- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index b1f320b..f1ad090 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2103,8 +2103,8 @@ static HRESULT d3d12_device_check_multisample_quality_levels(struct d3d12_device if (data->Format == DXGI_FORMAT_UNKNOWN) goto done; - if (!(format = vkd3d_get_format(data->Format, false))) - format = vkd3d_get_format(data->Format, true); + if (!(format = vkd3d_get_format(device, data->Format, false))) + format = vkd3d_get_format(device, data->Format, true); if (!format) { FIXME("Unhandled format %#x.\n", data->Format); @@ -2257,8 +2257,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * data->Support1 = D3D12_FORMAT_SUPPORT1_NONE; data->Support2 = D3D12_FORMAT_SUPPORT2_NONE; - if (!(format = vkd3d_get_format(data->Format, false))) - format = vkd3d_get_format(data->Format, true); + if (!(format = vkd3d_get_format(device, data->Format, false))) + format = vkd3d_get_format(device, data->Format, true); if (!format) { FIXME("Unhandled format %#x.\n", data->Format); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index b0a9c9a..36fcb22 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1701,12 +1701,12 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device, if (view_format == DXGI_FORMAT_R32_TYPELESS && (flags & VKD3D_VIEW_RAW_BUFFER)) { - format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); element_size = format->byte_count; } else if (view_format == DXGI_FORMAT_UNKNOWN && structure_stride) { - format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); element_size = structure_stride; } else if ((format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, view_format))) @@ -2055,7 +2055,7 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, WARN("Creating NULL SRV %#x.\n", desc->ViewDimension); - vkd3d_desc.format = vkd3d_get_format(VKD3D_NULL_VIEW_FORMAT, 0); + vkd3d_desc.format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, 0); vkd3d_desc.miplevel_idx = 0; vkd3d_desc.miplevel_count = 1; vkd3d_desc.layer_idx = 0; @@ -2258,7 +2258,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ assert(d3d12_resource_is_buffer(counter_resource)); assert(desc->u.Buffer.StructureByteStride); - format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); if (!vkd3d_create_vk_buffer_view(device, counter_resource, format, desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view->vk_counter_view)) { @@ -2272,7 +2272,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ if ((desc->Format == DXGI_FORMAT_R32_TYPELESS && (desc->u.Buffer.Flags & VKD3D_VIEW_RAW_BUFFER)) || desc->Format == DXGI_FORMAT_R32_UINT) { - const struct vkd3d_format *format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + const struct vkd3d_format *format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); descriptor->uav.buffer.offset = desc->u.Buffer.FirstElement * format->byte_count; descriptor->uav.buffer.size = desc->u.Buffer.NumElements * format->byte_count; @@ -2367,7 +2367,7 @@ bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, const struct vkd3d_format *format; struct d3d12_resource *resource; - format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, gpu_address); return vkd3d_create_vk_buffer_view(device, resource, format, gpu_address - resource->gpu_address, VK_WHOLE_SIZE, vk_buffer_view); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 054a9ae..2b7059c 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1969,8 +1969,8 @@ static bool is_dual_source_blending(const D3D12_RENDER_TARGET_BLEND_DESC *desc) || is_dual_source_blending_blend(desc->DestBlendAlpha)); } -static HRESULT compute_input_layout_offsets(const D3D12_INPUT_LAYOUT_DESC *input_layout_desc, - uint32_t *offsets) +static HRESULT compute_input_layout_offsets(const struct d3d12_device *device, + const D3D12_INPUT_LAYOUT_DESC *input_layout_desc, uint32_t *offsets) { uint32_t input_slot_offsets[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT] = {0}; const D3D12_INPUT_ELEMENT_DESC *e; @@ -1993,7 +1993,7 @@ static HRESULT compute_input_layout_offsets(const D3D12_INPUT_LAYOUT_DESC *input return E_INVALIDARG; } - if (!(format = vkd3d_get_format(e->Format, false))) + if (!(format = vkd3d_get_format(device, e->Format, false))) { WARN("Invalid input element format %#x.\n", e->Format); return E_INVALIDARG; @@ -2145,7 +2145,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s { const D3D12_DEPTH_STENCIL_DESC *ds_desc = &desc->DepthStencilState; - if (!(format = vkd3d_get_format(desc->DSVFormat, true))) + if (!(format = vkd3d_get_format(device, desc->DSVFormat, true))) { WARN("Invalid DSV format %#x.\n", desc->DSVFormat); hr = E_INVALIDARG; @@ -2183,7 +2183,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s const D3D12_RENDER_TARGET_BLEND_DESC *rt_desc; size_t idx = graphics->rt_idx + i; - if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) + if (!(format = vkd3d_get_format(device, desc->RTVFormats[i], false))) { WARN("Invalid RTV format %#x.\n", desc->RTVFormats[i]); hr = E_INVALIDARG; @@ -2368,7 +2368,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } - if (FAILED(hr = compute_input_layout_offsets(&desc->InputLayout, aligned_offsets))) + if (FAILED(hr = compute_input_layout_offsets(device, &desc->InputLayout, aligned_offsets))) goto fail; graphics->instance_divisor_count = 0; @@ -2377,7 +2377,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s const D3D12_INPUT_ELEMENT_DESC *e = &desc->InputLayout.pInputElementDescs[i]; const struct vkd3d_shader_signature_element *signature_element; - if (!(format = vkd3d_get_format(e->Format, false))) + if (!(format = vkd3d_get_format(device, e->Format, false))) { WARN("Invalid input element format %#x.\n", e->Format); hr = E_INVALIDARG; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index afa4da3..06a958d 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -136,10 +136,13 @@ static const struct vkd3d_format vkd3d_depth_stencil_formats[] = * properly support typeless formats because depth/stencil formats are only * compatible with themselves in Vulkan. */ -static const struct vkd3d_format *vkd3d_get_depth_stencil_format(DXGI_FORMAT dxgi_format) +static const struct vkd3d_format *vkd3d_get_depth_stencil_format(const struct d3d12_device *device, + DXGI_FORMAT dxgi_format) { unsigned int i; + assert(device); + for (i = 0; i < ARRAY_SIZE(vkd3d_depth_stencil_formats); ++i) { if (vkd3d_depth_stencil_formats[i].dxgi_format == dxgi_format) @@ -149,12 +152,13 @@ static const struct vkd3d_format *vkd3d_get_depth_stencil_format(DXGI_FORMAT dxg return NULL; } -const struct vkd3d_format *vkd3d_get_format(DXGI_FORMAT dxgi_format, bool depth_stencil) +const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, + DXGI_FORMAT dxgi_format, bool depth_stencil) { const struct vkd3d_format *format; unsigned int i; - if (depth_stencil && (format = vkd3d_get_depth_stencil_format(dxgi_format))) + if (depth_stencil && (format = vkd3d_get_depth_stencil_format(device, dxgi_format))) return format; for (i = 0; i < ARRAY_SIZE(vkd3d_formats); ++i) @@ -170,7 +174,7 @@ VkFormat vkd3d_get_vk_format(DXGI_FORMAT format) { const struct vkd3d_format *vkd3d_format; - if (!(vkd3d_format = vkd3d_get_format(format, false))) + if (!(vkd3d_format = vkd3d_get_format(NULL, format, false))) return VK_FORMAT_UNDEFINED; return vkd3d_format->vk_format; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0de0abf..915f634 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1034,14 +1034,15 @@ static inline bool vkd3d_format_is_compressed(const struct vkd3d_format *format) return format->block_byte_count != 1; } -const struct vkd3d_format *vkd3d_get_format(DXGI_FORMAT dxgi_format, bool depth_stencil) DECLSPEC_HIDDEN; +const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, + DXGI_FORMAT dxgi_format, bool depth_stencil) DECLSPEC_HIDDEN; bool dxgi_format_is_typeless(DXGI_FORMAT dxgi_format) DECLSPEC_HIDDEN; static inline const struct vkd3d_format *vkd3d_format_from_d3d12_resource_desc( const struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, DXGI_FORMAT view_format) { - return vkd3d_get_format(view_format ? view_format : desc->Format, + return vkd3d_get_format(device, view_format ? view_format : desc->Format, desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL); }

1 0

Józef Kucia : vkd3d: Pass device to vkd3d_format_from_d3d12_resource_desc().
by Alexandre Julliard 09 May '19

09 May '19

Module: vkd3d Branch: master Commit: 7c8ce3c51c156a5f0fddd438a4dbe30d67ca4c54 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7c8ce3c51c156a5f0fddd43… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 7 15:37:01 2019 +0200 vkd3d: Pass device to vkd3d_format_from_d3d12_resource_desc(). 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/command.c | 34 ++++++++++++++++++++-------------- libs/vkd3d/device.c | 5 +++-- libs/vkd3d/resource.c | 8 +++++--- libs/vkd3d/vkd3d_private.h | 2 +- 4 files changed, 29 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=7c8ce3c51c156a5f0fd…

1 0

Alexandre Julliard : webservices: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 08 May '19

08 May '19

Module: wine Branch: master Commit: 08a899d433e5b638b5cc18d5c81330dea38d7c04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08a899d433e5b638b5cc18d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 08:35:31 2019 -0500 webservices: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/url.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index fd8d33a..1ffcc13 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -39,19 +39,19 @@ static const WCHAR netpipe[] = {'n','e','t','.','p','i','p','e'}; static WS_URL_SCHEME_TYPE scheme_type( const WCHAR *str, ULONG len ) { - if (len == ARRAY_SIZE( http ) && !memicmpW( str, http, ARRAY_SIZE( http ))) + if (len == ARRAY_SIZE( http ) && !strncmpiW( str, http, ARRAY_SIZE( http ))) return WS_URL_HTTP_SCHEME_TYPE; - if (len == ARRAY_SIZE( https ) && !memicmpW( str, https, ARRAY_SIZE( https ))) + if (len == ARRAY_SIZE( https ) && !strncmpiW( str, https, ARRAY_SIZE( https ))) return WS_URL_HTTPS_SCHEME_TYPE; - if (len == ARRAY_SIZE( nettcp ) && !memicmpW( str, nettcp, ARRAY_SIZE( nettcp ))) + if (len == ARRAY_SIZE( nettcp ) && !strncmpiW( str, nettcp, ARRAY_SIZE( nettcp ))) return WS_URL_NETTCP_SCHEME_TYPE; - if (len == ARRAY_SIZE( soapudp ) && !memicmpW( str, soapudp, ARRAY_SIZE( soapudp ))) + if (len == ARRAY_SIZE( soapudp ) && !strncmpiW( str, soapudp, ARRAY_SIZE( soapudp ))) return WS_URL_SOAPUDP_SCHEME_TYPE; - if (len == ARRAY_SIZE( netpipe ) && !memicmpW( str, netpipe, ARRAY_SIZE( netpipe ))) + if (len == ARRAY_SIZE( netpipe ) && !strncmpiW( str, netpipe, ARRAY_SIZE( netpipe ))) return WS_URL_NETPIPE_SCHEME_TYPE; return ~0u;

1 0

Alexandre Julliard : wbemprox: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 08 May '19

08 May '19

Module: wine Branch: master Commit: cea239e9051e8f343c1866cd8667a71fa33af4b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cea239e9051e8f343c1866cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 08:35:23 2019 -0500 wbemprox: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wbemlocator.c | 9 ++++----- dlls/wbemprox/wql.y | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index fe26a87..998dc0e 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -101,8 +101,8 @@ static BOOL is_local_machine( const WCHAR *server ) static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **namespace ) { static const WCHAR rootW[] = {'R','O','O','T'}; - static const WCHAR cimv2W[] = {'C','I','M','V','2'}; - static const WCHAR defaultW[] = {'D','E','F','A','U','L','T'}; + static const WCHAR cimv2W[] = {'C','I','M','V','2',0}; + static const WCHAR defaultW[] = {'D','E','F','A','U','L','T',0}; HRESULT hr = WBEM_E_INVALID_NAMESPACE; const WCHAR *p, *q; unsigned int len; @@ -133,7 +133,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na p = q; while (*q && *q != '\\' && *q != '/') q++; len = q - p; - if (len >= ARRAY_SIZE( rootW ) && memicmpW( rootW, p, len )) goto done; + if (len >= ARRAY_SIZE( rootW ) && strncmpiW( rootW, p, len )) goto done; if (!*q) { hr = S_OK; @@ -141,8 +141,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na } q++; len = strlenW( q ); - if ((len != ARRAY_SIZE( cimv2W ) || memicmpW( q, cimv2W, len )) && - (len != ARRAY_SIZE( defaultW ) || memicmpW( q, defaultW, len ))) + if (strcmpiW( q, cimv2W ) && strcmpiW( q, defaultW )) goto done; if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 75ce5b0..236a37d 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -579,7 +579,7 @@ static int cmp_keyword( const void *arg1, const void *arg2 ) int len = min( key1->len, key2->len ); int ret; - if ((ret = memicmpW( key1->name, key2->name, len ))) return ret; + if ((ret = strncmpiW( key1->name, key2->name, len ))) return ret; if (key1->len < key2->len) return -1; else if (key1->len > key2->len) return 1; return 0;

1 0

Alexandre Julliard : userenv: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 08 May '19

08 May '19

Module: wine Branch: master Commit: 3c53e06b7bfa7aaccd068e910185f23b788c83de URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c53e06b7bfa7aaccd068e91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 08:35:15 2019 -0500 userenv: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/userenv_main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 11a4f75..4a38c9a 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -111,15 +111,13 @@ static void set_registry_variables(WCHAR **env, HKEY hkey, DWORD type, BOOL set_ if (ret != ERROR_SUCCESS) break; - if (!memicmpW(name, SystemRootW, ARRAY_SIZE(SystemRootW))) - continue; - if (!memicmpW(name, SystemDriveW, ARRAY_SIZE(SystemDriveW))) - continue; + if (!strcmpiW(name, SystemRootW)) continue; + if (!strcmpiW(name, SystemDriveW)) continue; RtlInitUnicodeString(&us_name, name); us_value.Buffer = value; us_value.MaximumLength = sizeof(value); - if (!memicmpW(name, PATHW, ARRAY_SIZE(PATHW)) && + if (!strncmpiW(name, PATHW, ARRAY_SIZE(PATHW)) && !RtlQueryEnvironmentVariable_U(*env, &us_name, &us_value)) { if (!set_path)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019