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

fusion/tests: Fix some test failures on systems with .NET 1.1.

This commit is contained in:
Paul Vriens 2009-02-06 08:27:08 +01:00 committed by Alexandre Julliard
parent cf9f4dfa2a
commit a89bd3f562
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/fusion/tests/fusion.c
View File

@ -144,13 +144,37 @@ static void test_GetCachePath(void)
"Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr);
ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path);
lstrcpyW(cachepath, windir);
lstrcatW(cachepath, backslash);
lstrcatW(cachepath, assembly);
/* ASM_CACHE_ROOT */
lstrcpyW(path, nochange);
size = MAX_PATH;
hr = pGetCachePath(ASM_CACHE_ROOT, path, &size);
ok(hr == S_OK ||
broken(hr == E_INVALIDARG), /* .NET 1.1 */
"Expected S_OK, got %08x\n", hr);
if (hr == S_OK)
ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path);
if (pGetCORVersion) if (pGetCORVersion)
{ {
CHAR versionA[MAX_PATH]; CHAR versionA[MAX_PATH];
CHAR cachepathA[MAX_PATH]; CHAR cachepathA[MAX_PATH];
CHAR nativeimgA[MAX_PATH];
CHAR zapfmtA[MAX_PATH];
static const CHAR nativeimgA[] = "NativeImages_"; if (hr == S_OK)
static const CHAR zapfmtA[] = "%s\\%s\\%s%s_32"; {
lstrcpyA(nativeimgA, "NativeImages_");
lstrcpyA(zapfmtA, "%s\\%s\\%s%s_32");
}
else
{
lstrcpyA(nativeimgA, "NativeImages1_");
lstrcpyA(zapfmtA, "%s\\%s\\%s%s");
}
pGetCORVersion(version, MAX_PATH, &size); pGetCORVersion(version, MAX_PATH, &size);
WideCharToMultiByte(CP_ACP, 0, version, -1, versionA, MAX_PATH, 0, 0); WideCharToMultiByte(CP_ACP, 0, version, -1, versionA, MAX_PATH, 0, 0);
@ -166,17 +190,6 @@ static void test_GetCachePath(void)
ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path);
} }
lstrcpyW(cachepath, windir);
lstrcatW(cachepath, backslash);
lstrcatW(cachepath, assembly);
/* ASM_CACHE_ROOT */
lstrcpyW(path, nochange);
size = MAX_PATH;
hr = pGetCachePath(ASM_CACHE_ROOT, path, &size);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path);
/* two flags at once */ /* two flags at once */
lstrcpyW(path, nochange); lstrcpyW(path, nochange);
size = MAX_PATH; size = MAX_PATH;