February 2009 - Wine-commits

Rob Shearman : ole32: Initialise more of the context passed into user marshaling functions in the tests for these functions .
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 712e33e669bf0534a8ba8ca8c7df059c427c7709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=712e33e669bf0534a8ba8ca8c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jan 30 13:47:02 2009 +0000 ole32: Initialise more of the context passed into user marshaling functions in the tests for these functions. --- dlls/ole32/tests/usrmarshal.c | 192 ++++++++++++++++++++++++++++------------ 1 files changed, 134 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=712e33e669bf0534a8ba8…

1 0

Rob Shearman : oleaut32: Initialise more of the context passed into user marshal functions in the tests for these functions .
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: f545468a2dfcb693a4a521337d81ed9e29bead4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f545468a2dfcb693a4a521337… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jan 30 13:48:38 2009 +0000 oleaut32: Initialise more of the context passed into user marshal functions in the tests for these functions. Enable unmarshall testing for LPSAFEARRAYs and BSTRs which works on Windows now that enough of the context has been filled in. --- dlls/oleaut32/tests/usrmarshal.c | 122 ++++++++++++++++++++++++++++---------- 1 files changed, 90 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f545468a2dfcb693a4a52…

1 0

Paul Vriens : wininet/tests: Fix tests failures on W2K and below and some early XP.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: dd943665932e428c3f423ae062464d9b4d755ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd943665932e428c3f423ae06… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 30 16:48:43 2009 +0100 wininet/tests: Fix tests failures on W2K and below and some early XP. --- dlls/wininet/tests/internet.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 13a5f5c..f3277d3 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -546,7 +546,9 @@ static void test_IsDomainLegalCookieDomainW(void) SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(NULL, NULL); error = GetLastError(); - ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(!ret || + broken(ret), /* Win98, NT4, W2K, XP (some) */ + "IsDomainLegalCookieDomainW succeeded\n"); ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); SetLastError(0xdeadbeef); @@ -565,25 +567,33 @@ static void test_IsDomainLegalCookieDomainW(void) ret = pIsDomainLegalCookieDomainW(empty, gmail_com); error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + ok(error == ERROR_INVALID_NAME || + broken(error == ERROR_INVALID_PARAMETER), /* Win98, NT4, W2K, XP (some) */ + "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, empty); error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + ok(error == ERROR_INVALID_NAME || + broken(error == ERROR_INVALID_PARAMETER), /* Win98, NT4, W2K, XP (some) */ + "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(gmail_com, dot); error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + ok(error == ERROR_INVALID_NAME || + broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */ + "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(dot, gmail_com); error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + ok(error == ERROR_INVALID_NAME || + broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */ + "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, com); @@ -595,13 +605,17 @@ static void test_IsDomainLegalCookieDomainW(void) ret = pIsDomainLegalCookieDomainW(com, dot_com); error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + ok(error == ERROR_INVALID_NAME || + broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */ + "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(dot_com, com); error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + ok(error == ERROR_INVALID_NAME || + broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */ + "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, gmail_com); @@ -615,7 +629,7 @@ static void test_IsDomainLegalCookieDomainW(void) SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(gmail_co_uk, co_uk); error = GetLastError(); - ok(!ret, "IsDomainLegalCookieDomainW failed\n"); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error); ret = pIsDomainLegalCookieDomainW(uk, co_uk); @@ -633,8 +647,10 @@ static void test_IsDomainLegalCookieDomainW(void) SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(dot_gmail_com, mail_gmail_com); error = GetLastError(); - ok(!ret, "IsDomainLegalCookieDomainW failed\n"); - ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME || + broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */ + "got %u expected ERROR_INVALID_NAME\n", error); ret = pIsDomainLegalCookieDomainW(gmail_com, mail_gmail_com); ok(ret, "IsDomainLegalCookieDomainW failed\n");

1 0

Juan Lang : crypt32: Remove test of a corner case that failed on older crypt32 versions.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: b5ea9643760fe4c4a61e2a0c71a211e404de6a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ea9643760fe4c4a61e2a0c7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 30 08:02:42 2009 -0800 crypt32: Remove test of a corner case that failed on older crypt32 versions. --- dlls/crypt32/tests/encode.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 5c681b6..439a25f 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1960,8 +1960,6 @@ static const struct encodedBits bits[] = { { 1, bin54, 2, bin55 }, /* strange test case, showing cUnusedBits >= 8 is allowed */ { 9, bin56, 1, bin57 }, - /* even stranger test case, showing cUnusedBits > cbData * 8 is allowed */ - { 17, bin58, 0, NULL }, }; static void test_encodeBits(DWORD dwEncoding)

1 0

Juan Lang : mapi32: Fix many test failures on Win9x.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: f5c0f3c3c26ffbb6b48335ec1b7c36427895cea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c0f3c3c26ffbb6b48335ec1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 30 08:14:00 2009 -0800 mapi32: Fix many test failures on Win9x. --- dlls/mapi32/tests/prop.c | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 0e979d1..92198a9 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -239,7 +239,8 @@ static void test_UlPropSize(void) } res = pUlPropSize(&pv); - ok(res == exp, "pt= %d: Expected %d, got %d\n", pt, exp, res); + ok(res == exp || broken(!res) /* Win9x */, + "pt= %d: Expected %d, got %d\n", pt, exp, res); } } @@ -280,30 +281,30 @@ static void test_FPropContainsProp(void) pvRight.Value.lpszA = szFull; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); - ok(bRet == TRUE, "(full,full)[] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,full)[] match failed\n"); pvRight.Value.lpszA = szPrefix; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); ok(bRet == FALSE, "(full,prefix)[] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == TRUE, "(full,prefix)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); - ok(bRet == TRUE, "(full,prefix)[SUBSTRING] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,prefix)[SUBSTRING] match failed\n"); pvRight.Value.lpszA = szPrefixLower; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == FALSE, "(full,prefixlow)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); ok(bRet == FALSE, "(full,prefixlow)[SUBSTRING] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX|FL_IGNORECASE); - ok(bRet == TRUE, "(full,prefixlow)[PREFIX|IGNORECASE] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,prefixlow)[PREFIX|IGNORECASE] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING|FL_IGNORECASE); - ok(bRet == TRUE, "(full,prefixlow)[SUBSTRING|IGNORECASE] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,prefixlow)[SUBSTRING|IGNORECASE] match failed\n"); pvRight.Value.lpszA = szSubstring; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); ok(bRet == FALSE, "(full,substr)[] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == FALSE, "(full,substr)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); - ok(bRet == TRUE, "(full,substr)[SUBSTRING] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,substr)[SUBSTRING] match failed\n"); pvRight.Value.lpszA = szSubstringLower; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == FALSE, "(full,substrlow)[PREFIX] match failed\n"); @@ -312,10 +313,10 @@ static void test_FPropContainsProp(void) bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX|FL_IGNORECASE); ok(bRet == FALSE, "(full,substrlow)[PREFIX|IGNORECASE] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING|FL_IGNORECASE); - ok(bRet == TRUE, "(full,substrlow)[SUBSTRING|IGNORECASE] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,substrlow)[SUBSTRING|IGNORECASE] match failed\n"); pvRight.Value.lpszA = szFullLower; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING|FL_IGNORECASE); - ok(bRet == TRUE, "(full,fulllow)[IGNORECASE] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,fulllow)[IGNORECASE] match failed\n"); pvLeft.ulPropTag = pvRight.ulPropTag = PT_BINARY; pvLeft.Value.bin.lpb = (LPBYTE)szFull; @@ -323,15 +324,15 @@ static void test_FPropContainsProp(void) pvLeft.Value.bin.cb = pvRight.Value.bin.cb = strlen(szFull); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); - ok(bRet == TRUE, "bin(full,full)[] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "bin(full,full)[] match failed\n"); pvRight.Value.bin.lpb = (LPBYTE)szPrefix; pvRight.Value.bin.cb = strlen(szPrefix); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); ok(bRet == FALSE, "bin(full,prefix)[] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); - ok(bRet == TRUE, "bin(full,prefix)[PREFIX] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "bin(full,prefix)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); - ok(bRet == TRUE, "bin(full,prefix)[SUBSTRING] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "bin(full,prefix)[SUBSTRING] match failed\n"); pvRight.Value.bin.lpb = (LPBYTE)szPrefixLower; pvRight.Value.bin.cb = strlen(szPrefixLower); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); @@ -349,7 +350,7 @@ static void test_FPropContainsProp(void) bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == FALSE, "bin(full,substr)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); - ok(bRet == TRUE, "bin(full,substr)[SUBSTRING] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "bin(full,substr)[SUBSTRING] match failed\n"); pvRight.Value.bin.lpb = (LPBYTE)szSubstringLower; pvRight.Value.bin.cb = strlen(szSubstringLower); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); @@ -502,7 +503,8 @@ static void test_FPropCompareProp(void) } bRet = pFPropCompareProp(&pvLeft, FPCProp_Results[j].relOp, &pvRight); - ok(bRet == bExp, "pt %d (%d,%d,%s): expected %d, got %d\n", ptTypes[i], + ok(bRet == bExp || broken(!bRet) /* Win9x */, + "pt %d (%d,%d,%s): expected %d, got %d\n", ptTypes[i], FPCProp_Results[j].lVal, FPCProp_Results[j].rVal, relops[FPCProp_Results[j].relOp], bExp, bRet); } @@ -646,7 +648,8 @@ static void test_PpropFindProp(void) pvProp.ulPropTag = ptTypes[i]; pRet = pPpropFindProp(&pvProp, 1u, ptTypes[i]); - ok(pRet == &pvProp, "PpropFindProp[%d]: Didn't find existing propery\n", + ok(pRet == &pvProp || broken(pRet != &pvProp) /* Win9x */, + "PpropFindProp[%d]: Didn't find existing propery\n", ptTypes[i]); pRet = pPpropFindProp(&pvProp, 1u, i ? ptTypes[i-1] : ptTypes[i+1]); @@ -882,7 +885,8 @@ static void test_LpValFindProp(void) pvProp.ulPropTag = PROP_TAG(ptTypes[i], 1u); pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 1u), 1u, &pvProp); - ok(pRet == &pvProp, "LpValFindProp[%d]: Didn't find existing propery id/type\n", + ok(pRet == &pvProp || broken(pRet != &pvProp) /* Win9x */, + "LpValFindProp[%d]: Didn't find existing propery id/type\n", ptTypes[i]); pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 0u), 1u, &pvProp); @@ -894,7 +898,8 @@ static void test_LpValFindProp(void) ptTypes[i]); pRet = pLpValFindProp(PROP_TAG(PT_NULL, 1u), 1u, &pvProp); - ok(pRet == &pvProp, "LpValFindProp[%d]: Didn't find existing propery id\n", + ok(pRet == &pvProp || broken(pRet != &pvProp) /* Win9x */, + "LpValFindProp[%d]: Didn't find existing propery id\n", ptTypes[i]); } } @@ -990,7 +995,8 @@ static void test_FBadPropTag(void) if (bBad) ok(res != 0, "pt= %d: Expected non-zero, got 0\n", pt); else - ok(res == 0, "pt= %d: Expected zero, got %d\n", pt, res); + ok(res == 0 || broken(res) /* Win9x */, + "pt= %d: Expected zero, got %d\n", pt, res); } } @@ -1079,7 +1085,8 @@ static void test_FBadProp(void) if (bBad) ok(res != 0, "pt= %d: Expected non-zero, got 0\n", pt); else - ok(res == 0, "pt= %d: Expected zero, got %d\n", pt, res); + ok(res == 0 || broken(res) /* Win9x */, + "pt= %d: Expected zero, got %d\n", pt, res); } } @@ -1130,7 +1137,8 @@ static void test_FBadColumnSet(void) if (bBad) ok(res != 0, "pt= %d: Expected non-zero, got 0\n", pt); else - ok(res == 0, "pt= %d: Expected zero, got %d\n", pt, res); + ok(res == 0 || broken(res) /* Win9x */, + "pt= %d: Expected zero, got %d\n", pt, res); } }

1 0