March 2018 - Wine-Devel - list.winehq.org

[PATCH v2 1/2] winevulkan: Allow vkGetDeviceProcAddr to load instance functions for broken games.
by Józef Kucia March 15, 2018

March 15, 2018

From: Roderick Colenbrander <thunderbird2k(a)gmail.com> Doom and Wolfenstein II use vkGetDeviceProcAddr to load all their function pointers, while they are supposed to use vkGetInstanceProcAddr for the instance ones. For now we need to allow this broken behavior. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- For time being, it's a reasonable workaround to run major Vulkan titles. Depending on further developments, we may be able to drop the workaround, or we should activate it only for the affected apps (based on VkApplicationInfo). --- dlls/winevulkan/vulkan.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index c0fc810a14a2..5062701e61d5 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -902,7 +902,26 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * if (func) return func; - TRACE("Function %s not found\n", debugstr_a(name)); + /* vkGetDeviceProcAddr was intended for loading device and subdevice functions. + * idTech 6 titles such as Doom and Wolfenstein II, however use it also for + * loading of instance functions. This is undefined behavior as the specification + * disallows using any of the returned function pointers outside of device / + * subdevice objects. The games don't actually use the function pointers and if they + * did, they would crash as VkInstance / VkPhysicalDevice parameters need unwrapping. + * Khronos clarified behavior in the Vulkan spec and expects drivers to get updated, + * however it would require both driver and game fixes. Since it are major titles + * it is not clear what will happen. At least for now we need the hack below. + * https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/2323 + * https://github.com/KhronosGroup/Vulkan-Docs/issues/655 + */ + func = wine_vk_get_instance_proc_addr(name); + if (func) + { + WARN("Returning instance function '%s'.\n", debugstr_a(name)); + return func; + } + + TRACE("Function %s not found.\n", debugstr_a(name)); return NULL; } -- 2.16.1

1 1

[PATCH 0/7] winevulkan
by Roderick Colenbrander March 15, 2018

March 15, 2018

Hi all, This wave of patches gets winevulkan to a usable state. Many simple applications such as Doom, Wolfenstein II and many others including dxvk should now work. Use of winevulkan at this point requires installation of Windows Vulkan SDK e.g. through winetricks (latest version). In addition registry settings and winevulkan.json need to be added by hand, which will be improved in the future. Thanks, Roderick Roderick Colenbrander (7): winevulkan: Implement vkQueueSubmit. winevulkan: Implement vkQueuePresentInfoKHR. winevulkan: Implement vkQueueBindSparse and vkQueueWaitIdle. winevulkan: Filter graphics driver reported instance extensions. winevulkan: Implement VK_KHR_get_physical_device_properties2 winevulkan: Allow vkGetDeviceProcAddr to load instance functions for broken games. winevulkan: Support various device extensions. dlls/winevulkan/make_vulkan | 96 +++++-- dlls/winevulkan/vulkan.c | 146 ++++++++++- dlls/winevulkan/vulkan_thunks.c | 545 +++++++++++++++++++++++++++++++++++++--- dlls/winevulkan/vulkan_thunks.h | 191 ++++++++++++-- dlls/winex11.drv/vulkan.c | 60 ++++- include/wine/vulkan.h | 458 ++++++++++++++++++++++----------- 6 files changed, 1257 insertions(+), 239 deletions(-) -- 2.14.3

2 13

[PATCH 4/5] wined3d: Reject managed/scratch textures with dynamic usage in texture_init().
by Henri Verbeet March 15, 2018

March 15, 2018

For consistency with volumetexture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e5a83ce7cba..e1f02a5f15b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2198,8 +2198,14 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3DERR_INVALIDCALL; } - if (desc->usage & WINED3DUSAGE_DYNAMIC && wined3d_resource_access_is_managed(desc->access)) - FIXME("Trying to create a managed texture with dynamic usage.\n"); + if (desc->usage & WINED3DUSAGE_DYNAMIC && (wined3d_resource_access_is_managed(desc->access) + || desc->usage & WINED3DUSAGE_SCRATCH)) + { + WARN("Attempted to create a dynamic texture with access %s and usage %s.\n", + wined3d_debug_resource_access(desc->access), debug_d3dusage(desc->usage)); + return WINED3DERR_INVALIDCALL; + } + if (!(desc->usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL)) && (flags & WINED3D_TEXTURE_CREATE_MAPPABLE)) WARN("Creating a mappable texture that doesn't specify dynamic usage.\n"); -- 2.11.0

1 0

[PATCH 3/5] wined3d: Only store dc_info for textures that require it.
by Henri Verbeet March 15, 2018

March 15, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 6 +- dlls/wined3d/texture.c | 320 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 12 +- 3 files changed, 162 insertions(+), 176 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f7aebdb7f32..4903445a0f0 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -549,7 +549,7 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai TRACE("swapchain %p.\n", swapchain); - front = swapchain->front_buffer->sub_resources[0].dc_info; + front = &swapchain->front_buffer->dc_info[0]; if (swapchain->palette) wined3d_palette_apply_to_dc(swapchain->palette, front->dc); @@ -589,8 +589,8 @@ static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, void *data; HDC dc; - front = swapchain->front_buffer->sub_resources[0].dc_info; - back = swapchain->back_buffers[0]->sub_resources[0].dc_info; + front = &swapchain->front_buffer->dc_info[0]; + back = &swapchain->back_buffers[0]->dc_info[0]; /* Flip the surface data. */ dc = front->dc; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 68615b49a5b..e5a83ce7cba 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -30,6 +30,12 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINED3D_TEXTURE_DYNAMIC_MAP_THRESHOLD 50 +struct wined3d_texture_idx +{ + struct wined3d_texture *texture; + unsigned int sub_resource_idx; +}; + static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { return !(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) @@ -652,6 +658,123 @@ static void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *text } } +static void wined3d_texture_create_dc(void *object) +{ + const struct wined3d_texture_idx *idx = object; + struct wined3d_context *context = NULL; + unsigned int sub_resource_idx, level; + const struct wined3d_format *format; + unsigned int row_pitch, slice_pitch; + struct wined3d_texture *texture; + struct wined3d_dc_info *dc_info; + struct wined3d_bo_address data; + D3DKMT_CREATEDCFROMMEMORY desc; + struct wined3d_device *device; + NTSTATUS status; + + TRACE("texture %p, sub_resource_idx %u.\n", idx->texture, idx->sub_resource_idx); + + texture = idx->texture; + sub_resource_idx = idx->sub_resource_idx; + level = sub_resource_idx % texture->level_count; + device = texture->resource.device; + + format = texture->resource.format; + if (!format->ddi_format) + { + WARN("Cannot create a DC for format %s.\n", debug_d3dformat(format->id)); + return; + } + + if (!texture->dc_info) + { + unsigned int sub_count = texture->level_count * texture->layer_count; + + if (!(texture->dc_info = heap_calloc(sub_count, sizeof(*texture->dc_info)))) + { + ERR("Failed to allocate DC info.\n"); + return; + } + } + + if (device->d3d_initialized) + context = context_acquire(device, NULL, 0); + + wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); + wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch); + wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); + desc.pMemory = context_map_bo_address(context, &data, + texture->sub_resources[sub_resource_idx].size, + GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ | WINED3D_MAP_WRITE); + + if (context) + context_release(context); + + desc.Format = format->ddi_format; + desc.Width = wined3d_texture_get_level_width(texture, level); + desc.Height = wined3d_texture_get_level_height(texture, level); + desc.Pitch = row_pitch; + desc.hDeviceDc = CreateCompatibleDC(NULL); + desc.pColorTable = NULL; + + status = D3DKMTCreateDCFromMemory(&desc); + DeleteDC(desc.hDeviceDc); + if (status) + { + WARN("Failed to create DC, status %#x.\n", status); + return; + } + + dc_info = &texture->dc_info[sub_resource_idx]; + dc_info->dc = desc.hDc; + dc_info->bitmap = desc.hBitmap; + + TRACE("Created DC %p, bitmap %p for texture %p, %u.\n", dc_info->dc, dc_info->bitmap, texture, sub_resource_idx); +} + +static void wined3d_texture_destroy_dc(void *object) +{ + const struct wined3d_texture_idx *idx = object; + D3DKMT_DESTROYDCFROMMEMORY destroy_desc; + struct wined3d_context *context = NULL; + struct wined3d_texture *texture; + struct wined3d_dc_info *dc_info; + struct wined3d_bo_address data; + unsigned int sub_resource_idx; + struct wined3d_device *device; + NTSTATUS status; + + texture = idx->texture; + sub_resource_idx = idx->sub_resource_idx; + device = texture->resource.device; + dc_info = &texture->dc_info[sub_resource_idx]; + + if (!dc_info->dc) + { + ERR("Sub-resource {%p, %u} has no DC.\n", texture, sub_resource_idx); + return; + } + + TRACE("dc %p, bitmap %p.\n", dc_info->dc, dc_info->bitmap); + + destroy_desc.hDc = dc_info->dc; + destroy_desc.hBitmap = dc_info->bitmap; + if ((status = D3DKMTDestroyDCFromMemory(&destroy_desc))) + ERR("Failed to destroy dc, status %#x.\n", status); + dc_info->dc = NULL; + dc_info->bitmap = NULL; + + if (device->d3d_initialized) + context = context_acquire(device, NULL, 0); + + wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); + context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + + if (context) + context_release(context); +} + static void wined3d_texture_cleanup(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; @@ -659,6 +782,7 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) struct wined3d_renderbuffer_entry *entry, *entry2; const struct wined3d_gl_info *gl_info = NULL; struct wined3d_context *context = NULL; + struct wined3d_dc_info *dc_info; GLuint buffer_object; unsigned int i; @@ -699,7 +823,20 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) if (context) context_release(context); - texture->texture_ops->texture_cleanup_sub_resources(texture); + if ((dc_info = texture->dc_info)) + { + for (i = 0; i < sub_count; ++i) + { + if (dc_info[i].dc) + { + struct wined3d_texture_idx texture_idx = {texture, i}; + + wined3d_texture_destroy_dc(&texture_idx); + } + } + heap_free(dc_info); + } + if (texture->overlay_info) { for (i = 0; i < sub_count; ++i) @@ -1334,118 +1471,6 @@ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture checkGLcall("set_compatible_renderbuffer"); } -struct wined3d_texture_idx -{ - struct wined3d_texture *texture; - unsigned int sub_resource_idx; -}; - -static void texture2d_create_dc(void *object) -{ - const struct wined3d_texture_idx *idx = object; - struct wined3d_context *context = NULL; - unsigned int sub_resource_idx, level; - const struct wined3d_format *format; - unsigned int row_pitch, slice_pitch; - struct wined3d_texture *texture; - struct wined3d_dc_info *dc_info; - struct wined3d_bo_address data; - D3DKMT_CREATEDCFROMMEMORY desc; - struct wined3d_device *device; - NTSTATUS status; - - TRACE("texture %p, sub_resource_idx %u.\n", idx->texture, idx->sub_resource_idx); - - texture = idx->texture; - sub_resource_idx = idx->sub_resource_idx; - level = sub_resource_idx % texture->level_count; - device = texture->resource.device; - - format = texture->resource.format; - if (!format->ddi_format) - { - WARN("Cannot create a DC for format %s.\n", debug_d3dformat(format->id)); - return; - } - - if (device->d3d_initialized) - context = context_acquire(device, NULL, 0); - - wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); - wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch); - wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - desc.pMemory = context_map_bo_address(context, &data, - texture->sub_resources[sub_resource_idx].size, - GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ | WINED3D_MAP_WRITE); - - if (context) - context_release(context); - - desc.Format = format->ddi_format; - desc.Width = wined3d_texture_get_level_width(texture, level); - desc.Height = wined3d_texture_get_level_height(texture, level); - desc.Pitch = row_pitch; - desc.hDeviceDc = CreateCompatibleDC(NULL); - desc.pColorTable = NULL; - - status = D3DKMTCreateDCFromMemory(&desc); - DeleteDC(desc.hDeviceDc); - if (status) - { - WARN("Failed to create DC, status %#x.\n", status); - return; - } - - dc_info = texture->sub_resources[sub_resource_idx].dc_info; - dc_info->dc = desc.hDc; - dc_info->bitmap = desc.hBitmap; - - TRACE("Created DC %p, bitmap %p for texture %p, %u.\n", dc_info->dc, dc_info->bitmap, texture, sub_resource_idx); -} - -static void texture2d_destroy_dc(void *object) -{ - const struct wined3d_texture_idx *idx = object; - D3DKMT_DESTROYDCFROMMEMORY destroy_desc; - struct wined3d_context *context = NULL; - struct wined3d_texture *texture; - struct wined3d_dc_info *dc_info; - struct wined3d_bo_address data; - unsigned int sub_resource_idx; - struct wined3d_device *device; - NTSTATUS status; - - texture = idx->texture; - sub_resource_idx = idx->sub_resource_idx; - device = texture->resource.device; - dc_info = texture->sub_resources[sub_resource_idx].dc_info; - - if (!dc_info->dc) - { - ERR("Sub-resource {%p, %u} has no DC.\n", texture, sub_resource_idx); - return; - } - - TRACE("dc %p, bitmap %p.\n", dc_info->dc, dc_info->bitmap); - - destroy_desc.hDc = dc_info->dc; - destroy_desc.hBitmap = dc_info->bitmap; - if ((status = D3DKMTDestroyDCFromMemory(&destroy_desc))) - ERR("Failed to destroy dc, status %#x.\n", status); - dc_info->dc = NULL; - dc_info->bitmap = NULL; - - if (device->d3d_initialized) - context = context_acquire(device, NULL, 0); - - wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); - - if (context) - context_release(context); -} - HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality, void *mem, UINT pitch) @@ -1501,11 +1526,11 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_resource_wait_idle(&texture->resource); sub_resource = &texture->sub_resources[0]; - if (sub_resource->dc_info->dc) + if (texture->dc_info && texture->dc_info[0].dc) { struct wined3d_texture_idx texture_idx = {texture, 0}; - wined3d_cs_destroy_object(device->cs, texture2d_destroy_dc, &texture_idx); + wined3d_cs_destroy_object(device->cs, wined3d_texture_destroy_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); create_dib = TRUE; } @@ -1575,7 +1600,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT { struct wined3d_texture_idx texture_idx = {texture, 0}; - wined3d_cs_init_object(device->cs, texture2d_create_dc, &texture_idx); + wined3d_cs_init_object(device->cs, wined3d_texture_create_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -1874,35 +1899,11 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi wined3d_texture_allocate_gl_mutable_storage(texture, internal, format, gl_info); } -static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) -{ - unsigned int sub_count = texture->level_count * texture->layer_count; - struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_dc_info *dc_info; - unsigned int i; - - for (i = 0; i < sub_count; ++i) - { - sub_resource = &texture->sub_resources[i]; - if (!(dc_info = sub_resource->dc_info)) - continue; - - if (dc_info->dc) - { - struct wined3d_texture_idx texture_idx = {texture, i}; - - texture2d_destroy_dc(&texture_idx); - } - } - heap_free(texture->sub_resources[0].dc_info); -} - static const struct wined3d_texture_ops texture2d_ops = { texture2d_upload_data, texture2d_load_location, texture2d_prepare_texture, - texture2d_cleanup_sub_resources, }; struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -2178,7 +2179,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { struct wined3d_device_parent *device_parent = device->device_parent; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - struct wined3d_dc_info *dc_infos; UINT pow2_width, pow2_height; unsigned int sub_count, i; HRESULT hr; @@ -2327,8 +2327,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture->resource.map_binding = WINED3D_LOCATION_BUFFER; sub_count = level_count * layer_count; - if (sub_count / layer_count != level_count - || !(dc_infos = heap_calloc(sub_count, sizeof(*dc_infos)))) + if (sub_count / layer_count != level_count) { wined3d_texture_cleanup_sync(texture); return E_OUTOFMEMORY; @@ -2338,7 +2337,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { if (!(texture->overlay_info = heap_calloc(sub_count, sizeof(*texture->overlay_info)))) { - heap_free(dc_infos); wined3d_texture_cleanup_sync(texture); return E_OUTOFMEMORY; } @@ -2354,13 +2352,9 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 for (i = 0; i < sub_count; ++i) { struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_dc_info *dc_info; - - dc_info = &dc_infos[i]; sub_resource = &texture->sub_resources[i]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; - sub_resource->dc_info = dc_info; if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) { wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_SYSMEM); @@ -2385,9 +2379,9 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { struct wined3d_texture_idx texture_idx = {texture, i}; - wined3d_cs_init_object(device->cs, texture2d_create_dc, &texture_idx); + wined3d_cs_init_object(device->cs, wined3d_texture_create_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - if (!dc_info->dc) + if (!texture->dc_info || !texture->dc_info[i].dc) { wined3d_texture_cleanup_sync(texture); return WINED3DERR_INVALIDCALL; @@ -2670,16 +2664,11 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi } } -static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) -{ -} - static const struct wined3d_texture_ops texture3d_ops = { texture3d_upload_data, texture3d_load_location, texture3d_prepare_texture, - texture3d_cleanup_sub_resources, }; static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, @@ -3162,27 +3151,25 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i return WINED3DERR_INVALIDCALL; } - dc_info = sub_resource->dc_info; - if (texture->resource.map_count && !(texture->flags & WINED3D_TEXTURE_GET_DC_LENIENT)) return WINED3DERR_INVALIDCALL; - if (!dc_info->dc) + if (!(dc_info = texture->dc_info) || !dc_info[sub_resource_idx].dc) { struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx}; - wined3d_cs_init_object(device->cs, texture2d_create_dc, &texture_idx); + wined3d_cs_init_object(device->cs, wined3d_texture_create_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + if (!(dc_info = texture->dc_info) || !dc_info[sub_resource_idx].dc) + return WINED3DERR_INVALIDCALL; } - if (!dc_info->dc) - return WINED3DERR_INVALIDCALL; if (!(texture->flags & WINED3D_TEXTURE_GET_DC_LENIENT)) texture->flags |= WINED3D_TEXTURE_DC_IN_USE; ++texture->resource.map_count; ++sub_resource->map_count; - *dc = dc_info->dc; + *dc = dc_info[sub_resource_idx].dc; TRACE("Returning dc %p.\n", *dc); return WINED3D_OK; @@ -3205,14 +3192,13 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign return WINED3DERR_INVALIDCALL; } - dc_info = sub_resource->dc_info; - if (!(texture->flags & (WINED3D_TEXTURE_GET_DC_LENIENT | WINED3D_TEXTURE_DC_IN_USE))) return WINED3DERR_INVALIDCALL; - if (dc_info->dc != dc) + if (!(dc_info = texture->dc_info) || dc_info[sub_resource_idx].dc != dc) { - WARN("Application tries to release invalid DC %p, sub-resource DC is %p.\n", dc, dc_info->dc); + WARN("Application tries to release invalid DC %p, sub-resource DC is %p.\n", + dc, dc_info ? dc_info[sub_resource_idx].dc : NULL); return WINED3DERR_INVALIDCALL; } @@ -3220,7 +3206,7 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign { struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx}; - wined3d_cs_destroy_object(device->cs, texture2d_destroy_dc, &texture_idx); + wined3d_cs_destroy_object(device->cs, wined3d_texture_destroy_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 786de2c6d12..718ee63a214 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3090,7 +3090,6 @@ struct wined3d_texture_ops struct wined3d_context *context, DWORD location); void (*texture_prepare_texture)(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb); - void (*texture_cleanup_sub_resources)(struct wined3d_texture *texture); }; #define WINED3D_TEXTURE_COND_NP2 0x00000001 @@ -3162,6 +3161,12 @@ struct wined3d_texture RECT dst_rect; } *overlay_info; + struct wined3d_dc_info + { + HBITMAP bitmap; + HDC dc; + } *dc_info; + struct list renderbuffers; const struct wined3d_renderbuffer_entry *current_renderbuffer; @@ -3170,11 +3175,6 @@ struct wined3d_texture void *parent; const struct wined3d_parent_ops *parent_ops; - struct wined3d_dc_info - { - HBITMAP bitmap; - HDC dc; - } *dc_info; unsigned int offset; unsigned int size; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Rename struct wined3d_surface to struct wined3d_dc_info.
by Henri Verbeet March 15, 2018

March 15, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 10 +-- dlls/wined3d/texture.c | 138 +++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 16 ++--- 3 files changed, 74 insertions(+), 90 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 36d84f6182a..f7aebdb7f32 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -541,7 +541,7 @@ static const struct wined3d_swapchain_ops swapchain_gl_ops = static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchain) { - struct wined3d_surface *front; + struct wined3d_dc_info *front; POINT offset = {0, 0}; HDC src_dc, dst_dc; RECT draw_rect; @@ -549,7 +549,7 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai TRACE("swapchain %p.\n", swapchain); - front = swapchain->front_buffer->sub_resources[0].u.surface; + front = swapchain->front_buffer->sub_resources[0].dc_info; if (swapchain->palette) wined3d_palette_apply_to_dc(swapchain->palette, front->dc); @@ -584,13 +584,13 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, DWORD flags) { - struct wined3d_surface *front, *back; + struct wined3d_dc_info *front, *back; HBITMAP bitmap; void *data; HDC dc; - front = swapchain->front_buffer->sub_resources[0].u.surface; - back = swapchain->back_buffers[0]->sub_resources[0].u.surface; + front = swapchain->front_buffer->sub_resources[0].dc_info; + back = swapchain->back_buffers[0]->sub_resources[0].dc_info; /* Flip the surface data. */ dc = front->dc; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 12fd103a738..68615b49a5b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1348,7 +1348,7 @@ static void texture2d_create_dc(void *object) const struct wined3d_format *format; unsigned int row_pitch, slice_pitch; struct wined3d_texture *texture; - struct wined3d_surface *surface; + struct wined3d_dc_info *dc_info; struct wined3d_bo_address data; D3DKMT_CREATEDCFROMMEMORY desc; struct wined3d_device *device; @@ -1397,11 +1397,11 @@ static void texture2d_create_dc(void *object) return; } - surface = texture->sub_resources[sub_resource_idx].u.surface; - surface->dc = desc.hDc; - surface->bitmap = desc.hBitmap; + dc_info = texture->sub_resources[sub_resource_idx].dc_info; + dc_info->dc = desc.hDc; + dc_info->bitmap = desc.hBitmap; - TRACE("Created DC %p, bitmap %p for texture %p, %u.\n", surface->dc, surface->bitmap, texture, sub_resource_idx); + TRACE("Created DC %p, bitmap %p for texture %p, %u.\n", dc_info->dc, dc_info->bitmap, texture, sub_resource_idx); } static void texture2d_destroy_dc(void *object) @@ -1410,7 +1410,7 @@ static void texture2d_destroy_dc(void *object) D3DKMT_DESTROYDCFROMMEMORY destroy_desc; struct wined3d_context *context = NULL; struct wined3d_texture *texture; - struct wined3d_surface *surface; + struct wined3d_dc_info *dc_info; struct wined3d_bo_address data; unsigned int sub_resource_idx; struct wined3d_device *device; @@ -1419,22 +1419,22 @@ static void texture2d_destroy_dc(void *object) texture = idx->texture; sub_resource_idx = idx->sub_resource_idx; device = texture->resource.device; - surface = texture->sub_resources[sub_resource_idx].u.surface; + dc_info = texture->sub_resources[sub_resource_idx].dc_info; - if (!surface->dc) + if (!dc_info->dc) { - ERR("Surface %p has no DC.\n", surface); + ERR("Sub-resource {%p, %u} has no DC.\n", texture, sub_resource_idx); return; } - TRACE("dc %p, bitmap %p.\n", surface->dc, surface->bitmap); + TRACE("dc %p, bitmap %p.\n", dc_info->dc, dc_info->bitmap); - destroy_desc.hDc = surface->dc; - destroy_desc.hBitmap = surface->bitmap; + destroy_desc.hDc = dc_info->dc; + destroy_desc.hBitmap = dc_info->bitmap; if ((status = D3DKMTDestroyDCFromMemory(&destroy_desc))) ERR("Failed to destroy dc, status %#x.\n", status); - surface->dc = NULL; - surface->bitmap = NULL; + dc_info->dc = NULL; + dc_info->bitmap = NULL; if (device->d3d_initialized) context = context_acquire(device, NULL, 0); @@ -1501,7 +1501,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_resource_wait_idle(&texture->resource); sub_resource = &texture->sub_resources[0]; - if (sub_resource->u.surface->dc) + if (sub_resource->dc_info->dc) { struct wined3d_texture_idx texture_idx = {texture, 0}; @@ -1878,28 +1878,23 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_context *context = NULL; - struct wined3d_surface *surface; + struct wined3d_dc_info *dc_info; unsigned int i; for (i = 0; i < sub_count; ++i) { sub_resource = &texture->sub_resources[i]; - if (!(surface = sub_resource->u.surface)) + if (!(dc_info = sub_resource->dc_info)) continue; - TRACE("surface %p.\n", surface); - - if (surface->dc) + if (dc_info->dc) { struct wined3d_texture_idx texture_idx = {texture, i}; texture2d_destroy_dc(&texture_idx); } } - if (context) - context_release(context); - heap_free(texture->sub_resources[0].u.surface); + heap_free(texture->sub_resources[0].dc_info); } static const struct wined3d_texture_ops texture2d_ops = @@ -2183,9 +2178,9 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { struct wined3d_device_parent *device_parent = device->device_parent; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - struct wined3d_surface *surfaces; + struct wined3d_dc_info *dc_infos; UINT pow2_width, pow2_height; - unsigned int i, j, sub_count; + unsigned int sub_count, i; HRESULT hr; if (!(desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) && layer_count > 1 @@ -2333,7 +2328,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 sub_count = level_count * layer_count; if (sub_count / layer_count != level_count - || !(surfaces = heap_calloc(sub_count, sizeof(*surfaces)))) + || !(dc_infos = heap_calloc(sub_count, sizeof(*dc_infos)))) { wined3d_texture_cleanup_sync(texture); return E_OUTOFMEMORY; @@ -2343,7 +2338,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { if (!(texture->overlay_info = heap_calloc(sub_count, sizeof(*texture->overlay_info)))) { - heap_free(surfaces); + heap_free(dc_infos); wined3d_texture_cleanup_sync(texture); return E_OUTOFMEMORY; } @@ -2355,50 +2350,47 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } } - /* Generate all the surfaces. */ - for (i = 0; i < texture->level_count; ++i) + /* Generate all sub-resources. */ + for (i = 0; i < sub_count; ++i) { - for (j = 0; j < texture->layer_count; ++j) - { - struct wined3d_texture_sub_resource *sub_resource; - unsigned int idx = j * texture->level_count + i; - struct wined3d_surface *surface; + struct wined3d_texture_sub_resource *sub_resource; + struct wined3d_dc_info *dc_info; - surface = &surfaces[idx]; + dc_info = &dc_infos[i]; - sub_resource = &texture->sub_resources[idx]; - sub_resource->locations = WINED3D_LOCATION_DISCARDED; - sub_resource->u.surface = surface; - if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) - { - wined3d_texture_validate_location(texture, idx, WINED3D_LOCATION_SYSMEM); - wined3d_texture_invalidate_location(texture, idx, ~WINED3D_LOCATION_SYSMEM); - } + sub_resource = &texture->sub_resources[i]; + sub_resource->locations = WINED3D_LOCATION_DISCARDED; + sub_resource->dc_info = dc_info; + if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) + { + wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_SYSMEM); + wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_SYSMEM); + } - if (FAILED(hr = device_parent->ops->surface_created(device_parent, - texture, idx, &sub_resource->parent, &sub_resource->parent_ops))) - { - WARN("Failed to create surface parent, hr %#x.\n", hr); - sub_resource->parent = NULL; - wined3d_texture_cleanup_sync(texture); - return hr; - } + if (FAILED(hr = device_parent->ops->surface_created(device_parent, + texture, i, &sub_resource->parent, &sub_resource->parent_ops))) + { + WARN("Failed to create sub-resource parent, hr %#x.\n", hr); + sub_resource->parent = NULL; + wined3d_texture_cleanup_sync(texture); + return hr; + } - TRACE("parent %p, parent_ops %p.\n", sub_resource->parent, sub_resource->parent_ops); + TRACE("parent %p, parent_ops %p.\n", sub_resource->parent, sub_resource->parent_ops); - TRACE("Created surface level %u, layer %u @ %p.\n", i, j, surface); + TRACE("Created sub-resource %u (level %u, layer %u).\n", + i, i % texture->level_count, i / texture->level_count); - if ((desc->usage & WINED3DUSAGE_OWNDC) || (device->wined3d->flags & WINED3D_NO3D)) + if ((desc->usage & WINED3DUSAGE_OWNDC) || (device->wined3d->flags & WINED3D_NO3D)) + { + struct wined3d_texture_idx texture_idx = {texture, i}; + + wined3d_cs_init_object(device->cs, texture2d_create_dc, &texture_idx); + device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + if (!dc_info->dc) { - struct wined3d_texture_idx texture_idx = {texture, idx}; - - wined3d_cs_init_object(device->cs, texture2d_create_dc, &texture_idx); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - if (!surface->dc) - { - wined3d_texture_cleanup_sync(texture); - return WINED3DERR_INVALIDCALL; - } + wined3d_texture_cleanup_sync(texture); + return WINED3DERR_INVALIDCALL; } } } @@ -3150,7 +3142,7 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i { struct wined3d_device *device = texture->resource.device; struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_surface *surface; + struct wined3d_dc_info *dc_info; TRACE("texture %p, sub_resource_idx %u, dc %p.\n", texture, sub_resource_idx, dc); @@ -3170,19 +3162,19 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i return WINED3DERR_INVALIDCALL; } - surface = sub_resource->u.surface; + dc_info = sub_resource->dc_info; if (texture->resource.map_count && !(texture->flags & WINED3D_TEXTURE_GET_DC_LENIENT)) return WINED3DERR_INVALIDCALL; - if (!surface->dc) + if (!dc_info->dc) { struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx}; wined3d_cs_init_object(device->cs, texture2d_create_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } - if (!surface->dc) + if (!dc_info->dc) return WINED3DERR_INVALIDCALL; if (!(texture->flags & WINED3D_TEXTURE_GET_DC_LENIENT)) @@ -3190,7 +3182,7 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i ++texture->resource.map_count; ++sub_resource->map_count; - *dc = surface->dc; + *dc = dc_info->dc; TRACE("Returning dc %p.\n", *dc); return WINED3D_OK; @@ -3200,7 +3192,7 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign { struct wined3d_device *device = texture->resource.device; struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_surface *surface; + struct wined3d_dc_info *dc_info; TRACE("texture %p, sub_resource_idx %u, dc %p.\n", texture, sub_resource_idx, dc); @@ -3213,14 +3205,14 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign return WINED3DERR_INVALIDCALL; } - surface = sub_resource->u.surface; + dc_info = sub_resource->dc_info; if (!(texture->flags & (WINED3D_TEXTURE_GET_DC_LENIENT | WINED3D_TEXTURE_DC_IN_USE))) return WINED3DERR_INVALIDCALL; - if (surface->dc != dc) + if (dc_info->dc != dc) { - WARN("Application tries to release invalid DC %p, surface DC is %p.\n", dc, surface->dc); + WARN("Application tries to release invalid DC %p, sub-resource DC is %p.\n", dc, dc_info->dc); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3799f6cc610..786de2c6d12 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2085,8 +2085,6 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN; -struct wined3d_surface; - enum wined3d_blit_op { WINED3D_BLIT_OP_COLOR_BLIT, @@ -3172,10 +3170,11 @@ struct wined3d_texture void *parent; const struct wined3d_parent_ops *parent_ops; - union + struct wined3d_dc_info { - struct wined3d_surface *surface; - } u; + HBITMAP bitmap; + HDC dc; + } *dc_info; unsigned int offset; unsigned int size; @@ -3336,13 +3335,6 @@ struct fbo_entry } key; }; -struct wined3d_surface -{ - /* For GetDC */ - HBITMAP bitmap; - HDC dc; -}; - void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, unsigned int src_pitch, const POINT *dst_point, BOOL srgb, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Store the destination as texture + sub-resource index in struct wined3d_overlay_info.
by Henri Verbeet March 15, 2018

March 15, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 19 +++++++++---------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fc5c6747862..12fd103a738 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2866,7 +2866,7 @@ HRESULT CDECL wined3d_texture_get_overlay_position(const struct wined3d_texture } overlay = &texture->overlay_info[sub_resource_idx]; - if (!overlay->dst) + if (!overlay->dst_texture) { TRACE("Overlay not visible.\n"); *x = 0; @@ -2909,9 +2909,7 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect, DWORD flags) { - struct wined3d_texture_sub_resource *dst_sub_resource; struct wined3d_overlay_info *overlay; - struct wined3d_surface *dst_surface; unsigned int level, dst_level; TRACE("texture %p, sub_resource_idx %u, src_rect %s, dst_texture %p, " @@ -2927,7 +2925,7 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un } if (!dst_texture || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D - || !(dst_sub_resource = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx))) + || dst_sub_resource_idx >= dst_texture->level_count * dst_texture->layer_count) { WARN("Invalid destination sub-resource specified.\n"); return WINED3DERR_INVALIDCALL; @@ -2943,7 +2941,6 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un wined3d_texture_get_level_width(texture, level), wined3d_texture_get_level_height(texture, level)); - dst_surface = dst_sub_resource->u.surface; dst_level = dst_sub_resource_idx % dst_texture->level_count; if (dst_rect) overlay->dst_rect = *dst_rect; @@ -2952,17 +2949,19 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un wined3d_texture_get_level_width(dst_texture, dst_level), wined3d_texture_get_level_height(dst_texture, dst_level)); - if (overlay->dst && (overlay->dst != dst_surface || flags & WINEDDOVER_HIDE)) + if (overlay->dst_texture && (overlay->dst_texture != dst_texture + || overlay->dst_sub_resource_idx != dst_sub_resource_idx || flags & WINEDDOVER_HIDE)) { - overlay->dst = NULL; + overlay->dst_texture = NULL; list_remove(&overlay->entry); } if (flags & WINEDDOVER_SHOW) { - if (overlay->dst != dst_surface) + if (overlay->dst_texture != dst_texture || overlay->dst_sub_resource_idx != dst_sub_resource_idx) { - overlay->dst = dst_surface; + overlay->dst_texture = dst_texture; + overlay->dst_sub_resource_idx = dst_sub_resource_idx; list_add_tail(&texture->overlay_info[dst_sub_resource_idx].overlays, &overlay->entry); } } @@ -2971,7 +2970,7 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un /* Tests show that the rectangles are erased on hide. */ SetRectEmpty(&overlay->src_rect); SetRectEmpty(&overlay->dst_rect); - overlay->dst = NULL; + overlay->dst_texture = NULL; } return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8acf3b04a74..3799f6cc610 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3158,7 +3158,8 @@ struct wined3d_texture { struct list entry; struct list overlays; - struct wined3d_surface *dst; + struct wined3d_texture *dst_texture; + unsigned int dst_sub_resource_idx; RECT src_rect; RECT dst_rect; } *overlay_info; -- 2.11.0

1 0

[PATCH] comctl32: Dont decrease x_offset if its already 0
by Alistair Leslie-Hughes March 15, 2018

March 15, 2018

Using an DPI of >= 154, it possible for the x_offset to be 0 when a WM_SETTEXT occurs and it loops for quite some time. ;) Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comctl32/edit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..aada9fc 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1758,7 +1758,8 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) if (x < es->format_rect.left) { goal = es->format_rect.left + format_width / HSCROLL_FRACTION; do { - es->x_offset--; + if (es->x_offset) + es->x_offset--; x = (short)LOWORD(EDIT_EM_PosFromChar(es, es->selection_end, FALSE)); } while ((x < goal) && es->x_offset); /* FIXME: use ScrollWindow() somehow to improve performance */ -- 1.9.1

1 0

[PATCH 4/4] api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll.
by Alistair Leslie-Hughes March 15, 2018

March 15, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure.ac | 1 + dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in | 1 + .../api-ms-win-rtcore-ntuser-draw-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 4 files changed, 4 insertions(+) create mode 100644 dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec diff --git a/configure.ac b/configure.ac index b320f3a..51a3a79 100644 --- a/configure.ac +++ b/configure.ac @@ -2997,6 +2997,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-ntuser-rectangle-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-perf-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-base-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-window-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in new file mode 100644 index 0000000..956f2f3 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-draw-l1-1-0.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec new file mode 100644 index 0000000..59900a9 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall RedrawWindow(long ptr long long) user32.RedrawWindow diff --git a/tools/make_specfiles b/tools/make_specfiles index a6156c4..44023aa 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -363,6 +363,7 @@ my @dll_groups = "api-ms-win-core-string-l2-1-0", "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", + "api-ms-win-rtcore-ntuser-draw-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-4", "api-ms-win-rtcore-ntuser-window-l1-1-0", -- 1.9.1

1 0

[PATCH 3/4] api-ms-win-shcore-stream-l1-1-0: Add dll
by Alistair Leslie-Hughes March 15, 2018

March 15, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure.ac | 1 + dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in | 1 + .../api-ms-win-shcore-stream-l1-1-0.spec | 15 +++++++++++++++ tools/make_specfiles | 1 + 4 files changed, 18 insertions(+) create mode 100644 dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec diff --git a/configure.ac b/configure.ac index dcb8672..b320f3a 100644 --- a/configure.ac +++ b/configure.ac @@ -3027,6 +3027,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-scaling-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-stream-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-thread-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellfolders-l1-1-0) diff --git a/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in new file mode 100644 index 0000000..df2caad --- /dev/null +++ b/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shcore-stream-l1-1-0.dll diff --git a/dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec b/dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec new file mode 100644 index 0000000..1ee9dd3 --- /dev/null +++ b/dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec @@ -0,0 +1,15 @@ +@ stub IStream_Copy +@ stdcall IStream_Read(ptr ptr long) shcore.IStream_Read +@ stub IStream_ReadStr +@ stdcall IStream_Reset(ptr) shcore.IStream_Reset +@ stdcall IStream_Size(ptr ptr) shcore.IStream_Size +@ stdcall IStream_Write(ptr ptr long) shcore.IStream_Write +@ stub IStream_WriteStr +@ stdcall SHCreateMemStream(ptr long) shcore.SHCreateMemStream +@ stdcall SHCreateStreamOnFileA(str long ptr) shcore.SHCreateStreamOnFileA +@ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shcore.SHCreateStreamOnFileEx +@ stdcall SHCreateStreamOnFileW(wstr long ptr) shcore.SHCreateStreamOnFileW +@ stdcall SHOpenRegStream2A(long str str long) shcore.SHOpenRegStream2A +@ stdcall SHOpenRegStream2W(long wstr wstr long) shcore.SHOpenRegStream2W +@ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA +@ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW diff --git a/tools/make_specfiles b/tools/make_specfiles index e26d8e3..a6156c4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -355,6 +355,7 @@ my @dll_groups = "shcore", "api-ms-win-shcore-obsolete-l1-1-0", "api-ms-win-shcore-thread-l1-1-0", + "api-ms-win-shcore-stream-l1-1-0", ], [ "user32", -- 1.9.1

1 0

[PATCH 2/4] api-ms-win-shcore-thread-l1-1-0: Add dll
by Alistair Leslie-Hughes March 15, 2018

March 15, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure.ac | 1 + dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in | 1 + .../api-ms-win-shcore-thread-l1-1-0.spec | 8 ++++++++ tools/make_specfiles | 1 + 4 files changed, 11 insertions(+) create mode 100644 dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec diff --git a/configure.ac b/configure.ac index 010e2db..dcb8672 100644 --- a/configure.ac +++ b/configure.ac @@ -3027,6 +3027,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-scaling-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-thread-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellfolders-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/apphelp) diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in new file mode 100644 index 0000000..0a20ccf --- /dev/null +++ b/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shcore-thread-l1-1-0.dll diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec b/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec new file mode 100644 index 0000000..1533005 --- /dev/null +++ b/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec @@ -0,0 +1,8 @@ +@ stub GetProcessReference +@ stdcall SHCreateThread(ptr ptr long ptr) shcore.SHCreateThread +@ stdcall SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef +@ stub SHCreateThreadWithHandle +@ stdcall SHGetThreadRef(ptr) shcore.SHGetThreadRef +@ stdcall SHReleaseThreadRef() shcore.SHReleaseThreadRef +@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef +@ stub SetProcessReference diff --git a/tools/make_specfiles b/tools/make_specfiles index f8cc99d..e26d8e3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -354,6 +354,7 @@ my @dll_groups = [ "shcore", "api-ms-win-shcore-obsolete-l1-1-0", + "api-ms-win-shcore-thread-l1-1-0", ], [ "user32", -- 1.9.1

1 0