Detlef Riekenberg : fusion/tests: Fix remaining win98 failures in asmcache.
Alexandre Julliard
julliard at winehq.org
Mon Feb 23 10:00:18 CST 2009
Module: wine
Branch: master
Commit: cfb33d1894a7c77c132ebe4cebd85eb5e3c5533b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb33d1894a7c77c132ebe4cebd85eb5e3c5533b
Author: Detlef Riekenberg <wine.dev at web.de>
Date: Sat Feb 21 12:17:43 2009 +0100
fusion/tests: Fix remaining win98 failures in asmcache.
---
dlls/fusion/tests/asmcache.c | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c
index 7f757c5..cd55afa 100644
--- a/dlls/fusion/tests/asmcache.c
+++ b/dlls/fusion/tests/asmcache.c
@@ -1193,7 +1193,9 @@ static void test_QueryAssemblyInfo(void)
"Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart);
todo_wine
{
- ok(info.uliAssemblySizeInKB.u.LowPart == 4,
+ /* win9x: 32 */
+ ok((info.uliAssemblySizeInKB.u.LowPart == 4) ||
+ broken(info.uliAssemblySizeInKB.u.LowPart == 32),
"Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart);
ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath),
"Wrong assembly path returned\n");
@@ -1214,7 +1216,9 @@ static void test_QueryAssemblyInfo(void)
"Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart);
todo_wine
{
- ok(info.uliAssemblySizeInKB.u.LowPart == 4,
+ /* win9x: 32 */
+ ok((info.uliAssemblySizeInKB.u.LowPart == 4) ||
+ broken(info.uliAssemblySizeInKB.u.LowPart == 32),
"Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart);
ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath),
"Wrong assembly path returned\n");
@@ -1237,7 +1241,9 @@ static void test_QueryAssemblyInfo(void)
{
ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),
"Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr);
- ok(info.uliAssemblySizeInKB.u.LowPart == 4,
+ /* win9x: 32 */
+ ok((info.uliAssemblySizeInKB.u.LowPart == 4) ||
+ broken(info.uliAssemblySizeInKB.u.LowPart == 32),
"Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart);
ok(info.cchBuf == lstrlenW(asmpath) + 1,
"Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf);
@@ -1260,7 +1266,9 @@ static void test_QueryAssemblyInfo(void)
{
ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),
"Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr);
- ok(info.uliAssemblySizeInKB.u.LowPart == 4,
+ /* win9x: 32 */
+ ok((info.uliAssemblySizeInKB.u.LowPart == 4) ||
+ broken(info.uliAssemblySizeInKB.u.LowPart == 32),
"Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart);
ok(info.cchBuf == lstrlenW(asmpath) + 1,
"Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf);
@@ -1282,7 +1290,9 @@ static void test_QueryAssemblyInfo(void)
"Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf);
todo_wine
{
- ok(info.uliAssemblySizeInKB.u.LowPart == 4,
+ /* win9x: 32 */
+ ok((info.uliAssemblySizeInKB.u.LowPart == 4) ||
+ broken(info.uliAssemblySizeInKB.u.LowPart == 32),
"Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart);
ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath),
"Wrong assembly path returned\n");
@@ -1304,7 +1314,9 @@ static void test_QueryAssemblyInfo(void)
"Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart);
todo_wine
{
- ok(info.uliAssemblySizeInKB.u.LowPart == 4,
+ /* win9x: 32 */
+ ok((info.uliAssemblySizeInKB.u.LowPart == 4) ||
+ broken(info.uliAssemblySizeInKB.u.LowPart == 32),
"Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart);
ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath),
"Wrong assembly path returned\n");
@@ -1328,7 +1340,9 @@ static void test_QueryAssemblyInfo(void)
"Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart);
todo_wine
{
- ok(info.uliAssemblySizeInKB.u.LowPart == 4,
+ /* win9x: 32 */
+ ok((info.uliAssemblySizeInKB.u.LowPart == 4) ||
+ broken(info.uliAssemblySizeInKB.u.LowPart == 32),
"Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart);
ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath),
"Wrong assembly path returned\n");
@@ -1372,7 +1386,9 @@ static void test_QueryAssemblyInfo(void)
"Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart);
todo_wine
{
- ok(info.uliAssemblySizeInKB.u.LowPart == 4,
+ /* win9x: 32 */
+ ok((info.uliAssemblySizeInKB.u.LowPart == 4) ||
+ broken(info.uliAssemblySizeInKB.u.LowPart == 32),
"Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart);
ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath),
"Wrong assembly path returned\n");
@@ -1419,7 +1435,9 @@ static void test_QueryAssemblyInfo(void)
"Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart);
todo_wine
{
- ok(info.uliAssemblySizeInKB.u.LowPart == 4,
+ /* win9x: 32 */
+ ok((info.uliAssemblySizeInKB.u.LowPart == 4) ||
+ broken(info.uliAssemblySizeInKB.u.LowPart == 32),
"Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart);
ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath),
"Wrong assembly path returned\n");
@@ -1463,7 +1481,9 @@ static void test_QueryAssemblyInfo(void)
"Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart);
todo_wine
{
- ok(info.uliAssemblySizeInKB.u.LowPart == 4,
+ /* win9x: 32 */
+ ok((info.uliAssemblySizeInKB.u.LowPart == 4) ||
+ broken(info.uliAssemblySizeInKB.u.LowPart == 32),
"Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart);
ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath),
"Wrong assembly path returned\n");
More information about the wine-cvs
mailing list