February 2020 - Wine-Commits

Jacek Caban : include: Add corecrt_wtime.h file.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: f0779722c33779d937b22773003b4bf7d64735ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0779722c33779d937b22773… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:49:42 2020 +0100 include: Add corecrt_wtime.h file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_wtime.h | 48 ++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/time.h | 39 +--------------------------------- include/msvcrt/wchar.h | 38 +-------------------------------- 4 files changed, 51 insertions(+), 75 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 506e5fc96a..fbfbf72be0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -427,6 +427,7 @@ SOURCES = \ msvcrt/corecrt_stdio_config.h \ msvcrt/corecrt_wio.h \ msvcrt/corecrt_wstdio.h \ + msvcrt/corecrt_wtime.h \ msvcrt/crtdbg.h \ msvcrt/crtdefs.h \ msvcrt/ctype.h \ diff --git a/include/msvcrt/corecrt_wtime.h b/include/msvcrt/corecrt_wtime.h new file mode 100644 index 0000000000..3422b2d349 --- /dev/null +++ b/include/msvcrt/corecrt_wtime.h @@ -0,0 +1,48 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _WTIME_DEFINED +#define _WTIME_DEFINED + +#include <corecrt.h> + +struct tm { + int tm_sec; + int tm_min; + int tm_hour; + int tm_mday; + int tm_mon; + int tm_year; + int tm_wday; + int tm_yday; + int tm_isdst; +}; + +#ifdef _USE_32BIT_TIME_T +#define _wctime32 _wctime +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +wchar_t* __cdecl _wasctime(const struct tm*); +size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); +wchar_t* __cdecl _wctime32(const __time32_t*); +wchar_t* __cdecl _wctime64(const __time64_t*); +wchar_t* __cdecl _wstrdate(wchar_t*); +errno_t __cdecl _wstrdate_s(wchar_t*,size_t); +wchar_t* __cdecl _wstrtime(wchar_t*); +errno_t __cdecl _wstrtime_s(wchar_t*,size_t); + +#ifndef _USE_32BIT_TIME_T +static inline wchar_t* _wctime(const time_t *t) { return _wctime64(t); } +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* _WTIME_DEFINED */ diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 9ed27f5f9e..61df364d21 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -20,7 +20,7 @@ #ifndef __WINE_TIME_H #define __WINE_TIME_H -#include <corecrt.h> +#include <corecrt_wtime.h> #include <pshpack8.h> @@ -33,21 +33,6 @@ typedef __msvcrt_long clock_t; #define CLOCKS_PER_SEC 1000 #endif -#ifndef _TM_DEFINED -#define _TM_DEFINED -struct tm { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -}; -#endif /* _TM_DEFINED */ - #ifdef __cplusplus extern "C" { #endif @@ -113,28 +98,6 @@ static inline time_t mktime(struct tm *tm) { return _mktime64(tm); } static inline time_t time(time_t *t) { return _time64(t); } #endif -#ifndef _WTIME_DEFINED -#define _WTIME_DEFINED - -#ifdef _USE_32BIT_TIME_T -#define _wctime32 _wctime -#endif - -wchar_t* __cdecl _wasctime(const struct tm*); -size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); -wchar_t* __cdecl _wctime32(const __time32_t*); -wchar_t* __cdecl _wctime64(const __time64_t*); -wchar_t* __cdecl _wstrdate(wchar_t*); -errno_t __cdecl _wstrdate_s(wchar_t*,size_t); -wchar_t* __cdecl _wstrtime(wchar_t*); -errno_t __cdecl _wstrtime_s(wchar_t*,size_t); - -#ifndef _USE_32BIT_TIME_T -static inline wchar_t* _wctime(const time_t *t) { return _wctime64(t); } -#endif - -#endif /* _WTIME_DEFINED */ - #ifdef __cplusplus } #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index d5ae3561d0..b93fec9de7 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -10,6 +10,7 @@ #include <corecrt_wstdio.h> #include <corecrt_wio.h> +#include <corecrt_wtime.h> #include <string.h> #include <pshpack8.h> @@ -50,21 +51,6 @@ typedef int _off_t; #define _OFF_T_DEFINED #endif -#ifndef _TM_DEFINED -#define _TM_DEFINED -struct tm { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -}; -#endif /* _TM_DEFINED */ - #ifndef _STAT_DEFINED #define _STAT_DEFINED @@ -326,28 +312,6 @@ wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t); #endif /* _WSTRING_DEFINED */ -#ifndef _WTIME_DEFINED -#define _WTIME_DEFINED - -#ifdef _USE_32BIT_TIME_T -#define _wctime32 _wctime -#endif - -wchar_t* __cdecl _wasctime(const struct tm*); -size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); -wchar_t* __cdecl _wctime32(const __time32_t*); -wchar_t* __cdecl _wctime64(const __time64_t*); -wchar_t* __cdecl _wstrdate(wchar_t*); -errno_t __cdecl _wstrdate_s(wchar_t*,size_t); -wchar_t* __cdecl _wstrtime(wchar_t*); -errno_t __cdecl _wstrtime_s(wchar_t*,size_t); - -#ifndef _USE_32BIT_TIME_T -static inline wchar_t* _wctime(const time_t *t) { return _wctime64(t); } -#endif - -#endif /* _WTIME_DEFINED */ - wchar_t __cdecl btowc(int); size_t __cdecl mbrlen(const char *,size_t,mbstate_t*); size_t __cdecl mbrtowc(wchar_t*,const char*,size_t,mbstate_t*);

1 0

Nikolay Sivov : mf: Use more descriptive name for one of the impl_from_* helpers.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: f396d80df5faae4f7e21b92e0e0b7d657b3fc97b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f396d80df5faae4f7e21b92e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 20 16:41:21 2020 +0300 mf: Use more descriptive name for one of the impl_from_* helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index b80499477c..6b5d590a25 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -278,7 +278,7 @@ static struct clock_timer *impl_clock_timer_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct clock_timer, IUnknown_iface); } -static struct sink_notification *impl_from_IUnknown(IUnknown *iface) +static struct sink_notification *impl_sink_notification_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct sink_notification, IUnknown_iface); } @@ -1918,7 +1918,7 @@ static HRESULT WINAPI sink_notification_QueryInterface(IUnknown *iface, REFIID r static ULONG WINAPI sink_notification_AddRef(IUnknown *iface) { - struct sink_notification *notification = impl_from_IUnknown(iface); + struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&notification->refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -1928,7 +1928,7 @@ static ULONG WINAPI sink_notification_AddRef(IUnknown *iface) static ULONG WINAPI sink_notification_Release(IUnknown *iface) { - struct sink_notification *notification = impl_from_IUnknown(iface); + struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&notification->refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -2496,7 +2496,7 @@ static HRESULT WINAPI present_clock_sink_callback_Invoke(IMFAsyncCallback *iface if (FAILED(hr = IMFAsyncResult_GetObject(result, &object))) return hr; - data = impl_from_IUnknown(object); + data = impl_sink_notification_from_IUnknown(object); clock_call_state_change(data->system_time, data->param, data->notification, data->sink);

1 0

Nikolay Sivov : mf: Implement timer functionality for presentation clock.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 0eda16206aeb3cafa9fdb63cb1dfa188930d13c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eda16206aeb3cafa9fdb63c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 20 16:41:20 2020 +0300 mf: Implement timer functionality for presentation clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 285 +++++++++++++++++++++++++++++++++++++++++++++++++++--- include/mfidl.idl | 5 + 2 files changed, 275 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0eda16206aeb3cafa9fd…

1 0

Nikolay Sivov : mferror: Add some more clock error codes.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

1 0

Zebediah Figura : d3d8: Retrieve the vertex shader from the primary stateblock.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 1dca8313ce5a86a2764899fe8d2a608cdbcb15d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dca8313ce5a86a2764899fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 09:53:56 2020 -0600 d3d8: Retrieve the vertex shader from the primary stateblock. 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, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8f851fa2a6..c7e4772b3b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2967,7 +2967,7 @@ static HRESULT WINAPI d3d8_device_DeleteVertexShader(IDirect3DDevice8 *iface, DW } if (shader_impl->wined3d_shader - && wined3d_device_get_vertex_shader(device->wined3d_device) == shader_impl->wined3d_shader) + && wined3d_stateblock_get_state(device->state)->vs == shader_impl->wined3d_shader) IDirect3DDevice8_SetVertexShader(iface, 0); wined3d_mutex_unlock();

1 0

Michael Stefaniuc : urlmon/tests: Get rid of a2w() in sec_mgr.c.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: eaacf86d6bc3bed715454ebdc825dfd3427fc2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaacf86d6bc3bed715454ebd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 18 23:53:22 2020 +0100 urlmon/tests: Get rid of a2w() in sec_mgr.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/sec_mgr.c | 172 +++++++++++++++++++------------------------- 1 file changed, 72 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eaacf86d6bc3bed71545…

1 0

Michael Stefaniuc : urlmon/tests: Get rid of strcmp_aw() in sec_mgr.c.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: c33e7dcadb2ddf7df4684a9766b103b77cb299d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c33e7dcadb2ddf7df4684a97… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 18 23:53:21 2020 +0100 urlmon/tests: Get rid of strcmp_aw() in sec_mgr.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/sec_mgr.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2974eecc36..dda50dd056 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -190,13 +190,6 @@ static inline LPWSTR a2w(LPCSTR str) return ret; } -static inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) { - LPWSTR strAW = a2w(strA); - DWORD ret = lstrcmpW(strAW, strB); - heap_free(strAW); - return ret; -} - /* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ static LONG myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) @@ -1592,21 +1585,21 @@ static const struct { DWORD create_flags; const char *security_uri; HRESULT security_hres; - const char *default_uri; + const WCHAR *default_uri; HRESULT default_hres; BOOL todo; } sec_url_ex_tests[] = { - {"index.htm",Uri_CREATE_ALLOW_RELATIVE,"*:index.html",S_OK,"*:index.htm",S_OK}, - {"file://c:\\Index.htm",Uri_CREATE_FILE_USE_DOS_PATH,"file:///c:/Index.htm",S_OK,"file:///c:/Index.htm",S_OK}, - {"file:some%20file%2ejpg",0,NULL,E_INVALIDARG,NULL,E_INVALIDARG}, - {"file:some file.jpg",0,NULL,E_INVALIDARG,NULL,E_INVALIDARG}, - {"http://www.zone3.winetest/",0,"http://www.zone3.winetest/",S_OK,"http://www.zone3.winetest/",S_OK}, - {"about:blank",0,"about:blank",S_OK,"about:blank",S_OK}, - {"ftp://zone3.winetest/file.test",0,"ftp://zone3.winetest/file.test",S_OK,"ftp://zone3.winetest/file.test",S_OK}, - {"test:123abc",0,"test:123abc",S_OK,"test:123abc",S_OK}, - {"http:google.com/test.file",0,"http:google.com/test.file",S_OK,"http:google.com/test.file",S_OK}, - {"ftp://test(a)ftp.winehq.org/",0,"ftp://ftp.winehq.org/",S_OK,"ftp://ftp.winehq.org/",S_OK}, - {"test://google(a)ftp.winehq.org/",0,"test://google(a)ftp.winehq.org/",S_OK,"test://google(a)ftp.winehq.org/",S_OK} + {"index.htm", Uri_CREATE_ALLOW_RELATIVE, "*:index.html", S_OK, L"*:index.htm", S_OK}, + {"file://c:\\Index.htm", Uri_CREATE_FILE_USE_DOS_PATH, "file:///c:/Index.htm", S_OK, L"file:///c:/Index.htm", S_OK}, + {"file:some%20file%2ejpg", 0, NULL, E_INVALIDARG, NULL, E_INVALIDARG}, + {"file:some file.jpg", 0, NULL, E_INVALIDARG, NULL, E_INVALIDARG}, + {"http://www.zone3.winetest/", 0, "http://www.zone3.winetest/", S_OK, L"http://www.zone3.winetest/", S_OK}, + {"about:blank", 0, "about:blank", S_OK, L"about:blank", S_OK}, + {"ftp://zone3.winetest/file.test", 0, "ftp://zone3.winetest/file.test", S_OK, L"ftp://zone3.winetest/file.test", S_OK}, + {"test:123abc", 0, "test:123abc", S_OK, L"test:123abc", S_OK}, + {"http:google.com/test.file", 0, "http:google.com/test.file", S_OK, L"http:google.com/test.file", S_OK}, + {"ftp://test(a)ftp.winehq.org/", 0, "ftp://ftp.winehq.org/", S_OK, L"ftp://ftp.winehq.org/", S_OK}, + {"test://google(a)ftp.winehq.org/", 0, "test://google(a)ftp.winehq.org/", S_OK, L"test://google(a)ftp.winehq.org/", S_OK} }; static void test_InternetGetSecurityUrlEx(void) @@ -1647,9 +1640,9 @@ static void test_InternetGetSecurityUrlEx(void) ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { todo_wine_if (sec_url_ex_tests[i].todo) { - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); + ok(!lstrcmpW(sec_url_ex_tests[i].default_uri, received), + "Expected %s but got %s on test %d\n", + wine_dbgstr_w(sec_url_ex_tests[i].default_uri), wine_dbgstr_w(received), i); } } SysFreeString(received); @@ -1670,9 +1663,9 @@ static void test_InternetGetSecurityUrlEx(void) ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { todo_wine_if (sec_url_ex_tests[i].todo) { - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); + ok(!lstrcmpW(sec_url_ex_tests[i].default_uri, received), + "Expected %s but got %s on test %d\n", + wine_dbgstr_w(sec_url_ex_tests[i].default_uri), wine_dbgstr_w(received), i); } } SysFreeString(received);

1 0

Zebediah Figura : d3d9: Validate the stream index in d3d9_device_SetStreamSource().
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: a3b36a34a6f140c7a3ea41db106b2c38a98f099e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b36a34a6f140c7a3ea41db… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 09:53:51 2020 -0600 d3d9: Validate the stream index in d3d9_device_SetStreamSource(). 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/d3d9/device.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 53e27adf05..8d85a43523 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3669,16 +3669,25 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_vertexbuffer *buffer_impl = unsafe_impl_from_IDirect3DVertexBuffer9(buffer); + const struct wined3d_stateblock_state *state; struct wined3d_buffer *wined3d_buffer; HRESULT hr; TRACE("iface %p, stream_idx %u, buffer %p, offset %u, stride %u.\n", iface, stream_idx, buffer, offset, stride); + if (stream_idx >= ARRAY_SIZE(state->streams)) + { + WARN("Stream index %u out of range.\n", stream_idx); + return WINED3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); if (!buffer_impl) { - const struct wined3d_stream_state *stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + const struct wined3d_stream_state *stream; + state = wined3d_stateblock_get_state(device->state); + stream = &state->streams[stream_idx]; wined3d_buffer = stream->buffer; offset = stream->offset; stride = stream->stride;

1 0

Zebediah Figura : wined3d: Remove the no longer used extra stream state.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: eb522056456644f79c05e19ee611ac1704fd065d URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb522056456644f79c05e19e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 09:53:52 2020 -0600 wined3d: Remove the no longer used extra stream state. This was used to implement high level patches, which were removed in 149a85c2e. 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/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d29dfc312b..444e8fdf63 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3179,7 +3179,7 @@ struct wined3d_state struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; - struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1 /* tessellated pseudo-stream */]; + struct wined3d_stream_state streams[WINED3D_MAX_STREAMS]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; unsigned int index_offset; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fa5682e5bd..908a1c9266 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2141,7 +2141,7 @@ struct wined3d_stream_state struct wined3d_stateblock_state { struct wined3d_vertex_declaration *vertex_declaration; - struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1]; + struct wined3d_stream_state streams[WINED3D_MAX_STREAMS]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; int base_vertex_index;

1 0

Zebediah Figura : d3d8: Set the primary stateblock when executing draw calls.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: d38daa79d8823b93b56136c57b8935a9c6dbd7ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d38daa79d8823b93b56136c5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 09:53:53 2020 -0600 d3d8: Set the primary stateblock when executing draw calls. 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 | 136 ++++++++++++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d38daa79d8823b93b561…

1 0