Module: wine Branch: master Commit: d1a3bad7230b1229ac6a5c885c2fa8f368919e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a3bad7230b1229ac6a5c885c...
Author: Paul Vriens paul.vriens.wine@gmail.com Date: Sun Mar 9 12:15:05 2008 +0100
advpack/tests: Free the library after use.
---
dlls/advpack/tests/advpack.c | 5 ++++- dlls/advpack/tests/files.c | 2 ++ dlls/advpack/tests/install.c | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 4232f76..b90df2d 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -35,6 +35,7 @@ #define REG_VAL_EXISTS(key, value) !RegQueryValueEx(key, value, NULL, NULL, NULL, NULL) #define OPEN_GUID_KEY() !RegOpenKey(HKEY_LOCAL_MACHINE, GUID_KEY, &guid)
+static HMODULE hAdvPack; static HRESULT (WINAPI *pCloseINFEngine)(HINF); static HRESULT (WINAPI *pDelNode)(LPCSTR,DWORD); static HRESULT (WINAPI *pGetVersionFromFile)(LPCSTR,LPDWORD,LPDWORD,BOOL); @@ -66,7 +67,7 @@ static void get_progfiles_dir(void)
static BOOL init_function_pointers(void) { - HMODULE hAdvPack = LoadLibraryA("advpack.dll"); + hAdvPack = LoadLibraryA("advpack.dll");
if (!hAdvPack) return FALSE; @@ -594,4 +595,6 @@ START_TEST(advpack) setperusersecvalues_test(); translateinfstring_test(); translateinfstringex_test(); + + FreeLibrary(hAdvPack); } diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 71c1741..e109a88 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -560,4 +560,6 @@ START_TEST(files) test_AdvInstallFile();
delete_test_files(); + + FreeLibrary(hAdvPack); } diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 6075963..564ecda 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -23,6 +23,7 @@ #include <advpub.h> #include "wine/test.h"
+static HMODULE hAdvPack; /* function pointers */ static HRESULT (WINAPI *pRunSetupCommand)(HWND, LPCSTR, LPCSTR, LPCSTR, LPCSTR, HANDLE*, DWORD, LPVOID); static HRESULT (WINAPI *pLaunchINFSection)(HWND, HINSTANCE, LPSTR, INT); @@ -32,7 +33,7 @@ static char CURR_DIR[MAX_PATH];
static BOOL init_function_pointers(void) { - HMODULE hAdvPack = LoadLibraryA("advpack.dll"); + hAdvPack = LoadLibraryA("advpack.dll"); if (!hAdvPack) return FALSE;
@@ -273,4 +274,6 @@ START_TEST(install) test_RunSetupCommand(); test_LaunchINFSection(); test_LaunchINFSectionEx(); + + FreeLibrary(hAdvPack); }