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

Zebediah Figura : ddraw: Return D3DERR_INBEGINSTATEBLOCK when BeginStateBlock() is called while recording.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: f9b9004f81ab5c1c9fbbc507bac963fb71de92af URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9b9004f81ab5c1c9fbbc507… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:56 2019 -0500 ddraw: Return D3DERR_INBEGINSTATEBLOCK when BeginStateBlock() is called 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/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 10 +++++++++- dlls/ddraw/tests/ddraw7.c | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2e58123..19f21a8 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -346,6 +346,8 @@ struct d3d_device D3DMATRIXHANDLE world, proj, view; struct wined3d_vec4 user_clip_planes[D3DMAXUSERCLIPPLANES]; + + BOOL recording; }; HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index adfbc41..4ab7621 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5644,7 +5644,14 @@ static HRESULT d3d_device7_BeginStateBlock(IDirect3DDevice7 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_device_begin_stateblock(device->wined3d_device); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INBEGINSTATEBLOCK; + } + if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device))) + device->recording = TRUE; wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr); @@ -5705,6 +5712,7 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl *stateblock = 0; return hr_ddraw_from_wined3d(hr); } + device->recording = FALSE; h = ddraw_allocate_handle(&device->handle_table, wined3d_sb, DDRAW_HANDLE_STATEBLOCK); if (h == DDRAW_INVALID_HANDLE) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 168253e..c0d2aad 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15863,7 +15863,7 @@ static void test_begin_end_state_block(void) 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); + 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);

1 0

Zebediah Figura : ddraw: Return D3DERR_NOTINBEGINSTATEBLOCK when EndStateBlock() is called while not recording.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 90af51d041103ae4e8990077b85dfb79f5cc466b URL: https://source.winehq.org/git/wine.git/?a=commit;h=90af51d041103ae4e8990077… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:57 2019 -0500 ddraw: Return D3DERR_NOTINBEGINSTATEBLOCK when EndStateBlock() is called while not 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/device.c | 7 ++++++- dlls/ddraw/tests/ddraw7.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4ab7621..49eb664 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5703,7 +5703,12 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - + if (!device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to end a stateblock, but no stateblock is being recorded.\n"); + return D3DERR_NOTINBEGINSTATEBLOCK; + } hr = wined3d_device_end_stateblock(device->wined3d_device, &wined3d_sb); if (FAILED(hr)) { diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c0d2aad..e10aedb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15852,8 +15852,8 @@ static void test_begin_end_state_block(void) 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); + ok(hr == D3DERR_NOTINBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + 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);

1 0

Paul Gofman : d3d8: Keep previous stream source stride only when setting NULL buffer.
by Alexandre Julliard April 5, 2019

April 5, 2019

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

Alexandre Julliard : msvcrt: Don't export _matherr().
by Alexandre Julliard April 5, 2019

April 5, 2019

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

Vincent Povirk : mscoree: Update Wine Mono to 4.8.1.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 4cae8334159a692c0e6a2623729502c34f5a2fc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cae8334159a692c0e6a2623… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 4 10:05:29 2019 -0500 mscoree: Update Wine Mono to 4.8.1. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b070307..143931b 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.8.0" -#define MONO_SHA "890159ffd1679ca7d45e840e1890caba8c24acbc18c59db1ca718b35a5ab8778" +#define MONO_VERSION "4.8.1" +#define MONO_SHA "4e073038c14c2496246ecb044ef8abfb8a1cfede58aa35168e04d484a003b032" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index db5f426..198e279 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.8.0"; + static const char* mono_version = "4.8.1"; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Matteo Bruni : d3dx9: Fix argument type in convert_dib_to_bmp().
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 8bed853c4380ebf86220ffe2fd89d48d98a90921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bed853c4380ebf86220ffe2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 4 16:56:03 2019 +0200 d3dx9: Fix argument type in convert_dib_to_bmp(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index cf8286e..c82c222 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -770,7 +770,7 @@ HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, co return D3D_OK; } -static BOOL convert_dib_to_bmp(void **data, UINT *size) +static BOOL convert_dib_to_bmp(const void **data, unsigned int *size) { ULONG header_size; ULONG count = 0; @@ -878,7 +878,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, } /* In case of DIB file, convert it to BMP */ - dib = convert_dib_to_bmp((void**)&data, &datasize); + dib = convert_dib_to_bmp(&data, &datasize); hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); @@ -1154,7 +1154,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, } if (imginfo.ImageFileFormat == D3DXIFF_DIB) - convert_dib_to_bmp((void**)&pSrcData, &SrcDataSize); + convert_dib_to_bmp(&pSrcData, &SrcDataSize); if (FAILED(WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory))) goto cleanup_err;

1 0

Christian Costa : d3dx9/tests: Add tests for 32 bpp BMP with alpha.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: a30fd8c0e44833b2a6412987a348273bfe42fe2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a30fd8c0e44833b2a6412987… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 4 16:54:34 2019 +0200 d3dx9/tests: Add tests for 32 bpp BMP with alpha. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index b7c52a2..56b79d8 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -67,6 +67,26 @@ static const unsigned char bmp_8bpp[] = { 0x00,0x00 }; +/* 2x2 bmp (32 bpp XRGB) */ +static const unsigned char bmp_32bpp_xrgb[] = +{ + 0x42,0x4d,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00, + 0x00,0x00,0x10,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0xb0,0xc0,0x00,0xa1,0xb1,0xc1,0x00,0xa2,0xb2, + 0xc2,0x00,0xa3,0xb3,0xc3,0x00 +}; + +/* 2x2 bmp (32 bpp ARGB) */ +static const unsigned char bmp_32bpp_argb[] = +{ + 0x42,0x4d,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00, + 0x00,0x00,0x10,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0xb0,0xc0,0x00,0xa1,0xb1,0xc1,0x00,0xa2,0xb2, + 0xc2,0x00,0xa3,0xb3,0xc3,0x01 +}; + static const unsigned char png_grayscale[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, @@ -560,6 +580,13 @@ static void test_D3DXGetImageInfo(void) ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + hr = D3DXGetImageInfoFromFileInMemory(bmp_32bpp_xrgb, sizeof(bmp_32bpp_xrgb), &info); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Format == D3DFMT_X8R8G8B8, "Got unexpected format %u.\n", info.Format); + hr = D3DXGetImageInfoFromFileInMemory(bmp_32bpp_argb, sizeof(bmp_32bpp_argb), &info); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(info.Format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", info.Format); + /* Grayscale PNG */ hr = D3DXGetImageInfoFromFileInMemory(png_grayscale, sizeof(png_grayscale), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);

1 0

Zebediah Figura : d3d8: Forbid capturing a stateblock while recording.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 2e01e46aeb06e7ec880efcf639f2ce202ce93fee URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e01e46aeb06e7ec880efcf6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 21:18:43 2019 -0500 d3d8: Forbid capturing a stateblock 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/d3d8/device.c | 6 ++++++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 381588f..4bd7578 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1964,6 +1964,12 @@ static HRESULT WINAPI d3d8_device_CaptureStateBlock(IDirect3DDevice8 *iface, DWO TRACE("iface %p, token %#x.\n", iface, token); wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to capture stateblock while recording, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } stateblock = d3d8_get_object(&device->handle_table, token - 1, D3D8_HANDLE_SB); if (!stateblock) { diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fee73de..37f4c5c 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7280,7 +7280,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);

1 0

Zebediah Figura : d3d8: Forbid applying a stateblock while recording.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: d63e1bc9ab5aa60a952ad7b06101e37c48f4cde7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63e1bc9ab5aa60a952ad7b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 21:18:42 2019 -0500 d3d8: Forbid applying a stateblock 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/d3d8/device.c | 6 ++++++ dlls/d3d8/tests/device.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5016ac4..381588f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1924,6 +1924,12 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD return D3D_OK; wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to apply stateblock while recording, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } stateblock = d3d8_get_object(&device->handle_table, token - 1, D3D8_HANDLE_SB); if (!stateblock) { diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f0acd9f..fee73de 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7277,7 +7277,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_ApplyStateBlock(device, stateblock); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); @@ -7297,7 +7297,7 @@ static void test_begin_end_state_block(void) hr = IDirect3DDevice8_GetRenderState(device, D3DRS_LIGHTING, &value); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); + ok(value == TRUE, "Got unexpected value %#x.\n", value); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Paul Gofman : d3d9: Keep previous stream source stride and offset only when setting NULL buffer.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 467199d59385e8bb145190e11a5a6fde906b81c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=467199d59385e8bb145190e1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Apr 3 20:26:06 2019 +0300 d3d9: Keep previous stream source stride and offset 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/d3d9/device.c | 10 +++------- dlls/d3d9/tests/device.c | 22 ++++++++++++++++++++-- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bad9211..f7f9358 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3558,13 +3558,9 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, iface, stream_idx, buffer, offset, 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, + &offset, &stride); if (!buffer_impl) wined3d_buffer = NULL; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index e7366b1..f5c8972 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3240,7 +3240,8 @@ cleanup: static void test_set_stream_source(void) { - IDirect3DVertexBuffer9 *vb; + IDirect3DVertexBuffer9 *vb, *current_vb; + unsigned int offset, stride; IDirect3DDevice9 *device; IDirect3D9 *d3d9; ULONG refcount; @@ -3273,7 +3274,24 @@ static void test_set_stream_source(void) hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 3, 32); ok(hr == D3DERR_INVALIDCALL || hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 4, 32); - ok(SUCCEEDED(hr), "Failed to set the stream source, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!current_vb, "Got unexpected vb %p.\n", current_vb); + ok(offset == 4, "Got unexpected offset %u.\n", offset); + ok(stride == 32, "Got unexpected stride %u.\n", stride); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(current_vb == vb, "Got unexpected vb %p.\n", current_vb); + IDirect3DVertexBuffer9_Release(current_vb); + ok(!offset, "Got unexpected offset %u.\n", offset); + ok(!stride, "Got unexpected stride %u.\n", stride); /* Try to set the NULL buffer with an offset and stride 0 */ hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0);

1 0