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

Zebediah Figura : ddraw: Return D3DERR_INBEGINSTATEBLOCK when BeginStateBlock() is called while recording.
by Alexandre Julliard 05 Apr '19

05 Apr '19

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 05 Apr '19

05 Apr '19

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

Zebediah Figura : ddraw: Forbid applying a stateblock while recording.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 5fd14a4e6273089f3ecae6608240278ead563ae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fd14a4e6273089f3ecae660… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:58 2019 -0500 ddraw: 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/ddraw/device.c | 6 ++++++ dlls/ddraw/tests/ddraw7.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 49eb664..0ddf9a8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5822,6 +5822,12 @@ static HRESULT d3d_device7_ApplyStateBlock(IDirect3DDevice7 *iface, DWORD stateb TRACE("iface %p, stateblock %#x.\n", iface, stateblock); wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to apply a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INBEGINSTATEBLOCK; + } wined3d_sb = ddraw_get_object(&device->handle_table, stateblock - 1, DDRAW_HANDLE_STATEBLOCK); if (!wined3d_sb) { diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e10aedb..ff73eea 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15866,7 +15866,7 @@ static void test_begin_end_state_block(void) 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); + 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); @@ -15886,7 +15886,7 @@ static void test_begin_end_state_block(void) 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); + ok(value == TRUE, "Got unexpected value %#x.\n", value); refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Zebediah Figura : ddraw: Forbid capturing a stateblock while recording.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 0da6f2a66a44e9bae5d724b59f54b58cb1359ff0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0da6f2a66a44e9bae5d724b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:59 2019 -0500 ddraw: 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/ddraw/device.c | 6 ++++++ dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0ddf9a8..b471612 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5882,6 +5882,12 @@ static HRESULT d3d_device7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD stat TRACE("iface %p, stateblock %#x.\n", iface, stateblock); wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to capture a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INBEGINSTATEBLOCK; + } wined3d_sb = ddraw_get_object(&device->handle_table, stateblock - 1, DDRAW_HANDLE_STATEBLOCK); if (!wined3d_sb) { diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ff73eea..61042e3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15869,7 +15869,7 @@ static void test_begin_end_state_block(void) 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); + 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);

1 0

Piotr Caban : d3dxof: Don't use strncasecmp.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 718b07b34340e0702bc4fd67039ae3420f315e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=718b07b34340e0702bc4fd67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:22 2019 +0200 d3dxof: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/parsing.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 6f93bfe..82cb186 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "wingdi.h" +#include "winternl.h" #include "d3dxof_private.h" #include "dxfile.h" @@ -405,7 +406,7 @@ static BOOL is_keyword(parse_buffer* buf, const char* keyword) if (!read_bytes(buf, tmp, len)) return FALSE; - if (strncasecmp(tmp, keyword, len)) + if (_strnicmp(tmp, keyword, len)) { rewind_bytes(buf, len); return FALSE; @@ -972,7 +973,7 @@ static BOOL parse_template_members_list(parse_buffer * buf) cur_member->idx_template = 1; while (cur_member->idx_template < buf->pdxf->nb_xtemplates) { - if (!strcasecmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name)) + if (!_strnicmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name, -1)) break; cur_member->idx_template++; } @@ -1176,7 +1177,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) /* To do template lookup */ for (j = 0; j < buf->pdxf->nb_xtemplates; j++) { - if (!strcasecmp(buf->pdxf->xtemplates[pt->members[i].idx_template].name, buf->pdxf->xtemplates[j].name)) + if (!_strnicmp(buf->pdxf->xtemplates[pt->members[i].idx_template].name, buf->pdxf->xtemplates[j].name, -1)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[j]; break; @@ -1392,7 +1393,7 @@ BOOL parse_object(parse_buffer * buf) /* To do template lookup */ for (i = 0; i < buf->pdxf->nb_xtemplates; i++) { - if (!strcasecmp((char*)buf->value, buf->pdxf->xtemplates[i].name)) + if (!_strnicmp((char*)buf->value, buf->pdxf->xtemplates[i].name, -1)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[i]; memcpy(&buf->pxo->type, &buf->pdxf->xtemplates[i].class_id, 16);

1 0

Piotr Caban : shell32: Don't use strcasecmp.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 232255f3c5c48a2685d317101d0c0d068414a6ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=232255f3c5c48a2685d31710… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 17:04:53 2019 +0200 shell32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/pidl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index e11a918..54fb818 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -511,7 +511,7 @@ BOOL WINAPI ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) _ILSimpleGetText(pidltemp1, szData1, MAX_PATH); _ILSimpleGetText(pidltemp2, szData2, MAX_PATH); - if (strcasecmp( szData1, szData2 )) + if (lstrcmpiA( szData1, szData2 )) return FALSE; pidltemp1 = ILGetNext(pidltemp1); @@ -563,7 +563,7 @@ BOOL WINAPI ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, BOOL b _ILSimpleGetText(pParent, szData1, MAX_PATH); _ILSimpleGetText(pChild, szData2, MAX_PATH); - if (strcasecmp( szData1, szData2 )) + if (lstrcmpiA( szData1, szData2 )) return FALSE; pParent = ILGetNext(pParent); @@ -630,7 +630,7 @@ LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) _ILSimpleGetText(pidltemp1, szData1, MAX_PATH); _ILSimpleGetText(pidltemp2, szData2, MAX_PATH); - if (strcasecmp(szData1,szData2)) + if (lstrcmpiA(szData1,szData2)) break; pidltemp1 = ILGetNext(pidltemp1);

1 0

Piotr Caban : shlwapi: Fix PathIsContentTypeA implementation.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 28f7e4615d9a02b6f556434e51568aab68edc35e URL: https://source.winehq.org/git/wine.git/?a=commit;h=28f7e4615d9a02b6f556434e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 16:01:03 2019 +0200 shlwapi: Fix PathIsContentTypeA implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/path.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index ad78c5d..1c4af7e 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -2027,22 +2027,18 @@ BOOL WINAPI PathIsSameRootW(LPCWSTR lpszPath1, LPCWSTR lpszPath2) * a content type is registered, it is compared (case insensitively) to * lpszContentType. Only if this matches does the function succeed. */ -BOOL WINAPI PathIsContentTypeA(LPCSTR lpszPath, LPCSTR lpszContentType) +BOOL WINAPI PathIsContentTypeA(LPCSTR path, LPCSTR content_type) { - LPCSTR szExt; - DWORD dwDummy; - char szBuff[MAX_PATH]; + char buf[MAX_PATH]; + DWORD size = sizeof(buf); + LPCSTR ext; - TRACE("(%s,%s)\n", debugstr_a(lpszPath), debugstr_a(lpszContentType)); + TRACE("(%s,%s)\n", debugstr_a(path), debugstr_a(content_type)); - if (lpszPath && (szExt = PathFindExtensionA(lpszPath)) && *szExt && - !SHGetValueA(HKEY_CLASSES_ROOT, szExt, "Content Type", - REG_NONE, szBuff, &dwDummy) && - !strcasecmp(lpszContentType, szBuff)) - { - return TRUE; - } - return FALSE; + if(!path) return FALSE; + if(!(ext = PathFindExtensionA(path)) || !*ext) return FALSE; + if(SHGetValueA(HKEY_CLASSES_ROOT, ext, "Content Type", NULL, buf, &size)) return FALSE; + return !lstrcmpiA(content_type, buf); } /*************************************************************************

1 0

Paul Gofman : d3d9: Keep previous stream source stride and offset only when setting NULL buffer.
by Alexandre Julliard 04 Apr '19

04 Apr '19

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

Zebediah Figura : d3d8/tests: Add more tests for calling stateblock methods while recording.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 74b3f9e3afc5837fbb804f9491298418e127b8c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b3f9e3afc5837fbb804f94… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 21:18:41 2019 -0500 d3d8/tests: Add more 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/d3d8/tests/device.c | 57 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c5ec9aa..f0acd9f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7231,10 +7231,11 @@ cleanup: static void test_begin_end_state_block(void) { + DWORD stateblock, stateblock2; IDirect3DDevice8 *device; - DWORD stateblock; IDirect3D8 *d3d; ULONG refcount; + DWORD value; HWND window; HRESULT hr; @@ -7249,28 +7250,54 @@ static void test_begin_end_state_block(void) return; } - /* Should succeed. */ hr = IDirect3DDevice8_BeginStateBlock(device); - ok(SUCCEEDED(hr), "Failed to begin stateblock, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Calling BeginStateBlock() while recording should return - * D3DERR_INVALIDCALL. */ - hr = IDirect3DDevice8_BeginStateBlock(device); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Should succeed. */ stateblock = 0xdeadbeef; hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); - ok(SUCCEEDED(hr), "Failed to end stateblock, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(!!stateblock && stateblock != 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock); - IDirect3DDevice8_DeleteStateBlock(device, stateblock); - /* Calling EndStateBlock() while not recording should return - * D3DERR_INVALIDCALL. stateblock should not be touched. */ - stateblock = 0xdeadbeef; - hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); + stateblock2 = 0xdeadbeef; + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock2); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - ok(stateblock == 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock); + ok(stateblock2 == 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock2); + + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginStateBlock(device); + 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); + + hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); + todo_wine 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); + + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_ApplyStateBlock(device, stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + 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); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Zebediah Figura : d3d8: Forbid applying a stateblock while recording.
by Alexandre Julliard 04 Apr '19

04 Apr '19

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