March 2022 - Wine-Commits - list.winehq.org

Eric Pouech : ndis.sys/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 8e4114be1081b2f03cd6ad3f67995f58314a87fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e4114be1081b2f03cd6ad3f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:49 2022 +0100 ndis.sys/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/tests/Makefile.in | 1 - dlls/ndis.sys/tests/ndis.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ndis.sys/tests/Makefile.in b/dlls/ndis.sys/tests/Makefile.in index f7073072fbf..8544dfdff2f 100644 --- a/dlls/ndis.sys/tests/Makefile.in +++ b/dlls/ndis.sys/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ndis.sys IMPORTS = iphlpapi advapi32 ole32 diff --git a/dlls/ndis.sys/tests/ndis.c b/dlls/ndis.sys/tests/ndis.c index 3349f1dae97..9a9ddcf7e7f 100644 --- a/dlls/ndis.sys/tests/ndis.c +++ b/dlls/ndis.sys/tests/ndis.c @@ -54,7 +54,7 @@ static void test_device(const WCHAR *service_name, const MIB_IF_ROW2 *row) if (status != STATUS_SUCCESS) { - skip( "Couldn't open the device (status = %d)\n", status ); + skip( "Couldn't open the device (status = %ld)\n", status ); return; } @@ -63,8 +63,8 @@ static void test_device(const WCHAR *service_name, const MIB_IF_ROW2 *row) iosb.Information = 0xdeadbeef; status = NtDeviceIoControlFile( netdev, NULL, NULL, NULL, &iosb, IOCTL_NDIS_QUERY_GLOBAL_STATS, &oid, sizeof(oid), &medium, sizeof(medium) ); - ok(status == STATUS_INVALID_PARAMETER, "got status %#x\n", status); - ok(iosb.Status == 0xdeadbeef, "got %#x\n", iosb.Status); + ok(status == STATUS_INVALID_PARAMETER, "got status %#lx\n", status); + ok(iosb.Status == 0xdeadbeef, "got %#lx\n", iosb.Status); ok(iosb.Information == 0xdeadbeef, "got size %#Ix\n", iosb.Information); oid = OID_GEN_MEDIA_SUPPORTED;

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.IHidGameControllerInputSink interface definition.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: cf47f7121a35de0761e6ddccc68995253caa2da9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf47f7121a35de0761e6ddcc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 1 09:32:33 2022 +0100 include: Add Windows.Gaming.Input.IHidGameControllerInputSink interface definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.custom.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index d059f35dddd..637e1d4abcf 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -34,6 +34,7 @@ namespace Windows.Gaming.Input.Custom { typedef struct GameControllerVersionInfo GameControllerVersionInfo; interface IGameControllerInputSink; interface IGameControllerProvider; + interface IHidGameControllerInputSink; interface ICustomGameControllerFactory; interface IGameControllerFactoryManagerStatics; interface IGameControllerFactoryManagerStatics2; @@ -94,6 +95,17 @@ namespace Windows.Gaming.Input.Custom { [propget] HRESULT IsConnected([out, retval] boolean *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + uuid(f754c322-182d-40e4-a126-fcee4ffa1e31) + ] + interface IHidGameControllerInputSink : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerInputSink + { + HRESULT OnInputReportReceived([in] UINT64 timestamp, [in] BYTE id, [in] UINT32 report_len, + [in, size_is(report_len)] BYTE *report_buf); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), uuid(69a0ae5e-758e-4cbe-ace6-62155fe9126f)

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.IGameControllerInputSink interface definition.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 436782f587e8563c7c4f8c0dbcb26382f6d8409e URL: https://source.winehq.org/git/wine.git/?a=commit;h=436782f587e8563c7c4f8c0d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 1 09:32:32 2022 +0100 include: Add Windows.Gaming.Input.IGameControllerInputSink interface definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.custom.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index a95ec9db482..d059f35dddd 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -32,6 +32,7 @@ namespace Windows.Gaming.Input.Custom { typedef enum XusbDeviceSubtype XusbDeviceSubtype; typedef enum XusbDeviceType XusbDeviceType; typedef struct GameControllerVersionInfo GameControllerVersionInfo; + interface IGameControllerInputSink; interface IGameControllerProvider; interface ICustomGameControllerFactory; interface IGameControllerFactoryManagerStatics; @@ -70,6 +71,16 @@ namespace Windows.Gaming.Input.Custom { UINT16 Revision; }; + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + uuid(1ff6f922-c640-4c78-a820-9a715c558bcb) + ] + interface IGameControllerInputSink : IInspectable + { + HRESULT OnInputResumed([in] UINT64 timestamp); + HRESULT OnInputSuspended([in] UINT64 timestamp); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), uuid(e6d73982-2996-4559-b16c-3e57d46e58d6)

1 0

Eric Pouech : netcfgx/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 2dd647a5bac5f27c9740c8fd11cf92e298a5db1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dd647a5bac5f27c9740c8fd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:35:01 2022 +0100 netcfgx/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netcfgx/tests/Makefile.in | 1 - dlls/netcfgx/tests/netcfgx.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/netcfgx/tests/Makefile.in b/dlls/netcfgx/tests/Makefile.in index 3caf6c9da7a..699af30f213 100644 --- a/dlls/netcfgx/tests/Makefile.in +++ b/dlls/netcfgx/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = netcfgx.dll IMPORTS = uuid ole32 diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index 31558f44f42..ab8104fa611 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -36,11 +36,11 @@ static void create_configuration(void) if(SUCCEEDED(hr)) { hr = INetCfg_QueryInterface(config, &IID_INetCfgLock, (LPVOID*)&netlock); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); ok(hr == S_OK || - hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08x\n", hr); + hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08lx\n", hr); if(hr == S_OK) { trace("Lock value: %s\n", wine_dbgstr_w(client)); @@ -50,27 +50,27 @@ static void create_configuration(void) trace("Not run with Admin permissions\n"); hr = INetCfg_Initialize(config, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); /* AcquireWriteLock needs to be run before Initialize */ hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); - todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08lx\n", hr); hr = INetCfg_FindComponent(config, L"MS_TCPIP", &component); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "got 0x%08lx\n", hr); if(hr == S_OK) { INetCfgComponent_Release(component); } hr = INetCfg_Apply(config); - todo_wine ok(hr == S_OK || hr == NETCFG_E_NO_WRITE_LOCK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK || hr == NETCFG_E_NO_WRITE_LOCK, "got 0x%08lx\n", hr); hr = INetCfg_Uninitialize(config); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = INetCfgLock_ReleaseWriteLock(netlock); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); INetCfgLock_Release(netlock); INetCfg_Release(config);

1 0

Eric Pouech : netprofm/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 722ecd5e6549ffb20fc7c08deda83e978fdbb446 URL: https://source.winehq.org/git/wine.git/?a=commit;h=722ecd5e6549ffb20fc7c08d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:35:07 2022 +0100 netprofm/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/tests/Makefile.in | 1 - dlls/netprofm/tests/list.c | 96 ++++++++++++++++++++--------------------- 2 files changed, 48 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=722ecd5e6549ffb20fc7…

1 0

Hans Leidekker : wusa: Use CRT allocation functions.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: f0f125f5c5e735021ca97d7442f9fa174dd97c3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0f125f5c5e735021ca97d74… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 1 11:42:59 2022 +0100 wusa: Use CRT allocation functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/main.c | 72 ++++++++++++++++++++++++------------------------ programs/wusa/manifest.c | 52 +++++++++++++++++----------------- programs/wusa/wusa.h | 35 +++-------------------- 3 files changed, 66 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0f125f5c5e735021ca9…

1 0

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognizerStateChangedEventArgs.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: d86c22ee284c5174b3311ca4f3154288fcf31b4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86c22ee284c5174b3311ca4… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 1 17:42:39 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognizerStateChangedEventArgs. And a needed enum. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechrecognition.idl | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index 87e8d4c7bf5..b0c0f864b22 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -38,6 +38,7 @@ namespace Windows { typedef enum SpeechRecognitionConstraintProbability SpeechRecognitionConstraintProbability; typedef enum SpeechRecognitionConstraintType SpeechRecognitionConstraintType; typedef enum SpeechRecognitionResultStatus SpeechRecognitionResultStatus; + typedef enum SpeechRecognizerState SpeechRecognizerState; interface ISpeechContinuousRecognitionCompletedEventArgs; interface ISpeechContinuousRecognitionResultGeneratedEventArgs; interface ISpeechContinuousRecognitionSession; @@ -49,6 +50,7 @@ namespace Windows { interface ISpeechRecognitionResult; interface ISpeechRecognitionResult2; interface ISpeechRecognitionSemanticInterpretation; + interface ISpeechRecognizerStateChangedEventArgs; interface ISpeechRecognizerTimeouts; interface ISpeechRecognizerUIOptions; runtimeclass SpeechContinuousRecognitionCompletedEventArgs; @@ -60,6 +62,7 @@ namespace Windows { runtimeclass SpeechRecognitionQualityDegradingEventArgs; runtimeclass SpeechRecognitionResult; runtimeclass SpeechRecognitionSemanticInterpretation; + runtimeclass SpeechRecognizerStateChangedEventArgs; runtimeclass SpeechRecognizerTimeouts; runtimeclass SpeechRecognizerUIOptions; } @@ -149,6 +152,20 @@ namespace Windows { MicrophoneUnavailable = 10, }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum SpeechRecognizerState + { + Idle = 0, + Capturing = 1, + Processing = 2, + SoundStarted = 3, + SoundEnded = 4, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + SpeechDetected = 5, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Paused = 6, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechRecognition.SpeechContinuousRecognitionCompletedEventArgs), @@ -287,6 +304,16 @@ namespace Windows { [propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*> **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognizerStateChangedEventArgs), + uuid(563d4f09-ba03-4bad-ad81-ddc6c4dab0c3) + ] + interface ISpeechRecognizerStateChangedEventArgs : IInspectable + { + [propget] HRESULT State([out, retval] Windows.Media.SpeechRecognition.SpeechRecognizerState *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognizerTimeouts), @@ -406,6 +433,15 @@ namespace Windows { [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionSemanticInterpretation; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognizerStateChangedEventArgs + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognizerStateChangedEventArgs; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile)

1 0

Eric Pouech : ieframe/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 964a6e995332cbe01fcc7bf3cbd1360bf581e856 URL: https://source.winehq.org/git/wine.git/?a=commit;h=964a6e995332cbe01fcc7bf3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:26:27 2022 +0100 ieframe/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/Makefile.in | 1 - dlls/ieframe/tests/ie.c | 36 +-- dlls/ieframe/tests/intshcut.c | 72 ++--- dlls/ieframe/tests/webbrowser.c | 630 ++++++++++++++++++++-------------------- 4 files changed, 369 insertions(+), 370 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=964a6e995332cbe01fcc…

1 0

Eric Pouech : dsound/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 5adca71cd7906b2ca9b7c101004f4158cbcdc9a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5adca71cd7906b2ca9b7c101… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:32:42 2022 +0100 dsound/tests: 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/tests/Makefile.in | 1 - dlls/dsound/tests/capture.c | 150 +++++++-------- dlls/dsound/tests/ds3d.c | 250 ++++++++++++------------- dlls/dsound/tests/ds3d8.c | 238 +++++++++++------------ dlls/dsound/tests/dsound.c | 386 +++++++++++++++++++------------------- dlls/dsound/tests/dsound8.c | 426 +++++++++++++++++++++--------------------- dlls/dsound/tests/duplex.c | 76 ++++---- dlls/dsound/tests/propset.c | 124 ++++++------ 8 files changed, 825 insertions(+), 826 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5adca71cd7906b2ca9b7…

1 0

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognitionCompilationResult.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 71d9e9663aa09f17584286df4add56d86498893d URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d9e9663aa09f17584286df… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 1 17:42:37 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognitionCompilationResult. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechrecognition.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index 9c288ce4066..c9e1305fcac 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -40,6 +40,7 @@ namespace Windows { interface ISpeechContinuousRecognitionCompletedEventArgs; interface ISpeechContinuousRecognitionResultGeneratedEventArgs; interface ISpeechContinuousRecognitionSession; + interface ISpeechRecognitionCompilationResult; interface ISpeechRecognitionConstraint; interface ISpeechRecognitionHypothesis; interface ISpeechRecognitionHypothesisGeneratedEventArgs; @@ -51,6 +52,7 @@ namespace Windows { runtimeclass SpeechContinuousRecognitionCompletedEventArgs; runtimeclass SpeechContinuousRecognitionResultGeneratedEventArgs; runtimeclass SpeechContinuousRecognitionSession; + runtimeclass SpeechRecognitionCompilationResult; runtimeclass SpeechRecognitionHypothesis; runtimeclass SpeechRecognitionHypothesisGeneratedEventArgs; runtimeclass SpeechRecognitionResult; @@ -177,6 +179,16 @@ namespace Windows { [eventremove] HRESULT ResultGenerated([in] EventRegistrationToken token); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionCompilationResult), + uuid(407e6c5d-6ac7-4da4-9cc1-2fce32cf7489) + ] + interface ISpeechRecognitionCompilationResult : IInspectable + { + [propget] HRESULT Status([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionResultStatus *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(79ac1628-4d68-43c4-8911-40dc4101b55b) @@ -312,6 +324,15 @@ namespace Windows { [default] interface Windows.Media.SpeechRecognition.ISpeechContinuousRecognitionSession; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognitionCompilationResult + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionCompilationResult; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile),

1 0