February 2022 - Wine-commits

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechContinuousRecognitionSession.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 191c28717874d72ffeac886bb0a11f0a1d2ba278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=191c28717874d72ffeac886b… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Sat Feb 26 09:27:30 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechContinuousRecognitionSession. And its dependencies. 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 | 91 +++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index 0e7be63036d..ad0590bcae6 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -32,14 +32,21 @@ import "windows.globalization.idl"; namespace Windows { namespace Media { namespace SpeechRecognition { + typedef enum SpeechContinuousRecognitionMode SpeechContinuousRecognitionMode; typedef enum SpeechRecognitionConfidence SpeechRecognitionConfidence; typedef enum SpeechRecognitionConstraintProbability SpeechRecognitionConstraintProbability; typedef enum SpeechRecognitionConstraintType SpeechRecognitionConstraintType; typedef enum SpeechRecognitionResultStatus SpeechRecognitionResultStatus; + interface ISpeechContinuousRecognitionCompletedEventArgs; + interface ISpeechContinuousRecognitionResultGeneratedEventArgs; + interface ISpeechContinuousRecognitionSession; interface ISpeechRecognitionConstraint; interface ISpeechRecognitionResult; interface ISpeechRecognitionResult2; interface ISpeechRecognitionSemanticInterpretation; + runtimeclass SpeechContinuousRecognitionCompletedEventArgs; + runtimeclass SpeechContinuousRecognitionResultGeneratedEventArgs; + runtimeclass SpeechContinuousRecognitionSession; runtimeclass SpeechRecognitionResult; runtimeclass SpeechRecognitionSemanticInterpretation; } @@ -53,6 +60,8 @@ namespace Windows { interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechRecognition.SpeechRecognitionResult*>; interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechRecognition.SpeechRecognitionResult*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechRecognition.SpeechRecognitionResult*>; + interface Windows.Foundation.TypedEventHandler<Windows.Media.SpeechRecognition.SpeechContinuousRecognitionSession*, Windows.Media.SpeechRecognition.SpeechContinuousRecognitionCompletedEventArgs*>; + interface Windows.Foundation.TypedEventHandler<Windows.Media.SpeechRecognition.SpeechContinuousRecognitionSession*, Windows.Media.SpeechRecognition.SpeechContinuousRecognitionResultGeneratedEventArgs*>; } } } @@ -62,6 +71,13 @@ namespace Windows { namespace Media { namespace SpeechRecognition { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum SpeechContinuousRecognitionMode + { + Default = 0, + PauseOnRecognition = 1, + }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] enum SpeechRecognitionConfidence { @@ -108,6 +124,51 @@ namespace Windows { MicrophoneUnavailable = 10, }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechContinuousRecognitionCompletedEventArgs), + uuid(e3d069bb-e30c-5e18-424b-7fbe81f8fbd0) + ] + interface ISpeechContinuousRecognitionCompletedEventArgs : IInspectable + { + [propget] HRESULT Status([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionResultStatus *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechContinuousRecognitionResultGeneratedEventArgs), + uuid(19091e1e-6e7e-5a46-40fb-76594f786504) + ] + interface ISpeechContinuousRecognitionResultGeneratedEventArgs : IInspectable + { + [propget] HRESULT Result([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionResult **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechContinuousRecognitionSession), + uuid(6a213c04-6614-49f8-99a2-b5e9b3a085c8) + ] + interface ISpeechContinuousRecognitionSession : IInspectable + { + [propget] HRESULT AutoStopSilenceTimeout([out, retval] Windows.Foundation.TimeSpan *value); + [propput] HRESULT AutoStopSilenceTimeout([in] Windows.Foundation.TimeSpan value); + [overload("StartAsync")] HRESULT StartAsync([out, retval] Windows.Foundation.IAsyncAction **action); + [overload("StartAsync")] HRESULT StartWithModeAsync([in] Windows.Media.SpeechRecognition.SpeechContinuousRecognitionMode mode, [out, retval] Windows.Foundation.IAsyncAction **action); + HRESULT StopAsync([out, retval] Windows.Foundation.IAsyncAction **action); + HRESULT CancelAsync([out, retval] Windows.Foundation.IAsyncAction **action); + HRESULT PauseAsync([out, retval] Windows.Foundation.IAsyncAction **action); + HRESULT Resume(); + [eventadd] HRESULT Completed( + [in] Windows.Foundation.TypedEventHandler<Windows.Media.SpeechRecognition.SpeechContinuousRecognitionSession*, Windows.Media.SpeechRecognition.SpeechContinuousRecognitionCompletedEventArgs*> *value, + [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Completed([in] EventRegistrationToken token); + [eventadd] HRESULT ResultGenerated( + [in] Windows.Foundation.TypedEventHandler<Windows.Media.SpeechRecognition.SpeechContinuousRecognitionSession*, Windows.Media.SpeechRecognition.SpeechContinuousRecognitionResultGeneratedEventArgs*> *value, + [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT ResultGenerated([in] EventRegistrationToken token); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(79ac1628-4d68-43c4-8911-40dc4101b55b) @@ -161,6 +222,36 @@ namespace Windows { [propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*> **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass SpeechContinuousRecognitionCompletedEventArgs + { + [default] interface Windows.Media.SpeechRecognition.ISpeechContinuousRecognitionCompletedEventArgs; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass SpeechContinuousRecognitionResultGeneratedEventArgs + { + [default] interface Windows.Media.SpeechRecognition.ISpeechContinuousRecognitionResultGeneratedEventArgs; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass SpeechContinuousRecognitionSession + { + [default] interface Windows.Media.SpeechRecognition.ISpeechContinuousRecognitionSession; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile)

1 0

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognitionResult.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: e0ab86d60161b22906e0adf6baf091227b0becf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0ab86d60161b22906e0adf6… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Sat Feb 26 09:27:29 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognitionResult. And its dependencies. 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 | 96 +++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index 65c9d5ef8da..0e7be63036d 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -32,9 +32,16 @@ import "windows.globalization.idl"; namespace Windows { namespace Media { namespace SpeechRecognition { + typedef enum SpeechRecognitionConfidence SpeechRecognitionConfidence; typedef enum SpeechRecognitionConstraintProbability SpeechRecognitionConstraintProbability; typedef enum SpeechRecognitionConstraintType SpeechRecognitionConstraintType; + typedef enum SpeechRecognitionResultStatus SpeechRecognitionResultStatus; interface ISpeechRecognitionConstraint; + interface ISpeechRecognitionResult; + interface ISpeechRecognitionResult2; + interface ISpeechRecognitionSemanticInterpretation; + runtimeclass SpeechRecognitionResult; + runtimeclass SpeechRecognitionSemanticInterpretation; } } } @@ -43,6 +50,9 @@ namespace Windows { namespace Media { namespace SpeechRecognition { declare { + interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechRecognition.SpeechRecognitionResult*>; + interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechRecognition.SpeechRecognitionResult*>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechRecognition.SpeechRecognitionResult*>; } } } @@ -52,6 +62,15 @@ namespace Windows { namespace Media { namespace SpeechRecognition { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum SpeechRecognitionConfidence + { + High = 0, + Medium = 1, + Low = 2, + Rejected = 3, + }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] enum SpeechRecognitionConstraintProbability { @@ -69,6 +88,26 @@ namespace Windows { VoiceCommandDefinition = 3, }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum SpeechRecognitionResultStatus + { + Success = 0, + TopicLanguageNotSupported = 1, + GrammarLanguageMismatch = 2, + GrammarCompilationFailure = 3, + AudioQualityFailure = 4, + UserCanceled = 5, + Unknown = 6, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + TimeoutExceeded = 7, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + PauseLimitExceeded = 8, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + NetworkFailure = 9, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + MicrophoneUnavailable = 10, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(79ac1628-4d68-43c4-8911-40dc4101b55b) @@ -83,6 +122,63 @@ namespace Windows { [propget] HRESULT Probability([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionConstraintProbability *value); [propput] HRESULT Probability([in] Windows.Media.SpeechRecognition.SpeechRecognitionConstraintProbability value); } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionResult), + uuid(4e303157-034e-4652-857e-d0454cc4beec) + ] + interface ISpeechRecognitionResult : IInspectable + { + [propget] HRESULT Status([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionResultStatus *value); + [propget] HRESULT Text([out, retval] HSTRING *value); + [propget] HRESULT Confidence([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionConfidence *value); + [propget] HRESULT SemanticInterpretation([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionSemanticInterpretation **value); + HRESULT GetAlternates([in] UINT32 max_amount, [out, retval] Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechRecognition.SpeechRecognitionResult*> **results); + [propget] HRESULT Constraint([out, retval] Windows.Media.SpeechRecognition.ISpeechRecognitionConstraint **value); + [propget] HRESULT RulePath([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING> **value); + [propget] HRESULT RawConfidence([out, retval] DOUBLE *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionResult), + uuid(af7ed1ba-451b-4166-a0c1-1ffe84032d03) + ] + interface ISpeechRecognitionResult2 : IInspectable + { + [propget] HRESULT PhraseStartTime([out, retval] Windows.Foundation.DateTime *value); + [propget] HRESULT PhraseDuration([out, retval] Windows.Foundation.TimeSpan *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionSemanticInterpretation), + uuid(aae1da9b-7e32-4c1f-89fe-0c65f486f52e) + ] + interface ISpeechRecognitionSemanticInterpretation : IInspectable + { + [propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognitionResult + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionResult; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.SpeechRecognition.ISpeechRecognitionResult2; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognitionSemanticInterpretation + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionSemanticInterpretation; + } } } }

1 0

Piotr Caban : oleacc/tests: Fix test windows cleanup.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 4967d2003b77ed7b5a0a9bcbdb3344bb5f9a3a8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4967d2003b77ed7b5a0a9bcb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Feb 26 21:08:19 2022 +0100 oleacc/tests: Fix test windows cleanup. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 3b3f18a5a80..4f8999c194a 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1324,6 +1324,7 @@ static void test_AccessibleObjectFromPoint(void) if (WindowFromPoint(point) != hwnd) { win_skip("test window not returned from WindowFromPoint\n"); + DestroyWindow(hwnd); return; } @@ -1358,6 +1359,7 @@ static void test_AccessibleObjectFromPoint(void) if (WindowFromPoint(point) != child) { win_skip("test window not returned from WindowFromPoint\n"); + DestroyWindow(hwnd); return; } @@ -1464,7 +1466,7 @@ static void test_CreateStdAccessibleObject_classes(void) IAccessible_Release(acc); SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)win_proc); - CloseWindow(hwnd); + DestroyWindow(hwnd); winetest_pop_context(); } }

1 0

Huw Davies : crypt32: Use an unsigned int to avoid a compiler warning on macOS.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 2c9fbf8300bf55cf7ada760321846444d301361a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c9fbf8300bf55cf7ada7603… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Feb 26 21:19:48 2022 +0000 crypt32: Use an unsigned int to avoid a compiler warning on macOS. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/unixlib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index a345b5e6ac8..9a36d12f293 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -623,7 +623,7 @@ static const char * const CRYPT_knownLocations[] = { static void load_root_certs(void) { - DWORD i; + unsigned int i; #ifdef HAVE_SECURITY_SECURITY_H const SecTrustSettingsDomain domains[] = { @@ -651,7 +651,7 @@ static void load_root_certs(void) CFRelease(certData); } else - WARN("could not export certificate %d to X509 format: 0x%08x\n", i, (unsigned int)status); + WARN("could not export certificate %u to X509 format: 0x%08x\n", i, (unsigned int)status); } CFRelease(certs); }

1 0

Piotr Caban : oleacc/tests: Check if test window has focus in test_default_client_accessible_object tests.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 15a3864f4dcbb844296579a66f4fb997f4fef5bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a3864f4dcbb844296579a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Feb 26 21:12:38 2022 +0100 oleacc/tests: Check if test window has focus in test_default_client_accessible_object tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 4f8999c194a..6b0000e5f56 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1037,6 +1037,7 @@ static void test_default_client_accessible_object(void) ShowWindow(hwnd, SW_SHOW); SetFocus(hwnd); hr = IAccessible_get_accFocus(acc, &v); + ok(GetFocus() == hwnd, "test window has no focus\n"); ok(hr == S_OK, "hr %#x\n", hr); ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_I4(&v) == CHILDID_SELF, "V_I4(&v) = %d\n", V_I4(&v)); @@ -1044,6 +1045,7 @@ static void test_default_client_accessible_object(void) /* Set focus to each child window. */ SetFocus(btn); hr = IAccessible_get_accFocus(acc, &v); + ok(GetFocus() == btn, "test window has no focus\n"); ok(hr == S_OK, "hr %#x\n", hr); ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v));

1 0

Eric Pouech : gdiplus/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 57a8ccf4e8c93df5019e4bb52b3fbbf8d385a004 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a8ccf4e8c93df5019e4bb5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:25:56 2022 +0100 gdiplus/tests: 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/tests/Makefile.in | 1 - dlls/gdiplus/tests/brush.c | 2 +- dlls/gdiplus/tests/font.c | 30 ++++---- dlls/gdiplus/tests/graphics.c | 14 ++-- dlls/gdiplus/tests/image.c | 160 ++++++++++++++++++++--------------------- dlls/gdiplus/tests/metafile.c | 14 ++-- dlls/gdiplus/tests/pen.c | 2 +- dlls/gdiplus/tests/region.c | 78 ++++++++++---------- 8 files changed, 150 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57a8ccf4e8c93df5019e…

1 0

Eric Pouech : gdiplus/tests: Introduce helper functions (expect*) to handle integral conversions.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: eb39c4e4fe26cc6784db9eeee362cac29458d90f URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb39c4e4fe26cc6784db9eee… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:25:50 2022 +0100 gdiplus/tests: Introduce helper functions (expect*) to handle integral conversions. 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/tests/brush.c | 6 +++++- dlls/gdiplus/tests/font.c | 7 ++++++- dlls/gdiplus/tests/metafile.c | 6 +++++- dlls/gdiplus/tests/pen.c | 6 +++++- dlls/gdiplus/tests/region.c | 6 +++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 0287078bc80..fd4116240d4 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -25,7 +25,11 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %.8d, got %.8d\n", expected, got); +} #define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) static HWND hwnd; diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index d8f8a474742..3fe123e25c4 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -25,7 +25,12 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define expect(expected,got) expect_inline(__LINE__, expected, got) +static inline void expect_inline(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} + #define expect_(expected, got, precision) ok(abs((expected) - (got)) <= (precision), "Expected %d, got %d\n", (expected), (got)) #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) expectf_((expected), (got), 0.001) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 3ad3db35273..51193f76b6a 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -25,7 +25,11 @@ #include "winspool.h" #include "wine/test.h" -#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %.8d, got %.8d\n", expected, got); +} #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) expectf_((expected), (got), 0.001) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 28caf29acbe..bfd4b233081 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -24,7 +24,11 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %.8d, got %.8d\n", expected, got); +} #define expectf(expected, got) ok(fabs(got - expected) < 0.1, "Expected %.2f, got %.2f\n", expected, got) static void test_startup(void) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 04c388bf5a7..04db033a7e0 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -33,7 +33,11 @@ #define RGNDATA_MAGIC 0xdbc01001 #define RGNDATA_MAGIC2 0xdbc01002 -#define expect(expected, got) ok((got) == (expected), "Expected %.8x, got %.8x\n", (expected), (got)) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) < (precision), "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) expectf_((expected), (got), 0.001)

1 0

Eric Pouech : comctl32/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: f2b4634c18f6c402f2a5963655b510fee2a6e676 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2b4634c18f6c402f2a59636… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:25:25 2022 +0100 comctl32/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/comctl32/tests/Makefile.in | 1 - dlls/comctl32/tests/animate.c | 4 +- dlls/comctl32/tests/button.c | 196 ++++++++++++++++----------------- dlls/comctl32/tests/combo.c | 114 ++++++++++---------- dlls/comctl32/tests/datetime.c | 62 +++++------ dlls/comctl32/tests/dpa.c | 68 ++++++------ dlls/comctl32/tests/edit.c | 198 +++++++++++++++++----------------- dlls/comctl32/tests/header.c | 74 ++++++------- dlls/comctl32/tests/imagelist.c | 120 ++++++++++----------- dlls/comctl32/tests/listbox.c | 226 +++++++++++++++++++-------------------- dlls/comctl32/tests/listview.c | 138 ++++++++++++------------ dlls/comctl32/tests/misc.c | 58 +++++----- dlls/comctl32/tests/monthcal.c | 40 +++---- dlls/comctl32/tests/mru.c | 28 ++--- dlls/comctl32/tests/msg.h | 16 +-- dlls/comctl32/tests/pager.c | 30 +++--- dlls/comctl32/tests/progress.c | 12 +-- dlls/comctl32/tests/propsheet.c | 84 +++++++-------- dlls/comctl32/tests/rebar.c | 20 ++-- dlls/comctl32/tests/static.c | 4 +- dlls/comctl32/tests/status.c | 13 ++- dlls/comctl32/tests/subclass.c | 2 +- dlls/comctl32/tests/syslink.c | 10 +- dlls/comctl32/tests/tab.c | 40 +++---- dlls/comctl32/tests/taskdialog.c | 16 +-- dlls/comctl32/tests/toolbar.c | 184 +++++++++++++++---------------- dlls/comctl32/tests/tooltips.c | 82 +++++++------- dlls/comctl32/tests/trackbar.c | 10 +- dlls/comctl32/tests/treeview.c | 58 +++++----- dlls/comctl32/tests/updown.c | 22 ++-- dlls/comctl32/tests/v6util.h | 4 +- include/commctrl.h | 4 +- 32 files changed, 971 insertions(+), 967 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2b4634c18f6c402f2a5…

1 0

Eric Pouech : gameux/tests: Use correct integral type.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 3350d094499da0b98c020bfa3ec4bc4f74a89c87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3350d094499da0b98c020bfa… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:25:32 2022 +0100 gameux/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gamestatistics.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index aa10156f1ab..2b1a867e83c 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -141,7 +141,7 @@ static void test_gamestatisticsmgr( void ) static const GUID guidApplicationId = { 0x17A6558E, 0x60BE, 0x4078, { 0xB6, 0x6F, 0x9C, 0x3A, 0xDA, 0x2A, 0x32, 0xE6 } }; HRESULT hr; - DWORD dwOpenResult; + GAMESTATS_OPEN_RESULT openResult; LPWSTR lpStatisticsFile = NULL; LPWSTR lpName = NULL, lpValue = NULL, sTooLongString = NULL; UINT uMaxCategoryLength = 0, uMaxNameLength = 0, uMaxValueLength = 0; @@ -157,7 +157,7 @@ static void test_gamestatisticsmgr( void ) /* this should fail, because statistics don't exist yet */ gs = (void *)0xdeadbeef; - hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); + hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &openResult, &gs); if (hr != HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) { /* With win10 1803 game explorer functionality was removed and gameux became a stub */ @@ -169,7 +169,7 @@ static void test_gamestatisticsmgr( void ) (gs == (void *)0xdeadbeef ? "deadbeef" : "neither NULL nor deadbeef")); /* now, allow them to be created */ - hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs); + hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &openResult, &gs); ok(SUCCEEDED(hr), "GetGameStatistics returned error: 0x%x\n", hr); ok(gs!=NULL, "GetGameStatistics did not return valid interface pointer\n"); if(gs) @@ -277,9 +277,9 @@ static void test_gamestatisticsmgr( void ) ok(SUCCEEDED(hr), "releasing IGameStatistics returned error: 0x%08x\n", hr); /* try to read written statistics */ - hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs); + hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &openResult, &gs); ok(SUCCEEDED(hr), "GetGameStatistics returned error: 0x%08x\n", hr); - ok(dwOpenResult == GAMESTATS_OPEN_OPENED, "GetGameStatistics returned invalid open result: 0x%x\n", dwOpenResult); + ok(openResult == GAMESTATS_OPEN_OPENED, "GetGameStatistics returned invalid open result: 0x%x\n", openResult); ok(gs!=NULL, "GetGameStatistics did not return valid interface pointer\n"); /* verify values with these which we stored before*/

1 0

Eric Pouech : gameux/tests: Enable compilation with long types.
by Alexandre Julliard 28 Feb '22

28 Feb '22

Module: wine Branch: master Commit: 91b705dc061e1b13c0e97a7eaad837be59ebecc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91b705dc061e1b13c0e97a7e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:25:38 2022 +0100 gameux/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/gameux/tests/Makefile.in | 1 - dlls/gameux/tests/gameexplorer.c | 16 +++++++-------- dlls/gameux/tests/gamestatistics.c | 40 +++++++++++++++++++------------------- 3 files changed, 28 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91b705dc061e1b13c0e9…

1 0