October 2019 - Wine-Commits

Jacek Caban : vbscript: Support DISP_E_EXCEPTION Invoke[Ex] return value.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: fa0c84ae0b3f3597cd98a9d3d3d999f86e6992b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa0c84ae0b3f3597cd98a9d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 31 19:16:29 2019 +0100 vbscript: Support DISP_E_EXCEPTION Invoke[Ex] return value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/error.vbs | 16 ++++++++++++++++ dlls/vbscript/tests/run.c | 11 ++++++++++- dlls/vbscript/vbdisp.c | 19 +++++++++++++++---- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/tests/error.vbs b/dlls/vbscript/tests/error.vbs index 13f9a2072e..1853f6c4bf 100644 --- a/dlls/vbscript/tests/error.vbs +++ b/dlls/vbscript/tests/error.vbs @@ -457,4 +457,20 @@ end sub call testVBErrorCodes +on error resume next + +throwWithDesc +ok err.number = &hdeadbeef&, "err.number = " & hex(err.number) +ok err.description = "test", "err.description = " & err.description +ok err.helpcontext = 10, "err.helpcontext = " & err.helpcontext +ok err.helpfile = "test.chm", "err.helpfile = " & err.helpfile + +throwWithDesc = 1 +ok err.number = &hdeadbeef&, "err.number = " & hex(err.number) +ok err.description = "test", "err.description = " & err.description +ok err.helpcontext = 10, "err.helpcontext = " & err.helpcontext +ok err.helpfile = "test.chm", "err.helpfile = " & err.helpfile + +on error goto 0 + call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index b7a204f919..9354cae309 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -139,6 +139,7 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_WEEKSTARTDAY 1021 #define DISPID_GLOBAL_GLOBALCALLBACK 1022 #define DISPID_GLOBAL_TESTERROROBJECT 1023 +#define DISPID_GLOBAL_THROWWITHDESC 1024 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -1105,7 +1106,8 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"testArray", DISPID_GLOBAL_TESTARRAY }, { L"throwInt", DISPID_GLOBAL_THROWINT }, { L"testOptionalArg", DISPID_GLOBAL_TESTOPTIONALARG }, - { L"testErrorObject", DISPID_GLOBAL_TESTERROROBJECT } + { L"testErrorObject", DISPID_GLOBAL_TESTERROROBJECT }, + { L"throwWithDesc", DISPID_GLOBAL_THROWWITHDESC } }; test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -1463,6 +1465,13 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, } return hres; + + case DISPID_GLOBAL_THROWWITHDESC: + pei->scode = 0xdeadbeef; + pei->bstrDescription = SysAllocString(L"test"); + pei->bstrHelpFile = SysAllocString(L"test.chm"); + pei->dwHelpContext = 10; + return DISP_E_EXCEPTION; } case DISPID_GLOBAL_TESTOPTIONALARG: { diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 1dd6d4ed05..25a80fc89d 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -952,15 +952,21 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, return invoke_vbdisp(vbdisp, id, flags, FALSE, dp, retv); hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(FAILED(hres)) { + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei, NULL /* CALLER_FIXME */); + IDispatchEx_Release(dispex); + }else { UINT err = 0; TRACE("using IDispatch\n"); - return IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, retv, &ei, &err); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, retv, &ei, &err); } - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei, NULL /* CALLER_FIXME */); - IDispatchEx_Release(dispex); + if(hres == DISP_E_EXCEPTION) { + clear_ei(&ctx->ei); + ctx->ei = ei; + hres = SCRIPT_E_RECORDED; + } return hres; } @@ -994,5 +1000,10 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, NULL, &ei, &err); } + if(hres == DISP_E_EXCEPTION) { + clear_ei(&ctx->ei); + ctx->ei = ei; + hres = SCRIPT_E_RECORDED; + } return hres; }

1 0

Jacek Caban : vbscript/tests: Introduce get_dispid helper.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 9115c37b467c013326061f97aded0cbb266436ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=9115c37b467c013326061f97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 31 19:16:17 2019 +0100 vbscript/tests: Introduce get_dispid helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 320 ++++++++++++++++------------------------------ 1 file changed, 113 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9115c37b467c01332606…

1 0

Piotr Caban : regedit: Fix double free error in GetValueName.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: f11a740266cf5504693c8cd32e000d1a3ab77098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f11a740266cf5504693c8cd3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 31 11:22:07 2019 +0100 regedit: Fix double free error in GetValueName. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index cdcaa8e067..0132cfb8db 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -38,7 +38,6 @@ DWORD g_columnToSort = ~0U; BOOL g_invertSort = FALSE; WCHAR *g_currentPath; HKEY g_currentRootKey; -static WCHAR *g_valueName; static WCHAR g_szValueNotSet[64]; #define MAX_LIST_COLUMNS (IDS_LIST_COLUMN_LAST - IDS_LIST_COLUMN_FIRST + 1) @@ -66,16 +65,10 @@ WCHAR *GetValueName(HWND hwndLV) { INT item; - if (g_valueName != LPSTR_TEXTCALLBACKW) - heap_free(g_valueName); - g_valueName = NULL; - item = SendMessageW(hwndLV, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED, 0)); if (item == -1) return NULL; - g_valueName = GetItemText(hwndLV, item); - - return g_valueName; + return GetItemText(hwndLV, item); } BOOL update_listview_path(const WCHAR *path)

1 0

Andrew Eikum : advapi32: Add EventRegister and EventUnregister tests.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 364d654ba3ab05fae08941114b8b17ac3f1040d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364d654ba3ab05fae0894111… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 31 08:58:02 2019 -0500 advapi32: Add EventRegister and EventUnregister tests. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 35 +++++++++++++++++++++++++++++++++++ dlls/ntdll/misc.c | 2 ++ 2 files changed, 37 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index d613c95315..f12a6a157b 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -28,12 +28,15 @@ #include "winreg.h" #include "sddl.h" #include "wmistr.h" +#include "evntprov.h" #include "evntrace.h" #include "wine/test.h" static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); +static ULONG (WINAPI *pEventRegister)(const GUID *,PENABLECALLBACK,void *,REGHANDLE *); +static ULONG (WINAPI *pEventUnregister)(REGHANDLE); static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *); @@ -46,6 +49,8 @@ static void init_function_pointers(void) pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid"); pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); + pEventRegister = (void*)GetProcAddress(hadvapi32, "EventRegister"); + pEventUnregister = (void*)GetProcAddress(hadvapi32, "EventUnregister"); pGetComputerNameExA = (void*)GetProcAddress(hkernel32, "GetComputerNameExA"); pWow64DisableWow64FsRedirection = (void*)GetProcAddress(hkernel32, "Wow64DisableWow64FsRedirection"); @@ -1146,6 +1151,35 @@ static void cleanup_eventlog(void) ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError()); } +static void test_trace_event_params(void) +{ + static const GUID test_guid = {0x57696E65, 0x0000, 0x0000, {0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x01}}; + + REGHANDLE reg_handle; + ULONG uret; + + if (!pEventRegister) + { + win_skip("advapi32.EventRegister is missing, skipping trace event tests\n"); + return; + } + + uret = pEventRegister(NULL, NULL, NULL, &reg_handle); + todo_wine ok(uret == ERROR_INVALID_PARAMETER, "EventRegister gave wrong error: %#x\n", uret); + + uret = pEventRegister(&test_guid, NULL, NULL, NULL); + ok(uret == ERROR_INVALID_PARAMETER, "EventRegister gave wrong error: %#x\n", uret); + + uret = pEventRegister(&test_guid, NULL, NULL, &reg_handle); + ok(uret == ERROR_SUCCESS, "EventRegister gave wrong error: %#x\n", uret); + + uret = pEventUnregister(0); + todo_wine ok(uret == ERROR_INVALID_HANDLE, "EventUnregister gave wrong error: %#x\n", uret); + + uret = pEventUnregister(reg_handle); + ok(uret == ERROR_SUCCESS, "EventUnregister gave wrong error: %#x\n", uret); +} + static void test_start_trace(void) { const char sessionname[] = "wine"; @@ -1259,6 +1293,7 @@ START_TEST(eventlog) test_openbackup(); test_read(); test_clear(); + test_trace_event_params(); /* Functional tests */ if (create_new_eventlog()) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 2a135518e7..c29a1c26c2 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -403,6 +403,8 @@ ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID { FIXME("(%s, %p, %p, %p) stub.\n", debugstr_guid(provider), callback, context, handle); + if (!handle) return ERROR_INVALID_PARAMETER; + *handle = 0xdeadbeef; return ERROR_SUCCESS; }

1 0

Paul Gofman : d3d11/tests: Add tests for binding resource as both SRV and DSV.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 818366486b12e38e1f4a06b4c2f588b5d7581891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=818366486b12e38e1f4a06b4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Oct 31 16:23:41 2019 +0300 d3d11/tests: Add tests for binding resource as both SRV and DSV. 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/d3d11/tests/d3d11.c | 97 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 92 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index bdf661cecb..d23cb15d82 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29396,18 +29396,24 @@ static void test_desktop_window(void) static void test_sample_attached_rtv(void) { - ID3D11ShaderResourceView *srv, *srv_test; + ID3D11ShaderResourceView *srv, *srv_test, *srv_ds; + ID3D11Texture2D *texture, *texture2, *dstexture; + D3D11_SHADER_RESOURCE_VIEW_DESC srvds_desc; + D3D11_DEPTH_STENCIL_VIEW_DESC dsview_desc; struct d3d11_test_context test_context; ID3D11RenderTargetView *rtv, *rtvs[2]; - ID3D11Texture2D *texture, *texture2; D3D11_TEXTURE2D_DESC texture_desc; D3D11_SAMPLER_DESC sampler_desc; + ID3D11DepthStencilView *dsview; + ID3D11BlendState *blend_state; ID3D11DeviceContext *context; + D3D11_BLEND_DESC blend_desc; ID3D11SamplerState *sampler; struct resource_readback rb; ID3D11PixelShader *ps; ID3D11Device *device; unsigned int x, y; + unsigned int i; DWORD color; HRESULT hr; @@ -29451,8 +29457,28 @@ static void test_sample_attached_rtv(void) 0x00004002, 0x3e800000, 0x3e800000, 0x3e800000, 0x3e800000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00100e46, 0x00000000, 0x0100003e, }; - static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const struct + { + DXGI_FORMAT texture_format, dsv_format, srv_format; + UINT dsv_flags; + BOOL srv_bind_allowed; + } + ds_tests[] = + { + {DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, DXGI_FORMAT_R24_UNORM_X8_TYPELESS, + 0, FALSE}, + {DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, DXGI_FORMAT_R24_UNORM_X8_TYPELESS, + D3D11_DSV_READ_ONLY_DEPTH, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, DXGI_FORMAT_X24_TYPELESS_G8_UINT, + D3D11_DSV_READ_ONLY_DEPTH, FALSE}, + {DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, DXGI_FORMAT_X24_TYPELESS_G8_UINT, + D3D11_DSV_READ_ONLY_STENCIL, TRUE}, + {DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, DXGI_FORMAT_R32_FLOAT, + 0, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, DXGI_FORMAT_R32_FLOAT, + D3D11_DSV_READ_ONLY_DEPTH, TRUE}, + }; if (!init_test_context(&test_context, NULL)) return; @@ -29497,7 +29523,6 @@ static void test_sample_attached_rtv(void) texture_desc.Width = 640; texture_desc.Height = 480; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture2); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -29546,11 +29571,26 @@ static void test_sample_attached_rtv(void) hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture2, NULL, &srv); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* SRV does not get bound if resource is attached as render target. */ + memset(&blend_desc, 0, sizeof(blend_desc)); + blend_desc.IndependentBlendEnable = TRUE; + blend_desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; + blend_desc.RenderTarget[1].RenderTargetWriteMask = 0; + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D11DeviceContext_OMSetBlendState(context, blend_state, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11BlendState_Release(blend_state); + + /* SRV does not get bound if resource is attached as render target, even if write mask is 0. */ ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); ID3D11DeviceContext_PSGetShaderResources(context, 0, 1, &srv_test); ok(!srv_test, "Unexpected SRV %p.\n", srv_test); + blend_desc.RenderTarget[1].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D11DeviceContext_OMSetBlendState(context, blend_state, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11BlendState_Release(blend_state); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); draw_quad(&test_context); @@ -29605,6 +29645,53 @@ static void test_sample_attached_rtv(void) ID3D11DeviceContext_PSGetShaderResources(context, 0, 1, &srv_test); ok(!srv_test, "Unexpected SRV %p.\n", srv_test); + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_DEPTH_STENCIL; + memset(&dsview_desc, 0, sizeof(dsview_desc)); + dsview_desc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D; + + memset(&srvds_desc, 0, sizeof(srvds_desc)); + srvds_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; + U(srvds_desc).Texture2D.MipLevels = 1; + + for (i = 0; i < ARRAY_SIZE(ds_tests); ++i) + { + texture_desc.Format = ds_tests[i].texture_format; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &dstexture); + ok(hr == S_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + dsview_desc.Format = ds_tests[i].dsv_format; + dsview_desc.Flags = ds_tests[i].dsv_flags; + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)dstexture, &dsview_desc, &dsview); + ok(hr == S_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + + srvds_desc.Format = ds_tests[i].srv_format; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)dstexture, &srvds_desc, &srv_ds); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, rtvs, NULL); + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv_ds); + ID3D11DeviceContext_PSGetShaderResources(context, 0, 1, &srv_test); + ok(!!srv_test, "Test %u, unexpected SRV %p.\n", i, srv_test); + ID3D11ShaderResourceView_Release(srv_test); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, rtvs, dsview); + ID3D11DeviceContext_PSGetShaderResources(context, 0, 1, &srv_test); + ok(!!srv_test == ds_tests[i].srv_bind_allowed, "Test %u, unexpected SRV %p.\n", i, srv_test); + if (srv_test) + ID3D11ShaderResourceView_Release(srv_test); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv_ds); + ID3D11DeviceContext_PSGetShaderResources(context, 0, 1, &srv_test); + ok(!!srv_test == ds_tests[i].srv_bind_allowed, "Test %u, unexpected SRV %p.\n", i, srv_test); + if (srv_test) + ID3D11ShaderResourceView_Release(srv_test); + + ID3D11Texture2D_Release(dstexture); + ID3D11DepthStencilView_Release(dsview); + ID3D11ShaderResourceView_Release(srv_ds); + } + + ID3D11DeviceContext_OMSetRenderTargets(context, 2, rtvs, NULL); + ID3D11RenderTargetView_Release(rtv); ID3D11ShaderResourceView_Release(srv); ID3D11SamplerState_Release(sampler);

1 0

Paul Gofman : d3d11: Mind DSV flags when checking for conflicting SRV.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 600f39d4ad8ff4efa8e63126fe0f43c1998497ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=600f39d4ad8ff4efa8e63126… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Oct 31 16:23:40 2019 +0300 d3d11: Mind DSV flags when checking for conflicting SRV. Fixes a regression introduced by commit 3f698b950f52bf731d397c04ad68d240d28d7e2b. 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/d3d11/view.c | 5 +++++ dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 11 ++++++----- dlls/wined3d/utils.c | 15 ++++++++++++--- dlls/wined3d/view.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 13 +++++++++++-- include/wine/wined3d.h | 2 ++ 7 files changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index a6eddf59ce..40037989eb 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1216,6 +1216,11 @@ static void wined3d_depth_stencil_view_desc_from_d3d11(struct wined3d_view_desc FIXME("Unhandled depth stencil view flags %#x.\n", desc->Flags); wined3d_desc->flags = 0; + if (desc->Flags & D3D11_DSV_READ_ONLY_DEPTH) + wined3d_desc->flags |= WINED3D_VIEW_READ_ONLY_DEPTH; + if (desc->Flags & D3D11_DSV_READ_ONLY_STENCIL) + wined3d_desc->flags |= WINED3D_VIEW_READ_ONLY_STENCIL; + wined3d_desc->u.texture.level_count = 1; switch (desc->ViewDimension) { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e9750c41c5..f4c0d46f8e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3696,7 +3696,7 @@ static void context_preload_texture(struct wined3d_context *context, if (!(texture = state->textures[idx])) return; - if (wined3d_resource_check_fbo_attached(state, &texture->resource)) + if (wined3d_resource_check_fbo_attached(state, &texture->resource, NULL)) context->uses_fbo_attached_resources = 1; wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b2aa33af41..2a4d377848 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2239,7 +2239,7 @@ static void wined3d_device_set_shader_resource_view(struct wined3d_device *devic if (view == prev) return; - if (view && wined3d_resource_check_fbo_attached(&device->state, view->resource)) + if (view && wined3d_resource_check_fbo_attached(&device->state, view->resource, view->format)) { WARN("Application is trying to bind resource which is attached as render target.\n"); view = NULL; @@ -4991,7 +4991,7 @@ struct wined3d_rendertarget_view * CDECL wined3d_device_get_depth_stencil_view(c } static void wined3d_unbind_srv_for_rtv(struct wined3d_device *device, - const struct wined3d_rendertarget_view *view) + const struct wined3d_rendertarget_view *view, BOOL dsv) { if (view && view->resource->srv_bind_count_device) { @@ -5003,7 +5003,8 @@ static void wined3d_unbind_srv_for_rtv(struct wined3d_device *device, for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) for (j = 0; j < MAX_SHADER_RESOURCE_VIEWS; ++j) - if ((srv = device->state.shader_resource_view[i][j]) && srv->resource == resource) + if ((srv = device->state.shader_resource_view[i][j]) && srv->resource == resource + && (!dsv || wined3d_dsv_srv_conflict(view, srv->format))) wined3d_device_set_shader_resource_view(device, i, j, NULL); } } @@ -5066,7 +5067,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device if (prev) wined3d_rendertarget_view_decref(prev); - wined3d_unbind_srv_for_rtv(device, view); + wined3d_unbind_srv_for_rtv(device, view, FALSE); return WINED3D_OK; } @@ -5098,7 +5099,7 @@ HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *devic if (prev) wined3d_rendertarget_view_decref(prev); - wined3d_unbind_srv_for_rtv(device, view); + wined3d_unbind_srv_for_rtv(device, view, TRUE); return WINED3D_OK; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cc217c7322..ac821ce732 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3785,18 +3785,27 @@ static BOOL init_typeless_formats(const struct wined3d_adapter *adapter) typeless_format->flags[j] &= ~(WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); } - if ((format_id = typeless_depth_stencil_formats[i].depth_view_id) - && typeless_depth_stencil_formats[i].separate_depth_view_format) + if ((format_id = typeless_depth_stencil_formats[i].depth_view_id)) { if (!(depth_view_format = get_format_internal(adapter, format_id))) return FALSE; - copy_format(adapter, depth_view_format, ds_format); + if (typeless_depth_stencil_formats[i].separate_depth_view_format) + { + copy_format(adapter, depth_view_format, ds_format); + depth_view_format->stencil_size = 0; + } + else + { + depth_view_format->depth_size = ds_format->depth_size; + } } if ((format_id = typeless_depth_stencil_formats[i].stencil_view_id)) { if (!(stencil_view_format = get_format_internal(adapter, format_id))) return FALSE; copy_format(adapter, stencil_view_format, ds_format); + if (typeless_depth_stencil_formats[i].separate_depth_view_format) + stencil_view_format->depth_size = 0; } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 6710abb270..eeca7c868b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -65,11 +65,13 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, {GL_TEXTURE_1D_ARRAY, 0, GL_TEXTURE_1D}, {GL_TEXTURE_1D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_1D_ARRAY}, }; + unsigned int flags = desc->flags & (WINED3D_VIEW_BUFFER_RAW | WINED3D_VIEW_BUFFER_APPEND + | WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_TEXTURE_CUBE | WINED3D_VIEW_TEXTURE_ARRAY); unsigned int i; for (i = 0; i < ARRAY_SIZE(view_types); ++i) { - if (view_types[i].texture_target != texture_gl->target || view_types[i].view_flags != desc->flags) + if (view_types[i].texture_target != texture_gl->target || view_types[i].view_flags != flags) continue; if (gl_info->supported[view_types[i].extension]) return view_types[i].view_target; @@ -77,7 +79,7 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, FIXME("Extension %#x not supported.\n", view_types[i].extension); } - FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture_gl->target); + FIXME("Unhandled view flags %#x for texture target %#x.\n", flags, texture_gl->target); return texture_gl->target; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4f48687f7d..82161c9034 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5289,14 +5289,23 @@ static inline void wined3d_context_copy_bo_address(struct wined3d_context *conte dst, dst_bind_flags, src, src_bind_flags, size); } +static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, + const struct wined3d_format *srv_format) +{ + return srv_format && ((srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) + || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL))); +} + static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, - const struct wined3d_resource *resource) + const struct wined3d_resource *resource, const struct wined3d_format *srv_format) { struct wined3d_rendertarget_view * const *rts = &state->fb->render_targets[0]; + const struct wined3d_rendertarget_view *dsv; unsigned int i; if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && state->fb->depth_stencil && state->fb->depth_stencil->resource == resource) + && (dsv = state->fb->depth_stencil) && dsv->resource == resource + && wined3d_dsv_srv_conflict(dsv, srv_format)) return TRUE; if (!(resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 27a0e58a28..0b535475d0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1579,6 +1579,8 @@ enum wined3d_shader_type #define WINED3D_VIEW_BUFFER_COUNTER 0x00000004 #define WINED3D_VIEW_TEXTURE_CUBE 0x00000008 #define WINED3D_VIEW_TEXTURE_ARRAY 0x00000010 +#define WINED3D_VIEW_READ_ONLY_DEPTH 0x00000020 +#define WINED3D_VIEW_READ_ONLY_STENCIL 0x00000040 #define WINED3D_MAX_VIEWPORTS 16

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetMaterial().
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 47fdb6d9144cfaf9bb4585e7573aa57ade067a8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=47fdb6d9144cfaf9bb4585e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 30 21:34:41 2019 -0500 ddraw: Handle stateblocks in d3d_device7_SetMaterial(). 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 525dd98d78..cef865948b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5448,7 +5448,9 @@ static HRESULT d3d_device7_SetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ - wined3d_device_set_material(device->wined3d_device, (struct wined3d_material *)material); + wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material); + if (!device->recording) + wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetMaterial().
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: f64feb17bc5a477565f004e934f0f919c294bf05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f64feb17bc5a477565f004e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 30 21:34:40 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetMaterial(). 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 680c75cb0f..0aa326fad5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1717,7 +1717,9 @@ static HRESULT WINAPI d3d8_device_SetMaterial(IDirect3DDevice8 *iface, const D3D /* Note: D3DMATERIAL8 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); + wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material); + if (!device->recording) + wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); return D3D_OK;

1 0

Jacek Caban : vbscript: Support VT_EMPTY in stack_pop_bool.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: 18117ccbab3232cf0d81219a37d52837e898ab7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=18117ccbab3232cf0d81219a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 31 19:16:01 2019 +0100 vbscript: Support VT_EMPTY in stack_pop_bool. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 1 + dlls/vbscript/tests/lang.vbs | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 2b681a0677..ad6454aa57 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -374,6 +374,7 @@ static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b) *b = V_BOOL(val.v); break; case VT_NULL: + case VT_EMPTY: *b = FALSE; break; case VT_I2: diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index f7cdc92ec4..0520038a02 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -329,6 +329,14 @@ end if while false wend +if empty then + ok false, "if empty executed" +end if + +while empty + ok false, "while empty executed" +wend + x = 0 WHILE x < 3 : x = x + 1 Wend

1 0

Jacek Caban : jscript: Use _ltow_s instead of int_to_string.
by Alexandre Julliard Oct. 31, 2019

Oct. 31, 2019

Module: wine Branch: master Commit: a20555ea5f29d998f39ea35c12e052cd2a1634ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=a20555ea5f29d998f39ea35c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 31 19:00:07 2019 +0100 jscript: Use _ltow_s instead of int_to_string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 79971f7f07..bb35ed7df5 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -690,36 +690,6 @@ HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, UINT32 *ret) return hres; } -static jsstr_t *int_to_string(int i) -{ - WCHAR buf[12], *p; - BOOL neg = FALSE; - - if(!i) { - static const WCHAR zeroW[] = {'0',0}; - return jsstr_alloc(zeroW); - } - - if(i < 0) { - neg = TRUE; - i = -i; - } - - p = buf + ARRAY_SIZE(buf)-1; - *p-- = 0; - while(i) { - *p-- = i%10 + '0'; - i /= 10; - } - - if(neg) - *p = '-'; - else - p++; - - return jsstr_alloc(p); -} - HRESULT double_to_string(double n, jsstr_t **str) { static const WCHAR InfinityW[] = {'-','I','n','f','i','n','i','t','y',0}; @@ -729,7 +699,9 @@ HRESULT double_to_string(double n, jsstr_t **str) }else if(isinf(n)) { *str = jsstr_alloc(n<0 ? InfinityW : InfinityW+1); }else if(is_int32(n)) { - *str = int_to_string(n); + WCHAR buf[12]; + _ltow_s(n, buf, ARRAY_SIZE(buf), 10); + *str = jsstr_alloc(buf); }else { VARIANT strv, v; HRESULT hres;

1 0