October 2019 - Wine-commits

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

31 Oct '19

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

Andrew Eikum : advapi32: Add EventRegister and EventUnregister tests.
by Alexandre Julliard 31 Oct '19

31 Oct '19

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

Andrew Eikum : ntdll: Add missing spec file entry for EtwEventWriteString.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: 9e817f8f8b8a710c92b66f5c791f667937a9121f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e817f8f8b8a710c92b66f5c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 31 08:58:13 2019 -0500 ntdll: Add missing spec file entry for EtwEventWriteString. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 9 +++++++++ dlls/ntdll/ntdll.spec | 1 + include/evntprov.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index f12a6a157b..6722ea7d62 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -37,6 +37,7 @@ 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 ULONG (WINAPI *pEventWriteString)(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *); static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *); @@ -49,6 +50,7 @@ static void init_function_pointers(void) pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid"); pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); + pEventWriteString = (void*)GetProcAddress(hadvapi32, "EventWriteString"); pEventRegister = (void*)GetProcAddress(hadvapi32, "EventRegister"); pEventUnregister = (void*)GetProcAddress(hadvapi32, "EventUnregister"); @@ -1153,6 +1155,7 @@ static void cleanup_eventlog(void) static void test_trace_event_params(void) { + static const WCHAR emptyW[] = {0}; static const GUID test_guid = {0x57696E65, 0x0000, 0x0000, {0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x01}}; REGHANDLE reg_handle; @@ -1173,6 +1176,12 @@ static void test_trace_event_params(void) uret = pEventRegister(&test_guid, NULL, NULL, &reg_handle); ok(uret == ERROR_SUCCESS, "EventRegister gave wrong error: %#x\n", uret); + uret = pEventWriteString(0, 0, 0, emptyW); + todo_wine ok(uret == ERROR_INVALID_HANDLE, "EventWriteString gave wrong error: %#x\n", uret); + + uret = pEventWriteString(reg_handle, 0, 0, NULL); + todo_wine ok(uret == ERROR_INVALID_PARAMETER, "EventWriteString gave wrong error: %#x\n", uret); + uret = pEventUnregister(0); todo_wine ok(uret == ERROR_INVALID_HANDLE, "EventUnregister gave wrong error: %#x\n", uret); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 06811edf01..a42b4fc248 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -52,6 +52,7 @@ @ stdcall EtwEventSetInformation(int64 long ptr long) @ stdcall EtwEventUnregister(int64) @ stdcall EtwEventWrite(int64 ptr long ptr) +@ stdcall EtwEventWriteString(int64 long int64 ptr) @ stdcall EtwEventWriteTransfer(int64 ptr ptr ptr long ptr) @ stdcall EtwGetTraceEnableFlags(int64) @ stdcall EtwGetTraceEnableLevel(int64) diff --git a/include/evntprov.h b/include/evntprov.h index a49fa79d9a..a89c65fd4b 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -73,6 +73,7 @@ ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); ULONG WINAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); ULONG WINAPI EventUnregister(REGHANDLE); ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); +ULONG WINAPI EventWriteString(REGHANDLE,UCHAR,ULONGLONG,const WCHAR *); ULONG WINAPI EventWriteTransfer(REGHANDLE,PCEVENT_DESCRIPTOR,LPCGUID,LPCGUID,ULONG,PEVENT_DATA_DESCRIPTOR); #ifdef __cplusplus

1 0

Piotr Caban : msvcrt: Cleanup sprintf tests.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: d5cde6ea26fbde412aded8914507fb7a868b160f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5cde6ea26fbde412aded891… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 31 16:00:17 2019 +0100 msvcrt: Cleanup sprintf tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 806 +++++++++++---------------------------------- 1 file changed, 193 insertions(+), 613 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5cde6ea26fbde412ade…

1 0

Zebediah Figura : quartz/tests: Relax some more timeouts.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: cda738d61d43065f80797eb8ac78bfe09f8891c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda738d61d43065f80797eb8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 30 22:57:08 2019 -0500 quartz/tests: Relax some more timeouts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 2 +- dlls/quartz/tests/systemclock.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 14f2dfaa7a..4b233dbcff 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -512,7 +512,7 @@ static void test_media_event(IFilterGraph2 *graph) while (!got_eos) { - if (WaitForSingleObject(event, 2000) == WAIT_TIMEOUT) + if (WaitForSingleObject(event, 5000) == WAIT_TIMEOUT) break; while ((hr = IMediaEvent_GetEvent(media_event, &code, &lparam1, &lparam2, 0)) == S_OK) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 3c493a0f38..fa1ab6856b 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -120,8 +120,8 @@ static void test_advise(void) hr = IReferenceClock_AdviseTime(clock, current, 500 * 10000, (HEVENT)event, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(WaitForSingleObject(event, 480) == WAIT_TIMEOUT, "Event should not be signaled.\n"); - ok(!WaitForSingleObject(event, 40), "Event should be signaled.\n"); + ok(WaitForSingleObject(event, 460) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(!WaitForSingleObject(event, 80), "Event should be signaled.\n"); hr = IReferenceClock_Unadvise(clock, cookie); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -133,15 +133,15 @@ static void test_advise(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IReferenceClock_Unadvise(clock, cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(WaitForSingleObject(event, 520) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 540) == WAIT_TIMEOUT, "Event should not be signaled.\n"); ResetEvent(event); hr = IReferenceClock_GetTime(clock, &current); ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); hr = IReferenceClock_AdviseTime(clock, current + 500 * 10000, 0, (HEVENT)event, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(WaitForSingleObject(event, 480) == WAIT_TIMEOUT, "Event should not be signaled.\n"); - ok(!WaitForSingleObject(event, 40), "Event should be signaled.\n"); + ok(WaitForSingleObject(event, 460) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(!WaitForSingleObject(event, 80), "Event should be signaled.\n"); hr = IReferenceClock_GetTime(clock, &current); ok(SUCCEEDED(hr), "Got hr %#x.\n", hr);

1 0

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

31 Oct '19

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

Jacek Caban : jscript: Use _ltow_s instead of int_to_string.
by Alexandre Julliard 31 Oct '19

31 Oct '19

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

Jacek Caban : vbscript: Support VT_EMPTY in stack_pop_bool.
by Alexandre Julliard 31 Oct '19

31 Oct '19

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 : vbscript: Silence BuiltinDisp::QueryInterface(IID_IDispatchEx) warning.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: wine Branch: master Commit: ce6c9f6d338a40c4f39b6758dae6d600823da767 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce6c9f6d338a40c4f39b6758… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 31 19:16:07 2019 +0100 vbscript: Silence BuiltinDisp::QueryInterface(IID_IDispatchEx) warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 6e0dfc6938..4171df3915 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -72,7 +72,8 @@ static HRESULT WINAPI Builtin_QueryInterface(IDispatch *iface, REFIID riid, void TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IDispatch_iface; }else { - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + if(!IsEqualGUID(riid, &IID_IDispatchEx)) + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; return E_NOINTERFACE; }

1 0

Jacek Caban : vbscript/tests: Introduce get_dispid helper.
by Alexandre Julliard 31 Oct '19

31 Oct '19

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