Module: wine Branch: master Commit: b76007d847a18c76f49718de42d9cbee7a4be83b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76007d847a18c76f49718de42...
Author: Nicolas Le Cam niko.lecam@gmail.com Date: Thu Feb 19 22:48:22 2009 +0100
fusion/tests: Fix a test on some platforms.
---
dlls/fusion/tests/asmcache.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index c5e4acd..436a04d 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -887,6 +887,8 @@ static void test_InstallAssembly(void) HRESULT hr; ULONG disp; DWORD attr; + char dllpath[MAX_PATH]; + UINT size;
static const WCHAR empty[] = {0}; static const WCHAR noext[] = {'f','i','l','e',0}; @@ -940,8 +942,10 @@ static void test_InstallAssembly(void) hr = IAssemblyCache_InstallAssembly(cache, 0, winedll, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
- attr = GetFileAttributes("C:\windows\assembly\GAC_MSIL\wine\" - "1.0.0.0__2d03617b1c31e2f5/wine.dll"); + size = GetWindowsDirectoryA(dllpath, MAX_PATH); + strcat(dllpath, "\assembly\GAC_MSIL\wine\\1.0.0.0__2d03617b1c31e2f5\wine.dll"); + + attr = GetFileAttributes(dllpath); ok(attr != INVALID_FILE_ATTRIBUTES, "Expected assembly to exist\n");
/* uninstall the assembly from the GAC */ @@ -955,10 +959,11 @@ static void test_InstallAssembly(void) }
/* FIXME: remove once UninstallAssembly is implemented */ - DeleteFileA("C:\windows\assembly\GAC_MSIL\wine\" - "1.0.0.0__2d03617b1c31e2f5\wine.dll"); - RemoveDirectoryA("C:\windows\assembly\GAC_MSIL\wine\1.0.0.0__2d03617b1c31e2f5"); - RemoveDirectoryA("C:\windows\assembly\GAC_MSIL\wine"); + DeleteFileA(dllpath); + dllpath[size + sizeof("\assembly\GAC_MSIL\wine\1.0.0.0__2d03617b1c31e2f5")] = '\0'; + RemoveDirectoryA(dllpath); + dllpath[size + sizeof("\assembly\GAC_MSIL\wine")] = '\0'; + RemoveDirectoryA(dllpath);
DeleteFileA("test.dll"); DeleteFileA("wine.dll");