February 2022 - Wine-commits

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

15 Feb '22

Module: wine Branch: master Commit: 57c58c46bb43e825baf49b21263c615ad83962f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c58c46bb43e825baf49b21… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 17:57:20 2022 -0600 wined3d: Use wined3d_context_copy_bo_address() to download 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 | 56 +++++---------------------------------------------- 1 file changed, 5 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bc6d9a67d6e..cab93ccc4e3 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_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) @@ -139,14 +137,6 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc wined3d_buffer_invalidate_range(buffer, location, 0, 0); } -/* Context activation is done by the caller. */ -static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) -{ - const struct wined3d_bo_gl *bo_gl = wined3d_bo_gl(buffer_gl->b.buffer_object); - - wined3d_context_gl_bind_bo(context_gl, bo_gl->binding, bo_gl->id); -} - static GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) { if (!bind_flags) @@ -628,10 +618,13 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, } else { + dst.buffer_object = NULL; + dst.addr = buffer->resource.heap_memory; + src.buffer_object = buffer->buffer_object; + src.addr = NULL; range.offset = 0; range.size = buffer->resource.size; - buffer->buffer_ops->buffer_download_ranges(buffer, context, - buffer->resource.heap_memory, 0, 1, &range); + wined3d_context_copy_bo_address(context, &dst, &src, 1, &range); } break; @@ -1351,17 +1344,10 @@ 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_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) -{ - FIXME("Not implemented.\n"); -} - static const struct wined3d_buffer_ops wined3d_buffer_no3d_ops = { wined3d_buffer_no3d_prepare_location, wined3d_buffer_no3d_unload_location, - wined3d_buffer_no3d_download_ranges, }; HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wined3d_device *device, @@ -1419,35 +1405,10 @@ static void wined3d_buffer_gl_unload_location(struct wined3d_buffer *buffer, } } -/* 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) -{ - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - struct wined3d_bo_gl *bo_gl = wined3d_bo_gl(buffer->buffer_object); - struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const struct wined3d_range *range; - - TRACE("buffer %p, context %p, data %p, data_offset %u, range_count %u, ranges %p.\n", - buffer, context, data, data_offset, range_count, ranges); - - wined3d_buffer_gl_bind(buffer_gl, context_gl); - - while (range_count--) - { - range = &ranges[range_count]; - GL_EXTCALL(glGetBufferSubData(bo_gl->binding, bo_gl->b.buffer_offset + range->offset, - range->size, (BYTE *)data + range->offset - data_offset)); - } - checkGLcall("buffer download"); -} - static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { wined3d_buffer_gl_prepare_location, wined3d_buffer_gl_unload_location, - wined3d_buffer_gl_download_ranges, }; HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, @@ -1597,17 +1558,10 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, } } -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) -{ - FIXME("Not implemented.\n"); -} - static const struct wined3d_buffer_ops wined3d_buffer_vk_ops = { wined3d_buffer_vk_prepare_location, wined3d_buffer_vk_unload_location, - wined3d_buffer_vk_download_ranges, }; HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined3d_device *device,

1 0

Francois Gouget : ntdll: Fix the spelling of SystemPrioritySeparation.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: fae276c44a921a6107fddd458e7ed0f45f1d0336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fae276c44a921a6107fddd45… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 15 03:34:59 2022 +0100 ntdll: Fix the spelling of SystemPrioritySeparation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winternl.h b/include/winternl.h index 5be28856920..81fd5f45665 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1624,7 +1624,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemContextSwitchInformation = 36, SystemRegistryQuotaInformation = 37, SystemExtendServiceTableInformation = 38, - SystemPrioritySeperation = 39, + SystemPrioritySeparation = 39, SystemVerifierAddDriverInformation = 40, SystemVerifierRemoveDriverInformation = 41, SystemProcessorIdleInformation = 42,

1 0

Nikolay Sivov : winepulse: Use FAILED() instead of non-zero result check.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 820c77319db2ad097f900f07c7596e125c7e615d URL: https://source.winehq.org/git/wine.git/?a=commit;h=820c77319db2ad097f900f07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 14 14:50:47 2022 +0300 winepulse: Use FAILED() instead of non-zero result check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 35a66e18d8a..e3d5ea91cf5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -344,7 +344,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->parent = dev; hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient3_iface, &This->marshal); - if (hr) { + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr; }

1 0

Connor McAdams : wined3d: Fix comment in wined3d_texture_vk_download_data().
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 0dcdfae29a671a3fbaaae1b2299324d9c51d1faf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dcdfae29a671a3fbaaae1b2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Feb 14 12:59:42 2022 -0500 wined3d: Fix comment in wined3d_texture_vk_download_data(). For download, vkCmdCopyImageToBuffer() is used, not vkCmdCopyBufferToImage(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e1f20887840..18925338285 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4953,7 +4953,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, return; } - /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyBufferToImage() calls below. */ + /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyImageToBuffer() calls below. */ wined3d_context_vk_end_current_render_pass(context_vk); if (!dst_bo_addr->buffer_object)

1 0

Sven Baars : rsaenh: Store a BCRYPT_HASH_HANDLE in CRYPTHASH.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: bb4c43de94720357bbabac489963df006c1783a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb4c43de94720357bbabac48… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Feb 15 12:45:46 2022 +0100 rsaenh: Store a BCRYPT_HASH_HANDLE in CRYPTHASH. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 20 ++++++++++---------- dlls/rsaenh/implglue.h | 14 +++++--------- dlls/rsaenh/rsaenh.c | 26 +++++++++++++------------- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 9d90ad70f53..d98a08b2f31 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -32,8 +32,8 @@ /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); - -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) + +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) { BCRYPT_ALG_HANDLE provider; NTSTATUS status; @@ -74,27 +74,27 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) if (status) return FALSE; - status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); + status = BCryptCreateHash(provider, hash_handle, NULL, 0, NULL, 0, 0); BCryptCloseAlgorithmProvider(provider, 0); return !status; } -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, DWORD dwDataLen) +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) { - BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); + BCryptHashData(hash_handle, (UCHAR*)pbData, dwDataLen, 0); return TRUE; } -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) { - BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); - BCryptDestroyHash(pHashContext->bcrypt_hash); + BCryptFinishHash(hash_handle, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); + BCryptDestroyHash(hash_handle); return TRUE; } -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, BCRYPT_HASH_HANDLE *dest_hash_handle) { - return !BCryptDuplicateHash(pSrcHashContext->bcrypt_hash, &pDestHashContext->bcrypt_hash, NULL, 0, 0); + return !BCryptDuplicateHash(src_hash_handle, dest_hash_handle, NULL, 0, 0); } BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 9be642e9b60..06fa3f4430a 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -29,10 +29,6 @@ #define RSAENH_MAX_HASH_SIZE 104 -typedef union tagHASH_CONTEXT { - BCRYPT_HASH_HANDLE bcrypt_hash; -} HASH_CONTEXT; - typedef union tagKEY_CONTEXT { rc2_key rc2; des_key des; @@ -42,12 +38,12 @@ typedef union tagKEY_CONTEXT { rsa_key rsa; } KEY_CONTEXT; -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) DECLSPEC_HIDDEN; -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) DECLSPEC_HIDDEN; +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) DECLSPEC_HIDDEN; -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) DECLSPEC_HIDDEN; -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, - HASH_CONTEXT *pDestHashContext) DECLSPEC_HIDDEN; +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) DECLSPEC_HIDDEN; +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, + BCRYPT_HASH_HANDLE *dest_hash_handle) DECLSPEC_HIDDEN; BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) DECLSPEC_HIDDEN; BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext) DECLSPEC_HIDDEN; diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index a4deb80b0e1..c913c0c71ee 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -58,7 +58,7 @@ typedef struct tagCRYPTHASH HCRYPTPROV hProv; DWORD dwHashSize; DWORD dwState; - HASH_CONTEXT context; + BCRYPT_HASH_HANDLE hash_handle; BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; PHMAC_INFO pHMACInfo; RSAENH_TLS1PRF_PARAMS tpPRFParams; @@ -627,8 +627,8 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { pAlgInfo = get_algid_info(pCryptHash->hProv, pCryptHash->pHMACInfo->HashAlgid); if (!pAlgInfo) return FALSE; pCryptHash->dwHashSize = pAlgInfo->dwDefaultLen >> 3; - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbInnerString, pCryptHash->pHMACInfo->cbInnerString); } @@ -642,7 +642,7 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { return TRUE; default: - return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->context); + return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->hash_handle); } } @@ -664,7 +664,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD { case CALG_HMAC: if (pCryptHash->pHMACInfo) - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); break; case CALG_MAC: @@ -677,7 +677,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD break; default: - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); } } @@ -699,15 +699,15 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { if (pCryptHash->pHMACInfo) { BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); memcpy(abHashValue, pCryptHash->abHashValue, pCryptHash->dwHashSize); - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbOuterString, pCryptHash->pHMACInfo->cbOuterString); - update_hash_impl(&pCryptHash->context, + update_hash_impl(pCryptHash->hash_handle, abHashValue, pCryptHash->dwHashSize); - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } break; @@ -718,7 +718,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { break; default: - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } } @@ -2371,7 +2371,7 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash, DWORD *pdw if (*phHash != (HCRYPTHASH)INVALID_HANDLE_VALUE) { *pDestHash = *pSrcHash; - duplicate_hash_impl(&pSrcHash->context, &pDestHash->context); + duplicate_hash_impl(pSrcHash->hash_handle, &pDestHash->hash_handle); copy_hmac_info(&pDestHash->pHMACInfo, pSrcHash->pHMACInfo); copy_data_blob(&pDestHash->tpPRFParams.blobLabel, &pSrcHash->tpPRFParams.blobLabel); copy_data_blob(&pDestHash->tpPRFParams.blobSeed, &pSrcHash->tpPRFParams.blobSeed);

1 0

Sven Baars : rsaenh: Properly destroy hashes created by CPCreateHash() (Valgrind).
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: f0987134b44bbac43ac21efc2d973bd4022fc375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0987134b44bbac43ac21efc… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Feb 15 12:45:47 2022 +0100 rsaenh: Properly destroy hashes created by CPCreateHash() (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index c913c0c71ee..d03f647832e 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -594,13 +594,14 @@ static BOOL copy_hmac_info(PHMAC_INFO *dst, const HMAC_INFO *src) { * Destructor for hash objects * * PARAMS - * pCryptHash [I] Pointer to the hash object to be destroyed. + * pCryptHash [I] Pointer to the hash object to be destroyed. * Will be invalid after function returns! */ static void destroy_hash(OBJECTHDR *pObject) { CRYPTHASH *pCryptHash = (CRYPTHASH*)pObject; - + + BCryptDestroyHash(pCryptHash->hash_handle); free_hmac_info(pCryptHash->pHMACInfo); free_data_blob(&pCryptHash->tpPRFParams.blobLabel); free_data_blob(&pCryptHash->tpPRFParams.blobSeed); @@ -708,6 +709,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { update_hash_impl(pCryptHash->hash_handle, abHashValue, pCryptHash->dwHashSize); finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); + pCryptHash->hash_handle = NULL; } break; @@ -719,6 +721,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { default: finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); + pCryptHash->hash_handle = NULL; } } @@ -2211,6 +2214,7 @@ BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, pCryptHash->hProv = hProv; pCryptHash->dwState = RSAENH_HASHSTATE_HASHING; pCryptHash->pHMACInfo = NULL; + pCryptHash->hash_handle = NULL; pCryptHash->dwHashSize = peaAlgidInfo->dwDefaultLen >> 3; init_data_blob(&pCryptHash->tpPRFParams.blobLabel); init_data_blob(&pCryptHash->tpPRFParams.blobSeed);

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

Eric Pouech : mfreadwrite: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 2ebd4e36b914e67cdafff06e8cea5c43bcc999b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ebd4e36b914e67cdafff06e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:27:32 2022 +0100 mfreadwrite: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/Makefile.in | 1 - dlls/mfreadwrite/reader.c | 88 ++++++++++++++++++++++---------------------- dlls/mfreadwrite/writer.c | 20 +++++----- 3 files changed, 54 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2ebd4e36b914e67cdaff…

1 0

Eric Pouech : msacm32: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: d1ee1d68c0fbf555a7f5d88477d027f1579231a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1ee1d68c0fbf555a7f5d884… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:28:35 2022 +0100 msacm32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/Makefile.in | 1 - dlls/msacm32/driver.c | 26 +++++++++++++------------- dlls/msacm32/filter.c | 12 ++++++------ dlls/msacm32/format.c | 26 +++++++++++++------------- dlls/msacm32/internal.c | 14 +++++++------- dlls/msacm32/msacm32_main.c | 4 ++-- dlls/msacm32/pcmconverter.c | 24 ++++++++++++------------ dlls/msacm32/stream.c | 24 ++++++++++++------------ 8 files changed, 65 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d1ee1d68c0fbf555a7f5…

1 0

Eric Pouech : mshtml: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 210abcd81a12d4806294ed057a35979aa12fb262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=210abcd81a12d4806294ed05… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:41 2022 +0100 mshtml: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/conpoint.c | 10 +-- dlls/mshtml/dispex.c | 58 +++++++-------- dlls/mshtml/editor.c | 28 +++---- dlls/mshtml/htmlanchor.c | 8 +- dlls/mshtml/htmlarea.c | 6 +- dlls/mshtml/htmlattr.c | 4 +- dlls/mshtml/htmlbody.c | 22 +++--- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmlcurstyle.c | 6 +- dlls/mshtml/htmldoc.c | 112 ++++++++++++++-------------- dlls/mshtml/htmlelem.c | 170 +++++++++++++++++++++---------------------- dlls/mshtml/htmlelemcol.c | 30 ++++---- dlls/mshtml/htmlevent.c | 38 +++++----- dlls/mshtml/htmlform.c | 38 +++++----- dlls/mshtml/htmlframe.c | 26 +++---- dlls/mshtml/htmlimg.c | 38 +++++----- dlls/mshtml/htmlinput.c | 74 +++++++++---------- dlls/mshtml/htmllink.c | 4 +- dlls/mshtml/htmllocation.c | 10 +-- dlls/mshtml/htmlnode.c | 46 ++++++------ dlls/mshtml/htmlobject.c | 18 ++--- dlls/mshtml/htmlscript.c | 10 +-- dlls/mshtml/htmlselect.c | 68 ++++++++--------- dlls/mshtml/htmlstorage.c | 6 +- dlls/mshtml/htmlstyle.c | 52 ++++++------- dlls/mshtml/htmlstyleelem.c | 4 +- dlls/mshtml/htmlstylesheet.c | 58 +++++++-------- dlls/mshtml/htmltable.c | 72 +++++++++--------- dlls/mshtml/htmltextarea.c | 10 +-- dlls/mshtml/htmltextnode.c | 16 ++-- dlls/mshtml/htmlwindow.c | 108 +++++++++++++-------------- dlls/mshtml/ifacewrap.c | 4 +- dlls/mshtml/loadopts.c | 8 +- dlls/mshtml/main.c | 12 +-- dlls/mshtml/mutation.c | 20 ++--- dlls/mshtml/navigate.c | 64 ++++++++-------- dlls/mshtml/npplugin.c | 4 +- dlls/mshtml/nsembed.c | 100 ++++++++++++------------- dlls/mshtml/nsevents.c | 12 +-- dlls/mshtml/nsio.c | 74 +++++++++---------- dlls/mshtml/nsservice.c | 4 +- dlls/mshtml/olecmd.c | 114 ++++++++++++++--------------- dlls/mshtml/oleobj.c | 52 ++++++------- dlls/mshtml/omnavigator.c | 56 +++++++------- dlls/mshtml/persist.c | 32 ++++---- dlls/mshtml/pluginhost.c | 114 ++++++++++++++--------------- dlls/mshtml/protocol.c | 38 +++++----- dlls/mshtml/range.c | 72 +++++++++--------- dlls/mshtml/script.c | 70 +++++++++--------- dlls/mshtml/secmgr.c | 10 +-- dlls/mshtml/selection.c | 12 +-- dlls/mshtml/service.c | 8 +- dlls/mshtml/svg.c | 16 ++-- dlls/mshtml/task.c | 4 +- dlls/mshtml/view.c | 40 +++++----- dlls/mshtml/xmlhttprequest.c | 36 ++++----- 57 files changed, 1064 insertions(+), 1065 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=210abcd81a12d4806294…

1 0