diff options
| -rw-r--r-- | dbeditorpp/dbeditorpp.dsp | 49 | ||||
| -rw-r--r-- | dbeditorpp/dbeditorpp.opt | bin | 51712 -> 49664 bytes | |||
| -rw-r--r-- | dbeditorpp/dbeditorpp.plg | 83 | ||||
| -rw-r--r-- | dbeditorpp/dbeditorpp_8.vcproj | 74 | ||||
| -rw-r--r-- | dbeditorpp/dbeditorpp_9.vcproj | 72 | ||||
| -rw-r--r-- | dbeditorpp/headers.h | 6 | ||||
| -rw-r--r-- | dbeditorpp/main.cpp | 2 |
7 files changed, 104 insertions, 182 deletions
diff --git a/dbeditorpp/dbeditorpp.dsp b/dbeditorpp/dbeditorpp.dsp index 80ba139..bf67828 100644 --- a/dbeditorpp/dbeditorpp.dsp +++ b/dbeditorpp/dbeditorpp.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DBEDITORPP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DBEDITORPP_EXPORTS" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX- /O1 /I "../../include" /I "../ExternalAPI" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DBEDITORPP_EXPORTS" /FR /Yu"headers.h" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -54,7 +54,7 @@ BSC32=bscmake.exe # 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 /machine:I386
-# 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 /machine:I386 /out:"../../bin/release/plugins/dbeditorpp.dll"
+# ADD LINK32 gdi32.lib winspool.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib comdlg32.lib advapi32.lib shell32.lib shlwapi.lib comctl32.lib /nologo /dll /machine:I386 /out:"../../bin/release/plugins/svc_dbepp.dll"
!ELSEIF "$(CFG)" == "dbeditorpp - Win32 Debug"
@@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DBEDITORPP_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DBEDITORPP_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX- /ZI /Od /I "../../include" /I "../ExternalAPI" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DBEDITORPP_EXPORTS" /Yu"headers.h" /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe # 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 /debug /machine:I386 /pdbtype:sept
-# 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 /debug /machine:I386 /out:"../../bin/debug/plugins/dbeditorpp.dll" /pdbtype:sept
+# ADD LINK32 gdi32.lib winspool.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib comdlg32.lib advapi32.lib shell32.lib shlwapi.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/debug/plugins/svc_dbepp.dll" /pdbtype:sept
!ELSEIF "$(CFG)" == "dbeditorpp - Win32 Release Unicode"
@@ -92,12 +92,12 @@ LINK32=link.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release Unicode"
-# PROP Intermediate_Dir "Release Unicode"
+# PROP Output_Dir ".\Release_Unicode"
+# PROP Intermediate_Dir ".\Release_Unicode"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O1 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DBEDITORPP_EXPORTS" /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Ox /Ot /Og /Os /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "_USRDLL" /D "DBEDITORPP_EXPORTS" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX- /Ox /Ot /Og /Os /I "../../include" /I "../ExternalAPI" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DBEDITORPP_EXPORTS" /FR /Yu"headers.h" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -107,7 +107,7 @@ BSC32=bscmake.exe # 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 /machine:I386 /out:"../../bin/release/plugins/dbeditorpp.dll"
-# ADD LINK32 kernel32.lib user32.lib comdlg32.lib advapi32.lib shell32.lib /nologo /dll /machine:I386 /out:"../../bin/release unicode/plugins/svc_dbepp.dll"
+# ADD LINK32 kernel32.lib user32.lib comdlg32.lib advapi32.lib shell32.lib shlwapi.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/release unicode/plugins/svc_dbepp.dll"
!ENDIF
@@ -124,7 +124,7 @@ LINK32=link.exe # PROP Default_Filter ""
# Begin Source File
-SOURCE=.\modsettingenum.c
+SOURCE=.\modsettingenum.cpp
# End Source File
# Begin Source File
@@ -136,64 +136,65 @@ SOURCE=.\modsettingenum.h # PROP Default_Filter ""
# Begin Source File
-SOURCE=.\addeditsettingsdlg.c
+SOURCE=.\addeditsettingsdlg.cpp
# End Source File
# Begin Source File
-SOURCE=.\copymodule.c
+SOURCE=.\copymodule.cpp
# End Source File
# Begin Source File
-SOURCE=.\deletemodule.c
+SOURCE=.\deletemodule.cpp
# End Source File
# Begin Source File
-SOURCE=.\findwindow.c
+SOURCE=.\findwindow.cpp
# End Source File
# Begin Source File
-SOURCE=.\main_window.c
+SOURCE=.\main_window.cpp
# End Source File
# Begin Source File
-SOURCE=.\moduletree.c
+SOURCE=.\moduletree.cpp
# End Source File
# Begin Source File
-SOURCE=.\options.c
+SOURCE=.\options.cpp
# End Source File
# Begin Source File
-SOURCE=.\settinglist.c
+SOURCE=.\settinglist.cpp
# End Source File
# Begin Source File
-SOURCE=.\watchedvars.c
+SOURCE=.\watchedvars.cpp
# End Source File
# End Group
# Begin Source File
-SOURCE=.\exportimport.c
+SOURCE=.\exportimport.cpp
# End Source File
# Begin Source File
-SOURCE=.\icons.c
+SOURCE=.\icons.cpp
# End Source File
# Begin Source File
-SOURCE=.\knownmodules.c
+SOURCE=.\knownmodules.cpp
# End Source File
# Begin Source File
-SOURCE=.\main.c
+SOURCE=.\main.cpp
+# ADD CPP /Yc"headers.h"
# End Source File
# Begin Source File
-SOURCE=.\modules.c
+SOURCE=.\modules.cpp
# End Source File
# Begin Source File
-SOURCE=.\threads.c
+SOURCE=.\threads.cpp
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/dbeditorpp/dbeditorpp.opt b/dbeditorpp/dbeditorpp.opt Binary files differindex 97fcfd5..d6d51c6 100644 --- a/dbeditorpp/dbeditorpp.opt +++ b/dbeditorpp/dbeditorpp.opt diff --git a/dbeditorpp/dbeditorpp.plg b/dbeditorpp/dbeditorpp.plg deleted file mode 100644 index 12a9bdd..0000000 --- a/dbeditorpp/dbeditorpp.plg +++ /dev/null @@ -1,83 +0,0 @@ -<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: dbeditorpp - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x409 /fo"Release/resource.res" /d "NDEBUG" "D:\Sources\svn.miranda.im\dbeditorpp\trunk\resource.rc""
-Creating temporary file "C:\Temp\RSP83A5.tmp" with contents
-[
-/nologo /MD /W3 /GX /O1 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DBEDITORPP_EXPORTS" /FR"Release/" /Fp"Release/dbeditorpp.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\modsettingenum.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\addeditsettingsdlg.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\copymodule.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\deletemodule.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\findwindow.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\main_window.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\moduletree.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\options.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\settinglist.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\watchedvars.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\exportimport.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\icons.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\knownmodules.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\main.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\modules.c"
-"D:\Sources\svn.miranda.im\dbeditorpp\trunk\threads.c"
-]
-Creating command line "cl.exe @C:\Temp\RSP83A5.tmp"
-Creating temporary file "C:\Temp\RSP83B6.tmp" with contents
-[
-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:no /pdb:"Release/dbeditorpp.pdb" /machine:I386 /out:"../../bin/release/plugins/dbeditorpp.dll" /implib:"Release/dbeditorpp.lib"
-.\Release\modsettingenum.obj
-.\Release\addeditsettingsdlg.obj
-.\Release\copymodule.obj
-.\Release\deletemodule.obj
-.\Release\findwindow.obj
-.\Release\main_window.obj
-.\Release\moduletree.obj
-.\Release\options.obj
-.\Release\settinglist.obj
-.\Release\watchedvars.obj
-.\Release\exportimport.obj
-.\Release\icons.obj
-.\Release\knownmodules.obj
-.\Release\main.obj
-.\Release\modules.obj
-.\Release\threads.obj
-.\Release\resource.res
-]
-Creating command line "link.exe @C:\Temp\RSP83B6.tmp"
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-modsettingenum.c
-D:\Sources\svn.miranda.im\dbeditorpp\trunk\headers.h(203) : warning C4028: formal parameter 4 different from declaration
-D:\Sources\svn.miranda.im\dbeditorpp\trunk\headers.h(203) : warning C4028: formal parameter 5 different from declaration
-addeditsettingsdlg.c
-copymodule.c
-deletemodule.c
-findwindow.c
-main_window.c
-moduletree.c
-options.c
-settinglist.c
-watchedvars.c
-exportimport.c
-icons.c
-knownmodules.c
-main.c
-D:\Sources\svn.miranda.im\dbeditorpp\trunk\main.c(465) : error C2084: function 'int __cdecl DBWriteContactSettingBlob(void *,const char *,const char *,const unsigned char *,unsigned short )' already has a body
-modules.c
-threads.c
-Error executing cl.exe.
-
-
-
-<h3>Results</h3>
-dbeditorpp.dll - 1 error(s), 2 warning(s)
-</pre>
-</body>
-</html>
diff --git a/dbeditorpp/dbeditorpp_8.vcproj b/dbeditorpp/dbeditorpp_8.vcproj index a1f678c..b6f909e 100644 --- a/dbeditorpp/dbeditorpp_8.vcproj +++ b/dbeditorpp/dbeditorpp_8.vcproj @@ -5,8 +5,6 @@ Name="dbeditorpp"
ProjectGUID="{9C6040B8-1173-40FA-A3DB-DE044CCD8250}"
RootNamespace="dbeditorpp_8"
- SccProjectName=""
- SccLocalPath=""
>
<Platforms>
<Platform
@@ -18,8 +16,8 @@ <Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(SolutionDir)Debug/Obj/$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\Obj\$(ProjectName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -48,7 +46,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -57,7 +55,6 @@ WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
- CompileAs="0"
DisableSpecificWarnings="4996"
/>
<Tool
@@ -74,7 +71,8 @@ <Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="shlwapi.lib comctl32.lib"
+ OutputFile="$(OutDir)\svc_dbepp.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@@ -106,8 +104,8 @@ </Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(SolutionDir)/Release/Obj/$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\Obj\$(ProjectName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -141,7 +139,7 @@ FavorSizeOrSpeed="2"
OmitFramePointers="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
@@ -151,7 +149,6 @@ AssemblerOutput="4"
WarningLevel="3"
SuppressStartupBanner="true"
- CompileAs="1"
DisableSpecificWarnings="4996"
/>
<Tool
@@ -169,7 +166,8 @@ Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="shlwapi.lib comctl32.lib"
+ OutputFile="$(OutDir)\svc_dbepp.dll"
SuppressStartupBanner="true"
AdditionalManifestDependencies="type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'"
OptimizeReferences="2"
@@ -204,8 +202,8 @@ </Configuration>
<Configuration
Name="Debug Unicode|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\Obj\$(ProjectName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -234,7 +232,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -243,7 +241,6 @@ WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
- CompileAs="0"
DisableSpecificWarnings="4996"
/>
<Tool
@@ -260,7 +257,8 @@ <Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="shlwapi.lib comctl32.lib"
+ OutputFile="$(OutDir)\svc_dbepp.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@@ -292,8 +290,8 @@ </Configuration>
<Configuration
Name="Release Unicode|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\Obj\$(ProjectName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -326,7 +324,7 @@ InlineFunctionExpansion="1"
FavorSizeOrSpeed="2"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
@@ -336,7 +334,6 @@ AssemblerOutput="4"
WarningLevel="3"
SuppressStartupBanner="true"
- CompileAs="1"
DisableSpecificWarnings="4996"
/>
<Tool
@@ -354,7 +351,8 @@ Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="shlwapi.lib comctl32.lib"
+ OutputFile="$(OutDir)\svc_dbepp.dll"
SuppressStartupBanner="true"
AdditionalManifestDependencies="type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'"
OptimizeReferences="2"
@@ -396,19 +394,19 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
- RelativePath=".\exportimport.c"
+ RelativePath=".\exportimport.cpp"
>
</File>
<File
- RelativePath=".\icons.c"
+ RelativePath=".\icons.cpp"
>
</File>
<File
- RelativePath=".\knownmodules.c"
+ RelativePath=".\knownmodules.cpp"
>
</File>
<File
- RelativePath=".\main.c"
+ RelativePath=".\main.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -444,18 +442,18 @@ </FileConfiguration>
</File>
<File
- RelativePath=".\modules.c"
+ RelativePath=".\modules.cpp"
>
</File>
<File
- RelativePath=".\threads.c"
+ RelativePath=".\threads.cpp"
>
</File>
<Filter
Name="ModSetting Enuming"
>
<File
- RelativePath=".\modsettingenum.c"
+ RelativePath=".\modsettingenum.cpp"
>
</File>
<File
@@ -467,39 +465,39 @@ Name="dialogs"
>
<File
- RelativePath=".\addeditsettingsdlg.c"
+ RelativePath=".\addeditsettingsdlg.cpp"
>
</File>
<File
- RelativePath=".\copymodule.c"
+ RelativePath=".\copymodule.cpp"
>
</File>
<File
- RelativePath=".\deletemodule.c"
+ RelativePath=".\deletemodule.cpp"
>
</File>
<File
- RelativePath=".\findwindow.c"
+ RelativePath=".\findwindow.cpp"
>
</File>
<File
- RelativePath=".\main_window.c"
+ RelativePath=".\main_window.cpp"
>
</File>
<File
- RelativePath=".\moduletree.c"
+ RelativePath=".\moduletree.cpp"
>
</File>
<File
- RelativePath=".\options.c"
+ RelativePath=".\options.cpp"
>
</File>
<File
- RelativePath=".\settinglist.c"
+ RelativePath=".\settinglist.cpp"
>
</File>
<File
- RelativePath=".\watchedvars.c"
+ RelativePath=".\watchedvars.cpp"
>
</File>
</Filter>
diff --git a/dbeditorpp/dbeditorpp_9.vcproj b/dbeditorpp/dbeditorpp_9.vcproj index 7eb7740..879d53d 100644 --- a/dbeditorpp/dbeditorpp_9.vcproj +++ b/dbeditorpp/dbeditorpp_9.vcproj @@ -20,8 +20,8 @@ <Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\Obj\$(ProjectName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -50,7 +50,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -59,7 +59,6 @@ WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
- CompileAs="0"
DisableSpecificWarnings="4996"
/>
<Tool
@@ -77,7 +76,8 @@ Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="shlwapi.lib comctl32.lib"
+ OutputFile="$(OutDir)\svc_dbepp.dll"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
@@ -197,8 +197,8 @@ </Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\Obj\$(ProjectName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -231,7 +231,7 @@ InlineFunctionExpansion="1"
FavorSizeOrSpeed="2"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
@@ -241,7 +241,6 @@ AssemblerOutput="4"
WarningLevel="3"
SuppressStartupBanner="true"
- CompileAs="1"
DisableSpecificWarnings="4996"
/>
<Tool
@@ -259,7 +258,8 @@ Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="shlwapi.lib comctl32.lib"
+ OutputFile="$(OutDir)\svc_dbepp.dll"
SuppressStartupBanner="true"
AdditionalManifestDependencies="type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'"
GenerateDebugInformation="true"
@@ -394,8 +394,8 @@ </Configuration>
<Configuration
Name="Debug Unicode|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\Obj\$(ProjectName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -424,7 +424,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -433,7 +433,6 @@ WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
- CompileAs="0"
DisableSpecificWarnings="4996"
/>
<Tool
@@ -451,7 +450,8 @@ Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="shlwapi.lib comctl32.lib"
+ OutputFile="$(OutDir)\svc_dbepp.dll"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
@@ -571,8 +571,8 @@ </Configuration>
<Configuration
Name="Release Unicode|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\Obj\$(ProjectName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -605,7 +605,7 @@ InlineFunctionExpansion="1"
FavorSizeOrSpeed="2"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
@@ -616,7 +616,6 @@ WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
- CompileAs="1"
DisableSpecificWarnings="4996"
/>
<Tool
@@ -634,7 +633,8 @@ Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="shlwapi.lib comctl32.lib"
+ OutputFile="$(OutDir)\svc_dbepp.dll"
AdditionalManifestDependencies="type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'"
GenerateDebugInformation="true"
OptimizeReferences="2"
@@ -773,19 +773,19 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
- RelativePath=".\exportimport.c"
+ RelativePath=".\exportimport.cpp"
>
</File>
<File
- RelativePath=".\icons.c"
+ RelativePath=".\icons.cpp"
>
</File>
<File
- RelativePath=".\knownmodules.c"
+ RelativePath=".\knownmodules.cpp"
>
</File>
<File
- RelativePath=".\main.c"
+ RelativePath=".\main.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -853,18 +853,18 @@ </FileConfiguration>
</File>
<File
- RelativePath=".\modules.c"
+ RelativePath=".\modules.cpp"
>
</File>
<File
- RelativePath=".\threads.c"
+ RelativePath=".\threads.cpp"
>
</File>
<Filter
Name="ModSetting Enuming"
>
<File
- RelativePath=".\modsettingenum.c"
+ RelativePath=".\modsettingenum.cpp"
>
</File>
<File
@@ -876,39 +876,39 @@ Name="dialogs"
>
<File
- RelativePath=".\addeditsettingsdlg.c"
+ RelativePath=".\addeditsettingsdlg.cpp"
>
</File>
<File
- RelativePath=".\copymodule.c"
+ RelativePath=".\copymodule.cpp"
>
</File>
<File
- RelativePath=".\deletemodule.c"
+ RelativePath=".\deletemodule.cpp"
>
</File>
<File
- RelativePath=".\findwindow.c"
+ RelativePath=".\findwindow.cpp"
>
</File>
<File
- RelativePath=".\main_window.c"
+ RelativePath=".\main_window.cpp"
>
</File>
<File
- RelativePath=".\moduletree.c"
+ RelativePath=".\moduletree.cpp"
>
</File>
<File
- RelativePath=".\options.c"
+ RelativePath=".\options.cpp"
>
</File>
<File
- RelativePath=".\settinglist.c"
+ RelativePath=".\settinglist.cpp"
>
</File>
<File
- RelativePath=".\watchedvars.c"
+ RelativePath=".\watchedvars.cpp"
>
</File>
</Filter>
diff --git a/dbeditorpp/headers.h b/dbeditorpp/headers.h index 9eda591..b1b4c23 100644 --- a/dbeditorpp/headers.h +++ b/dbeditorpp/headers.h @@ -7,6 +7,12 @@ #define _WIN32_WINNT 0x0501
#define MIRANDA_VER 0x0900
+#if defined( UNICODE ) && !defined( _UNICODE )
+ #define _UNICODE
+#endif
+
+#include <tchar.h>
+
#include <Windows.h>
#include <commctrl.h>
#include <stdio.h>
diff --git a/dbeditorpp/main.cpp b/dbeditorpp/main.cpp index b94cceb..280d72e 100644 --- a/dbeditorpp/main.cpp +++ b/dbeditorpp/main.cpp @@ -86,7 +86,7 @@ int DBSettingChanged(WPARAM wParam,LPARAM lParam) {
if ((hContact == info->hContact) && !mir_strcmp(info->module, cws->szModule))
{
- setting = mir_tstrdup(cws->szSetting);
+ setting = mir_strdup(cws->szSetting);
if (cws->value.type == DBVT_DELETED)
{
LVFINDINFO lvfi;
|