October 2021 - Wine-Commits

Zebediah Figura : wined3d: Separate a resource_offset_map_pointer() helper.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 3d1163f108b09d2d48593d2bc388b25c9284101e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d1163f108b09d2d48593d2b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 29 17:15:21 2021 -0500 wined3d: Separate a resource_offset_map_pointer() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/texture.c | 22 +--------------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 3d24d375bc8..8f31996595c 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -586,3 +586,29 @@ VkPipelineStageFlags vk_pipeline_stage_mask_from_bind_flags(uint32_t bind_flags) return flags; } + +void *resource_offset_map_pointer(struct wined3d_resource *resource, unsigned int sub_resource_idx, + uint8_t *base_memory, const struct wined3d_box *box) +{ + const struct wined3d_format *format = resource->format; + unsigned int row_pitch, slice_pitch; + + wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, &row_pitch, &slice_pitch); + + if ((resource->format_flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_BLOCKS) + { + /* Compressed textures are block based, so calculate the offset of + * the block that contains the top-left pixel of the mapped box. */ + return base_memory + + (box->front * slice_pitch) + + ((box->top / format->block_height) * row_pitch) + + ((box->left / format->block_width) * format->block_byte_count); + } + else + { + return base_memory + + (box->front * slice_pitch) + + (box->top * row_pitch) + + (box->left * format->byte_count); + } +} diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f9babc6e28f..db32274960f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3466,11 +3466,8 @@ static void texture_resource_sub_resource_get_map_pitch(struct wined3d_resource static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, void **map_ptr, const struct wined3d_box *box, DWORD flags) { - const struct wined3d_format *format = resource->format; struct wined3d_texture_sub_resource *sub_resource; struct wined3d_device *device = resource->device; - unsigned int fmt_flags = resource->format_flags; - unsigned int row_pitch, slice_pitch; struct wined3d_context *context; struct wined3d_texture *texture; struct wined3d_bo_address data; @@ -3537,24 +3534,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour context_release(context); - texture_resource_sub_resource_get_map_pitch(resource, sub_resource_idx, &row_pitch, &slice_pitch); - - if ((fmt_flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_BLOCKS) - { - /* Compressed textures are block based, so calculate the offset of - * the block that contains the top-left pixel of the mapped box. */ - *map_ptr = base_memory - + (box->front * slice_pitch) - + ((box->top / format->block_height) * row_pitch) - + ((box->left / format->block_width) * format->block_byte_count); - } - else - { - *map_ptr = base_memory - + (box->front * slice_pitch) - + (box->top * row_pitch) - + (box->left * format->byte_count); - } + *map_ptr = resource_offset_map_pointer(resource, sub_resource_idx, base_memory, box); if (texture->swapchain && texture->swapchain->front_buffer == texture) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 520eb968eb6..5a5c6c9c0a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4165,6 +4165,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * unsigned int bind_flags, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; +void *resource_offset_map_pointer(struct wined3d_resource *resource, unsigned int sub_resource_idx, + uint8_t *base_memory, const struct wined3d_box *box) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT wined3d_resource_check_box_dimensions(struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Do not emit an upload for NOOVERWRITE maps on deferred contexts.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 6ba6d65d9135435746eeb71c98a4fd13b414dd4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ba6d65d9135435746eeb71c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 29 17:15:20 2021 -0500 wined3d: Do not emit an upload for NOOVERWRITE maps on deferred contexts. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 18 ++++++++++++------ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b659fc3868f..eb599211501 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -32,6 +32,7 @@ struct wined3d_deferred_upload unsigned int sub_resource_idx; uint8_t *sysmem; struct wined3d_box box; + uint32_t upload_flags; }; struct wined3d_deferred_query_issue @@ -2458,9 +2459,9 @@ static void wined3d_device_context_upload_bo(struct wined3d_device_context *cont { struct wined3d_cs_update_sub_resource *op; - TRACE("context %p, resource %p, sub_resource_idx %u, box %s, bo %s, row_pitch %u, slice_pitch %u.\n", + TRACE("context %p, resource %p, sub_resource_idx %u, box %s, bo %s, flags %#x, row_pitch %u, slice_pitch %u.\n", context, resource, sub_resource_idx, debug_box(box), - debug_const_bo_address(&bo->addr), row_pitch, slice_pitch); + debug_const_bo_address(&bo->addr), bo->flags, row_pitch, slice_pitch); op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; @@ -2547,7 +2548,8 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context unsigned int row_pitch, slice_pitch; wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_device_context_upload_bo(context, resource, sub_resource_idx, &box, &bo, row_pitch, slice_pitch); + if (bo.flags & UPLOAD_BO_UPLOAD_ON_UNMAP) + wined3d_device_context_upload_bo(context, resource, sub_resource_idx, &box, &bo, row_pitch, slice_pitch); return WINED3D_OK; } @@ -2778,6 +2780,7 @@ void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_conte op->box = *box; op->bo.addr.buffer_object = 0; op->bo.addr.addr = data; + op->bo.flags = 0; op->row_pitch = row_pitch; op->slice_pitch = slice_pitch; @@ -3507,7 +3510,7 @@ static void wined3d_deferred_context_push_constants(struct wined3d_device_contex FIXME("context %p, p %#x, start_idx %u, count %u, constants %p, stub!\n", context, p, start_idx, count, constants); } -static const struct wined3d_deferred_upload *deferred_context_get_upload(struct wined3d_deferred_context *deferred, +static struct wined3d_deferred_upload *deferred_context_get_upload(struct wined3d_deferred_context *deferred, struct wined3d_resource *resource, unsigned int sub_resource_idx) { SIZE_T i = deferred->upload_count; @@ -3551,13 +3554,13 @@ static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_co if (flags & WINED3D_MAP_NOOVERWRITE) { - const struct wined3d_deferred_upload *upload; - if ((upload = deferred_context_get_upload(deferred, resource, sub_resource_idx))) { + upload->upload_flags = 0; map_ptr = (uint8_t *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); bo->addr.buffer_object = 0; bo->addr.addr = map_ptr; + bo->flags = 0; return map_ptr; } @@ -3572,6 +3575,7 @@ static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_co return NULL; upload = &deferred->uploads[deferred->upload_count++]; + upload->upload_flags = UPLOAD_BO_UPLOAD_ON_UNMAP; upload->resource = resource; wined3d_resource_incref(resource); upload->sub_resource_idx = sub_resource_idx; @@ -3581,6 +3585,7 @@ static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_co bo->addr.buffer_object = 0; map_ptr = (uint8_t *)align((size_t)sysmem, RESOURCE_ALIGNMENT); bo->addr.addr = map_ptr; + bo->flags = UPLOAD_BO_UPLOAD_ON_UNMAP; return map_ptr; } @@ -3595,6 +3600,7 @@ static bool wined3d_deferred_context_get_upload_bo(struct wined3d_device_context *box = upload->box; bo->addr.buffer_object = 0; bo->addr.addr = (uint8_t *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); + bo->flags = upload->upload_flags; return true; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c801e5b3ce8..520eb968eb6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3324,9 +3324,12 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_description, enum wined3d_feature_level feature_level, UINT64 vram_bytes, UINT64 sysmem_bytes) DECLSPEC_HIDDEN; +#define UPLOAD_BO_UPLOAD_ON_UNMAP 0x1 + struct upload_bo { struct wined3d_const_bo_address addr; + uint32_t flags; }; struct wined3d_adapter_ops

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.195.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 165d1c0bef1840d1556162477467defcd3f7a1f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=165d1c0bef1840d155616247… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 5 15:40:37 2021 +0200 winevulkan: Update to VK spec version 1.2.195. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 18 + dlls/winevulkan/loader_thunks.h | 3 + dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 131 ++ dlls/winevulkan/vulkan_thunks.h | 17 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 2944 ++++++++++++++++++++------------------- 7 files changed, 1699 insertions(+), 1418 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=165d1c0bef1840d15561…

1 0

Paul Gofman : wintrust: Cache provider functions in WintrustLoadFunctionPointers().
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: e7b0b35d57d3567d6b6891beaf3241179a926ad6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7b0b35d57d3567d6b6891be… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 4 21:44:32 2021 +0300 wintrust: Cache provider functions in WintrustLoadFunctionPointers(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/register.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index effe9d18f20..f2479e178f7 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -835,6 +835,23 @@ error_close_key: return Func; } +static CRITICAL_SECTION cache_cs; +static CRITICAL_SECTION_DEBUG cache_cs_debug = +{ + 0, 0, &cache_cs, + { &cache_cs_debug.ProcessLocksList, &cache_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cache_cs") } +}; +static CRITICAL_SECTION cache_cs = { &cache_cs_debug, -1, 0, 0, 0, 0 }; + +static struct provider_cache_entry +{ + GUID guid; + CRYPT_PROVIDER_FUNCTIONS provider_functions; +} +*provider_cache; +static unsigned int provider_cache_size; + /*********************************************************************** * WintrustLoadFunctionPointers (WINTRUST.@) */ @@ -842,6 +859,8 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, CRYPT_PROVIDER_FUNCTIONS* pPfns ) { WCHAR GuidString[39]; + BOOL cached = FALSE; + unsigned int i; TRACE("(%s %p)\n", debugstr_guid(pgActionID), pPfns); @@ -853,6 +872,20 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, } if (pPfns->cbStruct != sizeof(CRYPT_PROVIDER_FUNCTIONS)) return FALSE; + EnterCriticalSection( &cache_cs ); + for (i = 0; i < provider_cache_size; ++i) + { + if (IsEqualGUID( &provider_cache[i].guid, pgActionID )) + { + TRACE( "Using cached data.\n" ); + *pPfns = provider_cache[i].provider_functions; + cached = TRUE; + break; + } + } + LeaveCriticalSection( &cache_cs ); + if (cached) return TRUE; + /* Create this string only once, instead of in the helper function */ WINTRUST_Guid2Wstr( pgActionID, GuidString); @@ -873,6 +906,25 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, pPfns->pfnTestFinalPolicy = (PFN_PROVIDER_TESTFINALPOLICY_CALL)WINTRUST_ReadProviderFromReg(GuidString, DiagnosticPolicy); pPfns->pfnCleanupPolicy = (PFN_PROVIDER_CLEANUP_CALL)WINTRUST_ReadProviderFromReg(GuidString, Cleanup); + EnterCriticalSection( &cache_cs ); + for (i = 0; i < provider_cache_size; ++i) + if (IsEqualGUID( &provider_cache[i].guid, pgActionID )) break; + + if (i == provider_cache_size) + { + struct provider_cache_entry *new; + + new = realloc( provider_cache, (provider_cache_size + 1) * sizeof(*new) ); + if (new) + { + provider_cache = new; + provider_cache[provider_cache_size].guid = *pgActionID; + provider_cache[provider_cache_size].provider_functions = *pPfns; + ++provider_cache_size; + } + } + LeaveCriticalSection( &cache_cs ); + return TRUE; }

1 0

Georg Lehmann : winevulkan: Support aliased constants.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 9a65f82232eaacb3f392cafaef9440d79a1f81d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a65f82232eaacb3f392cafa… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 5 15:40:36 2021 +0200 winevulkan: Support aliased constants. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3a6bc66d32b..9e55753ca38 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3445,11 +3445,17 @@ class VkRegistry(object): enum.create_alias(enum_elem.attrib["name"], enum_elem.attrib["alias"]) elif "value" in enum_elem.keys(): - # Constants are not aliased, no need to add them here, they'll get added later on. + # Constant with an explicit value if only_aliased: return self.consts.append(VkConstant(enum_elem.attrib["name"], enum_elem.attrib["value"])) + elif "alias" in enum_elem.keys(): + # Aliased constant + if not only_aliased: + return + + self.consts.append(VkConstant(enum_elem.attrib["name"], enum_elem.attrib["alias"])) @staticmethod def _require_type(type_info):

1 0

Jan Sikorski : wined3d: Return error when GetData() is called from a deferred context.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: d2daa8b902a4ee9c1076c5b55356788278840462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2daa8b902a4ee9c1076c5b5… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Sep 29 17:40:08 2021 +0200 wined3d: Return error when GetData() is called from a deferred context. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c47b5208360..68b0333604f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1038,6 +1038,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_End(ID3D11DeviceContext1 *ifa static HRESULT STDMETHODCALLTYPE d3d11_device_context_GetData(ID3D11DeviceContext1 *iface, ID3D11Asynchronous *asynchronous, void *data, UINT data_size, UINT data_flags) { + struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_query *query = unsafe_impl_from_ID3D11Asynchronous(asynchronous); unsigned int wined3d_flags; HRESULT hr; @@ -1045,6 +1046,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_GetData(ID3D11DeviceContex TRACE("iface %p, asynchronous %p, data %p, data_size %u, data_flags %#x.\n", iface, asynchronous, data, data_size, data_flags); + if (context->type != D3D11_DEVICE_CONTEXT_IMMEDIATE) + return DXGI_ERROR_INVALID_CALL; + if (!data && data_size) return E_INVALIDARG; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c0d3b650d79..eb8cde40dcc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33091,6 +33091,11 @@ static void test_deferred_context_queries(void) ID3D11DeviceContext_ExecuteCommandList(immediate, list, FALSE); + hr = ID3D11DeviceContext_GetData(deferred, query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(deferred, query, NULL, 0, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + get_query_data(immediate, query, &data, sizeof(data)); ok(data.uint == 640 * 480, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]);

1 0

Gabriel Ivăncescu : gdi32: Create the registry keys recursively, if needed.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: e1948ccc37e104122c66bb2c4e591e47c88642a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1948ccc37e104122c66bb2c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 5 17:16:45 2021 +0300 gdi32: Create the registry keys recursively, if needed. Fixes a regression introduced by 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd when creating new prefixes, as NtCreateKey does not recursively create keys. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c6bc3a716be..8cc60d5a16f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -31,6 +31,8 @@ #include <assert.h> #include <pthread.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -564,11 +566,13 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, DWORD options, DWORD *disposition ) { UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; OBJECT_ATTRIBUTES attr; + NTSTATUS status; HANDLE ret; attr.Length = sizeof(attr); @@ -578,7 +582,34 @@ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition )) return 0; + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + static const WCHAR registry_rootW[] = { '\\','R','e','g','i','s','t','r','y','\\' }; + DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR); + + /* don't try to create registry root */ + if (!root && len > ARRAY_SIZE(registry_rootW) && + !memcmp( name, registry_rootW, sizeof(registry_rootW) )) + i += ARRAY_SIZE(registry_rootW); + + while (i < len && name[i] != '\\') i++; + if (i == len) return 0; + for (;;) + { + nameW.Buffer = (WCHAR *)name + pos; + nameW.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + + if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); + if (!NT_SUCCESS(status)) return 0; + if (i == len) break; + attr.RootDirectory = ret; + while (i < len && name[i] == '\\') i++; + pos = i; + while (i < len && name[i] != '\\') i++; + } + } return ret; }

1 0

Jacek Caban : include: Don't use DECLSPEC_HIDDEN for NTSYSAPI in Unix libs.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: a7ecf080406b76b64176505d1d2fc8abba837022 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7ecf080406b76b64176505d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 5 17:03:27 2021 +0200 include: Don't use DECLSPEC_HIDDEN for NTSYSAPI in Unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/icmp_echo.c | 2 -- dlls/nsiproxy.sys/ip.c | 2 -- dlls/winepulse.drv/pulse.c | 2 -- include/winnt.h | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index 999b53186c2..955fdfdb979 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -21,8 +21,6 @@ #pragma makedep unix #endif -#define _NTSYSTEM_ - #include "config.h" #include <stdarg.h> diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index c7ec2e89b16..432fe9d8e65 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -22,8 +22,6 @@ #pragma makedep unix #endif -#define _NTSYSTEM_ - #include "config.h" #include <stdarg.h> diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 2e6ad4848eb..bce70ac358c 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -22,8 +22,6 @@ #pragma makedep unix #endif -#define _NTSYSTEM_ - #include <stdarg.h> #include <pthread.h> #include <math.h> diff --git a/include/winnt.h b/include/winnt.h index c230fa0cd7f..87051289445 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -41,7 +41,7 @@ extern "C" { #endif -#ifdef _NTSYSTEM_ +#if defined(_NTSYSTEM_) || defined(WINE_UNIX_LIB) #define NTSYSAPI #else #define NTSYSAPI DECLSPEC_IMPORT

1 0

Alexandre Julliard : libport: Remove the _spawnvp() implementation.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 8d3bc5c89cffb01b8a78b3d642804081c7028afd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d3bc5c89cffb01b8a78b3d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 11:54:42 2021 +0200 libport: Remove the _spawnvp() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 -- include/wine/port.h | 12 ------- libs/port/Makefile.in | 1 - libs/port/spawn.c | 98 --------------------------------------------------- 6 files changed, 116 deletions(-) diff --git a/configure b/configure index 2bcdd7d7f30..db2e07679d4 100755 --- a/configure +++ b/configure @@ -17896,7 +17896,6 @@ CFLAGS="$CFLAGS $BUILTINFLAG" for ac_func in \ __res_get_state \ __res_getservers \ - _spawnvp \ epoll_create \ fork \ fstatfs \ diff --git a/configure.ac b/configure.ac index 767ba3ca202..6321206b9db 100644 --- a/configure.ac +++ b/configure.ac @@ -2127,7 +2127,6 @@ CFLAGS="$CFLAGS $BUILTINFLAG" AC_CHECK_FUNCS(\ __res_get_state \ __res_getservers \ - _spawnvp \ epoll_create \ fork \ fstatfs \ diff --git a/include/config.h.in b/include/config.h.in index a19e3768808..e27b23f658f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -965,9 +965,6 @@ /* Define if Xrandr has the XRRGetProviderResources function */ #undef HAVE_XRRGETPROVIDERRESOURCES -/* Define to 1 if you have the `_spawnvp' function. */ -#undef HAVE__SPAWNVP - /* Define to 1 if you have the `__builtin_popcount' built-in function. */ #undef HAVE___BUILTIN_POPCOUNT diff --git a/include/wine/port.h b/include/wine/port.h index ee15981c20f..b7f537bec86 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -92,18 +92,6 @@ typedef int ssize_t; # endif #endif -/* Process creation flags */ -#ifndef _P_WAIT -# define _P_WAIT 0 -# define _P_NOWAIT 1 -# define _P_OVERLAY 2 -# define _P_NOWAITO 3 -# define _P_DETACH 4 -#endif -#ifndef HAVE__SPAWNVP -extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); -#endif - #endif /* _WIN32 */ /**************************************************************** diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index a1159d67a02..9b36c6c5a3b 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -3,5 +3,4 @@ STATICLIB = libwine_port.a C_SRCS = \ lstat.c \ readlink.c \ - spawn.c \ symlink.c diff --git a/libs/port/spawn.c b/libs/port/spawn.c deleted file mode 100644 index e19aa615a5d..00000000000 --- a/libs/port/spawn.c +++ /dev/null @@ -1,98 +0,0 @@ -/* - * spawnvp function - * - * Copyright 2003 Dimitrie O. Paun - * - * 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 "config.h" -#include "wine/port.h" - -#if !defined(HAVE__SPAWNVP) && (!defined(_WIN32) || defined(__CYGWIN__)) - -#include <errno.h> -#include <signal.h> -#include <stdlib.h> -#ifdef HAVE_SYS_WAIT_H -#include <sys/wait.h> -#endif -#include <sys/stat.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -int _spawnvp(int mode, const char *cmdname, const char *const argv[]) -{ - int pid, status, wret; - - if (mode == _P_OVERLAY) - { - execvp(cmdname, (char **)argv); - /* if we get here it failed */ -#ifdef ENOTSUP - if (errno != ENOTSUP) /* exec fails on MacOS if the process has multiple threads */ -#endif - return -1; - } - - pid = fork(); - if (pid == 0) - { - /* in child */ - if (mode == _P_DETACH) - { - pid = fork(); - if (pid == -1) _exit(1); - else if (pid > 0) _exit(0); - /* else in grandchild */ - } - - signal( SIGPIPE, SIG_DFL ); - execvp(cmdname, (char **)argv); - _exit(1); - } - - if (pid == -1) - return -1; - - if (mode == _P_OVERLAY) exit(0); - - if (mode == _P_WAIT || mode == _P_DETACH) - { - while (pid != (wret = waitpid(pid, &status, 0))) - if (wret == -1 && errno != EINTR) break; - - if (pid == wret && WIFEXITED(status)) - { - if (mode == _P_WAIT) - pid = WEXITSTATUS(status); - else /* mode == _P_DETACH */ - if (WEXITSTATUS(status) != 0) /* child couldn't fork grandchild */ - pid = -1; - } - else - { - if (mode == _P_WAIT) - pid = 255; /* abnormal exit with an abort or an interrupt */ - else /* mode == _P_DETACH */ - pid = -1; - } - } - - return pid; -} - -#endif /* HAVE__SPAWNVP */

1 0

Alexandre Julliard : libport: Remove the mkstemps() implementation.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 6052dbd77a4f4aa79c33708ef975e915304b0f28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6052dbd77a4f4aa79c33708e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 11:54:12 2021 +0200 libport: Remove the mkstemps() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 2 - libs/port/Makefile.in | 1 - libs/port/mkstemps.c | 121 -------------------------------------------------- 3 files changed, 124 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index e5e9b2ee280..ee15981c20f 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -177,6 +177,4 @@ int readlink( const char *path, char *buf, size_t size ); int symlink(const char *from, const char *to); #endif -extern int mkstemps(char *template, int suffix_len); - #endif /* !defined(__WINE_WINE_PORT_H) */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 7b3ecc159df..a1159d67a02 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -2,7 +2,6 @@ STATICLIB = libwine_port.a C_SRCS = \ lstat.c \ - mkstemps.c \ readlink.c \ spawn.c \ symlink.c diff --git a/libs/port/mkstemps.c b/libs/port/mkstemps.c deleted file mode 100644 index ba92b2aeeb3..00000000000 --- a/libs/port/mkstemps.c +++ /dev/null @@ -1,121 +0,0 @@ -/* Copyright (C) 1991, 1992, 1996, 1998 Free Software Foundation, Inc. - This file is derived from mkstemp.c from the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301, USA */ - -#include "config.h" -#include "wine/port.h" - -#include <sys/types.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <stdio.h> -#include <fcntl.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - -#ifndef TMP_MAX -#define TMP_MAX 16384 -#endif - -/* - -(a)deftypefn Replacement int mkstemps (char *@var{template}, int @var{suffix_len}) - -Generate a unique temporary file name from @var{template}. -(a)var{template} has the form: - -(a)example - @var{path}/ccXXXXXX(a)var{suffix} -(a)end example - -(a)var{suffix_len} tells us how long @var{suffix} is (it can be zero -length). The last six characters of @var{template} before @var{suffix} -must be @samp{XXXXXX}; they are replaced with a string that makes the -filename unique. Returns a file descriptor open on the file for -reading and writing. - -(a)end deftypefn - -*/ - -int -mkstemps ( - char *template, - int suffix_len) -{ - static const char letters[] - = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - static unsigned __int64 value; - char *XXXXXX; - size_t len; - int count; - - len = strlen (template); - - if ((int) len < 6 + suffix_len - || strncmp (&template[len - 6 - suffix_len], "XXXXXX", 6)) - { - return -1; - } - - XXXXXX = &template[len - 6 - suffix_len]; - -#ifndef _WIN32 - { - struct timeval tv; - gettimeofday( &tv, NULL ); - value += ((unsigned __int64) tv.tv_usec << 16) ^ tv.tv_sec; - } -#endif - value += getpid(); - - for (count = 0; count < TMP_MAX; ++count) - { - unsigned __int64 v = value; - int fd; - - /* Fill in the random bits. */ - XXXXXX[0] = letters[v % 62]; - v /= 62; - XXXXXX[1] = letters[v % 62]; - v /= 62; - XXXXXX[2] = letters[v % 62]; - v /= 62; - XXXXXX[3] = letters[v % 62]; - v /= 62; - XXXXXX[4] = letters[v % 62]; - v /= 62; - XXXXXX[5] = letters[v % 62]; - - fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600); - if (fd >= 0) - /* The file does not exist. */ - return fd; - - /* This is a random value. It is only necessary that the next - TMP_MAX values generated by adding 7777 to VALUE are different - with (module 2^32). */ - value += 7777; - } - - return -1; -}

1 0