wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Zebediah Figura : wined3d: Use wined3d_context_copy_bo_address() to upload buffer ranges.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: bf5ae2a3a0fbc1ce6b1a53737014d9efc23deee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf5ae2a3a0fbc1ce6b1a5373… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 17:57:19 2022 -0600 wined3d: Use wined3d_context_copy_bo_address() to upload buffer ranges. 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/buffer.c | 92 ++++++++------------------------------------------- 1 file changed, 13 insertions(+), 79 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cc5b7bf6c33..bc6d9a67d6e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -43,8 +43,6 @@ struct wined3d_buffer_ops struct wined3d_context *context, unsigned int location); void (*buffer_unload_location)(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location); - void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); }; @@ -516,6 +514,7 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined3d_context *context) { unsigned int i, j, range_idx, start, end, vertex_count; + struct wined3d_bo_address src, dst; BYTE *data; if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM)) @@ -564,8 +563,11 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } } - buffer->buffer_ops->buffer_upload_ranges(buffer, context, - data, 0, buffer->modified_areas, buffer->maps); + dst.buffer_object = buffer->buffer_object; + dst.addr = NULL; + src.buffer_object = NULL; + src.addr = data; + wined3d_context_copy_bo_address(context, &dst, &src, buffer->modified_areas, buffer->maps); heap_free(data); } @@ -585,6 +587,7 @@ static void wined3d_buffer_unload_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_bo_address src, dst; struct wined3d_range range; TRACE("buffer %p, context %p, location %s.\n", @@ -641,9 +644,13 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, memset(buffer->resource.heap_memory, 0, buffer->resource.size); } + dst.buffer_object = buffer->buffer_object; + dst.addr = NULL; + src.buffer_object = NULL; + src.addr = buffer->resource.heap_memory; + if (!buffer->conversion_map) - buffer->buffer_ops->buffer_upload_ranges(buffer, context, - buffer->resource.heap_memory, 0, buffer->modified_areas, buffer->maps); + wined3d_context_copy_bo_address(context, &dst, &src, buffer->modified_areas, buffer->maps); else buffer_conversion_upload(buffer, context); break; @@ -1344,12 +1351,6 @@ static void wined3d_buffer_no3d_unload_location(struct wined3d_buffer *buffer, TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); } -static void wined3d_buffer_no3d_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) -{ - FIXME("Not implemented.\n"); -} - static void wined3d_buffer_no3d_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) { @@ -1360,7 +1361,6 @@ static const struct wined3d_buffer_ops wined3d_buffer_no3d_ops = { wined3d_buffer_no3d_prepare_location, wined3d_buffer_no3d_unload_location, - wined3d_buffer_no3d_upload_ranges, wined3d_buffer_no3d_download_ranges, }; @@ -1419,23 +1419,6 @@ static void wined3d_buffer_gl_unload_location(struct wined3d_buffer *buffer, } } -/* Context activation is done by the caller. */ -static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) -{ - struct wined3d_bo_address src, dst; - - TRACE("buffer %p, context %p, data %p, data_offset %u, range_count %u, ranges %p.\n", - buffer, context, data, data_offset, range_count, ranges); - - dst.buffer_object = buffer->buffer_object; - dst.addr = 0; - src.buffer_object = NULL; - src.addr = (uint8_t *)data - data_offset; - - wined3d_context_copy_bo_address(context, &dst, &src, range_count, ranges); -} - /* Context activation is done by the caller. */ static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) @@ -1464,7 +1447,6 @@ static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { wined3d_buffer_gl_prepare_location, wined3d_buffer_gl_unload_location, - wined3d_buffer_gl_upload_ranges, wined3d_buffer_gl_download_ranges, }; @@ -1615,53 +1597,6 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, } } -static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) -{ - struct wined3d_context_vk *context_vk = wined3d_context_vk(context); - struct wined3d_resource *resource = &buffer->resource; - struct wined3d_bo_address src, dst; - const struct wined3d_range *range; - struct wined3d_bo_vk *dst_bo; - unsigned int i = range_count; - uint32_t flags; - void *map_ptr; - - if (!range_count) - return; - - dst.buffer_object = buffer->buffer_object; - dst.addr = NULL; - - flags = WINED3D_MAP_WRITE; - if (!ranges->offset && ranges->size == resource->size) - flags |= WINED3D_MAP_DISCARD; - - dst_bo = wined3d_bo_vk(buffer->buffer_object); - if (!(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) || (!(flags & WINED3D_MAP_DISCARD) - && dst_bo->command_buffer_id > context_vk->completed_command_buffer_id)) - { - src.buffer_object = 0; - src.addr = (uint8_t *)data - data_offset; - wined3d_context_copy_bo_address(context, &dst, &src, range_count, ranges); - return; - } - - if (!(map_ptr = wined3d_context_map_bo_address(context, &dst, resource->size, flags))) - { - FIXME("Failed to map buffer.\n"); - return; - } - - while (i--) - { - range = &ranges[i]; - memcpy((uint8_t *)map_ptr + range->offset, (uint8_t *)data + range->offset - data_offset, range->size); - } - - wined3d_context_unmap_bo_address(context, &dst, range_count, ranges); -} - static void wined3d_buffer_vk_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) { @@ -1672,7 +1607,6 @@ static const struct wined3d_buffer_ops wined3d_buffer_vk_ops = { wined3d_buffer_vk_prepare_location, wined3d_buffer_vk_unload_location, - wined3d_buffer_vk_upload_ranges, wined3d_buffer_vk_download_ranges, };

1 0

Zebediah Figura : wined3d: Pass a wined3d_range array to wined3d_context_copy_bo_address().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 9f8b5670e4fc85ecdbc54330f98c56c0a082ec70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f8b5670e4fc85ecdbc54330… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 17:57:18 2022 -0600 wined3d: Pass a wined3d_range array to wined3d_context_copy_bo_address(). 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/adapter_gl.c | 5 ++- dlls/wined3d/adapter_vk.c | 84 ++++++++++++++++++++++++------------------ dlls/wined3d/buffer.c | 27 +++++--------- dlls/wined3d/context_gl.c | 39 +++++++++++++------- dlls/wined3d/directx.c | 9 ++++- dlls/wined3d/texture.c | 6 ++- dlls/wined3d/view.c | 10 ++++- dlls/wined3d/wined3d_private.h | 14 ++++--- 8 files changed, 114 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f8b5670e4fc85ecdbc5…

1 0

Zebediah Figura : wined3d: Move struct wined3d_buffer_ops to buffer.c.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: a2653a94557c50d2d36e94af5eb1c0b400194119 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2653a94557c50d2d36e94af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 17:57:17 2022 -0600 wined3d: Move struct wined3d_buffer_ops to buffer.c. 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/buffer.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 902ab720396..bb8f9753468 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -37,6 +37,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ +struct wined3d_buffer_ops +{ + BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); + void (*buffer_unload_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); + void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); + void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); +}; + static void wined3d_buffer_evict_sysmem(struct wined3d_buffer *buffer) { if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0e4f0cdfaf..51a7c2ffb10 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5122,18 +5122,6 @@ enum wined3d_buffer_conversion_type CONV_POSITIONT, }; -struct wined3d_buffer_ops -{ - BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, - struct wined3d_context *context, unsigned int location); - void (*buffer_unload_location)(struct wined3d_buffer *buffer, - struct wined3d_context *context, unsigned int location); - void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); - void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); -}; - struct wined3d_buffer { struct wined3d_resource resource;

1 0

Alexandre Julliard : api-ms-*: Forward to cryptsp instead of advapi32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: b331ffcded6cb7b9e66f3f7ae6756ddaa5af5263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b331ffcded6cb7b9e66f3f7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 17:33:10 2022 +0100 api-ms-*: Forward to cryptsp instead of advapi32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-security-cryptoapi-l1-1-0.spec | 78 +++++++++++----------- tools/make_specfiles | 5 +- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec b/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec index 357af4c79d1..6c1a412f534 100644 --- a/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec +++ b/dlls/api-ms-win-security-cryptoapi-l1-1-0/api-ms-win-security-cryptoapi-l1-1-0.spec @@ -1,39 +1,39 @@ -@ stdcall CryptAcquireContextA(ptr str str long long) advapi32.CryptAcquireContextA -@ stdcall CryptAcquireContextW(ptr wstr wstr long long) advapi32.CryptAcquireContextW -@ stdcall CryptContextAddRef(long ptr long) advapi32.CryptContextAddRef -@ stdcall CryptCreateHash(long long long long ptr) advapi32.CryptCreateHash -@ stdcall CryptDecrypt(long long long long ptr ptr) advapi32.CryptDecrypt -@ stdcall CryptDeriveKey(long long long long ptr) advapi32.CryptDeriveKey -@ stdcall CryptDestroyHash(long) advapi32.CryptDestroyHash -@ stdcall CryptDestroyKey(long) advapi32.CryptDestroyKey -@ stdcall CryptDuplicateHash(long ptr long ptr) advapi32.CryptDuplicateHash -@ stdcall CryptDuplicateKey(long ptr long ptr) advapi32.CryptDuplicateKey -@ stdcall CryptEncrypt(long long long long ptr ptr long) advapi32.CryptEncrypt -@ stdcall CryptEnumProviderTypesA(long ptr long ptr ptr ptr) advapi32.CryptEnumProviderTypesA -@ stdcall CryptEnumProviderTypesW(long ptr long ptr ptr ptr) advapi32.CryptEnumProviderTypesW -@ stdcall CryptEnumProvidersA(long ptr long ptr ptr ptr) advapi32.CryptEnumProvidersA -@ stdcall CryptEnumProvidersW(long ptr long ptr ptr ptr) advapi32.CryptEnumProvidersW -@ stdcall CryptExportKey(long long long long ptr ptr) advapi32.CryptExportKey -@ stdcall CryptGenKey(long long long ptr) advapi32.CryptGenKey -@ stdcall CryptGenRandom(long long ptr) advapi32.CryptGenRandom -@ stdcall CryptGetDefaultProviderA(long ptr long ptr ptr) advapi32.CryptGetDefaultProviderA -@ stdcall CryptGetDefaultProviderW(long ptr long ptr ptr) advapi32.CryptGetDefaultProviderW -@ stdcall CryptGetHashParam(long long ptr ptr long) advapi32.CryptGetHashParam -@ stdcall CryptGetKeyParam(long long ptr ptr long) advapi32.CryptGetKeyParam -@ stdcall CryptGetProvParam(long long ptr ptr long) advapi32.CryptGetProvParam -@ stdcall CryptGetUserKey(long long ptr) advapi32.CryptGetUserKey -@ stdcall CryptHashData(long ptr long long) advapi32.CryptHashData -@ stdcall CryptHashSessionKey(long long long) advapi32.CryptHashSessionKey -@ stdcall CryptImportKey(long ptr long long long ptr) advapi32.CryptImportKey -@ stdcall CryptReleaseContext(long long) advapi32.CryptReleaseContext -@ stdcall CryptSetHashParam(long long ptr long) advapi32.CryptSetHashParam -@ stdcall CryptSetKeyParam(long long ptr long) advapi32.CryptSetKeyParam -@ stdcall CryptSetProvParam(long long ptr long) advapi32.CryptSetProvParam -@ stdcall CryptSetProviderA(str long) advapi32.CryptSetProviderA -@ stdcall CryptSetProviderExA(str long ptr long) advapi32.CryptSetProviderExA -@ stdcall CryptSetProviderExW(wstr long ptr long) advapi32.CryptSetProviderExW -@ stdcall CryptSetProviderW(wstr long) advapi32.CryptSetProviderW -@ stdcall CryptSignHashA(long long str long ptr ptr) advapi32.CryptSignHashA -@ stdcall CryptSignHashW(long long wstr long ptr ptr) advapi32.CryptSignHashW -@ stdcall CryptVerifySignatureA(long ptr long long str long) advapi32.CryptVerifySignatureA -@ stdcall CryptVerifySignatureW(long ptr long long wstr long) advapi32.CryptVerifySignatureW +@ stdcall CryptAcquireContextA(ptr str str long long) cryptsp.CryptAcquireContextA +@ stdcall CryptAcquireContextW(ptr wstr wstr long long) cryptsp.CryptAcquireContextW +@ stdcall CryptContextAddRef(long ptr long) cryptsp.CryptContextAddRef +@ stdcall CryptCreateHash(long long long long ptr) cryptsp.CryptCreateHash +@ stdcall CryptDecrypt(long long long long ptr ptr) cryptsp.CryptDecrypt +@ stdcall CryptDeriveKey(long long long long ptr) cryptsp.CryptDeriveKey +@ stdcall CryptDestroyHash(long) cryptsp.CryptDestroyHash +@ stdcall CryptDestroyKey(long) cryptsp.CryptDestroyKey +@ stdcall CryptDuplicateHash(long ptr long ptr) cryptsp.CryptDuplicateHash +@ stdcall CryptDuplicateKey(long ptr long ptr) cryptsp.CryptDuplicateKey +@ stdcall CryptEncrypt(long long long long ptr ptr long) cryptsp.CryptEncrypt +@ stdcall CryptEnumProviderTypesA(long ptr long ptr ptr ptr) cryptsp.CryptEnumProviderTypesA +@ stdcall CryptEnumProviderTypesW(long ptr long ptr ptr ptr) cryptsp.CryptEnumProviderTypesW +@ stdcall CryptEnumProvidersA(long ptr long ptr ptr ptr) cryptsp.CryptEnumProvidersA +@ stdcall CryptEnumProvidersW(long ptr long ptr ptr ptr) cryptsp.CryptEnumProvidersW +@ stdcall CryptExportKey(long long long long ptr ptr) cryptsp.CryptExportKey +@ stdcall CryptGenKey(long long long ptr) cryptsp.CryptGenKey +@ stdcall CryptGenRandom(long long ptr) cryptsp.CryptGenRandom +@ stdcall CryptGetDefaultProviderA(long ptr long ptr ptr) cryptsp.CryptGetDefaultProviderA +@ stdcall CryptGetDefaultProviderW(long ptr long ptr ptr) cryptsp.CryptGetDefaultProviderW +@ stdcall CryptGetHashParam(long long ptr ptr long) cryptsp.CryptGetHashParam +@ stdcall CryptGetKeyParam(long long ptr ptr long) cryptsp.CryptGetKeyParam +@ stdcall CryptGetProvParam(long long ptr ptr long) cryptsp.CryptGetProvParam +@ stdcall CryptGetUserKey(long long ptr) cryptsp.CryptGetUserKey +@ stdcall CryptHashData(long ptr long long) cryptsp.CryptHashData +@ stdcall CryptHashSessionKey(long long long) cryptsp.CryptHashSessionKey +@ stdcall CryptImportKey(long ptr long long long ptr) cryptsp.CryptImportKey +@ stdcall CryptReleaseContext(long long) cryptsp.CryptReleaseContext +@ stdcall CryptSetHashParam(long long ptr long) cryptsp.CryptSetHashParam +@ stdcall CryptSetKeyParam(long long ptr long) cryptsp.CryptSetKeyParam +@ stdcall CryptSetProvParam(long long ptr long) cryptsp.CryptSetProvParam +@ stdcall CryptSetProviderA(str long) cryptsp.CryptSetProviderA +@ stdcall CryptSetProviderExA(str long ptr long) cryptsp.CryptSetProviderExA +@ stdcall CryptSetProviderExW(wstr long ptr long) cryptsp.CryptSetProviderExW +@ stdcall CryptSetProviderW(wstr long) cryptsp.CryptSetProviderW +@ stdcall CryptSignHashA(long long str long ptr ptr) cryptsp.CryptSignHashA +@ stdcall CryptSignHashW(long long wstr long ptr ptr) cryptsp.CryptSignHashW +@ stdcall CryptVerifySignatureA(long ptr long long str long) cryptsp.CryptVerifySignatureA +@ stdcall CryptVerifySignatureW(long ptr long long wstr long) cryptsp.CryptVerifySignatureW diff --git a/tools/make_specfiles b/tools/make_specfiles index a374867f938..8f83034f160 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -123,7 +123,6 @@ my @dll_groups = "api-ms-win-eventlog-legacy-l1-1-0", "api-ms-win-perf-legacy-l1-1-0", "api-ms-win-security-base-private-l1-1-1", - "api-ms-win-security-cryptoapi-l1-1-0", "api-ms-win-security-lsalookup-ansi-l2-1-0", "api-ms-win-security-provider-l1-1-0", "api-ms-win-security-systemfunctions-l1-1-0", @@ -150,6 +149,10 @@ my @dll_groups = "api-ms-win-service-winsvc-l1-1-0", "api-ms-win-service-winsvc-l1-2-0", ], + [ + "cryptsp", + "api-ms-win-security-cryptoapi-l1-1-0", + ], [ "authz", "ext-ms-win-authz-context-l1-1-0",

1 0

Alexandre Julliard : api-ms-*: Forward to sechost instead of advapi32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 23791eb11d8cd65655d0f62dc0fa511be3eab22a URL: https://source.winehq.org/git/wine.git/?a=commit;h=23791eb11d8cd65655d0f62d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:55:46 2022 +0100 api-ms-*: Forward to sechost instead of advapi32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-advapi32-l2-1-0.spec | 26 ++++++++--------- .../api-ms-win-eventing-consumer-l1-1-0.spec | 6 ++-- .../api-ms-win-eventing-controller-l1-1-0.spec | 12 ++++---- .../api-ms-win-security-audit-l1-1-1.spec | 2 +- .../api-ms-win-security-credentials-l1-1-0.spec | 34 +++++++++++----------- .../api-ms-win-security-lsalookup-l1-1-0.spec | 4 +-- .../api-ms-win-security-lsalookup-l1-1-1.spec | 4 +-- .../api-ms-win-security-lsapolicy-l1-1-0.spec | 28 +++++++++--------- .../api-ms-win-security-sddl-l1-1-0.spec | 8 ++--- .../api-ms-win-service-core-l1-1-0.spec | 6 ++-- .../api-ms-win-service-core-l1-1-1.spec | 10 +++---- .../api-ms-win-service-management-l1-1-0.spec | 12 ++++---- .../api-ms-win-service-management-l2-1-0.spec | 16 +++++----- .../api-ms-win-service-private-l1-1-1.spec | 4 +-- .../api-ms-win-service-winsvc-l1-1-0.spec | 28 +++++++++--------- .../api-ms-win-service-winsvc-l1-2-0.spec | 28 +++++++++--------- tools/make_specfiles | 19 +++++++----- 17 files changed, 125 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=23791eb11d8cd65655d0…

1 0

Alexandre Julliard : api-ms-*: Forward to cfgmgr32 instead of setupapi.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: c239f38db44118235f6450ea6f111d0ee1d7f38a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c239f38db44118235f6450ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:38:59 2022 +0100 api-ms-*: Forward to cfgmgr32 instead of setupapi. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-devices-config-l1-1-0.spec | 30 +++++++++++----------- .../api-ms-win-devices-config-l1-1-1.spec | 30 +++++++++++----------- tools/make_specfiles | 1 - 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec index 59004c997f7..87d0e9fd903 100644 --- a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec +++ b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec @@ -3,33 +3,33 @@ @ stub CM_Delete_Device_Interface_KeyW @ stub CM_Disable_DevNode @ stub CM_Enable_DevNode -@ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child +@ stdcall CM_Get_Child(ptr long long) cfgmgr32.CM_Get_Child @ stub CM_Get_Class_PropertyW @ stub CM_Get_Class_Property_Keys -@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) cfgmgr32.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) cfgmgr32.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys -@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW -@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status -@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW -@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW -@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW -@ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) cfgmgr32.CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) cfgmgr32.CM_Get_DevNode_Status +@ stdcall CM_Get_Device_IDW(ptr ptr long long) cfgmgr32.CM_Get_Device_IDW +@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) cfgmgr32.CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) cfgmgr32.CM_Get_Device_ID_List_SizeW +@ stdcall CM_Get_Device_ID_Size(ptr ptr long) cfgmgr32.CM_Get_Device_ID_Size @ stub CM_Get_Device_Interface_ListW -@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) cfgmgr32.CM_Get_Device_Interface_List_SizeW @ stub CM_Get_Device_Interface_PropertyW @ stub CM_Get_Device_Interface_Property_KeysW -@ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent -@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling -@ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW +@ stdcall CM_Get_Parent(ptr long long) cfgmgr32.CM_Get_Parent +@ stdcall CM_Get_Sibling(ptr long long) cfgmgr32.CM_Get_Sibling +@ stdcall CM_Locate_DevNodeW(ptr wstr long) cfgmgr32.CM_Locate_DevNodeW @ stub CM_Open_Class_KeyW -@ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key +@ stdcall CM_Open_DevNode_Key(long long long long ptr long) cfgmgr32.CM_Open_DevNode_Key @ stub CM_Open_Device_Interface_KeyW @ stub CM_Query_And_Remove_SubTreeW @ stub CM_Register_Notification @ stub CM_Set_Class_PropertyW -@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) cfgmgr32.CM_Set_Class_Registry_PropertyW @ stub CM_Set_DevNode_PropertyW @ stub CM_Set_DevNode_Registry_PropertyW @ stub CM_Set_Device_Interface_PropertyW diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec index e10352eda59..46ef2754e7b 100644 --- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -3,34 +3,34 @@ @ stub CM_Delete_Device_Interface_KeyW @ stub CM_Disable_DevNode @ stub CM_Enable_DevNode -@ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child +@ stdcall CM_Get_Child(ptr long long) cfgmgr32.CM_Get_Child @ stub CM_Get_Class_PropertyW @ stub CM_Get_Class_Property_Keys -@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) cfgmgr32.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) cfgmgr32.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys -@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW -@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status -@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW -@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW -@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW -@ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) cfgmgr32.CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) cfgmgr32.CM_Get_DevNode_Status +@ stdcall CM_Get_Device_IDW(ptr ptr long long) cfgmgr32.CM_Get_Device_IDW +@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) cfgmgr32.CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) cfgmgr32.CM_Get_Device_ID_List_SizeW +@ stdcall CM_Get_Device_ID_Size(ptr ptr long) cfgmgr32.CM_Get_Device_ID_Size @ stub CM_Get_Device_Interface_ListW -@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) cfgmgr32.CM_Get_Device_Interface_List_SizeW @ stub CM_Get_Device_Interface_PropertyW @ stub CM_Get_Device_Interface_Property_KeysW -@ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent -@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling -@ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW +@ stdcall CM_Get_Parent(ptr long long) cfgmgr32.CM_Get_Parent +@ stdcall CM_Get_Sibling(ptr long long) cfgmgr32.CM_Get_Sibling +@ stdcall CM_Locate_DevNodeW(ptr wstr long) cfgmgr32.CM_Locate_DevNodeW @ stub CM_MapCrToWin32Err @ stub CM_Open_Class_KeyW -@ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key +@ stdcall CM_Open_DevNode_Key(long long long long ptr long) cfgmgr32.CM_Open_DevNode_Key @ stub CM_Open_Device_Interface_KeyW @ stub CM_Query_And_Remove_SubTreeW @ stub CM_Register_Notification @ stub CM_Set_Class_PropertyW -@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) cfgmgr32.CM_Set_Class_Registry_PropertyW @ stub CM_Set_DevNode_PropertyW @ stub CM_Set_DevNode_Registry_PropertyW @ stub CM_Set_Device_Interface_PropertyW diff --git a/tools/make_specfiles b/tools/make_specfiles index 157337ee01a..07fb263ed65 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -101,7 +101,6 @@ my @dll_groups = "xinput9_1_0", ], [ - "setupapi", "cfgmgr32", "api-ms-win-devices-config-l1-1-0", "api-ms-win-devices-config-l1-1-1",

1 0

Alexandre Julliard : api-ms-*: Forward to shcore instead of shlwapi.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 6e90c16e1779731a2ece6fc9bc854dfc7ed00510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e90c16e1779731a2ece6fc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:36:18 2022 +0100 api-ms-*: Forward to shcore instead of shlwapi. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-shlwapi-l2-1-0.spec | 106 ++++++++++----------- tools/make_specfiles | 9 +- 2 files changed, 54 insertions(+), 61 deletions(-) diff --git a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec index 11c33f8949c..cec457dc6d6 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec @@ -1,56 +1,56 @@ @ stub IStream_Copy -@ stdcall IStream_Read(ptr ptr long) shlwapi.IStream_Read +@ stdcall IStream_Read(ptr ptr long) shcore.IStream_Read @ stub IStream_ReadStr -@ stdcall IStream_Reset(ptr) shlwapi.IStream_Reset -@ stdcall IStream_Size(ptr ptr) shlwapi.IStream_Size -@ stdcall IStream_Write(ptr ptr long) shlwapi.IStream_Write +@ 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 IUnknown_AtomicRelease(ptr) shlwapi.IUnknown_AtomicRelease -@ stdcall IUnknown_GetSite(ptr ptr ptr) shlwapi.IUnknown_GetSite -@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) shlwapi.IUnknown_QueryService -@ stdcall IUnknown_Set(ptr ptr) shlwapi.IUnknown_Set -@ stdcall IUnknown_SetSite(ptr ptr) shlwapi.IUnknown_SetSite -@ stdcall SHAnsiToAnsi(str ptr long) shlwapi.SHAnsiToAnsi -@ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode -@ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA -@ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW -@ stdcall SHCreateMemStream(ptr long) shlwapi.SHCreateMemStream -@ stdcall SHCreateStreamOnFileA(str long ptr) shlwapi.SHCreateStreamOnFileA -@ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shlwapi.SHCreateStreamOnFileEx -@ stdcall SHCreateStreamOnFileW(wstr long ptr) shlwapi.SHCreateStreamOnFileW -@ stdcall SHCreateThreadRef(ptr ptr) shlwapi.SHCreateThreadRef -@ stdcall SHDeleteEmptyKeyA(long str) shlwapi.SHDeleteEmptyKeyA -@ stdcall SHDeleteEmptyKeyW(long wstr) shlwapi.SHDeleteEmptyKeyW -@ stdcall SHDeleteKeyA(long str) shlwapi.SHDeleteKeyA -@ stdcall SHDeleteKeyW(long wstr) shlwapi.SHDeleteKeyW -@ stdcall SHDeleteValueA(long str str) shlwapi.SHDeleteValueA -@ stdcall SHDeleteValueW(long wstr wstr) shlwapi.SHDeleteValueW -@ stdcall SHEnumKeyExA(long long str ptr) shlwapi.SHEnumKeyExA -@ stdcall SHEnumKeyExW(long long wstr ptr) shlwapi.SHEnumKeyExW -@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shlwapi.SHEnumValueA -@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shlwapi.SHEnumValueW -@ stdcall SHGetThreadRef(ptr) shlwapi.SHGetThreadRef -@ stdcall SHGetValueA(long str str ptr ptr ptr) shlwapi.SHGetValueA -@ stdcall SHGetValueW(long wstr wstr ptr ptr ptr) shlwapi.SHGetValueW -@ stdcall SHOpenRegStream2A(long str str long) shlwapi.SHOpenRegStream2A -@ stdcall SHOpenRegStream2W(long wstr wstr long) shlwapi.SHOpenRegStream2W -@ stdcall SHOpenRegStreamA(long str str long) shlwapi.SHOpenRegStreamA -@ stdcall SHOpenRegStreamW(long wstr wstr long) shlwapi.SHOpenRegStreamW -@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyA -@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyW -@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) shlwapi.SHQueryValueExA -@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) shlwapi.SHQueryValueExW -@ stdcall SHRegDuplicateHKey(long) shlwapi.SHRegDuplicateHKey -@ stdcall SHRegGetPathA(long str str ptr long) shlwapi.SHRegGetPathA -@ stdcall SHRegGetPathW(long wstr wstr ptr long) shlwapi.SHRegGetPathW -@ stdcall SHRegGetValueA( long str str long ptr ptr ptr ) shlwapi.SHRegGetValueA -@ stdcall SHRegGetValueW( long wstr wstr long ptr ptr ptr ) shlwapi.SHRegGetValueW -@ stdcall SHRegSetPathA(long str str str long) shlwapi.SHRegSetPathA -@ stdcall SHRegSetPathW(long wstr wstr wstr long) shlwapi.SHRegSetPathW -@ stdcall SHReleaseThreadRef() shlwapi.SHReleaseThreadRef -@ stdcall SHSetThreadRef(ptr) shlwapi.SHSetThreadRef -@ stdcall SHSetValueA(long str str long ptr long) shlwapi.SHSetValueA -@ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW -@ stdcall SHStrDupW(wstr ptr) shlwapi.SHStrDupW -@ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi -@ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode +@ stdcall IUnknown_AtomicRelease(ptr) shcore.IUnknown_AtomicRelease +@ stdcall IUnknown_GetSite(ptr ptr ptr) shcore.IUnknown_GetSite +@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) shcore.IUnknown_QueryService +@ stdcall IUnknown_Set(ptr ptr) shcore.IUnknown_Set +@ stdcall IUnknown_SetSite(ptr ptr) shcore.IUnknown_SetSite +@ stdcall SHAnsiToAnsi(str ptr long) shcore.SHAnsiToAnsi +@ stdcall SHAnsiToUnicode(str ptr long) shcore.SHAnsiToUnicode +@ stdcall SHCopyKeyA(long str long long) shcore.SHCopyKeyA +@ stdcall SHCopyKeyW(long wstr long long) shcore.SHCopyKeyW +@ 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 SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef +@ stdcall SHDeleteEmptyKeyA(long str) shcore.SHDeleteEmptyKeyA +@ stdcall SHDeleteEmptyKeyW(long wstr) shcore.SHDeleteEmptyKeyW +@ stdcall SHDeleteKeyA(long str) shcore.SHDeleteKeyA +@ stdcall SHDeleteKeyW(long wstr) shcore.SHDeleteKeyW +@ stdcall SHDeleteValueA(long str str) shcore.SHDeleteValueA +@ stdcall SHDeleteValueW(long wstr wstr) shcore.SHDeleteValueW +@ stdcall SHEnumKeyExA(long long str ptr) shcore.SHEnumKeyExA +@ stdcall SHEnumKeyExW(long long wstr ptr) shcore.SHEnumKeyExW +@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shcore.SHEnumValueA +@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shcore.SHEnumValueW +@ stdcall SHGetThreadRef(ptr) shcore.SHGetThreadRef +@ stdcall SHGetValueA(long str str ptr ptr ptr) shcore.SHGetValueA +@ stdcall SHGetValueW(long wstr wstr ptr ptr ptr) shcore.SHGetValueW +@ 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 +@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) shcore.SHQueryInfoKeyA +@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) shcore.SHQueryInfoKeyW +@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) shcore.SHQueryValueExA +@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) shcore.SHQueryValueExW +@ stdcall SHRegDuplicateHKey(long) shcore.SHRegDuplicateHKey +@ stdcall SHRegGetPathA(long str str ptr long) shcore.SHRegGetPathA +@ stdcall SHRegGetPathW(long wstr wstr ptr long) shcore.SHRegGetPathW +@ stdcall SHRegGetValueA(long str str long ptr ptr ptr) shcore.SHRegGetValueA +@ stdcall SHRegGetValueW(long wstr wstr long ptr ptr ptr) shcore.SHRegGetValueW +@ stdcall SHRegSetPathA(long str str str long) shcore.SHRegSetPathA +@ stdcall SHRegSetPathW(long wstr wstr wstr long) shcore.SHRegSetPathW +@ stdcall SHReleaseThreadRef() shcore.SHReleaseThreadRef +@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef +@ stdcall SHSetValueA(long str str long ptr long) shcore.SHSetValueA +@ stdcall SHSetValueW(long wstr wstr long ptr long) shcore.SHSetValueW +@ stdcall SHStrDupW(wstr ptr) shcore.SHStrDupW +@ stdcall SHUnicodeToAnsi(wstr ptr ptr) shcore.SHUnicodeToAnsi +@ stdcall SHUnicodeToUnicode(wstr ptr long) shcore.SHUnicodeToUnicode diff --git a/tools/make_specfiles b/tools/make_specfiles index 11f54156233..3f1370a01f3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -375,10 +375,7 @@ my @dll_groups = [ "shcore", "api-ms-win-core-featurestaging-l1-1-0", - ], - [ - "shcore", - "shell32", + "api-ms-win-downlevel-shlwapi-l2-1-0", "api-ms-win-shcore-obsolete-l1-1-0", "api-ms-win-shcore-scaling-l1-1-0", "api-ms-win-shcore-scaling-l1-1-1", @@ -393,10 +390,6 @@ my @dll_groups = "api-ms-win-shell-shellfolders-l1-1-0", "ext-ms-win-shell-shell32-l1-2-0", ], - [ - "shlwapi", - "api-ms-win-downlevel-shlwapi-l2-1-0", - ], [ "user32", "api-ms-win-ntuser-dc-access-l1-1-0",

1 0

Alexandre Julliard : api-ms-*: Forward to shcore instead of shell32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: e2187d4fe142b1f8322ecc46832f26f4f76680ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2187d4fe142b1f8322ecc46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:38:02 2022 +0100 api-ms-*: Forward to shcore instead of shell32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-shell32-l1-1-0.spec | 6 +++--- tools/make_specfiles | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec index 9d03c03f8b7..5484bdecc70 100644 --- a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec @@ -1,3 +1,3 @@ -@ stdcall CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW -@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID -@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID +@ stdcall CommandLineToArgvW(wstr ptr) shcore.CommandLineToArgvW +@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shcore.GetCurrentProcessExplicitAppUserModelID +@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shcore.SetCurrentProcessExplicitAppUserModelID diff --git a/tools/make_specfiles b/tools/make_specfiles index 3f1370a01f3..157337ee01a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -375,6 +375,7 @@ my @dll_groups = [ "shcore", "api-ms-win-core-featurestaging-l1-1-0", + "api-ms-win-downlevel-shell32-l1-1-0", "api-ms-win-downlevel-shlwapi-l2-1-0", "api-ms-win-shcore-obsolete-l1-1-0", "api-ms-win-shcore-scaling-l1-1-0", @@ -385,7 +386,6 @@ my @dll_groups = ], [ "shell32", - "api-ms-win-downlevel-shell32-l1-1-0", "api-ms-win-shell-shellcom-l1-1-0", "api-ms-win-shell-shellfolders-l1-1-0", "ext-ms-win-shell-shell32-l1-2-0",

1 0

Alexandre Julliard : api-ms-*: Forward to combase instead of ole32.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 21536c066a8bf30ee3a67d3f4a5dd4d08e2ea321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21536c066a8bf30ee3a67d3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:34:30 2022 +0100 api-ms-*: Forward to combase instead of ole32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0.spec | 140 ++++++++++----------- .../api-ms-win-core-com-l1-1-1.spec | 140 ++++++++++----------- .../api-ms-win-downlevel-ole32-l1-1-0.spec | 94 +++++++------- tools/make_specfiles | 6 +- 4 files changed, 190 insertions(+), 190 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21536c066a8bf30ee3a6…

1 0

Alexandre Julliard : api-ms-*: Forward to kernelbase instead of version.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 7df8967358ffad162514afec443088a418053605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7df8967358ffad162514afec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:32:38 2022 +0100 api-ms-*: Forward to kernelbase instead of version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-version-l1-1-0.spec | 8 ++++---- .../api-ms-win-core-version-l1-1-1.spec | 12 ++++++------ .../api-ms-win-core-versionansi-l1-1-0.spec | 8 ++++---- .../api-ms-win-downlevel-version-l1-1-0.spec | 12 ++++++------ tools/make_specfiles | 8 ++++---- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec b/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec index 0ac1e13369d..0973ab48a98 100644 --- a/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec +++ b/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stdcall GetFileVersionInfoExW(long wstr long long ptr) version.GetFileVersionInfoExW -@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) version.GetFileVersionInfoSizeExW -@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW -@ stdcall VerQueryValueW(ptr wstr ptr ptr) version.VerQueryValueW +@ stdcall GetFileVersionInfoExW(long wstr long long ptr) kernelbase.GetFileVersionInfoExW +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) kernelbase.GetFileVersionInfoSizeExW +@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) kernelbase.VerFindFileW +@ stdcall VerQueryValueW(ptr wstr ptr ptr) kernelbase.VerQueryValueW diff --git a/dlls/api-ms-win-core-version-l1-1-1/api-ms-win-core-version-l1-1-1.spec b/dlls/api-ms-win-core-version-l1-1-1/api-ms-win-core-version-l1-1-1.spec index 95b9df68df4..5f04422cca6 100644 --- a/dlls/api-ms-win-core-version-l1-1-1/api-ms-win-core-version-l1-1-1.spec +++ b/dlls/api-ms-win-core-version-l1-1-1/api-ms-win-core-version-l1-1-1.spec @@ -1,6 +1,6 @@ -@ stdcall GetFileVersionInfoExW(long wstr long long ptr) version.GetFileVersionInfoExW -@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) version.GetFileVersionInfoSizeExW -@ stdcall GetFileVersionInfoSizeW(wstr ptr) version.GetFileVersionInfoSizeW -@ stdcall GetFileVersionInfoW(wstr long long ptr) version.GetFileVersionInfoW -@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW -@ stdcall VerQueryValueW(ptr wstr ptr ptr) version.VerQueryValueW +@ stdcall GetFileVersionInfoExW(long wstr long long ptr) kernelbase.GetFileVersionInfoExW +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) kernelbase.GetFileVersionInfoSizeExW +@ stdcall GetFileVersionInfoSizeW(wstr ptr) kernelbase.GetFileVersionInfoSizeW +@ stdcall GetFileVersionInfoW(wstr long long ptr) kernelbase.GetFileVersionInfoW +@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) kernelbase.VerFindFileW +@ stdcall VerQueryValueW(ptr wstr ptr ptr) kernelbase.VerQueryValueW diff --git a/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec b/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec index 58a1711a1fe..701f1053980 100644 --- a/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec +++ b/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stdcall GetFileVersionInfoExA(long str long long ptr) version.GetFileVersionInfoExA -@ stdcall GetFileVersionInfoSizeExA(long str ptr) version.GetFileVersionInfoSizeExA -@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA -@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA +@ stdcall GetFileVersionInfoExA(long str long long ptr) kernelbase.GetFileVersionInfoExA +@ stdcall GetFileVersionInfoSizeExA(long str ptr) kernelbase.GetFileVersionInfoSizeExA +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) kernelbase.VerFindFileA +@ stdcall VerQueryValueA(ptr str ptr ptr) kernelbase.VerQueryValueA diff --git a/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec index e645bbbf1f6..41188ef2962 100644 --- a/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec @@ -1,6 +1,6 @@ -@ stdcall GetFileVersionInfoExW(long wstr long long ptr) version.GetFileVersionInfoExW -@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) version.GetFileVersionInfoSizeExW -@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA -@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW -@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA -@ stdcall VerQueryValueW(ptr wstr ptr ptr) version.VerQueryValueW +@ stdcall GetFileVersionInfoExW(long wstr long long ptr) kernelbase.GetFileVersionInfoExW +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) kernelbase.GetFileVersionInfoSizeExW +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) kernelbase.VerFindFileA +@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) kernelbase.VerFindFileW +@ stdcall VerQueryValueA(ptr str ptr ptr) kernelbase.VerQueryValueA +@ stdcall VerQueryValueW(ptr wstr ptr ptr) kernelbase.VerQueryValueW diff --git a/tools/make_specfiles b/tools/make_specfiles index 915241e2797..3b7765cdca5 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -304,6 +304,9 @@ my @dll_groups = "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-toolhelp-l1-1-0", "api-ms-win-core-url-l1-1-0", + "api-ms-win-core-version-l1-1-0", + "api-ms-win-core-version-l1-1-1", + "api-ms-win-core-versionansi-l1-1-0", "api-ms-win-core-windowserrorreporting-l1-1-0", "api-ms-win-core-windowserrorreporting-l1-1-1", "api-ms-win-core-wow64-l1-1-0", @@ -313,6 +316,7 @@ my @dll_groups = "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-downlevel-shlwapi-l1-1-0", "api-ms-win-downlevel-user32-l1-1-0", + "api-ms-win-downlevel-version-l1-1-0", "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-security-base-l1-1-0", @@ -435,11 +439,7 @@ my @dll_groups = ], [ "version", - "api-ms-win-core-version-l1-1-0", - "api-ms-win-core-version-l1-1-1", "api-ms-win-core-version-private-l1-1-0", - "api-ms-win-core-versionansi-l1-1-0", - "api-ms-win-downlevel-version-l1-1-0", ], [ "winmm",

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022