April 2022 - Wine-devel - list.winehq.org

[PATCH v2 1/2] winex11: Prevent the call sequence change between xim preedit callback and key event handlers.
by Byeongsik Jeon 07 Apr '22

07 Apr '22

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: rework. update merge_events(). "xim preedit callback" is called from within the XFilterEvent(). Because of the [2/2]'s action, the strings on the 'ERASED' line are erased. ### xim server sended event sequence ### preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string 'ㄱ' preedit draw:: caret 1 chg_first 0 chg_length 1 string '가' preedit draw:: caret 1 chg_first 0 chg_length 1 string '간' preedit draw:: caret 0 chg_first 0 chg_length 1 NULL preedit done:: lookup chars:: keycode 0 string 3 '가' <== HERE preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string '나' ### Wine process_events() simulated event sequence ### preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string 'ㄱ' preedit draw:: caret 1 chg_first 0 chg_length 1 string '가' preedit draw:: caret 1 chg_first 0 chg_length 1 string '간' preedit draw:: caret 0 chg_first 0 chg_length 1 NULL preedit done:: preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string '나' <== ERASED lookup chars:: keycode 0 string 3 '가' <== HERE dlls/winex11.drv/event.c | 60 ++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c20ceeacca1..581e28787a0 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -261,10 +261,11 @@ static Bool filter_event( Display *display, XEvent *event, char *arg ) enum event_merge_action { - MERGE_DISCARD, /* discard the old event */ - MERGE_HANDLE, /* handle the old event */ + MERGE_FLUSH, /* handle all the events */ MERGE_KEEP, /* keep the old event for future merging */ - MERGE_IGNORE /* ignore the new event, keep the old one */ + MERGE_IGNORE, /* ignore the new event, keep the old one */ + MERGE_DISCARD, /* discard the old event */ + MERGE_HANDLE /* handle the old event */ }; /*********************************************************************** @@ -316,6 +317,19 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) { switch (prev->type) { + case 0: + switch (next->type) + { + case ConfigureNotify: + case MotionNotify: +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + case GenericEvent: +#endif + return MERGE_DISCARD; + default: + return MERGE_KEEP; + } + break; case ConfigureNotify: switch (next->type) { @@ -325,7 +339,7 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate ConfigureNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; case Expose: case PropertyNotify: return MERGE_KEEP; @@ -340,30 +354,30 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - if (x11drv_thread_data()->warp_serial) break; + if (next->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (next->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; + if (x11drv_thread_data()->warp_serial) return MERGE_HANDLE; return MERGE_KEEP; } break; case GenericEvent: - if (prev->xcookie.extension != xinput2_opcode) break; - if (prev->xcookie.evtype != XI_RawMotion) break; + if (prev->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (prev->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; switch (next->type) { case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - if (x11drv_thread_data()->warp_serial) break; + if (next->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (next->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; + if (x11drv_thread_data()->warp_serial) return MERGE_HANDLE; return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); #endif } break; } - return MERGE_HANDLE; + return MERGE_FLUSH; } @@ -445,23 +459,29 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X else continue; /* filtered, ignore it */ } + get_event_data( &event ); - if (prev_event.type) action = merge_events( &prev_event, &event ); + action = merge_events( &prev_event, &event ); switch( action ) { - case MERGE_HANDLE: /* handle prev, keep new */ + case MERGE_FLUSH: /* handle all the events */ queued |= call_event_handler( display, &prev_event ); - /* fall through */ - case MERGE_DISCARD: /* discard prev, keep new */ free_event_data( &prev_event ); - prev_event = event; - break; + prev_event.type = 0; + /* fall through */ case MERGE_KEEP: /* handle new, keep prev for future merging */ queued |= call_event_handler( display, &event ); /* fall through */ case MERGE_IGNORE: /* ignore new, keep prev for future merging */ free_event_data( &event ); break; + case MERGE_HANDLE: /* handle prev, keep new */ + queued |= call_event_handler( display, &prev_event ); + /* fall through */ + case MERGE_DISCARD: /* discard prev, keep new */ + free_event_data( &prev_event ); + prev_event = event; + break; } } if (prev_event.type) queued |= call_event_handler( display, &prev_event ); -- 2.35.1

1 1

[PATCH vkd3d 1/5] tests: Use a vertex buffer to draw quads for shader tests.
by Zebediah Figura 07 Apr '22

07 Apr '22

For compatibility with shader models before 4.0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tests/shader_runner.c | 71 +++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 22 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index d3d131164..0ad2d56c7 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -314,6 +314,24 @@ static void parse_input_layout_directive(struct shader_runner *runner, const cha element->index = 0; } +static void set_resource(struct shader_runner *runner, struct resource *resource) +{ + size_t i; + + for (i = 0; i < runner->resource_count; ++i) + { + if (runner->resources[i]->slot == resource->slot && runner->resources[i]->type == resource->type) + { + runner->ops->destroy_resource(runner, runner->resources[i]); + runner->resources[i] = resource; + return; + } + } + + runner->resources = realloc(runner->resources, (runner->resource_count + 1) * sizeof(*runner->resources)); + runner->resources[runner->resource_count++] = resource; +} + static void set_uniforms(struct shader_runner *runner, size_t offset, size_t count, const void *uniforms) { runner->uniform_count = align(max(runner->uniform_count, offset + count), 4); @@ -326,17 +344,44 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) { if (match_string(line, "draw quad", &line)) { + struct resource_params params; + struct input_element *element; + + static const struct vec2 quad[] = + { + {-1.0f, -1.0f}, + {-1.0f, 1.0f}, + { 1.0f, -1.0f}, + { 1.0f, 1.0f}, + }; + static const char vs_source[] = - "void main(uint id : SV_VertexID, out float4 position : SV_Position)\n" + "void main(inout float4 position : sv_position)\n" "{\n" - " float2 coords = float2((id << 1) & 2, id & 2);\n" - " position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);\n" "}"; + vkd3d_array_reserve((void **)&runner->input_elements, &runner->input_element_capacity, + 1, sizeof(*runner->input_elements)); + element = &runner->input_elements[0]; + element->name = strdup("sv_position"); + element->slot = 0; + element->format = DXGI_FORMAT_R32G32_FLOAT; + element->texel_size = sizeof(*quad); + element->index = 0; + runner->input_element_count = 1; + + memset(&params, 0, sizeof(params)); + params.slot = 0; + params.type = RESOURCE_TYPE_VERTEX_BUFFER; + params.data = malloc(sizeof(quad)); + memcpy(params.data, quad, sizeof(quad)); + params.data_size = sizeof(quad); + set_resource(runner, runner->ops->create_resource(runner, &params)); + if (!runner->vs_source) runner->vs_source = strdup(vs_source); - runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3); + runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP, 4); } else if (match_string(line, "draw", &line)) { @@ -482,24 +527,6 @@ static struct sampler *get_sampler(struct shader_runner *runner, unsigned int sl return NULL; } -static void set_resource(struct shader_runner *runner, struct resource *resource) -{ - size_t i; - - for (i = 0; i < runner->resource_count; ++i) - { - if (runner->resources[i]->slot == resource->slot && runner->resources[i]->type == resource->type) - { - runner->ops->destroy_resource(runner, runner->resources[i]); - runner->resources[i] = resource; - return; - } - } - - runner->resources = realloc(runner->resources, (runner->resource_count + 1) * sizeof(*runner->resources)); - runner->resources[runner->resource_count++] = resource; -} - unsigned int get_vb_stride(const struct shader_runner *runner, unsigned int slot) { unsigned int stride = 0; -- 2.35.1

3 16

[PATCH] dlls/dmstyle: don't cast size_t to DWORD in trace, use %I instead
by Eric Pouech 07 Apr '22

07 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dmstyle/style.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 87b7eed09029..9048984adea9 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -508,7 +508,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); - TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize); + TRACE_(dmfile)(" - cnt: %lu (%Iu / %lu)\n", cnt / dwSize, Chunk.dwSize - sizeof(DWORD), dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL; @@ -524,7 +524,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); - TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize); + TRACE_(dmfile)(" - cnt: %lu (%Iu / %lu)\n", cnt / dwSize, Chunk.dwSize - sizeof(DWORD), dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL;

2 1

[PATCH 1/3] kernel32/tests: Load all test function pointers on init.
by Rémi Bernon 07 Apr '22

07 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 7469de223b8..c9d25c55e2d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -40,9 +40,28 @@ /* use function pointers to avoid warnings for invalid parameter tests */ static LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); static LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); -static BOOL (WINAPI *pHeapQueryInformation)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T, PSIZE_T); -static BOOL (WINAPI *pGetPhysicallyInstalledSystemMemory)(ULONGLONG *); -static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); +static BOOL (WINAPI *pGetPhysicallyInstalledSystemMemory)( ULONGLONG * ); + +#define MAKE_FUNC(f) static typeof(f) *p ## f +MAKE_FUNC( HeapQueryInformation ); +MAKE_FUNC( GlobalFlags ); +MAKE_FUNC( RtlGetNtGlobalFlags ); +#undef MAKE_FUNC + +static void load_functions(void) +{ + HMODULE kernel32 = GetModuleHandleW( L"kernel32.dll" ); + HMODULE ntdll = GetModuleHandleW( L"ntdll.dll" ); + +#define LOAD_FUNC(m, f) p ## f = (void *)GetProcAddress( m, #f ); + LOAD_FUNC( kernel32, HeapAlloc ); + LOAD_FUNC( kernel32, HeapReAlloc ); + LOAD_FUNC( kernel32, HeapQueryInformation ); + LOAD_FUNC( kernel32, GetPhysicallyInstalledSystemMemory ); + LOAD_FUNC( kernel32, GlobalFlags ); + LOAD_FUNC( ntdll, RtlGetNtGlobalFlags ); +#undef LOAD_FUNC +} struct heap { @@ -1079,7 +1098,6 @@ static void test_HeapQueryInformation(void) SIZE_T size; BOOL ret; - pHeapQueryInformation = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "HeapQueryInformation"); if (!pHeapQueryInformation) { win_skip("HeapQueryInformation is not available\n"); @@ -1462,12 +1480,10 @@ static void test_child_heap( const char *arg ) static void test_GetPhysicallyInstalledSystemMemory(void) { - HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); MEMORYSTATUSEX memstatus; ULONGLONG total_memory; BOOL ret; - pGetPhysicallyInstalledSystemMemory = (void *)GetProcAddress(kernel32, "GetPhysicallyInstalledSystemMemory"); if (!pGetPhysicallyInstalledSystemMemory) { win_skip("GetPhysicallyInstalledSystemMemory is not available\n"); @@ -1575,10 +1591,7 @@ START_TEST(heap) int argc; char **argv; - pHeapAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapAlloc" ); - pHeapReAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapReAlloc" ); - - pRtlGetNtGlobalFlags = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "RtlGetNtGlobalFlags" ); + load_functions(); argc = winetest_get_mainargs( &argv ); if (argc >= 3) -- 2.35.1

1 2

[PATCH] ucrtbase/tests: Add a test for wcsnicmp() with limit -1.
by Dmitry Timoshkov 07 Apr '22

07 Apr '22

To show that it's valid unlike _strnicmp(). Based on _strnicmp() test. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ucrtbase/tests/string.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 9446a1e4d5c..806ae08f253 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -491,6 +491,20 @@ static void test__strnicmp(void) ok(!ret, "got %d.\n", ret); } +static void test_wcsnicmp(void) +{ + static const wchar_t str1[] = L"TEST"; + static const wchar_t str2[] = L"test"; + int ret; + + errno = 0xdeadbeef; + ret = wcsnicmp(str1, str2, -1); + ok(!ret, "got %d.\n", ret); + + ret = wcsnicmp(str1, str2, 0x7fffffff); + ok(!ret, "got %d.\n", ret); +} + static void test_SpecialCasing(void) { int i; @@ -602,6 +616,7 @@ START_TEST(string) test_mbsspn(); test_wcstok(); test__strnicmp(); + test_wcsnicmp(); test_SpecialCasing(); test__mbbtype_l(); } -- 2.35.1

2 1

[tools 1/2] c2man: Recognize file extensions in forward specifications.
by Jinoh Kang 07 Apr '22

07 Apr '22

Today, c2man assumes that there is no file extension in the DLL name part of a forward specification. This causes forwarded exports to krnl386.exe16 from kernel32 to be recognized incorrectly. For example, the spec index file for kernel32 contains the following incorrect entry: VxDCall0() (forwarded to exe16.VxDCall0() in krnl386()) Fix this by correctly handling DLL names with file extensions in forward specifications. We omit the extension in the link destination, but not the link text itself. The line above is now changed into: VxDCall0() (forwarded to VxDCall0() in {{krnl386.exe16}}{{krnl386}}) We switch to the double-brace syntax for the DLL hyperlink, since the "<id>()" syntax cannot accept strings with dots in them. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- c2man.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/c2man.pl b/c2man.pl index 0fe9e78..883a888 100755 --- a/c2man.pl +++ b/c2man.pl @@ -1229,9 +1229,9 @@ sub output_spec($) # @$_ => ordinal, call convention, exported name, implementation name, flags; if (@$_[$EXPORT_CALL] eq "forward") { - my $forward_dll = @$_[$EXPORT_IMPNAME]; - $forward_dll =~ s/\.(.*)//; - $line = @$_[$EXPORT_EXPNAME]." (forward to ".$1."() in ".$forward_dll."())"; + if (@$_[$EXPORT_IMPNAME] =~ /^(?:([^.]*)((?:\..*)?)\.)?([^.]*)$/) { + $line = @$_[$EXPORT_EXPNAME]." (forward to ".$3."() in {{".$1.$2."}}{{".$1."}})"; + } } elsif (@$_[$EXPORT_CALL] eq "extern") { -- 2.34.1

1 1

[PATCH] ws2_32: Allow getsockname after AcceptEx
by David Curtiss 07 Apr '22

07 Apr '22

.NET 6's HTTP/Socket code queries this. Winsock allows getsockname on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT is set. Signed-off-by: David Curtiss <david.curtiss(a)ni.com> --- dlls/ws2_32/tests/sock.c | 9 +++++++++ server/sock.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d501930b32d..93f4f420c66 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7718,6 +7718,15 @@ static void test_AcceptEx(void) ok(bret, "GetOverlappedResult failed, error %ld\n", GetLastError()); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %ld\n", bytesReturned); + /* Try to call getsockname on the acceptor socket. + * + * On Windows, this requires setting SO_UPDATE_ACCEPT_CONTEXT. */ + iret = setsockopt(acceptor, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char *)&listener, sizeof(SOCKET)); + ok(!iret, "Failed to set accept context %ld\n", GetLastError()); + iret = getsockname(acceptor, (struct sockaddr *)&peerAddress, &remoteSize); + ok(!iret, "getsockname failed.\n"); + ok(remoteSize == sizeof(struct sockaddr_in), "got remote size %u\n", remoteSize); + closesocket(connector); connector = INVALID_SOCKET; closesocket(acceptor); diff --git a/server/sock.c b/server/sock.c index b403541fcbf..22fcce50312 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2701,7 +2701,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } case IOCTL_AFD_GETSOCKNAME: - if (!sock->bound) + if (!sock->addr_len) { set_error( STATUS_INVALID_PARAMETER ); return; -- 2.25.1

1 0

[PATCH 7/7] win32u: Don't use CDECL for user driver functions.
by Jacek Caban 07 Apr '22

07 Apr '22

2 1

[PATCH 6/7] win32u: Move __wine_set_user_driver implementation from user32.
by Jacek Caban 07 Apr '22

07 Apr '22

3 2

[PATCH 5/7] win32u: Partially move WM_SYSCOMMAND implementation from user32.
by Jacek Caban 07 Apr '22

07 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 8 +------- dlls/user32/nonclient.c | 7 +------ dlls/win32u/defwnd.c | 16 ++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 +- 5 files changed, 20 insertions(+), 14 deletions(-)

3 2