December 2018 - Wine-commits

Francois Gouget : wined3d: Make wined3d_adapter_init_format_info() static.
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: wine Branch: master Commit: 1177d08245baa070fd3b66145ee42847f456efde URL: https://source.winehq.org/git/wine.git/?a=commit;h=1177d08245baa070fd3b6614… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 9 01:41:51 2018 +0100 wined3d: Make wined3d_adapter_init_format_info() static. It is no longer referenced in other source files. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index aa68799..f8da256 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3971,7 +3971,7 @@ static void init_format_depth_bias_scale(struct wined3d_adapter *adapter, } } -BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) +static BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) { unsigned int count = WINED3D_FORMAT_COUNT + ARRAY_SIZE(typeless_depth_stencil_formats); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a6715a..6e39db4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2707,7 +2707,6 @@ struct wined3d_caps_gl_ctx GLuint test_program_id; }; -BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) DECLSPEC_HIDDEN; BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN;

1 0

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

17 Dec '18

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

Matteo Bruni : d3d9: Support drawing from D3DPOOL_SYSTEMMEM index buffers.
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: wine Branch: master Commit: f34a19e68eea12fd0ae0ddd88134031939383f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f34a19e68eea12fd0ae0ddd8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 17 23:17:22 2018 +0330 d3d9: 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/d3d9/buffer.c | 24 ++++++- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 44 +++++++++++-- dlls/d3d9/stateblock.c | 3 + dlls/d3d9/tests/visual.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 234 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f34a19e68eea12fd0ae0…

1 0

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

17 Dec '18

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

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

17 Dec '18

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

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

17 Dec '18

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: wine Branch: master Commit: 8d4456ddfb0e813ade5f1dbbc82d2e35aa423081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d4456ddfb0e813ade5f1dbb… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Dec 14 21:15:59 2018 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 416 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 198 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d4456ddfb0e813ade5f…

1 0

Alistair Leslie-Hughes : include: Add GetFilePatchSignature definition.
by Alexandre Julliard 17 Dec '18

17 Dec '18

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 17 Dec '18

17 Dec '18

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

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

17 Dec '18

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