wine-commits December 2018

wine-commits@winehq.org

1 participants
352 discussions

Józef Kucia : vkd3d-shader: Add support for dual source blending.
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: vkd3d Branch: master Commit: 5b0ed414a15aafc7bcd4fa79d2b2d7da552ff14f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5b0ed414a15aafc7bcd4fa7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 13 10:28:36 2018 +0100 vkd3d-shader: Add support for dual source blending. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7d9bf70..1153fde 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -165,6 +165,7 @@ struct vkd3d_shader_compile_arguments const void *next; enum vkd3d_shader_target target; + bool dual_source_blending; const unsigned int *output_swizzles; unsigned int output_swizzle_count; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ec7cab6..a24585c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3400,6 +3400,14 @@ static unsigned int get_shader_output_swizzle(const struct vkd3d_dxbc_compiler * return compile_args->output_swizzles[register_idx]; } +static bool is_dual_source_blending(const struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; + + return compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL + && compile_args && compile_args->dual_source_blending; +} + static void calculate_clip_or_cull_distance_mask(const struct vkd3d_shader_signature_element *e, uint32_t *mask) { @@ -3544,7 +3552,16 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } else { - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); + if (is_dual_source_blending(compiler) && reg->idx[0].offset < 2) + { + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, 0); + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationIndex, reg->idx[0].offset); + } + else + { + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); + } + if (component_idx) vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); }

1 0

Alexandre Julliard : Wine release 4.0-rc2
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: website Branch: master Commit: 124e2925f4632dfe03dcf705273688d869404206 URL: https://source.winehq.org/git/website.git/?a=commit;h=124e2925f4632dfe03dcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:57:28 2018 +0100 Wine release 4.0-rc2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018121401.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018121401.xml b/news/en/2018121401.xml new file mode 100644 index 0000000..027a806 --- /dev/null +++ b/news/en/2018121401.xml @@ -0,0 +1,12 @@ +<news> +<date>December 14, 2018</date> +<title>Wine 4.0-rc2 Released</title> +<body> + The Wine development release 4.0-rc2 is now available. + <a href="{$root}/announce/4.0-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0-rc2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-4.0-rc2 : Alexandre Julliard : Release 4.0-rc2
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: refs/tags/wine-4.0-rc2 Tag: 6340db6f8508df95bffe5e2e7e37d73a7049b76b URL: https://source.winehq.org/git/wine.git/?a=tag;h=6340db6f8508df95bffe5e2e7e3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:55:31 2018 +0100 Release 4.0-rc2

1 0

Alexandre Julliard : Release 4.0-rc2.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 4397d9497608a3df45a5c519a37f5dcde5cc2301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4397d9497608a3df45a5c519… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:55:31 2018 +0100 Release 4.0-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 588 +++++++++++--------------------------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 116 insertions(+), 494 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4397d9497608a3df45a5…

1 0

Alexandre Julliard : comctl32/tests: Avoid a structure initialization warning.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 0e166d998d5f203e3de67cb3776081a97f200de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e166d998d5f203e3de67cb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:33:34 2018 +0100 comctl32/tests: Avoid a structure initialization warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 718df25..f48dc03 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -1099,7 +1099,7 @@ static void test_wm_notify_datetime(HWND pager) static void test_wm_notify_header(HWND pager) { - NMHEADERW nmh = {0}; + NMHEADERW nmh = {{0}}; HDITEMW hdi = {0}; HD_TEXTFILTERW hdtf = {0};

1 0

Alexandre Julliard : winedbg: Fix incorrect pointer casts.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 2a64e751e36d78fdd106c2bb4ddfe471546bf25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a64e751e36d78fdd106c2bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:20:23 2018 +0100 winedbg: Fix incorrect pointer casts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_i386.c | 3 +-- programs/winedbg/db_disasm.c | 2 +- programs/winedbg/info.c | 2 +- programs/winedbg/tgt_active.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 3a2b91a..9656244 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -770,8 +770,7 @@ static BOOL be_i386_remove_Xpoint(HANDLE hProcess, const struct be_process_io* p if (size != 0) return FALSE; if (!pio->read(hProcess, addr, &ch, 1, &sz) || sz != 1) return FALSE; if (ch != (unsigned char)0xCC) - WINE_FIXME("Cannot get back %02x instead of 0xCC at %08lx\n", - ch, (unsigned long)addr); + WINE_FIXME("Cannot get back %02x instead of 0xCC at %p\n", ch, addr); ch = (unsigned char)val; if (!pio->write(hProcess, addr, &ch, 1, &sz) || sz != 1) return FALSE; break; diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index f57f009..41b1da2 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -1230,7 +1230,7 @@ static void db_print_address(const char *seg, int size, struct i_addr *addrp, in } else if (!dbg_read_memory(a1, &a2, sizeof(a2))) { dbg_printf("(invalid destination)"); } else { - db_task_printsym((unsigned long)a1, 0); + db_task_printsym((ULONG_PTR)a1, 0); } } else diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index c965759..72c57a2 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -984,7 +984,7 @@ void info_win32_exception(void) dbg_printf(" in 16-bit code (%04x:%04x)", addr.Segment, (unsigned) addr.Offset); break; case AddrMode1632: - dbg_printf(" in segmented 32-bit code (%04x:%08lx)", addr.Segment, (unsigned long) addr.Offset); + dbg_printf(" in segmented 32-bit code (%04x:%08x)", addr.Segment, (unsigned) addr.Offset); break; default: dbg_printf(" bad address"); } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index f632ca0..5385d0e 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -301,7 +301,7 @@ static void fetch_module_name(void* name_addr, BOOL unicode, void* mod_addr, snprintfW(buffer, bufsz, pcspid, dbg_curr_pid); } else - snprintfW(buffer, bufsz, dlladdr, (unsigned long)mod_addr); + snprintfW(buffer, bufsz, dlladdr, (ULONG_PTR)mod_addr); } }

1 0

Alexandre Julliard : msvcrt: Add some more MSVCRT prefixes to avoid conflicts with recent Mingw.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: dd016c031a4eb55783a1606b604057daf47560cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd016c031a4eb55783a1606b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 17:47:08 2018 +0100 msvcrt: Add some more MSVCRT prefixes to avoid conflicts with recent Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 6 +++--- dlls/msvcr71/msvcr71.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/data.c | 6 +++--- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/process.c | 2 +- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 13 files changed, 33 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd016c031a4eb55783a1…

1 0

Alexandre Julliard : msvcrt: Fix __p__fmode() prototype.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: e4d34098a65afbc5923d1bc7845ca80b6a24f8d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4d34098a65afbc5923d1bc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 17:39:06 2018 +0100 msvcrt: Fix __p__fmode() prototype. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 4 ++-- dlls/msvcrt/msvcrt.h | 2 +- include/msvcrt/stdlib.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index f08d9b1..24a36bd 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -33,7 +33,7 @@ int MSVCRT___argc = 0; static int argc_expand; static int wargc_expand; unsigned int MSVCRT__commode = 0; -unsigned int MSVCRT__fmode = 0; +int MSVCRT__fmode = 0; unsigned int MSVCRT__osver = 0; unsigned int MSVCRT__osplatform = 0; unsigned int MSVCRT__winmajor = 0; @@ -180,7 +180,7 @@ int CDECL _get_wpgmptr(WCHAR** p) /*********************************************************************** * __p__fmode (MSVCRT.@) */ -unsigned int* CDECL __p__fmode(void) { return &MSVCRT__fmode; } +int* CDECL __p__fmode(void) { return &MSVCRT__fmode; } /*********************************************************************** * _set_fmode (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 37e820a..4046dd1 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1121,7 +1121,7 @@ int WINAPIV _cprintf(const char*,...); int WINAPIV _cwprintf(const MSVCRT_wchar_t*,...); char*** __cdecl MSVCRT___p__environ(void); int* __cdecl __p___mb_cur_max(void); -unsigned int* __cdecl __p__fmode(void); +int* __cdecl __p__fmode(void); MSVCRT_wchar_t* __cdecl MSVCRT__wcsdup(const MSVCRT_wchar_t*); MSVCRT_size_t __cdecl MSVCRT_strnlen(const char *,MSVCRT_size_t); MSVCRT_size_t __cdecl MSVCRT_wcsnlen(const MSVCRT_wchar_t*,MSVCRT_size_t); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index e8ca2fa..bc7c86e 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -109,7 +109,7 @@ extern char*** __cdecl __p__environ(void); #define _environ (*__p__environ()) extern wchar_t*** __cdecl __p__wenviron(void); #define _wenviron (*__p__wenviron()) -extern unsigned int* __cdecl __p__fmode(void); +extern int* __cdecl __p__fmode(void); #define _fmode (*__p__fmode()) #else /* __i386__ */

1 0

Alexandre Julliard : msvcrt: Export onexit functions for compatibility with Mingw.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 32bac734632cf082da40a82de7f3135262688351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32bac734632cf082da40a82d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 17:31:14 2018 +0100 msvcrt: Export onexit functions for compatibility with Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 7 ------- dlls/msvcrt/file.c | 2 -- dlls/msvcrt/msvcrt.spec | 4 ++++ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 51bc6f0..0a7e303 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -39,10 +39,7 @@ typedef struct MSVCRT__onexit_table_t } MSVCRT__onexit_table_t; static MSVCRT__onexit_table_t MSVCRT_atexit_table; - -#if _MSVCR_VER>=140 static MSVCRT__onexit_table_t MSVCRT_quick_exit_table; -#endif typedef void (__stdcall *_tls_callback_type)(void*,ULONG,void*); static _tls_callback_type tls_atexit_callback; @@ -406,8 +403,6 @@ int CDECL MSVCRT_atexit(void (__cdecl *func)(void)) return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; } -#if _MSVCR_VER>=140 - /********************************************************************* * _crt_at_quick_exit (UCRTBASE.@) */ @@ -476,8 +471,6 @@ void CDECL _register_thread_local_exe_atexit_callback(_tls_callback_type callbac tls_atexit_callback = callback; } -#endif /* _MSVCR_VER>=140 */ - #if _MSVCR_VER>=71 /********************************************************************* * _set_purecall_handler (MSVCR71.@) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 224e6ea..43d4b56 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -786,7 +786,6 @@ MSVCRT_FILE * CDECL MSVCRT___iob_func(void) return &MSVCRT__iob[0]; } -#if _MSVCR_VER >= 140 /********************************************************************* * __acrt_iob_func(UCRTBASE.@) */ @@ -794,7 +793,6 @@ MSVCRT_FILE * CDECL MSVCRT___acrt_iob_func(unsigned idx) { return &MSVCRT__iob[idx]; } -#endif /********************************************************************* * _access (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d71d37a..cd6834b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -197,6 +197,7 @@ @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___setlc_active_func() MSVCRT____setlc_active_func @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func +@ cdecl __acrt_iob_func(long) MSVCRT___acrt_iob_func # for compatibility with Mingw @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo @@ -421,6 +422,7 @@ @ varargs _execle(str str) @ varargs _execlp(str str) @ varargs _execlpe(str str) +@ cdecl _execute_onexit_table(ptr) MSVCRT__execute_onexit_table # for compatibility with Mingw @ cdecl _execv(str ptr) @ cdecl _execve(str ptr ptr) MSVCRT__execve @ cdecl _execvp(str ptr) @@ -553,6 +555,7 @@ @ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s @ cdecl _i64tow(int64 ptr long) ntdll._i64tow @ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s +@ cdecl _initialize_onexit_table(ptr) MSVCRT__initialize_onexit_table # for compatibility with Mingw @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @ stub -arch=i386 _inp(long) @@ -866,6 +869,7 @@ # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read # stub _realloc_dbg(ptr long long str long) +@ cdecl _register_onexit_function(ptr ptr) MSVCRT__register_onexit_function # for compatibility with Mingw @ cdecl _resetstkoflw() MSVCRT__resetstkoflw @ cdecl _rmdir(str) MSVCRT__rmdir @ cdecl _rmtmp() MSVCRT__rmtmp

1 0

Alexandre Julliard : winspool.drv: Make cupsGetPPD optional to work around deprecation warning.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: d4bc97c5546f446a241c1e18bd4d3cc9d9a47cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4bc97c5546f446a241c1e18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 11:21:00 2018 +0100 winspool.drv: Make cupsGetPPD optional to work around deprecation warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e91138d..bfa63f9 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -786,11 +786,11 @@ static void *cupshandle; DO_FUNC(cupsFreeOptions); \ DO_FUNC(cupsGetDests); \ DO_FUNC(cupsGetOption); \ - DO_FUNC(cupsGetPPD); \ DO_FUNC(cupsParseOptions); \ DO_FUNC(cupsPrintFile) #define CUPS_OPT_FUNCS \ DO_FUNC(cupsGetNamedDest); \ + DO_FUNC(cupsGetPPD); \ DO_FUNC(cupsGetPPD3); \ DO_FUNC(cupsLastErrorString) @@ -798,6 +798,7 @@ static void *cupshandle; CUPS_FUNCS; #undef DO_FUNC static cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); +static const char * (*pcupsGetPPD)(const char *); static http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); static const char * (*pcupsLastErrorString)(void);

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
36
Older →

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 December 2018