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

Luke Deller : msvcrt/tests: Add test for fopen/_open access hints.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: 6553a66ba17ca643380eeebbd05d7f2fab936d18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6553a66ba17ca643380eeebb… Author: Luke Deller <luke(a)deller.id.au> Date: Wed Aug 18 15:25:53 2021 +0200 msvcrt/tests: Add test for fopen/_open access hints. Signed-off-by: Luke Deller <luke(a)deller.id.au> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index fb242d81282..1d74c6135b8 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -35,6 +35,7 @@ #include <process.h> #include <errno.h> #include <locale.h> +#include <winternl.h> #define MSVCRT_FD_BLOCK_SIZE 32 typedef struct { @@ -2731,6 +2732,81 @@ static void test_lseek(void) DeleteFileA("_creat.tst"); } +static BOOL has_sequential_hint(int fd) +{ + HANDLE handle; + FILE_MODE_INFORMATION mode_info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + handle = (HANDLE)_get_osfhandle(fd); + status = NtQueryInformationFile(handle, &io, &mode_info, sizeof(mode_info), + FileModeInformation); + ok(!status, "NtQueryInformationFile failed\n"); + return (mode_info.Mode & FILE_SEQUENTIAL_ONLY) != 0; +} + +static void test_fopen_hints(void) +{ + static const struct { + const char *mode; + BOOL seq; + } tests[] = { + { "rb", FALSE }, + { "rbS", TRUE }, + { "rbR", FALSE }, + { "rbSR", TRUE }, + { "rbRS", FALSE } + }; + + char temppath[MAX_PATH], tempfile[MAX_PATH]; + FILE *fp; + int i; + + GetTempPathA(MAX_PATH, temppath); + GetTempFileNameA(temppath, "", 0, tempfile); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + fp = fopen(tempfile, tests[i].mode); + ok(fp != NULL, "unable to fopen test file with mode \"%s\"\n", tests[i].mode); + ok(has_sequential_hint(_fileno(fp)) == tests[i].seq, + "unexpected sequential hint for fopen mode \"%s\"\n", tests[i].mode); + fclose(fp); + } + unlink(tempfile); +} + +static void test_open_hints(void) +{ + static const struct { + int mode; + BOOL seq; + } tests[] = { + { _O_RDONLY | _O_BINARY, FALSE }, + { _O_RDONLY | _O_BINARY | _O_SEQUENTIAL, TRUE }, + { _O_RDONLY | _O_BINARY | _O_RANDOM, FALSE }, + { _O_RDONLY | _O_BINARY | _O_RANDOM | _O_SEQUENTIAL, TRUE } + }; + + char temppath[MAX_PATH], tempfile[MAX_PATH]; + int fd; + int i; + + GetTempPathA(MAX_PATH, temppath); + GetTempFileNameA(temppath, "", 0, tempfile); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + fd = open(tempfile, tests[i].mode); + ok(fd != -1, "unable to _open test file with flags %x\n", tests[i].mode); + ok(has_sequential_hint(fd) == tests[i].seq, + "unexpected sequential hint for _open flags %x\n", tests[i].mode); + close(fd); + } + unlink(tempfile); +} + START_TEST(file) { int arg_c; @@ -2803,6 +2879,8 @@ START_TEST(file) test_close(); test__creat(); test_lseek(); + test_fopen_hints(); + test_open_hints(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Hiroki Awata : msgsm32.acm: Msgsm32 should not perform PCM-to-PCM conversion.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: d05dd4460c69cb749918a61dbaea35285a5cb8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d05dd4460c69cb749918a61d… Author: Hiroki Awata <castaneai(a)by.black> Date: Sat Aug 14 23:56:14 2021 +0900 msgsm32.acm: Msgsm32 should not perform PCM-to-PCM conversion. If the source and destination are both in a specific PCM format (1 channel, 16bit), acmStreamOpen will select the GSM 6.10 driver in preference to the built-in, causing incorrect conversion. Signed-off-by: Hiroki Awata <castaneai(a)by.black> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 1 + dlls/msgsm32.acm/msgsm32.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 04b4e090820..82ddb430cd7 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1056,6 +1056,7 @@ struct stream_output static const struct stream_output expected_output[] = { /* #0: Identical conversion */ {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}, 64, FALSE}, + {{WAVE_FORMAT_PCM, 1, 44100, 88200, 2, 16}, {WAVE_FORMAT_PCM, 1, 44100, 88200, 2, 16}, {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}, 64, FALSE}, /* #1: 1 -> 2 channels */ {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 2, 8000, 16000, 2, 8}, {0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,30,30,31,31,32,32,33,33,34,34,35,35,36,36,37,37,38,38,39,39,40,40,41,41,42,42,43,43,44,44,45,45,46,46,47,47,48,48,49,49,50,50,51,51,52,52,53,53,54,54,55,55,56,56,57,57,58,58,59,59,60,60,61,61,62,62,63,63}, 128, FALSE}, diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index bd54aa4fb36..d1d4c01d0e7 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -364,6 +364,9 @@ static LRESULT GSM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) { int used = 1; gsm r; + if (adsi->pwfxSrc->wFormatTag != WAVE_FORMAT_GSM610 && adsi->pwfxDst->wFormatTag != WAVE_FORMAT_GSM610) + return MMSYSERR_NOTSUPPORTED; + if (!GSM_FormatValidate(adsi->pwfxSrc) || !GSM_FormatValidate(adsi->pwfxDst)) return MMSYSERR_NOTSUPPORTED;

1 0

Nikolay Sivov : dwrite/tests: Use winetest context for some tests.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: eba92fd3a776dbcb4e6aa34036a19bd69c331e6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=eba92fd3a776dbcb4e6aa340… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 18 16:52:32 2021 +0300 dwrite/tests: Use winetest context for some tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 77 ++++---- dlls/dwrite/tests/font.c | 443 ++++++++++++++++++++++++------------------- 2 files changed, 285 insertions(+), 235 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eba92fd3a776dbcb4e6a…

1 0

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

Aug. 18, 2021

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: Rank drivers according to their id match.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

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 Aug. 18, 2021

Aug. 18, 2021

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 Aug. 18, 2021

Aug. 18, 2021

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

Piotr Caban : msvcrt: Use new() for allocations returning BadAlloc exception.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: b24ee3b534b3d186470e9ef0dd72b27452308dcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b24ee3b534b3d186470e9ef0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 16:08:56 2021 +0200 msvcrt: Use new() for allocations returning BadAlloc exception. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 74156aa7db3..78767689c06 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -23,7 +23,6 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" -#include "wine/heap.h" #include "msvcrt.h" #include "cppexcept.h" #include "mtdll.h" @@ -921,11 +920,9 @@ int __cdecl event_wait_for_multiple(event **events, size_t count, bool wait_all, if(count == 0) return 0; - wait = heap_alloc(FIELD_OFFSET(thread_wait, entries[count])); - if(!wait) - throw_exception(EXCEPTION_BAD_ALLOC, 0, "bad allocation"); + wait = operator_new(FIELD_OFFSET(thread_wait, entries[count])); ret = evt_wait(wait, events, count, wait_all, timeout); - heap_free(wait); + operator_delete(wait); return ret; } @@ -1005,10 +1002,7 @@ bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, TRACE("(%p %p %d)\n", this, cs, timeout); - if(!(q = HeapAlloc(GetProcessHeap(), 0, sizeof(cv_queue)))) { - throw_exception(EXCEPTION_BAD_ALLOC, 0, "bad allocation"); - } - + q = operator_new(sizeof(cv_queue)); critical_section_lock(&this->lock); q->next = this->queue; q->expired = FALSE; @@ -1030,7 +1024,7 @@ bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, NtWaitForKeyedEvent(keyed_event, q, 0, 0); } - HeapFree(GetProcessHeap(), 0, q); + operator_delete(q); critical_section_lock(cs); return TRUE; }

1 0

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

Aug. 18, 2021

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

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

Aug. 18, 2021

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