March 2024 - Wine-commits - list.winehq.org

Eric Pouech : dbghelp/tests: Add more tests for SymLoadModule*.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: ec099b8ea34c6417fe3417899c1480ab1521c881 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec099b8ea34c6417fe3417899c1480… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 8 13:57:01 2024 +0100 dbghelp/tests: Add more tests for SymLoadModule*. - SymLoadModules flags (SLMFLAG_VIRTUAL and SLMFLAG_NO_SYMBOLS), - handling of load details (SymType, ImageName vs LoadedImageName, various instances of module name). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/path.c | 292 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 292 insertions(+)

1 0

Eric Pouech : dbghelp: Always use SymGetSrvIndexFileInfo() for files lookup.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: f01474567695556803cf953113cfac7a4e01005c URL: https://gitlab.winehq.org/wine/wine/-/commit/f01474567695556803cf953113cfac… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun Jan 28 09:53:40 2024 +0100 dbghelp: Always use SymGetSrvIndexFileInfo() for files lookup. This will help separate debug info files lookup from their actual loading once found and correctly matched. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/msc.c | 28 ----------------- dlls/dbghelp/path.c | 68 +++++------------------------------------- dlls/dbghelp/tests/path.c | 3 +- 4 files changed, 9 insertions(+), 91 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 4f14433c7c4..382d2d1ce5e 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -759,7 +759,6 @@ extern BOOL pe_load_debug_directory(const struct process* pcs, const IMAGE_DEBUG_DIRECTORY* dbg, int nDbg); extern DWORD msc_get_file_indexinfo(void* image, const IMAGE_DEBUG_DIRECTORY* dbgdir, DWORD size, SYMSRV_INDEX_INFOW* info); -extern BOOL pdb_fetch_file_info(const struct pdb_lookup* pdb_lookup, unsigned* matched); struct pdb_cmd_pair { const char* name; DWORD* pvalue; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 12ed93380b6..b495d4c24f2 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3996,34 +3996,6 @@ static BOOL pdb_process_file(const struct process* pcs, return ret; } -BOOL pdb_fetch_file_info(const struct pdb_lookup* pdb_lookup, unsigned* matched) -{ - HANDLE hFile, hMap = NULL; - char* image = NULL; - BOOL ret; - struct pdb_file_info pdb_file; - - if ((hFile = CreateFileA(pdb_lookup->filename, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) == INVALID_HANDLE_VALUE || - ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) == NULL) || - ((image = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) == NULL)) - { - WARN("Unable to open .PDB file: %s\n", pdb_lookup->filename); - ret = FALSE; - } - else - { - ret = pdb_init(pdb_lookup, &pdb_file, image, matched); - pdb_free_file(&pdb_file); - } - - if (image) UnmapViewOfFile(image); - if (hMap) CloseHandle(hMap); - if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); - - return ret; -} - /*======================================================================== * FPO unwinding code */ diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index f45807c634f..dd2587db99e 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -477,67 +477,15 @@ struct module_find static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) { struct module_find* mf = user; - DWORD timestamp; unsigned matched = 0; + SYMSRV_INDEX_INFOW info; - /* the matching weights: - * +1 if a file with same name is found and is a decent file of expected type - * +1 if first parameter and second parameter match - */ - - if (mf->is_pdb) - { - struct pdb_lookup pdb_lookup; - char fn[MAX_PATH]; - - WideCharToMultiByte(CP_ACP, 0, buffer, -1, fn, MAX_PATH, NULL, NULL); - pdb_lookup.filename = fn; - - if (mf->guid) - { - pdb_lookup.kind = PDB_DS; - pdb_lookup.timestamp = 0; - pdb_lookup.guid = *mf->guid; - } - else - { - pdb_lookup.kind = PDB_JG; - pdb_lookup.timestamp = mf->dw1; - /* pdb_loopkup.guid = */ - } - pdb_lookup.age = mf->dw2; - - if (!pdb_fetch_file_info(&pdb_lookup, &matched)) return FALSE; - } - else - { - HANDLE hFile, hMap; - void* mapping; - - timestamp = ~mf->dw1; - hFile = CreateFileW(buffer, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) return FALSE; - if ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != NULL) - { - if ((mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL) - { - const IMAGE_SEPARATE_DEBUG_HEADER* hdr; - hdr = mapping; - - if (hdr->Signature == IMAGE_SEPARATE_DEBUG_SIGNATURE) - { - matched++; - timestamp = hdr->TimeDateStamp; - } - UnmapViewOfFile(mapping); - } - CloseHandle(hMap); - } - CloseHandle(hFile); - if (timestamp == mf->dw1) matched++; - else WARN("Found %s, but wrong timestamp\n", debugstr_w(buffer)); - } + info.sizeofstruct = sizeof(info); + if (!SymSrvGetFileIndexInfoW(buffer, &info, 0)) + return FALSE; + if (!memcmp(&info.guid, mf->guid, sizeof(GUID))) matched++; + if (info.timestamp == mf->dw1) matched++; + if (info.age == mf->dw2) matched++; if (matched > mf->matched) { @@ -547,7 +495,7 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) /* yes, EnumDirTree/do_search and SymFindFileInPath callbacks use the opposite * convention to stop/continue enumeration. sigh. */ - return mf->matched == 2; + return mf->matched == 3; } BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index 92b2bd21c94..1a7ea1faa18 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -1592,7 +1592,7 @@ static void test_load_modules_path(void) todo_wine ok(im.PdbAge == test_files[test->found_file].age_or_timestamp, "Expected %lx as pdb-age, got %lx instead\n", test_files[test->found_file].age_or_timestamp, im.PdbAge); - todo_wine_if(i == 11 || i == 16 || i == 17) + todo_wine_if(i == 11) ok(im.PdbUnmatched == !(test_files[test->found_file].age_or_timestamp == 0x0030cafe), "Expecting matched PDB\n"); } todo_wine @@ -1813,7 +1813,6 @@ static void test_load_modules_details(void) "Unexpected loaded image name '%ls' (%ls)\n", im.LoadedImageName, loaded_img_name); todo_wine_if(i == 3 || i == 4 || i == 6 || i == 8 || i == 10 || i == 12 || i == 14) ok(im.SymType == test->sym_type, "Unexpected module type %u\n", im.SymType); - todo_wine_if(i == 8) ok(!im.TypeInfo, "No type info present\n"); if (test->mismatch_in) {

1 0

Eric Pouech : dbghelp: Rework loading of PDB string table.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: feee77f84df4ee3e0d9df650df0ad199198ce9c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/feee77f84df4ee3e0d9df650df0ad1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Feb 16 15:10:48 2024 +0100 dbghelp: Rework loading of PDB string table. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index b495d4c24f2..ead0aec41d0 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3141,21 +3141,22 @@ static void pdb_free_file(struct pdb_file_info* pdb_file) HeapFree(GetProcessHeap(), 0, pdb_file->stream_dict); } -static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const char* str, unsigned cb) +static struct pdb_stream_name* pdb_load_stream_name_table(const char* str, unsigned cb) { - DWORD* pdw; - DWORD* ok_bits; - DWORD count, numok; - unsigned i, j; - char* cpstr; + struct pdb_stream_name* stream_dict; + DWORD* pdw; + DWORD* ok_bits; + DWORD count, numok; + unsigned i, j; + char* cpstr; pdw = (DWORD*)(str + cb); numok = *pdw++; count = *pdw++; - pdb_file->stream_dict = HeapAlloc(GetProcessHeap(), 0, (numok + 1) * sizeof(struct pdb_stream_name) + cb); - if (!pdb_file->stream_dict) return FALSE; - cpstr = (char*)(pdb_file->stream_dict + numok + 1); + stream_dict = HeapAlloc(GetProcessHeap(), 0, (numok + 1) * sizeof(struct pdb_stream_name) + cb); + if (!stream_dict) return NULL; + cpstr = (char*)(stream_dict + numok + 1); memcpy(cpstr, str, cb); /* bitfield: first dword is len (in dword), then data */ @@ -3168,15 +3169,14 @@ static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha if (ok_bits[i / 32] & (1 << (i % 32))) { if (j >= numok) break; - pdb_file->stream_dict[j].name = &cpstr[*pdw++]; - pdb_file->stream_dict[j].index = *pdw++; + stream_dict[j].name = &cpstr[*pdw++]; + stream_dict[j].index = *pdw++; j++; } } /* add sentinel */ - pdb_file->stream_dict[numok].name = NULL; - pdb_file->fpoext_stream = -1; - return TRUE; + stream_dict[numok].name = NULL; + return stream_dict; } static unsigned pdb_get_stream_by_name(const struct pdb_file_info* pdb_file, const char* name) @@ -3494,8 +3494,6 @@ static const char PDB_DS_IDENT[] = "Microsoft C/C++ MSF 7.00\r\n\032DS\0"; static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* pdb_file, const char* image, unsigned* matched) { - BOOL ret = TRUE; - /* check the file header, and if ok, load the TOC */ TRACE("PDB(%s): %.40s\n", pdb_lookup->filename, debugstr_an(image, 40)); @@ -3539,7 +3537,8 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* pdb_lookup->filename, root->Age, pdb_lookup->age); TRACE("found JG for %s: age=%x timestamp=%x\n", pdb_lookup->filename, root->Age, root->TimeDateStamp); - ret = pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames); + pdb_file->stream_dict = pdb_load_stream_name_table(&root->names[0], root->cbNames); + pdb_file->fpoext_stream = -1; pdb_free(root); } else if (!memcmp(image, PDB_DS_IDENT, sizeof(PDB_DS_IDENT))) @@ -3575,7 +3574,8 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* pdb_lookup->filename, root->Age, pdb_lookup->age); TRACE("found DS for %s: age=%x guid=%s\n", pdb_lookup->filename, root->Age, debugstr_guid(&root->guid)); - ret = pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames); + pdb_file->stream_dict = pdb_load_stream_name_table(&root->names[0], root->cbNames); + pdb_file->fpoext_stream = -1; pdb_free(root); } @@ -3599,7 +3599,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* pdb_free(x); } } - return ret; + return pdb_file->stream_dict != NULL; } static BOOL pdb_process_internal(const struct process* pcs,

1 0

Eric Pouech : dbghelp: Get rid of struct pdb_lookup.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: f824a72c7f76b84c3c4c764eea8dc11b6d1bb243 URL: https://gitlab.winehq.org/wine/wine/-/commit/f824a72c7f76b84c3c4c764eea8dc1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun Feb 25 09:48:23 2024 +0100 dbghelp: Get rid of struct pdb_lookup. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 11 ---- dlls/dbghelp/msc.c | 141 ++++++++++++----------------------------- dlls/dbghelp/tests/path.c | 7 +- 3 files changed, 45 insertions(+), 114 deletions(-)

1 0

Eric Pouech : dbghelp: Return matched information for path_find_symbol_file.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: ad921b3c561c428ce36a2a3e0f44de1369def0c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad921b3c561c428ce36a2a3e0f44de… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Feb 24 17:49:23 2024 +0100 dbghelp: Return matched information for path_find_symbol_file. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/msc.c | 179 ++++++++++++++++++++--------------------- dlls/dbghelp/path.c | 60 ++++++++------ dlls/dbghelp/pe_module.c | 8 +- dlls/dbghelp/tests/path.c | 14 ++-- 5 files changed, 132 insertions(+), 133 deletions(-)

1 0

Rémi Bernon : win32u: Use NtUserCallHwndParam interface for __wine_send_input.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 66baee8b990140a62fb07535be7a9d8027324de2 URL: https://gitlab.winehq.org/wine/wine/-/commit/66baee8b990140a62fb07535be7a9d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 11 18:06:32 2024 +0100 win32u: Use NtUserCallHwndParam interface for __wine_send_input. --- dlls/hidclass.sys/device.c | 2 +- dlls/hidclass.sys/pnp.c | 2 +- dlls/win32u/input.c | 12 +----------- dlls/win32u/main.c | 5 ----- dlls/win32u/message.c | 19 +++++++++++++------ dlls/win32u/win32syscalls.h | 6 ++---- dlls/win32u/win32u.spec | 1 - dlls/win32u/win32u_private.h | 3 +-- dlls/win32u/window.c | 6 ++++++ dlls/wineandroid.drv/keyboard.c | 2 +- dlls/wineandroid.drv/window.c | 4 ++-- dlls/winemac.drv/keyboard.c | 2 +- dlls/winemac.drv/mouse.c | 2 +- dlls/winewayland.drv/wayland_keyboard.c | 6 +++--- dlls/winewayland.drv/wayland_pointer.c | 8 ++++---- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/mouse.c | 8 ++++---- dlls/wow64win/user.c | 22 ++++++++++++++++------ include/ntuser.h | 15 +++++++++++++-- 19 files changed, 71 insertions(+), 56 deletions(-)

1 0

Rémi Bernon : win32u: Use a custom struct hid_input for NtUserSendHardwareInput.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: bb5f0e122f453ecf422ddeb26d31ce1b9d55d152 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb5f0e122f453ecf422ddeb26d31ce… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 28 12:11:55 2024 +0100 win32u: Use a custom struct hid_input for NtUserSendHardwareInput. --- dlls/hidclass.sys/device.c | 37 +++++++++++++++++----------------- dlls/hidclass.sys/pnp.c | 23 ++++++++------------- dlls/win32u/message.c | 45 ++++++++---------------------------------- include/ntuser.h | 18 ++++++++++++++++- include/wine/server_protocol.h | 11 +++-------- server/protocol.def | 9 ++------- server/queue.c | 2 +- 7 files changed, 57 insertions(+), 88 deletions(-)

1 0

Rémi Bernon : dinput/tests: Test the WM_POINTER* message parameter values.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 13f908b9b5503b7225b16e2a3be70e67d52f7c3f URL: https://gitlab.winehq.org/wine/wine/-/commit/13f908b9b5503b7225b16e2a3be70e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 15 11:33:24 2024 +0100 dinput/tests: Test the WM_POINTER* message parameter values. --- dlls/dinput/tests/device8.c | 151 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 141 insertions(+), 10 deletions(-)

1 0

Rémi Bernon : mouhid.sys: Send WM_POINTER* messages on contact updates.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 48f8db6c30b478ceb5317138d0a4d865e02363f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/48f8db6c30b478ceb5317138d0a4d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 11:35:33 2024 +0100 mouhid.sys: Send WM_POINTER* messages on contact updates. --- dlls/mouhid.sys/Makefile.in | 2 +- dlls/mouhid.sys/main.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/mouhid.sys/Makefile.in b/dlls/mouhid.sys/Makefile.in index 331486bc104..79bc38a92b4 100644 --- a/dlls/mouhid.sys/Makefile.in +++ b/dlls/mouhid.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = mouhid.sys -IMPORTS = ntoskrnl hidparse +IMPORTS = ntoskrnl hidparse win32u EXTRADLLFLAGS = -Wl,--subsystem,native SOURCES = \ diff --git a/dlls/mouhid.sys/main.c b/dlls/mouhid.sys/main.c index c1b4288e1dd..b38299b0fb8 100644 --- a/dlls/mouhid.sys/main.c +++ b/dlls/mouhid.sys/main.c @@ -113,6 +113,8 @@ static NTSTATUS start_device_read( DEVICE_OBJECT *device ) static void add_contact( struct device *impl, struct list *old_contacts, ULONG id, LONG x, LONG y ) { + UINT flags = POINTER_MESSAGE_FLAG_INRANGE | POINTER_MESSAGE_FLAG_INCONTACT | POINTER_MESSAGE_FLAG_CONFIDENCE; + INPUT input = {.type = INPUT_HARDWARE}; struct contact *contact; LIST_FOR_EACH_ENTRY( contact, old_contacts, struct contact, entry ) @@ -120,6 +122,7 @@ static void add_contact( struct device *impl, struct list *old_contacts, ULONG i if (&contact->entry != old_contacts) { + input.hi.uMsg = WM_POINTERUPDATE; list_remove( &contact->entry ); contact->pos.x = x; @@ -128,6 +131,9 @@ static void add_contact( struct device *impl, struct list *old_contacts, ULONG i } else if ((contact = calloc( 1, sizeof(*contact) ))) { + input.hi.uMsg = WM_POINTERDOWN; + flags |= POINTER_MESSAGE_FLAG_NEW; + contact->id = id; contact->pos.x = x; contact->pos.y = y; @@ -139,6 +145,10 @@ static void add_contact( struct device *impl, struct list *old_contacts, ULONG i return; } + input.hi.wParamL = contact->id; + input.hi.wParamH = flags; + NtUserSendHardwareInput( 0, 0, &input, MAKELPARAM(contact->pos.x, contact->pos.y) ); + list_add_tail( &impl->contacts, &contact->entry ); } @@ -148,7 +158,16 @@ static void release_contacts( struct list *contacts ) LIST_FOR_EACH_ENTRY_SAFE( contact, next, contacts, struct contact, entry ) { + INPUT input = {.type = INPUT_HARDWARE}; + ULONG flags = POINTER_MESSAGE_FLAG_CONFIDENCE; + TRACE( "releasing contact %#lx, pos %s\n", contact->id, wine_dbgstr_point( &contact->pos ) ); + + input.hi.uMsg = WM_POINTERUP; + input.hi.wParamL = contact->id; + input.hi.wParamH = flags; + NtUserSendHardwareInput( 0, 0, &input, MAKELPARAM(contact->pos.x, contact->pos.y) ); + list_remove( &contact->entry ); free( contact ); }

1 0

Rémi Bernon : server: Add support for sending and receiving WM_POINTER* messages.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 61d1c18957db9bf4d5d0c2c6f2d7232d00fda0ab URL: https://gitlab.winehq.org/wine/wine/-/commit/61d1c18957db9bf4d5d0c2c6f2d723… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 20:57:55 2021 +0200 server: Add support for sending and receiving WM_POINTER* messages. --- dlls/dinput/tests/device8.c | 4 --- server/queue.c | 85 ++++++++++++++++++++++++++++++++++++++++++++- server/user.h | 2 ++ server/winstation.c | 2 ++ 4 files changed, 88 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index caf85fc370f..41e560a7e62 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1997,7 +1997,6 @@ static void test_hid_touch_screen(void) bus_send_hid_input( file, &desc, &touch_single, sizeof(touch_single) ); res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); - todo_wine ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); res = msg_wait_for_events( 1, &touchdown_event, 10 ); @@ -2049,7 +2048,6 @@ static void test_hid_touch_screen(void) bus_wait_hid_input( file, &desc, 5000 ); res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); - todo_wine ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); memset( rawbuffer, 0, sizeof(rawbuffer) ); @@ -2088,11 +2086,9 @@ static void test_hid_touch_screen(void) bus_send_hid_input( file, &desc, &touch_multiple, sizeof(touch_multiple) ); res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); - todo_wine ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); bus_send_hid_input( file, &desc, &touch_release, sizeof(touch_release) ); res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); - todo_wine ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); rawinput = (RAWINPUT *)rawbuffer; diff --git a/server/queue.c b/server/queue.c index ef40d30aedf..0b9430c5f4d 100644 --- a/server/queue.c +++ b/server/queue.c @@ -633,6 +633,7 @@ static inline int filter_contains_hw_range( unsigned int first, unsigned int las /* get the QS_* bit corresponding to a given hardware message */ static inline int get_hardware_msg_bit( unsigned int message ) { + if (message >= WM_POINTERUPDATE && message <= WM_POINTERLEAVE) return QS_POINTER; if (message == WM_INPUT_DEVICE_CHANGE || message == WM_INPUT) return QS_RAWINPUT; if (message == WM_MOUSEMOVE || message == WM_NCMOUSEMOVE) return QS_MOUSEMOVE; if (message >= WM_KEYFIRST && message <= WM_KEYLAST) return QS_KEY; @@ -1614,6 +1615,7 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru *msg_code = msg->msg; switch (get_hardware_msg_bit( msg->msg )) { + case QS_POINTER: case QS_RAWINPUT: if (!(win = msg->win) && input) win = input->focus; break; @@ -2216,12 +2218,72 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c return wait; } +struct pointer +{ + struct list entry; + struct desktop *desktop; + user_handle_t win; + int primary; + hw_input_t input; +}; + +static void queue_pointer_message( struct pointer *pointer ) +{ + struct hw_msg_source source = { IMDT_UNAVAILABLE, IMDT_TOUCH }; + struct desktop *desktop = pointer->desktop; + const hw_input_t *input = &pointer->input; + unsigned int wparam = input->hw.wparam; + user_handle_t win = pointer->win; + rectangle_t top_rect; + struct message *msg; + int x, y; + + get_top_window_rectangle( desktop, &top_rect ); + x = LOWORD(input->hw.lparam) * (top_rect.right - top_rect.left) / 65535; + y = HIWORD(input->hw.lparam) * (top_rect.bottom - top_rect.top) / 65535; + + if (pointer->primary) wparam |= POINTER_MESSAGE_FLAG_PRIMARY << 16; + + if (!(msg = alloc_hardware_message( 0, source, get_tick_count(), 0 ))) return; + + msg->win = get_user_full_handle( win ); + msg->msg = input->hw.msg; + msg->wparam = wparam; + msg->lparam = MAKELONG(x, y); + msg->x = desktop->cursor.x; + msg->y = desktop->cursor.y; + + queue_hardware_message( desktop, msg, 1 ); + + if (input->hw.msg == WM_POINTERUP) + { + list_remove( &pointer->entry ); + free( pointer ); + } +} + +static struct pointer *find_pointer_from_id( struct desktop *desktop, unsigned int id ) +{ + struct pointer *pointer; + + LIST_FOR_EACH_ENTRY( pointer, &desktop->pointers, struct pointer, entry ) + if (LOWORD(pointer->input.hw.wparam) == id) return pointer; + + pointer = mem_alloc( sizeof(struct pointer) ); + pointer->desktop = desktop; + pointer->primary = list_empty( &desktop->pointers ); + list_add_tail( &desktop->pointers, &pointer->entry ); + + return pointer; +} + /* queue a hardware message for a custom type of event */ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_t win, unsigned int origin, const hw_input_t *input ) { struct hw_msg_source source = { IMDT_UNAVAILABLE, origin }; struct thread *foreground; + struct pointer *pointer; struct message *msg; switch (input->hw.msg) @@ -2246,6 +2308,16 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ return; } + if (input->hw.msg == WM_POINTERDOWN || input->hw.msg == WM_POINTERUP || input->hw.msg == WM_POINTERUPDATE) + { + pointer = find_pointer_from_id( desktop, LOWORD(input->hw.wparam) ); + pointer->input = *input; + pointer->win = win; + + queue_pointer_message( pointer ); + return; + } + if (!(msg = alloc_hardware_message( 0, source, get_tick_count(), 0 ))) return; msg->win = get_user_full_handle( win ); @@ -2394,7 +2466,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); - if ((get_hardware_msg_bit( msg->msg ) == QS_RAWINPUT && (flags & PM_REMOVE)) || + if ((get_hardware_msg_bit( msg->msg ) & (QS_RAWINPUT | QS_POINTER) && (flags & PM_REMOVE)) || is_internal_hardware_message( msg->msg )) release_hardware_message( current->queue, data->hw_id ); return 1; @@ -2572,6 +2644,17 @@ void post_win_event( struct thread *thread, unsigned int event, } } +void free_pointers( struct desktop *desktop ) +{ + struct pointer *pointer, *next; + + LIST_FOR_EACH_ENTRY_SAFE( pointer, next, &desktop->pointers, struct pointer, entry ) + { + list_remove( &pointer->entry ); + free( pointer ); + } +} + /* free all hotkeys on a desktop, optionally filtering by window */ void free_hotkeys( struct desktop *desktop, user_handle_t window ) { diff --git a/server/user.h b/server/user.h index b4cf618f87e..309a0966104 100644 --- a/server/user.h +++ b/server/user.h @@ -75,6 +75,7 @@ struct desktop struct window *msg_window; /* HWND_MESSAGE top window */ struct hook_table *global_hooks; /* table of global hooks on this desktop */ struct list hotkeys; /* list of registered hotkeys */ + struct list pointers; /* list of active pointers */ struct timeout_user *close_timeout; /* timeout before closing the desktop */ struct thread_input *foreground_input; /* thread input of foreground thread */ unsigned int users; /* processes and threads using this desktop */ @@ -125,6 +126,7 @@ extern void post_win_event( struct thread *thread, unsigned int event, const WCHAR *module, data_size_t module_size, user_handle_t handle ); extern void free_hotkeys( struct desktop *desktop, user_handle_t window ); +extern void free_pointers( struct desktop *desktop ); extern void set_rawinput_process( struct process *process, int enable ); /* region functions */ diff --git a/server/winstation.c b/server/winstation.c index 373a1f7ba92..4672cf65e56 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -296,6 +296,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned memset( desktop->keystate, 0, sizeof(desktop->keystate) ); list_add_tail( &winstation->desktops, &desktop->entry ); list_init( &desktop->hotkeys ); + list_init( &desktop->pointers ); } else { @@ -357,6 +358,7 @@ static void desktop_destroy( struct object *obj ) } free_hotkeys( desktop, 0 ); + free_pointers( desktop ); if (desktop->top_window) free_window_handle( desktop->top_window ); if (desktop->msg_window) free_window_handle( desktop->msg_window ); if (desktop->global_hooks) release_object( desktop->global_hooks );

1 0