October 2019 - Wine-Devel - list.winehq.org

[PATCH v2] ddraw: implement Pick() and GetPickRecords().
by MattKC Nov. 7, 2019

Nov. 7, 2019

3 5

[PATCH 1/1] wininet: Ensure ssl_ctx are empty in case of error
by Roberto Pungartnik Nov. 6, 2019

Nov. 6, 2019

2 2

[PATCH v4 2/7] kernel32: Handle GEOCLASS_REGION in Get/SetUserGeoID.
by João Diogo Ferreira Nov. 5, 2019

Nov. 5, 2019

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 172368 V4: Include documentation. V3: Fix build error. V2: Introduce trace logs. --- dlls/kernel32/locale.c | 66 ++++++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 884709730c..cee501278a 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3996,12 +3996,22 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) /****************************************************************************** * GetUserGeoID (KERNEL32.@) + * + * Retrieves the ID of the user's geographic nation or region. + * + * PARAMS + * GeoClass [I] One of GEOCLASS_NATION or GEOCLASS_REGION (SYSGEOCLASS enum from "winnls.h"). + * + * RETURNS + * SUCCESS: The ID of the specified geographic class. + * FAILURE: GEOID_NOT_AVAILABLE. */ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) { GEOID ret = GEOID_NOT_AVAILABLE; static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; WCHAR bufferW[40], *end; HANDLE hkey, hsubkey = 0; UNICODE_STRING keyW; @@ -4009,20 +4019,29 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) DWORD count = sizeof(bufferW); RtlInitUnicodeString(&keyW, nationW); + if (geoclass == GEOCLASS_NATION) + { + TRACE("(GEOCLASS_NATION)\n"); + RtlInitUnicodeString(&keyW, nationW); + } + else if (geoclass == GEOCLASS_REGION) + { + TRACE("(GEOCLASS_REGION)\n"); + RtlInitUnicodeString(&keyW, regionW); + } + else + { + WARN("Unknown geoclass %d\n", geoclass); + return ret; + } + if (!(hkey = create_registry_key())) return ret; - switch (geoclass) { - case GEOCLASS_NATION: - if ((hsubkey = NLS_RegOpenKey(hkey, geoW))) - { - if ((NtQueryValueKey(hsubkey, &keyW, KeyValuePartialInformation, - bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) - ret = strtolW((const WCHAR*)info->Data, &end, 10); - } - break; - case GEOCLASS_REGION: - FIXME("GEOCLASS_REGION not handled yet\n"); - break; + if ((hsubkey = NLS_RegOpenKey(hkey, geoW))) + { + if((NtQueryValueKey(hsubkey, &keyW, KeyValuePartialInformation, + bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) + ret = strtolW((const WCHAR*)info->Data, &end, 10); } NtClose(hkey); @@ -4035,15 +4054,26 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) */ BOOL WINAPI SetUserGeoID(GEOID geoid) { + const struct geoinfo_t *geoinfo = get_geoinfo_dataptr(geoid); static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; static const WCHAR formatW[] = {'%','i',0}; UNICODE_STRING nameW, keyW; WCHAR bufferW[10]; OBJECT_ATTRIBUTES attr; HANDLE hkey; - if (!(hkey = create_registry_key())) return FALSE; + if (!geoinfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!(hkey = create_registry_key())) + { + SetLastError(ERROR_INTERNAL_ERROR); + return FALSE; + } attr.Length = sizeof(attr); attr.RootDirectory = hkey; @@ -4052,16 +4082,20 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; RtlInitUnicodeString(&nameW, geoW); - RtlInitUnicodeString(&keyW, nationW); - if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) + if (geoinfo->kind == LOCATION_NATION) + RtlInitUnicodeString(&keyW, nationW); + else + RtlInitUnicodeString(&keyW, regionW); + if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) { NtClose(attr.RootDirectory); + SetLastError(ERROR_INTERNAL_ERROR); return FALSE; } - sprintfW(bufferW, formatW, geoid); + sprintfW(bufferW, formatW, geoinfo->id); NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); NtClose(attr.RootDirectory); NtClose(hkey); -- 2.23.0

3 3

[PATCH] wine.inf: add registry value for DigitalProductId
by Louis Lenders Nov. 5, 2019

Nov. 5, 2019

2 2

[PATCH 0/4] Add support for Vulkan shared memory in wine.
by Derek Lesho Nov. 5, 2019

Nov. 5, 2019

This patchset adds support for Vulkan shared memory in wine, which can in turn be used by API layers like DXVK or D9VK to support D3D shared resources. The final commit in the patchset adds a wine extension allowing layers to associate a custom struct describing a resource, so that they can recreate it with no outside information. In the case of DXVK and D3D11 shared resources, this is a D3D11_COMMON_TEXTURE_DESC. While this is the simplest solution, it may be a better idea to define a standard structure/s, so that interop between i.e. DXVK and vkd3d would be possible. Keep in mind that this functionality may also be used for resources other than textures/surfaces, like synchronization primtives. Derek Lesho (4): server: Implement GPU Resource object type. ntdll: Add custom helpers for interfacing with GPU Resource objects. winevulkan: Add support for VK_KHR_external_memory_fd. server,ntdll: Allow storage of API data inside of GPU Resource objects. dlls/ntdll/Makefile.in | 1 + dlls/ntdll/gpu_resource.c | 128 ++++++++++++ dlls/ntdll/ntdll.spec | 6 + dlls/winevulkan/make_vulkan | 11 +- dlls/winevulkan/vulkan.c | 336 +++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_private.h | 26 +++ server/Makefile.in | 1 + server/gpu_resource.c | 339 +++++++++++++++++++++++++++++++ server/protocol.def | 41 ++++ 9 files changed, 878 insertions(+), 11 deletions(-) create mode 100644 dlls/ntdll/gpu_resource.c create mode 100644 server/gpu_resource.c -- 2.23.0

2 12

[PATCH v3 1/2] vkd3d: Allocate one large buffer for a heap and offset into it.
by Hans-Kristian Arntzen Nov. 4, 2019

Nov. 4, 2019

Greatly reduce VA allocations we have to make and makes returned VA more sensible, and better matches returned VAs we see on native drivers. D3D12 usage flags for buffers seem generic enough that there is no obvious benefit to place smaller VkBuffers on top of VkDeviceMemory. Ideally, physical_buffer_address is used here, but this works as a good fallback if that path is added later. With this patch and previous VA optimization, I'm observing a 2.0-2.5% FPS uplift on SOTTR when CPU bound. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- libs/vkd3d/command.c | 15 +++-- libs/vkd3d/resource.c | 135 ++++++++++++++++++++++++++++++++----- libs/vkd3d/vkd3d_private.h | 2 + 3 files changed, 130 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d420863..4f74fa4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3031,8 +3031,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12Graphics d3d12_command_list_end_current_render_pass(list); - buffer_copy.srcOffset = src_offset; - buffer_copy.dstOffset = dst_offset; + buffer_copy.srcOffset = src_offset + src_resource->heap_offset; + buffer_copy.dstOffset = dst_offset + dst_resource->heap_offset; buffer_copy.size = byte_count; VK_CALL(vkCmdCopyBuffer(list->vk_command_buffer, @@ -3341,6 +3341,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic vk_image_buffer_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, src->u.SubresourceIndex, &src_resource->desc, dst_format, src_box, dst_x, dst_y, dst_z); + buffer_image_copy.bufferOffset += dst_resource->heap_offset; VK_CALL(vkCmdCopyImageToBuffer(list->vk_command_buffer, src_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_resource->u.vk_buffer, 1, &buffer_image_copy)); @@ -3370,6 +3371,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &src->u.PlacedFootprint, dst->u.SubresourceIndex, &dst_resource->desc, src_format, src_box, dst_x, dst_y, dst_z); + buffer_image_copy.bufferOffset += src_resource->heap_offset; VK_CALL(vkCmdCopyBufferToImage(list->vk_command_buffer, src_resource->u.vk_buffer, dst_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &buffer_image_copy)); @@ -3450,8 +3452,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm assert(d3d12_resource_is_buffer(src_resource)); assert(src_resource->desc.Width == dst_resource->desc.Width); - vk_buffer_copy.srcOffset = 0; - vk_buffer_copy.dstOffset = 0; + vk_buffer_copy.srcOffset = src_resource->heap_offset; + vk_buffer_copy.dstOffset = dst_resource->heap_offset; vk_buffer_copy.size = dst_resource->desc.Width; VK_CALL(vkCmdCopyBuffer(list->vk_command_buffer, src_resource->u.vk_buffer, dst_resource->u.vk_buffer, 1, &vk_buffer_copy)); @@ -3842,8 +3844,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.buffer = resource->u.vk_buffer; - vk_barrier.offset = 0; - vk_barrier.size = VK_WHOLE_SIZE; + vk_barrier.offset = resource->heap_offset; + vk_barrier.size = resource->desc.Width; VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, src_stage_mask, dst_stage_mask, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); @@ -4728,6 +4730,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID return; } + /* Offset from heap with placed buffers is already applied in CPU descriptor. */ VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, cpu_descriptor->uav.buffer.offset, cpu_descriptor->uav.buffer.size, values[0])); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6c9564b..c289fa8 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -292,6 +292,8 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_AddRef(ID3D12Heap *iface) return refcount; } +static ULONG d3d12_resource_decref(struct d3d12_resource *resource); + static void d3d12_heap_destroy(struct d3d12_heap *heap) { struct d3d12_device *device = heap->device; @@ -299,6 +301,9 @@ static void d3d12_heap_destroy(struct d3d12_heap *heap) TRACE("Destroying heap %p.\n", heap); + if (heap->buffer_resource) + d3d12_resource_decref(heap->buffer_resource); + vkd3d_private_store_destroy(&heap->private_store); VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL)); @@ -539,6 +544,12 @@ static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc, const struct d3d1 return S_OK; } +static HRESULT d3d12_resource_create(struct d3d12_device *device, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, + const D3D12_CLEAR_VALUE *optimized_clear_value, bool placed, + struct d3d12_resource **resource); + static HRESULT d3d12_heap_init(struct d3d12_heap *heap, struct d3d12_device *device, const D3D12_HEAP_DESC *desc, const struct d3d12_resource *resource) { @@ -546,6 +557,9 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, VkDeviceSize vk_memory_size; HRESULT hr; int rc; + bool buffers_allowed; + D3D12_RESOURCE_DESC resource_desc; + D3D12_RESOURCE_STATES initial_resource_state; heap->ID3D12Heap_iface.lpVtbl = &d3d12_heap_vtbl; heap->refcount = 1; @@ -556,6 +570,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, heap->map_ptr = NULL; heap->map_count = 0; + heap->buffer_resource = NULL; if (!heap->desc.Properties.CreationNodeMask) heap->desc.Properties.CreationNodeMask = 1; @@ -583,6 +598,53 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, return hr; } + buffers_allowed = !(heap->desc.Flags & D3D12_HEAP_FLAG_DENY_BUFFERS); + if (buffers_allowed && !resource) + { + /* Create a single omnipotent buffer which fills the entire heap. + * Whenever we place buffer resources on this heap, we'll just offset this VkBuffer. + * This allows us to keep VA space somewhat sane, and keeps number of (limited) VA allocations down. + * One possible downside is that the buffer might be slightly slower to access, + * but D3D12 has very lenient usage flags for buffers. */ + + memset(&resource_desc, 0, sizeof(resource_desc)); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Width = desc->SizeInBytes; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.SampleDesc.Count = 1; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + + switch (desc->Properties.Type) + { + case D3D12_HEAP_TYPE_UPLOAD: + initial_resource_state = D3D12_RESOURCE_STATE_GENERIC_READ; + break; + + case D3D12_HEAP_TYPE_READBACK: + initial_resource_state = D3D12_RESOURCE_STATE_COPY_DEST; + break; + + default: + /* Upload and readback heaps do not allow UAV access, only enable this flag for other heaps. */ + resource_desc.Flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; + initial_resource_state = D3D12_RESOURCE_STATE_COMMON; + break; + } + + if (FAILED(hr = d3d12_resource_create(device, &desc->Properties, desc->Flags, + &resource_desc, initial_resource_state, + NULL, false, &heap->buffer_resource))) + { + heap->buffer_resource = NULL; + return hr; + } + /* This internal resource should not own a reference on the device. + * d3d12_resource_create takes a reference on the device. */ + d3d12_device_release(device); + } + if (resource) { if (d3d12_resource_is_buffer(resource)) @@ -600,8 +662,16 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, heap->desc.SizeInBytes = vk_memory_size; } + else if (heap->buffer_resource) + { + hr = vkd3d_allocate_buffer_memory(device, heap->buffer_resource->u.vk_buffer, + &heap->desc.Properties, heap->desc.Flags, + &heap->vk_memory, &heap->vk_memory_type, &vk_memory_size); + } else { + /* Allocate generic memory which should hopefully match up with whatever resources + * we want to place here. */ memory_requirements.size = heap->desc.SizeInBytes; memory_requirements.alignment = heap->desc.Alignment; memory_requirements.memoryTypeBits = ~(uint32_t)0; @@ -614,6 +684,11 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, { vkd3d_private_store_destroy(&heap->private_store); pthread_mutex_destroy(&heap->mutex); + if (heap->buffer_resource) + { + d3d12_resource_decref(heap->buffer_resource); + heap->buffer_resource = NULL; + } return hr; } @@ -1003,13 +1078,16 @@ static void d3d12_resource_destroy(struct d3d12_resource *resource, struct d3d12 if (resource->flags & VKD3D_RESOURCE_EXTERNAL) return; - if (resource->gpu_address) - vkd3d_gpu_va_allocator_free(&device->gpu_va_allocator, resource->gpu_address); + if (!(resource->flags & VKD3D_RESOURCE_PLACED_BUFFER)) + { + if (resource->gpu_address) + vkd3d_gpu_va_allocator_free(&device->gpu_va_allocator, resource->gpu_address); - if (d3d12_resource_is_buffer(resource)) - VK_CALL(vkDestroyBuffer(device->vk_device, resource->u.vk_buffer, NULL)); - else - VK_CALL(vkDestroyImage(device->vk_device, resource->u.vk_image, NULL)); + if (d3d12_resource_is_buffer(resource)) + VK_CALL(vkDestroyBuffer(device->vk_device, resource->u.vk_buffer, NULL)); + else + VK_CALL(vkDestroyImage(device->vk_device, resource->u.vk_image, NULL)); + } if (resource->flags & VKD3D_RESOURCE_DEDICATED_HEAP) d3d12_heap_destroy(resource->heap); @@ -1669,7 +1747,7 @@ static bool d3d12_resource_validate_heap_properties(const struct d3d12_resource static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value) + const D3D12_CLEAR_VALUE *optimized_clear_value, bool placed) { HRESULT hr; @@ -1699,6 +1777,8 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->gpu_address = 0; resource->flags = 0; + if (placed && d3d12_resource_is_buffer(resource)) + resource->flags |= VKD3D_RESOURCE_PLACED_BUFFER; if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc))) return hr; @@ -1706,6 +1786,13 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: + /* We'll inherit a VkBuffer reference from the heap with an implied offset. */ + if (placed) + { + resource->u.vk_buffer = VK_NULL_HANDLE; + break; + } + if (FAILED(hr = vkd3d_create_buffer(device, heap_properties, heap_flags, &resource->desc, &resource->u.vk_buffer))) return hr; @@ -1755,7 +1842,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 static HRESULT d3d12_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) + const D3D12_CLEAR_VALUE *optimized_clear_value, bool placed, struct d3d12_resource **resource) { struct d3d12_resource *object; HRESULT hr; @@ -1764,7 +1851,7 @@ static HRESULT d3d12_resource_create(struct d3d12_device *device, return E_OUTOFMEMORY; if (FAILED(hr = d3d12_resource_init(object, device, heap_properties, heap_flags, - desc, initial_state, optimized_clear_value))) + desc, initial_state, optimized_clear_value, placed))) { vkd3d_free(object); return hr; @@ -1806,7 +1893,7 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, } if (FAILED(hr = d3d12_resource_create(device, heap_properties, heap_flags, - desc, initial_state, optimized_clear_value, &object))) + desc, initial_state, optimized_clear_value, false, &object))) return hr; if (FAILED(hr = vkd3d_allocate_resource_memory(device, object, heap_properties, heap_flags))) @@ -1830,6 +1917,16 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, VkMemoryRequirements requirements; VkResult vr; + if (resource->flags & VKD3D_RESOURCE_PLACED_BUFFER) + { + /* Just inherit the buffer from the heap. */ + resource->u.vk_buffer = heap->buffer_resource->u.vk_buffer; + resource->heap = heap; + resource->heap_offset = heap_offset; + resource->gpu_address = heap->buffer_resource->gpu_address + heap_offset; + return S_OK; + } + if (d3d12_resource_is_buffer(resource)) VK_CALL(vkGetBufferMemoryRequirements(vk_device, resource->u.vk_buffer, &requirements)); else @@ -1879,7 +1976,7 @@ HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_h HRESULT hr; if (FAILED(hr = d3d12_resource_create(device, &heap->desc.Properties, heap->desc.Flags, - desc, initial_state, optimized_clear_value, &object))) + desc, initial_state, optimized_clear_value, true, &object))) return hr; if (FAILED(hr = vkd3d_bind_heap_memory(device, object, heap, heap_offset))) @@ -1903,7 +2000,7 @@ HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, HRESULT hr; if (FAILED(hr = d3d12_resource_create(device, NULL, 0, - desc, initial_state, optimized_clear_value, &object))) + desc, initial_state, optimized_clear_value, false, &object))) return hr; TRACE("Created reserved resource %p.\n", object); @@ -2205,7 +2302,7 @@ static bool vkd3d_create_buffer_view_for_resource(struct d3d12_device *device, assert(d3d12_resource_is_buffer(resource)); return vkd3d_create_buffer_view(device, resource->u.vk_buffer, - format, offset * element_size, size * element_size, view); + format, resource->heap_offset + offset * element_size, size * element_size, view); } static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, @@ -2807,7 +2904,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); if (!vkd3d_create_vk_buffer_view(device, counter_resource->u.vk_buffer, format, - desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view->vk_counter_view)) + desc->u.Buffer.CounterOffsetInBytes + resource->heap_offset, sizeof(uint32_t), &view->vk_counter_view)) { WARN("Failed to create counter buffer view.\n"); view->vk_counter_view = VK_NULL_HANDLE; @@ -2821,7 +2918,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ { 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.offset = desc->u.Buffer.FirstElement * format->byte_count + resource->heap_offset; descriptor->uav.buffer.size = desc->u.Buffer.NumElements * format->byte_count; } } @@ -2913,12 +3010,18 @@ bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, { const struct vkd3d_format *format; struct d3d12_resource *resource; + uint64_t range; + uint64_t offset; format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, gpu_address); assert(d3d12_resource_is_buffer(resource)); + + offset = gpu_address - resource->gpu_address; + range = min(resource->desc.Width - offset, device->vk_info.device_limits.maxStorageBufferRange); + return vkd3d_create_vk_buffer_view(device, resource->u.vk_buffer, format, - gpu_address - resource->gpu_address, VK_WHOLE_SIZE, vk_buffer_view); + offset, range, vk_buffer_view); } /* samplers */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a5f7c81..2b1ae30 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -380,6 +380,7 @@ struct d3d12_heap unsigned int map_count; uint32_t vk_memory_type; + struct d3d12_resource *buffer_resource; struct d3d12_device *device; struct vkd3d_private_store private_store; @@ -394,6 +395,7 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) DECLSPEC_HIDDE #define VKD3D_RESOURCE_EXTERNAL 0x00000004 #define VKD3D_RESOURCE_DEDICATED_HEAP 0x00000008 #define VKD3D_RESOURCE_LINEAR_TILING 0x00000010 +#define VKD3D_RESOURCE_PLACED_BUFFER 0x00000020 /* ID3D12Resource */ struct d3d12_resource -- 2.23.0

2 2

[PATCH v3 1/6] xmllite: Use empty_element to store various names.
by Jeff Smith Nov. 4, 2019

Nov. 4, 2019

Rather than maintain global state for prefix, local name, and qualified name, always determine the value based on node type. For the xml declaration, DTD, and processing instruction nodes it is reasonable to place those into empty_element fields. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/xmllite/reader.c | 171 +++++++++++++++--------------------- dlls/xmllite/tests/reader.c | 5 +- 2 files changed, 72 insertions(+), 104 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e813ca37fe..dd033f37c5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -74,15 +74,6 @@ typedef enum XmlReadResume_Last } XmlReaderResume; -typedef enum -{ - StringValue_LocalName, - StringValue_Prefix, - StringValue_QualifiedName, - StringValue_Value, - StringValue_Last -} XmlReaderStringValue; - static const WCHAR usasciiW[] = {'U','S','-','A','S','C','I','I',0}; static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; static const WCHAR utf8W[] = {'U','T','F','-','8',0}; @@ -289,12 +280,12 @@ typedef struct struct list ns; struct list elements; int chunk_read_off; - strval strvalues[StringValue_Last]; + strval strvalue; UINT depth; UINT max_depth; BOOL is_empty_element; struct element empty_element; /* used for empty elements without end tag <a />, - and to keep <?xml reader position */ + xml declaration, DTD, and processing instructions */ UINT resume[XmlReadResume_Last]; /* offsets used to resume reader */ } xmlreader; @@ -484,18 +475,6 @@ static inline void reader_init_cstrvalue(WCHAR *str, UINT len, strval *v) v->str = str; } -static void reader_free_strvalue(xmlreader *reader, XmlReaderStringValue type) -{ - reader_free_strvalued(reader, &reader->strvalues[type]); -} - -static void reader_free_strvalues(xmlreader *reader) -{ - int type; - for (type = 0; type < StringValue_Last; type++) - reader_free_strvalue(reader, type); -} - /* This helper should only be used to test if strings are the same, it doesn't try to sort. */ static inline int strval_eq(const xmlreader *reader, const strval *str1, const strval *str2) @@ -515,6 +494,7 @@ static void reader_clear_elements(xmlreader *reader) reader_free(reader, elem); } list_init(&reader->elements); + reader_free_strvalued(reader, &reader->empty_element.prefix); reader_free_strvalued(reader, &reader->empty_element.localname); reader_free_strvalued(reader, &reader->empty_element.qname); reader->is_empty_element = FALSE; @@ -669,37 +649,27 @@ static void reader_pop_element(xmlreader *reader) /* Always make a copy, cause strings are supposed to be null terminated. Null pointer for 'value' means node value is to be determined. */ -static void reader_set_strvalue(xmlreader *reader, XmlReaderStringValue type, const strval *value) +static void reader_set_strvalue(xmlreader *reader, const strval *value) { - strval *v = &reader->strvalues[type]; + strval *v = &reader->strvalue; - reader_free_strvalue(reader, type); + reader_free_strvalued(reader, v); if (!value) { v->str = NULL; v->start = 0; v->len = 0; - return; } - - if (value->str == strval_empty.str) + else if (value->str == strval_empty.str) + { *v = *value; + } else { - if (type == StringValue_Value) - { - /* defer allocation for value string */ - v->str = NULL; - v->start = value->start; - v->len = value->len; - } - else - { - v->str = reader_alloc(reader, (value->len + 1)*sizeof(WCHAR)); - memcpy(v->str, reader_get_strptr(reader, value), value->len*sizeof(WCHAR)); - v->str[value->len] = 0; - v->len = value->len; - } + /* defer allocation for value string */ + v->str = NULL; + v->start = value->start; + v->len = value->len; } } @@ -1414,8 +1384,8 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) reader->nodetype = XmlNodeType_XmlDeclaration; reader->empty_element.position = position; - reader_set_strvalue(reader, StringValue_LocalName, &strval_xml); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_xml); + reader_strvaldup(reader, &strval_xml, &reader->empty_element.localname); + reader_strvaldup(reader, &strval_xml, &reader->empty_element.qname); return S_OK; } @@ -1441,7 +1411,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader->nodetype = XmlNodeType_Comment; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_Comment; - reader_set_strvalue(reader, StringValue_Value, NULL); + reader_set_strvalue(reader, NULL); } /* will exit when there's no more data, it won't attempt to @@ -1462,7 +1432,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) /* skip rest of markup '->' */ reader_skipn(reader, 3); - reader_set_strvalue(reader, StringValue_Value, &value); + reader_set_strvalue(reader, &value); reader->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; return S_OK; @@ -1648,9 +1618,11 @@ static HRESULT reader_parse_pi(xmlreader *reader) case XmlReadResumeState_PITarget: hr = reader_parse_pitarget(reader, &target); if (FAILED(hr)) return hr; - reader_set_strvalue(reader, StringValue_LocalName, &target); - reader_set_strvalue(reader, StringValue_QualifiedName, &target); - reader_set_strvalue(reader, StringValue_Value, &strval_empty); + reader_free_strvalued(reader, &reader->empty_element.localname); + reader_strvaldup(reader, &target, &reader->empty_element.localname); + reader_free_strvalued(reader, &reader->empty_element.qname); + reader_strvaldup(reader, &target, &reader->empty_element.qname); + reader_set_strvalue(reader, &strval_empty); reader->resumestate = XmlReadResumeState_PIBody; reader->resume[XmlReadResume_Body] = reader_get_cur(reader); default: @@ -1684,7 +1656,7 @@ static HRESULT reader_parse_pi(xmlreader *reader) reader->nodetype = XmlNodeType_ProcessingInstruction; reader->resumestate = XmlReadResumeState_Initial; reader->resume[XmlReadResume_Body] = 0; - reader_set_strvalue(reader, StringValue_Value, &value); + reader_set_strvalue(reader, &value); return S_OK; } } @@ -1706,9 +1678,7 @@ static HRESULT reader_parse_whitespace(xmlreader *reader) reader->resumestate = XmlReadResumeState_Whitespace; reader->resume[XmlReadResume_Body] = reader_get_cur(reader); reader->nodetype = XmlNodeType_Whitespace; - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); - reader_set_strvalue(reader, StringValue_Value, &strval_empty); + reader_set_strvalue(reader, &strval_empty); /* fallthrough */ case XmlReadResumeState_Whitespace: { @@ -1720,7 +1690,7 @@ static HRESULT reader_parse_whitespace(xmlreader *reader) start = reader->resume[XmlReadResume_Body]; reader_init_strvalue(start, reader_get_cur(reader)-start, &value); - reader_set_strvalue(reader, StringValue_Value, &value); + reader_set_strvalue(reader, &value); TRACE("%s\n", debug_strval(reader, &value)); reader->resumestate = XmlReadResumeState_Initial; } @@ -1919,8 +1889,10 @@ static HRESULT reader_parse_dtd(xmlreader *reader) reader_skipn(reader, 1); reader->nodetype = XmlNodeType_DocumentType; - reader_set_strvalue(reader, StringValue_LocalName, &name); - reader_set_strvalue(reader, StringValue_QualifiedName, &name); + reader_free_strvalued(reader, &reader->empty_element.localname); + reader_strvaldup(reader, &name, &reader->empty_element.localname); + reader_free_strvalued(reader, &reader->empty_element.qname); + reader_strvaldup(reader, &name, &reader->empty_element.qname); return S_OK; } @@ -2342,9 +2314,7 @@ static HRESULT reader_parse_element(xmlreader *reader) reader->nodetype = XmlNodeType_Element; reader->resumestate = XmlReadResumeState_Initial; - reader_set_strvalue(reader, StringValue_Prefix, &prefix); - reader_set_strvalue(reader, StringValue_QualifiedName, &qname); - reader_set_strvalue(reader, StringValue_Value, &strval_empty); + reader_set_strvalue(reader, &strval_empty); break; } default: @@ -2386,7 +2356,6 @@ static HRESULT reader_parse_endtag(xmlreader *reader) reader->nodetype = XmlNodeType_EndElement; reader->is_empty_element = FALSE; - reader_set_strvalue(reader, StringValue_Prefix, &prefix); return S_OK; } @@ -2415,7 +2384,7 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader->nodetype = XmlNodeType_CDATA; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CDATA; - reader_set_strvalue(reader, StringValue_Value, NULL); + reader_set_strvalue(reader, NULL); } while (*ptr) @@ -2430,7 +2399,7 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader_skipn(reader, 3); TRACE("%s\n", debug_strval(reader, &value)); - reader_set_strvalue(reader, StringValue_Value, &value); + reader_set_strvalue(reader, &value); reader->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; return S_OK; @@ -2467,7 +2436,7 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader->nodetype = is_wchar_space(*ptr) ? XmlNodeType_Whitespace : XmlNodeType_Text; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CharData; - reader_set_strvalue(reader, StringValue_Value, NULL); + reader_set_strvalue(reader, NULL); } position = reader->position; @@ -2486,7 +2455,7 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader->empty_element.position = position; reader_init_strvalue(start, reader_get_cur(reader)-start, &value); - reader_set_strvalue(reader, StringValue_Value, &value); + reader_set_strvalue(reader, &value); reader->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; return S_OK; @@ -2732,7 +2701,7 @@ static void reader_reset_parser(xmlreader *reader) reader_clear_elements(reader); reader_clear_attrs(reader); reader_clear_ns(reader); - reader_free_strvalues(reader); + reader_free_strvalued(reader, &reader->strvalue); reader->depth = 0; reader->nodetype = XmlNodeType_None; @@ -2954,9 +2923,7 @@ static void reader_set_current_attribute(xmlreader *reader, struct attribute *at { reader->attr = attr; reader->chunk_read_off = 0; - reader_set_strvalue(reader, StringValue_Prefix, &attr->prefix); - reader_set_strvalue(reader, StringValue_QualifiedName, &attr->qname); - reader_set_strvalue(reader, StringValue_Value, &attr->value); + reader_set_strvalue(reader, &attr->value); } static HRESULT reader_move_to_first_attribute(xmlreader *reader) @@ -3115,20 +3082,8 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) This->attr = NULL; - /* FIXME: support other node types with 'attributes' like DTD */ - if (This->is_empty_element) { - reader_set_strvalue(This, StringValue_Prefix, &This->empty_element.prefix); - reader_set_strvalue(This, StringValue_QualifiedName, &This->empty_element.qname); - } - else { - struct element *element = LIST_ENTRY(list_head(&This->elements), struct element, entry); - if (element) { - reader_set_strvalue(This, StringValue_Prefix, &element->prefix); - reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); - } - } This->chunk_read_off = 0; - reader_set_strvalue(This, StringValue_Value, &strval_empty); + reader_set_strvalue(This, &strval_empty); return S_OK; } @@ -3136,6 +3091,7 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); + XmlNodeType nodetype; struct attribute *attribute = This->attr; struct element *element; UINT length; @@ -3145,7 +3101,7 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam if (!len) len = &length; - switch (reader_get_nodetype(This)) + switch ((nodetype = reader_get_nodetype(This))) { case XmlNodeType_Text: case XmlNodeType_CDATA: @@ -3175,8 +3131,8 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam *len = 5; } else if (attribute->prefix.len) { - *name = This->strvalues[StringValue_QualifiedName].str; - *len = This->strvalues[StringValue_QualifiedName].len; + *name = attribute->qname.str; + *len = attribute->qname.len; } else { @@ -3184,10 +3140,17 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam *len = attribute->localname.len; } break; - default: - *name = This->strvalues[StringValue_QualifiedName].str; - *len = This->strvalues[StringValue_QualifiedName].len; + case XmlNodeType_DocumentType: + case XmlNodeType_XmlDeclaration: + case XmlNodeType_ProcessingInstruction: + *name = This->empty_element.qname.str; + *len = This->empty_element.qname.len; break; + default: + FIXME("Unhandled node type %d\n", nodetype); + *name = NULL; + *len = 0; + return E_NOTIMPL; } return S_OK; @@ -3204,7 +3167,6 @@ static struct ns *reader_lookup_nsdef(xmlreader *reader) static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR **uri, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); - const strval *prefix = &This->strvalues[StringValue_Prefix]; XmlNodeType nodetype; struct ns *ns; UINT length; @@ -3222,7 +3184,8 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * case XmlNodeType_Element: case XmlNodeType_EndElement: { - ns = reader_lookup_ns(This, prefix); + struct element *element = reader_get_element(This); + ns = reader_lookup_ns(This, &element->prefix); /* pick top default ns if any */ if (!ns) @@ -3260,6 +3223,7 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); + XmlNodeType nodetype; struct element *element; UINT length; @@ -3268,7 +3232,7 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U if (!len) len = &length; - switch (reader_get_nodetype(This)) + switch ((nodetype = reader_get_nodetype(This))) { case XmlNodeType_Text: case XmlNodeType_CDATA: @@ -3286,10 +3250,17 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U case XmlNodeType_Attribute: reader_get_attribute_local_name(This, This->attr, name, len); break; - default: - *name = This->strvalues[StringValue_LocalName].str; - *len = This->strvalues[StringValue_LocalName].len; + case XmlNodeType_DocumentType: + case XmlNodeType_XmlDeclaration: + case XmlNodeType_ProcessingInstruction: + *name = This->empty_element.localname.str; + *len = This->empty_element.localname.len; break; + default: + FIXME("Unhandled node type %d\n", nodetype); + *name = NULL; + *len = 0; + return E_NOTIMPL; } return S_OK; @@ -3315,8 +3286,10 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, const WCHAR **ret, case XmlNodeType_EndElement: case XmlNodeType_Attribute: { - const strval *prefix = &This->strvalues[StringValue_Prefix]; struct ns *ns; + struct element *element = reader_get_element(This); + const strval *prefix = (nodetype == XmlNodeType_Attribute) ? + &This->attr->prefix : &element->prefix; if (strval_eq(This, prefix, &strval_xml)) { @@ -3369,7 +3342,7 @@ static const strval *reader_get_value(xmlreader *reader, BOOL ensure_allocated) break; } - val = &reader->strvalues[StringValue_Value]; + val = &reader->strvalue; if (!val->str && ensure_allocated) { WCHAR *ptr = reader_alloc(reader, (val->len+1)*sizeof(WCHAR)); @@ -3385,7 +3358,7 @@ static const strval *reader_get_value(xmlreader *reader, BOOL ensure_allocated) static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) { xmlreader *reader = impl_from_IXmlReader(iface); - const strval *val = &reader->strvalues[StringValue_Value]; + const strval *val = &reader->strvalue; UINT off; TRACE("(%p)->(%p %p)\n", reader, value, len); @@ -3651,7 +3624,6 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) { xmlreader *reader; HRESULT hr; - int i; TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); @@ -3679,8 +3651,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->max_depth = 256; reader->chunk_read_off = 0; - for (i = 0; i < StringValue_Last; i++) - reader->strvalues[i] = strval_empty; + reader->strvalue = strval_empty; hr = IXmlReader_QueryInterface(&reader->IXmlReader_iface, riid, obj); IXmlReader_Release(&reader->IXmlReader_iface); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 41adad1598..c93ee01fa1 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1320,10 +1320,9 @@ static void test_read_public_dtd(void) str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); -} + IXmlReader_Release(reader); } @@ -1373,10 +1372,8 @@ static void test_read_system_dtd(void) str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); -} read_node(reader, XmlNodeType_Comment); -- 2.21.0

2 7

Source of Bug Found.
by Thales Nov. 4, 2019

Nov. 4, 2019

Hello everyone, I was able to figure out the source of a bug for one of the bugs listed in Bugzilla. I wrote a little demo app with Windows API functions to show it. I hesitated to fix the problem in Wine, because the code is complex and therefore wasn't sure what the ramifications would be. How do I go about presenting this to those who deal with bugs? Many thanks for any feedback! Regards,John Alway

2 3

[PATCH v4 7/7] ddraw/tests: Port TnLHal device test to ddraw7.c
by David Adam Nov. 1, 2019

Nov. 1, 2019

2 1

[PATCH] find: First implementation
by Fabian Maurer Nov. 1, 2019

Nov. 1, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44975 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/find/Makefile.in | 4 +- programs/find/find.c | 170 ++++++++++++++++++++++++++++++++++++- programs/find/find.rc | 25 ++++++ programs/find/resources.h | 27 ++++++ programs/find/tests/find.c | 6 +- 5 files changed, 225 insertions(+), 7 deletions(-) create mode 100644 programs/find/find.rc create mode 100644 programs/find/resources.h diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in index 0c6b334f29..f572a371b4 100644 --- a/programs/find/Makefile.in +++ b/programs/find/Makefile.in @@ -1,5 +1,7 @@ MODULE = find.exe - +IMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = find.c + +RC_SRCS = find.rc diff --git a/programs/find/find.c b/programs/find/find.c index 0c8ba1fcd7..3794a8190f 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -16,18 +16,180 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> +#include <stdlib.h> +#include <shlwapi.h> + +#include "wine/heap.h" #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(find); +static BOOL read_char_from_handle(HANDLE handle, char *char_out) +{ + static char buffer[4096]; + static UINT buffer_max = 0; + static UINT buffer_pos = 0; + + /* Read next content into buffer */ + if (buffer_pos >= buffer_max) + { + BOOL success = ReadFile(handle, buffer, 4096, &buffer_max, NULL); + if (!success) + return FALSE; + buffer_pos = 0; + } + + *char_out = buffer[buffer_pos++]; + return TRUE; +} + +/* Read a line from a handle, returns NULL if the end is reached */ +static WCHAR* read_line_from_handle(HANDLE handle) +{ + int line_max = 4096; + int length = 0; + WCHAR *line_converted; + int line_converted_length; + BOOL success; + char *line = heap_alloc(line_max); + + for (;;) + { + char c; + success = read_char_from_handle(handle, &c); + + /* Check for EOF */ + if (!success) + { + if (length == 0) + return NULL; + else + break; + } + + if (c == '\n') + break; + + /* Make sure buffer is large enough */ + if (length + 1 >= line_max) + { + line_max *= 2; + line = heap_realloc(line, line_max); + } + + line[length++] = c; + } + + line[length] = 0; + if (length - 1 >= 0 && line[length - 1] == '\r') /* Strip \r of windows line endings */ + line[length - 1] = 0; + + line_converted_length = MultiByteToWideChar(CP_ACP, 0, line, -1, 0, 0); + line_converted = heap_alloc(line_converted_length * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, line, -1, line_converted, line_converted_length); + + heap_free(line); + + return line_converted; +} + +static void write_to_stdout(const WCHAR *str) +{ + char *str_converted; + UINT str_converted_length; + DWORD bytes_written; + UINT str_length = lstrlenW(str); + int codepage = CP_ACP; + + str_converted_length = WideCharToMultiByte(codepage, 0, str, str_length, NULL, 0, NULL, NULL); + str_converted = heap_alloc(str_converted_length); + WideCharToMultiByte(codepage, 0, str, str_length, str_converted, str_converted_length, NULL, NULL); + + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), str_converted, str_converted_length, &bytes_written, NULL); + if (bytes_written < str_converted_length) + ERR("Failed to write output\n"); + + heap_free(str_converted); +} + +static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind) +{ + void *found; + WCHAR lineending[] = {'\r', '\n', 0}; + + if (lstrlenW(line) == 0 || lstrlenW(tofind) == 0) + return FALSE; + + found = wcsstr(line, tofind); + + if (found) + { + write_to_stdout(line); + write_to_stdout(lineending); + return TRUE; + } + + return FALSE; +} + +static void output_resource_message(int id) +{ + WCHAR buffer[64]; + LoadStringW(GetModuleHandleW(NULL), id, buffer, ARRAY_SIZE(buffer)); + write_to_stdout(buffer); +} + int __cdecl wmain(int argc, WCHAR *argv[]) { + WCHAR *line; + WCHAR *tofind = NULL; int i; + int exitcode; + HANDLE input; - WINE_FIXME("stub:"); + TRACE("running find:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + { + TRACE(" %s", wine_dbgstr_w(argv[i])); + } + TRACE("\n"); + + input = GetStdHandle(STD_INPUT_HANDLE); + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + output_resource_message(IDS_INVALID_SWITCH); + return 2; + } + else if(tofind == NULL) + { + tofind = argv[i]; + } + else + { + FIXME("Searching files not supported yet\n"); + return 1000; + } + } + + if (tofind == NULL) + { + output_resource_message(IDS_INVALID_PARAMETER); + return 2; + } + + exitcode = 1; + while ((line = read_line_from_handle(input)) != NULL) + { + if (run_find_for_line(line, tofind)) + exitcode = 0; + + heap_free(line); + } - return 0; + return exitcode; } diff --git a/programs/find/find.rc b/programs/find/find.rc new file mode 100644 index 0000000000..8c358c8677 --- /dev/null +++ b/programs/find/find.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2019 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +STRINGTABLE +{ + IDS_INVALID_PARAMETER "FIND: Parameter format not correct\r\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\r\n" +} diff --git a/programs/find/resources.h b/programs/find/resources.h new file mode 100644 index 0000000000..2ebe197b7d --- /dev/null +++ b/programs/find/resources.h @@ -0,0 +1,27 @@ +/* + * Resource IDs + * + * Copyright 2019 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_FIND_RESOURCES_H +#define __WINE_FIND_RESOURCES_H + +#define IDS_INVALID_PARAMETER 1000 +#define IDS_INVALID_SWITCH 1001 + +#endif /* __WINE_FIND_RESOURCES_H */ diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index 8af21a53fa..147b59c8ce 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -90,7 +90,6 @@ static void check_find_output(const BYTE *child_output, int child_output_len, co } - todo_wine_if(out_expected_len != 0) ok_(file, line)(strings_are_equal, "\n#################### Expected:\n" "%s\n" "#################### But got:\n" @@ -176,7 +175,6 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp check_find_output(child_output, child_output_len, out_expected, out_expected_len, file, line); - todo_wine_if(exitcode_expected != 0) ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); heap_free(child_output); @@ -227,7 +225,9 @@ static void run_find_stdin_unicode_(const BYTE *input, int input_len, const BYTE static void test_errors(void) { run_find_stdin_str("", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("test", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("\"test", "", "FIND: Parameter format not correct\r\n", 2); run_find_stdin_str("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); } @@ -238,6 +238,7 @@ static void test_singleline_without_switches(void) run_find_stdin_str("\"test\"", "", "", 1); run_find_stdin_str("\"test\"", "test", "test\r\n", 0); run_find_stdin_str("\"test\"", "test2", "test2\r\n", 0); + run_find_stdin_str("\"test\"", "test\r2", "test\r2\r\n", 0); run_find_stdin_str("\"test2\"", "test", "", 1); } @@ -297,6 +298,7 @@ static void test_unicode_support(void) run_find_stdin_unicode(str_jap_utf16be_nobom, str_empty, 1); /* Test utf16le */ + todo_wine run_find_stdin_unicode(str_jap_utf16le_bom, str_jap_utf16le_bom, 0); } -- 2.23.0

2 3