April 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32: Validate handle before freeing a LOAD_LIBRARY_AS_DATAFILE module.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 35d202fc0982da4e7ae3596414482318af118acb URL: https://source.winehq.org/git/wine.git/?a=commit;h=35d202fc0982da4e7ae35964… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 09:42:09 2019 +0200 kernel32: Validate handle before freeing a LOAD_LIBRARY_AS_DATAFILE module. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46019 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 8 +++++++- dlls/kernel32/tests/module.c | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index eb0471c..2f078a0 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1102,6 +1102,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) if ((ULONG_PTR)hLibModule & 3) /* this is a datafile module */ { + void *ptr = (void *)((ULONG_PTR)hLibModule & ~3); + if (!RtlImageNtHeader( ptr )) + { + SetLastError( ERROR_BAD_EXE_FORMAT ); + return FALSE; + } if ((ULONG_PTR)hLibModule & 1) { struct exclusive_datafile *file; @@ -1119,7 +1125,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) } LdrUnlockLoaderLock( 0, magic ); } - return UnmapViewOfFile( (void *)((ULONG_PTR)hLibModule & ~3) ); + return UnmapViewOfFile( ptr ); } if ((nts = LdrUnloadDll( hLibModule )) == STATUS_SUCCESS) retv = TRUE; diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 3e077f3..c059b98 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -430,6 +430,11 @@ static void testLoadLibraryEx(void) ok(hmodule != 0, "Expected valid module handle\n"); SetLastError(0xdeadbeef); + ret = FreeLibrary( (HMODULE)((ULONG_PTR)hmodule + 0x1230)); + ok(!ret, "Free succeeded on wrong handle\n"); + ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = FreeLibrary(hmodule); ok(ret, "Expected to be able to free the module, failed with %d\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : msvcrt: Don't export _matherr().
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 9a364c1a663611f9ef6668ebb71e792f03be1add URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a364c1a663611f9ef6668eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 09:27:37 2019 +0200 msvcrt: Don't export _matherr(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 28 +++++++++++----------------- dlls/msvcrt/msvcrt.spec | 1 - dlls/msvcrt20/msvcrt20.c | 10 ++++++++++ dlls/msvcrt20/msvcrt20.spec | 2 +- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ca181d9..754e46c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -62,24 +62,26 @@ void msvcrt_init_math(void) } /********************************************************************* - * _matherr (MSVCRT.@) + * _matherr (CRTDLL.@) */ int CDECL MSVCRT__matherr(struct MSVCRT__exception *e) { - int ret; + return 0; +} - if (e) - TRACE("(%p = {%d, \"%s\", %g, %g, %g})\n", e, e->type, e->name, e->arg1, e->arg2, e->retval); - else - TRACE("(null)\n"); + +static void math_error(int type, const char *name, double arg1, double arg2, double retval) +{ + TRACE("(%d, %s, %g, %g, %g)\n", type, debugstr_a(name), arg1, arg2, retval); if (MSVCRT_default_matherr_func) { - ret = MSVCRT_default_matherr_func(e); - if (ret) return ret; + struct MSVCRT__exception exception = {type, (char *)name, arg1, arg2, retval}; + + if (MSVCRT_default_matherr_func(&exception)) return; } - switch (e->type) + switch (type) { case _DOMAIN: *MSVCRT__errno() = MSVCRT_EDOM; @@ -94,8 +96,6 @@ int CDECL MSVCRT__matherr(struct MSVCRT__exception *e) default: ERR("Unhandled math error!\n"); } - - return 0; } /********************************************************************* @@ -107,12 +107,6 @@ void CDECL MSVCRT___setusermatherr(MSVCRT_matherr_func func) TRACE("new matherr handler %p\n", func); } -static inline void math_error(int type, const char *name, double arg1, double arg2, double retval) -{ - struct MSVCRT__exception exception = {type, (char *)name, arg1, arg2, retval}; - MSVCRT__matherr(&exception); -} - /********************************************************************* * _set_SSE2_enable (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 101e2c7..0c2881d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -683,7 +683,6 @@ @ cdecl _makepath(ptr str str str str) MSVCRT__makepath @ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s # stub _malloc_dbg(long long str long) -@ cdecl _matherr(ptr) MSVCRT__matherr @ cdecl _mbbtombc(long) # stub _mbbtombc_l(long ptr) @ cdecl _mbbtype(long long) diff --git a/dlls/msvcrt20/msvcrt20.c b/dlls/msvcrt20/msvcrt20.c index e8d2b3c..3cb1e67 100644 --- a/dlls/msvcrt20/msvcrt20.c +++ b/dlls/msvcrt20/msvcrt20.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <math.h> #include "windef.h" @@ -48,3 +49,12 @@ void CDECL MSVCRT20__wgetmainargs( int *argc, WCHAR** *wargv, WCHAR** *wenvp, { __wgetmainargs( argc, wargv, wenvp, expand_wildcards, &new_mode ); } + + +/********************************************************************* + * _matherr (MSVCRT20.@) + */ +int CDECL MSVCRT20__matherr(struct _exception *e) +{ + return 0; +} diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 6ced0fd..84a1014 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1012,7 +1012,7 @@ @ cdecl _ltoa(long ptr long) msvcrt._ltoa @ cdecl _ltow(long ptr long) msvcrt._ltow @ cdecl _makepath(ptr str str str str) msvcrt._makepath -@ cdecl _matherr(ptr) msvcrt._matherr +@ cdecl _matherr(ptr) MSVCRT20__matherr @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ cdecl _mbbtype(long long) msvcrt._mbbtype @ cdecl _mbccpy(ptr ptr) msvcrt._mbccpy

1 0

Alexandre Julliard : winegcc: Use Wine's msvcrt for Windows builds.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 45bf872a435b8354a9919f87ab49a16c7aba950c URL: https://source.winehq.org/git/wine.git/?a=commit;h=45bf872a435b8354a9919f87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 09:28:19 2019 +0200 winegcc: Use Wine's msvcrt for Windows builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 79a4cbe..674d1a3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -972,11 +972,6 @@ static void build(struct options* opts) /* add the default libraries, if needed */ - if (!opts->nostdlib && opts->use_msvcrt && opts->target_platform != PLATFORM_WINDOWS) - { - if (!is_pe || !opts->shared) add_library(opts, lib_dirs, files, "msvcrt"); - } - if (!opts->wine_objdir && !opts->nodefaultlibs) { if (opts->gui_app) @@ -991,6 +986,7 @@ static void build(struct options* opts) if (!opts->nodefaultlibs) { + if (opts->use_msvcrt) add_library(opts, lib_dirs, files, "msvcrt"); add_library(opts, lib_dirs, files, "winecrt0"); if (opts->win16_app) add_library(opts, lib_dirs, files, "kernel"); add_library(opts, lib_dirs, files, "kernel32"); @@ -1108,7 +1104,7 @@ static void build(struct options* opts) char *p = strrchr( lib, '/' ); *p++ = 0; - if (!strncmp( p, "lib", 3 )) + if (!strncmp( p, "lib", 3 ) && strcmp( p, "libmsvcrt.a" )) { char *ext = strrchr( p, '.' );

1 0

Alexandre Julliard : winmm/tests: Fix printf format warnings for the Windows build.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 1c7312a0c66e56c1d44d086849682a30145dd0bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c7312a0c66e56c1d44d0868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 18:47:14 2019 +0200 winmm/tests: Fix printf format warnings for the Windows build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/capture.c | 11 +++++------ dlls/winmm/tests/wave.c | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index ba71f9c..4290c35 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -141,7 +141,8 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, DWORD nSamplesPerSec = pwfx->nSamplesPerSec; win=NULL; - rc=waveInOpen(&win,device,pwfx,(DWORD_PTR)hevent,0,CALLBACK_EVENT|flags); + flags |= CALLBACK_EVENT; + rc=waveInOpen(&win,device,pwfx,(DWORD_PTR)hevent,0,flags); /* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */ ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NOTENABLED || rc==MMSYSERR_NODRIVER || @@ -154,8 +155,7 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, (rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)), "waveInOpen(%s): format=%dx%2dx%d flags=%x(%s) rc=%s\n", dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample, - pwfx->nChannels,CALLBACK_EVENT|flags, - wave_open_flags(CALLBACK_EVENT|flags),wave_in_error(rc)); + pwfx->nChannels,flags,wave_open_flags(flags),wave_in_error(rc)); if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && (flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & format)) trace(" Reason: The device lists this format as supported in its " @@ -261,10 +261,9 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, rc==MMSYSERR_ALLOCATED || ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && !(pcaps->dwFormats & format)), - "waveOutOpen(%s) format=%dx%2dx%d flags=%x(%s) rc=%s\n", + "waveOutOpen(%s) format=%dx%2dx%d flags=CALLBACK_EVENT rc=%s\n", dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample, - pwfx->nChannels,CALLBACK_EVENT|flags, - wave_open_flags(CALLBACK_EVENT),wave_out_error(rc)); + pwfx->nChannels,wave_out_error(rc)); if (rc==MMSYSERR_NOERROR) { rc=waveOutPrepareHeader(wout, &frag, sizeof(frag)); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 9c114c8..a2f2a82 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -665,8 +665,7 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in (rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)), "waveOutOpen(%s): format=%dx%2dx%d flags=%x(%s) rc=%s\n", dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample, - pwfx->nChannels,CALLBACK_EVENT|flags, - wave_open_flags(CALLBACK_EVENT|flags),wave_out_error(rc)); + pwfx->nChannels,flags,wave_open_flags(flags),wave_out_error(rc)); if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && (flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & format)) trace(" Reason: The device lists this format as supported in its "

1 0

Alexandre Julliard : winecrt0: Avoid using wine/port.h.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: e78ee4f436ec2e5775a8e4e7826612f0a76642fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e78ee4f436ec2e5775a8e4e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 09:59:54 2019 +0200 winecrt0: Avoid using wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 69a3ea7..f4b2573 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -20,11 +20,9 @@ #ifdef _WIN32 -#include "config.h" -#include "wine/port.h" - #include <stdio.h> #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "wine/debug.h" @@ -54,7 +52,7 @@ static void load_func( void **func, const char *name, void *def ) { HMODULE module = GetModuleHandleA( "ntdll.dll" ); void *proc = GetProcAddress( module, name ); - interlocked_xchg_ptr( func, proc ? proc : def ); + InterlockedExchangePointer( func, proc ? proc : def ); } } #define LOAD_FUNC(name) load_func( (void **)&p ## name, #name, fallback ## name ) @@ -164,8 +162,8 @@ static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) char *ret = _strdup( str ); int idx; - idx = interlocked_xchg_add( &pos, 1 ) % ARRAY_SIZE(list); - free( interlocked_xchg_ptr( (void **)&list[idx], ret )); + idx = InterlockedIncrement( &pos ) % ARRAY_SIZE(list); + free( InterlockedExchangePointer( (void **)&list[idx], ret )); return ret; } @@ -174,7 +172,7 @@ static int __cdecl fallback__wine_dbg_output( const char *str ) size_t len = strlen( str ); if (!len) return 0; - interlocked_xchg( (LONG *)&partial_line_tid, str[len - 1] != '\n' ? GetCurrentThreadId() : 0 ); + InterlockedExchange( (LONG *)&partial_line_tid, str[len - 1] != '\n' ? GetCurrentThreadId() : 0 ); return fwrite( str, 1, len, stderr ); }

1 0

Alexandre Julliard : makefiles: Don' t link against wine_port when using msvcrt.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 3e6a4c4a5cd8d47fac8e4cdc814ebb2a2b2f2ec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6a4c4a5cd8d47fac8e4cdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 10:01:12 2019 +0200 makefiles: Don't link against wine_port when using msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2b916af..a03222b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2057,7 +2057,7 @@ static struct strarray add_default_libraries( const struct makefile *make, struc struct strarray all_libs = empty_strarray; unsigned int i, j; - strarray_add( &all_libs, "-lwine_port" ); + if (!make->use_msvcrt) strarray_add( &all_libs, "-lwine_port" ); strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); strarray_addall( &all_libs, libs );

1 0

Alexandre Julliard : configure: Check for supported warning flags also for the cross-compiler.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 870f99eced99dc143efb71f95c2cb91d40ea46cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=870f99eced99dc143efb71f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 18:47:44 2019 +0200 configure: Check for supported warning flags also for the cross-compiler. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + aclocal.m4 | 23 ++ configure | 636 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 36 ++++ tools/makedep.c | 4 +- 5 files changed, 699 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=870f99eced99dc143efb…

1 0

Paul Gofman : wined3d: Store and use stream offset in state block.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 57653b9527ed377747b898f11484219466902fed URL: https://source.winehq.org/git/wine.git/?a=commit;h=57653b9527ed377747b898f1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 4 19:07:13 2019 +0300 wined3d: Store and use stream offset in state block. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=21161 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/stateblock.c | 79 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/device.c | 1 + dlls/wined3d/stateblock.c | 30 ++++++++++++---- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 87 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57653b9527ed377747b8…

1 0

Paul Gofman : d3d8: Keep previous stream source stride only when setting NULL buffer.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 1035d2ae28b5bcf53d9f2a4d83d83cc174fd4ff7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1035d2ae28b5bcf53d9f2a4d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 4 23:13:06 2019 +0300 d3d8: Keep previous stream source stride only when setting NULL buffer. Signed-off-by: Paul Gofman <gofmanp(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 | 11 ++++------- dlls/d3d8/tests/device.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4eb44e2..3dce0f6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3282,16 +3282,13 @@ static HRESULT WINAPI d3d8_device_SetStreamSource(IDirect3DDevice8 *iface, iface, stream_idx, buffer, stride); wined3d_mutex_lock(); - if (!stride) - { - unsigned int cur_offset; - - hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, - &cur_offset, &stride); - } if (!buffer_impl) + { + wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, + NULL, &stride); wined3d_buffer = NULL; + } else if (buffer_impl->draw_buffer) wined3d_buffer = buffer_impl->draw_buffer; else diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index af58789..b0a279b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2310,6 +2310,55 @@ cleanup: DestroyWindow(window); } +static void test_set_stream_source(void) +{ + IDirect3DVertexBuffer8 *vb, *current_vb; + IDirect3DDevice8 *device; + unsigned int stride; + IDirect3D8 *d3d8; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d8, window, NULL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + goto cleanup; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, 512, 0, 0, D3DPOOL_DEFAULT, &vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, 32); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!current_vb, "Got unexpected vb %p.\n", current_vb); + ok(stride == 32, "Got unexpected stride %u.\n", stride); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(current_vb == vb, "Got unexpected vb %p.\n", current_vb); + IDirect3DVertexBuffer8_Release(current_vb); + ok(!stride, "Got unexpected stride %u.\n", stride); + + IDirect3DVertexBuffer8_Release(vb); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +cleanup: + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + static void test_render_zero_triangles(void) { IDirect3DDevice8 *device; @@ -9774,6 +9823,7 @@ START_TEST(device) test_shader(); test_limits(); test_lights(); + test_set_stream_source(); test_ApplyStateBlock(); test_render_zero_triangles(); test_depth_stencil_reset();

1 0

Zebediah Figura : ddraw/tests: Add some tests for calling stateblock methods while recording.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 7df470164bd4ba173921caacf0ad671e180894f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7df470164bd4ba173921caac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:55 2019 -0500 ddraw/tests: Add some tests for calling stateblock methods while recording. 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/ddraw/tests/ddraw7.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 423dba5..168253e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15822,6 +15822,77 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_begin_end_state_block(void) +{ + DWORD stateblock, stateblock2; + IDirect3DDevice7 *device; + ULONG refcount; + DWORD value; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + stateblock = 0xdeadbeef; + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!!stateblock && stateblock != 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock); + + stateblock2 = 0xdeadbeef; + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock2); + todo_wine ok(hr == D3DERR_NOTINBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(stateblock2 == 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock2); + + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice7_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginStateBlock(device); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); + + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -15966,4 +16037,5 @@ START_TEST(ddraw7) test_multiply_transform(); test_alphatest(); test_clipper_refcount(); + test_begin_end_state_block(); }

1 0