From 9b450b9f36442200b4f4190d084bec484d84b6b5 Mon Sep 17 00:00:00 2001 From: "george.hazan" Date: Thu, 26 May 2011 20:42:21 +0000 Subject: project fixes git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@123 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- dbeditorpp/dbeditorpp.dsp | 49 ++++++++++++------------ dbeditorpp/dbeditorpp.opt | Bin 51712 -> 49664 bytes dbeditorpp/dbeditorpp.plg | 83 ----------------------------------------- dbeditorpp/dbeditorpp_8.vcproj | 74 ++++++++++++++++++------------------ dbeditorpp/dbeditorpp_9.vcproj | 72 +++++++++++++++++------------------ dbeditorpp/headers.h | 6 +++ dbeditorpp/main.cpp | 2 +- 7 files changed, 104 insertions(+), 182 deletions(-) delete mode 100644 dbeditorpp/dbeditorpp.plg 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 index 97fcfd5..d6d51c6 100644 Binary files a/dbeditorpp/dbeditorpp.opt and b/dbeditorpp/dbeditorpp.opt differ 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 @@ - - -
-
Build Log

-

---------------------Configuration: dbeditorpp - Win32 Release--------------------
-

-
Command Lines

-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"
-
Output Window

-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.
-
-
-
-
Results

-dbeditorpp.dll - 1 error(s), 2 warning(s)
-
- - 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="" > 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 @@ 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 + #include #include #include 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; -- cgit v1.2.3