November 2021 - Wine-Commits

Alexandre Julliard : widl: Support loading typelibs stored inside PE files.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: ae44ba97b008ecd8f78d61a29bc21f5325add086 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae44ba97b008ecd8f78d61a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 10:26:03 2021 +0100 widl: Support loading typelibs stored inside PE files. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49803 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib.c | 147 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 93 insertions(+), 54 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 85cb140b7a6..d0fbdcab690 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -239,78 +239,114 @@ unsigned short get_type_vt(type_t *t) return 0; } -static void tlb_read(int fd, void *buf, int count) +static void msft_read_guid(void *data, MSFT_SegDir *segdir, int offset, GUID *guid) { - if(read(fd, buf, count) < count) - error("error while reading importlib.\n"); + memcpy( guid, (char *)data + segdir->pGuidTab.offset + offset, sizeof(*guid) ); } -static void tlb_lseek(int fd, int offset) +static void read_msft_importlib(importlib_t *importlib, void *data, unsigned int size) { - if(lseek(fd, offset, SEEK_SET) == -1) - error("lseek failed\n"); -} - -static void msft_read_guid(int fd, MSFT_SegDir *segdir, int offset, GUID *guid) -{ - tlb_lseek(fd, segdir->pGuidTab.offset+offset); - tlb_read(fd, guid, sizeof(GUID)); -} - -static void read_msft_importlib(importlib_t *importlib, int fd) -{ - MSFT_Header header; - MSFT_SegDir segdir; + MSFT_Header *header = data; + MSFT_SegDir *segdir; int *typeinfo_offs; int i; importlib->allocated = 0; + importlib->version = header->version; - tlb_lseek(fd, 0); - tlb_read(fd, &header, sizeof(header)); - - importlib->version = header.version; - - typeinfo_offs = xmalloc(header.nrtypeinfos*sizeof(INT)); - tlb_read(fd, typeinfo_offs, header.nrtypeinfos*sizeof(INT)); - tlb_read(fd, &segdir, sizeof(segdir)); + typeinfo_offs = (int *)(header + 1); + segdir = (MSFT_SegDir *)(typeinfo_offs + header->nrtypeinfos); - msft_read_guid(fd, &segdir, header.posguid, &importlib->guid); + msft_read_guid(data, segdir, header->posguid, &importlib->guid); - importlib->ntypeinfos = header.nrtypeinfos; + importlib->ntypeinfos = header->nrtypeinfos; importlib->importinfos = xmalloc(importlib->ntypeinfos*sizeof(importinfo_t)); for(i=0; i < importlib->ntypeinfos; i++) { - MSFT_TypeInfoBase base; - MSFT_NameIntro nameintro; + MSFT_TypeInfoBase *base = (MSFT_TypeInfoBase *)((char *)(segdir + 1) + typeinfo_offs[i]); + MSFT_NameIntro *nameintro; int len; - tlb_lseek(fd, sizeof(MSFT_Header) + header.nrtypeinfos*sizeof(INT) + sizeof(MSFT_SegDir) - + typeinfo_offs[i]); - tlb_read(fd, &base, sizeof(base)); - importlib->importinfos[i].importlib = importlib; - importlib->importinfos[i].flags = (base.typekind&0xf)<<24; + importlib->importinfos[i].flags = (base->typekind & 0xf)<<24; importlib->importinfos[i].offset = -1; importlib->importinfos[i].id = i; - if(base.posguid != -1) { + if(base->posguid != -1) { importlib->importinfos[i].flags |= MSFT_IMPINFO_OFFSET_IS_GUID; - msft_read_guid(fd, &segdir, base.posguid, &importlib->importinfos[i].guid); + msft_read_guid(data, segdir, base->posguid, &importlib->importinfos[i].guid); } else memset( &importlib->importinfos[i].guid, 0, sizeof(importlib->importinfos[i].guid)); - tlb_lseek(fd, segdir.pNametab.offset + base.NameOffset); - tlb_read(fd, &nameintro, sizeof(nameintro)); - - len = nameintro.namelen & 0xff; + nameintro = (MSFT_NameIntro *)((char *)data + segdir->pNametab.offset + base->NameOffset); + len = nameintro->namelen & 0xff; importlib->importinfos[i].name = xmalloc(len+1); - tlb_read(fd, importlib->importinfos[i].name, len); + memcpy( importlib->importinfos[i].name, nameintro + 1, len ); importlib->importinfos[i].name[len] = 0; } +} + +static unsigned int rva_to_va( const IMAGE_NT_HEADERS32 *nt, unsigned int rva ) +{ + IMAGE_SECTION_HEADER *sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + unsigned int i; + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) + if (sec->VirtualAddress <= rva && sec->VirtualAddress + sec->Misc.VirtualSize > rva) + return sec->PointerToRawData + (rva - sec->VirtualAddress); + error( "no PE section found for addr %x\n", rva ); +} - free(typeinfo_offs); +static void read_pe_importlib(importlib_t *importlib, void *data, unsigned int size) +{ + IMAGE_DOS_HEADER *dos = data; + IMAGE_NT_HEADERS32 *nt; + IMAGE_DATA_DIRECTORY *dir; + IMAGE_RESOURCE_DIRECTORY *root, *resdir; + IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; + IMAGE_RESOURCE_DATA_ENTRY *resdata; + void *ptr; + unsigned int i, va; + + if (dos->e_lfanew < sizeof(*dos) || dos->e_lfanew >= size) error( "not a PE file\n" ); + nt = (IMAGE_NT_HEADERS32 *)((char *)data + dos->e_lfanew); + if (nt->Signature != IMAGE_NT_SIGNATURE) error( "not a PE file\n" ); + if ((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader > (char *)data + size) + error( "invalid PE file\n" ); + switch (nt->OptionalHeader.Magic) + { + case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + dir = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE]; + break; + case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + dir = &((IMAGE_NT_HEADERS64 *)nt)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE]; + break; + default: + error( "invalid PE file\n" ); + } + if (!dir->VirtualAddress || !dir->Size) error( "resource not found in PE file\n" ); + va = rva_to_va( nt, dir->VirtualAddress ); + if (va + dir->Size > size) error( "invalid resource data in PE file\n" ); + root = resdir = (IMAGE_RESOURCE_DIRECTORY *)((char *)data + va ); + entry = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); + for (i = 0; i < resdir->NumberOfNamedEntries; i++, entry++) + { + static const WCHAR typelibW[] = {'T','Y','P','E','L','I','B'}; + WCHAR *name = (WCHAR *)((char *)root + entry->NameOffset); + if (name[0] != ARRAY_SIZE(typelibW)) continue; + if (!memcmp( name + 1, typelibW, sizeof(typelibW) )) break; + } + if (i == resdir->NumberOfNamedEntries) error( "typelib resource not found in PE file\n" ); + while (entry->DataIsDirectory) + { + resdir = (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry->OffsetToDirectory); + entry = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); + } + resdata = (IMAGE_RESOURCE_DATA_ENTRY *)((char *)root + entry->OffsetToData); + ptr = (char *)data + rva_to_va( nt, resdata->OffsetToData ); + if (memcmp( ptr, "MSFT", 4 )) error( "invalid typelib found in PE file\n" ); + read_msft_importlib( importlib, ptr, resdata->Size ); } static int open_typelib(const char *name) @@ -329,8 +365,8 @@ static int open_typelib(const char *name) static void read_importlib(importlib_t *importlib) { - int fd; - INT magic; + int fd, size; + void *data; fd = open_typelib(importlib->name); @@ -341,17 +377,20 @@ static void read_importlib(importlib_t *importlib) if(fd < 0) error("Could not find importlib %s.\n", importlib->name); - tlb_read(fd, &magic, sizeof(magic)); + size = lseek( fd, 0, SEEK_END ); + data = xmalloc( size ); + lseek( fd, 0, SEEK_SET ); + if (read( fd, data, size) < size) error("error while reading importlib.\n"); + close( fd ); - switch(magic) { - case MSFT_MAGIC: - read_msft_importlib(importlib, fd); - break; - default: - error("Wrong or unsupported typelib magic %x\n", magic); - }; + if (!memcmp( data, "MSFT", 4 )) + read_msft_importlib(importlib, data, size); + else if (!memcmp( data, "MZ", 2 )) + read_pe_importlib(importlib, data, size); + else + error("Wrong or unsupported typelib\n"); - close(fd); + free( data ); } void add_importlib(const char *name, typelib_t *typelib)

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for loading manifest from resources.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: 6e754202bffb64cd87108ec087970350f9f8cdf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e754202bffb64cd87108ec0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 12 16:49:47 2021 +0300 kernel32/tests: Add a test for loading manifest from resources. To confirm that 2d764e90dd2c624f7a2d863ab29bd418ed33d252 does the right thing. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 32 ++++++++++++++++++++++++++++++-- dlls/kernel32/tests/resource.rc | 2 ++ dlls/kernel32/tests/wine_test.manifest | 4 ++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 163ea405222..adf2549bece 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -694,7 +694,7 @@ static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo, int ok_(__FILE__, line)(detailed_info->lpRootManifestPath != NULL, "detailed_info->lpRootManifestPath == NULL\n"); if(detailed_info->lpRootManifestPath) ok_(__FILE__, line)(!lstrcmpiW(detailed_info->lpRootManifestPath, exinfo->root_manifest_path), - "unexpected detailed_info->lpRootManifestPath\n"); + "unexpected detailed_info->lpRootManifestPath %s\n", wine_dbgstr_w(detailed_info->lpRootManifestPath)); }else { ok_(__FILE__, line)(detailed_info->lpRootManifestPath == NULL, "detailed_info->lpRootManifestPath != NULL\n"); } @@ -2683,7 +2683,8 @@ todo_wine SetLastError(0xdeadbeef); handle = CreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); - ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); +todo_wine + ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND, "got error %d\n", GetLastError()); /* load manifest from lpAssemblyDirectory directory */ write_manifest("testdir.manifest", manifest1); @@ -3548,6 +3549,32 @@ static void run_child_process_two_dll(int run) CloseHandle(pi.hProcess); } +static const detailed_info_t detailed_info3 = +{ + 1, 1, 1, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, exe_path, + ACTIVATION_CONTEXT_PATH_TYPE_NONE, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, + app_dir, +}; + +static void test_manifest_in_module(void) +{ + ACTCTXW ctx; + HANDLE handle; + + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + ctx.lpResourceName = (LPWSTR)124; + ctx.hModule = GetModuleHandleW(NULL); + handle = CreateActCtxW(&ctx); + ok(handle != 0, "CreateActCtx error %u\n", GetLastError()); + + test_basic_info(handle, __LINE__); + test_detailed_info(handle, &detailed_info3, __LINE__); + + ReleaseActCtx(handle); +} + START_TEST(actctx) { int argc; @@ -3574,6 +3601,7 @@ START_TEST(actctx) return; } + test_manifest_in_module(); test_actctx(); test_create_fail(); test_CreateActCtx(); diff --git a/dlls/kernel32/tests/resource.rc b/dlls/kernel32/tests/resource.rc index f40a87819ea..58902e7a015 100644 --- a/dlls/kernel32/tests/resource.rc +++ b/dlls/kernel32/tests/resource.rc @@ -24,3 +24,5 @@ { MENUITEM "foo", 1 } + +124 24 wine_test.manifest diff --git a/dlls/kernel32/tests/wine_test.manifest b/dlls/kernel32/tests/wine_test.manifest new file mode 100644 index 00000000000..de77de3e201 --- /dev/null +++ b/dlls/kernel32/tests/wine_test.manifest @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity version="1.0.0.0" name="Wine.Test"/> +</assembly>

1 0

Dmitry Timoshkov : ntdll: Return correct status when manifest could not be loaded from file.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: 33bc90e6873f9663550964df1e2f49515d9c5580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33bc90e6873f9663550964df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 12 16:49:49 2021 +0300 ntdll: Return correct status when manifest could not be loaded from file. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 1 - dlls/ntdll/actctx.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index adf2549bece..e103dfdcf2b 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2683,7 +2683,6 @@ todo_wine SetLastError(0xdeadbeef); handle = CreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); -todo_wine ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND, "got error %d\n", GetLastError()); /* load manifest from lpAssemblyDirectory directory */ diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f9afb655885..ca38f37e673 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3020,7 +3020,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, FALSE, file ); NtClose( file ); } - else status = STATUS_RESOURCE_TYPE_NOT_FOUND; + else status = STATUS_RESOURCE_NAME_NOT_FOUND; RtlFreeUnicodeString( &nameW ); return status; }

1 0

Ivo Ivanov : dinput: Stop calling SendForceFeedbackCommand on device destroy.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: dbb735efd150f2e7834c07e7d65dbf697cbf9d42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb735efd150f2e7834c07e7… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:37 2021 +0100 dinput: Stop calling SendForceFeedbackCommand on device destroy. It is only relevant for FFB devices, and is already being called by hid_joystick_unacquire(). Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a0fc47ec05b..12670a46564 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -741,8 +741,6 @@ void dinput_device_destroy( IDirectInputDevice8W *iface ) TRACE( "iface %p.\n", iface ); IDirectInputDevice_Unacquire(iface); - /* Reset the FF state, free all effects, etc */ - IDirectInputDevice8_SendForceFeedbackCommand(iface, DISFFC_RESET); free( This->data_queue );

1 0

Ivo Ivanov : dinput: Always return a valid string from effect_guid_to_string.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: eb2e52a9d5a244c8cb8d660815ea99565e33bd84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb2e52a9d5a244c8cb8d6608… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:40 2021 +0100 dinput: Always return a valid string from effect_guid_to_string. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index cb920adab06..fa3c01ec673 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -278,31 +278,19 @@ static inline const GUID *effect_usage_to_guid( USAGE usage ) static const WCHAR *effect_guid_to_string( const GUID *guid ) { - static const WCHAR guid_customforce_w[] = {'G','U','I','D','_','C','u','s','t','o','m','F','o','r','c','e',0}; - static const WCHAR guid_constantforce_w[] = {'G','U','I','D','_','C','o','n','s','t','a','n','t','F','o','r','c','e',0}; - static const WCHAR guid_rampforce_w[] = {'G','U','I','D','_','R','a','m','p','F','o','r','c','e',0}; - static const WCHAR guid_square_w[] = {'G','U','I','D','_','S','q','u','a','r','e',0}; - static const WCHAR guid_sine_w[] = {'G','U','I','D','_','S','i','n','e',0}; - static const WCHAR guid_triangle_w[] = {'G','U','I','D','_','T','r','i','a','n','g','l','e',0}; - static const WCHAR guid_sawtoothup_w[] = {'G','U','I','D','_','S','a','w','t','o','o','t','h','U','p',0}; - static const WCHAR guid_sawtoothdown_w[] = {'G','U','I','D','_','S','a','w','t','o','o','t','h','D','o','w','n',0}; - static const WCHAR guid_spring_w[] = {'G','U','I','D','_','S','p','r','i','n','g',0}; - static const WCHAR guid_damper_w[] = {'G','U','I','D','_','D','a','m','p','e','r',0}; - static const WCHAR guid_inertia_w[] = {'G','U','I','D','_','I','n','e','r','t','i','a',0}; - static const WCHAR guid_friction_w[] = {'G','U','I','D','_','F','r','i','c','t','i','o','n',0}; - if (IsEqualGUID( guid, &GUID_CustomForce )) return guid_customforce_w; - if (IsEqualGUID( guid, &GUID_ConstantForce )) return guid_constantforce_w; - if (IsEqualGUID( guid, &GUID_RampForce )) return guid_rampforce_w; - if (IsEqualGUID( guid, &GUID_Square )) return guid_square_w; - if (IsEqualGUID( guid, &GUID_Sine )) return guid_sine_w; - if (IsEqualGUID( guid, &GUID_Triangle )) return guid_triangle_w; - if (IsEqualGUID( guid, &GUID_SawtoothUp )) return guid_sawtoothup_w; - if (IsEqualGUID( guid, &GUID_SawtoothDown )) return guid_sawtoothdown_w; - if (IsEqualGUID( guid, &GUID_Spring )) return guid_spring_w; - if (IsEqualGUID( guid, &GUID_Damper )) return guid_damper_w; - if (IsEqualGUID( guid, &GUID_Inertia )) return guid_inertia_w; - if (IsEqualGUID( guid, &GUID_Friction )) return guid_friction_w; - return NULL; + if (IsEqualGUID( guid, &GUID_CustomForce )) return L"GUID_CustomForce"; + if (IsEqualGUID( guid, &GUID_ConstantForce )) return L"GUID_ConstantForce"; + if (IsEqualGUID( guid, &GUID_RampForce )) return L"GUID_RampForce"; + if (IsEqualGUID( guid, &GUID_Square )) return L"GUID_Square"; + if (IsEqualGUID( guid, &GUID_Sine )) return L"GUID_Sine"; + if (IsEqualGUID( guid, &GUID_Triangle )) return L"GUID_Triangle"; + if (IsEqualGUID( guid, &GUID_SawtoothUp )) return L"GUID_SawtoothUp"; + if (IsEqualGUID( guid, &GUID_SawtoothDown )) return L"GUID_SawtoothDown"; + if (IsEqualGUID( guid, &GUID_Spring )) return L"GUID_Spring"; + if (IsEqualGUID( guid, &GUID_Damper )) return L"GUID_Damper"; + if (IsEqualGUID( guid, &GUID_Inertia )) return L"GUID_Inertia"; + if (IsEqualGUID( guid, &GUID_Friction )) return L"GUID_Friction"; + return L"GUID_Unknown"; } static HRESULT find_next_effect_id( struct hid_joystick *impl, ULONG *index )

1 0

Ivo Ivanov : winebus.sys: Accept whitespaces in strings parsed from uevent.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: 57161ff6937e7ce738ce461032f894e9134a68af URL: https://source.winehq.org/git/wine.git/?a=commit;h=57161ff6937e7ce738ce4610… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:47 2021 +0100 winebus.sys: Accept whitespaces in strings parsed from uevent. Fixes the device names appearing with the first words in joy.cpl and probably in games, when the UDEV bus is used in HIDRAW mode. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index dad5344a54c..5ff1719848d 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1121,13 +1121,13 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy if (!strncmp(ptr, "HID_UNIQ=", 9)) { if (desc->serialnumber[0]) continue; - if (sscanf(ptr, "HID_UNIQ=%256s\n", buffer) == 1) + if (sscanf(ptr, "HID_UNIQ=%256[^\n]", buffer) == 1) ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc->serialnumber, ARRAY_SIZE(desc->serialnumber)); } if (!strncmp(ptr, "HID_NAME=", 9)) { if (desc->product[0]) continue; - if (sscanf(ptr, "HID_NAME=%256s\n", buffer) == 1) + if (sscanf(ptr, "HID_NAME=%256[^\n]", buffer) == 1) ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc->product, ARRAY_SIZE(desc->product)); } if (!strncmp(ptr, "HID_PHYS=", 9) || !strncmp(ptr, "PHYS=\"", 6))

1 0

Rémi Bernon : dinput: Only call internal poll callback when device is acquired.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: 90ebe524da10fa550daf3aa6fe4d70766a8fd69d URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ebe524da10fa550daf3aa6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 12 14:42:33 2021 +0100 dinput: Only call internal poll callback when device is acquired. Fixes a regression from 53fcfe3834da3c43838cd26bdeb4fdb335542627. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52022 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51956 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 85392c6b30b..a0fc47ec05b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1537,6 +1537,7 @@ static HRESULT WINAPI dinput_device_Poll( IDirectInputDevice8W *iface ) EnterCriticalSection( &impl->crit ); if (!impl->acquired) hr = DIERR_NOTACQUIRED; LeaveCriticalSection( &impl->crit ); + if (FAILED(hr)) return hr; if (impl->vtbl->poll) return impl->vtbl->poll( iface ); return hr;

1 0

Ivo Ivanov : dinput: Set effect block index in the second type specific report.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: 576bf9239f63fb61ecb04327808bb9753a5aeceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=576bf9239f63fb61ecb04327… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:44 2021 +0100 dinput: Set effect block index in the second type specific report. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index c49e840f845..500ae05d481 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2581,6 +2581,11 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) impl->index, impl->joystick->preparsed, impl->type_specific_buf[0], report_len ); if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsageValue returned %#x\n", status ); + if (!impl->type_specific_buf[1][0]) status = HIDP_STATUS_SUCCESS; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, + impl->index, impl->joystick->preparsed, impl->type_specific_buf[1], report_len ); + if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsageValue returned %#x\n", status ); + status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, impl->index, impl->joystick->preparsed, impl->effect_update_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) hr = status;

1 0

Ivo Ivanov : dinput: Fix HID joystick set_ramp_force end_caps lookup.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: fbd7356232c74b2193a5e2088356272e00b482b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbd7356232c74b2193a5e208… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:41 2021 +0100 dinput: Fix HID joystick set_ramp_force end_caps lookup. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index fa3c01ec673..b5b3c73d3de 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1679,7 +1679,7 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap { caps->physical_min = -10000; caps->physical_max = 10000; - set_ramp_force->start_caps = caps; + set_ramp_force->end_caps = caps; } }

1 0

Rémi Bernon : server: Wait for process exit more often and using increasing delay.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: c37a6e8e40e50e96e4e8a5414ce702f0156fde77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c37a6e8e40e50e96e4e8a541… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:26:45 2021 +0100 server: Wait for process exit more often and using increasing delay. Instead of waiting for 1s before considering it dead, when most of the time the process dies quickly, delaying desktop or wineserver shutdown. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 19 +++++++++++++++---- server/process.h | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/server/process.c b/server/process.c index 48b5d6d6dd4..343ad78270c 100644 --- a/server/process.c +++ b/server/process.c @@ -595,10 +595,20 @@ static void process_died( struct process *process ) static void process_sigkill( void *private ) { struct process *process = private; + int signal = 0; - process->sigkill_timeout = NULL; - kill( process->unix_pid, SIGKILL ); - process_died( process ); + process->sigkill_delay *= 2; + if (process->sigkill_delay >= TICKS_PER_SEC / 2) + signal = SIGKILL; + + if (!kill( process->unix_pid, signal ) && !signal) + process->sigkill_timeout = add_timeout_user( -process->sigkill_delay, process_sigkill, process ); + else + { + process->sigkill_delay = TICKS_PER_SEC / 64; + process->sigkill_timeout = NULL; + process_died( process ); + } } /* start the sigkill timer for a process upon exit */ @@ -606,7 +616,7 @@ static void start_sigkill_timer( struct process *process ) { grab_object( process ); if (process->unix_pid != -1) - process->sigkill_timeout = add_timeout_user( -TICKS_PER_SEC, process_sigkill, process ); + process->sigkill_timeout = add_timeout_user( -process->sigkill_delay, process_sigkill, process ); else process_died( process ); } @@ -630,6 +640,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->handles = NULL; process->msg_fd = NULL; process->sigkill_timeout = NULL; + process->sigkill_delay = TICKS_PER_SEC / 64; process->unix_pid = -1; process->exit_code = STILL_ACTIVE; process->running_threads = 0; diff --git a/server/process.h b/server/process.h index 55e4d6dced6..22ee8178368 100644 --- a/server/process.h +++ b/server/process.h @@ -53,6 +53,7 @@ struct process process_id_t group_id; /* group id of the process */ unsigned int session_id; /* session id */ struct timeout_user *sigkill_timeout; /* timeout for final SIGKILL */ + timeout_t sigkill_delay; /* delay before final SIGKILL */ unsigned short machine; /* client machine type */ int unix_pid; /* Unix pid for final SIGKILL */ int exit_code; /* process exit code */

1 0