marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mscoree/tests: Use more A-functions to fix test failures on Win9x.

oldstable
Paul Vriens 2010-11-22 13:31:53 +01:00 committed by Alexandre Julliard
parent 167ab75f4e
commit 759f12c187
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/mscoree/tests/mscoree.c
View File

@ -153,8 +153,9 @@ static void test_loadlibraryshim(void)
const WCHAR gdidll[] = {'g','d','i','3','2','.','d','l','l',0};
HRESULT hr;
const WCHAR *latest = NULL;
CHAR latestA[MAX_PATH];
HMODULE hdll;
WCHAR dllpath[MAX_PATH];
CHAR dllpath[MAX_PATH];
hr = pLoadLibraryShim(fusion, v1_1, NULL, &hdll);
ok(hr == S_OK || hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr);
@ -162,10 +163,10 @@ static void test_loadlibraryshim(void)
{
latest = v1_1;
GetModuleFileNameW(hdll, dllpath, MAX_PATH);
GetModuleFileNameA(hdll, dllpath, MAX_PATH);
todo_wine ok(StrStrIW(dllpath, v1_1) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath));
ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath));
todo_wine ok(StrStrIA(dllpath, "v1.1.4322") != 0, "incorrect fusion.dll path %s\n", dllpath);
ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath);
FreeLibrary(hdll);
}
@ -176,10 +177,10 @@ static void test_loadlibraryshim(void)
{
latest = v2_0;
GetModuleFileNameW(hdll, dllpath, MAX_PATH);
GetModuleFileNameA(hdll, dllpath, MAX_PATH);
todo_wine ok(StrStrIW(dllpath, v2_0) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath));
ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath));
todo_wine ok(StrStrIA(dllpath, "v2.0.50727") != 0, "incorrect fusion.dll path %s\n", dllpath);
ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath);
FreeLibrary(hdll);
}
@ -192,10 +193,10 @@ static void test_loadlibraryshim(void)
if (!latest)
latest = v4_0;
GetModuleFileNameW(hdll, dllpath, MAX_PATH);
GetModuleFileNameA(hdll, dllpath, MAX_PATH);
todo_wine ok(StrStrIW(dllpath, v4_0) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath));
ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath));
todo_wine ok(StrStrIA(dllpath, "v4.0.30319") != 0, "incorrect fusion.dll path %s\n", dllpath);
ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath);
FreeLibrary(hdll);
}
@ -205,15 +206,17 @@ static void test_loadlibraryshim(void)
if (SUCCEEDED(hr))
FreeLibrary(hdll);
WideCharToMultiByte(CP_ACP, 0, latest, -1, latestA, MAX_PATH, NULL, NULL);
hr = pLoadLibraryShim(fusion, NULL, NULL, &hdll);
ok(hr == S_OK, "LoadLibraryShim failed, hr=%x\n", hr);
if (SUCCEEDED(hr))
{
GetModuleFileNameW(hdll, dllpath, MAX_PATH);
GetModuleFileNameA(hdll, dllpath, MAX_PATH);
if (latest)
todo_wine ok(StrStrIW(dllpath, latest) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath));
ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath));
todo_wine ok(StrStrIA(dllpath, latestA) != 0, "incorrect fusion.dll path %s\n", dllpath);
ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath);
FreeLibrary(hdll);
}
@ -222,11 +225,11 @@ static void test_loadlibraryshim(void)
ok(hr == S_OK, "LoadLibraryShim failed, hr=%x\n", hr);
if (SUCCEEDED(hr))
{
GetModuleFileNameW(hdll, dllpath, MAX_PATH);
GetModuleFileNameA(hdll, dllpath, MAX_PATH);
if (latest)
todo_wine ok(StrStrIW(dllpath, latest) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath));
ok(StrStrIW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath));
todo_wine ok(StrStrIA(dllpath, latestA) != 0, "incorrect fusion.dll path %s\n", dllpath);
ok(StrStrIA(dllpath, "fusion.dll") != 0, "incorrect fusion.dll path %s\n", dllpath);
FreeLibrary(hdll);
}