wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

David Kahurani : oleaut32: Do not skip the first decimal digit in VarParseNumFromStr().
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: a4ba88c0ff25c71687fd26792cda40c20d8eaed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ba88c0ff25c71687fd2679… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Mar 7 18:47:31 2022 +0100 oleaut32: Do not skip the first decimal digit in VarParseNumFromStr(). Add more tests to probe what happens if the integral part is omitted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52476 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 47 +++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.c | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index f25a448645c..a4e2700c7df 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1775,6 +1775,45 @@ static void test_VarParseNumFromStrEn(void) EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,0); EXPECT2(1,FAILDIG); + /* Skipping the integer part is not an error */ + CONVERT(".2", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(2,FAILDIG); + + /* Even zero gets an exponent (it sort of indicates 'precision') */ + CONVERT(".0", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(0,FAILDIG); + + CONVERT(".000", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-3); + EXPECTRGB(0,0); + EXPECTRGB(3,FAILDIG); + + CONVERT("$.02", NUMPRS_CURRENCY|NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_DECIMAL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,4,0,-2); + EXPECT2(2,FAILDIG); + + CONVERT(".001", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-3); + EXPECT2(1,FAILDIG); + + CONVERT(".101", NUMPRS_DECIMAL); + EXPECT(3,NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-3); + EXPECT2(1,0); + EXPECTRGB(2,1); + EXPECTRGB(3,FAILDIG); + + CONVERT(".30", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,3,0,-1); + /* See the NUMPRS_THOUSANDS comment about trailing zeroes */ + EXPECTRGB(0,3); + EXPECTRGB(2,FAILDIG); + + /* But skipping both the integer and decimal part is not allowed */ + CONVERT(".", NUMPRS_DECIMAL); + EXPECTFAIL; + /* Consumes only one decimal point */ CONVERT("1.1.", NUMPRS_DECIMAL); EXPECT(2,NUMPRS_DECIMAL,NUMPRS_DECIMAL,3,0,-1); @@ -2131,6 +2170,14 @@ static void test_VarParseNumFromStrFr(void) CONVERT("1.2", NUMPRS_DECIMAL); EXPECT(1,NUMPRS_DECIMAL,0,1,0,0); EXPECT2(1,FAILDIG); + + /* The integer part can still be omitted */ + CONVERT(",2", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(2,FAILDIG); + + CONVERT(".2", NUMPRS_DECIMAL); + EXPECTFAIL; } static void test_VarParseNumFromStrMisc(void) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index bf8f041b9c6..885082cc659 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1633,7 +1633,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla /* If we have no digits so far, skip leading zeros */ if (!pNumprs->cDig) { - while (lpszStr[1] == '0') + while (*lpszStr == '0') { dwState |= B_LEADING_ZERO; cchUsed++;

1 0

Eric Pouech : quartz/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 3c2e6efb5a6b077ccd6eac2190e16829882ee333 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2e6efb5a6b077ccd6eac21… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Mar 7 12:54:07 2022 -0600 quartz/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 1 - dlls/quartz/tests/acmwrapper.c | 196 ++--- dlls/quartz/tests/avidec.c | 506 +++++------ dlls/quartz/tests/avisplit.c | 576 ++++++------ dlls/quartz/tests/dsoundrender.c | 500 +++++------ dlls/quartz/tests/filesource.c | 496 +++++------ dlls/quartz/tests/filtergraph.c | 1762 +++++++++++++++++++------------------ dlls/quartz/tests/filtermapper.c | 120 +-- dlls/quartz/tests/memallocator.c | 358 ++++---- dlls/quartz/tests/mpegsplit.c | 626 ++++++------- dlls/quartz/tests/passthrough.c | 32 +- dlls/quartz/tests/systemclock.c | 88 +- dlls/quartz/tests/videorenderer.c | 1216 ++++++++++++------------- dlls/quartz/tests/vmr7.c | 1314 +++++++++++++-------------- dlls/quartz/tests/vmr9.c | 1688 +++++++++++++++++------------------ dlls/quartz/tests/waveparser.c | 388 ++++---- 16 files changed, 4934 insertions(+), 4933 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c2e6efb5a6b077ccd6e…

1 0

Eric Pouech : quartz/tests: Use the correct integer types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 64e2921ef3032779cf78ac000f1700e9bb3a86fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=64e2921ef3032779cf78ac00… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Mar 7 12:54:06 2022 -0600 quartz/tests: Use the correct integer types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 3 ++- dlls/quartz/tests/filtergraph.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 03e6b8413d5..2e1289e715b 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -449,10 +449,11 @@ static void test_basic_audio(void) IBaseFilter *filter = create_dsound_render(); LONG balance, volume; ITypeInfo *typeinfo; + unsigned int count; IBasicAudio *audio; TYPEATTR *typeattr; - ULONG ref, count; HRESULT hr; + ULONG ref; hr = IBaseFilter_QueryInterface(filter, &IID_IBasicAudio, (void **)&audio); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 98f7b30717d..2496b556132 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2827,8 +2827,8 @@ static void test_control_delegation(void) IVideoWindow *window; IBasicVideo2 *video; ITypeInfo *typeinfo; + unsigned int count; TYPEATTR *typeattr; - ULONG count; HRESULT hr; LONG val; diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index a0ccb4898a9..45ec3313813 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3975,11 +3975,11 @@ static void test_windowless_size(void) IVMRAspectRatioControl9 *aspect_ratio_control; IVMRWindowlessControl9 *windowless_control; IFilterGraph2 *graph = create_graph(); - VMR9AspectRatioMode aspect_mode; struct testfilter source; IMemAllocator *allocator; RECT src, dst, expect; IMemInputPin *input; + DWORD aspect_mode; HWND window; HRESULT hr; ULONG ref;

1 0

Eric Pouech : uiautomationcore/tests: Enable compilation with long types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: c7bbb107cd0412ec8dc87930aa348dbf628fb1c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7bbb107cd0412ec8dc87930… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:09:02 2022 +0100 uiautomationcore/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/uiautomationcore/tests/Makefile.in | 1 - dlls/uiautomationcore/tests/uiautomation.c | 80 +++++++++++++++--------------- 2 files changed, 40 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7bbb107cd0412ec8dc8…

1 0

Eric Pouech : uianimation/tests: Enable compilation with long types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: b0eec770d0e82cd6680e434b78bf79051ba6e88c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0eec770d0e82cd6680e434b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:56 2022 +0100 uianimation/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/uianimation/tests/Makefile.in | 1 - dlls/uianimation/tests/uianimation.c | 26 +++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/uianimation/tests/Makefile.in b/dlls/uianimation/tests/Makefile.in index 340034a0ddb..ec1118c2fcd 100644 --- a/dlls/uianimation/tests/Makefile.in +++ b/dlls/uianimation/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = uianimation.dll IMPORTS = ole32 diff --git a/dlls/uianimation/tests/uianimation.c b/dlls/uianimation/tests/uianimation.c index e8d113a6257..8aedd2e4bcf 100644 --- a/dlls/uianimation/tests/uianimation.c +++ b/dlls/uianimation/tests/uianimation.c @@ -41,12 +41,12 @@ static void test_UIAnimationManager(void) } hr = IUIAnimationManager_CreateAnimationVariable(manager, 1.0f, &variable); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); if (hr == S_OK) IUIAnimationVariable_Release(variable); hr = IUIAnimationManager_CreateStoryboard(manager, &storyboard); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); if (hr == S_OK) IUIAnimationStoryboard_Release(storyboard); @@ -66,25 +66,25 @@ static void test_IUIAnimationTimer(void) } hr = IUIAnimationTimer_IsEnabled(timer); - todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + todo_wine ok(hr == S_FALSE, "got 0x%08lx\n", hr); hr = IUIAnimationTimer_Enable(timer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IUIAnimationTimer_Enable(timer); - todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + todo_wine ok(hr == S_FALSE, "got 0x%08lx\n", hr); hr = IUIAnimationTimer_IsEnabled(timer); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IUIAnimationTimer_Disable(timer); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IUIAnimationTimer_Disable(timer); - todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + todo_wine ok(hr == S_FALSE, "got 0x%08lx\n", hr); hr = IUIAnimationTimer_IsEnabled(timer); - todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + todo_wine ok(hr == S_FALSE, "got 0x%08lx\n", hr); IUIAnimationTimer_Release(timer); } @@ -104,7 +104,7 @@ static void test_IUIAnimationTransitionFactory(void) } hr = IUIAnimationTransitionFactory_CreateTransition(factory, NULL, &transition); - todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + todo_wine ok(hr == E_POINTER, "got 0x%08lx\n", hr); IUIAnimationTransitionFactory_Release(factory); } @@ -124,17 +124,17 @@ static void test_IUIAnimationTransitionLibrary(void) } hr = IUIAnimationTransitionLibrary_CreateInstantaneousTransition(library, 100.0, &instantaneous); - 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) IUIAnimationTransition_Release(instantaneous); hr = IUIAnimationTransitionLibrary_CreateLinearTransition(library, 500.0, 100.0, &linear); - 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) IUIAnimationTransition_Release(linear); hr = IUIAnimationTransitionLibrary_CreateSmoothStopTransition(library, 500.0, 100.0, &smooth); - 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) IUIAnimationTransition_Release(smooth);

1 0

Eric Pouech : twain_32/tests: Enable compilation with long types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: b6dbbfe649c3a30540a41ac4da29e5f06766c37a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6dbbfe649c3a30540a41ac4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:50 2022 +0100 twain_32/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/twain_32/tests/Makefile.in | 1 - dlls/twain_32/tests/dsm.c | 42 ++++++++++++++++++++--------------------- 2 files changed, 21 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6dbbfe649c3a30540a4…

1 0

Eric Pouech : taskschd/tests: Enable compilation with long types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 0ff329c041b0a420d1b3d1393e0fdae638e387d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ff329c041b0a420d1b3d139… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:44 2022 +0100 taskschd/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/taskschd/tests/Makefile.in | 1 - dlls/taskschd/tests/scheduler.c | 618 ++++++++++++++++++++-------------------- 2 files changed, 309 insertions(+), 310 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0ff329c041b0a420d1b3…

1 0

Eric Pouech : tapi32/tests: Enable compilation with long types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: bb71d6d9bad586144d61a5e72775b535a87face0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb71d6d9bad586144d61a5e7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:38 2022 +0100 tapi32/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/tapi32/tests/Makefile.in | 1 - dlls/tapi32/tests/tapi.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in index 6c420bf270f..126eed1c85c 100644 --- a/dlls/tapi32/tests/Makefile.in +++ b/dlls/tapi32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = tapi32.dll IMPORTS = tapi32 diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c index 13772c8c7d4..462f0ceb0c6 100644 --- a/dlls/tapi32/tests/tapi.c +++ b/dlls/tapi32/tests/tapi.c @@ -35,25 +35,25 @@ static void test_lineInitialize(void) HLINEAPP lnApp; ret = lineInitialize(NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %lx.\n", ret); ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %lx.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %lx.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %lx.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev); - ok(!ret, "unexpected return value, got %u.\n", ret); + ok(!ret, "unexpected return value, got %lu.\n", ret); ret = lineShutdown(NULL); - todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %x.\n", ret); + todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %lx.\n", ret); ret = lineShutdown(lnApp); - ok(!ret, "unexpected return value, got %u.\n", ret); + ok(!ret, "unexpected return value, got %lu.\n", ret); } START_TEST(tapi)

1 0

Eric Pouech : sxs/tests: Enable compilation with long types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 0dabbc1548e8de4d28ce2c1b7eb02b8dec7c96a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dabbc1548e8de4d28ce2c1b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:32 2022 +0100 sxs/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/sxs/tests/Makefile.in | 1 - dlls/sxs/tests/cache.c | 70 +++++++++++++++++++++++----------------------- dlls/sxs/tests/name.c | 66 +++++++++++++++++++++---------------------- dlls/sxs/tests/sxs.c | 38 ++++++++++++------------- 4 files changed, 87 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0dabbc1548e8de4d28ce…

1 0

Eric Pouech : sti/tests: Enable compilation with long types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: d046c3fc1c09369493de025c1eefeafa22de090b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d046c3fc1c09369493de025c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:26 2022 +0100 sti/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/sti/tests/Makefile.in | 1 - dlls/sti/tests/sti.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/sti/tests/Makefile.in b/dlls/sti/tests/Makefile.in index 0c14e735f0a..a6735dd09e6 100644 --- a/dlls/sti/tests/Makefile.in +++ b/dlls/sti/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = sti.dll IMPORTS = uuid ole32 diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index a87ab9fe47e..fdfff62b3f6 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -99,7 +99,7 @@ static void test_version_flag_versus_aw(void) IUnknown_Release((IUnknown*)pStiW); } else - ok(0, "could not create StillImageA, hr = 0x%X\n", hr); + ok(0, "could not create StillImageA, hr = 0x%lX\n", hr); hr = pStiCreateInstance(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); if (SUCCEEDED(hr)) { @@ -113,7 +113,7 @@ static void test_version_flag_versus_aw(void) IUnknown_Release((IUnknown*)pStiW); } else - ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + ok(0, "could not create StillImageW, hr = 0x%lX\n", hr); } else skip("No StiCreateInstance function\n"); @@ -134,7 +134,7 @@ static void test_version_flag_versus_aw(void) IUnknown_Release((IUnknown*)pStiA); } else - todo_wine ok(0, "could not create StillImageA, hr = 0x%X\n", hr); + todo_wine ok(0, "could not create StillImageA, hr = 0x%lX\n", hr); } else skip("No StiCreateInstanceA function\n"); @@ -155,7 +155,7 @@ static void test_version_flag_versus_aw(void) IUnknown_Release((IUnknown*)pStiW); } else - ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + ok(0, "could not create StillImageW, hr = 0x%lX\n", hr); } else skip("No StiCreateInstanceW function\n"); @@ -204,12 +204,12 @@ static void test_stillimage_aggregation(void) IStillImage_Release(pStiW2); } else - ok(0, "could not query for IID_IStillImageW, hr = 0x%x\n", hr); + ok(0, "could not query for IID_IStillImageW, hr = 0x%lx\n", hr); IStillImage_Release(pStiW); } else - ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + ok(0, "could not create StillImageW, hr = 0x%lX\n", hr); /* Now do the above tests prove that STI.DLL isn't picky about querying for IUnknown in CoCreateInterface when aggregating? */ @@ -220,7 +220,7 @@ static void test_stillimage_aggregation(void) hr = CoCreateInstance(&CLSID_Sti, &aggregator, CLSCTX_ALL, &IID_IUnknown, (void**)&pUnknown); ok(SUCCEEDED(hr) || broken(hr == CLASS_E_NOAGGREGATION), /* Win 2000 */ - "CoCreateInstance unexpectedly failed when querying for IUnknown during aggregation, hr = 0x%x\n", hr); + "CoCreateInstance unexpectedly failed when querying for IUnknown during aggregation, hr = 0x%lx\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(pUnknown); } @@ -249,14 +249,14 @@ static void test_launch_app_registry(void) else if (SUCCEEDED(hr)) { hr = IStillImage_UnregisterLaunchApplication(pStiW, appName); - ok(SUCCEEDED(hr), "could not unregister launch application, error 0x%X\n", hr); + ok(SUCCEEDED(hr), "could not unregister launch application, error 0x%lX\n", hr); } else - ok(0, "could not register launch application, error 0x%X\n", hr); + ok(0, "could not register launch application, error 0x%lX\n", hr); IStillImage_Release(pStiW); } else - ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + ok(0, "could not create StillImageW, hr = 0x%lX\n", hr); } START_TEST(sti)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022