January 2020 - Wine-commits

Zebediah Figura : strmbase: Merge enumpins.c into filter.c.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: c36641536070e943f5b0eb4281f4f767f696ebf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36641536070e943f5b0eb42… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:53 2020 -0600 strmbase: Merge enumpins.c into filter.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 1 - dlls/strmbase/Makefile.in | 1 - dlls/strmbase/enumpins.c | 212 --------------------------------------- dlls/strmbase/filter.c | 176 ++++++++++++++++++++++++++++++++ dlls/strmbase/strmbase_private.h | 1 - dlls/winegstreamer/Makefile.in | 1 - dlls/wineqtdecoder/Makefile.in | 1 - 7 files changed, 176 insertions(+), 217 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c36641536070e943f5b0…

1 0

Alexandre Julliard : libwine: Make some functions obsolete.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 39138478fdd93cc0dfc1e83b85784bc468e8d237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39138478fdd93cc0dfc1e83b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:48:39 2020 +0100 libwine: Make some functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_powerpc.c | 16 +++++++- include/wine/asm.h | 6 +++ include/wine/library.h | 5 --- libs/wine/port.c | 70 +++++++++++++++------------------- libs/wine/wine.map | 91 +++++++++++++++++++++++---------------------- 5 files changed, 96 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39138478fdd93cc0dfc1…

1 0

Zebediah Figura : strmbase: Remove some no longer used callbacks.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 38291846f306dd5c6bd8bc5ed6a1634022d1dd2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=38291846f306dd5c6bd8bc5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:52 2020 -0600 strmbase: Remove some no longer used callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 28 ++++++---------------------- include/wine/strmbase.h | 4 ---- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 74be6b107e..2c75156c1b 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -38,14 +38,6 @@ static inline TransformFilter *impl_from_sink_IPin(IPin *iface) static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *pmt) { - TransformFilter *pTransform = impl_from_sink_IPin(&iface->IPin_iface); - - TRACE("%p\n", iface); - - if (pTransform->pFuncsTable->pfnCheckInputType) - return pTransform->pFuncsTable->pfnCheckInputType(pTransform, pmt); - /* Assume OK if there's no query method (the connection will fail if - needed) */ return S_OK; } @@ -239,13 +231,9 @@ static HRESULT sink_eos(struct strmbase_sink *iface) static HRESULT sink_begin_flush(struct strmbase_sink *iface) { TransformFilter *filter = impl_from_sink_IPin(&iface->pin.IPin_iface); - HRESULT hr = S_OK; - - if (filter->pFuncsTable->pfnBeginFlush) - hr = filter->pFuncsTable->pfnBeginFlush(filter); - if (SUCCEEDED(hr) && filter->source.pin.peer) - hr = IPin_BeginFlush(filter->source.pin.peer); - return hr; + if (filter->source.pin.peer) + return IPin_BeginFlush(filter->source.pin.peer); + return S_OK; } static HRESULT sink_end_flush(struct strmbase_sink *iface) @@ -264,13 +252,9 @@ static HRESULT sink_new_segment(struct strmbase_sink *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { TransformFilter *filter = impl_from_sink_IPin(&iface->pin.IPin_iface); - HRESULT hr = S_OK; - - if (filter->pFuncsTable->pfnNewSegment) - hr = filter->pFuncsTable->pfnNewSegment(filter, start, stop, rate); - if (SUCCEEDED(hr) && filter->source.pin.peer) - hr = IPin_NewSegment(filter->source.pin.peer, start, stop, rate); - return hr; + if (filter->source.pin.peer) + return IPin_NewSegment(filter->source.pin.peer, start, stop, rate); + return S_OK; } static const struct strmbase_sink_ops sink_ops = diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 48d7638ae1..abb04a8384 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -195,13 +195,9 @@ typedef struct TransformFilterFuncTable { TransformFilter_StartStreaming pfnStartStreaming; TransformFilter_Receive pfnReceive; TransformFilter_StopStreaming pfnStopStreaming; - TransformFilter_CheckInputType pfnCheckInputType; HRESULT (*transform_connect_sink)(TransformFilter *filter, const AM_MEDIA_TYPE *mt); TransformFilter_BreakConnect pfnBreakConnect; - TransformFilter_EndOfStream pfnEndOfStream; - TransformFilter_BeginFlush pfnBeginFlush; TransformFilter_EndFlush pfnEndFlush; - TransformFilter_NewSegment pfnNewSegment; TransformFilter_Notify pfnNotify; } TransformFilterFuncTable;

1 0

Alexandre Julliard : libwine: Make the debug functions obsolete.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: c1dadbcfb1776b9ed33dcbf849d6c0aa43ab9913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1dadbcfb1776b9ed33dcbf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:49:04 2020 +0100 libwine: Make the debug functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/debug.c | 52 +++++++++++++++++++++++++++------------------------- libs/wine/wine.map | 16 ++++++++-------- 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 0e710223a2..f2b03b76e8 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -20,6 +20,9 @@ #include "config.h" #include "wine/port.h" +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE #include <stdlib.h> #include <stdio.h> @@ -30,12 +33,6 @@ # include <sys/stat.h> #endif -#define __wine_dbg_get_channel_flags __wine_dbg_get_channel_flags_inline -#define wine_dbg_sprintf wine_dbg_sprintf_inline -#define wine_dbg_printf wine_dbg_printf_inline -#define wine_dbg_log wine_dbg_log_inline -#define wine_dbgstr_an wine_dbgstr_an_inline -#define wine_dbgstr_wn wine_dbgstr_wn_inline #include "wine/debug.h" #include "wine/library.h" @@ -70,8 +67,7 @@ static int cmp_name( const void *p1, const void *p2 ) } /* get the flags to use for a given channel, possibly setting them too in case of lazy init */ -#undef __wine_dbg_get_channel_flags -unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) +unsigned char __wine_dbg_get_channel_flags_obsolete( struct __wine_debug_channel *channel ) { if (nb_debug_options == -1) debug_init(); @@ -87,8 +83,8 @@ unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel } /* set the flags to use for a given channel; return 0 if the channel is not available to set */ -int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel, - unsigned char set, unsigned char clear ) +int __wine_dbg_set_channel_flags_obsolete( struct __wine_debug_channel *channel, + unsigned char set, unsigned char clear ) { if (nb_debug_options == -1) debug_init(); @@ -228,8 +224,7 @@ static void debug_init(void) } /* varargs wrapper for funcs.dbg_vprintf */ -#undef wine_dbg_printf -int wine_dbg_printf( const char *format, ... ) +int wine_dbg_printf_obsolete( const char *format, ... ) { int ret; va_list valist; @@ -241,8 +236,7 @@ int wine_dbg_printf( const char *format, ... ) } /* printf with temp buffer allocation */ -#undef wine_dbg_sprintf -const char *wine_dbg_sprintf( const char *format, ... ) +const char *wine_dbg_sprintf_obsolete( const char *format, ... ) { static const int max_size = 200; char *ret; @@ -260,14 +254,13 @@ const char *wine_dbg_sprintf( const char *format, ... ) /* varargs wrapper for funcs.dbg_vlog */ -#undef wine_dbg_log -int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *func, const char *format, ... ) +int wine_dbg_log_obsolete( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *func, const char *format, ... ) { int ret; va_list valist; - if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; + if (!(__wine_dbg_get_channel_flags_obsolete( channel ) & (1 << cls))) return -1; va_start(valist, format); ret = funcs.dbg_vlog( cls, channel, func, format, valist ); @@ -424,7 +417,7 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch int ret = 0; if (cls < ARRAY_SIZE(debug_classes)) - ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); + ret += wine_dbg_printf_obsolete( "%s:%s:%s ", debug_classes[cls], channel->name, func ); if (format) ret += funcs.dbg_vprintf( format, args ); return ret; @@ -432,20 +425,18 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch /* wrappers to use the function pointers */ -#undef wine_dbgstr_an -const char *wine_dbgstr_an( const char * s, int n ) +const char *wine_dbgstr_an_obsolete( const char * s, int n ) { return funcs.dbgstr_an(s, n); } -#undef wine_dbgstr_wn -const char *wine_dbgstr_wn( const WCHAR *s, int n ) +const char *wine_dbgstr_wn_obsolete( const WCHAR *s, int n ) { return funcs.dbgstr_wn(s, n); } -void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, - struct __wine_debug_functions *old_funcs, size_t size ) +void __wine_dbg_set_functions_obsolete( const struct __wine_debug_functions *new_funcs, + struct __wine_debug_functions *old_funcs, size_t size ) { if (old_funcs) memcpy( old_funcs, &funcs, min(sizeof(funcs),size) ); if (new_funcs) memcpy( &funcs, new_funcs, min(sizeof(funcs),size) ); @@ -460,3 +451,14 @@ static struct __wine_debug_functions funcs = default_dbg_vprintf, default_dbg_vlog }; + +__ASM_OBSOLETE(__wine_dbg_get_channel_flags); +__ASM_OBSOLETE(__wine_dbg_set_channel_flags); +__ASM_OBSOLETE(__wine_dbg_set_functions); +__ASM_OBSOLETE(wine_dbg_log); +__ASM_OBSOLETE(wine_dbg_printf); +__ASM_OBSOLETE(wine_dbg_sprintf); +__ASM_OBSOLETE(wine_dbgstr_an); +__ASM_OBSOLETE(wine_dbgstr_wn); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 83ef3a0f60..50ae479788 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -1,9 +1,6 @@ WINE_1.0 { global: - __wine_dbg_get_channel_flags; - __wine_dbg_set_channel_flags; - __wine_dbg_set_functions; __wine_dll_register; __wine_main_argc; __wine_main_argv; @@ -19,11 +16,6 @@ WINE_1.0 wine_cp_wcstombs; wine_cpsymbol_mbstowcs; wine_cpsymbol_wcstombs; - wine_dbg_log; - wine_dbg_printf; - wine_dbg_sprintf; - wine_dbgstr_an; - wine_dbgstr_wn; wine_dlclose; wine_dll_enum_load_path; wine_dll_get_owner; @@ -76,6 +68,9 @@ WINE_1.0 /* the following functions are obsolete and only exported for backwards compatibility */ + __wine_dbg_get_channel_flags; + __wine_dbg_set_channel_flags; + __wine_dbg_set_functions; atoiW; atolW; get_char_typeW; @@ -117,6 +112,11 @@ WINE_1.0 vsnprintfW; vsprintfW; wine_call_on_stack; + wine_dbg_log; + wine_dbg_printf; + wine_dbg_sprintf; + wine_dbgstr_an; + wine_dbgstr_wn; wine_pthread_get_functions; wine_pthread_set_functions; wine_switch_to_stack;

1 0

Alexandre Julliard : libwine: Make some loader functions obsolete.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: c599ec149431a447084a347d381e7897b2102b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c599ec149431a447084a347d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:49:40 2020 +0100 libwine: Make some loader functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- include/wine/library.h | 5 -- libs/wine/loader.c | 183 ++++++++++++++++++++++++++----------------------- libs/wine/wine.map | 8 +-- 4 files changed, 101 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c599ec149431a447084a…

1 0

Chip Davis : msvcrt: Fix the btowc() function.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 0216290675db25da4266497ef14a623d237ac3c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0216290675db25da4266497e… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Jan 28 16:08:13 2020 -0600 msvcrt: Fix the btowc() function. This function returns WEOF on conversion failure. It should only operate on single-byte characters in the C locale. Finally, it should use the current locale's codepage, instead of the current locale itself, to do conversions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 10 ++++-- dlls/msvcrt/tests/string.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ae9f7c9c21..72a52a20a9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -786,9 +786,13 @@ MSVCRT_wint_t CDECL MSVCRT_btowc(int c) unsigned char letter = c; MSVCRT_wchar_t ret; - if(!MultiByteToWideChar(get_locinfo()->lc_handle[MSVCRT_LC_CTYPE], - 0, (LPCSTR)&letter, 1, &ret, 1)) - return 0; + if(c == MSVCRT_EOF) + return MSVCRT_WEOF; + if(!get_locinfo()->lc_codepage) + return c & 255; + if(!MultiByteToWideChar(get_locinfo()->lc_codepage, + MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1)) + return MSVCRT_WEOF; return ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index da0400fa83..8f97d8959e 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -90,6 +90,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static wint_t (__cdecl *p_btowc)(int); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_wcrtomb_s)(size_t*, char*, size_t, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); @@ -2880,6 +2881,82 @@ static void test_wctob(void) _setmbcp(cp); } +static void test_btowc(void) +{ + wint_t ret; + int cp = _getmbcp(); + + if(!p_btowc || !setlocale(LC_ALL, "chinese-traditional")) { + win_skip("Skipping btowc tests\n"); + return; + } + + ret = p_btowc(EOF); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + _setmbcp(1250); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + if(!setlocale(LC_CTYPE, ".1250")) { + win_skip("No codepage 1250 support\n"); + setlocale(LC_ALL, "C"); + _setmbcp(cp); + return; + } + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0x155, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0x155, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == 0x9f, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0xe0, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(cp); +} + static void test_wctomb(void) { mbstate_t state; @@ -4127,6 +4204,7 @@ START_TEST(string) p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); + p_btowc = (void*)GetProcAddress(hMsvcrt, "btowc"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_wcrtomb_s = (void*)GetProcAddress(hMsvcrt, "wcrtomb_s"); @@ -4204,6 +4282,7 @@ START_TEST(string) test__mbsupr_s(); test__mbslwr_s(); test_wctob(); + test_btowc(); test_wctomb(); test__atodbl(); test__stricmp();

1 0

Zebediah Figura : d3d8: Apply the device state before executing a draw call.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 2ff6b5ec6f7c9f6f25b419f679f00bd4a56db153 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff6b5ec6f7c9f6f25b419f6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:10 2020 -0600 d3d8: Apply the device state before executing a draw call. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index bcd25e9245..0721d2a501 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1606,6 +1606,7 @@ static HRESULT WINAPI d3d8_device_Clear(IDirect3DDevice8 *iface, DWORD rect_coun } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_clear(device->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); @@ -2287,6 +2288,7 @@ static HRESULT WINAPI d3d8_device_ValidateDevice(IDirect3DDevice8 *iface, DWORD TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_validate_device(device->wined3d_device, pass_count); wined3d_mutex_unlock(); @@ -2417,6 +2419,7 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d8_device_upload_sysmem_vertex_buffers(device, start_vertex, vertex_count); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); @@ -2439,6 +2442,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); base_vertex_index = wined3d_device_get_base_vertex_index(device->wined3d_device); d3d8_device_upload_sysmem_vertex_buffers(device, base_vertex_index + min_vertex_idx, vertex_count); d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); @@ -2509,6 +2513,7 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d8_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -2610,6 +2615,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d8_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -2689,6 +2695,8 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + /* Note that an alternative approach would be to simply create these * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we * do for draws. In some regards that would be easier, but it seems less

1 0

Zebediah Figura : d3d8: Handle multisample depth resolve in d3d8_device_SetRenderState().
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 18c863e0ae4279403f14757e257936f6114f65b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18c863e0ae4279403f14757e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:11 2020 -0600 d3d8: Handle multisample depth resolve in d3d8_device_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 3 +++ dlls/d3d8/device.c | 30 ++++++++++++++++++++++++++++++ dlls/d3d8/directx.c | 13 +++++++++++-- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index f262d12fc7..26451255c0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -42,6 +42,9 @@ #define D3D8_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D8_MAX_STREAMS 16 +#define D3DFMT_RESZ MAKEFOURCC('R','E','S','Z') +#define D3D8_RESZ_CODE 0x7fa05000 + /* CreateVertexShader can return > 0xFFFF */ #define VS_HIGHESTFIXEDFXF 0xF0000000 diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0721d2a501..4c2c350ec2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1846,6 +1846,34 @@ static HRESULT WINAPI d3d8_device_GetClipPlane(IDirect3DDevice8 *iface, DWORD in return hr; } +static void resolve_depth_buffer(struct d3d8_device *device) +{ + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); + struct wined3d_rendertarget_view *wined3d_dsv; + struct wined3d_resource *dst_resource; + struct wined3d_texture *dst_texture; + struct wined3d_resource_desc desc; + struct d3d8_surface *d3d8_dsv; + + if (!(dst_texture = state->textures[0])) + return; + dst_resource = wined3d_texture_get_resource(dst_texture); + wined3d_resource_get_desc(dst_resource, &desc); + if (desc.format != WINED3DFMT_D24_UNORM_S8_UINT + && desc.format != WINED3DFMT_X8D24_UNORM + && desc.format != WINED3DFMT_DF16 + && desc.format != WINED3DFMT_DF24 + && desc.format != WINED3DFMT_INTZ) + return; + + if (!(wined3d_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + return; + d3d8_dsv = wined3d_rendertarget_view_get_sub_resource_parent(wined3d_dsv); + + wined3d_device_resolve_sub_resource(device->wined3d_device, dst_resource, 0, + wined3d_rendertarget_view_get_resource(wined3d_dsv), d3d8_dsv->sub_resource_idx, desc.format); +} + static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, D3DRENDERSTATETYPE state, DWORD value) { @@ -1859,6 +1887,8 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, wined3d_stateblock_set_render_state(device->update_state, state, value); if (!device->recording) wined3d_device_set_render_state(device->wined3d_device, state, value); + if (state == D3DRS_POINTSIZE && value == D3D8_RESZ_CODE) + resolve_depth_buffer(device); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 9a9abeccca..d1f8872d12 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -266,8 +266,17 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 } wined3d_mutex_lock(); - hr = wined3d_check_device_format(d3d8->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), - usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); + if (format == D3DFMT_RESZ && resource_type == D3DRTYPE_SURFACE && usage == D3DUSAGE_RENDERTARGET) + { + DWORD levels; + hr = wined3d_check_device_multisample_type(d3d8->wined3d, adapter, device_type, + WINED3DFMT_D24_UNORM_S8_UINT, FALSE, WINED3D_MULTISAMPLE_NON_MASKABLE, &levels); + if (SUCCEEDED(hr) && !levels) + hr = D3DERR_NOTAVAILABLE; + } + else + hr = wined3d_check_device_format(d3d8->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), + usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetRenderState().
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 5e9c139c5fd1a8eb7fdda12db86113241ee854c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e9c139c5fd1a8eb7fdda12d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:12 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4c2c350ec2..b0a0491890 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1885,8 +1885,6 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, if (state == D3DRS_ZBIAS) state = WINED3D_RS_DEPTHBIAS; wined3d_stateblock_set_render_state(device->update_state, state, value); - if (!device->recording) - wined3d_device_set_render_state(device->wined3d_device, state, value); if (state == D3DRS_POINTSIZE && value == D3D8_RESZ_CODE) resolve_depth_buffer(device); wined3d_mutex_unlock();

1 0

Zebediah Figura : d3d8: Stop setting the device state when setting the default ZENABLE and POINTSIZE_MIN states.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 23de061d2f8347d8131909bc137c9b4a536d58e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23de061d2f8347d8131909bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:13 2020 -0600 d3d8: Stop setting the device state when setting the default ZENABLE and POINTSIZE_MIN states. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b0a0491890..71717852bb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -927,9 +927,6 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, - !!swapchain_desc.enable_auto_depth_stencil); device_reset_viewport_state(device); device->device_state = D3D8_DEVICE_STATE_OK; } @@ -3769,9 +3766,6 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); device_reset_viewport_state(device); wined3d_mutex_unlock();

1 0