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

[PATCH RFC 0/5] Timer Resolution
by Arkadiusz Hiler Aug. 18, 2020

Aug. 18, 2020

TL;DR: Good learning experience, lead to a fix in winmm but IMO we are better off defaulting to 1ms resolution and avoid all the extra complications. The whole thing started because of miss-assigning blame for DOSBox regression to mismatched GetTickCount() and Sleep() resolutions. Initial attempts at fixing the issue just made Sleep() work in increments of 15.6ms. Then, I have learned about timer resolution and I have started implementing this series. As soon as I had working timeBeginPeriod() DOSBox regressed again. After some confusing debugging of "phantom" calls to GetTickCount() with 1-call stacktraces and building myself and unoptimized debug version of SDL and DOSBox I have found out that, in Wine, timeGetTime() is an alias for GetTickCount() and this has caused the problem. More details here: https://www.winehq.org/pipermail/wine-devel/2020-August/171965.html I have started questioning usefulness and feasibility of implementing resolution support: - introducing extra branching for each Sleep / Wait call - multiple places to maintain (some wait calls use server_wait, other call server directly) - a lot of Sleep(1) to assess across Wine's codebase - per-process implementation may be not sufficient for some multi-process software I did testing with popular software and a lot of things set resolution: * Chrome and a lot of Electron-based apps - 1ms with multimedia content, fluctuating otherwise * Firefox - 8ms when downloading, 5ms when playing music/videos * Visual Studio - 1ms all the time * Discord - 1ms all the time while being on a voice chat * Spotify - oscillating 1-5ms when playing music * EGS - 1ms * many many games Resolution is global - if one process requests high resolution (i.e. low update interval) the whole system gets it. Conjecture: If having 1ms resolution all the time / by default would cause any noticeable problems / performance issue with software, it would be seen on Windows and loudly complained about. I think it's worth abandoning the effort to implement proper resolution setting, default to 1ms and implement more convincing stubs for timeBeginPeriod() and NtSetTimerResolution() and friends. Any thoughts? Cc: Rémi Bernon <rbernon(a)codeweavers.com> Cc: Paul Gofman <pgofman(a)codeweavers.com> Arkadiusz Hiler (5): ntdll: Implmement NtQueryTimerResolution and NtSetTimerResolution ntdll: Make wait/delay calls respect the timer resolution server: Set the worst case time for updating user_shared_data to 15ms ntdll: Remove todo_wine from tick count vs sleep test winmm: Implement timeBeginPeriod() and timeEndPeriod() dlls/ntdll/tests/time.c | 187 ++++++++++++++++++++++++++++++++- dlls/ntdll/unix/server.c | 16 ++- dlls/ntdll/unix/sync.c | 84 +++++++++++++-- dlls/ntdll/unix/unix_private.h | 10 ++ dlls/winmm/tests/timer.c | 46 +++++++- dlls/winmm/time.c | 76 +++++++++++--- server/fd.c | 2 +- 7 files changed, 396 insertions(+), 25 deletions(-) -- 2.28.0

3 11

[PATCH] winapi: Update win16.api.
by Francois Gouget Aug. 18, 2020

Aug. 18, 2020

Wine no longer has winedos16.dll and wprocs.dll and display.drv, keyboard.drv and mouse.drv have a .drv extension, not a .dll one. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/winapi/win16.api | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api index ea646c9ec8d..5e78e544dac 100644 --- a/tools/winapi/win16.api +++ b/tools/winapi/win16.api @@ -217,7 +217,7 @@ LPSTR WORD -%%display.dll +%%display.drv %long @@ -362,7 +362,7 @@ INT16 UINT16 WORD -%%keyboard.dll +%%keyboard.drv %long @@ -628,7 +628,7 @@ MMRESULT16 UINT16 WORD -%%mouse.dll +%%mouse.drv %ptr @@ -1408,12 +1408,6 @@ CONTEXT86 * void -%%winedos16.dll - -%void - -void - %%wineps16.drv %long @@ -1556,13 +1550,3 @@ HWTHOOK16 INT16 UINT16 WPARAM16 - -%%wprocs.dll - -%ptr - -CONTEXT86 * - -%void - -void -- 2.20.1

1 0

[PATCH] winapi: Remove obsolete entries from win32.api.
by Francois Gouget Aug. 18, 2020

Aug. 18, 2020

Wine no longer has d3dx8.dll, d3dxof.dll, glut32.dll, msacmmap.dll, winedos.dll, wineesd.drv, winenas.drv and winetty.drv dlls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/winapi/win32.api | 189 ----------------------------------------- 1 file changed, 189 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index ed14ecc034e..d9b77dbce39 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -924,48 +924,6 @@ LPCWSTR void -%%d3dx8.dll - -%long - -DWORD -HFONT -HRESULT -UINT - -%float - -FLOAT - -%ptr - -D3DXCOLOR * -D3DXMATRIX * -D3DXPLANE * -D3DXQUATERNION * -D3DXVECTOR2 * -D3DXVECTOR3 * -D3DXVECTOR4 * -D3DVIEWPORT8 * -FLOAT * -LPCVOID -LPD3DXBUFFER * -LPD3DXFONT * -LPD3DXMATRIXSTACK * -LPDIRECT3DDEVICE8 - -%str - -LPCSTR - -%wstr - -LPCWSTR - -%void - -void - %%d3dxof.dll %long @@ -1761,31 +1719,6 @@ char * void -%%glut32.dll - -%double - -double - -%float - -float - -%long - -int -unsigned int - -%ptr - -void (*)(int) -void * -void ** - -%void - -void - %%gphoto2.ds %long @@ -2671,16 +2604,6 @@ PHACMSTREAM PWAVEFILTER PWAVEFORMATEX -%%msacmmap.dll - -%long - -DWORD -HDRVR -LONG -UINT -WORD - %%mscms.dll %long @@ -5692,61 +5615,6 @@ IUnknown * IWineD3D * IWineD3DClipper * -%%winedos.dll - -%long - -BOOL -BYTE -DWORD -UINT -WORD -int - -%ptr - -LPVOID -UINT16 * -void * - -%str - -LPCSTR - -%void - -void - -%%wineesd.drv - -%long - -DWORD -HDRVR -LPARAM -LRESULT -UINT -WORD - -%long --pointer - -DWORD_PTR - -%%winejack.drv - -%long - -DWORD -HDRVR -LPARAM -LRESULT -UINT -WORD - -%long --pointer - -DWORD_PTR - %%winejoystick.drv %long @@ -5773,21 +5641,6 @@ UINT DWORD_PTR -%%winenas.drv - -%long - -DWORD -HDRVR -LPARAM -LRESULT -UINT -WORD - -%long --pointer - -DWORD_PTR - %%wineoss.drv %long @@ -5857,48 +5710,6 @@ void LPCWSTR -%%winetty.drv - -%long - -BOOL -COLORREF -DWORD -HANDLE -HBITMAP -HDC -HFONT -HRGN -HWND -INT -LONG -UINT - -%ptr - -BITMAPINFO * -CREATESTRUCTA * -DEVMODEW * -DWORD * -INT * -LPCVOID -LPINT -LPPALETTEENTRY -LPPOINT -LPSIZE -LPTEXTMETRICW -LPVOID -POINT * -RECT * -TTYDRV_PDEVICE * -TTYDRV_PDEVICE ** -WINDOWPOS * -void * - -%wstr - -LPCWSTR - %%winex11.drv %long -- 2.20.1

1 0

[PATCH] fsutil: Initialize ret in hardlink() (Coverity).
by Gijs Vermeulen Aug. 18, 2020

Aug. 18, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- programs/fsutil/main.c | 2 +- programs/fsutil/tests/fsutil.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c index bde07ac2df..0bc8817b88 100644 --- a/programs/fsutil/main.c +++ b/programs/fsutil/main.c @@ -97,7 +97,7 @@ static int create_hardlink(int argc, WCHAR *argv[]) static int hardlink(int argc, WCHAR *argv[]) { - int ret; + int ret = 0; if (argc > 2) { diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index 9867788274..1111b5b2fe 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -63,6 +63,12 @@ static void test_hardlink(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to create a file\n"); CloseHandle(hfile); + rc = runcmd("fsutil"); + ok(rc == 0, "failed to run fsutil\n"); + + rc = runcmd("fsutil hardlink"); + ok(rc == 0, "failed to run fsutil hardlink\n"); + rc = runcmd("fsutil hardlink create link file"); ok(rc == 0, "failed to create a hardlink\n"); -- 2.28.0

2 1

[PATCH 1/2] riched20: Implement ITextRange::MoveStart() and ITextRange::MoveEnd() for tomCharacter
by Damjan Jovanovic Aug. 17, 2020

Aug. 17, 2020

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/riched20/richole.c | 77 +++++++++++++++++++++++++-- dlls/riched20/tests/richole.c | 98 ++++++++++++++++++++++++++++++++++- 2 files changed, 169 insertions(+), 6 deletions(-)

2 2

[PATCH] ntdll: Don't transfer xmm registers explicitly during context save and restore on x64.
by Paul Gofman Aug. 17, 2020

Aug. 17, 2020

fxsave / fxrstor already do that. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 16 ---------------- dlls/ntdll/unix/signal_x86_64.c | 16 ---------------- 2 files changed, 32 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index faf24b93b58..dad4340c06c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -341,22 +341,6 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, "movq (%rsp),%rax\n\t" "movq %rax,0xf8(%rcx)\n\t" /* context->Rip */ "fxsave 0x100(%rcx)\n\t" /* context->FtlSave */ - "movdqa %xmm0,0x1a0(%rcx)\n\t" /* context->Xmm0 */ - "movdqa %xmm1,0x1b0(%rcx)\n\t" /* context->Xmm1 */ - "movdqa %xmm2,0x1c0(%rcx)\n\t" /* context->Xmm2 */ - "movdqa %xmm3,0x1d0(%rcx)\n\t" /* context->Xmm3 */ - "movdqa %xmm4,0x1e0(%rcx)\n\t" /* context->Xmm4 */ - "movdqa %xmm5,0x1f0(%rcx)\n\t" /* context->Xmm5 */ - "movdqa %xmm6,0x200(%rcx)\n\t" /* context->Xmm6 */ - "movdqa %xmm7,0x210(%rcx)\n\t" /* context->Xmm7 */ - "movdqa %xmm8,0x220(%rcx)\n\t" /* context->Xmm8 */ - "movdqa %xmm9,0x230(%rcx)\n\t" /* context->Xmm9 */ - "movdqa %xmm10,0x240(%rcx)\n\t" /* context->Xmm10 */ - "movdqa %xmm11,0x250(%rcx)\n\t" /* context->Xmm11 */ - "movdqa %xmm12,0x260(%rcx)\n\t" /* context->Xmm12 */ - "movdqa %xmm13,0x270(%rcx)\n\t" /* context->Xmm13 */ - "movdqa %xmm14,0x280(%rcx)\n\t" /* context->Xmm14 */ - "movdqa %xmm15,0x290(%rcx)\n\t" /* context->Xmm15 */ "ret" ); /****************************************************************************** diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index ecf326700e6..8e21333ba19 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1516,22 +1516,6 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, "movq 0xf8(%rdi),%rax\n\t" /* context->Rip */ "movq %rax,(%rsp)\n\t" "fxrstor 0x100(%rdi)\n\t" /* context->FtlSave */ - "movdqa 0x1a0(%rdi),%xmm0\n\t" /* context->Xmm0 */ - "movdqa 0x1b0(%rdi),%xmm1\n\t" /* context->Xmm1 */ - "movdqa 0x1c0(%rdi),%xmm2\n\t" /* context->Xmm2 */ - "movdqa 0x1d0(%rdi),%xmm3\n\t" /* context->Xmm3 */ - "movdqa 0x1e0(%rdi),%xmm4\n\t" /* context->Xmm4 */ - "movdqa 0x1f0(%rdi),%xmm5\n\t" /* context->Xmm5 */ - "movdqa 0x200(%rdi),%xmm6\n\t" /* context->Xmm6 */ - "movdqa 0x210(%rdi),%xmm7\n\t" /* context->Xmm7 */ - "movdqa 0x220(%rdi),%xmm8\n\t" /* context->Xmm8 */ - "movdqa 0x230(%rdi),%xmm9\n\t" /* context->Xmm9 */ - "movdqa 0x240(%rdi),%xmm10\n\t" /* context->Xmm10 */ - "movdqa 0x250(%rdi),%xmm11\n\t" /* context->Xmm11 */ - "movdqa 0x260(%rdi),%xmm12\n\t" /* context->Xmm12 */ - "movdqa 0x270(%rdi),%xmm13\n\t" /* context->Xmm13 */ - "movdqa 0x280(%rdi),%xmm14\n\t" /* context->Xmm14 */ - "movdqa 0x290(%rdi),%xmm15\n\t" /* context->Xmm15 */ "movq 0x78(%rdi),%rax\n\t" /* context->Rax */ "movq 0xb0(%rdi),%rdi\n\t" /* context->Rdi */ "iretq" ); -- 2.26.2

1 0

[PATCH v3] vbscript: Implement Split.
by Robert Wilhelm Aug. 17, 2020

Aug. 17, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47570 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- v3: Try to address comments from Jacek's review: Fix some corner cases, avoid memory leaks and add more tests. --- dlls/vbscript/global.c | 128 +++++++++++++++++++++++++++++++++++- dlls/vbscript/tests/api.vbs | 42 ++++++++++++ 2 files changed, 167 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 122f5c7b71..d697c63be2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2291,10 +2291,132 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V return E_NOTIMPL; } -static HRESULT Global_Split(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, string, delimeter = NULL; + int count, max, mode, len, start, end, ret, delimeterlen = 1; + SAFEARRAYBOUND bounds; + SAFEARRAY *sa = NULL; + VARIANT *data, var; + HRESULT hres = S_OK; + + TRACE("%s %u...\n", debugstr_variant(args), args_cnt); + + assert(1 <= args_cnt && args_cnt <= 4); + if(V_VT(args) != VT_BSTR) { + hres = to_string(args, &string); + if(FAILED(hres)) + return hres; + }else { + string = V_BSTR(args); + } + + if(args_cnt > 1) + { + if(V_VT(args+1) != VT_BSTR) { + hres = to_string(args+1, &delimeter); + if(FAILED(hres)) + goto error; + }else { + delimeter = V_BSTR(args+1); + } + delimeterlen = SysStringLen(delimeter); + } + + if(args_cnt > 2) { + hres = to_int(args+2, &max); + if(FAILED(hres)) + goto error;; + }else { + max = -1; + } + + if(args_cnt == 4) { + hres = to_int(args+3, &mode); + if(FAILED(hres)) + goto error; + if (mode != 0 && mode != 1) { + FIXME("unknown compare mode = %d\n", mode); + hres = E_FAIL; + goto error; + } + } + else { + mode = 0; + } + + start = 0; + bounds.lLbound = 0; + bounds.cElements = 0; + sa = SafeArrayCreate( VT_VARIANT, 1, &bounds); + if (!sa) + { + hres = E_OUTOFMEMORY; + goto error; + } + len = SysStringLen(string); + count = 0; + + while(1) { + ret = -1; + if (delimeterlen) { + ret = FindStringOrdinal(FIND_FROMSTART, string + start, len -start, + delimeter ? delimeter : L" ", delimeterlen, mode); + } + + if (ret == -1) { + end = len; + } + else { + end = start + ret; + } + + if (end-start) { + str = SysAllocStringLen(string + start, end - start); + if (!str) { + hres = E_OUTOFMEMORY; + break; + } + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = str; + bounds.cElements++; + SafeArrayRedim(sa, &bounds); + hres = SafeArrayAccessData(sa, (void**)&data); + if(FAILED(hres)) { + SafeArrayDestroy(sa); + break; + } + + hres = VariantCopyInd(data+count, &var); + if(FAILED(hres)) { + SafeArrayUnaccessData(sa); + SafeArrayDestroy(sa); + break; + } + + SafeArrayUnaccessData(sa); + count++; + } + + if (ret == -1) break; + start = start + ret + delimeterlen; + if (count == max) break; + if (start >= len) break; + } + +error: + if(res) { + V_VT(res) = VT_ARRAY|VT_VARIANT; + V_ARRAY(res) = sa; + }else { + if (sa) SafeArrayDestroy(sa); + } + + if(V_VT(args) != VT_BSTR) + SysFreeString(string); + if(V_VT(args+1) != VT_BSTR) + SysFreeString(delimeter); + return hres; } static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 6af49c849d..440c2e38d5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -609,6 +609,48 @@ TestLCase 0.123, doubleAsString(0.123) TestLCase Empty, "" Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " & getVT(LCase(Null))) +x = Split("abc") +Call ok(x(0) = "abc", "Split returned " & x(0)) +x = Split("abc def") +Call ok(x(0) = "abc", "Split returned " & x(0)) +Call ok(x(1) = "def", "Split returned " & x(1)) +x = Split("abc def ghi") +Call ok(x(0) = "abc", "Split returned " & x(0)) +Call ok(x(1) = "def", "Split returned " & x(1)) +Call ok(x(2) = "ghi", "Split returned " & x(2)) +x = Split("abc def","") +Call ok(x(0) = "abc def", "Split returned " & x(0)) +x = Split("abc-def","-") +Call ok(x(0) = "abc", "Split returned " & x(0)) +Call ok(x(1) = "def", "Split returned " & x(1)) +x = Split("abc--def","-") +Call ok(x(0) = "abc", "Split returned " & x(0)) +Call ok(x(1) = "def", "Split returned " & x(1)) +x = Split("abcdefghi","def") +Call ok(x(0) = "abc", "Split returned " & x(0)) +Call ok(x(1) = "ghi", "Split returned " & x(1)) +x = Split("12345",3) +Call ok(x(0) = "12", "Split returned " & x(0)) +Call ok(x(1) = "45", "Split returned " & x(1)) +x = Split("12345",5) +Call ok(x(0) = "1234", "Split returned " & x(0)) +Call ok(UBound(x) = 0, "Split returned " & UBound(x)) +x = Split("12345",12) +Call ok(x(0) = "345", "Split returned " & x(0)) +Call ok(UBound(x) = 0, "Split returned " & UBound(x)) +x = Split("abc-def-ghi","-") +Call ok(UBound(x) = 2, "Split returned " & UBound(x)) +x = Split("abc-def-ghi","-",2) +Call ok(UBound(x) = 1, "Split returned " & UBound(x)) +x = Split("abc-def-ghi","-",4) +Call ok(UBound(x) = 2, "Split returned " & UBound(x)) +x = Split("abcZdefZghi","Z",3,0) +Call ok(UBound(x) = 2, "Split returned " & UBound(x)) +x = Split("abcZdefZghi","z",3,0) +Call ok(UBound(x) = 0, "Split returned " & UBound(x)) +x = Split("abcZdefZghi","z",3,1) +Call ok(UBound(x) = 2, "Split returned " & UBound(x)) + Sub TestStrComp(str_left, str_right, mode, ex) x = StrComp(str_left, str_right, mode) Call ok(x = ex, "StrComp(" & str_left & ", " & str_right & ", " & mode & ") = " & x & " expected " & ex) -- 2.26.2

2 1

[PATCH v2 3/3] windowscodecs/tests: Add tests for decoding BC1 format.
by Ziqing Hui Aug. 17, 2020

Aug. 17, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 104 +++++++++++++++++++++++++++ 1 file changed, 104 insertions(+)

2 1

[PATCH v2 2/3] windowscodecs: Add tests and initial implementation for DdsFrameDecode_CopyPixels().
by Ziqing Hui Aug. 17, 2020

Aug. 17, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: (The differences are done in PATCH 1) * Use CreateComponentInfo() directly in get_pixel_format_bpp(). * Add a pixel_format_bpp member in dds_frame_info. dlls/windowscodecs/ddsformat.c | 31 +++++++++- dlls/windowscodecs/tests/ddsformat.c | 91 ++++++++++++++++++++++++++-- 2 files changed, 115 insertions(+), 7 deletions(-)

2 1

[PATCH v2 1/3] windowscodecs: Introduce get_pixel_format_bpp().
by Ziqing Hui Aug. 17, 2020

Aug. 17, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: This is a new patch in our patch set. dlls/windowscodecs/ddsformat.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)

2 1