August 2020 - Wine-Devel - list.winehq.org

[PATCH 1/3] include: Add xact2wb.h
by Vijay Kiran Kamuju Aug. 12, 2020

Aug. 12, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] ntdll/tests: Fix w2008 debugger test results.
by Rémi Bernon Aug. 12, 2020

Aug. 12, 2020

Changing Eip has an effect there, so offset it just a little bit so that it still falls within code. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 51 ++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7ee191469ec..0efe1898914 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -376,14 +376,16 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { ok(context->Eip == (DWORD)code_mem + 0xa || - broken(context->Eip == (DWORD)code_mem + 0xb), /* win2k3 */ + broken(context->Eip == (DWORD)code_mem + 0xb) /* win2k3 */ || + broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, "Eip at %x instead of %x or %x\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); } else { - ok(context->Eip == (DWORD)code_mem + 0xb, "Eip at %x instead of %x\n", - context->Eip, (DWORD)code_mem + 0xb); + ok(context->Eip == (DWORD)code_mem + 0xb || + broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, + "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xb); } /* test if context change is preserved from vectored handler to stack handlers */ @@ -411,14 +413,16 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { ok(context->Eip == (DWORD)code_mem + 0xa || - broken(context->Eip == (DWORD)code_mem + 0xb), /* win2k3 */ + broken(context->Eip == (DWORD)code_mem + 0xb) /* win2k3 */ || + broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, "Eip at %x instead of %x or %x\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); } else { - ok(context->Eip == (DWORD)code_mem + 0xb, "Eip at %x instead of %x\n", - context->Eip, (DWORD)code_mem + 0xb); + ok(context->Eip == (DWORD)code_mem + 0xb || + broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, + "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xb); } if(have_vectored_api) @@ -1045,8 +1049,8 @@ static void test_debugger(void) ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at %x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Eip = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Eip = (UINT_PTR)code_mem_address + 0xd; ctx.Eax = 0xf00f00f1; /* let the debuggee handle the exception */ continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -1058,7 +1062,7 @@ static void test_debugger(void) /* debugger gets first chance exception with unmodified ctx.Eip */ ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at 0x%x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xb); - ctx.Eip = 0x12345; + ctx.Eip = (UINT_PTR)code_mem_address + 0xd; ctx.Eax = 0xf00f00f1; /* pass exception to debuggee * exception will not be handled and a second chance exception will be raised */ @@ -1071,7 +1075,8 @@ static void test_debugger(void) if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) { ok((char *)ctx.Eip == (char *)code_mem_address + 0xa || - broken(is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb), + broken(is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb) || + broken((char *)ctx.Eip == (char *)code_mem_address + 0xd) /* w2008 */, "Eip at 0x%x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xa); /* need to fixup Eip for debuggee */ @@ -1079,8 +1084,10 @@ static void test_debugger(void) ctx.Eip += 1; } else - ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at 0x%x instead of %p\n", - ctx.Eip, (char *)code_mem_address + 0xb); + ok((char *)ctx.Eip == (char *)code_mem_address + 0xb || + broken((char *)ctx.Eip == (char *)code_mem_address + 0xd) /* w2008 */, + "Eip at 0x%x instead of %p\n", + ctx.Eip, (char *)code_mem_address + 0xb); /* here we handle exception */ } } @@ -2933,8 +2940,8 @@ static void test_debugger(void) ok((char *)ctx.Rip == (char *)code_mem_address + 0xb, "Rip at %p instead of %p\n", (char *)ctx.Rip, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Rip = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Rip = (UINT_PTR)code_mem_address + 0xd; ctx.Rax = 0xf00f00f1; /* let the debuggee handle the exception */ continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -2946,8 +2953,8 @@ static void test_debugger(void) ok((char *)ctx.Rip == (char *)code_mem_address + 0xb, "Rip at %p instead of %p\n", (char *)ctx.Rip, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Rip = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Rip = (UINT_PTR)code_mem_address + 0xd; ctx.Rax = 0xf00f00f1; /* pass exception to debuggee * exception will not be handled and a second chance exception will be raised */ @@ -3732,8 +3739,8 @@ static void test_debugger(void) ok((char *)ctx.Pc == (char *)code_mem_address + 0xb, "Pc at %x instead of %p\n", ctx.Pc, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Pc = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Pc = (UINT_PTR)code_mem_address + 0xd; ctx.R0 = 0xf00f00f1; /* let the debuggee handle the exception */ continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -3745,7 +3752,7 @@ static void test_debugger(void) /* debugger gets first chance exception with unmodified ctx.Pc */ ok((char *)ctx.Pc == (char *)code_mem_address + 0xb, "Pc at 0x%x instead of %p\n", ctx.Pc, (char *)code_mem_address + 0xb); - ctx.Pc = 0x12345; + ctx.Pc = (UINT_PTR)code_mem_address + 0xd; ctx.R0 = 0xf00f00f1; /* pass exception to debuggee * exception will not be handled and a second chance exception will be raised */ @@ -4110,8 +4117,8 @@ static void test_debugger(void) ok((char *)ctx.Pc == (char *)code_mem_address + 0xb, "Pc at %p instead of %p\n", (char *)ctx.Pc, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the - * exception handler gets */ - ctx.Pc = 0x12345; + * exception handler gets, except on w2008 */ + ctx.Pc = (UINT_PTR)code_mem_address + 0xd; ctx.X0 = 0xf00f00f1; /* let the debuggee handle the exception */ continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -4123,7 +4130,7 @@ static void test_debugger(void) /* debugger gets first chance exception with unmodified ctx.Pc */ ok((char *)ctx.Pc == (char *)code_mem_address + 0xb, "Pc at %p instead of %p\n", (char *)ctx.Pc, (char *)code_mem_address + 0xb); - ctx.Pc = 0x12345; + ctx.Pc = (UINT_PTR)code_mem_address + 0xd; ctx.X0 = 0xf00f00f1; /* pass exception to debuggee * exception will not be handled and a second chance exception will be raised */ -- 2.28.0

2 3

[PATCH v2] xactengine3_7: Initial IXACT3Engine tests
by Alistair Leslie-Hughes Aug. 11, 2020

Aug. 11, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/tests/Makefile.in | 5 ++ dlls/xactengine3_7/tests/xact3.c | 100 +++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 dlls/xactengine3_7/tests/Makefile.in create mode 100644 dlls/xactengine3_7/tests/xact3.c diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in new file mode 100644 index 0000000000..c32b256254 --- /dev/null +++ b/dlls/xactengine3_7/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = xactengine3_7.dll +IMPORTS = ole32 + +C_SRCS = \ + xact3.c diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c new file mode 100644 index 0000000000..9b0d3defb0 --- /dev/null +++ b/dlls/xactengine3_7/tests/xact3.c @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <math.h> +#include <limits.h> +#include <float.h> + +#define COBJMACROS +#include "wine/test.h" + +#include "x3daudio.h" + +#include "initguid.h" +#include "xact3.h" + +DEFINE_GUID(IID_IXACT3Engine30, 0x9e33f661, 0x2d07, 0x43ec, 0x97, 0x04, 0xbb, 0xcb, 0x71, 0xa5, 0x49, 0x72); +DEFINE_GUID(IID_IXACT3Engine31, 0xe72c1b9a, 0xd717, 0x41c0, 0x81, 0xa6, 0x50, 0xeb, 0x56, 0xe8, 0x06, 0x49); + +DEFINE_GUID(CLSID_XACTEngine30, 0x3b80ee2a, 0xb0f5, 0x4780, 0x9e, 0x30, 0x90, 0xcb, 0x39, 0x68, 0x5b, 0x03); +DEFINE_GUID(CLSID_XACTEngine31, 0x962f5027, 0x99be, 0x4692, 0xa4, 0x68, 0x85, 0x80, 0x2c, 0xf8, 0xde, 0x61); +DEFINE_GUID(CLSID_XACTEngine32, 0xd3332f02, 0x3dd0, 0x4de9, 0x9a, 0xec, 0x20, 0xd8, 0x5c, 0x41, 0x11, 0xb6); +DEFINE_GUID(CLSID_XACTEngine33, 0x94c1affa, 0x66e7, 0x4961, 0x95, 0x21, 0xcf, 0xde, 0xf3, 0x12, 0x8d, 0x4f); +DEFINE_GUID(CLSID_XACTEngine34, 0x0977d092, 0x2d95, 0x4e43, 0x8d, 0x42, 0x9d, 0xdc, 0xc2, 0x54, 0x5e, 0xd5); +DEFINE_GUID(CLSID_XACTEngine35, 0x074b110f, 0x7f58, 0x4743, 0xae, 0xa5, 0x12, 0xf1, 0x5b, 0x50, 0x74, 0xed); +DEFINE_GUID(CLSID_XACTEngine36, 0x248d8a3b, 0x6256, 0x44d3, 0xa0, 0x18, 0x2a, 0xc9, 0x6c, 0x45, 0x9f, 0x47); + +struct xact_interfaces +{ + REFGUID clsid; + REFIID iid; + HRESULT expected; +} xact_interfaces[] = +{ + {&CLSID_XACTEngine30, &IID_IXACT3Engine30, S_OK }, + {&CLSID_XACTEngine30, &IID_IXACT3Engine31, E_NOINTERFACE}, + {&CLSID_XACTEngine30, &IID_IXACT3Engine, E_NOINTERFACE }, + + /* Version 3.1 to 3.4 use the same inteface */ + {&CLSID_XACTEngine31, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine32, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine33, &IID_IXACT3Engine31, S_OK }, + {&CLSID_XACTEngine34, &IID_IXACT3Engine31, S_OK }, + + /* Version 3.5 to 3.7 use the same inteface */ + {&CLSID_XACTEngine35, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine35, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine36, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine36, &IID_IXACT3Engine, S_OK }, + + {&CLSID_XACTEngine, &IID_IXACT3Engine31, E_NOINTERFACE }, + {&CLSID_XACTEngine, &IID_IXACT3Engine, S_OK }, + {&CLSID_XACTEngine, &IID_IUnknown, S_OK }, +}; + +static void test_interfaces(void) +{ + IUnknown *unk; + HRESULT hr; + int i; + + for (i = 0; i < ARRAY_SIZE(xact_interfaces); i++) + { + hr = CoCreateInstance(xact_interfaces[i].clsid, NULL, CLSCTX_INPROC_SERVER, + xact_interfaces[i].iid, (void**)&unk); + if (hr == REGDB_E_CLASSNOTREG) + { + trace("%d %s not registered. Skipping\n", i, wine_dbgstr_guid(xact_interfaces[i].clsid) ); + continue; + } + ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08x\n", i, hr); + if (hr == S_OK) + IUnknown_Release(unk); + } +} + +START_TEST(xact3) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +} -- 2.28.0

2 1

[PATCH 1/2] gdiplus/tests: Add metafile null frame rect GDI/GDI+ interop test case.
by Shawn M. Chapla Aug. 11, 2020

Aug. 11, 2020

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/metafile.c | 58 +++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 47978d64d8b..e047c9a4212 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1374,6 +1374,64 @@ static void test_nullframerect(void) { stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, NULL, MetafileFrameUnitMillimeter, + description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &metafile_dc); + expect(Ok, stat); + + if (stat != Ok) + { + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)metafile); + return; + } + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(metafile_dc, hbrush); + + Rectangle(metafile_dc, 25, 25, 75, 75); + + SelectObject(metafile_dc, holdbrush); + + DeleteObject(hbrush); + + stat = GdipReleaseDC(graphics, metafile_dc); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 20, 40, 10, 70); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); + expect(Ok, stat); + expect(UnitPixel, unit); + todo_wine expectf_(20.0, bounds.X, 0.05); + todo_wine expectf_(25.0, bounds.Y, 0.05); + todo_wine expectf_(55.0, bounds.Width, 1.00); + todo_wine expectf_(55.0, bounds.Width, 0.05); + todo_wine expectf_(85.0, bounds.Height, 0.05); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); } static const emfplus_record pagetransform_records[] = { -- 2.28.0

2 3

[PATCH 4/4] kernel32/tests: Add console title tests.
by Jacek Caban Aug. 11, 2020

Aug. 11, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)

2 1

[PATCH 3/4] kernel32/tests: Add an option to test current console.
by Jacek Caban Aug. 11, 2020

Aug. 11, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 136 ++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 65 deletions(-)

2 1

[PATCH 2/4] kernel32/tests: Disable ENABLE_VIRTUAL_TERMINAL_PROCESSING mode in testWriteNotWrappedProcessed.
by Jacek Caban Aug. 11, 2020

Aug. 11, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

2 1

Implementing NtSetTimerResolution() and timeBeginPeriod()
by Arkadiusz Hiler Aug. 11, 2020

Aug. 11, 2020

On Windows NtDelayExecution() has the default resolution of 15.625 ms. This can be changed system-wide by NtSetTimerResolution() or timeBeginPeriod(). Each process's preference is stored in EPROCESS and the global resolution is the min(all_of_them). This gets updated each time a process exits or sets a new value. In Wine NtDelayExecution() has the resolution of select(), which is sub 1ms. Recently GetTickCount() was changed to use user_shared_data and has the update interval of 16ms - this is now (almost) the same as on Windows. The Sleep()/GetTickCount() misalignment seems to be root cause of https://bugs.winehq.org/show_bug.cgi?id=49564. I would like to implement timer resolution support, but since I am new to the project it's better to ask you folks first :-) Implementation plan: 1. Change max tick update interval to 15.625ms or as close as possible, err on the shorter side. 2. Introduce per-process timer resolution. 2. Make changes to NtDelayExecution() so it waits in multiples of process's timer resolution. 3. Implement NtQueryTimerResolution(), and NtSetTimerResolution() that sets (2nd arg = TRUE) and resets (2nd arg = FALSE) the per-process timer resoltuion with similar min, max and rounding behaviors as on Windows. 4. Implement timeBeginPeriod() and timeEndPeriod() (they will keep track of matching calls and use NtSetTimerResolution() internally). 5. Check if other "wait" calls use timer resolution - give them treatment from step 2. 6. If we ever find software that depends on timer resolution being global, then we can make NtSetTimerResolution() do a wineserver call. Requested resolution would be kept in a per-process structure. The effective timer resolution can be exposed via unused part of user_shared_data and updated each NtSetTimerResolution() call or if any process exits. Thoughts? -- Cheers, Arek

1 0

[PATCH 1/4] include: Add missing console mode defines.
by Jacek Caban Aug. 11, 2020

Aug. 11, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/consoleapi.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)

1 0

[PATCH 1/4] dwmapi: Improve DwmGetWindowAttribute stub.
by Gabriel Ivăncescu Aug. 11, 2020

Aug. 11, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/dwmapi/dwmapi_main.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 8408a2e..3f48691 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -208,9 +208,33 @@ BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, */ HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attribute, DWORD size) { - FIXME("(%p %d %p %d) stub\n", hwnd, attribute, pv_attribute, size); + TRACE("(%p %d %p %d)\n", hwnd, attribute, pv_attribute, size); - return E_NOTIMPL; + if (!hwnd) return E_HANDLE; + if (!pv_attribute) return E_INVALIDARG; + + switch (attribute) + { + case DWMWA_NCRENDERING_ENABLED: + if (size < sizeof(BOOL)) return E_INVALIDARG; + + WARN("DWMWA_NCRENDERING_ENABLED: always returning FALSE.\n"); + *(BOOL*)(pv_attribute) = FALSE; + break; + + case DWMWA_CLOAKED: + if (size < sizeof(DWORD)) return E_INVALIDARG; + + FIXME("DWMWA_CLOAKED: always returning 0.\n"); + *(DWORD*)(pv_attribute) = 0; + break; + + default: + FIXME("unimplemented attribute %d, size %u, for hwnd %p.\n", attribute, size, hwnd); + return E_INVALIDARG; + } + + return S_OK; } /********************************************************************** -- 2.21.0

1 3