June 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Avoid sign conversion warnings in Thumb-2 relocation processing.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: aff5e8fb75ac938844c9995402047c82600f18e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aff5e8fb75ac938844c99954… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 17:20:02 2021 +0100 ntdll: Avoid sign conversion warnings in Thumb-2 relocation processing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d89b304eb703a7eb0eefb3b759497a7747f5cc6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/loader.c | 53 +++++++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3f43062f9f8..1f8e6c24400 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2889,41 +2889,26 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count #elif defined(__arm__) case IMAGE_REL_BASED_THUMB_MOV32: { - DWORD inst = *(INT_PTR *)((char *)page + offset); - DWORD imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); - DWORD hi_delta; - - if ((inst & 0x8000fbf0) != 0x0000f240) - ERR("wrong Thumb2 instruction %08x, expected MOVW\n", inst); - - imm16 += LOWORD(delta); - hi_delta = HIWORD(delta) + HIWORD(imm16); - *(INT_PTR *)((char *)page + offset) = (inst & 0x8f00fbf0) + ((imm16 >> 1) & 0x0400) + - ((imm16 >> 12) & 0x000f) + - ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0xff0000); - - if (hi_delta != 0) - { - inst = *(INT_PTR *)((char *)page + offset + 4); - imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); - - if ((inst & 0x8000fbf0) != 0x0000f2c0) - ERR("wrong Thumb2 instruction %08x, expected MOVT\n", inst); - - imm16 += hi_delta; - if (imm16 > 0xffff) - ERR("resulting immediate value won't fit: %08x\n", imm16); - *(INT_PTR *)((char *)page + offset + 4) = (inst & 0x8f00fbf0) + - ((imm16 >> 1) & 0x0400) + - ((imm16 >> 12) & 0x000f) + - ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0xff0000); - } - } + DWORD *inst = (DWORD *)((char *)page + offset); + WORD lo = ((inst[0] << 1) & 0x0800) + ((inst[0] << 12) & 0xf000) + + ((inst[0] >> 20) & 0x0700) + ((inst[0] >> 16) & 0x00ff); + WORD hi = ((inst[1] << 1) & 0x0800) + ((inst[1] << 12) & 0xf000) + + ((inst[1] >> 20) & 0x0700) + ((inst[1] >> 16) & 0x00ff); + DWORD imm = MAKELONG( lo, hi ) + delta; + + lo = LOWORD( imm ); + hi = HIWORD( imm ); + + if ((inst[0] & 0x8000fbf0) != 0x0000f240 || (inst[1] & 0x8000fbf0) != 0x0000f2c0) + ERR("wrong Thumb2 instruction @%p %08x:%08x, expected MOVW/MOVT\n", + inst, inst[0], inst[1] ); + + inst[0] = (inst[0] & 0x8f00fbf0) + ((lo >> 1) & 0x0400) + ((lo >> 12) & 0x000f) + + ((lo << 20) & 0x70000000) + ((lo << 16) & 0xff0000); + inst[1] = (inst[1] & 0x8f00fbf0) + ((hi >> 1) & 0x0400) + ((hi >> 12) & 0x000f) + + ((hi << 20) & 0x70000000) + ((hi << 16) & 0xff0000); break; + } #endif default: FIXME("Unknown/unsupported fixup type %x.\n", type);

1 0

Matteo Bruni : wined3d: Use VK_FORMAT_D24_UNORM_S8_UINT when available.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 43e4f4b81e0f54709aa11fe57a7dce3e15f7718a URL: https://source.winehq.org/git/wine.git/?a=commit;h=43e4f4b81e0f54709aa11fe5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 10 20:50:15 2021 +0100 wined3d: Use VK_FORMAT_D24_UNORM_S8_UINT when available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50123 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e4bc4df09f414ee44b293f942015e6e20a58c0f8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/utils.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3974eeb1fcc..58f214b51ca 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4142,7 +4142,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_X32_TYPELESS_G8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, - {WINED3DFMT_D24_UNORM_S8_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, + {WINED3DFMT_D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties; @@ -4177,6 +4177,17 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, format->f.color_fixup = COLOR_FIXUP_IDENTITY; VK_CALL(vkGetPhysicalDeviceFormatProperties(vk_physical_device, vk_format, &properties)); + if (vk_format == VK_FORMAT_D24_UNORM_S8_UINT) + { + if (~properties.optimalTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) + { + /* AMD doesn't support VK_FORMAT_D24_UNORM_S8_UINT. */ + WARN("Mapping VK_FORMAT_D24_UNORM_S8_UINT to VK_FORMAT_D32_SFLOAT_S8_UINT.\n"); + + format->vk_format = vk_format = VK_FORMAT_D32_SFLOAT_S8_UINT; + VK_CALL(vkGetPhysicalDeviceFormatProperties(vk_physical_device, vk_format, &properties)); + } + } if (properties.bufferFeatures & VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT) format->f.flags[WINED3D_GL_RES_TYPE_BUFFER] |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE;

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Implement IOleObject::GetMiscStatus function.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: b4031162439374a9e6f355dbe0afb24b559b6422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4031162439374a9e6f355db… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Feb 6 10:16:24 2021 +0100 dhtmled.ocx: Implement IOleObject::GetMiscStatus function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50620 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2c2987bcef21c08aacaba95af76ef381e0907e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dhtmled.ocx/Makefile.in | 2 +- dlls/dhtmled.ocx/edit.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in index c483de93a05..0a890a57d44 100644 --- a/dlls/dhtmled.ocx/Makefile.in +++ b/dlls/dhtmled.ocx/Makefile.in @@ -1,5 +1,5 @@ MODULE = dhtmled.ocx -IMPORTS = uuid +IMPORTS = uuid ole32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 874b6554e59..dfa300b9590 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -737,9 +737,9 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ad static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD aspect, DWORD *status) { DHTMLEditImpl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%u, %p) stub\n", This, aspect, status); - *status = 0; - return E_NOTIMPL; + TRACE("(%p)->(%u, %p)\n", This, aspect, status); + + return OleRegGetMiscStatus(&CLSID_DHTMLEdit, aspect, status); } static HRESULT WINAPI OleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *palette)

1 0

Jacek Caban : conhost: Avoid assumption about the exact Unix cursor position after writing to the last column.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: a4ac7faab9effb60f9d5ec5bb8c8df149ea2cad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ac7faab9effb60f9d5ec5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 16 20:32:33 2021 +0100 conhost: Avoid assumption about the exact Unix cursor position after writing to the last column. Spotted by Roman Pišl. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50581 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9e97f3513eeea8da96654e9843579461649c3597) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/conhost/conhost.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index dd22636be6a..fbee37d9c01 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -195,6 +195,14 @@ static void set_tty_cursor( struct console *console, unsigned int x, unsigned in else if (!x && y == console->tty_cursor_y) strcpy( buf, "\r" ); else if (y == console->tty_cursor_y) { + if (console->is_unix && console->tty_cursor_x >= console->active->width) + { + /* Unix will usually have the cursor at width-1 in this case. instead of depending + * on the exact behaviour, move the cursor to the first column and move forward + * from threre. */ + tty_write( console, "\r", 1 ); + console->tty_cursor_x = 0; + } if (x + 1 == console->tty_cursor_x) strcpy( buf, "\b" ); else if (x > console->tty_cursor_x) sprintf( buf, "\x1b[%uC", x - console->tty_cursor_x ); else sprintf( buf, "\x1b[%uD", console->tty_cursor_x - x );

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for calling QueueUserAPC() on a terminated thread.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 015f3167d8bf3319e0b619379841b94093c0e788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=015f3167d8bf3319e0b61937… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 3 12:27:44 2021 +0300 kernel32/tests: Add a test for calling QueueUserAPC() on a terminated thread. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 816b588e0438f94a3769612739abc9d8d9980537) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/sync.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 2a47abf342c..7d6ac030299 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -21,6 +21,9 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winternl.h> @@ -60,6 +63,7 @@ static PSLIST_ENTRY (__fastcall *pRtlInterlockedPushListSList)(PSLIST_HEADER lis PSLIST_ENTRY last, ULONG count); static PSLIST_ENTRY (WINAPI *pRtlInterlockedPushListSListEx)(PSLIST_HEADER list, PSLIST_ENTRY first, PSLIST_ENTRY last, ULONG count); +static NTSTATUS (WINAPI *pNtQueueApcThread)(HANDLE,PNTAPCFUNC,ULONG_PTR,ULONG_PTR,ULONG_PTR); #ifdef __i386__ @@ -2702,6 +2706,49 @@ static void test_crit_section(void) ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); } +static DWORD WINAPI thread_proc(LPVOID unused) +{ + Sleep(INFINITE); + return 0; +} + +static void CALLBACK user_apc(ULONG_PTR unused) +{ +} + +static void CALLBACK call_user_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3) +{ + PAPCFUNC func = (PAPCFUNC)arg1; + func(arg2); +} + +static void test_QueueUserAPC(void) +{ + HANDLE thread; + DWORD tid, ret; + + thread = CreateThread(NULL, 0, thread_proc, NULL, CREATE_SUSPENDED, &tid); + ok(thread != NULL, "CreateThread error %u\n", GetLastError()); + + ret = TerminateThread(thread, 0xdeadbeef); + ok(ret, "TerminateThread error %u\n", GetLastError()); + + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "got %u\n", ret); + + ret = pNtQueueApcThread(thread, call_user_apc, (ULONG_PTR)user_apc, 0, 0); +todo_wine + ok(ret == STATUS_UNSUCCESSFUL, "got %#x\n", ret); + + SetLastError(0xdeadbeef); + ret = QueueUserAPC(user_apc, thread, 0); + ok(!ret, "QueueUserAPC should fail\n"); +todo_wine + ok(GetLastError() == ERROR_GEN_FAILURE, "got %u\n", GetLastError()); + + CloseHandle(thread); +} + START_TEST(sync) { char **argv; @@ -2732,6 +2779,7 @@ START_TEST(sync) pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); pRtlInterlockedPushListSList = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSList"); pRtlInterlockedPushListSListEx = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSListEx"); + pNtQueueApcThread = (void *)GetProcAddress(hntdll, "NtQueueApcThread"); argc = winetest_get_mainargs( &argv ); if (argc >= 3) @@ -2744,6 +2792,8 @@ START_TEST(sync) } init_fastcall_thunk(); + + test_QueueUserAPC(); test_signalandwait(); test_mutex(); test_slist();

1 0

Dmitry Timoshkov : server: Set error to STATUS_UNSUCCESSFUL when the server fails to queue APC for a thread.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: b66571e730e137d3989737542b5971cc9112adf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b66571e730e137d398973754… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 3 12:27:47 2021 +0300 server: Set error to STATUS_UNSUCCESSFUL when the server fails to queue APC for a thread. I've left another case of returning STATUS_PROCESS_IS_TERMINATING since that's not covered by the tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50704 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 050dc49b3850a9cf807d995c2c8e8c3f244b9f11) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/sync.c | 2 -- server/thread.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 7d6ac030299..f1c5f01fa84 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2737,13 +2737,11 @@ static void test_QueueUserAPC(void) ok(ret == WAIT_OBJECT_0, "got %u\n", ret); ret = pNtQueueApcThread(thread, call_user_apc, (ULONG_PTR)user_apc, 0, 0); -todo_wine ok(ret == STATUS_UNSUCCESSFUL, "got %#x\n", ret); SetLastError(0xdeadbeef); ret = QueueUserAPC(user_apc, thread, 0); ok(!ret, "QueueUserAPC should fail\n"); -todo_wine ok(GetLastError() == ERROR_GEN_FAILURE, "got %u\n", GetLastError()); CloseHandle(thread); diff --git a/server/thread.c b/server/thread.c index 942a8ff8389..1e32ef8e1fc 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1750,7 +1750,7 @@ DECL_HANDLER(queue_apc) if (thread) { - if (!queue_apc( NULL, thread, apc )) set_error( STATUS_THREAD_IS_TERMINATING ); + if (!queue_apc( NULL, thread, apc )) set_error( STATUS_UNSUCCESSFUL ); release_object( thread ); } else if (process)

1 0

Bernhard Kölbl : msvcrt: Update source pointer in wcsrtombs in C locale.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 3224e39044106b56dfbc197ccfeeab65ba853080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3224e39044106b56dfbc197c… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 2 12:09:32 2021 +0100 msvcrt: Update source pointer in wcsrtombs in C locale. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50698 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3dca00f1dd7e8ff1abe0a15af3365b4f7c7ae042) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/string.c | 16 ++++++++++++++++ dlls/msvcrt/wcs.c | 3 +++ 2 files changed, 19 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4d61cff11c0..dbc93dc93f5 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2094,6 +2094,22 @@ static void test_mbstowcs(void) ok(ret == 0, "wcstombs did not return 0, got %d\n", (int)ret); ok(!mOut[0], "mOut = %s\n", mOut); + if(pwcsrtombs) { + pwstr = wSimple; + err = -3; + ret = pwcsrtombs(mOut, &pwstr, 4, &err); + ok(ret == 4, "wcsrtombs did not return 4\n"); + ok(err == 0, "err = %d\n", err); + ok(pwstr == wSimple+4, "pwstr = %p (wszSimple = %p)\n", pwstr, wSimple); + ok(!memcmp(mOut, mSimple, ret), "mOut = %s\n", mOut); + + pwstr = wSimple; + ret = pwcsrtombs(mOut, &pwstr, 5, NULL); + ok(ret == 4, "wcsrtombs did not return 4\n"); + ok(pwstr == NULL, "pwstr != NULL\n"); + ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); + } + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { win_skip("Japanese_Japan.932 locale not available\n"); return; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9a30e0fe149..343dec70477 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -610,6 +610,9 @@ static size_t wcsrtombs_l(char *mbstr, const wchar_t **wcstr, mbstr[i] = (*wcstr)[i]; if(!(*wcstr)[i]) break; } + + if(i < count) *wcstr = NULL; + else *wcstr += i; return i; }

1 0

Roman Pišl : cmd: Fix handling of brackets in if-set expressions on a single line.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 780b202907eb4de575b7772b73db1580fa463f92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=780b202907eb4de575b7772b… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 8 19:06:44 2021 +0100 cmd: Fix handling of brackets in if-set expressions on a single line. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50642 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2d6b0b67d91b6433744ec859b10b8ee8eb4a37b3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ programs/cmd/wcmdmain.c | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4019c51ba73..7cd806c3d54 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1246,6 +1246,11 @@ echo ------------ Testing if/for ------------ if ""=="" for %%i in (A) DO (echo %%i) if not ""=="" for %%i in (B) DO (echo %%i) +echo ------------ Testing if/set ------------ +set x=C:\Program Files (x86) +if ""=="" set y=%x%\dummy +echo %y% + echo ------------ Testing for ------------ echo --- plain FOR for %%i in (A B C) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 129e5313d90..bf5fcddeb9d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -916,6 +916,8 @@ x(a)space@ --- ------------ Testing if/for ------------ A +------------ Testing if/set ------------ +C:\Program Files (x86)\dummy ------------ Testing for ------------ --- plain FOR A diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index fbe8475d8a9..dd7d14e50e5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1817,6 +1817,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE static const WCHAR forCmd[] = {'f','o','r'}; static const WCHAR ifCmd[] = {'i','f'}; static const WCHAR ifElse[] = {'e','l','s','e'}; + static const WCHAR setCmd[] = {'s','e','t'}; BOOL inOneLine = FALSE; BOOL inFor = FALSE; BOOL inIn = FALSE; @@ -1829,6 +1830,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE BOOL lastWasElse = FALSE; BOOL lastWasRedirect = TRUE; BOOL lastWasCaret = FALSE; + BOOL ignoreBracket = FALSE; /* Some expressions after if (set) require */ + /* handling brackets as a normal character */ int lineCurDepth; /* Bracket depth when line was read in */ BOOL resetAtEndOfLine = FALSE; /* Do we need to reset curdepth at EOL */ @@ -1957,6 +1960,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curPos+=if_condition_len; } + if (WCMD_keyword_ws_found(setCmd, ARRAY_SIZE(setCmd), curPos)) + ignoreBracket = TRUE; + } else if (WCMD_keyword_ws_found(ifElse, ARRAY_SIZE(ifElse), curPos)) { const int keyw_len = ARRAY_SIZE(ifElse) + 1; inElse = TRUE; @@ -2146,7 +2152,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE In an ELSE statement, only allow it straight away after the ELSE and whitespace */ - } else if (inIf || + } else if ((inIf && !ignoreBracket) || (inElse && lastWasElse && onlyWhiteSpace) || (inFor && (lastWasIn || lastWasDo) && onlyWhiteSpace)) {

1 0

Michael Müller : ntdll: Implement NtQuerySystemInformation(SystemExtendedHandleInformation).
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: dc85e950179173dbf5d46dade570ff8671770e94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc85e950179173dbf5d46dad… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 17 22:59:15 2021 -0600 ntdll: Implement NtQuerySystemInformation(SystemExtendedHandleInformation). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 835f5fff7150034139919801444b52a4c0186f44) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/info.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/system.c | 50 ++++++++++++++++++++++++++++++ include/winternl.h | 20 ++++++++++++ 3 files changed, 149 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4379d8a84c6..d003def5107 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -603,6 +603,84 @@ done: HeapFree( GetProcessHeap(), 0, shi); } +static void test_query_handle_ex(void) +{ + SYSTEM_HANDLE_INFORMATION_EX *info = malloc(sizeof(SYSTEM_HANDLE_INFORMATION_EX)); + ULONG size, expect_size; + NTSTATUS status; + unsigned int i; + HANDLE event; + BOOL found, ret; + + event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "failed to create event, error %u\n", GetLastError()); + ret = SetHandleInformation(event, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE, + HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE); + ok(ret, "got error %u\n", GetLastError()); + + size = 0; + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, sizeof(SYSTEM_HANDLE_INFORMATION_EX), &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status); + ok(size > sizeof(SYSTEM_HANDLE_INFORMATION_EX), "got size %u\n", size); + + while (status == STATUS_INFO_LENGTH_MISMATCH) + { + info = realloc(info, size); + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size); + } + ok(!status, "got %#x\n", status); + expect_size = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handles[info->NumberOfHandles]); + ok(size == expect_size, "expected size %u, got %u\n", expect_size, size); + ok(info->NumberOfHandles > 1, "got %Iu handles\n", info->NumberOfHandles); + + found = FALSE; + for (i = 0; i < info->NumberOfHandles; ++i) + { + if (info->Handles[i].UniqueProcessId == GetCurrentProcessId() + && (HANDLE)info->Handles[i].HandleValue == event) + { + todo_wine ok(info->Handles[i].HandleAttributes == (OBJ_INHERIT | OBJ_PROTECT_CLOSE), + "got flags %#x\n", info->Handles[i].HandleAttributes); + ok(info->Handles[i].GrantedAccess == EVENT_ALL_ACCESS, "got access %#x\n", info->Handles[i].GrantedAccess); + found = TRUE; + } + ok(!info->Handles[i].CreatorBackTraceIndex, "got backtrace index %u\n", info->Handles[i].CreatorBackTraceIndex); + } + ok(found, "event handle not found\n"); + + ret = SetHandleInformation(event, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); + ok(ret, "got error %u\n", GetLastError()); + CloseHandle(event); + + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size); + while (status == STATUS_INFO_LENGTH_MISMATCH) + { + info = realloc(info, size); + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size); + } + ok(!status, "got %#x\n", status); + expect_size = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handles[info->NumberOfHandles]); + ok(size == expect_size, "expected size %u, got %u\n", expect_size, size); + ok(info->NumberOfHandles > 1, "got %Iu handles\n", info->NumberOfHandles); + + found = FALSE; + for (i = 0; i < info->NumberOfHandles; ++i) + { + if (info->Handles[i].UniqueProcessId == GetCurrentProcessId() + && (HANDLE)info->Handles[i].HandleValue == event) + { + found = TRUE; + break; + } + } + ok(!found, "event handle found\n"); + + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, NULL, sizeof(SYSTEM_HANDLE_INFORMATION_EX), &size); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); + + free(info); +} + static void test_query_cache(void) { NTSTATUS status; @@ -2762,6 +2840,7 @@ START_TEST(info) test_query_procperf(); test_query_module(); test_query_handle(); + test_query_handle_ex(); test_query_cache(); test_query_interrupt(); test_time_adjustment(); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index a889b2e020c..e2482f91041 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2461,6 +2461,56 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemExtendedHandleInformation: + { + struct handle_info *handle_info; + DWORD i, num_handles; + + if (size < sizeof(SYSTEM_HANDLE_INFORMATION_EX)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + if (!info) + { + ret = STATUS_ACCESS_VIOLATION; + break; + } + + num_handles = (size - FIELD_OFFSET( SYSTEM_HANDLE_INFORMATION_EX, Handles )) + / sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX); + if (!(handle_info = malloc( sizeof(*handle_info) * num_handles ))) return STATUS_NO_MEMORY; + + SERVER_START_REQ( get_system_handles ) + { + wine_server_set_reply( req, handle_info, sizeof(*handle_info) * num_handles ); + if (!(ret = wine_server_call( req ))) + { + SYSTEM_HANDLE_INFORMATION_EX *shi = info; + shi->NumberOfHandles = wine_server_reply_size( req ) / sizeof(*handle_info); + len = FIELD_OFFSET( SYSTEM_HANDLE_INFORMATION_EX, Handles[shi->NumberOfHandles] ); + for (i = 0; i < shi->NumberOfHandles; i++) + { + memset( &shi->Handles[i], 0, sizeof(shi->Handles[i]) ); + shi->Handles[i].UniqueProcessId = handle_info[i].owner; + shi->Handles[i].HandleValue = handle_info[i].handle; + shi->Handles[i].GrantedAccess = handle_info[i].access; + /* FIXME: Fill out Object, HandleAttributes, ObjectTypeIndex */ + } + } + else if (ret == STATUS_BUFFER_TOO_SMALL) + { + len = FIELD_OFFSET( SYSTEM_HANDLE_INFORMATION_EX, Handles[reply->count] ); + ret = STATUS_INFO_LENGTH_MISMATCH; + } + } + SERVER_END_REQ; + + free( handle_info ); + break; + } + case SystemCacheInformation: { SYSTEM_CACHE_INFORMATION sci = { 0 }; diff --git a/include/winternl.h b/include/winternl.h index a7b0e04aade..41d871e9bc6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1867,6 +1867,25 @@ typedef struct _SYSTEM_HANDLE_INFORMATION { SYSTEM_HANDLE_ENTRY Handle[1]; } SYSTEM_HANDLE_INFORMATION, *PSYSTEM_HANDLE_INFORMATION; +typedef struct _SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX +{ + void *Object; + ULONG_PTR UniqueProcessId; + ULONG_PTR HandleValue; + ULONG GrantedAccess; + USHORT CreatorBackTraceIndex; + USHORT ObjectTypeIndex; + ULONG HandleAttributes; + ULONG Reserved; +} SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX; + +typedef struct _SYSTEM_HANDLE_INFORMATION_EX +{ + ULONG_PTR NumberOfHandles; + ULONG_PTR Reserved; + SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX Handles[1]; +} SYSTEM_HANDLE_INFORMATION_EX; + /* System Information Class 0x15 */ typedef struct _SYSTEM_CACHE_INFORMATION { @@ -2244,6 +2263,7 @@ typedef struct _RTL_HANDLE_TABLE #define LOGONID_CURRENT ((ULONG)-1) +#define OBJ_PROTECT_CLOSE 0x00000001 #define OBJ_INHERIT 0x00000002 #define OBJ_PERMANENT 0x00000010 #define OBJ_EXCLUSIVE 0x00000020

1 0

Henri Verbeet : d3d11/tests: Add format compatibility tests for DXGI_FORMAT_R9G9B9E5_SHAREDEXP.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: c760f6b9de0224e0ca778cd29dd3e4e926880023 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c760f6b9de0224e0ca778cd2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 00:23:58 2021 +0100 d3d11/tests: Add format compatibility tests for DXGI_FORMAT_R9G9B9E5_SHAREDEXP. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 70c09cd89d7b6c181dcef4ad35f49f13ee429ac6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9fc09a5ec83..1fbc91bb5e1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26557,6 +26557,13 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_UINT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_SINT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_B8G8R8A8_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R16G16_TYPELESS, 4, FALSE}, {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, @@ -26590,6 +26597,7 @@ static void test_format_compatibility(void) for (i = 0; i < ARRAY_SIZE(test_data); ++i) { unsigned int x, y, texel_dwords; + BOOL broken = FALSE; D3D11_BOX box; texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); @@ -26617,15 +26625,23 @@ static void test_format_compatibility(void) texel_dwords = test_data[i].texel_size / sizeof(DWORD); get_texture_readback(dst_texture, 0, &rb); - for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + colour = get_readback_color(&rb, 0, 0, 0); + if (test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && colour == bitmap_data[0]) + { + win_skip("Broken destination offset for %#x -> %#x copy.\n", + test_data[i].src_format, test_data[i].dst_format); + broken = TRUE; + } + for (j = 0; j < ARRAY_SIZE(bitmap_data) && !broken; ++j) { x = j % 4; y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success && x >= texel_dwords && y ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && expected) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); @@ -26638,8 +26654,9 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && expected) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb);

1 0