December 2018 - Wine-Commits

Nikolay Sivov : combase/tests: Fix a string leak (Valgrind).
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: c18fa0eb7fa2f8c7f8b8e45d59392954b1fb405a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c18fa0eb7fa2f8c7f8b8e45d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 17 08:16:11 2018 +0300 combase/tests: Fix a string leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/roapi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index 05581f8..eef00fc 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -99,6 +99,7 @@ static void test_ActivationFactories(void) if(inspect) IInspectable_Release(inspect); + pWindowsDeleteString(str2); pWindowsDeleteString(str); pRoUninitialize(); }

1 0

Matteo Bruni : ddraw: Support drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffers.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 5a8e430b96ab429a85f82f26ba9d2de4729954c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a8e430b96ab429a85f82f26… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 17 23:17:25 2018 +0330 ddraw: Support drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45279 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 44 +++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 93 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 236 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a8e430b96ab429a85f8…

1 0

Matteo Bruni : d3d8: Support drawing from D3DPOOL_SYSTEMMEM index buffers.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 695dbca9d3568fe797de2c7fb988972ba2e8e263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=695dbca9d3568fe797de2c7f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 17 23:17:24 2018 +0330 d3d8: Support drawing from D3DPOOL_SYSTEMMEM index buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 24 +++++++++++-- dlls/d3d8/d3d8_private.h | 4 ++- dlls/d3d8/device.c | 47 +++++++++++++++++++++--- dlls/d3d8/tests/visual.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 160 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=695dbca9d3568fe797de…

1 0

Henri Verbeet : d3d9: Support drawing from D3DPOOL_SYSTEMMEM vertex buffers.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: b18a53a5b44b651cde8e05200c75eacf54f49926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b18a53a5b44b651cde8e0520… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 17 23:17:21 2018 +0330 d3d9: Support drawing from D3DPOOL_SYSTEMMEM vertex buffers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45486 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 24 ++++++++++++++++--- dlls/d3d9/d3d9_private.h | 11 ++++++--- dlls/d3d9/device.c | 61 +++++++++++++++++++++++++++++++++++++++++++----- dlls/d3d9/stateblock.c | 17 ++++++++++++++ 4 files changed, 101 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b18a53a5b44b651cde8e…

1 0

Hans Leidekker : bcrypt: Clear magic bytes on destroy.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 370ffa0d149d366cfcc9f544dd182b8b3592d708 URL: https://source.winehq.org/git/wine.git/?a=commit;h=370ffa0d149d366cfcc9f544… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 17 09:47:58 2018 +0100 bcrypt: Clear magic bytes on destroy. Based on a patch by Steven Noonan. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 5 ++++- dlls/bcrypt/tests/bcrypt.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 0c68a4f..c236491 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -214,6 +214,7 @@ NTSTATUS WINAPI BCryptCloseAlgorithmProvider( BCRYPT_ALG_HANDLE handle, DWORD fl TRACE( "%p, %08x\n", handle, flags ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + alg->hdr.magic = 0; heap_free( alg ); return STATUS_SUCCESS; } @@ -672,7 +673,8 @@ NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) TRACE( "%p\n", handle ); - if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; + if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_PARAMETER; + hash->hdr.magic = 0; heap_free( hash ); return STATUS_SUCCESS; } @@ -1265,6 +1267,7 @@ NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) TRACE( "%p\n", handle ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + key->hdr.magic = 0; return key_destroy( key ); } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index c3f8f3d..5240c3b 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -293,6 +293,12 @@ static void test_hash(const struct hash_test *test) ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = pBCryptDestroyHash(hash); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + ret = pBCryptDestroyHash(NULL); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } @@ -1415,8 +1421,17 @@ static void test_BCryptDecrypt(void) ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptDestroyKey(NULL); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + ret = pBCryptCloseAlgorithmProvider(aes, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(aes, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(NULL, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); } static void test_key_import_export(void)

1 0

Matteo Bruni : d3d8: Support drawing from D3DPOOL_SYSTEMMEM vertex buffers.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 75b7ff60562880b6e7b646a8fa84486670162d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75b7ff60562880b6e7b646a8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 17 23:17:23 2018 +0330 d3d8: Support drawing from D3DPOOL_SYSTEMMEM vertex buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 24 ++++++++++++-- dlls/d3d8/d3d8_private.h | 14 ++++++--- dlls/d3d8/device.c | 82 ++++++++++++++++++++++++++++++++++++++++++------ dlls/d3d8/tests/visual.c | 77 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 181 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=75b7ff60562880b6e7b6…

1 0

Nikolay Sivov : dwrite/tests: Fix another factory leak (Valgrind).
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 3d100f7d56fafd1c0bd1f6ecf2304e2e96457abf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d100f7d56fafd1c0bd1f6ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 17 08:16:12 2018 +0300 dwrite/tests: Fix another factory leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index aa1562e..3f41289 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8887,6 +8887,8 @@ static void test_localfontfileloader(void) IDWriteFontFileLoader_Release(loader2); ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); + ref = IDWriteFactory_Release(factory2); + ok(ref == 0, "factory not released, %u\n", ref); DELETE_FONTFILE(path); }

1 0

Dmitry Timoshkov : include: Add compatibility macros for Visual Studio 10.0.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 36588028142793dbe43a6421db3d9fb64412b32c URL: https://source.winehq.org/git/wine.git/?a=commit;h=36588028142793dbe43a6421… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 17 08:30:13 2018 +0300 include: Add compatibility macros for Visual Studio 10.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/include/sal.h b/include/sal.h index 29746c3..35f6493 100644 --- a/include/sal.h +++ b/include/sal.h @@ -25,12 +25,15 @@ #define _At_buffer_(a, b, c, d) #define _Check_return_ +#define _Check_return_opt_ #define _Deref_out_ +#define _Deref_out_z_ #define _Deref_out_opt_ #define _Deref_out_opt_z_ #define _Deref_post_opt_cap_(count) #define _Deref_post_opt_valid_ +#define _Deref_post_opt_z_cap_(count) #define _Deref_post_valid_ #define _Deref_post_z_ #define _Deref_prepost_opt_z_ @@ -40,10 +43,25 @@ #define _In_ #define _In_bytecount_(count) +#define _In_bytecount_c_(count) +#define _In_bytecount_x_(count) #define _In_count_(count) +#define _In_count_c_(count) +#define _In_count_x_(count) #define _In_opt_ +#define _In_opt_bytecount_(count) +#define _In_opt_bytecount_c_(count) +#define _In_opt_bytecount_x_(count) #define _In_opt_count_(count) +#define _In_opt_count_c_(count) +#define _In_opt_count_x_(count) +#define _In_opt_ptrdiff_count_(count) #define _In_opt_z_ +#define _In_opt_z_count_(count) +#define _In_opt_z_count_c_(count) +#define _In_opt_z_bytecount_(count) +#define _In_opt_z_bytecount_c_(count) +#define _In_ptrdiff_count_(count) #define _In_range_(min, max) #define _In_reads_(count) #define _In_reads_bytes_(count) @@ -53,11 +71,18 @@ #define _In_reads_or_z_opt_(count) #define _In_reads_z_(count) #define _In_z_ +#define _In_z_bytecount_(count) +#define _In_z_bytecount_c_(count) +#define _In_z_count_(count) +#define _In_z_count_c_(count) #define _Inout_ +#define _Inout_bytecap_x_(count) #define _Inout_cap_(count) #define _Inout_opt_ +#define _Inout_opt_cap_c_(count) #define _Inout_opt_z_ +#define _Inout_opt_z_bytecap_(count) #define _Inout_updates_(count) #define _Inout_updates_bytes_(count) #define _Inout_updates_opt_(count) @@ -72,13 +97,37 @@ #define _Out_ #define _Out_bytecap_(count) +#define _Out_bytecap_c_(count) +#define _Out_bytecap_x_(count) #define _Out_bytecapcount_(count) #define _Out_bytecap_post_bytecount_(count1, count2) #define _Out_cap_(count) +#define _Out_cap_c_(count) +#define _Out_cap_m_(count1, count2) +#define _Out_cap_x_(count) #define _Out_cap_post_count_(count1, count2) #define _Out_opt_ +#define _Out_opt_bytecap_(count) +#define _Out_opt_bytecap_c_(count) +#define _Out_opt_bytecap_x_(count) +#define _Out_opt_bytecap_post_bytecount_(count1, count2) +#define _Out_opt_bytecapcount_(count) +#define _Out_opt_cap_(count) +#define _Out_opt_cap_m_(count1, count2) +#define _Out_opt_cap_c_(count) +#define _Out_opt_cap_x_(count) +#define _Out_opt_cap_post_count_(count1, count2) +#define _Out_opt_ptrdiff_cap_(count) +#define _Out_opt_z_bytecap_(count) +#define _Out_opt_z_bytecap_c_(count) +#define _Out_opt_z_bytecap_x_(count) +#define _Out_opt_z_bytecap_post_bytecount_(count1, count2) #define _Out_opt_z_cap_(count) +#define _Out_opt_z_cap_c_(count) +#define _Out_opt_z_cap_m_(count1, count2) +#define _Out_opt_z_cap_x_(count) #define _Out_opt_z_cap_post_count_(count1, count2) +#define _Out_ptrdiff_cap_(count) #define _Out_writes_(count) #define _Out_writes_bytes_(count) #define _Out_writes_bytes_all_(count) @@ -91,8 +140,14 @@ #define _Out_writes_to_(count1, count2) #define _Out_writes_to_opt_(count1, count2) #define _Out_writes_z_(count) +#define _Out_z_bytecap_(count) +#define _Out_z_bytecap_c_(count) +#define _Out_z_bytecap_x_(count) +#define _Out_z_bytecap_post_bytecount_(count1, count2) #define _Out_z_cap_(count) #define _Out_z_cap_c_(count) +#define _Out_z_cap_m_(count1, count2) +#define _Out_z_cap_x_(count) #define _Out_z_cap_post_count_(count1, count2) #define _Outptr_result_buffer_(count) @@ -103,19 +158,24 @@ #define _Param_(p) +#define _Post_count_(count) +#define _Post_count_c_(count) #define _Post_equal_to_(exp) #define _Post_invalid_ #define _Post_maybez_ +#define _Post_ptr_invalid_ #define _Post_readable_size_(count) #define _Post_satisfies_(exp) #define _Post_writable_byte_size_(count) #define _Post_z_ +#define _Pre_cap_for_(count) #define _Pre_maybenull_ #define _Pre_notnull_ #define _Pre_opt_z_ #define _Pre_writable_size_(count) #define _Pre_z_ +#define _Prepost_z_ #define _Printf_format_string_ #define _Printf_format_string_params_(count) @@ -124,6 +184,8 @@ #define _Ret_maybenull_z_ #define _Ret_notnull_ #define _Ret_opt_ +#define _Ret_opt_bytecap_(count) +#define _Ret_opt_bytecap_x_(count) #define _Ret_opt_z_cap_(count) #define _Ret_writes_bytes_maybenull_(count) #define _Ret_z_

1 0

Alistair Leslie-Hughes : include: Add GetFilePatchSignature definition.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 5b9eefd91f89dcf84a1dd92d98dc5ae97b83c334 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b9eefd91f89dcf84a1dd92d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Dec 16 21:57:30 2018 +0000 include: Add GetFilePatchSignature definition. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/patchapi.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/patchapi.h b/include/patchapi.h index 9a62a0f..5adaf0a 100644 --- a/include/patchapi.h +++ b/include/patchapi.h @@ -45,6 +45,12 @@ BOOL WINAPI ApplyPatchToFileA(LPCSTR,LPCSTR,LPCSTR,ULONG); BOOL WINAPI ApplyPatchToFileW(LPCWSTR,LPCWSTR,LPCWSTR,ULONG); #define ApplyPatchToFile WINELIB_NAME_AW(ApplyPatchToFile) +BOOL WINAPI GetFilePatchSignatureA(LPCSTR, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, + PPATCH_RETAIN_RANGE, ULONG, LPSTR); +BOOL WINAPI GetFilePatchSignatureW(LPCWSTR, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, + PPATCH_RETAIN_RANGE, ULONG, LPWSTR); +#define GetFilePatchSignature WINELIB_NAME_AW(GetFilePatchSignature) + #ifdef __cplusplus } #endif

1 0

Alistair Leslie-Hughes : include: Correct IBrowserService.IEGetDisplayName definition.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: wine Branch: master Commit: 6f3e082c5cdccc8be4a9f52da38e73a607f123a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3e082c5cdccc8be4a9f52d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Dec 16 22:15:11 2018 +0000 include: Correct IBrowserService.IEGetDisplayName definition. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shdeprecated.idl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/shdeprecated.idl b/include/shdeprecated.idl index 3e1e5e7..c8bb3fd 100644 --- a/include/shdeprecated.idl +++ b/include/shdeprecated.idl @@ -34,6 +34,12 @@ cpp_quote("#define TLMENUF_BACK 0x00000010") cpp_quote("#define TLMENUF_FORE 0x00000020") cpp_quote("#define TLMENUF_BACKANDFORTH (TLMENUF_BACK | TLMENUF_FORE | TLMENUF_INCLUDECURRENT)") +cpp_quote("#ifndef INTERNET_MAX_URL_LENGTH") +cpp_quote("#define INTERNET_MAX_PATH_LENGTH 2048") +cpp_quote("#define INTERNET_MAX_SCHEME_LENGTH 32") +cpp_quote("#define INTERNET_MAX_URL_LENGTH (INTERNET_MAX_SCHEME_LENGTH + sizeof(\"://\")+ INTERNET_MAX_PATH_LENGTH)") +cpp_quote("#endif") + [ hidden, local, @@ -214,7 +220,7 @@ interface IBrowserService : IUnknown HRESULT IEGetDisplayName( [in] PCIDLIST_ABSOLUTE pidl, - [out] LPWSTR pwszName, + [out, size_is(INTERNET_MAX_URL_LENGTH)] LPWSTR pwszName, [in] UINT uFlags); HRESULT IEParseDisplayName(

1 0