diff options
51 files changed, 719 insertions, 438 deletions
diff --git a/MirandaPlugin/Templates/1033/base.cpp b/MirandaPlugin/Templates/1033/base.cpp index d0cb971..a36cad8 100644 --- a/MirandaPlugin/Templates/1033/base.cpp +++ b/MirandaPlugin/Templates/1033/base.cpp @@ -21,18 +21,20 @@ HINSTANCE hInst;
PLUGINLINK *pluginLink;
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
- //META_PROTO,
- __PLUGIN_NAME, // altered here and on file listing, so as not to match original
- PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
- __DESC,
- __AUTHOR,
- __AUTHOREMAIL,
- __COPYRIGHT,
- __AUTHORWEB,
- 0,
- 0
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
+ //META_PROTO,
+ __PLUGIN_NAME, // altered here and on file listing, so as not to match original
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESC,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
+ 0,
+ 0,
+ // TODO: generate your own GUID!!
+ { 0x3899640f, 0xbdc9, 0x4f39, { 0x91, 0x28, 0x5, 0x77, 0xa6, 0x9b, 0xc4, 0xe2 } } // {3899640F-BDC9-4f39-9128-0577A69BC4E2}
};
@@ -41,10 +43,17 @@ extern "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRe return TRUE;
}
-extern "C" __declspec (dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) {
+extern "C" __declspec (dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) {
return &pluginInfo;
}
+// TODO: add any interfaces you implement to this list
+static const MUUID interfaces[] = {MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
[!if USE_NETLIB]
InitNetlib();
diff --git a/alarms/alarms.cpp b/alarms/alarms.cpp index ec4d1ab..eb0ddc2 100644 --- a/alarms/alarms.cpp +++ b/alarms/alarms.cpp @@ -30,17 +30,18 @@ typedef LRESULT (CALLBACK *WNDPROC)(HWND, UINT, WPARAM, LPARAM); //bool right_window = false;
WNDPROC old_clist_wndproc;
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
"Alarms",
- PLUGIN_MAKE_VERSION(0,3,0,0),
+ PLUGIN_MAKE_VERSION(0,4,0,0),
"Set once-off, daily, weekly and weekday alarms.",
"Scott Ellis",
"mail@scottellis.com.au",
"© 2005 Scott Ellis",
"http://www.scottellis.com.au",
0, //not transient
- 0 //doesn't replace anything built-in
+ 0, //doesn't replace anything built-in
+ { 0x4dd7762b, 0xd612, 0x4f84, { 0xaa, 0x86, 0x6, 0x8f, 0x17, 0x85, 0x9b, 0x6d } } // {4DD7762B-D612-4f84-AA86-068F17859B6D}
};
extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
@@ -49,11 +50,19 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese return TRUE;
}
-extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_ALARMS, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
+
+
static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch(message) {
diff --git a/alarms/common.h b/alarms/common.h index 4ae5fce..95199d4 100644 --- a/alarms/common.h +++ b/alarms/common.h @@ -68,5 +68,8 @@ typedef struct ALARM_tag { DWORD trigger_id;
} ALARM;
+#ifndef MIID_ALARMS
+#define MIID_ALARMS {0x60ebaad1, 0x8d95, 0x4966, { 0x8b, 0xe3, 0xb1, 0xed, 0xaf, 0xa2, 0x11, 0xab}}
+#endif
#endif
diff --git a/attache/MiniDump.cpp b/attache/MiniDump.cpp index e565c10..cae9993 100644 --- a/attache/MiniDump.cpp +++ b/attache/MiniDump.cpp @@ -24,8 +24,8 @@ extern "C" BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPV return TRUE;
}
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
__PLUGIN_NAME,
PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESC,
@@ -34,14 +34,22 @@ PLUGININFO pluginInfo={ __COPYRIGHT,
__AUTHORWEB,
0, //not transient
- 0 //doesn't replace anything built-in
+ 0, //doesn't replace anything built-in
+ { 0xe3ab632a, 0x693c, 0x41c2, { 0xa7, 0x55, 0xaa, 0xb7, 0xde, 0x4f, 0x1f, 0x7f } } // {E3AB632A-693C-41c2-A755-AAB7DE4F1F7F}
};
-extern "C" MINIDUMP_API PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
+extern "C" MINIDUMP_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_ATTACHE, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
+
void InitNetlib() {
NETLIBUSER nl_user = {0};
nl_user.cbSize = sizeof(nl_user);
diff --git a/attache/common.h b/attache/common.h index d3b2d91..c2250a0 100644 --- a/attache/common.h +++ b/attache/common.h @@ -29,4 +29,8 @@ extern DWORD mirandaVersion; #define DEFAULT_DUMP_PATH "\\Attache\\dumps"
+#ifndef MIID_ATTACHE
+#define MIID_ATTACHE {0x21c8ec80, 0x46d8, 0x4ca9, { 0x94, 0xb, 0xaa, 0xe0, 0x8f, 0xb2, 0x52, 0xba}}
+#endif
+
#endif
diff --git a/attache/version.h b/attache/version.h index c47b036..b5b0e40 100644 --- a/attache/version.h +++ b/attache/version.h @@ -4,9 +4,9 @@ #define MODULE "Attache"
#define __MAJOR_VERSION 0
-#define __MINOR_VERSION 1
-#define __RELEASE_NUM 3
-#define __BUILD_NUM 4
+#define __MINOR_VERSION 2
+#define __RELEASE_NUM 0
+#define __BUILD_NUM 0
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
#define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
diff --git a/clist_classic_sje/clist.dsp b/clist_classic_sje/clist.dsp index 016e474..94aea63 100644 --- a/clist_classic_sje/clist.dsp +++ b/clist_classic_sje/clist.dsp @@ -45,8 +45,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 1
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLIST_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O1 /I "../../include/" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLIST_EXPORTS" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD CPP /nologo /MD /W3 /Zi /O1 /I "../../include/" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLIST_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"
@@ -56,8 +55,8 @@ 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 comctl32.lib shell32.lib ole32.lib comdlg32.lib /nologo /base:"0x6590000" /dll /pdb:none /machine:I386 /out:"clist_classic_sje_mod\ANSI\clist_classic_sje.dll"
-# SUBTRACT LINK32 /map /debug
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib shell32.lib ole32.lib comdlg32.lib /nologo /base:"0x6590000" /dll /map /debug /machine:I386 /out:"../../bin/release/plugins/clist_classic.dll"
+# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "clist - Win32 Debug"
@@ -70,7 +69,7 @@ LINK32=link.exe # PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
+# PROP Ignore_Export_Lib 1
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLIST_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLIST_EXPORTS" /YX /FD /GZ /c
@@ -101,8 +100,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 1
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O1 /I "../../include/" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLIST_EXPORTS" /Yu"commonheaders.h" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O1 /I "../../include/" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLIST_EXPORTS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /Fr /YX /Yc /Yu
+# ADD CPP /nologo /MD /W3 /Zi /O1 /I "../../include/" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLIST_EXPORTS" /D "UNICODE" /Yu"commonheaders.h" /FD /c
+# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /i "../../include/" /d "NDEBUG"
@@ -113,8 +112,8 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib shell32.lib ole32.lib comdlg32.lib /nologo /base:"0x6590000" /dll /map /machine:I386 /out:"../../bin/release/plugins/clist_classic.dll"
# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib shell32.lib ole32.lib comdlg32.lib /nologo /base:"0x6590000" /dll /pdb:none /machine:I386 /out:"clist_classic_sje_mod\Unicode\clist_classic_sje.dll"
-# SUBTRACT LINK32 /map /debug
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib shell32.lib ole32.lib comdlg32.lib /nologo /base:"0x6590000" /dll /map /debug /machine:I386 /out:"../../bin/Release Unicode/plugins/clist_classic.dll"
+# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "clist - Win32 Debug Unicode"
@@ -297,10 +296,6 @@ SOURCE=.\forkthread.c # End Source File
# Begin Source File
-SOURCE=.\frames.c
-# End Source File
-# Begin Source File
-
SOURCE=.\init.c
!IF "$(CFG)" == "clist - Win32 Release"
@@ -319,14 +314,6 @@ SOURCE=.\init.c !ENDIF
# End Source File
-# Begin Source File
-
-SOURCE=.\meta_mod.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod.c
-# End Source File
# End Group
# Begin Group "Header Files"
@@ -349,14 +336,6 @@ SOURCE=.\forkthread.h # End Source File
# Begin Source File
-SOURCE=.\meta_mod.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod.h
-# End Source File
-# Begin Source File
-
SOURCE=.\resource.h
# End Source File
# End Group
diff --git a/clist_classic_sje/clist.mak b/clist_classic_sje/clist.mak index e4d68cc..f046c14 100644 --- a/clist_classic_sje/clist.mak +++ b/clist_classic_sje/clist.mak @@ -27,6 +27,10 @@ NULL= NULL=nul
!ENDIF
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "clist - Win32 Release"
OUTDIR=.\Release
@@ -56,42 +60,8 @@ CLEAN : "$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /Zi /O1 /I "../../include/" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLIST_EXPORTS" /Fp"$(INTDIR)\clist.pch" /Yu"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC=rc.exe
RSC_PROJ=/l 0x809 /fo"$(INTDIR)\resource.res" /i "../../include/" /d "NDEBUG"
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\clist.bsc"
@@ -144,42 +114,8 @@ CLEAN : "$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLIST_EXPORTS" /Fp"$(INTDIR)\clist.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
RSC_PROJ=/l 0x809 /fo"$(INTDIR)\resource.res" /i "../../include/" /d "_DEBUG"
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\clist.bsc"
@@ -232,42 +168,8 @@ CLEAN : "$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /Zi /O1 /I "../../include/" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLIST_EXPORTS" /D "UNICODE" /Fp"$(INTDIR)\clist.pch" /Yu"commonheaders.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC=rc.exe
RSC_PROJ=/l 0x809 /fo"$(INTDIR)\resource.res" /i "../../include/" /d "NDEBUG"
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\clist.bsc"
@@ -319,8 +221,32 @@ CLEAN : "$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLIST_EXPORTS" /D "UNICODE" /Fp"$(INTDIR)\clist.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x809 /fo"$(INTDIR)\resource.res" /i "../../include/" /d "_DEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\clist.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib comctl32.lib shell32.lib ole32.lib comdlg32.lib /nologo /base:"0x6590000" /dll /incremental:yes /pdb:"$(OUTDIR)\clist_classic.pdb" /debug /machine:I386 /out:"../../bin/Debug Unicode/plugins/clist_classic.dll" /implib:"$(OUTDIR)\clist_classic.lib" /pdbtype:sept
+LINK32_OBJS= \
+ "$(INTDIR)\clcopts.obj" \
+ "$(INTDIR)\clcpaint.obj" \
+ "$(INTDIR)\clistmenus.obj" \
+ "$(INTDIR)\clistopts.obj" \
+ "$(INTDIR)\cluiopts.obj" \
+ "$(INTDIR)\commonheaders.obj" \
+ "$(INTDIR)\forkthread.obj" \
+ "$(INTDIR)\init.obj" \
+ "$(INTDIR)\resource.res"
+
+"..\..\bin\Debug Unicode\plugins\clist_classic.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -352,34 +278,6 @@ CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEB $(CPP_PROJ) $<
<<
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)\resource.res" /i "../../include/" /d "_DEBUG"
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\clist.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib comctl32.lib shell32.lib ole32.lib comdlg32.lib /nologo /base:"0x6590000" /dll /incremental:yes /pdb:"$(OUTDIR)\clist_classic.pdb" /debug /machine:I386 /out:"../../bin/Debug Unicode/plugins/clist_classic.dll" /implib:"$(OUTDIR)\clist_classic.lib" /pdbtype:sept
-LINK32_OBJS= \
- "$(INTDIR)\clcopts.obj" \
- "$(INTDIR)\clcpaint.obj" \
- "$(INTDIR)\clistmenus.obj" \
- "$(INTDIR)\clistopts.obj" \
- "$(INTDIR)\cluiopts.obj" \
- "$(INTDIR)\commonheaders.obj" \
- "$(INTDIR)\forkthread.obj" \
- "$(INTDIR)\init.obj" \
- "$(INTDIR)\resource.res"
-
-"..\..\bin\Debug Unicode\plugins\clist_classic.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("clist.dep")
diff --git a/clist_classic_sje/clist_8.vcproj b/clist_classic_sje/clist_8.vcproj index 1a53455..af99a2c 100644 --- a/clist_classic_sje/clist_8.vcproj +++ b/clist_classic_sje/clist_8.vcproj @@ -16,8 +16,8 @@ <Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="../../bin/$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -76,7 +76,7 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib"
- OutputFile="$(OutDir)/clist_classic_sje.dll"
+ OutputFile="$(OutDir)/clist_classic.dll"
LinkIncremental="0"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@@ -107,13 +107,12 @@ />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="sync.bat"
/>
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="../../bin/$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -178,7 +177,7 @@ Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="comctl32.lib"
- OutputFile="$(OutDir)/clist_classic_sje.dll"
+ OutputFile="$(OutDir)/clist_classic.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@@ -214,13 +213,12 @@ />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="sync.bat"
/>
</Configuration>
<Configuration
Name="Debug Unicode|Win32"
- OutputDirectory="../../bin/$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -278,7 +276,7 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib"
- OutputFile="$(OutDir)/clist_classic_sje.dll"
+ OutputFile="$(OutDir)/clist_classic.dll"
LinkIncremental="0"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@@ -309,13 +307,12 @@ />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="sync.bat"
/>
</Configuration>
<Configuration
Name="Release Unicode|Win32"
- OutputDirectory="../../bin/$(ConfigurationName)/Plugins"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -346,10 +343,10 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
+ Optimization="3"
InlineFunctionExpansion="1"
FavorSizeOrSpeed="2"
- OmitFramePointers="false"
+ OmitFramePointers="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CLIST_EXPORTS;UNICODE"
@@ -383,7 +380,7 @@ Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="comctl32.lib"
- OutputFile="$(OutDir)/clist_classic_sje.dll"
+ OutputFile="$(OutDir)/clist_classic.dll"
LinkIncremental="0"
SuppressStartupBanner="true"
AdditionalManifestDependencies="type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'"
@@ -402,7 +399,6 @@ />
<Tool
Name="VCManifestTool"
- EmbedManifest="false"
/>
<Tool
Name="VCXDCMakeTool"
@@ -421,7 +417,6 @@ />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="sync.bat"
/>
</Configuration>
</Configurations>
@@ -687,26 +682,10 @@ <File
RelativePath=".\meta_mod.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\mod.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- />
- </FileConfiguration>
</File>
</Filter>
<Filter
diff --git a/clist_classic_sje/init.c b/clist_classic_sje/init.c index b9a26c2..25b331b 100644 --- a/clist_classic_sje/init.c +++ b/clist_classic_sje/init.c @@ -63,31 +63,40 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD dwReason, LPVOID reserved) /////////////////////////////////////////////////////////////////////////////////////////
// returns the plugin information
-PLUGININFO pluginInfo = {
- sizeof(PLUGININFO),
- #if defined( _UNICODE )
- "Classic contact list [sje mod] (Unicode)",
- #else
- "Classic contact list [sje mod]",
- #endif
- PLUGIN_MAKE_VERSION(0, 2, 4, 1),
-
+PLUGININFOEX pluginInfo = {
+ sizeof(PLUGININFOEX),
+ "Classic contact list [sje mod]",
+ PLUGIN_MAKE_VERSION(0, 3, 0, 0),
"Display contacts, event notifications, protocol status",
"Miranda IM project",
"mail@scottellis.com.au",
"Copyright 2000-2006 Miranda IM project, 2006 Scott Ellis",
"http://www.scottellis.com.au",
UNICODE_AWARE,
- DEFMOD_CLISTALL
+ DEFMOD_CLISTALL,
+ #if defined( _UNICODE )
+ //{0x240a91dc, 0x9464, 0x457a, { 0x97, 0x87, 0xff, 0x1e, 0xa8, 0x8e, 0x77, 0xe3 }} //{240A91DC-9464-457a-9787-FF1EA88E77E3}
+ { 0x345c2f5b, 0x3fd3, 0x4cae, { 0xa9, 0xc0, 0xa, 0x1f, 0x5, 0x38, 0xa3, 0xb1 } } // {345C2F5B-3FD3-4cae-A9C0-0A1F0538A3B1}
+ #else
+ //{0x552cf71a, 0x249f, 0x4650, { 0xbb, 0x2b, 0x7c, 0xdb, 0x1f, 0xe7, 0xd1, 0x78 }} //{552CF71A-249F-4650-BB2B-7CDB1FE7D178}
+ { 0x789c7d9b, 0x45b4, 0x4768, { 0x9c, 0xfc, 0x50, 0x10, 0x25, 0x2c, 0x21, 0xa4 } } // {789C7D9B-45B4-4768-9CFC-5010252C21A4}
+ #endif
};
-__declspec(dllexport) PLUGININFO *MirandaPluginInfo(DWORD mirandaVersion)
+__declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion)
{
if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 4, 3, 0))
return NULL;
return &pluginInfo;
}
+
+static const MUUID interfaces[] = {MIID_CLIST, MIID_LAST};
+__declspec(dllexport) const MUUID * MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
/////////////////////////////////////////////////////////////////////////////////////////
// called when all modules got loaded
diff --git a/db3x_autobackups/database.c b/db3x_autobackups/database.c index 2d815dc..703fefa 100644 --- a/db3x_autobackups/database.c +++ b/db3x_autobackups/database.c @@ -143,7 +143,7 @@ int LoadDatabaseModule(void) log0("DB logging running"); { DWORD dummy=0; - hDbFile=CreateFile(szDbPath,GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, 0, NULL); + hDbFile=CreateFile(szDbPath,GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL); if ( hDbFile == INVALID_HANDLE_VALUE ) { return 1; } diff --git a/db3x_autobackups/db3x_8.sln b/db3x_autobackups/db3x_8.sln index a033a41..5cd7ec0 100644 --- a/db3x_autobackups/db3x_8.sln +++ b/db3x_autobackups/db3x_8.sln @@ -5,15 +5,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db3x", "db3x_8.vcproj", "{8 EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug Unicode|Win32 = Debug Unicode|Win32
Debug|Win32 = Debug|Win32
- Release (RECLAIM)|Win32 = Release (RECLAIM)|Win32
+ Release Unicode|Win32 = Release Unicode|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8B778B6A-F5EF-49A4-8437-424832F2B280}.Debug|Win32.ActiveCfg = Release|Win32
- {8B778B6A-F5EF-49A4-8437-424832F2B280}.Debug|Win32.Build.0 = Release|Win32
- {8B778B6A-F5EF-49A4-8437-424832F2B280}.Release (RECLAIM)|Win32.ActiveCfg = Release (RECLAIM)|Win32
- {8B778B6A-F5EF-49A4-8437-424832F2B280}.Release (RECLAIM)|Win32.Build.0 = Release (RECLAIM)|Win32
+ {8B778B6A-F5EF-49A4-8437-424832F2B280}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
+ {8B778B6A-F5EF-49A4-8437-424832F2B280}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
+ {8B778B6A-F5EF-49A4-8437-424832F2B280}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8B778B6A-F5EF-49A4-8437-424832F2B280}.Debug|Win32.Build.0 = Debug|Win32
+ {8B778B6A-F5EF-49A4-8437-424832F2B280}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
+ {8B778B6A-F5EF-49A4-8437-424832F2B280}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
{8B778B6A-F5EF-49A4-8437-424832F2B280}.Release|Win32.ActiveCfg = Release|Win32
{8B778B6A-F5EF-49A4-8437-424832F2B280}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
diff --git a/db3x_autobackups/db3x_8.vcproj b/db3x_autobackups/db3x_8.vcproj index 88639d2..03ee817 100644 --- a/db3x_autobackups/db3x_8.vcproj +++ b/db3x_autobackups/db3x_8.vcproj @@ -16,8 +16,8 @@ <Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -50,6 +50,7 @@ Optimization="0"
AdditionalIncludeDirectories="../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"
+ ExceptionHandling="0"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
@@ -73,7 +74,7 @@ />
<Tool
Name="VCLinkerTool"
- OutputFile="../../bin/$(ConfigurationName)/Plugins/dbx_3x.dll"
+ OutputFile="$(OutDir)/dbx_3x.dll"
LinkIncremental="0"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@@ -103,12 +104,13 @@ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="sync.bat"
/>
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -148,7 +150,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"
StringPooling="true"
ExceptionHandling="0"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="commonheaders.h"
@@ -174,7 +176,7 @@ <Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- OutputFile="../../bin/$(ConfigurationName)/Plugins/dbx_3x.dll"
+ OutputFile="$(OutDir)/dbx_3x.dll"
LinkIncremental="0"
SuppressStartupBanner="true"
AdditionalManifestDependencies="type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'"
@@ -211,12 +213,106 @@ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="sync.bat"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug Unicode|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Debug/db3x.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="commonheaders.h"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ CompileAs="0"
+ DisableSpecificWarnings="4996"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="2057"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/dbx_3x.dll"
+ LinkIncremental="0"
+ SuppressStartupBanner="true"
+ GenerateDebugInformation="true"
+ ImportLibrary="$(IntDir)/$(TargetName).lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="sync.bat"
/>
</Configuration>
<Configuration
- Name="Release (RECLAIM)|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Release Unicode|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
+ IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -253,10 +349,10 @@ OmitFramePointers="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="../../include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS;DB_RECLAIM"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"
StringPooling="true"
ExceptionHandling="0"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="commonheaders.h"
@@ -282,7 +378,7 @@ <Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- OutputFile="../../bin/$(ConfigurationName)/Plugins/dbx_3x_reclaim.dll"
+ OutputFile="$(OutDir)/dbx_3x.dll"
LinkIncremental="0"
SuppressStartupBanner="true"
AdditionalManifestDependencies="type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'"
@@ -319,6 +415,7 @@ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="sync.bat"
/>
</Configuration>
</Configurations>
@@ -361,7 +458,19 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release (RECLAIM)|Win32"
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;DB3X_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -400,7 +509,18 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release (RECLAIM)|Win32"
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;DB3X_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -439,7 +559,18 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release (RECLAIM)|Win32"
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;DB3X_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -478,7 +609,18 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release (RECLAIM)|Win32"
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;DB3X_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -517,7 +659,18 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release (RECLAIM)|Win32"
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;DB3X_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -556,7 +709,18 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release (RECLAIM)|Win32"
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;DB3X_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -595,7 +759,18 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release (RECLAIM)|Win32"
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;DB3X_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -634,7 +809,18 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release (RECLAIM)|Win32"
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;DB3X_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -673,7 +859,18 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release (RECLAIM)|Win32"
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;DB3X_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -712,7 +909,18 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release (RECLAIM)|Win32"
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;DB3X_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -755,7 +963,18 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release (RECLAIM)|Win32"
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;DB3X_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -788,10 +1007,6 @@ RelativePath=".\options.h"
>
</File>
- <File
- RelativePath=".\resource.h"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
diff --git a/db3x_autobackups/dbcontacts.c b/db3x_autobackups/dbcontacts.c index 2a8d038..5985590 100644 --- a/db3x_autobackups/dbcontacts.c +++ b/db3x_autobackups/dbcontacts.c @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2003 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -55,56 +55,86 @@ void UninitContacts(void) {
}
+int GetContactSettingStatic(WPARAM wParam,LPARAM lParam);
+
static int GetContactCount(WPARAM wParam,LPARAM lParam)
{
int ret;
-
+
EnterCriticalSection(&csDbAccess);
ret=dbHeader.contactCount;
LeaveCriticalSection(&csDbAccess);
return ret;
}
+#define proto_module "Protocol"
+#define proto_setting "p"
+
+static int CheckProto(HANDLE hContact, const char *proto)
+{
+ static char protobuf[MAX_PATH] = {0};
+ static DBVARIANT dbv;
+ static DBCONTACTGETSETTING sVal = {proto_module,proto_setting,&dbv};
+
+ dbv.type = DBVT_ASCIIZ;
+ dbv.pszVal = protobuf;
+ dbv.cchVal = sizeof(protobuf);
+
+ if (GetContactSettingStatic((WPARAM)hContact, (LPARAM )&sVal) != 0
+ || (dbv.type != DBVT_ASCIIZ)) return 0;
+
+ return !strcmp(protobuf,proto);
+}
+
static int FindFirstContact(WPARAM wParam,LPARAM lParam)
{
int ret = 0;
EnterCriticalSection(&csDbAccess);
ret = (int)(HANDLE)dbHeader.ofsFirstContact;
+ if (lParam && !CheckProto((HANDLE)ret,(const char*)lParam))
+ ret = FindNextContact((WPARAM)ret,lParam);
LeaveCriticalSection(&csDbAccess);
return ret;
}
static int FindNextContact(WPARAM wParam,LPARAM lParam)
{
- int ret, index;
+ int index;
struct DBContact *dbc;
- DBCachedContactValueList *VL = NULL;
-
+ DBCachedContactValueList VLtemp, *VL = NULL;
+ VLtemp.hContact = (HANDLE)wParam;
EnterCriticalSection(&csDbAccess);
- {
- DBCachedContactValueList VLtemp;
- VLtemp.hContact = (HANDLE)wParam;
+ while ( VLtemp.hContact ) {
if ( li.List_GetIndex(&lContacts,&VLtemp,&index)) {
VL = ( DBCachedContactValueList* )lContacts.items[index];
- if ( VL->hNext != NULL ) {
+ if (VL->hNext != NULL) {
+ if (!lParam || CheckProto(VL->hNext,(const char*)lParam)) {
+ LeaveCriticalSection(&csDbAccess);
+ return (int)VL->hNext;
+ }
+
+ VLtemp.hContact = VL->hNext;
+ continue;
+ } }
+
+ dbc=(struct DBContact*)DBRead((DWORD)VLtemp.hContact,sizeof(struct DBContact),NULL);
+ if (dbc->signature!=DBCONTACT_SIGNATURE)
+ break;
+ else {
+ if ( VL == NULL ) {
+ VL = (DBCachedContactValueList*)HeapAlloc(hCacheHeap,HEAP_ZERO_MEMORY,sizeof(DBCachedContactValueList));
+ VL->hContact = VLtemp.hContact;
+ li.List_Insert(&lContacts,VL,index);
+ }
+ VL->hNext = (HANDLE)dbc->ofsNext;
+ if (VL->hNext != NULL && (!lParam || CheckProto(VL->hNext,(const char*)lParam))) {
LeaveCriticalSection(&csDbAccess);
return (int)VL->hNext;
- } } }
-
- dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);
- if(dbc->signature!=DBCONTACT_SIGNATURE)
- ret=(int)(HANDLE)NULL;
- else {
- if ( VL == NULL ) {
- VL = (DBCachedContactValueList*)HeapAlloc(hCacheHeap,HEAP_NO_SERIALIZE+HEAP_ZERO_MEMORY,sizeof(DBCachedContactValueList));
- VL->hContact = (HANDLE)wParam;
- li.List_Insert(&lContacts,VL,index);
- }
- VL->hNext = (HANDLE)dbc->ofsNext;
- ret=(int)(HANDLE)dbc->ofsNext;
- }
+ }
+ VLtemp.hContact = VL->hNext;
+ } }
LeaveCriticalSection(&csDbAccess);
- return ret;
+ return 0;
}
static int DeleteContact(WPARAM wParam,LPARAM lParam)
@@ -114,7 +144,7 @@ static int DeleteContact(WPARAM wParam,LPARAM lParam) struct DBContactSettings *dbcs;
struct DBEvent *dbe;
int index;
-
+
if((HANDLE)wParam==NULL) return 1;
EnterCriticalSection(&csDbAccess);
dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);
@@ -143,11 +173,11 @@ static int DeleteContact(WPARAM wParam,LPARAM lParam) while ( V != NULL ) {
DBCachedContactValue* V1 = V->next;
if ( V->value.type == DBVT_ASCIIZ )
- HeapFree( hCacheHeap, HEAP_NO_SERIALIZE, V->value.pszVal );
- HeapFree( hCacheHeap, HEAP_NO_SERIALIZE, V );
+ HeapFree( hCacheHeap, 0, V->value.pszVal );
+ HeapFree( hCacheHeap, 0, V );
V = V1;
}
- HeapFree( hCacheHeap, HEAP_NO_SERIALIZE, VL );
+ HeapFree( hCacheHeap, 0, VL );
li.List_Remove(&lContacts,index);
} }
@@ -230,7 +260,7 @@ static int AddContact(WPARAM wParam,LPARAM lParam) { int index;
- DBCachedContactValueList *VL = (DBCachedContactValueList*)HeapAlloc(hCacheHeap,HEAP_NO_SERIALIZE+HEAP_ZERO_MEMORY,sizeof(DBCachedContactValueList));
+ DBCachedContactValueList *VL = (DBCachedContactValueList*)HeapAlloc(hCacheHeap,HEAP_ZERO_MEMORY,sizeof(DBCachedContactValueList));
VL->hContact = (HANDLE)ofsNew;
li.List_GetIndex(&lContacts,VL,&index);
@@ -240,7 +270,7 @@ static int AddContact(WPARAM wParam,LPARAM lParam) LeaveCriticalSection(&csDbAccess);
NotifyEventHooks(hContactAddedEvent,(WPARAM)ofsNew,0);
return (int)ofsNew;
-}
+}
static int IsDbContact(WPARAM wParam,LPARAM lParam)
{
@@ -260,7 +290,7 @@ static int IsDbContact(WPARAM wParam,LPARAM lParam) ret=dbc.signature==DBCONTACT_SIGNATURE;
if (ret) {
- VL = (DBCachedContactValueList*)HeapAlloc(hCacheHeap,HEAP_NO_SERIALIZE+HEAP_ZERO_MEMORY,sizeof(DBCachedContactValueList));
+ VL = (DBCachedContactValueList*)HeapAlloc(hCacheHeap,HEAP_ZERO_MEMORY,sizeof(DBCachedContactValueList));
VL->hContact = (HANDLE)wParam;
li.List_Insert(&lContacts,VL,index);
} } }
diff --git a/db3x_autobackups/dbevents.c b/db3x_autobackups/dbevents.c index e0f7c02..b45cee4 100644 --- a/db3x_autobackups/dbevents.c +++ b/db3x_autobackups/dbevents.c @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright 2000-2003 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -74,7 +74,7 @@ static int GetEventCount(WPARAM wParam,LPARAM lParam) {
int ret;
struct DBContact *dbc;
-
+
EnterCriticalSection(&csDbAccess);
if(wParam==0) wParam=dbHeader.ofsUser;
dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);
@@ -182,7 +182,7 @@ static int DeleteEvent(WPARAM wParam,LPARAM lParam) struct DBContact dbc;
DWORD ofsContact,ofsThis;
struct DBEvent dbe,*dbeNext,*dbePrev;
-
+
EnterCriticalSection(&csDbAccess);
if(wParam==0) ofsContact=dbHeader.ofsUser;
else ofsContact=wParam;
@@ -262,7 +262,7 @@ static int GetBlobSize(WPARAM wParam,LPARAM lParam) {
int ret;
struct DBEvent *dbe;
-
+
EnterCriticalSection(&csDbAccess);
dbe=(struct DBEvent*)DBRead(wParam,sizeof(struct DBEvent),NULL);
if(dbe->signature!=DBEVENT_SIGNATURE) ret=-1;
@@ -276,8 +276,12 @@ static int GetEvent(WPARAM wParam,LPARAM lParam) struct DBEvent *dbe;
DBEVENTINFO *dbei=(DBEVENTINFO*)lParam;
int bytesToCopy,i;
-
+
if(dbei==NULL||dbei->cbSize!=sizeof(DBEVENTINFO)) return 1;
+ if(dbei->cbBlob > 0 && dbei->pBlob == NULL) {
+ dbei->cbBlob = 0;
+ return 1;
+ }
EnterCriticalSection(&csDbAccess);
dbe=(struct DBEvent*)DBRead(wParam,sizeof(struct DBEvent),NULL);
if(dbe->signature!=DBEVENT_SIGNATURE) {
@@ -312,7 +316,7 @@ static int MarkEventRead(WPARAM wParam,LPARAM lParam) struct DBEvent *dbe;
struct DBContact dbc;
DWORD ofsThis;
-
+
EnterCriticalSection(&csDbAccess);
if(wParam==0) wParam=dbHeader.ofsUser;
dbc=*(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);
@@ -356,7 +360,7 @@ static int GetEventContact(WPARAM wParam,LPARAM lParam) {
int ret;
struct DBEvent *dbe;
-
+
EnterCriticalSection(&csDbAccess);
dbe=(struct DBEvent*)DBRead(wParam,sizeof(struct DBEvent),NULL);
if(dbe->signature!=DBEVENT_SIGNATURE) {
@@ -374,7 +378,7 @@ static int FindFirstEvent(WPARAM wParam,LPARAM lParam) {
int ret;
struct DBContact *dbc;
-
+
EnterCriticalSection(&csDbAccess);
if(wParam==0) wParam=dbHeader.ofsUser;
dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);
@@ -388,7 +392,7 @@ static int FindFirstUnreadEvent(WPARAM wParam,LPARAM lParam) {
int ret;
struct DBContact *dbc;
-
+
EnterCriticalSection(&csDbAccess);
if(wParam==0) wParam=dbHeader.ofsUser;
dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);
@@ -402,7 +406,7 @@ static int FindLastEvent(WPARAM wParam,LPARAM lParam) {
int ret;
struct DBContact *dbc;
-
+
EnterCriticalSection(&csDbAccess);
if(wParam==0) wParam=dbHeader.ofsUser;
dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);
@@ -416,7 +420,7 @@ static int FindNextEvent(WPARAM wParam,LPARAM lParam) {
int ret;
struct DBEvent *dbe;
-
+
EnterCriticalSection(&csDbAccess);
dbe=(struct DBEvent*)DBRead(wParam,sizeof(struct DBEvent),NULL);
if(dbe->signature!=DBEVENT_SIGNATURE) ret=(int)(HANDLE)NULL;
@@ -429,7 +433,7 @@ static int FindPrevEvent(WPARAM wParam,LPARAM lParam) {
int ret;
struct DBEvent *dbe;
-
+
EnterCriticalSection(&csDbAccess);
dbe=(struct DBEvent*)DBRead(wParam,sizeof(struct DBEvent),NULL);
if(dbe->signature!=DBEVENT_SIGNATURE) ret=(int)(HANDLE)NULL;
diff --git a/db3x_autobackups/dbsettings.c b/db3x_autobackups/dbsettings.c index 3c40277..503a5eb 100644 --- a/db3x_autobackups/dbsettings.c +++ b/db3x_autobackups/dbsettings.c @@ -92,7 +92,7 @@ static DWORD __inline GetSettingValueLength(PBYTE pSetting) static char* InsertCachedSetting( const char* szName, size_t cbNameLen, int index )
{
- char* newValue = (char*)HeapAlloc( hCacheHeap, HEAP_NO_SERIALIZE, cbNameLen );
+ char* newValue = (char*)HeapAlloc( hCacheHeap, 0, cbNameLen );
*newValue = 0;
strcpy(newValue+1,szName+1);
li.List_Insert(&lSettings,newValue,index);
@@ -121,9 +121,9 @@ static void SetCachedVariant( DBVARIANT* s /* new */, DBVARIANT* d /* cached */ memcpy( d, s, sizeof( DBVARIANT ));
if (( s->type == DBVT_UTF8 || s->type == DBVT_ASCIIZ ) && s->pszVal != NULL ) {
if ( szSave != NULL )
- d->pszVal = (char*)HeapReAlloc(hCacheHeap,HEAP_NO_SERIALIZE,szSave,strlen(s->pszVal)+1);
+ d->pszVal = (char*)HeapReAlloc(hCacheHeap,0,szSave,strlen(s->pszVal)+1);
else
- d->pszVal = (char*)HeapAlloc(hCacheHeap,HEAP_NO_SERIALIZE,strlen(s->pszVal)+1);
+ d->pszVal = (char*)HeapAlloc(hCacheHeap,0,strlen(s->pszVal)+1);
strcpy(d->pszVal,s->pszVal);
}
@@ -139,7 +139,7 @@ static void SetCachedVariant( DBVARIANT* s /* new */, DBVARIANT* d /* cached */ static void FreeCachedVariant( DBVARIANT* V )
{
if (( V->type == DBVT_ASCIIZ || V->type == DBVT_UTF8 ) && V->pszVal != NULL )
- HeapFree(hCacheHeap,HEAP_NO_SERIALIZE,V->pszVal);
+ HeapFree(hCacheHeap,0,V->pszVal);
}
static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllocate )
@@ -154,14 +154,14 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo if ( bAllocate == -1 ) {
FreeCachedVariant( &V->value );
li.List_Remove(&lGlobalSettings,index);
- HeapFree(hCacheHeap,HEAP_NO_SERIALIZE,V);
+ HeapFree(hCacheHeap,0,V);
return NULL;
} }
else {
if ( bAllocate != 1 )
return NULL;
- V = (DBCachedGlobalValue*)HeapAlloc(hCacheHeap,HEAP_NO_SERIALIZE+HEAP_ZERO_MEMORY,sizeof(DBCachedGlobalValue));
+ V = (DBCachedGlobalValue*)HeapAlloc(hCacheHeap,HEAP_ZERO_MEMORY,sizeof(DBCachedGlobalValue));
V->name = szSetting;
li.List_Insert(&lGlobalSettings,V,index);
}
@@ -177,10 +177,10 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo VL = (DBCachedContactValueList*)lContacts.items[index];
}
else {
- if ( bAllocate == -1 )
+ if ( bAllocate != 1 )
return NULL;
- VL = (DBCachedContactValueList*)HeapAlloc(hCacheHeap,HEAP_NO_SERIALIZE+HEAP_ZERO_MEMORY,sizeof(DBCachedContactValueList));
+ VL = (DBCachedContactValueList*)HeapAlloc(hCacheHeap,HEAP_ZERO_MEMORY,sizeof(DBCachedContactValueList));
VL->hContact = hContact;
li.List_Insert(&lContacts,VL,index);
}
@@ -189,11 +189,11 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo if (strcmp(V->name,szSetting)==0)
break;
- if ( V == NULL )
- { if ( bAllocate != 1 )
+ if ( V == NULL ) {
+ if ( bAllocate != 1 )
return NULL;
- V = HeapAlloc(hCacheHeap,HEAP_NO_SERIALIZE+HEAP_ZERO_MEMORY,sizeof(DBCachedContactValue));
+ V = HeapAlloc(hCacheHeap,HEAP_ZERO_MEMORY,sizeof(DBCachedContactValue));
V->next = VL->first;
VL->first = V;
V->name = szSetting;
@@ -207,7 +207,7 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo V1->next = V->next;
break;
}
- HeapFree(hCacheHeap,HEAP_NO_SERIALIZE,V);
+ HeapFree(hCacheHeap,0,V);
return NULL;
}
@@ -393,7 +393,7 @@ static int GetContactSettingStr(WPARAM wParam,LPARAM lParam) if ( GetContactSettingWorker(( HANDLE )wParam, dgs, 0 ))
return 1;
- if ( iSaveType == 0 || iSaveType == dgs->pValue->type )
+ if ( iSaveType == 0 || iSaveType == dgs->pValue->type )
return 0;
if ( dgs->pValue->type != DBVT_ASCIIZ && dgs->pValue->type != DBVT_UTF8 )
@@ -432,7 +432,7 @@ static int GetContactSettingStr(WPARAM wParam,LPARAM lParam) return 0;
}
-static int GetContactSettingStatic(WPARAM wParam,LPARAM lParam)
+int GetContactSettingStatic(WPARAM wParam,LPARAM lParam)
{
DBCONTACTGETSETTING* dgs = (DBCONTACTGETSETTING*)lParam;
if ( GetContactSettingWorker(( HANDLE )wParam, dgs, 1 ))
@@ -938,7 +938,7 @@ int InitSettings(void) CreateServiceFunction(MS_DB_SETSETTINGRESIDENT,SetSettingResident);
hSettingChangeEvent=CreateHookableEvent(ME_DB_CONTACT_SETTINGCHANGED);
- hCacheHeap=HeapCreate(HEAP_NO_SERIALIZE,0,0);
+ hCacheHeap=HeapCreate(0,0,0);
lSettings.sortFunc=stringCompare;
lSettings.increment=50;
lContacts.sortFunc=handleCompare;
diff --git a/db3x_autobackups/init.c b/db3x_autobackups/init.c index 11b0f61..a282f0c 100644 --- a/db3x_autobackups/init.c +++ b/db3x_autobackups/init.c @@ -104,19 +104,6 @@ static int grokHeader( char * profile, int * error ) return rc;
}
-static PLUGININFO pluginInfo = {
- sizeof(PLUGININFO),
- "Miranda database - with AutoBackups",
- PLUGIN_MAKE_VERSION(0,6,0,1),
- "Provides Miranda database support: global settings, contacts, history, settings per contact.",
- "Miranda-IM project",
- "mail@scottellis.com.au",
- "Copyright 2000-2005 Miranda-IM project",
- "",
- 0,
- DEFMOD_DB
-};
-
// returns 0 if all the APIs are injected otherwise, 1
static int LoadDatabase( char * profile, void * plink )
{
@@ -164,9 +151,8 @@ static DATABASELINK dblink = { };
/*
-
-static PLUGININFO pluginInfo = {
- sizeof(PLUGININFO),
+static PLUGININFOEX pluginInfo = {
+ sizeof(PLUGININFOEX),
"Miranda database driver",
PLUGIN_MAKE_VERSION(0,6,0,1),
"Provides Miranda database support: global settings, contacts, history, settings per contact.",
@@ -175,10 +161,27 @@ static PLUGININFO pluginInfo = { "Copyright 2000-2006 Miranda IM project",
"",
0,
- DEFMOD_DB
+ DEFMOD_DB,
+ {0x1394a3ab, 0x2585, 0x4196, { 0x8f, 0x72, 0xe, 0xae, 0xc2, 0x45, 0xe, 0x11 }} //{1394A3AB-2585-4196-8F72-0EAEC2450E11}
};
*/
+
+static PLUGININFOEX pluginInfo = {
+ sizeof(PLUGININFOEX),
+ "Miranda database - with AutoBackups",
+ PLUGIN_MAKE_VERSION(0,7,0,0),
+ "Provides Miranda database support: global settings, contacts, history, settings per contact.",
+ "Miranda-IM project",
+ "mail@scottellis.com.au",
+ "Copyright 2000-2005 Miranda-IM project",
+ "",
+ 0,
+ DEFMOD_DB,
+ //{0x1394a3ab, 0x2585, 0x4196, { 0x8f, 0x72, 0xe, 0xae, 0xc2, 0x45, 0xe, 0x11 }} //{1394A3AB-2585-4196-8F72-0EAEC2450E11}
+ { 0x52bbc116, 0x188a, 0x4b55, { 0x9a, 0x4f, 0xf6, 0x84, 0xb3, 0x46, 0x8b, 0x66 } } // {52BBC116-188A-4b55-9A4F-F684B3468B66}
+};
+
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD dwReason, LPVOID reserved)
{
g_hInst = hInstDLL;
@@ -190,7 +193,7 @@ __declspec(dllexport) DATABASELINK* DatabasePluginInfo(void * reserved) return &dblink;
}
-__declspec(dllexport) PLUGININFO * MirandaPluginInfo(DWORD mirandaVersion)
+__declspec(dllexport) PLUGININFOEX * MirandaPluginInfoEx(DWORD mirandaVersion)
{
if ( mirandaVersion < PLUGIN_MAKE_VERSION(0,6,0,15)) {
MessageBox( NULL, _T("The db3x plugin cannot be loaded. It requires Miranda IM 0.6.0.15 or later."), _T("db3x Plugin"), MB_OK|MB_ICONWARNING|MB_SETFOREGROUND|MB_TOPMOST );
@@ -199,6 +202,12 @@ __declspec(dllexport) PLUGININFO * MirandaPluginInfo(DWORD mirandaVersion) return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_DATABASE, MIID_LAST};
+__declspec(dllexport) const MUUID * MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
int __declspec(dllexport) Load(PLUGINLINK * link)
{
return 1;
diff --git a/iax/dllmain.cpp b/iax/dllmain.cpp index 86866c3..5e10508 100644 --- a/iax/dllmain.cpp +++ b/iax/dllmain.cpp @@ -15,8 +15,8 @@ HINSTANCE hInst; PLUGINLINK *pluginLink;
// plugin stuff
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
MODULE,
PLUGIN_MAKE_VERSION(VER_MAJOR, VER_MINOR, VER_RELEASE, VER_BUILD),
DESC_STRING,
@@ -25,7 +25,8 @@ PLUGININFO pluginInfo={ "© 2005 Scott Ellis",
"http://www.scottellis.com.au/",
0, //not transient
- 0 //doesn't replace anything built-in
+ 0, //doesn't replace anything built-in
+ { 0x65e1a7f4, 0x1408, 0x4462, { 0xb8, 0xfd, 0x9d, 0xab, 0xb8, 0x37, 0x1f, 0x81 } } // {65E1A7F4-1408-4462-B8FD-9DABB8371F81}
};
extern "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) {
@@ -33,10 +34,16 @@ extern "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRe return TRUE;
}
-extern "C" __declspec (dllexport) PLUGININFO* __cdecl MirandaPluginInfo(DWORD mirandaVersion) {
+extern "C" __declspec (dllexport) PLUGININFOEX* __cdecl MirandaPluginInfoEx(DWORD mirandaVersion) {
return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};
+__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
if(ServiceExists(MS_UPDATE_REGISTER)) {
// register with updater
diff --git a/iax/private.h b/iax/private.h index 84ad034..fe727c9 100644 --- a/iax/private.h +++ b/iax/private.h @@ -3,8 +3,8 @@ /* VERSION DEFINITIONS */
#define VER_MAJOR 0
-#define VER_MINOR 0
-#define VER_RELEASE 3
+#define VER_MINOR 1
+#define VER_RELEASE 0
#define VER_BUILD 0
#define __STRINGIZE(x) #x
diff --git a/justtabs/justtabs.cpp b/justtabs/justtabs.cpp index 918fef2..cac633a 100644 --- a/justtabs/justtabs.cpp +++ b/justtabs/justtabs.cpp @@ -22,17 +22,18 @@ FontID font_id_tabs = {0}; FontIDW font_id_tabsw = {0};
HFONT hFontTabs = 0;
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
MODULE,
- PLUGIN_MAKE_VERSION(0,0,2,4),
+ PLUGIN_MAKE_VERSION(0,1,0,0),
"Put SRMM windows into a single frame",
"Scott Ellis",
"mail@scottellis.com.au",
"© 2006 Scott Ellis",
"http://scottellis.com.au",
0, //not transient
- 0 //doesn't replace anything built-in
+ 0, //doesn't replace anything built-in
+ { 0xef551a22, 0xc851, 0x4983, { 0xa3, 0x33, 0x6c, 0x7, 0x68, 0xa0, 0xb1, 0xb2 } } // {EF551A22-C851-4983-A333-6C0768A0B1B2}
};
extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
@@ -41,11 +42,17 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese return TRUE;
}
-extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_JUSTTABS, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
diff --git a/justtabs/win.h b/justtabs/win.h index 9d3902f..635ff4e 100644 --- a/justtabs/win.h +++ b/justtabs/win.h @@ -49,4 +49,8 @@ void FixWindowStyle(); extern HFONT hFontTabs;
+#ifndef MIID_JUSTTABS
+#define MIID_JUSTTABS {0x66847dd, 0xd3c5, 0x4ee9, { 0x93, 0x7c, 0x95, 0x2c, 0xcf, 0x8b, 0x59, 0x2e}}
+#endif
+
#endif
diff --git a/last_contact/LastContact.cpp b/last_contact/LastContact.cpp index 6bb0fb2..6cf9e09 100644 --- a/last_contact/LastContact.cpp +++ b/last_contact/LastContact.cpp @@ -49,17 +49,18 @@ void stack_update(MessageWindowEventData *data) { windowDataStack[stackTop] = *data;
}
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
MODULE,
- PLUGIN_MAKE_VERSION(0,0,0,5),
+ PLUGIN_MAKE_VERSION(0,0,1,0),
"Re-open the last open message window using a configurable hot key.",
"Scott Ellis",
"mail@scottellis.com.au",
"© 2006 Scott Ellis",
"http://scottellis.com.au",
0, //not transient
- 0 //doesn't replace anything built-in
+ 0, //doesn't replace anything built-in
+ { 0x199db5f3, 0x888d, 0x42df, { 0x96, 0x5, 0xc1, 0x79, 0xd, 0x7b, 0xba, 0xbd } } // {199DB5F3-888D-42df-9605-C1790D7BBABD}
};
extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
@@ -68,11 +69,18 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese return TRUE;
}
-extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_LASTCONTACT, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
+
int WindowEvent(WPARAM wParam, LPARAM lParam) {
MessageWindowEventData *wd = (MessageWindowEventData *)lParam;
diff --git a/last_contact/common.h b/last_contact/common.h index 7201202..cf9bfa8 100644 --- a/last_contact/common.h +++ b/last_contact/common.h @@ -31,4 +31,8 @@ extern HWND pluginwind;
extern HINSTANCE hInst;
+#ifndef MIID_LASTCONTACT
+#define MIID_LASTCONTACT {0x76e40d07, 0x10d4, 0x4f58, { 0xb1, 0xbc, 0xda, 0xd3, 0x6a, 0xf9, 0xed, 0x50}}
+#endif
+
#endif
diff --git a/message_notify/common.h b/message_notify/common.h index 1accfe7..d21adf4 100644 --- a/message_notify/common.h +++ b/message_notify/common.h @@ -40,6 +40,9 @@ extern HANDLE popupWindowList; void StartFocusTimer();
void StopFocusTimer();
+#ifndef MIID_MESSAGENOTIFY
+#define MIID_MESSAGENOTIFY {0x9b2eb930, 0xbcff, 0x4cbf, { 0x8f, 0x2d, 0xf7, 0xca, 0x8b, 0x8f, 0x17, 0xfd}}
+#endif
//#endif
diff --git a/message_notify/messagenotify.cpp b/message_notify/messagenotify.cpp index c3d5132..54d29df 100644 --- a/message_notify/messagenotify.cpp +++ b/message_notify/messagenotify.cpp @@ -24,17 +24,18 @@ HANDLE popupWindowList; DWORD focusTimerId = 0;
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
"Message Notify",
- PLUGIN_MAKE_VERSION(0,1,3,1),
+ PLUGIN_MAKE_VERSION(0,2,0,0),
"Show a popup when a message is received",
"Scott Ellis",
"mail@scottellis.com.au",
"© 2005 Scott Ellis",
"http://www.scottellis.com.au/",
0, //not transient
- 0 //doesn't replace anything built-in
+ 0, //doesn't replace anything built-in
+ { 0x715d0a1b, 0x69b7, 0x4553, { 0xa0, 0xdb, 0xae, 0x49, 0x5, 0x5c, 0x2a, 0xe6 } } // {715D0A1B-69B7-4553-A0DB-AE49055C2AE6}
};
@@ -45,11 +46,18 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese return TRUE;
}
-extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_MESSAGENOTIFY, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
+
HANDLE hWindowEvent, hEventDbEventAdded, hIdle;
BOOL bIsIdle = FALSE;
diff --git a/metacontacts/m_metacontacts.h b/metacontacts/m_metacontacts.h index 1da12b9..9f348bd 100644 --- a/metacontacts/m_metacontacts.h +++ b/metacontacts/m_metacontacts.h @@ -23,6 +23,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef M_METACONTACTS_H__
#define M_METACONTACTS_H__ 1
+#ifndef MIID_METACONTACTS
+#define MIID_METACONTACTS {0xc0325019, 0xc1a7, 0x40f5, { 0x83, 0x65, 0x4f, 0x46, 0xbe, 0x21, 0x86, 0x3e}}
+#endif
+
//get the handle for a contact's parent metacontact
//wParam=(HANDLE)hSubContact
//lParam=0
diff --git a/metacontacts/meta_main.c b/metacontacts/meta_main.c index e66221f..6376e0e 100644 --- a/metacontacts/meta_main.c +++ b/metacontacts/meta_main.c @@ -92,18 +92,18 @@ struct MM_INTERFACE memoryManagerInterface; BOOL os_unicode_enabled = FALSE;
//! Information gathered by Miranda, displayed in the plugin pane of the Option Dialog
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
- //META_PROTO,
- __PLUGIN_NAME, // altered here and on file listing, so as not to match original
- PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
- __DESC,
- __AUTHOR,
- __AUTHOREMAIL,
- __COPYRIGHT,
- __AUTHORWEB,
- 0,
- 0
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
+ __PLUGIN_NAME, // altered here and on file listing, so as not to match original
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESC,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
+ 0,
+ 0,
+ { 0x4c4a27cf, 0x5e64, 0x4242, { 0xa3, 0x32, 0xb9, 0x8b, 0x8, 0x24, 0x3e, 0x89 } } // {4C4A27CF-5E64-4242-A332-B98B08243E89}
};
HINSTANCE hInstance; //!< Global reference to the application
@@ -115,11 +115,18 @@ HANDLE metaMainThread; //!< Duplicate of thread handle * It only returns the PLUGININFO structure, without any test on the version
* @param mirandaVersion The version of the application calling this function
*/
-__declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
+__declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_METACONTACTS, MIID_LAST};
+__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
+
/** DLL entry point
* Required to store the instance handle
*/
diff --git a/metacontacts/meta_services.c b/metacontacts/meta_services.c index 229d3db..033da47 100644 --- a/metacontacts/meta_services.c +++ b/metacontacts/meta_services.c @@ -472,7 +472,7 @@ int MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam) // should be able to do this, but some protos mess with the memory
if(options.use_proto_recv)
{
- // use the subcontact's protocol 'recv' service to add the db (AIMOSCAR removes HTML here!) if possible
+ // use the subcontact's protocol 'recv' service to add the meta's history (AIMOSCAR removes HTML here!) if possible
char *proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0);
if(proto) {
char service[256];
diff --git a/metacontacts/metacontacts.h b/metacontacts/metacontacts.h index 0e5bfd9..39118da 100644 --- a/metacontacts/metacontacts.h +++ b/metacontacts/metacontacts.h @@ -104,7 +104,7 @@ int MenuFunc18(WPARAM wParam, LPARAM lParam); int MenuFunc19(WPARAM wParam, LPARAM lParam);
extern HINSTANCE hInstance;
-extern PLUGININFO pluginInfo;
+extern PLUGININFOEX pluginInfo;
// contact menu items
extern HANDLE hMenuConvert,
diff --git a/metacontacts/version.h b/metacontacts/version.h index fba4e6b..c2b000a 100644 --- a/metacontacts/version.h +++ b/metacontacts/version.h @@ -3,9 +3,9 @@ // take effect within the version resource)
#define __MAJOR_VERSION 0
-#define __MINOR_VERSION 12
-#define __RELEASE_NUM 3
-#define __BUILD_NUM 1
+#define __MINOR_VERSION 13
+#define __RELEASE_NUM 0
+#define __BUILD_NUM 0
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
#define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
diff --git a/no_history/common.h b/no_history/common.h index 0e8ac88..34b0371 100644 --- a/no_history/common.h +++ b/no_history/common.h @@ -30,4 +30,8 @@ extern HINSTANCE hInst;
+#ifndef MIID_NOHISTORY
+#define MIID_NOHISTORY {0xe9ba130e, 0x9927, 0x4469, { 0xb6, 0x19, 0x95, 0x61, 0xa8, 0xc0, 0x57, 0xa7}}
+#endif
+
#endif
diff --git a/no_history/dllmain.cpp b/no_history/dllmain.cpp index 7996e09..9a042ae 100644 --- a/no_history/dllmain.cpp +++ b/no_history/dllmain.cpp @@ -33,8 +33,8 @@ struct EventListNode { EventListNode *event_list = 0;
// plugin stuff
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
MODULE,
PLUGIN_MAKE_VERSION(VER_MAJOR, VER_MINOR, VER_RELEASE, VER_BUILD),
DESC_STRING,
@@ -43,7 +43,12 @@ PLUGININFO pluginInfo={ "© 2005 Scott Ellis",
"http://www.scottellis.com.au/",
0, //not transient
- 0 //doesn't replace anything built-in
+ 0, //doesn't replace anything built-in
+#ifdef _UNICODE
+{ 0xb25e8c7b, 0x292b, 0x495a, { 0x9f, 0xb8, 0xa4, 0xc3, 0xd4, 0xee, 0xb0, 0x4b } } // {B25E8C7B-292B-495a-9FB8-A4C3D4EEB04B}
+#else
+{ 0x12e5a39, 0x78a6, 0x4ccb, { 0xa6, 0x3f, 0x60, 0xfa, 0x7c, 0xb4, 0xd, 0xee } } // {012E5A39-78A6-4ccb-A63F-60FA7CB40DEE}
+#endif
};
extern "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) {
@@ -51,10 +56,17 @@ extern "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRe return TRUE;
}
-extern "C" __declspec (dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) {
+extern "C" __declspec (dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) {
return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_NOHISTORY, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) {
+ return interfaces;
+}
+
+
+
void RemoveReadEvents() {
DBEVENTINFO info = {0};
info.cbSize = sizeof(info);
diff --git a/no_history/private.h b/no_history/private.h index ba51b4d..daa8152 100644 --- a/no_history/private.h +++ b/no_history/private.h @@ -3,8 +3,8 @@ /* VERSION DEFINITIONS */
#define VER_MAJOR 0
-#define VER_MINOR 0
-#define VER_RELEASE 5
+#define VER_MINOR 1
+#define VER_RELEASE 0
#define VER_BUILD 0
#define __STRINGIZE(x) #x
diff --git a/otr/common.h b/otr/common.h index 7889661..028e7ca 100644 --- a/otr/common.h +++ b/otr/common.h @@ -76,5 +76,8 @@ bool GetFingerprint(HANDLE hContact, char buff[45]); #define INLINE_PREFIX "[OTR Message] "
#define INLINE_PREFIX_LEN 14
+#ifndef MIID_OTR
+#define MIID_OTR {0xade1b67c, 0xc164, 0x4817, { 0x94, 0x50, 0xc8, 0x9d, 0xcf, 0x59, 0x4c, 0x4b}}
+#endif
#endif
diff --git a/otr/dllmain.cpp b/otr/dllmain.cpp index 4f19e47..68fbf4b 100644 --- a/otr/dllmain.cpp +++ b/otr/dllmain.cpp @@ -32,8 +32,8 @@ char private_key_filename[MAX_PATH]; OtrlUserState otr_user_state = 0;
// plugin stuff
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
MODULE,
PLUGIN_MAKE_VERSION(VER_MAJOR, VER_MINOR, VER_RELEASE, VER_BUILD),
DESC_STRING,
@@ -42,7 +42,8 @@ PLUGININFO pluginInfo={ "© 2005 Scott Ellis",
"http://www.scottellis.com.au/",
0, //not transient
- 0 //doesn't replace anything built-in
+ 0, //doesn't replace anything built-in
+ { 0x1b5b5c1b, 0x93a, 0x4765, { 0xa1, 0xfa, 0x4c, 0xc1, 0xda, 0x44, 0x52, 0x87 } } // {1B5B5C1B-093A-4765-A1FA-4CC1DA445287}
};
extern "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) {
@@ -50,7 +51,12 @@ extern "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRe return TRUE;
}
-extern "C" DLLIMPORT PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) {
+static const MUUID interfaces[] = {MIID_OTR, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) {
+ return interfaces;
+}
+
+extern "C" DLLIMPORT PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) {
return &pluginInfo;
}
@@ -267,8 +273,8 @@ extern "C" void otr_gui_inject_message(void *opdata, const char *accountname, co * protocol / username conversation. */
extern "C" void otr_gui_notify(void *opdata, OtrlNotifyLevel level, const char *accountname, const char *protocol, const char *username, const char *title, const char *primary, const char *secondary) {
char buff1[512], buff2[512];
- mir_snprintf(buff1, 512, "%s: %s", username, title);
- mir_snprintf(buff2, 512, "%s\n%s", primary, secondary);
+ mir_snprintf(buff1, 512, "%s: %s", username, Translate(title));
+ mir_snprintf(buff2, 512, "%s\n%s", Translate(primary), Translate(secondary));
ShowPopup(buff1, buff2, 0);
}
@@ -288,7 +294,7 @@ extern "C" int otr_gui_display_otr_message(void *opdata, const char *accountname */
//return 1;
- ShowMessageInline((HANDLE)opdata, msg);
+ ShowMessageInline((HANDLE)opdata, Translate(msg));
return 0;
}
diff --git a/otr/otr.mdsp b/otr/otr.mdsp index 0b8b6b2..dc3fb96 100644 --- a/otr/otr.mdsp +++ b/otr/otr.mdsp @@ -99,16 +99,7 @@ extraResourceOptions= 2=resource.rc
[Other]
[History]
-options.cpp,17104
-common.h,1699
-dllmain.cpp,1959
-libotr\src\privkey.h,0
-libotr\src\context.h,6126
-libotr\src\userstate.h,0
-libotr\src\privkey-t.h,0
-libotr\src\privkey.c,15456
-libotr\src\context.c,4830
-..\..\include\m_folders.h,0
+utils.cpp,6882
+common.h,2043
otr_private.h,149
-.svn\text-base\options.cpp.svn-base,4330
-.svn\text-base\dllmain.cpp.svn-base,31704
+dllmain.cpp,1358
diff --git a/otr/otr_private.h b/otr/otr_private.h index a02a091..ceb5b03 100644 --- a/otr/otr_private.h +++ b/otr/otr_private.h @@ -3,9 +3,9 @@ /* VERSION DEFINITIONS */
#define VER_MAJOR 0
-#define VER_MINOR 4
-#define VER_RELEASE 4
-#define VER_BUILD 1
+#define VER_MINOR 5
+#define VER_RELEASE 0
+#define VER_BUILD 0
#define __STRINGIZE(x) #x
#define VER_STRING __STRINGIZE( VER_MAJOR.VER_MINOR.VER_RELEASE.VER_BUILD )
diff --git a/ping/common.h b/ping/common.h index b43eca2..aebbfc0 100644 --- a/ping/common.h +++ b/ping/common.h @@ -121,4 +121,8 @@ extern HINSTANCE hInst; extern bool use_raw_ping;
+#ifndef MIID_PING
+#define MIID_PING {0x9cd1684e, 0xc520, 0x4b58, { 0x9a, 0x52, 0xae, 0x3d, 0x7a, 0x72, 0x4, 0x46}}
+#endif
+
#endif
diff --git a/ping/ping.cpp b/ping/ping.cpp index c1cbfb5..90ebf36 100644 --- a/ping/ping.cpp +++ b/ping/ping.cpp @@ -10,17 +10,18 @@ HANDLE hFillListEvent = 0; bool use_raw_ping = true;
// plugin stuff
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
"Ping Plugin",
- PLUGIN_MAKE_VERSION(0, 7, 0, 1),
+ PLUGIN_MAKE_VERSION(0, 8, 0, 0),
"Ping labelled IP addresses or domain names.",
"Scott Ellis",
"mail@scottellis.com.au",
"© 2005 Scott Ellis",
"http://www.scottellis.com.au/",
0, //not transient
- 0 //doesn't replace anything built-in
+ 0, //doesn't replace anything built-in
+ { 0x760ea901, 0xc0c2, 0x446c, { 0x80, 0x29, 0x94, 0xc3, 0xbc, 0x47, 0xc4, 0x5e } } // {760EA901-C0C2-446c-8029-94C3BC47C45E}
};
extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
@@ -29,11 +30,19 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese return TRUE;
}
-extern "C" PING_API PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
+extern "C" PING_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_PING, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
+
+
void CreatePluginServices() {
// general
CreateServiceFunction(PLUG "/Ping", PluginPing);
diff --git a/ping/ping.h b/ping/ping.h index f38ecca..b309c41 100644 --- a/ping/ping.h +++ b/ping/ping.h @@ -33,7 +33,7 @@ http://miranda-icq.sourceforge.net/ // globals
extern PLUGINLINK *pluginLink;
-extern PLUGININFO pluginInfo;
+extern PLUGININFOEX pluginInfo;
extern "C" PING_API PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion);
extern "C" PING_API int Load(PLUGINLINK *link);
diff --git a/ping_protocol/common.h b/ping_protocol/common.h index 0cf5f60..0295725 100644 --- a/ping_protocol/common.h +++ b/ping_protocol/common.h @@ -119,4 +119,8 @@ extern HINSTANCE hInst; extern int previousMode;
extern int mcStatus;
+#ifndef MIID_PING
+#define MIID_PING {0x9cd1684e, 0xc520, 0x4b58, { 0x9a, 0x52, 0xae, 0x3d, 0x7a, 0x72, 0x4, 0x46}}
+#endif
+
#endif
diff --git a/ping_protocol/pingproto.cpp b/ping_protocol/pingproto.cpp index 9412233..eb98e4e 100644 --- a/ping_protocol/pingproto.cpp +++ b/ping_protocol/pingproto.cpp @@ -136,17 +136,18 @@ int GetStatus(WPARAM wParam,LPARAM lParam) }
// plugin stuff
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
"Ping Protocol",
- PLUGIN_MAKE_VERSION(0, 4, 0, 0),
+ PLUGIN_MAKE_VERSION(0, 5, 0, 0),
"Ping labelled IP addresses or domain names.",
"Scott Ellis",
"mail@scottellis.com.au",
"© 2005 Scott Ellis",
"http://www.scottellis.com.au/",
0, //not transient
- 0 //doesn't replace anything built-in
+ 0, //doesn't replace anything built-in
+ { 0x9eb87960, 0x61ab, 0x4625, { 0x94, 0xc7, 0xa0, 0xee, 0xd, 0x9, 0x38, 0x85 } } // {9EB87960-61AB-4625-94C7-A0EE0D093885}
};
extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
@@ -155,11 +156,18 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese return TRUE;
}
-extern "C" PINGPROTO_API PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
+extern "C" PINGPROTO_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_PING, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
+
int ContactDeleted(WPARAM wParam, LPARAM lParam) {
if ( CallService(MS_PROTO_ISPROTOONCONTACT, wParam, (LPARAM)PROTO) ) {
CallService(MS_PROTO_REMOVEFROMCONTACT, wParam, (LPARAM)PROTO);
diff --git a/ping_protocol/pingproto.h b/ping_protocol/pingproto.h index cb70bd6..d203568 100644 --- a/ping_protocol/pingproto.h +++ b/ping_protocol/pingproto.h @@ -34,7 +34,7 @@ http://miranda-icq.sourceforge.net/ // globals
extern PLUGINLINK *pluginLink;
-extern PLUGININFO pluginInfo;
+extern PLUGININFOEX pluginInfo;
extern "C" PINGPROTO_API PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion);
extern "C" PINGPROTO_API int Load(PLUGINLINK *link);
diff --git a/ping_protocol/utils.cpp b/ping_protocol/utils.cpp index 1f9c839..2c35d0d 100644 --- a/ping_protocol/utils.cpp +++ b/ping_protocol/utils.cpp @@ -101,7 +101,7 @@ int PluginPing(WPARAM wParam,LPARAM lParam) IP_ECHO_REPLY result;
pa->responding = ICMP::get_instance()->ping(pa->pszName, result);
if(pa->responding)
- pa->round_trip_time = result.RoundTripTime;
+ pa->round_trip_time = (short)result.RoundTripTime;
else
pa->round_trip_time = -1;
}
diff --git a/tipper/tipper.cpp b/tipper/tipper.cpp index 7ed27ec..9a7c3fb 100644 --- a/tipper/tipper.cpp +++ b/tipper/tipper.cpp @@ -29,7 +29,7 @@ HANDLE hShowTipService = 0, hShowTipWService = 0, hHideTipService = 0; struct MM_INTERFACE memoryManagerInterface = {0};
PLUGININFOEX pluginInfo={
- sizeof(PLUGININFO),
+ sizeof(PLUGININFOEX),
__PLUGIN_NAME,
PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESC,
diff --git a/updater/common.h b/updater/common.h index 3672961..2e63f31 100644 --- a/updater/common.h +++ b/updater/common.h @@ -162,7 +162,7 @@ typedef std::map<int, STDStringList > FilenameMap; extern HINSTANCE hInst;
extern PLUGINLINK *pluginLink;
-extern PLUGININFO pluginInfo;
+extern PLUGININFOEX pluginInfo;
extern bool is_idle;
@@ -181,6 +181,10 @@ static int __inline NLog(char *msg) { // maximum number of redirects when getting xml data or download files via HTTP
#define MAX_REDIRECT_RECURSE 4
+#ifndef MIID_UPDATER
+#define MIID_UPDATER {0x4a47b19b, 0xde5a, 0x4436, { 0xab, 0x4b, 0xe1, 0xf3, 0xa0, 0x22, 0x5d, 0xe7}}
+#endif
+
#endif
diff --git a/updater/updater.cpp b/updater/updater.cpp index 61e54bc..f07cfbd 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -13,8 +13,8 @@ bool is_idle = false; //#define TESTING // defined here to reduce build time blowout caused by changing common.h
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
__PLUGIN_NAME,
#ifdef TESTING
0x00000001,
@@ -27,7 +27,13 @@ PLUGININFO pluginInfo={ __COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE, //not transient
- 0 //doesn't replace anything built-in
+ 0, //doesn't replace anything built-in
+
+#ifdef _UNICODE
+ { 0x66dceb80, 0x384, 0x4507, { 0x97, 0x74, 0xcc, 0x20, 0xa7, 0xef, 0x1d, 0x6d } } // {66DCEB80-0384-4507-9774-CC20A7EF1D6D}
+#else
+ { 0x37f59333, 0x8c51, 0x4886, { 0x96, 0xdb, 0xb9, 0xd9, 0xe3, 0x7c, 0xad, 0x38 } } // {37F59333-8C51-4886-96DB-B9D9E37CAD38}
+#endif
};
extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
@@ -36,11 +42,19 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese return TRUE;
}
-extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_UPDATER, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
+
+
int IdleChanged(WPARAM wParam, LPARAM lParam) {
is_idle = (lParam & IDF_ISIDLE);
diff --git a/updater/version.h b/updater/version.h index defca3b..0e355e7 100644 --- a/updater/version.h +++ b/updater/version.h @@ -3,9 +3,9 @@ #define __MAJOR_VERSION 0
-#define __MINOR_VERSION 4
-#define __RELEASE_NUM 12
-#define __BUILD_NUM 5
+#define __MINOR_VERSION 5
+#define __RELEASE_NUM 0
+#define __BUILD_NUM 0
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
#define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
diff --git a/xframes/common.h b/xframes/common.h index 73b2ef0..b598660 100644 --- a/xframes/common.h +++ b/xframes/common.h @@ -51,4 +51,8 @@ extern HANDLE mainThread; extern int code_page;
+#ifndef MIID_XFRAMES
+#define MIID_XFRAMES {0xd3155cb0, 0xd8d, 0x4e12, { 0x80, 0x24, 0xc8, 0xb6, 0xb8, 0x2e, 0x8b, 0x91}}
+#endif
+
#endif
diff --git a/xframes/xframes.cpp b/xframes/xframes.cpp index fae3cef..3708211 100644 --- a/xframes/xframes.cpp +++ b/xframes/xframes.cpp @@ -20,17 +20,18 @@ HANDLE popupWindowList; DWORD focusTimerId = 0;
-PLUGININFO pluginInfo={
- sizeof(PLUGININFO),
+PLUGININFOEX pluginInfo={
+ sizeof(PLUGININFOEX),
"XFrames",
- PLUGIN_MAKE_VERSION(0,0,1,2),
+ PLUGIN_MAKE_VERSION(0,1,0,0),
"External frames support",
"Scott Ellis",
"mail@scottellis.com.au",
"© 2005 Scott Ellis",
"http://www.scottellis.com.au/",
0, //not transient
- 0 //doesn't replace anything built-in
+ 0, //doesn't replace anything built-in
+ { 0x21ef6349, 0xfe67, 0x463b, { 0x80, 0xf3, 0x93, 0x97, 0xd, 0xb7, 0x3a, 0xd9 } } // {21EF6349-FE67-463b-80F3-93970DB73AD9}
};
@@ -41,11 +42,17 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese return TRUE;
}
-extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
+static const MUUID interfaces[] = {MIID_XFRAMES, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+{
+ return interfaces;
+}
+
int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {
if(ServiceExists(MS_UPDATE_REGISTER)) {
// register with updater
diff --git a/yapp/popups2.cpp b/yapp/popups2.cpp index b31c503..5111e36 100644 --- a/yapp/popups2.cpp +++ b/yapp/popups2.cpp @@ -33,7 +33,7 @@ COLORREF colFirstLine = RGB(255, 0, 0), colSecondLine = 0, colTime = RGB(0, 0, 2 HANDLE hAvChangeEvent = 0;
PLUGININFOEX pluginInfo={
- sizeof(PLUGININFO),
+ sizeof(PLUGININFOEX),
__PLUGIN_NAME,
PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESC,
|