added usage of InitWinAPIWrapper

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1998 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/filed/win32/winmain.cpp b/bacula/src/filed/win32/winmain.cpp
index 26ae82ad80b2d099b9bcc52eb7c7d0b8eecde536..5b226d72762a1c788336420b02747e28343a2b87 100755 (executable)
--- a/bacula/src/filed/win32/winmain.cpp
+++ b/bacula/src/filed/win32/winmain.cpp
@@ -302,114 +302,9 @@ int BaculaAppMain()
  /* DWORD dwThreadID; */
    pthread_t tid;
 
-   HMODULE hLib = LoadLibrary("KERNEL32.DLL");
-   if (hLib) {
-      /* create file calls */
-      p_CreateFileA = (t_CreateFileA)
-          GetProcAddress(hLib, "CreateFileA");
-      p_CreateFileW = (t_CreateFileW)
-          GetProcAddress(hLib, "CreateFileW");      
-
-      /* attribute calls */
-      p_GetFileAttributesA = (t_GetFileAttributesA)
-          GetProcAddress(hLib, "GetFileAttributesA");
-      p_GetFileAttributesW = (t_GetFileAttributesW)
-          GetProcAddress(hLib, "GetFileAttributesW");
-      p_GetFileAttributesExA = (t_GetFileAttributesExA)
-          GetProcAddress(hLib, "GetFileAttributesExA");
-      p_GetFileAttributesExW = (t_GetFileAttributesExW)
-          GetProcAddress(hLib, "GetFileAttributesExW");
-      p_SetFileAttributesA = (t_SetFileAttributesA)
-          GetProcAddress(hLib, "SetFileAttributesA");
-      p_SetFileAttributesW = (t_SetFileAttributesW)
-          GetProcAddress(hLib, "SetFileAttributesW");
-      /* process calls */
-      p_SetProcessShutdownParameters = (t_SetProcessShutdownParameters)
-          GetProcAddress(hLib, "SetProcessShutdownParameters");
-      /* backup calls */
-      p_BackupRead = (t_BackupRead)
-          GetProcAddress(hLib, "BackupRead");
-      p_BackupWrite = (t_BackupWrite)
-          GetProcAddress(hLib, "BackupWrite");
-      /* char conversion calls */
-      p_WideCharToMultiByte = (t_WideCharToMultiByte)
-          GetProcAddress(hLib, "WideCharToMultiByte");
-      p_MultiByteToWideChar = (t_MultiByteToWideChar)
-          GetProcAddress(hLib, "MultiByteToWideChar");
-
-      /* find files */
-      p_FindFirstFileA = (t_FindFirstFileA)
-          GetProcAddress(hLib, "FindFirstFileA"); 
-      p_FindFirstFileW = (t_FindFirstFileW)
-          GetProcAddress(hLib, "FindFirstFileW");       
-      p_FindNextFileA = (t_FindNextFileA)
-          GetProcAddress(hLib, "FindNextFileA");
-      p_FindNextFileW = (t_FindNextFileW)
-          GetProcAddress(hLib, "FindNextFileW");
-      /* set and get directory */
-      p_SetCurrentDirectoryA = (t_SetCurrentDirectoryA)
-          GetProcAddress(hLib, "SetCurrentDirectoryA");
-      p_SetCurrentDirectoryW = (t_SetCurrentDirectoryW)
-          GetProcAddress(hLib, "SetCurrentDirectoryW");       
-      p_GetCurrentDirectoryA = (t_GetCurrentDirectoryA)
-          GetProcAddress(hLib, "GetCurrentDirectoryA");
-      p_GetCurrentDirectoryW = (t_GetCurrentDirectoryW)
-          GetProcAddress(hLib, "GetCurrentDirectoryW");      
-      FreeLibrary(hLib);
-   }
-
-   
-   hLib = LoadLibrary("MSVCRT.DLL");
-   if (hLib) {
-      /* unlink */
-      p_wunlink = (t_wunlink)
-      GetProcAddress(hLib, "_wunlink");
-      /* wmkdir */
-      p_wmkdir = (t_wmkdir)
-      GetProcAddress(hLib, "_wmkdir");
-      /* wopen */
-      p_wopen = (t_wopen)
-      GetProcAddress(hLib, "_wopen");
-
-      FreeLibrary(hLib);
-   }
-
-   
-   hLib = LoadLibrary("ADVAPI32.DLL");
-   if (hLib) {
-      p_OpenProcessToken = (t_OpenProcessToken)
-         GetProcAddress(hLib, "OpenProcessToken");
-      p_AdjustTokenPrivileges = (t_AdjustTokenPrivileges)
-         GetProcAddress(hLib, "AdjustTokenPrivileges");
-      p_LookupPrivilegeValue = (t_LookupPrivilegeValue)
-         GetProcAddress(hLib, "LookupPrivilegeValueA");
-      FreeLibrary(hLib);
-   }
+   InitWinAPIWrapper();
 
    WSA_Init();
-   /*  
-    * Even if these are defined, don't use on old 
-    *  platforms.
-    */
-   if (bacService::IsWin95()) {
-      p_BackupRead = NULL;
-      p_BackupWrite = NULL;
-
-      p_CreateFileW = NULL;          
-      p_GetFileAttributesW = NULL;          
-      p_GetFileAttributesExW = NULL;
-          
-      p_SetFileAttributesW = NULL;
-                
-      p_FindFirstFileW = NULL;
-      p_FindNextFileW = NULL;
-      p_SetCurrentDirectoryW = NULL;
-      p_GetCurrentDirectoryW = NULL;
-
-      p_wunlink = NULL;
-      p_wmkdir = NULL;
-      p_wopen = NULL;
-   }
 
    /* Set this process to be the last application to be shut down. */
    if (p_SetProcessShutdownParameters) {