diff options
-rw-r--r-- | db3x_autobackups/commonheaders.h | 14 | ||||
-rw-r--r-- | db3x_autobackups/database.c | 19 | ||||
-rw-r--r-- | db3x_autobackups/database.h | 2 | ||||
-rw-r--r-- | db3x_autobackups/db3x_mmap.dsp | 66 | ||||
-rw-r--r-- | db3x_autobackups/db3x_mmap.mak | 373 | ||||
-rw-r--r-- | db3x_autobackups/db3x_mmap.vcproj | 4 | ||||
-rw-r--r-- | db3x_autobackups/db3x_mmap_8.vcproj | 4 | ||||
-rw-r--r-- | db3x_autobackups/dbcache.c | 6 | ||||
-rw-r--r-- | db3x_autobackups/dbmodulechain.c | 4 | ||||
-rw-r--r-- | db3x_autobackups/dbsettings.c | 2 | ||||
-rw-r--r-- | db3x_autobackups/init.c | 7 | ||||
-rw-r--r-- | db3x_autobackups/version.h | 6 |
12 files changed, 424 insertions, 83 deletions
diff --git a/db3x_autobackups/commonheaders.h b/db3x_autobackups/commonheaders.h index e1cae64..0fc6dc3 100644 --- a/db3x_autobackups/commonheaders.h +++ b/db3x_autobackups/commonheaders.h @@ -28,12 +28,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <malloc.h>
+#if defined( UNICODE ) && !defined( _UNICODE )
+ #define _UNICODE
+#endif
+#include <tchar.h>
+
#ifdef _DEBUG
-# define _ALPHA_BASE_ 1 // defined for CVS builds
-# define _ALPHA_FUSE_ 1 // defined for fuse powered core
-# define _CRTDBG_MAP_ALLOC
-# include <stdlib.h>
-//# include <crtdbg.h>
+ #define _ALPHA_BASE_ 1 // defined for CVS builds
+ #define _ALPHA_FUSE_ 1 // defined for fuse powered core
+ #define _CRTDBG_MAP_ALLOC
+ #include <stdlib.h>
#endif
#include <commctrl.h>
diff --git a/db3x_autobackups/database.c b/db3x_autobackups/database.c index f26289a..d402b6a 100644 --- a/db3x_autobackups/database.c +++ b/db3x_autobackups/database.c @@ -154,7 +154,7 @@ int LoadDatabaseModule(void) log0("DB logging running");
{
DWORD dummy=0;
- hDbFile=CreateFile(szDbPath,GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL);
+ hDbFile=CreateFileA(szDbPath,GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL);
if ( hDbFile == INVALID_HANDLE_VALUE ) {
return 1;
}
@@ -180,30 +180,29 @@ int LoadDatabaseModule(void) }
static DWORD DatabaseCorrupted=0;
-static char *msg = NULL;
+static TCHAR *msg = NULL;
static DWORD dwErr = 0;
void __cdecl dbpanic(void *arg)
{
if (msg)
{
- char err[256];
+ TCHAR err[256];
if (dwErr==ERROR_DISK_FULL)
- msg = Translate("Disk is full. Miranda will now shutdown.");
+ msg = TranslateT("Disk is full. Miranda will now shutdown.");
- mir_snprintf(err, sizeof(err), msg, Translate("Database failure. Miranda will now shutdown."), dwErr);
+ mir_sntprintf(err, SIZEOF(err), msg, TranslateT("Database failure. Miranda will now shutdown."), dwErr);
- MessageBox(0,err,Translate("Database Error"),MB_SETFOREGROUND|MB_TOPMOST|MB_APPLMODAL|MB_ICONWARNING|MB_OK);
+ MessageBox(0,err,TranslateT("Database Error"),MB_SETFOREGROUND|MB_TOPMOST|MB_APPLMODAL|MB_ICONWARNING|MB_OK);
}
else
- MessageBox(0,Translate("Miranda has detected corruption in your database. This corruption maybe fixed by DBTool. Please download it from http://www.miranda-im.org. Miranda will now shutdown."),
- Translate("Database Panic"),MB_SETFOREGROUND|MB_TOPMOST|MB_APPLMODAL|MB_ICONWARNING|MB_OK);
+ MessageBox(0,TranslateT("Miranda has detected corruption in your database. This corruption maybe fixed by DBTool. Please download it from http://www.miranda-im.org. Miranda will now shutdown."),
+ TranslateT("Database Panic"),MB_SETFOREGROUND|MB_TOPMOST|MB_APPLMODAL|MB_ICONWARNING|MB_OK);
TerminateProcess(GetCurrentProcess(),255);
- return;
}
-void DatabaseCorruption(char *text)
+void DatabaseCorruption(TCHAR *text)
{
int kill=0;
diff --git a/db3x_autobackups/database.h b/db3x_autobackups/database.h index 67ed205..aebfac4 100644 --- a/db3x_autobackups/database.h +++ b/db3x_autobackups/database.h @@ -179,7 +179,7 @@ typedef struct DBCachedContactValueList;
//databasecorruption: with NULL called if any signatures are broken. very very fatal
-void DatabaseCorruption(char *text);
+void DatabaseCorruption(TCHAR *text);
PBYTE DBRead(DWORD ofs,int bytesRequired,int *bytesAvail); //any preview result could be invalidated by the next call
void DBWrite(DWORD ofs,PVOID pData,int count);
void DBFill(DWORD ofs,int bytes);
diff --git a/db3x_autobackups/db3x_mmap.dsp b/db3x_autobackups/db3x_mmap.dsp index 7cd1188..0d57355 100644 --- a/db3x_autobackups/db3x_mmap.dsp +++ b/db3x_autobackups/db3x_mmap.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=db3x_mmap - Win32 Debug
+CFG=db3x_mmap - Win32 Debug Unicode
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,14 @@ CFG=db3x_mmap - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "db3x_mmap.mak" CFG="db3x_mmap - Win32 Debug"
+!MESSAGE NMAKE /f "db3x_mmap.mak" CFG="db3x_mmap - Win32 Debug Unicode"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "db3x_mmap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "db3x_mmap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "db3x_mmap - Win32 Release Unicode" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "db3x_mmap - Win32 Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -83,12 +85,72 @@ LINK32=link.exe # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /map /debug /machine:I386 /out:"../../bin/debug/plugins/dbx_mmap.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none /incremental:no
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Release Unicode"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "db3x_mmap___Win32_Release_Unicode"
+# PROP BASE Intermediate_Dir "db3x_mmap___Win32_Release_Unicode"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_Unicode"
+# PROP Intermediate_Dir "Release_Unicode"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /Zi /O1 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "db3x_mmap_EXPORTS" /Yu"commonheaders.h" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O1 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "db3x_mmap_EXPORTS" /Yu"commonheaders.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x5130000" /dll /map /debug /machine:I386 /out:"../../bin/release/plugins/dbx_mmap.dll" /IGNORE:4089
+# SUBTRACT BASE LINK32 /pdb:none /incremental:yes
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x5130000" /dll /map /debug /machine:I386 /out:"../../bin/release unicode/plugins/dbx_mmap.dll" /IGNORE:4089
+# SUBTRACT LINK32 /pdb:none /incremental:yes
+
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "db3x_mmap___Win32_Debug_Unicode"
+# PROP BASE Intermediate_Dir "db3x_mmap___Win32_Debug_Unicode"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_Unicode"
+# PROP Intermediate_Dir "Debug_Unicode"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DB3X_EXPORTS" /Fr /Yu"commonheaders.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "DB3X_EXPORTS" /Fr /Yu"commonheaders.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /map /debug /machine:I386 /out:"../../bin/debug/plugins/dbx_mmap.dll" /pdbtype:sept
+# SUBTRACT BASE LINK32 /pdb:none /incremental:no
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /map /debug /machine:I386 /out:"../../bin/debug Unicode/plugins/dbx_mmap.dll" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none /incremental:no
+
!ENDIF
# Begin Target
# Name "db3x_mmap - Win32 Release"
# Name "db3x_mmap - Win32 Debug"
+# Name "db3x_mmap - Win32 Release Unicode"
+# Name "db3x_mmap - Win32 Debug Unicode"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/db3x_autobackups/db3x_mmap.mak b/db3x_autobackups/db3x_mmap.mak index 31eeae1..4ef29e7 100644 --- a/db3x_autobackups/db3x_mmap.mak +++ b/db3x_autobackups/db3x_mmap.mak @@ -1,29 +1,31 @@ # Microsoft Developer Studio Generated NMAKE File, Based on db3x_mmap.dsp
!IF "$(CFG)" == ""
-CFG=db3x_mmap - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to db3x_mmap - Win32 Debug.
-!ENDIF
+CFG=db3x_mmap - Win32 Release Unicode
+!MESSAGE No configuration specified. Defaulting to db3x_mmap - Win32 Release Unicode.
+!ENDIF
-!IF "$(CFG)" != "db3x_mmap - Win32 Release" && "$(CFG)" != "db3x_mmap - Win32 Debug"
+!IF "$(CFG)" != "db3x_mmap - Win32 Release" && "$(CFG)" != "db3x_mmap - Win32 Debug" && "$(CFG)" != "db3x_mmap - Win32 Release Unicode" && "$(CFG)" != "db3x_mmap - Win32 Debug Unicode"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "db3x_mmap.mak" CFG="db3x_mmap - Win32 Debug"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "db3x_mmap.mak" CFG="db3x_mmap - Win32 Debug Unicode"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "db3x_mmap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "db3x_mmap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
+!MESSAGE "db3x_mmap - Win32 Release Unicode" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "db3x_mmap - Win32 Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
!ERROR An invalid configuration is specified.
-!ENDIF
+!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
-!ELSE
+!ELSE
NULL=nul
-!ENDIF
+!ENDIF
CPP=cl.exe
MTL=midl.exe
@@ -61,15 +63,15 @@ CLEAN : "$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /Zi /O1 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "db3x_mmap_EXPORTS" /Fp"$(INTDIR)\db3x_mmap.pch" /Yu"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)\resource.res" /d "NDEBUG"
+CPP_PROJ=/nologo /MD /W3 /Zi /O1 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "db3x_mmap_EXPORTS" /Fp"$(INTDIR)\db3x_mmap.pch" /Yu"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x809 /fo"$(INTDIR)\resource.res" /d "NDEBUG"
BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\db3x_mmap.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\db3x_mmap.bsc"
BSC32_SBRS= \
-
+
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x5130000" /dll /incremental:no /pdb:"$(OUTDIR)\dbx_mmap.pdb" /map:"$(INTDIR)\dbx_mmap.map" /debug /machine:I386 /out:"../../bin/release/plugins/dbx_mmap.dll" /implib:"$(OUTDIR)\dbx_mmap.lib" /IGNORE:4089
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x5130000" /dll /incremental:no /pdb:"$(OUTDIR)\dbx_mmap.pdb" /map:"$(INTDIR)\dbx_mmap.map" /debug /machine:I386 /out:"../../bin/release/plugins/dbx_mmap.dll" /implib:"$(OUTDIR)\dbx_mmap.lib" /IGNORE:4089
LINK32_OBJS= \
"$(INTDIR)\commonheaders.obj" \
"$(INTDIR)\database.obj" \
@@ -135,11 +137,11 @@ CLEAN : "$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DB3X_EXPORTS" /Fr"$(INTDIR)\\" /Fp"$(INTDIR)\db3x_mmap.pch" /Yu"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)\resource.res" /d "_DEBUG"
+CPP_PROJ=/nologo /MDd /W3 /Gm /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DB3X_EXPORTS" /Fr"$(INTDIR)\\" /Fp"$(INTDIR)\db3x_mmap.pch" /Yu"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x809 /fo"$(INTDIR)\resource.res" /d "_DEBUG"
BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\db3x_mmap.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\db3x_mmap.bsc"
BSC32_SBRS= \
"$(INTDIR)\commonheaders.sbr" \
"$(INTDIR)\database.sbr" \
@@ -158,7 +160,7 @@ BSC32_SBRS= \ <<
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\dbx_mmap.pdb" /map:"$(INTDIR)\dbx_mmap.map" /debug /machine:I386 /out:"../../bin/debug/plugins/dbx_mmap.dll" /implib:"$(OUTDIR)\dbx_mmap.lib" /pdbtype:sept
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\dbx_mmap.pdb" /map:"$(INTDIR)\dbx_mmap.map" /debug /machine:I386 /out:"../../bin/debug/plugins/dbx_mmap.dll" /implib:"$(OUTDIR)\dbx_mmap.lib" /pdbtype:sept
LINK32_OBJS= \
"$(INTDIR)\commonheaders.obj" \
"$(INTDIR)\database.obj" \
@@ -177,54 +179,202 @@ LINK32_OBJS= \ $(LINK32_FLAGS) $(LINK32_OBJS)
<<
-!ENDIF
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Release Unicode"
+
+OUTDIR=.\Release_Unicode
+INTDIR=.\Release_Unicode
+
+ALL : "..\..\bin\release unicode\plugins\dbx_mmap.dll"
+
+
+CLEAN :
+ -@erase "$(INTDIR)\commonheaders.obj"
+ -@erase "$(INTDIR)\database.obj"
+ -@erase "$(INTDIR)\db3x_mmap.pch"
+ -@erase "$(INTDIR)\dbcache.obj"
+ -@erase "$(INTDIR)\dbcontacts.obj"
+ -@erase "$(INTDIR)\dbevents.obj"
+ -@erase "$(INTDIR)\dbheaders.obj"
+ -@erase "$(INTDIR)\dbmodulechain.obj"
+ -@erase "$(INTDIR)\dbsettings.obj"
+ -@erase "$(INTDIR)\encrypt.obj"
+ -@erase "$(INTDIR)\init.obj"
+ -@erase "$(INTDIR)\resource.res"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(INTDIR)\vc60.pdb"
+ -@erase "$(OUTDIR)\dbx_mmap.exp"
+ -@erase "$(OUTDIR)\dbx_mmap.lib"
+ -@erase "$(OUTDIR)\dbx_mmap.map"
+ -@erase "$(OUTDIR)\dbx_mmap.pdb"
+ -@erase "..\..\bin\release unicode\plugins\dbx_mmap.dll"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /Zi /O1 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "db3x_mmap_EXPORTS" /Fp"$(INTDIR)\db3x_mmap.pch" /Yu"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x809 /fo"$(INTDIR)\resource.res" /d "NDEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\db3x_mmap.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x5130000" /dll /incremental:no /pdb:"$(OUTDIR)\dbx_mmap.pdb" /map:"$(INTDIR)\dbx_mmap.map" /debug /machine:I386 /out:"../../bin/release unicode/plugins/dbx_mmap.dll" /implib:"$(OUTDIR)\dbx_mmap.lib" /IGNORE:4089
+LINK32_OBJS= \
+ "$(INTDIR)\commonheaders.obj" \
+ "$(INTDIR)\database.obj" \
+ "$(INTDIR)\dbcache.obj" \
+ "$(INTDIR)\dbcontacts.obj" \
+ "$(INTDIR)\dbevents.obj" \
+ "$(INTDIR)\dbheaders.obj" \
+ "$(INTDIR)\dbmodulechain.obj" \
+ "$(INTDIR)\dbsettings.obj" \
+ "$(INTDIR)\encrypt.obj" \
+ "$(INTDIR)\init.obj" \
+ "$(INTDIR)\resource.res"
+
+"..\..\bin\release unicode\plugins\dbx_mmap.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
+
+OUTDIR=.\Debug_Unicode
+INTDIR=.\Debug_Unicode
+# Begin Custom Macros
+OutDir=.\Debug_Unicode
+# End Custom Macros
+
+ALL : "..\..\bin\debug Unicode\plugins\dbx_mmap.dll" "$(OUTDIR)\db3x_mmap.bsc"
+
+
+CLEAN :
+ -@erase "$(INTDIR)\commonheaders.obj"
+ -@erase "$(INTDIR)\commonheaders.sbr"
+ -@erase "$(INTDIR)\database.obj"
+ -@erase "$(INTDIR)\database.sbr"
+ -@erase "$(INTDIR)\db3x_mmap.pch"
+ -@erase "$(INTDIR)\dbcache.obj"
+ -@erase "$(INTDIR)\dbcache.sbr"
+ -@erase "$(INTDIR)\dbcontacts.obj"
+ -@erase "$(INTDIR)\dbcontacts.sbr"
+ -@erase "$(INTDIR)\dbevents.obj"
+ -@erase "$(INTDIR)\dbevents.sbr"
+ -@erase "$(INTDIR)\dbheaders.obj"
+ -@erase "$(INTDIR)\dbheaders.sbr"
+ -@erase "$(INTDIR)\dbmodulechain.obj"
+ -@erase "$(INTDIR)\dbmodulechain.sbr"
+ -@erase "$(INTDIR)\dbsettings.obj"
+ -@erase "$(INTDIR)\dbsettings.sbr"
+ -@erase "$(INTDIR)\encrypt.obj"
+ -@erase "$(INTDIR)\encrypt.sbr"
+ -@erase "$(INTDIR)\init.obj"
+ -@erase "$(INTDIR)\init.sbr"
+ -@erase "$(INTDIR)\resource.res"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(INTDIR)\vc60.pdb"
+ -@erase "$(OUTDIR)\db3x_mmap.bsc"
+ -@erase "$(OUTDIR)\dbx_mmap.exp"
+ -@erase "$(OUTDIR)\dbx_mmap.lib"
+ -@erase "$(OUTDIR)\dbx_mmap.map"
+ -@erase "$(OUTDIR)\dbx_mmap.pdb"
+ -@erase "..\..\bin\debug Unicode\plugins\dbx_mmap.dll"
+ -@erase "..\..\bin\debug Unicode\plugins\dbx_mmap.ilk"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "DB3X_EXPORTS" /Fr"$(INTDIR)\\" /Fp"$(INTDIR)\db3x_mmap.pch" /Yu"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x809 /fo"$(INTDIR)\resource.res" /d "_DEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\db3x_mmap.bsc"
+BSC32_SBRS= \
+ "$(INTDIR)\commonheaders.sbr" \
+ "$(INTDIR)\database.sbr" \
+ "$(INTDIR)\dbcache.sbr" \
+ "$(INTDIR)\dbcontacts.sbr" \
+ "$(INTDIR)\dbevents.sbr" \
+ "$(INTDIR)\dbheaders.sbr" \
+ "$(INTDIR)\dbmodulechain.sbr" \
+ "$(INTDIR)\dbsettings.sbr" \
+ "$(INTDIR)\encrypt.sbr" \
+ "$(INTDIR)\init.sbr"
+
+"$(OUTDIR)\db3x_mmap.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+ $(BSC32) @<<
+ $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\dbx_mmap.pdb" /map:"$(INTDIR)\dbx_mmap.map" /debug /machine:I386 /out:"../../bin/debug Unicode/plugins/dbx_mmap.dll" /implib:"$(OUTDIR)\dbx_mmap.lib" /pdbtype:sept
+LINK32_OBJS= \
+ "$(INTDIR)\commonheaders.obj" \
+ "$(INTDIR)\database.obj" \
+ "$(INTDIR)\dbcache.obj" \
+ "$(INTDIR)\dbcontacts.obj" \
+ "$(INTDIR)\dbevents.obj" \
+ "$(INTDIR)\dbheaders.obj" \
+ "$(INTDIR)\dbmodulechain.obj" \
+ "$(INTDIR)\dbsettings.obj" \
+ "$(INTDIR)\encrypt.obj" \
+ "$(INTDIR)\init.obj" \
+ "$(INTDIR)\resource.res"
+
+"..\..\bin\debug Unicode\plugins\dbx_mmap.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
- $(CPP_PROJ) $<
+ $(CPP_PROJ) $<
<<
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("db3x_mmap.dep")
!INCLUDE "db3x_mmap.dep"
-!ELSE
+!ELSE
!MESSAGE Warning: cannot find "db3x_mmap.dep"
-!ENDIF
-!ENDIF
+!ENDIF
+!ENDIF
-!IF "$(CFG)" == "db3x_mmap - Win32 Release" || "$(CFG)" == "db3x_mmap - Win32 Debug"
+!IF "$(CFG)" == "db3x_mmap - Win32 Release" || "$(CFG)" == "db3x_mmap - Win32 Debug" || "$(CFG)" == "db3x_mmap - Win32 Release Unicode" || "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
SOURCE=.\commonheaders.c
!IF "$(CFG)" == "db3x_mmap - Win32 Release"
-CPP_SWITCHES=/nologo /MD /W3 /Zi /O1 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "db3x_mmap_EXPORTS" /Fp"$(INTDIR)\db3x_mmap.pch" /Yc"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_SWITCHES=/nologo /MD /W3 /Zi /O1 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "db3x_mmap_EXPORTS" /Fp"$(INTDIR)\db3x_mmap.pch" /Yc"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
"$(INTDIR)\commonheaders.obj" "$(INTDIR)\db3x_mmap.pch" : $(SOURCE) "$(INTDIR)"
$(CPP) @<<
@@ -234,7 +384,7 @@ CPP_SWITCHES=/nologo /MD /W3 /Zi /O1 /I "../../include" /D "WIN32" /D "NDEBUG" / !ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug"
-CPP_SWITCHES=/nologo /MDd /W3 /Gm /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DB3X_EXPORTS" /Fr"$(INTDIR)\\" /Fp"$(INTDIR)\db3x_mmap.pch" /Yc"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_SWITCHES=/nologo /MDd /W3 /Gm /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DB3X_EXPORTS" /Fr"$(INTDIR)\\" /Fp"$(INTDIR)\db3x_mmap.pch" /Yc"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
"$(INTDIR)\commonheaders.obj" "$(INTDIR)\commonheaders.sbr" "$(INTDIR)\db3x_mmap.pch" : $(SOURCE) "$(INTDIR)"
$(CPP) @<<
@@ -242,7 +392,27 @@ CPP_SWITCHES=/nologo /MDd /W3 /Gm /ZI /Od /I "../../include" /D "WIN32" /D "_DEB <<
-!ENDIF
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Release Unicode"
+
+CPP_SWITCHES=/nologo /MD /W3 /Zi /O1 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "db3x_mmap_EXPORTS" /Fp"$(INTDIR)\db3x_mmap.pch" /Yc"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+"$(INTDIR)\commonheaders.obj" "$(INTDIR)\db3x_mmap.pch" : $(SOURCE) "$(INTDIR)"
+ $(CPP) @<<
+ $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
+
+CPP_SWITCHES=/nologo /MDd /W3 /Gm /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "DB3X_EXPORTS" /Fr"$(INTDIR)\\" /Fp"$(INTDIR)\db3x_mmap.pch" /Yc"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+"$(INTDIR)\commonheaders.obj" "$(INTDIR)\commonheaders.sbr" "$(INTDIR)\db3x_mmap.pch" : $(SOURCE) "$(INTDIR)"
+ $(CPP) @<<
+ $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ENDIF
SOURCE=.\database.c
@@ -258,7 +428,19 @@ SOURCE=.\database.c "$(INTDIR)\database.obj" "$(INTDIR)\database.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
-!ENDIF
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Release Unicode"
+
+
+"$(INTDIR)\database.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
+
+
+"$(INTDIR)\database.obj" "$(INTDIR)\database.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ENDIF
SOURCE=.\dbcache.c
@@ -274,7 +456,19 @@ SOURCE=.\dbcache.c "$(INTDIR)\dbcache.obj" "$(INTDIR)\dbcache.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
-!ENDIF
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Release Unicode"
+
+
+"$(INTDIR)\dbcache.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
+
+
+"$(INTDIR)\dbcache.obj" "$(INTDIR)\dbcache.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ENDIF
SOURCE=.\dbcontacts.c
@@ -290,7 +484,19 @@ SOURCE=.\dbcontacts.c "$(INTDIR)\dbcontacts.obj" "$(INTDIR)\dbcontacts.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
-!ENDIF
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Release Unicode"
+
+
+"$(INTDIR)\dbcontacts.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
+
+
+"$(INTDIR)\dbcontacts.obj" "$(INTDIR)\dbcontacts.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ENDIF
SOURCE=.\dbevents.c
@@ -306,7 +512,19 @@ SOURCE=.\dbevents.c "$(INTDIR)\dbevents.obj" "$(INTDIR)\dbevents.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
-!ENDIF
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Release Unicode"
+
+
+"$(INTDIR)\dbevents.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
+
+
+"$(INTDIR)\dbevents.obj" "$(INTDIR)\dbevents.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ENDIF
SOURCE=.\dbheaders.c
@@ -322,7 +540,19 @@ SOURCE=.\dbheaders.c "$(INTDIR)\dbheaders.obj" "$(INTDIR)\dbheaders.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
-!ENDIF
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Release Unicode"
+
+
+"$(INTDIR)\dbheaders.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
+
+
+"$(INTDIR)\dbheaders.obj" "$(INTDIR)\dbheaders.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ENDIF
SOURCE=.\dbmodulechain.c
@@ -338,7 +568,19 @@ SOURCE=.\dbmodulechain.c "$(INTDIR)\dbmodulechain.obj" "$(INTDIR)\dbmodulechain.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
-!ENDIF
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Release Unicode"
+
+
+"$(INTDIR)\dbmodulechain.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
+
+
+"$(INTDIR)\dbmodulechain.obj" "$(INTDIR)\dbmodulechain.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ENDIF
SOURCE=.\dbsettings.c
@@ -354,7 +596,19 @@ SOURCE=.\dbsettings.c "$(INTDIR)\dbsettings.obj" "$(INTDIR)\dbsettings.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
-!ENDIF
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Release Unicode"
+
+
+"$(INTDIR)\dbsettings.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
+
+
+"$(INTDIR)\dbsettings.obj" "$(INTDIR)\dbsettings.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ENDIF
SOURCE=.\encrypt.c
@@ -370,7 +624,19 @@ SOURCE=.\encrypt.c "$(INTDIR)\encrypt.obj" "$(INTDIR)\encrypt.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
-!ENDIF
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Release Unicode"
+
+
+"$(INTDIR)\encrypt.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
+
+
+"$(INTDIR)\encrypt.obj" "$(INTDIR)\encrypt.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ENDIF
SOURCE=.\init.c
@@ -386,7 +652,19 @@ SOURCE=.\init.c "$(INTDIR)\init.obj" "$(INTDIR)\init.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
-!ENDIF
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Release Unicode"
+
+
+"$(INTDIR)\init.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ELSEIF "$(CFG)" == "db3x_mmap - Win32 Debug Unicode"
+
+
+"$(INTDIR)\init.obj" "$(INTDIR)\init.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\db3x_mmap.pch"
+
+
+!ENDIF
SOURCE=.\resource.rc
@@ -395,5 +673,4 @@ SOURCE=.\resource.rc -!ENDIF
-
+!ENDIF
diff --git a/db3x_autobackups/db3x_mmap.vcproj b/db3x_autobackups/db3x_mmap.vcproj index c2c865a..eac78fe 100644 --- a/db3x_autobackups/db3x_mmap.vcproj +++ b/db3x_autobackups/db3x_mmap.vcproj @@ -147,7 +147,7 @@ ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -208,7 +208,7 @@ ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2"
+ CharacterSet="1"
WholeProgramOptimization="FALSE">
<Tool
Name="VCCLCompilerTool"
diff --git a/db3x_autobackups/db3x_mmap_8.vcproj b/db3x_autobackups/db3x_mmap_8.vcproj index a929f70..a3c18c2 100644 --- a/db3x_autobackups/db3x_mmap_8.vcproj +++ b/db3x_autobackups/db3x_mmap_8.vcproj @@ -215,7 +215,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -309,7 +309,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
+ CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
diff --git a/db3x_autobackups/dbcache.c b/db3x_autobackups/dbcache.c index 601670d..666dd0a 100644 --- a/db3x_autobackups/dbcache.c +++ b/db3x_autobackups/dbcache.c @@ -40,10 +40,10 @@ void Map() if (hMap)
pDbCache = MapViewOfFile(hMap, FILE_MAP_ALL_ACCESS/*FILE_MAP_WRITE*/, 0, 0 ,0);
else
- DatabaseCorruption("%s (CreateFileMapping failed. Code: %d)");
+ DatabaseCorruption( _T("%s (CreateFileMapping failed. Code: %d)"));
if (!pDbCache)
- DatabaseCorruption("%s (MapViewOfFile failed. Code: %d)");
+ DatabaseCorruption( _T("%s (MapViewOfFile failed. Code: %d)"));
}
void UnMap()
@@ -64,7 +64,7 @@ void ReMap(DWORD needed) if (needed > ChunkSize)
{
if ((needed + dwFileSize) - dbHeader.ofsFileEnd > ChunkSize)
- DatabaseCorruption("%s (Too large increment)");
+ DatabaseCorruption( _T("%s (Too large increment)"));
else
{
DWORD x = dbHeader.ofsFileEnd/ChunkSize;
diff --git a/db3x_autobackups/dbmodulechain.c b/db3x_autobackups/dbmodulechain.c index 9508850..265685f 100644 --- a/db3x_autobackups/dbmodulechain.c +++ b/db3x_autobackups/dbmodulechain.c @@ -51,12 +51,12 @@ void AddToList(char *name, DWORD len, DWORD ofs) mn->ofs = ofs;
if (li.List_GetIndex(&lMods,mn,&index))
- DatabaseCorruption("%s (Module Name not unique)");
+ DatabaseCorruption( _T("%s (Module Name not unique)"));
li.List_Insert(&lMods,mn,index);
if (li.List_GetIndex(&lOfs,mn,&index))
- DatabaseCorruption("%s (Module Offset not unique)");
+ DatabaseCorruption( _T("%s (Module Offset not unique)"));
li.List_Insert(&lOfs,mn,index);
}
diff --git a/db3x_autobackups/dbsettings.c b/db3x_autobackups/dbsettings.c index 3e8f49d..e111918 100644 --- a/db3x_autobackups/dbsettings.c +++ b/db3x_autobackups/dbsettings.c @@ -426,7 +426,7 @@ static int GetContactSettingStr(WPARAM wParam,LPARAM lParam) return 0;
if ( dgs->pValue->type != DBVT_ASCIIZ && dgs->pValue->type != DBVT_UTF8 )
- return 0;
+ return 1;
if ( iSaveType == DBVT_WCHAR ) {
if ( dgs->pValue->type != DBVT_UTF8 ) {
diff --git a/db3x_autobackups/init.c b/db3x_autobackups/init.c index 7b60ab5..51d7bfe 100644 --- a/db3x_autobackups/init.c +++ b/db3x_autobackups/init.c @@ -40,7 +40,7 @@ static int getCapability( int flag ) // returns 0 if the profile is created, EMKPRF*
static int makeDatabase(char * profile, int * error)
{
- HANDLE hFile=CreateFile(profile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);
+ HANDLE hFile = CreateFileA(profile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);
if ( hFile != INVALID_HANDLE_VALUE ) {
CreateDbHeaders(hFile);
CloseHandle(hFile);
@@ -59,7 +59,7 @@ static int grokHeader( char * profile, int * error ) HANDLE hFile = INVALID_HANDLE_VALUE;
DWORD dummy=0;
- hFile = CreateFile(profile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+ hFile = CreateFileA(profile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
if ( hFile == INVALID_HANDLE_VALUE ) {
if ( error != NULL ) *error=EGROKPRF_CANTREAD;
return 1;
@@ -156,12 +156,11 @@ static PLUGININFOEX pluginInfo = { "bio@msx.ru; ghazan@miranda-im.org; mail@scottellis.com.au",
"Copyright 2000-2007 Miranda IM project; Autobackups Copyright 2007 Scott Ellis",
"",
- 0,
+ UNICODE_AWARE,
DEFMOD_DB,
{ 0x9407902, 0x9b9b, 0x4f14, { 0xba, 0x18, 0xf6, 0x10, 0xbc, 0x1f, 0xde, 0x5f }} // {09407902-9B9B-4f14-BA18-F610BC1FDE5F}
};
-
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD dwReason, LPVOID reserved)
{
g_hInst=hInstDLL;
diff --git a/db3x_autobackups/version.h b/db3x_autobackups/version.h index 5bd20bc..16fcf0a 100644 --- a/db3x_autobackups/version.h +++ b/db3x_autobackups/version.h @@ -1,3 +1,3 @@ -#define __FILEVERSION_STRING 0,7,4,0
-#define __VERSION_STRING "0.7.4.0"
-#define __VERSION_DWORD 0x00070400
+#define __FILEVERSION_STRING 0,7,5,0
+#define __VERSION_STRING "0.7.5.0"
+#define __VERSION_DWORD 0x00070500
|