February 2022 - Wine-Commits

Francois Gouget : hnetcfg: Fix the spelling of a TRACE() message.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: fcc0f1fb645111352bea815deefa34aecf4248ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc0f1fb645111352bea815d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 13:58:38 2022 +0100 hnetcfg: Fix the spelling of a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index bda9455a2b5..61513f97746 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -1522,7 +1522,7 @@ static HRESULT WINAPI static_ports_Add( struct port_mapping mapping_data; HRESULT ret; - TRACE( "iface %p, external %ld, protocol %s, internal %ld, client %s, enabled %d, descritption %s, mapping %p.\n", + TRACE( "iface %p, external %ld, protocol %s, internal %ld, client %s, enabled %d, description %s, mapping %p.\n", iface, external, debugstr_w(protocol), internal, debugstr_w(client), enabled, debugstr_w(description), mapping );

1 0

Francois Gouget : msdasql: Remove a couple of unneeded NULL casts.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 64a778338664ec65994f9a185d8c7b2cf2174890 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64a778338664ec65994f9a18… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 13:57:28 2022 +0100 msdasql: Remove a couple of unneeded NULL casts. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 3e1af95b1a7..60d46349590 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -547,7 +547,7 @@ static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) } ret = SQLConnectW( provider->hdbc, (SQLWCHAR *)V_BSTR(&provider->properties[i].value), - SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS ); + SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS ); TRACE("SQLConnectW ret %d\n", ret); if (ret != SQL_SUCCESS) {

1 0

Francois Gouget : dinput/tests: Remove an unneeded NULL cast.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 57d342afe50db084a4b812e6db90ad4142dcd3df URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d342afe50db084a4b812e6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 13:57:49 2022 +0100 dinput/tests: Remove an unneeded NULL cast. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 71e9f66834c..83635146324 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -3547,7 +3547,7 @@ DWORD WINAPI dinput_test_device_thread( void *stop_event ) ok( !status, "RegSetValueExW returned %#lx\n", status ); status = RegSetValueExW( hkey, L"Caps", 0, REG_BINARY, (void *)&caps, sizeof(caps) ); ok( !status, "RegSetValueExW returned %#lx\n", status ); - status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, (void *)NULL, 0 ); + status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#lx\n", status ); status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#lx\n", status );

1 0

Rémi Bernon : winebus.sys: Fix HID haptics waveform NONE / STOP ordinals.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: baa417a371d03ead4d84053dea01f78469f0b633 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baa417a371d03ead4d84053d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 14 17:26:19 2022 +0100 winebus.sys: Fix HID haptics waveform NONE / STOP ordinals. There's some inconsistencies between the HID 1.22 specification and HID usage names in Windows SDK headers. The headers use STOP for the 0x1001 usage name, and NULL for 0x1002, where the HID spec uses None for the 0x1001 usage name and Stop for 0x1002. Both are implicit waveforms anyway, and the HID usages aren't really used anywhere, but their ordinal matters. The HID spec says that None has ordinal 1, and Stop ordinal 2, and that Stop waveform can be used to stop any previously started waveform. We are going to stick to that and ignore the HID usages, although the names won't match the usages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 20 ++++++++------------ dlls/winebus.sys/unix_private.h | 24 +++++++++++++++--------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 3be2ca304d5..ec2250fbe80 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -323,26 +323,22 @@ BOOL hid_device_add_haptics(struct unix_device *iface) USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), COLLECTION(1, NamedArray), - USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), - USAGE(1, 3), /* HID_USAGE_HAPTICS_WAVEFORM_RUMBLE */ - USAGE(1, 4), /* HID_USAGE_HAPTICS_WAVEFORM_BUZZ */ + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_RUMBLE_ORDINAL), /* HID_USAGE_HAPTICS_WAVEFORM_RUMBLE */ + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_BUZZ_ORDINAL), /* HID_USAGE_HAPTICS_WAVEFORM_BUZZ */ REPORT_COUNT(1, 2), REPORT_SIZE(1, 16), FEATURE(1, Data|Var|Abs|Null), END_COLLECTION, - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), COLLECTION(1, NamedArray), - USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), - USAGE(1, 3), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_RUMBLE) */ - USAGE(1, 4), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_BUZZ) */ + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_RUMBLE_ORDINAL), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_RUMBLE) */ + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_BUZZ_ORDINAL), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_BUZZ) */ REPORT_COUNT(1, 2), REPORT_SIZE(1, 16), FEATURE(1, Data|Var|Abs|Null), END_COLLECTION, - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME), UNIT(2, 0x1001), /* seconds */ UNIT_EXPONENT(1, -3), /* 10^-3 */ @@ -1042,18 +1038,18 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC if (packet->reportId == haptics->waveform_report) { struct hid_haptics_waveform *waveform = (struct hid_haptics_waveform *)(packet->reportBuffer + 1); - struct hid_haptics_waveform *rumble = haptics->waveforms + HAPTICS_WAVEFORM_RUMBLE_INDEX; - struct hid_haptics_waveform *buzz = haptics->waveforms + HAPTICS_WAVEFORM_BUZZ_INDEX; + struct hid_haptics_waveform *rumble = haptics->waveforms + HAPTICS_WAVEFORM_RUMBLE_ORDINAL; + struct hid_haptics_waveform *buzz = haptics->waveforms + HAPTICS_WAVEFORM_BUZZ_ORDINAL; ULONG duration_ms; io->Information = sizeof(*waveform) + 1; assert(packet->reportBufferLen == io->Information); - if (waveform->manual_trigger == 0 || waveform->manual_trigger > HAPTICS_WAVEFORM_LAST_INDEX) + if (waveform->manual_trigger == 0 || waveform->manual_trigger > HAPTICS_WAVEFORM_LAST_ORDINAL) io->Status = STATUS_INVALID_PARAMETER; else { - if (waveform->manual_trigger == HAPTICS_WAVEFORM_STOP_INDEX) + if (waveform->manual_trigger == HAPTICS_WAVEFORM_STOP_ORDINAL) memset(haptics->waveforms, 0, sizeof(haptics->waveforms)); else haptics->waveforms[waveform->manual_trigger] = *waveform; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index ff57e537ffe..74c1f4c092a 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -121,19 +121,25 @@ struct hid_report_descriptor BYTE next_report_id[3]; }; -enum haptics_waveform_index +/* HID spec uses None / Stop names for the first two implicit waveforms, + * where Windows SDK headers use STOP / NULL for the corresponding HID + * usage constants. We're not actually using the usages anyway are we + * stick to the HID spec here. + */ +enum haptics_waveform_ordinal { - HAPTICS_WAVEFORM_STOP_INDEX = 1, - HAPTICS_WAVEFORM_NULL_INDEX = 2, - HAPTICS_WAVEFORM_RUMBLE_INDEX = 3, - HAPTICS_WAVEFORM_BUZZ_INDEX = 4, - HAPTICS_WAVEFORM_LAST_INDEX = HAPTICS_WAVEFORM_BUZZ_INDEX, + HAPTICS_WAVEFORM_NONE_ORDINAL = 1, /* implicit, not included in waveform_list / duration_list */ + HAPTICS_WAVEFORM_STOP_ORDINAL = 2, /* implicit, not included in waveform_list / duration_list */ + HAPTICS_WAVEFORM_RUMBLE_ORDINAL = 3, + HAPTICS_WAVEFORM_BUZZ_ORDINAL = 4, + HAPTICS_WAVEFORM_FIRST_ORDINAL = HAPTICS_WAVEFORM_RUMBLE_ORDINAL, + HAPTICS_WAVEFORM_LAST_ORDINAL = HAPTICS_WAVEFORM_BUZZ_ORDINAL, }; struct hid_haptics_features { - WORD waveform_list[HAPTICS_WAVEFORM_LAST_INDEX - HAPTICS_WAVEFORM_NULL_INDEX]; - WORD duration_list[HAPTICS_WAVEFORM_LAST_INDEX - HAPTICS_WAVEFORM_NULL_INDEX]; + WORD waveform_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; + WORD duration_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; UINT waveform_cutoff_time_ms; }; @@ -146,7 +152,7 @@ struct hid_haptics_waveform struct hid_haptics { struct hid_haptics_features features; - struct hid_haptics_waveform waveforms[HAPTICS_WAVEFORM_LAST_INDEX + 1]; + struct hid_haptics_waveform waveforms[HAPTICS_WAVEFORM_LAST_ORDINAL + 1]; BYTE features_report; BYTE waveform_report; };

1 0

Eric Pouech : dsound: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 86bc819f07a67dc5ef2cb5bc9f8d609daa0f7b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86bc819f07a67dc5ef2cb5bc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:41:37 2022 +0100 dsound: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/Makefile.in | 1 - dlls/dsound/buffer.c | 86 ++++++++++++++++++++++---------------------- dlls/dsound/capture.c | 80 ++++++++++++++++++++--------------------- dlls/dsound/dsound.c | 34 +++++++++--------- dlls/dsound/dsound_main.c | 24 ++++++------- dlls/dsound/duplex.c | 12 +++---- dlls/dsound/mixer.c | 52 +++++++++++++-------------- dlls/dsound/primary.c | 90 +++++++++++++++++++++++------------------------ dlls/dsound/propset.c | 30 ++++++++-------- dlls/dsound/sound3d.c | 62 ++++++++++++++++---------------- 10 files changed, 235 insertions(+), 236 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86bc819f07a67dc5ef2c…

1 0

Francois Gouget : msi/tests: Fix the trailing linefeed in an ok() message.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 194d1b72587756512c693df7c2fce505d591c905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=194d1b72587756512c693df7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 12:41:11 2022 +0100 msi/tests: Fix the trailing linefeed in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 39cbaf56b79..fcdcd60a9f8 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -4553,7 +4553,7 @@ static void test_MsiGetProductInfo(void) ok(r == ERROR_UNKNOWN_PROPERTY, "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r); ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf); - ok(sz == MAX_PATH, "%lun", sz); + ok(sz == MAX_PATH, "%lu\n", sz); res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &propkey, NULL); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);

1 0

Sven Baars : ntoskrnl.exe/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: ef437b41eebcb54a3576741fc52dbc29caa1590f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef437b41eebcb54a3576741f… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Feb 13 20:43:45 2022 +0100 ntoskrnl.exe/tests: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f53663f17d0..6207ce00ccb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -235,11 +235,15 @@ static void testsign_cleanup(struct testsign_context *ctx) ret = CertDeleteCertificateFromStore(ctx->root_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); + ret = CertFreeCertificateContext(ctx->root_cert); + ok(ret, "Failed to free certificate context, error %u\n", GetLastError()); ret = CertCloseStore(ctx->root_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); ret = CertDeleteCertificateFromStore(ctx->publisher_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); + ret = CertFreeCertificateContext(ctx->publisher_cert); + ok(ret, "Failed to free certificate context, error %u\n", GetLastError()); ret = CertCloseStore(ctx->publisher_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); @@ -1360,6 +1364,8 @@ static void add_file_to_catalog(HANDLE catalog, const WCHAR *file) sizeof(L"2:6.0"), (BYTE *)L"2:6.0"); ok(ret, "Failed to write attr, error %u\n", GetLastError()); } + + free(indirect_data); } static const GUID bus_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc1}}; @@ -1816,6 +1822,8 @@ static void test_pnp_driver(struct testsign_context *ctx) ok(ret, "failed to remove device, error %#x\n", GetLastError()); } + SetupDiDestroyDeviceInfoList(set); + /* Windows stops the service but does not delete it. */ manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); ok(!!manager, "failed to open service manager, error %u\n", GetLastError());

1 0

Eric Pouech : dwrite: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 46667959e744d4c8eaa725fe98b5b4884fe1de39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46667959e744d4c8eaa725fe… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:08 2022 +0100 dwrite: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/Makefile.in | 1 - dlls/dwrite/analyzer.c | 16 +++++----- dlls/dwrite/font.c | 76 ++++++++++++++++++++++++------------------------ dlls/dwrite/format.c | 8 ++--- dlls/dwrite/gdiinterop.c | 22 +++++++------- dlls/dwrite/layout.c | 40 ++++++++++++------------- dlls/dwrite/main.c | 20 ++++++------- dlls/dwrite/opentype.c | 6 ++-- 8 files changed, 94 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46667959e744d4c8eaa7…

1 0

Eric Pouech : gdiplus: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 846fcc5bf6f5e007619e0aaaf610136959860b3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=846fcc5bf6f5e007619e0aaa… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:43:13 2022 +0100 gdiplus: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/Makefile.in | 1 - dlls/gdiplus/brush.c | 22 +++++++++++----------- dlls/gdiplus/font.c | 16 ++++++++-------- dlls/gdiplus/gdiplus.c | 6 +++--- dlls/gdiplus/graphics.c | 6 +++--- dlls/gdiplus/image.c | 16 ++++++++-------- dlls/gdiplus/imageattributes.c | 4 ++-- dlls/gdiplus/metafile.c | 8 ++++---- dlls/gdiplus/pen.c | 4 ++-- dlls/gdiplus/region.c | 18 +++++++++--------- 10 files changed, 50 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=846fcc5bf6f5e007619e…

1 0

Nikolay Sivov : mfmediaengine/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 29a9ba6e1863f403254de2ab35c8d5065ccdacf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29a9ba6e1863f403254de2ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 14 14:48:02 2022 +0300 mfmediaengine/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/tests/Makefile.in | 1 - dlls/mfmediaengine/tests/mfmediaengine.c | 255 +++++++++++++++---------------- 2 files changed, 126 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29a9ba6e1863f403254d…

1 0