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

Paul Gofman : ws2_32/tests: Add tests for setting and getting socket options with shorter length.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 4d60b85f3ba12c2561ce117f9dffd45daf20797d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d60b85f3ba12c2561ce117f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sat Mar 5 22:04:07 2022 +0300 ws2_32/tests: Add tests for setting and getting socket options with shorter length. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6b6267dc153..6e492ffbb61 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1155,15 +1155,38 @@ static const LINGER linger_testvals[] = { static void test_set_getsockopt(void) { + static struct + { + int af; + int type; + int level; + int optname; + BOOL accepts_short_len; + unsigned int sizes[3]; + DWORD values[3]; + } + test_optsize[] = + { + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}}, + }; SOCKET s, s2; - int i, err, lasterr; + int i, j, err, lasterr; int timeout; LINGER lingval; int size; WSAPROTOCOL_INFOA infoA; WSAPROTOCOL_INFOW infoW; char providername[WSAPROTOCOL_LEN + 1]; - DWORD value; + DWORD expected_last_error, expected_value; + int expected_err, expected_size; + DWORD value, save_value; + UINT64 value64; + struct _prottest { int family, type, proto; @@ -1375,6 +1398,117 @@ static void test_set_getsockopt(void) err, WSAGetLastError()); closesocket(s); + + /* Test option length. */ + for (i = 0; i < ARRAY_SIZE(test_optsize); ++i) + { + winetest_push_context("i %u, level %d, optname %d", + i, test_optsize[i].level, test_optsize[i].optname); + + s2 = socket( test_optsize[i].af, test_optsize[i].type, 0 ); + ok(s2 != INVALID_SOCKET, "socket() failed error %d\n", WSAGetLastError()); + + size = sizeof(save_value); + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&save_value, &size); + ok(!err, "Unexpected getsockopt result %d.\n", err); + + value64 = 0xffffffff00000001; + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char *)&value64, sizeof(value64)); + ok(!err, "Unexpected setsockopt result %d.\n", err); + ok(!WSAGetLastError(), "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + + size = sizeof(value64); + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value64, &size); + ok(!err, "Unexpected getsockopt result %d.\n", err); + ok(size == test_optsize[i].sizes[2], "Got unexpected size %d.\n", size); + /* The behaviour regarding filling the high dword is different between options without the obvious + * pattern, it is either left untouched (more often) or zeroed. Wine doesn't touch the high dword. */ + + if (test_optsize[i].sizes[2] == 1 || test_optsize[i].level != SOL_SOCKET) + { + expected_err = -1; + expected_last_error = WSAENOBUFS; + } + else + { + expected_err = 0; + expected_last_error = 0; + } + + value = 1; + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char *)&value, -1); + ok(err == expected_err, "Unexpected setsockopt result %d.\n", err); + /* Broken between Win7 and Win10 21H1. */ + ok(WSAGetLastError() == expected_last_error || broken(expected_last_error && WSAGetLastError() == WSAEFAULT), + "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + + size = -1; + value = 0xdeadbeef; + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, &size); + if (test_optsize[i].optname == SO_OPENTYPE) + { + ok(!err, "Unexpected getsockopt result %d.\n", err); + ok(!WSAGetLastError(), "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + } + else + { + ok(err == -1, "Unexpected getsockopt result %d.\n", err); + ok(WSAGetLastError() == WSAEFAULT, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + } + ok(size == (test_optsize[i].optname == SO_OPENTYPE ? 4 : -1), "Got unexpected size %d.\n", size); + + winetest_pop_context(); + + for (j = 0; j < ARRAY_SIZE(test_optsize[i].sizes); ++j) + { + size = 1 << j; + winetest_push_context("i %u, level %d, optname %d, len %u", + i, test_optsize[i].level, test_optsize[i].optname, size); + + value = 1; + if (test_optsize[i].values[j]) + expected_value = test_optsize[i].values[j]; + else + expected_value = 0xdeadbeef; + + if (test_optsize[i].accepts_short_len || size == 4) + { + expected_err = 0; + expected_last_error = 0; + expected_size = test_optsize[i].sizes[j]; + + if (!test_optsize[i].values[j]) + memcpy(&expected_value, &value, expected_size); + } + else + { + expected_err = -1; + expected_last_error = WSAEFAULT; + expected_size = test_optsize[i].sizes[j]; + } + + SetLastError(0xdeadbeef); + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, size); + ok(err == expected_err, "Unexpected setsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + + value = 0xdeadbeef; + SetLastError(0xdeadbeef); + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, &size); + ok(err == expected_err, "Unexpected getsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + ok(value == expected_value, "Got unexpected value %#x, expected %#x.\n", value, expected_value); + ok(size == expected_size, "Got unexpected size %d, expected %d.\n", size, expected_size); + + winetest_pop_context(); + } + + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, + (char*)&save_value, sizeof(save_value)); + ok(!err, "Unexpected getsockopt result %d.\n", err); + closesocket(s2); + } + /* Test with the closed socket */ SetLastError(0xdeadbeef); size = sizeof(i);

1 0

David Kahurani : oleaut32: Do not skip the first decimal digit in VarParseNumFromStr().
by Alexandre Julliard March 7, 2022

March 7, 2022

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

Alexandre Julliard : xslt: Revert some calling convention changes.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 05509812798f5d21e7c9055e624c613a2dd26a4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=05509812798f5d21e7c9055e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 20:41:57 2022 +0100 xslt: Revert some calling convention changes. We require -mabi=ms now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/xslt/libxslt/xsltutils.c | 6 +++--- libs/xslt/libxslt/xsltutils.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/xslt/libxslt/xsltutils.c b/libs/xslt/libxslt/xsltutils.c index 4717c0e8548..94097b9d209 100644 --- a/libs/xslt/libxslt/xsltutils.c +++ b/libs/xslt/libxslt/xsltutils.c @@ -511,7 +511,7 @@ xsltMessage(xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst) { * * Default handler for out of context error messages. */ -static void WINAPIV LIBXSLT_ATTR_FORMAT(2,3) +static void LIBXSLT_ATTR_FORMAT(2,3) xsltGenericErrorDefaultFunc(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) { va_list args; @@ -557,7 +557,7 @@ xsltSetGenericErrorFunc(void *ctx, xmlGenericErrorFunc handler) { * * Default handler for out of context error messages. */ -static void WINAPIV LIBXSLT_ATTR_FORMAT(2,3) +static void LIBXSLT_ATTR_FORMAT(2,3) xsltGenericDebugDefaultFunc(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) { va_list args; @@ -698,7 +698,7 @@ xsltSetTransformErrorFunc(xsltTransformContextPtr ctxt, * Display and format an error messages, gives file, line, position and * extra parameters, will use the specific transformation context if available */ -void WINAPIV +void xsltTransformError(xsltTransformContextPtr ctxt, xsltStylesheetPtr style, xmlNodePtr node, diff --git a/libs/xslt/libxslt/xsltutils.h b/libs/xslt/libxslt/xsltutils.h index 2b5f17a8b11..ea6c3740540 100644 --- a/libs/xslt/libxslt/xsltutils.h +++ b/libs/xslt/libxslt/xsltutils.h @@ -160,7 +160,7 @@ XSLTPUBFUN void XSLTCALL xsltSetTransformErrorFunc (xsltTransformContextPtr ctxt, void *ctx, xmlGenericErrorFunc handler); -XSLTPUBFUN void WINAPIV +XSLTPUBFUN void XSLTCALL xsltTransformError (xsltTransformContextPtr ctxt, xsltStylesheetPtr style, xmlNodePtr node,

1 0

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

March 7, 2022

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 March 7, 2022

March 7, 2022

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 : sti/tests: Enable compilation with long types.
by Alexandre Julliard March 7, 2022

March 7, 2022

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

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

March 7, 2022

Module: wine Branch: master Commit: bf0f6792f7c79085e2c3320b27479199d35b311d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf0f6792f7c79085e2c3320b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:08 2022 +0100 shlwapi/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/shlwapi/tests/Makefile.in | 1 - dlls/shlwapi/tests/assoc.c | 50 +++---- dlls/shlwapi/tests/clist.c | 4 +- dlls/shlwapi/tests/clsid.c | 10 +- dlls/shlwapi/tests/istream.c | 258 +++++++++++++++++----------------- dlls/shlwapi/tests/ordinal.c | 306 ++++++++++++++++++++--------------------- dlls/shlwapi/tests/path.c | 210 ++++++++++++++-------------- dlls/shlwapi/tests/shreg.c | 104 +++++++------- dlls/shlwapi/tests/string.c | 52 +++---- dlls/shlwapi/tests/thread.c | 34 ++--- dlls/shlwapi/tests/url.c | 276 ++++++++++++++++++------------------- 11 files changed, 652 insertions(+), 653 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf0f6792f7c79085e2c3…

1 0

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

March 7, 2022

Module: wine Branch: master Commit: 4ad1bab4642ab4435e92342c4cf0af1b6ff6b26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ad1bab4642ab4435e92342c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:01 2022 +0100 shell32/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/shell32/tests/Makefile.in | 1 - dlls/shell32/tests/appbar.c | 18 +- dlls/shell32/tests/assoc.c | 80 +-- dlls/shell32/tests/autocomplete.c | 76 +-- dlls/shell32/tests/brsfolder.c | 34 +- dlls/shell32/tests/ebrowser.c | 314 +++++----- dlls/shell32/tests/msg.h | 8 +- dlls/shell32/tests/recyclebin.c | 4 +- dlls/shell32/tests/shelldispatch.c | 438 +++++++------- dlls/shell32/tests/shelllink.c | 274 ++++----- dlls/shell32/tests/shellole.c | 74 +-- dlls/shell32/tests/shellpath.c | 260 ++++----- dlls/shell32/tests/shfldr_special.c | 66 +-- dlls/shell32/tests/shlexec.c | 202 +++---- dlls/shell32/tests/shlfileop.c | 278 ++++----- dlls/shell32/tests/shlfolder.c | 1070 +++++++++++++++++------------------ dlls/shell32/tests/shlview.c | 194 +++---- 17 files changed, 1695 insertions(+), 1696 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ad1bab4642ab4435e92…

1 0

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

March 7, 2022

Module: wine Branch: master Commit: 9e90cecdc603d79c6332a03884ed8d4851ef2e88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e90cecdc603d79c6332a038… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:02 2022 +0100 riched20/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/Makefile.in | 1 - dlls/riched20/tests/editor.c | 466 +++++------ dlls/riched20/tests/richole.c | 1622 +++++++++++++++++++-------------------- dlls/riched20/tests/txtsrv.c | 194 ++--- 4 files changed, 1141 insertions(+), 1142 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e90cecdc603d79c6332…

1 0

Eric Pouech : riched20/tests: Use correct integral type.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 8b66db027d4112bfd4287b03d5c7b6f33994adc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b66db027d4112bfd4287b03… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:24:56 2022 +0100 riched20/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index c06be02bd89..8d8ba5b1e9d 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -947,7 +947,8 @@ static void test_ITextRange_GetStart_GetEnd(void) ITextDocument *txtDoc = NULL; ITextRange *txtRge = NULL; HRESULT hres; - int first, lim, start, end; + int first, lim; + LONG start, end; static const CHAR test_text1[] = "TestSomeText"; create_interfaces(&w, &reOle, &txtDoc, NULL); @@ -1166,7 +1167,8 @@ static void test_ITextSelection_GetStart_GetEnd(void) ITextDocument *txtDoc = NULL; ITextSelection *txtSel = NULL; HRESULT hres; - int first, lim, start, end; + int first, lim; + LONG start, end; static const CHAR test_text1[] = "TestSomeText"; create_interfaces(&w, &reOle, &txtDoc, &txtSel);

1 0