ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

version/tests: Remove win9x hacks.

This commit is contained in:
Austin English 2011-02-23 19:12:33 -08:00 committed by Alexandre Julliard
parent 291949cbc4
commit 35a39e3cf6
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/version/tests/info.c
View File

@ -178,7 +178,6 @@ static void test_info_size(void)
ok(retval == 0, "Expected 0, got %d\n", retval); ok(retval == 0, "Expected 0, got %d\n", retval);
ok(hdl == 0, "Expected 0, got %d\n", hdl); ok(hdl == 0, "Expected 0, got %d\n", hdl);
ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND || ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND ||
GetLastError() == ERROR_BAD_FORMAT || /* win9x */
GetLastError() == ERROR_SUCCESS, /* win2k */ GetLastError() == ERROR_SUCCESS, /* win2k */
"Expected ERROR_RESOURCE_DATA_NOT_FOUND, got %d\n", GetLastError()); "Expected ERROR_RESOURCE_DATA_NOT_FOUND, got %d\n", GetLastError());
@ -501,12 +500,10 @@ static void test_VerQueryValue(void)
ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len); ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len);
ok(!ret, "VerQueryValue should fail\n"); ok(!ret, "VerQueryValue should fail\n");
ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND ||
GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, GetLastError() == 0xdeadbeef /* NT4, W2K */,
"VerQueryValue returned %u\n", GetLastError()); "VerQueryValue returned %u\n", GetLastError());
ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p);
ok(len == 0 || ok(len == 0, "expected 0 got %x\n", len);
len == 0xbeef, /* win9x */
"expected 0 got %x\n", len);
p = (char *)0xdeadbeef; p = (char *)0xdeadbeef;
len = 0xdeadbeef; len = 0xdeadbeef;
@ -570,12 +567,10 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len);
ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len);
ok(!ret, "VerQueryValue(%s) succeeded\n", buf); ok(!ret, "VerQueryValue(%s) succeeded\n", buf);
ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND ||
GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, GetLastError() == 0xdeadbeef /* NT4, W2K */,
"VerQueryValue returned %u\n", GetLastError()); "VerQueryValue returned %u\n", GetLastError());
ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p);
ok(len == 0 || ok(len == 0, "expected 0 or 0xbeef, got %x\n", len);
len == 0xbeef, /* win9x */
"expected 0 or 0xbeef, got %x\n", len);
} }
HeapFree(GetProcessHeap(), 0, ver); HeapFree(GetProcessHeap(), 0, ver);