Fix msvc build problems.

Fix path quoting in SQLite scripts.

Fix problems with SHGetFolderPath.

Fix bacula.dll exports for msvc build.

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

diff --git a/bacula/src/lib/parse_conf.h b/bacula/src/lib/parse_conf.h
index b8adffe25f44e75bc38991d9fb8e520e77f205d9..75a8dd8d8cba95208f28f48ea8cb99e76087ed86 100644 (file)
--- a/bacula/src/lib/parse_conf.h
+++ b/bacula/src/lib/parse_conf.h
@@ -30,7 +30,7 @@
 */
 
 struct RES_ITEM;                    /* Declare forward referenced structure */
-struct RES;                         /* Declare forware referenced structure */
+class RES;                         /* Declare forware referenced structure */
 typedef void (MSG_RES_HANDLER)(LEX *lc, RES_ITEM *item, int index, int pass);
 
 /* This is the structure that defines

diff --git a/bacula/src/lib/tls.c b/bacula/src/lib/tls.c
index c0e64f4bec276aaa3afe50ed607d842b82bcd506..8a17312ce84d4efb0a21baa988581e9355c10507 100644 (file)
--- a/bacula/src/lib/tls.c
+++ b/bacula/src/lib/tls.c
@@ -241,7 +241,7 @@ bool tls_postconnect_verify_cn(TLS_CONNECTION *tls, alist *verify_list)
    SSL *ssl = tls->openssl;
    X509 *cert;
    X509_NAME *subject;
-   int auth_success = false;
+   bool auth_success = false;
    char data[256];
 
    /* Check if peer provided a certificate */
@@ -280,7 +280,7 @@ bool tls_postconnect_verify_host(TLS_CONNECTION *tls, const char *host)
    SSL *ssl = tls->openssl;
    X509 *cert;
    X509_NAME *subject;
-   int auth_success = false;
+   bool auth_success = false;
    int extensions;
    char data[256];
    int i, j;

diff --git a/bacula/src/win32/bacula.sln b/bacula/src/win32/bacula.sln
index a625e9a30b8002c377194360259b224828424d26..8b114bd2fa395ce53c13fce694298bf55ae0b5dc 100644 (file)
--- a/bacula/src/win32/bacula.sln
+++ b/bacula/src/win32/bacula.sln
@@ -189,6 +189,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsmtp", "tools\bsmtp\bsmtp.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{40CADEE4-8D53-4157-AA36-B256F4934FC3}"
        ProjectSection(SolutionItems) = preProject
+               build-depkgs-msvc.cmd = build-depkgs-msvc.cmd
                scripts\disk-changer.cmd = scripts\disk-changer.cmd
                scripts\dvd-handler.cmd = scripts\dvd-handler.cmd
                scripts\mtx-changer.cmd = scripts\mtx-changer.cmd

diff --git a/bacula/src/win32/build-depkgs-msvc.cmd b/bacula/src/win32/build-depkgs-msvc.cmd
index 26cbd8cbe6692da04108dab5d69290ed110d2c2f..689a2f32dbc469a17856fa5ced391e8296531b94 100644 (file)
--- a/bacula/src/win32/build-depkgs-msvc.cmd
+++ b/bacula/src/win32/build-depkgs-msvc.cmd
@@ -175,6 +175,12 @@ REM        do_patch pcre.patch
 
 :process_pthreads
        CALL :get_source %URL_PTHREADS% %DIR_PTHREADS% %MKD_PTHREADS%
+       FOR %%I IN ( %URL_PTHREADS% ) DO (SET ARCHIVE=%%~nxI)
+       IF EXIST %SRC_DIR%\nul GOTO :install_pthreads
+       ECHO Extracting %ARCHIVE%
+       7z x -bd -y -o"%DIR_PTHREADS%" "%ARCHIVE%" 2>&1 > "%ARCHIVE%.log"
+:install_pthreads
+       CD %DIR_PTHREADS%
        ECHO Installing pthreads
        XCOPY Pre-built\include\*.h %DEPPKG_DIR%\include\ /Y
        XCOPY Pre-built\lib\pthreadVCE.lib %DEPPKG_DIR%\lib\ /Y
@@ -248,6 +254,7 @@ REM do_patch postgresql.patch
        CALL :do_nmake ../Makefile.msvc clean all
        ECHO Installing SQLite
        COPY sqlite3.exe %DEPPKG_DIR%\bin
+       COPY sqlite3.exe.manifest %DEPPKG_DIR%\bin
        COPY sqlite3.lib %DEPPKG_DIR%\lib
        COPY sqlite3.h %DEPPKG_DIR%\include
        EXIT /B 0

diff --git a/bacula/src/win32/cats/create_sqlite3_database.cmd b/bacula/src/win32/cats/create_sqlite3_database.cmd
index 9ea7f5200b89ab18fa6876057ee5e3ab28b21688..c951597aac8a528826b9cc8ba2988c4bec4ef0c2 100644 (file)
--- a/bacula/src/win32/cats/create_sqlite3_database.cmd
+++ b/bacula/src/win32/cats/create_sqlite3_database.cmd
@@ -2,5 +2,5 @@
 REM
 REM Script to create Bacula SQLite tables
 
-ECHO .databases | "@bin_dir_cmd@\sqlite3" %* @working_dir_cmd@\bacula.db
+ECHO .databases | "@bin_dir_cmd@\sqlite3" %* "@working_dir_cmd@\bacula.db"
 EXIT /b 0

diff --git a/bacula/src/win32/cats/drop_sqlite3_database.cmd b/bacula/src/win32/cats/drop_sqlite3_database.cmd
index 6be1689c1a692116e66ce1cf1d7ee4189f3043bf..29719243ed05b47b0a08384b06c73f67febf207e 100644 (file)
--- a/bacula/src/win32/cats/drop_sqlite3_database.cmd
+++ b/bacula/src/win32/cats/drop_sqlite3_database.cmd
@@ -2,6 +2,6 @@
 REM
 REM Script to drop Bacula SQLite tables
 
-DEL @working_dir_cmd@\bacula.db
+DEL "@working_dir_cmd@\bacula.db"
 ECHO SQLite database dropped.
 EXIT /b 0

diff --git a/bacula/src/win32/cats/make_sqlite3_catalog_backup.cmd b/bacula/src/win32/cats/make_sqlite3_catalog_backup.cmd
index 9af7713558a636d736317fcef2cff035fbae7f03..90be3615c5c98970bdd392551509b85bd66155be 100644 (file)
--- a/bacula/src/win32/cats/make_sqlite3_catalog_backup.cmd
+++ b/bacula/src/win32/cats/make_sqlite3_catalog_backup.cmd
@@ -15,7 +15,7 @@ REM
 
 DEL /f "@working_dir_cmd@\%1.sql" 2>nul
 
-ECHO .dump | "@bin_dir_cmd@\sqlite3" %1.db > "@working_dir_cmd@\%1.sql"
+ECHO .dump | "@bin_dir_cmd@\sqlite3" "@working_dir_cmd@\%1.db" > "@working_dir_cmd@\%1.sql"
 
 @ECHO off
 REM 

diff --git a/bacula/src/win32/compat/winapi.c b/bacula/src/win32/compat/winapi.c
index b713bad443a6d5521bfc150cdc8452ec379fbf1e..1a61144debe9bcd6434fda0caa24ea4ac24e0705 100644 (file)
--- a/bacula/src/win32/compat/winapi.c
+++ b/bacula/src/win32/compat/winapi.c
@@ -176,8 +176,6 @@ InitWinAPIWrapper()
          p_AttachConsole = (t_AttachConsole)
              GetProcAddress(hLib, "AttachConsole");
       }
-
-      FreeLibrary(hLib);
    }
    
    if (g_platform_id != VER_PLATFORM_WIN32_WINDOWS) {
@@ -189,8 +187,6 @@ InitWinAPIWrapper()
          /* wmkdir */
          p_wmkdir = (t_wmkdir)
          GetProcAddress(hLib, "_wmkdir");
-
-         FreeLibrary(hLib);
       }
 
       hLib = LoadLibraryA("ADVAPI32.DLL");
@@ -201,25 +197,20 @@ InitWinAPIWrapper()
             GetProcAddress(hLib, "AdjustTokenPrivileges");
          p_LookupPrivilegeValue = (t_LookupPrivilegeValue)
             GetProcAddress(hLib, "LookupPrivilegeValueA");
-         FreeLibrary(hLib);
       }
    }
 
-   /* First try in SHFOLDER for older systems */
-   hLib = LoadLibraryA("SHFOLDER.DLL");
-   if (hLib) {
-      p_SHGetFolderPath = (t_SHGetFolderPath)
-         GetProcAddress(hLib, "SHGetFolderPath");
-      FreeLibrary(hLib);
-   }
-
-   /* Now try Shell32.dll for newer systems */
    hLib = LoadLibraryA("SHELL32.DLL");
    if (hLib) {
       p_SHGetFolderPath = (t_SHGetFolderPath)
-         GetProcAddress(hLib, "SHGetFolderPath");
-      FreeLibrary(hLib);
+         GetProcAddress(hLib, "SHGetFolderPathA");
+   } else {
+      /* If SHELL32 isn't found try SHFOLDER for older systems */
+      hLib = LoadLibraryA("SHFOLDER.DLL");
+      if (hLib) {
+         p_SHGetFolderPath = (t_SHGetFolderPath)
+            GetProcAddress(hLib, "SHGetFolderPathA");
+      }
    }
-
    atexit(Win32ConvCleanupCache);
 }

diff --git a/bacula/src/win32/compat/winconfig.h b/bacula/src/win32/compat/winconfig.h
index c87851db288458383ad5d9722655d3e9f422ae15..98cd69bb40a991668f79998f7ec9c96b757f4d20 100644 (file)
--- a/bacula/src/win32/compat/winconfig.h
+++ b/bacula/src/win32/compat/winconfig.h
@@ -376,7 +376,7 @@
 /* Enable NLS only if we are using the new VC++.
  * NLS should also work with VC++ 7.1, but the Makefiles are
  * not adapted to support it (include, lib...). */
-#define ENABLE_NLS 1
+//#define ENABLE_NLS 1
 #endif
 
 #undef  LOCALEDIR

diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index ccd82a06cb708de7faf605afdbae3ec2d8f21906..b71984c50680b3721fe394779c61d35473241011 100644 (file)
--- a/bacula/src/win32/installer/winbacula.nsi
+++ b/bacula/src/win32/installer/winbacula.nsi
@@ -418,9 +418,9 @@ Section "-Initialize"
   Delete /REBOOTOK "$INSTDIR\bin\License.txt"
 
   FileOpen $R1 $PLUGINSDIR\config.sed w
-  FileWrite $R1 "s;@VERSION@;${VERSION};$\r$\n"
-  FileWrite $R1 "s;@DATE@;${__DATE__};$\r$\n"
-  FileWrite $R1 "s;@DISTNAME@;Windows;$\r$\n"
+  FileWrite $R1 "s;@VERSION@;${VERSION};g$\r$\n"
+  FileWrite $R1 "s;@DATE@;${__DATE__};g$\r$\n"
+  FileWrite $R1 "s;@DISTNAME@;Windows;g$\r$\n"
 
 !If "$BUILD_TOOLS" == "MinGW"
   StrCpy $R2 "MinGW32"
@@ -432,92 +432,92 @@ Section "-Initialize"
   Exch $R3
   Pop $R3
 
-  FileWrite $R1 "s;@DISTVER@;$R2;$\r$\n"
+  FileWrite $R1 "s;@DISTVER@;$R2;g$\r$\n"
 
   ${StrRep} $R2 "$APPDATA\Bacula\Work" "\" "\\\\"
-  FileWrite $R1 's;@working_dir@;$R2;$\r$\n'
+  FileWrite $R1 's;@working_dir@;$R2;g$\r$\n'
   ${StrRep} $R2 "$APPDATA\Bacula\Work" "\" "\\"
-  FileWrite $R1 's;@working_dir_cmd@;$R2;$\r$\n'
+  FileWrite $R1 's;@working_dir_cmd@;$R2;g$\r$\n'
 
   ${StrRep} $R2 "$INSTDIR\bin" "\" "\\\\"
-  FileWrite $R1 's;@bin_dir@;$R2;$\r$\n'
+  FileWrite $R1 's;@bin_dir@;$R2;g$\r$\n'
   ${StrRep} $R2 "$INSTDIR\bin" "\" "\\"
   FileWrite $R1 's;@bin_dir_cmd@;$R2;g$\r$\n'
 
   ${StrRep} $R2 "$INSTDIR" "\" "/"
-  FileWrite $R1 "s;@BUILD_DIR@;$R2;$\r$\n"
+  FileWrite $R1 "s;@BUILD_DIR@;$R2;g$\r$\n"
 
   Call IsDirectorSelected
   Pop $R2
   ${If} $R2 = 1
-    FileWrite $R1 "s;@director_address@;$LocalHostAddress;$\r$\n"
+    FileWrite $R1 "s;@director_address@;$LocalHostAddress;g$\r$\n"
   ${Else}
     ${If} "$ConfigDirectorAddress" != ""
-      FileWrite $R1 "s;@director_address@;$ConfigDirectorAddress;$\r$\n"
+      FileWrite $R1 "s;@director_address@;$ConfigDirectorAddress;g$\r$\n"
     ${EndIf}
   ${EndIf}
 
-  FileWrite $R1 "s;@client_address@;$LocalHostAddress;$\r$\n"
-  FileWrite $R1 "s;@storage_address@;$LocalHostAddress;$\r$\n"
+  FileWrite $R1 "s;@client_address@;$LocalHostAddress;g$\r$\n"
+  FileWrite $R1 "s;@storage_address@;$LocalHostAddress;g$\r$\n"
 
   ${If} "$ConfigClientName" != ""
-    FileWrite $R1 "s;@client_name@;$ConfigClientName;$\r$\n"
+    FileWrite $R1 "s;@client_name@;$ConfigClientName;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigClientPort" != ""
-    FileWrite $R1 "s;@client_port@;$ConfigClientPort;$\r$\n"
+    FileWrite $R1 "s;@client_port@;$ConfigClientPort;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigClientMaxJobs" != ""
-    FileWrite $R1 "s;@client_maxjobs@;$ConfigClientMaxJobs;$\r$\n"
+    FileWrite $R1 "s;@client_maxjobs@;$ConfigClientMaxJobs;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigClientPassword" != ""
-    FileWrite $R1 "s;@client_password@;$ConfigClientPassword;$\r$\n"
+    FileWrite $R1 "s;@client_password@;$ConfigClientPassword;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigStorageName" != ""
-    FileWrite $R1 "s;@storage_name@;$ConfigStorageName;$\r$\n"
+    FileWrite $R1 "s;@storage_name@;$ConfigStorageName;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigStoragePort" != ""
-    FileWrite $R1 "s;@storage_port@;$ConfigStoragePort;$\r$\n"
+    FileWrite $R1 "s;@storage_port@;$ConfigStoragePort;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigStorageMaxJobs" != ""
-    FileWrite $R1 "s;@storage_maxjobs@;$ConfigStorageMaxJobs;$\r$\n"
+    FileWrite $R1 "s;@storage_maxjobs@;$ConfigStorageMaxJobs;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigStoragePassword" != ""
-    FileWrite $R1 "s;@storage_password@;$ConfigStoragePassword;$\r$\n"
+    FileWrite $R1 "s;@storage_password@;$ConfigStoragePassword;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigDirectorName" != ""
-    FileWrite $R1 "s;@director_name@;$ConfigDirectorName;$\r$\n"
+    FileWrite $R1 "s;@director_name@;$ConfigDirectorName;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigDirectorPort" != ""
-    FileWrite $R1 "s;@director_port@;$ConfigDirectorPort;$\r$\n"
+    FileWrite $R1 "s;@director_port@;$ConfigDirectorPort;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigDirectorMaxJobs" != ""
-    FileWrite $R1 "s;@director_maxjobs@;$ConfigDirectorMaxJobs;$\r$\n"
+    FileWrite $R1 "s;@director_maxjobs@;$ConfigDirectorMaxJobs;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigDirectorPassword" != ""
-    FileWrite $R1 "s;@director_password@;$ConfigDirectorPassword;$\r$\n"
+    FileWrite $R1 "s;@director_password@;$ConfigDirectorPassword;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigDirectorMailServer" != ""
-    FileWrite $R1 "s;@smtp_host@;$ConfigDirectorMailServer;$\r$\n"
+    FileWrite $R1 "s;@smtp_host@;$ConfigDirectorMailServer;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigDirectorMailAddress" != ""
-    FileWrite $R1 "s;@job_email@;$ConfigDirectorMailAddress;$\r$\n"
+    FileWrite $R1 "s;@job_email@;$ConfigDirectorMailAddress;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigMonitorName" != ""
-    FileWrite $R1 "s;@monitor_name@;$ConfigMonitorName;$\r$\n"
+    FileWrite $R1 "s;@monitor_name@;$ConfigMonitorName;g$\r$\n"
   ${EndIf}
   ${If} "$ConfigMonitorPassword" != ""
-    FileWrite $R1 "s;@monitor_password@;$ConfigMonitorPassword;$\r$\n"
+    FileWrite $R1 "s;@monitor_password@;$ConfigMonitorPassword;g$\r$\n"
   ${EndIf}
 
   ${If} $ConfigDirectorDB = 1
     ${If} $MySQLPath != ""
       ${StrRep} $R2 "$MySQLPath\bin" "\" "\\"
-      FileWrite $R1 "s;@SQL_BINDIR@;$R2;$\r$\n"
+      FileWrite $R1 "s;@SQL_BINDIR@;$R2;g$\r$\n"
     ${EndIf}
   ${ElseIf} $ConfigDirectorDB = 2
     ${If} $PostgreSQLPath != ""
       ${StrRep} $R2 "$PostgreSQLPath\bin" "\" "\\"
-      FileWrite $R1 "s;@SQL_BINDIR@;$R2;$\r$\n"
+      FileWrite $R1 "s;@SQL_BINDIR@;$R2;g$\r$\n"
     ${EndIf}
   ${EndIf}
 

diff --git a/bacula/src/win32/libbac/libbac.vcproj b/bacula/src/win32/libbac/libbac.vcproj
index a6fb6065330deb43211763f5a9d108c38507fbd2..41b08d796e19863a1a9a2c67a6bec0795cd8e77e 100644 (file)
--- a/bacula/src/win32/libbac/libbac.vcproj
+++ b/bacula/src/win32/libbac/libbac.vcproj
@@ -1565,11 +1565,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\lib\protos.h"\r
+                               RelativePath="..\..\findlib\protos.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\findlib\protos.h"\r
+                               RelativePath="..\..\lib\protos.h"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/bacula/src/win32/libbac/msvc/bacula.def b/bacula/src/win32/libbac/msvc/bacula.def
index a6c15affdd8fe64d114697089fcb974d43fea201..ea9deea165c6be6d49e577b7a105c9b15f0539a2 100644 (file)
--- a/bacula/src/win32/libbac/msvc/bacula.def
+++ b/bacula/src/win32/libbac/msvc/bacula.def
@@ -353,13 +353,13 @@ fnmatch
 ?my_name_is@@YAXHQAPADPBD@Z
 ?get_db_type@@YAPBDXZ
 ?set_db_type@@YAXPBD@Z
-?init_msg@@YAXPAVJCR@@PAUMSGS@@@Z
+?init_msg@@YAXPAVJCR@@PAVMSGS@@@Z
 ?init_console_msg@@YAXPBD@Z
-?add_msg_dest@@YAXPAUMSGS@@HHPAD1@Z
-?rem_msg_dest@@YAXPAUMSGS@@HHPAD@Z
+?add_msg_dest@@YAXPAVMSGS@@HHPAD1@Z
+?rem_msg_dest@@YAXPAVMSGS@@HHPAD@Z
 ?close_msg@@YAXPAVJCR@@@Z
 ?set_errno@berrno@@QAEXH@Z
-?free_msgs_res@@YAXPAUMSGS@@@Z
+?free_msgs_res@@YAXPAVMSGS@@@Z
 ?term_msg@@YAXXZ
 ?dispatch_message@@YAXPAVJCR@@HJPAD@Z
 ?c_str@POOL_MEM@@QBEPADXZ
@@ -464,7 +464,7 @@ fnmatch
 ?tree_cwd@@YAPAUs_tree_node@@PADPAUs_tree_root@@PAU1@@Z
  
 ; util.obj 
-?is_buf_zero@@YAHPADH@Z
+?is_buf_zero@@YA_NPADH@Z
 ?lcase@@YAXPAD@Z
 ?bash_spaces@@YAXPAD@Z
 ?bash_spaces@@YAXAAVPOOL_MEM@@@Z