August 2021 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Move _Trace_agents function to concurrency.c.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 69e2467aa78350f0e5a1e349f23e23a0550808c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69e2467aa78350f0e5a1e349… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 16:09:27 2021 +0200 msvcrt: Move _Trace_agents function to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 8 ++++++++ dlls/msvcrt/misc.c | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 142d578633e..5aee472559e 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -2374,6 +2374,14 @@ void __cdecl Concurrency_wait(unsigned int time) Sleep(time); } +#if _MSVCR_VER>=110 +/* ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ */ +void WINAPIV _Trace_agents(/*enum Concurrency::Agents_EventType*/int type, __int64 id, ...) +{ + FIXME("(%d %s)\n", type, wine_dbgstr_longlong(id)); +} +#endif + #ifdef __ASM_USE_THISCALL_WRAPPER #define DEFINE_VTBL_WRAPPER(off) \ diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 5ea1ddfc6c7..bee269ed5f8 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -562,12 +562,6 @@ LONG CDECL __crtUnhandledException(EXCEPTION_POINTERS *ep) SetUnhandledExceptionFilter(NULL); return UnhandledExceptionFilter(ep); } - -/* ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ */ -void WINAPIV _Trace_agents(/*enum Concurrency::Agents_EventType*/int type, __int64 id, ...) -{ - FIXME("(%d %s)\n", type, wine_dbgstr_longlong(id)); -} #endif #if _MSVCR_VER>=120

1 0

Piotr Caban : msvcrt: Move _Trace_ppl_function to concurrency.c.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: ce5c989171f458842bee6e168a65dc36d2ec61d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce5c989171f458842bee6e16… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 16:09:51 2021 +0200 msvcrt: Move _Trace_ppl_function to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcrt/concurrency.c | 19 +++++++++++++++++++ dlls/msvcrt/cpp.c | 23 ----------------------- 5 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6af92d7ea6f..26a1f1fdea7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -386,8 +386,8 @@ @ stub -arch=win64 ?_Stop(a)_Timer@details(a)Concurrency@@IEAAXXZ @ stub -arch=win32 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ -@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function -@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) _Trace_ppl_function +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) _Trace_ppl_function @ thiscall -arch=win32 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ thiscall -arch=win32 ?_TryAcquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 45d8e2b3507..e77a855a263 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -658,8 +658,8 @@ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ @ varargs ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ(long int64) _Trace_agents -@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function -@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) _Trace_ppl_function +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) _Trace_ppl_function @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 3ed0aafdc3d..c540c4019bc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -640,8 +640,8 @@ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ @ varargs ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ(long int64) _Trace_agents -@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function -@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) _Trace_ppl_function +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) _Trace_ppl_function @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 5aee472559e..a4df63d19a8 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -296,6 +296,18 @@ typedef struct { CRITICAL_SECTION cs; } _ReentrantBlockingLock; +enum ConcRT_EventType +{ + CONCRT_EVENT_GENERIC, + CONCRT_EVENT_START, + CONCRT_EVENT_END, + CONCRT_EVENT_BLOCK, + CONCRT_EVENT_UNBLOCK, + CONCRT_EVENT_YIELD, + CONCRT_EVENT_ATTACH, + CONCRT_EVENT_DETACH +}; + static int context_tls_index = TLS_OUT_OF_INDEXES; static CRITICAL_SECTION default_scheduler_cs; @@ -2382,6 +2394,13 @@ void WINAPIV _Trace_agents(/*enum Concurrency::Agents_EventType*/int type, __int } #endif +/* ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z */ +/* ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z */ +void __cdecl _Trace_ppl_function(const GUID *guid, unsigned char level, enum ConcRT_EventType type) +{ + FIXME("(%s %u %i) stub\n", debugstr_guid(guid), level, type); +} + #ifdef __ASM_USE_THISCALL_WRAPPER #define DEFINE_VTBL_WRAPPER(off) \ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 1f36bca5712..638081f5b85 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -2075,26 +2075,3 @@ size_t CDECL __std_type_info_hash(const type_info140 *ti) } #endif /* _MSVCR_VER >= 140 */ - -#if _MSVCR_VER >= 100 - -enum ConcRT_EventType -{ - CONCRT_EVENT_GENERIC, - CONCRT_EVENT_START, - CONCRT_EVENT_END, - CONCRT_EVENT_BLOCK, - CONCRT_EVENT_UNBLOCK, - CONCRT_EVENT_YIELD, - CONCRT_EVENT_ATTACH, - CONCRT_EVENT_DETACH -}; - -/* ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z */ -/* ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z */ -void __cdecl Concurrency__Trace_ppl_function(const GUID *guid, unsigned char level, enum ConcRT_EventType type) -{ - FIXME("(%s %u %i) stub\n", debugstr_guid(guid), level, type); -} - -#endif /* _MSVCR_VER >= 100 */

1 0

Alexandre Julliard : ntdll/tests: Don't mark Wow64 behavior as broken.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 0883dafe6a9c3a49fcc5c4b65904503172e6aa5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0883dafe6a9c3a49fcc5c4b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 18 20:03:31 2021 +0200 ntdll/tests: Don't mark Wow64 behavior as broken. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f79a302d4aa..2a56641ca3c 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -470,7 +470,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { ok(context->Eip == (DWORD)code_mem + 0xa || - broken(context->Eip == (DWORD)code_mem + 0xb) /* win2k3 */ || + (is_wow64 && context->Eip == (DWORD)code_mem + 0xb) || broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, "Eip at %x instead of %x or %x\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); @@ -507,7 +507,7 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { ok(context->Eip == (DWORD)code_mem + 0xa || - broken(context->Eip == (DWORD)code_mem + 0xb) /* win2k3 */ || + (is_wow64 && context->Eip == (DWORD)code_mem + 0xb) || broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, "Eip at %x instead of %x or %x\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); @@ -1177,7 +1177,7 @@ static void test_debugger(DWORD cont_status) if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) { ok((char *)ctx.Eip == (char *)code_mem_address + 0xa || - broken(is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb) || + (is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb) || broken((char *)ctx.Eip == (char *)code_mem_address + 0xd) /* w2008 */, "Eip at 0x%x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xa);

1 0

Rémi Bernon : setupapi: Use a struct driver instead of individual local variables.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: fcb6da3af415f76c194340c9a5d10b7cdf586d65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcb6da3af415f76c194340c9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 18 09:40:10 2021 +0200 setupapi: Use a struct driver instead of individual local variables. In enum_compat_drivers_from_file. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 91001976edd..baef28ac130 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4644,9 +4644,10 @@ static BOOL version_is_compatible(const WCHAR *version) static void enum_compat_drivers_from_file(struct device *device, const WCHAR *path) { static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; - WCHAR mfg_name[LINE_LEN], mfg_key[LINE_LEN], mfg_key_ext[LINE_LEN], id[MAX_DEVICE_ID_LEN], version[MAX_DEVICE_ID_LEN]; + WCHAR mfg_key[LINE_LEN], id[MAX_DEVICE_ID_LEN], version[MAX_DEVICE_ID_LEN]; + DWORD i, j, k, driver_count = device->driver_count; + struct driver driver, *drivers = device->drivers; INFCONTEXT ctx; - DWORD i, j, k; HINF hinf; TRACE("Enumerating drivers from %s.\n", debugstr_w(path)); @@ -4654,11 +4655,13 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa if ((hinf = SetupOpenInfFileW(path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) return; + lstrcpyW(driver.inf_path, path); + for (i = 0; SetupGetLineByIndexW(hinf, manufacturerW, i, &ctx); ++i) { - SetupGetStringFieldW(&ctx, 0, mfg_name, ARRAY_SIZE(mfg_name), NULL); + SetupGetStringFieldW(&ctx, 0, driver.manufacturer, ARRAY_SIZE(driver.manufacturer), NULL); if (!SetupGetStringFieldW(&ctx, 1, mfg_key, ARRAY_SIZE(mfg_key), NULL)) - lstrcpyW(mfg_key, mfg_name); + lstrcpyW(mfg_key, driver.manufacturer); if (SetupGetFieldCount(&ctx) >= 2) { @@ -4675,37 +4678,37 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa continue; } - if (!SetupDiGetActualSectionToInstallW(hinf, mfg_key, mfg_key_ext, ARRAY_SIZE(mfg_key_ext), NULL, NULL)) + if (!SetupDiGetActualSectionToInstallW(hinf, mfg_key, driver.mfg_key, + ARRAY_SIZE(driver.mfg_key), NULL, NULL)) { WARN("Failed to find section for %s, skipping.\n", debugstr_w(mfg_key)); continue; } - for (j = 0; SetupGetLineByIndexW(hinf, mfg_key_ext, j, &ctx); ++j) + for (j = 0; SetupGetLineByIndexW(hinf, driver.mfg_key, j, &ctx); ++j) { for (k = 2; SetupGetStringFieldW(&ctx, k, id, ARRAY_SIZE(id), NULL); ++k) { if (device_matches_id(device, HardwareId, id) || device_matches_id(device, CompatibleIDs, id)) { - unsigned int count = ++device->driver_count; - - device->drivers = heap_realloc(device->drivers, count * sizeof(*device->drivers)); - lstrcpyW(device->drivers[count - 1].inf_path, path); - lstrcpyW(device->drivers[count - 1].manufacturer, mfg_name); - lstrcpyW(device->drivers[count - 1].mfg_key, mfg_key_ext); - SetupGetStringFieldW(&ctx, 0, device->drivers[count - 1].description, - ARRAY_SIZE(device->drivers[count - 1].description), NULL); - SetupGetStringFieldW(&ctx, 1, device->drivers[count - 1].section, - ARRAY_SIZE(device->drivers[count - 1].section), NULL); + SetupGetStringFieldW(&ctx, 0, driver.description, ARRAY_SIZE(driver.description), NULL); + SetupGetStringFieldW(&ctx, 1, driver.section, ARRAY_SIZE(driver.section), NULL); TRACE("Found compatible driver: manufacturer %s, desc %s.\n", - debugstr_w(mfg_name), debugstr_w(device->drivers[count - 1].description)); + debugstr_w(driver.manufacturer), debugstr_w(driver.description)); + + driver_count++; + drivers = heap_realloc(drivers, driver_count * sizeof(*drivers)); + drivers[driver_count - 1] = driver; } } } } SetupCloseInfFile(hinf); + + device->drivers = drivers; + device->driver_count = driver_count; } /***********************************************************************

1 0

Rémi Bernon : setupapi: Create only one driver per driver id match.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: eb94d7aea85b13197f8d678baeca414adc05aaed URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb94d7aea85b13197f8d678b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 18 09:40:11 2021 +0200 setupapi: Create only one driver per driver id match. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 26 +++++++++++++++----------- dlls/setupapi/tests/devinst.c | 9 +-------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index baef28ac130..13e52f4534a 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4648,6 +4648,7 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa DWORD i, j, k, driver_count = device->driver_count; struct driver driver, *drivers = device->drivers; INFCONTEXT ctx; + BOOL found; HINF hinf; TRACE("Enumerating drivers from %s.\n", debugstr_w(path)); @@ -4687,20 +4688,23 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa for (j = 0; SetupGetLineByIndexW(hinf, driver.mfg_key, j, &ctx); ++j) { - for (k = 2; SetupGetStringFieldW(&ctx, k, id, ARRAY_SIZE(id), NULL); ++k) + for (k = 2, found = FALSE; SetupGetStringFieldW(&ctx, k, id, ARRAY_SIZE(id), NULL); ++k) { - if (device_matches_id(device, HardwareId, id) || device_matches_id(device, CompatibleIDs, id)) - { - SetupGetStringFieldW(&ctx, 0, driver.description, ARRAY_SIZE(driver.description), NULL); - SetupGetStringFieldW(&ctx, 1, driver.section, ARRAY_SIZE(driver.section), NULL); + if ((found = device_matches_id(device, HardwareId, id))) break; + if ((found = device_matches_id(device, CompatibleIDs, id))) break; + } - TRACE("Found compatible driver: manufacturer %s, desc %s.\n", - debugstr_w(driver.manufacturer), debugstr_w(driver.description)); + if (found) + { + SetupGetStringFieldW(&ctx, 0, driver.description, ARRAY_SIZE(driver.description), NULL); + SetupGetStringFieldW(&ctx, 1, driver.section, ARRAY_SIZE(driver.section), NULL); - driver_count++; - drivers = heap_realloc(drivers, driver_count * sizeof(*drivers)); - drivers[driver_count - 1] = driver; - } + TRACE("Found compatible driver: manufacturer %s, desc %s.\n", + debugstr_w(driver.manufacturer), debugstr_w(driver.description)); + + driver_count++; + drivers = heap_realloc(drivers, driver_count * sizeof(*drivers)); + drivers[driver_count - 1] = driver; } } } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 73e0086081d..677d6bda02a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2458,14 +2458,7 @@ static void test_driver_list(void) ret = SetupDiEnumDriverInfoA(set, &device, SPDIT_COMPATDRIVER, idx++, &driver); ok(ret, "Failed to enumerate drivers, error %#x.\n", GetLastError()); ok(driver.DriverType == SPDIT_COMPATDRIVER, "Got wrong type %#x.\n", driver.DriverType); - todo_wine ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); - if (strcmp(driver.Description, "desc1")) - { - ret = SetupDiEnumDriverInfoA(set, &device, SPDIT_COMPATDRIVER, idx++, &driver); - ok(ret, "Failed to enumerate drivers, error %#x.\n", GetLastError()); - ok(driver.DriverType == SPDIT_COMPATDRIVER, "Got wrong type %#x.\n", driver.DriverType); - ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); - } + ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); ok(!strcmp(driver.MfgName, wow64 ? "mfg1_wow" : "mfg1"), "Got wrong manufacturer '%s'.\n", driver.MfgName); ok(!strcmp(driver.ProviderName, ""), "Got wrong provider '%s'.\n", driver.ProviderName);

1 0

Rémi Bernon : setupapi: Rank drivers according to their id match.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: cfddd2c1e24fc03ad570f771093fd08bbf8b9575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfddd2c1e24fc03ad570f771… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 18 09:40:12 2021 +0200 setupapi: Rank drivers according to their id match. And as described on MSDN "Driver Rank Example". In order to safely remove the hardcoded XBox gamepad ID list from winebus.sys, and list their hardware IDs in the (future) xinput.sys driver INF. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 33 ++++++++++++++++++++++++--------- dlls/setupapi/tests/devinst.c | 2 +- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 13e52f4534a..29cfbbeb87f 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -109,6 +109,7 @@ static const WCHAR emptyW[] = {0}; struct driver { + DWORD rank; WCHAR inf_path[MAX_PATH]; WCHAR manufacturer[LINE_LEN]; WCHAR mfg_key[LINE_LEN]; @@ -4588,21 +4589,23 @@ BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO devinfo, SP_DEVINFO_DATA /* Check whether the given hardware or compatible ID matches any of the device's * own hardware or compatible IDs. */ -static BOOL device_matches_id(const struct device *device, const WCHAR *id_type, const WCHAR *id) +static BOOL device_matches_id(const struct device *device, const WCHAR *id_type, const WCHAR *id, + DWORD *driver_rank) { WCHAR *device_ids; const WCHAR *p; - DWORD size; + DWORD i, size; if (!RegGetValueW(device->key, NULL, id_type, RRF_RT_REG_MULTI_SZ, NULL, NULL, &size)) { device_ids = heap_alloc(size); if (!RegGetValueW(device->key, NULL, id_type, RRF_RT_REG_MULTI_SZ, NULL, device_ids, &size)) { - for (p = device_ids; *p; p += lstrlenW(p) + 1) + for (p = device_ids, i = 0; *p; p += lstrlenW(p) + 1, i++) { if (!wcsicmp(p, id)) { + *driver_rank += min(i, 0xff); heap_free(device_ids); return TRUE; } @@ -4688,10 +4691,13 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa for (j = 0; SetupGetLineByIndexW(hinf, driver.mfg_key, j, &ctx); ++j) { + driver.rank = 0; for (k = 2, found = FALSE; SetupGetStringFieldW(&ctx, k, id, ARRAY_SIZE(id), NULL); ++k) { - if ((found = device_matches_id(device, HardwareId, id))) break; - if ((found = device_matches_id(device, CompatibleIDs, id))) break; + if ((found = device_matches_id(device, HardwareId, id, &driver.rank))) break; + driver.rank += 0x2000; + if ((found = device_matches_id(device, CompatibleIDs, id, &driver.rank))) break; + driver.rank = 0x1000 + min(0x0100 * (k - 2), 0xf00); } if (found) @@ -4699,8 +4705,8 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa SetupGetStringFieldW(&ctx, 0, driver.description, ARRAY_SIZE(driver.description), NULL); SetupGetStringFieldW(&ctx, 1, driver.section, ARRAY_SIZE(driver.section), NULL); - TRACE("Found compatible driver: manufacturer %s, desc %s.\n", - debugstr_w(driver.manufacturer), debugstr_w(driver.description)); + TRACE("Found compatible driver: rank %#x manufacturer %s, desc %s.\n", + driver.rank, debugstr_w(driver.manufacturer), debugstr_w(driver.description)); driver_count++; drivers = heap_realloc(drivers, driver_count * sizeof(*drivers)); @@ -4867,6 +4873,8 @@ BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { struct device *device; + struct driver *best; + DWORD i; TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); @@ -4880,10 +4888,17 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device return FALSE; } - WARN("Semi-stub, selecting the first available driver.\n"); + best = device->drivers; + for (i = 1; i < device->driver_count; ++i) + { + if (device->drivers[i].rank >= best->rank) continue; + best = device->drivers + i; + } - device->selected_driver = &device->drivers[0]; + TRACE("selected driver: rank %#x manufacturer %s, desc %s.\n", + best->rank, debugstr_w(best->manufacturer), debugstr_w(best->description)); + device->selected_driver = best; return TRUE; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 677d6bda02a..6f02acb9589 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2575,7 +2575,7 @@ static void test_driver_list(void) ret = SetupDiGetSelectedDriverA(set, &device, &driver); ok(ret, "Failed to get selected driver, error %#x.\n", GetLastError()); ok(driver.DriverType == SPDIT_COMPATDRIVER, "Got wrong type %#x.\n", driver.DriverType); - todo_wine ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); + ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); ok(!strcmp(driver.MfgName, wow64 ? "mfg1_wow" : "mfg1"), "Got wrong manufacturer '%s'.\n", driver.MfgName); ok(!strcmp(driver.ProviderName, ""), "Got wrong provider '%s'.\n", driver.ProviderName);

1 0

Rémi Bernon : winebus.sys: Introduce a new start_device callback.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 68c6c7d9362c53b4e0668c056f74d1f3e706a5fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=68c6c7d9362c53b4e0668c05… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 18 09:14:18 2021 +0200 winebus.sys: Introduce a new start_device callback. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_iohid.c | 6 ++++++ dlls/winebus.sys/bus_sdl.c | 6 ++++++ dlls/winebus.sys/bus_udev.c | 12 ++++++++++++ dlls/winebus.sys/main.c | 33 ++++++++++++++++++++++++++++----- 5 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 72bd071135b..f46daa7144d 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -39,6 +39,7 @@ typedef struct { void (*free_device)(DEVICE_OBJECT *device); int (*compare_platform_device)(DEVICE_OBJECT *device, void *platform_dev); + NTSTATUS (*start_device)(DEVICE_OBJECT *device); NTSTATUS (*get_reportdescriptor)(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length); NTSTATUS (*get_string)(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length); NTSTATUS (*begin_report_processing)(DEVICE_OBJECT *device); diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index eb6765d6aac..9b9e93f5c49 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -148,6 +148,11 @@ static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) return 0; } +static NTSTATUS start_device(DEVICE_OBJECT *device) +{ + return STATUS_SUCCESS; +} + static NTSTATUS get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) { struct platform_private *private = impl_from_DEVICE_OBJECT(device); @@ -274,6 +279,7 @@ static const platform_vtbl iohid_vtbl = { free_device, compare_platform_device, + start_device, get_reportdescriptor, get_string, begin_report_processing, diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index c833b4e4c06..e7b7c1fef22 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -487,6 +487,11 @@ static int compare_platform_device(DEVICE_OBJECT *device, void *context) return impl_from_DEVICE_OBJECT(device)->id - PtrToUlong(context); } +static NTSTATUS start_device(DEVICE_OBJECT *device) +{ + return STATUS_SUCCESS; +} + static NTSTATUS get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) { struct platform_private *ext = impl_from_DEVICE_OBJECT(device); @@ -596,6 +601,7 @@ static const platform_vtbl sdl_vtbl = { free_device, compare_platform_device, + start_device, get_reportdescriptor, get_string, begin_report_processing, diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 9176dff69a7..eb6434ad2a5 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -558,6 +558,11 @@ static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) return strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2)); } +static NTSTATUS hidraw_start_device(DEVICE_OBJECT *device) +{ + return STATUS_SUCCESS; +} + static NTSTATUS hidraw_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) { #ifdef HAVE_LINUX_HIDRAW_H @@ -818,6 +823,7 @@ static const platform_vtbl hidraw_vtbl = { hidraw_free_device, compare_platform_device, + hidraw_start_device, hidraw_get_reportdescriptor, hidraw_get_string, begin_report_processing, @@ -854,6 +860,11 @@ static void lnxev_free_device(DEVICE_OBJECT *device) udev_device_unref(ext->base.udev_device); } +static NTSTATUS lnxev_start_device(DEVICE_OBJECT *device) +{ + return STATUS_SUCCESS; +} + static NTSTATUS lnxev_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) { struct wine_input_private *ext = input_impl_from_DEVICE_OBJECT(device); @@ -967,6 +978,7 @@ static NTSTATUS lnxev_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE * static const platform_vtbl lnxev_vtbl = { lnxev_free_device, compare_platform_device, + lnxev_start_device, lnxev_get_reportdescriptor, lnxev_get_string, lnxev_begin_report_processing, diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index a60e3cc9a2c..f15e7da47b2 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -109,11 +109,17 @@ struct pnp_device DEVICE_OBJECT *device; }; +enum device_state +{ + DEVICE_STATE_STOPPED, + DEVICE_STATE_STARTED, + DEVICE_STATE_REMOVED, +}; + struct device_extension { CRITICAL_SECTION cs; - - BOOL removed; + enum device_state state; struct pnp_device *pnp_device; @@ -480,6 +486,11 @@ static void mouse_free_device(DEVICE_OBJECT *device) { } +static NTSTATUS mouse_start_device(DEVICE_OBJECT *device) +{ + return STATUS_SUCCESS; +} + static NTSTATUS mouse_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *ret_length) { TRACE("buffer %p, length %u.\n", buffer, length); @@ -528,6 +539,7 @@ static NTSTATUS mouse_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE * static const platform_vtbl mouse_vtbl = { .free_device = mouse_free_device, + .start_device = mouse_start_device, .get_reportdescriptor = mouse_get_reportdescriptor, .get_string = mouse_get_string, .begin_report_processing = mouse_begin_report_processing, @@ -555,6 +567,11 @@ static void keyboard_free_device(DEVICE_OBJECT *device) { } +static NTSTATUS keyboard_start_device(DEVICE_OBJECT *device) +{ + return STATUS_SUCCESS; +} + static NTSTATUS keyboard_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *ret_length) { TRACE("buffer %p, length %u.\n", buffer, length); @@ -603,6 +620,7 @@ static NTSTATUS keyboard_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYT static const platform_vtbl keyboard_vtbl = { .free_device = keyboard_free_device, + .start_device = keyboard_start_device, .get_reportdescriptor = keyboard_get_reportdescriptor, .get_string = keyboard_get_string, .begin_report_processing = keyboard_begin_report_processing, @@ -695,13 +713,18 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) break; case IRP_MN_START_DEVICE: - status = STATUS_SUCCESS; + EnterCriticalSection(&ext->cs); + if (ext->state != DEVICE_STATE_STOPPED) status = STATUS_SUCCESS; + else if (ext->state == DEVICE_STATE_REMOVED) status = STATUS_DELETE_PENDING; + else if (!(status = ext->vtbl->start_device(device))) ext->state = DEVICE_STATE_STARTED; + else ERR("failed to start device %p, status %#x\n", device, status); + LeaveCriticalSection(&ext->cs); break; case IRP_MN_SURPRISE_REMOVAL: EnterCriticalSection(&ext->cs); remove_pending_irps(device); - ext->removed = TRUE; + ext->state = DEVICE_STATE_REMOVED; LeaveCriticalSection(&ext->cs); status = STATUS_SUCCESS; break; @@ -834,7 +857,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) EnterCriticalSection(&ext->cs); - if (ext->removed) + if (ext->state == DEVICE_STATE_REMOVED) { LeaveCriticalSection(&ext->cs); irp->IoStatus.Status = STATUS_DELETE_PENDING;

1 0

Rémi Bernon : winebus.sys: Build report descriptors in start_device.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 620b514aa0b41187a3c438eb515bbeab02feb7bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=620b514aa0b41187a3c438eb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 18 09:14:19 2021 +0200 winebus.sys: Build report descriptors in start_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 19 +++---------------- dlls/winebus.sys/bus_udev.c | 17 ++--------------- dlls/winebus.sys/main.c | 30 ++++++++++++++---------------- 3 files changed, 19 insertions(+), 47 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index e7b7c1fef22..21eac3c67f4 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -489,7 +489,9 @@ static int compare_platform_device(DEVICE_OBJECT *device, void *context) static NTSTATUS start_device(DEVICE_OBJECT *device) { - return STATUS_SUCCESS; + struct platform_private *ext = impl_from_DEVICE_OBJECT(device); + if (ext->sdl_controller) return build_mapped_report_descriptor(ext); + return build_report_descriptor(ext); } static NTSTATUS get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) @@ -797,25 +799,10 @@ static void try_add_device(unsigned int index) if (device) { - NTSTATUS status; struct platform_private *private = impl_from_DEVICE_OBJECT(device); private->sdl_joystick = joystick; private->sdl_controller = controller; private->id = id; - - /* FIXME: We should probably move this to IRP_MN_START_DEVICE. */ - if (controller) - status = build_mapped_report_descriptor(private); - else - status = build_report_descriptor(private); - if (status) - { - ERR("Building report descriptor failed, removing device\n"); - bus_unlink_hid_device(device); - bus_remove_hid_device(device); - HeapFree(GetProcessHeap(), 0, serial); - return; - } IoInvalidateDeviceRelations(bus_pdo, BusRelations); } else diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index eb6434ad2a5..25c8b5f0b36 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -862,7 +862,8 @@ static void lnxev_free_device(DEVICE_OBJECT *device) static NTSTATUS lnxev_start_device(DEVICE_OBJECT *device) { - return STATUS_SUCCESS; + struct wine_input_private *ext = input_impl_from_DEVICE_OBJECT(device); + return build_report_descriptor(ext, ext->base.udev_device); } static NTSTATUS lnxev_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) @@ -1148,20 +1149,6 @@ static void try_add_device(struct udev_device *dev) struct platform_private *private = impl_from_DEVICE_OBJECT(device); private->udev_device = udev_device_ref(dev); private->device_fd = fd; -#ifdef HAS_PROPER_INPUT_HEADER - if (strcmp(subsystem, "input") == 0) - /* FIXME: We should probably move this to IRP_MN_START_DEVICE. */ - if (build_report_descriptor((struct wine_input_private *)private, dev)) - { - ERR("Building report descriptor failed, removing device\n"); - close(fd); - udev_device_unref(dev); - bus_unlink_hid_device(device); - bus_remove_hid_device(device); - HeapFree(GetProcessHeap(), 0, serial); - return; - } -#endif IoInvalidateDeviceRelations(bus_pdo, BusRelations); } else diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index f15e7da47b2..3bb534a7d8a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -488,6 +488,13 @@ static void mouse_free_device(DEVICE_OBJECT *device) static NTSTATUS mouse_start_device(DEVICE_OBJECT *device) { + if (!hid_descriptor_begin(&mouse_desc, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_MOUSE)) + return STATUS_NO_MEMORY; + if (!hid_descriptor_add_buttons(&mouse_desc, HID_USAGE_PAGE_BUTTON, 1, 3)) + return STATUS_NO_MEMORY; + if (!hid_descriptor_end(&mouse_desc)) + return STATUS_NO_MEMORY; + return STATUS_SUCCESS; } @@ -551,14 +558,6 @@ static const platform_vtbl mouse_vtbl = static void mouse_device_create(void) { static const WCHAR busidW[] = {'W','I','N','E','M','O','U','S','E',0}; - - if (!hid_descriptor_begin(&mouse_desc, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_MOUSE)) - return; - if (!hid_descriptor_add_buttons(&mouse_desc, HID_USAGE_PAGE_BUTTON, 1, 3)) - return; - if (!hid_descriptor_end(&mouse_desc)) - return; - mouse_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &mouse_vtbl, 0); IoInvalidateDeviceRelations(bus_pdo, BusRelations); } @@ -569,6 +568,13 @@ static void keyboard_free_device(DEVICE_OBJECT *device) static NTSTATUS keyboard_start_device(DEVICE_OBJECT *device) { + if (!hid_descriptor_begin(&keyboard_desc, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD)) + return STATUS_NO_MEMORY; + if (!hid_descriptor_add_buttons(&keyboard_desc, HID_USAGE_PAGE_KEYBOARD, 0, 101)) + return STATUS_NO_MEMORY; + if (!hid_descriptor_end(&keyboard_desc)) + return STATUS_NO_MEMORY; + return STATUS_SUCCESS; } @@ -632,14 +638,6 @@ static const platform_vtbl keyboard_vtbl = static void keyboard_device_create(void) { static const WCHAR busidW[] = {'W','I','N','E','K','E','Y','B','O','A','R','D',0}; - - if (!hid_descriptor_begin(&keyboard_desc, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD)) - return; - if (!hid_descriptor_add_buttons(&keyboard_desc, HID_USAGE_PAGE_KEYBOARD, 0, 101)) - return; - if (!hid_descriptor_end(&keyboard_desc)) - return; - keyboard_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &keyboard_vtbl, 0); IoInvalidateDeviceRelations(bus_pdo, BusRelations); }

1 0

Rémi Bernon : winebus.sys: Remove the now useless bus_remove_hid_device.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 8f065f97c91433eab9d6141e5cce118d00701210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f065f97c91433eab9d6141e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 18 09:14:20 2021 +0200 winebus.sys: Remove the now useless bus_remove_hid_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 - dlls/winebus.sys/main.c | 18 ------------------ 2 files changed, 19 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index f46daa7144d..d07b33e86b3 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -56,7 +56,6 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, const platform_vtbl *vtbl, DWORD platform_data_size) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) DECLSPEC_HIDDEN; void bus_unlink_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; -void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function, void *context) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 3bb534a7d8a..4b246b0059a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -378,24 +378,6 @@ void bus_unlink_hid_device(DEVICE_OBJECT *device) LeaveCriticalSection(&device_list_cs); } -void bus_remove_hid_device(DEVICE_OBJECT *device) -{ - struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - struct pnp_device *pnp_device = ext->pnp_device; - - TRACE("(%p)\n", device); - - ext->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&ext->cs); - - HeapFree(GetProcessHeap(), 0, ext->serial); - HeapFree(GetProcessHeap(), 0, ext->last_report); - IoDeleteDevice(device); - - /* pnp_device must be released after the device is gone */ - HeapFree(GetProcessHeap(), 0, pnp_device); -} - static NTSTATUS build_device_relations(DEVICE_RELATIONS **devices) { int i;

1 0

Rémi Bernon : winebus.sys: Merge begin_report_processing with start_device.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: ee5cde83dae7024873438be4c806c106fe121b04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee5cde83dae7024873438be4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 18 09:14:21 2021 +0200 winebus.sys: Merge begin_report_processing with start_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 - dlls/winebus.sys/bus_iohid.c | 27 +++++-------- dlls/winebus.sys/bus_sdl.c | 6 --- dlls/winebus.sys/bus_udev.c | 94 ++++++++++++++++++++------------------------ dlls/winebus.sys/main.c | 17 -------- 5 files changed, 51 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee5cde83dae702487343…

1 0