From 81b6813e3aa0eb6a0ed72b09aaf7ac468c062ea9 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Sat, 28 Jan 2012 16:14:03 +0000 Subject: [PATCH] - Removed example plugins (will be available tomorrow from http://rainmeter.net/cms/Developers) - Changed new plugin API exports to __stdcall calling convention - Disabled /DEBUG for Release configurations --- Application/Application.vcxproj | 1 - Library/Export.cpp | 10 +- Library/Export.h | 23 +- Library/Exports.def | 7 + Library/Library.vcxproj | 8 +- Library/Library.vcxproj.filters | 5 + .../PluginAdvancedCPU.vcxproj | 1 - Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj | 2 - Plugins/PluginExample/ExamplePlugin.c | 122 -------- Plugins/PluginExample/PluginExample.rc | 48 --- Plugins/PluginExample/PluginExample.vcxproj | 282 ------------------ Plugins/PluginExampleCS/AssemblyInfo.cs | 7 - Plugins/PluginExampleCS/Plugin.cs | 154 ---------- .../PluginExampleCS/PluginExampleCS.csproj | 100 ------- .../PluginFolderInfo/PluginFolderInfo.vcxproj | 1 - Plugins/PluginMediaKey/PluginMediaKey.vcxproj | 2 - .../PluginNowPlaying/PluginNowPlaying.vcxproj | 2 - Plugins/PluginPerfMon/PluginPerfMon.vcxproj | 1 - Plugins/PluginPing/PluginPing.vcxproj | 1 - Plugins/PluginPower/PluginPower.vcxproj | 1 - Plugins/PluginProcess/PluginProcess.vcxproj | 1 - Plugins/PluginQuote/PluginQuote.vcxproj | 1 - .../PluginRecycleManager.vcxproj | 1 - Plugins/PluginResMon/PluginResMon.vcxproj | 1 - Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj | 1 - Plugins/PluginSysInfo/PluginSysInfo.vcxproj | 1 - .../PluginVirtualDesktops.vcxproj | 1 - .../PluginWebParser/PluginWebParser.vcxproj | 1 - .../PluginWifiStatus/PluginWifiStatus.vcxproj | 1 - .../PluginWin7Audio/PluginWin7Audio.vcxproj | 2 - .../PluginWindowMessage.vcxproj | 1 - Plugins/PluginiTunes/PluginiTunes.vcxproj | 2 - Rainmeter.sln | 23 -- RainmeterCPP.sln | 10 - RainmeterCS.sln | 13 - 35 files changed, 33 insertions(+), 805 deletions(-) create mode 100644 Library/Exports.def delete mode 100644 Plugins/PluginExample/ExamplePlugin.c delete mode 100644 Plugins/PluginExample/PluginExample.rc delete mode 100644 Plugins/PluginExample/PluginExample.vcxproj delete mode 100644 Plugins/PluginExampleCS/AssemblyInfo.cs delete mode 100644 Plugins/PluginExampleCS/Plugin.cs delete mode 100644 Plugins/PluginExampleCS/PluginExampleCS.csproj diff --git a/Application/Application.vcxproj b/Application/Application.vcxproj index 60140a30..a4035a8a 100644 --- a/Application/Application.vcxproj +++ b/Application/Application.vcxproj @@ -219,7 +219,6 @@ xcopy /Q /S /Y ..\Install\Default.ini ..\testbench\x32\release\ ../TestBench/x32/Release/Rainmeter.exe true ..\Library\x32\Release;%(AdditionalLibraryDirectories) - true .\x32/Release/Rainmeter.pdb Windows wWinMainCRTStartup diff --git a/Library/Export.cpp b/Library/Export.cpp index 1ba48781..fd7daa90 100644 --- a/Library/Export.cpp +++ b/Library/Export.cpp @@ -29,7 +29,7 @@ extern CRainmeter* Rainmeter; static std::wstring g_Buffer; -LPCWSTR RmReadString(void* rm, LPCWSTR option, LPCWSTR defValue, BOOL replaceMeasures) +LPCWSTR __stdcall RmReadString(void* rm, LPCWSTR option, LPCWSTR defValue, BOOL replaceMeasures) { NULLCHECK(option); NULLCHECK(defValue); @@ -39,7 +39,7 @@ LPCWSTR RmReadString(void* rm, LPCWSTR option, LPCWSTR defValue, BOOL replaceMea return parser.ReadString(measure->GetName(), option, defValue, (bool)replaceMeasures).c_str(); } -double RmReadFormula(void* rm, LPCWSTR option, double defValue) +double __stdcall RmReadFormula(void* rm, LPCWSTR option, double defValue) { NULLCHECK(option); @@ -48,7 +48,7 @@ double RmReadFormula(void* rm, LPCWSTR option, double defValue) return parser.ReadFormula(measure->GetName(), option, defValue); } -LPCWSTR RmPathToAbsolute(void* rm, LPCWSTR relativePath) +LPCWSTR __stdcall RmPathToAbsolute(void* rm, LPCWSTR relativePath) { NULLCHECK(relativePath); @@ -58,7 +58,7 @@ LPCWSTR RmPathToAbsolute(void* rm, LPCWSTR relativePath) return g_Buffer.c_str(); } -void* RmGet(void* rm, int type) +void* __stdcall RmGet(void* rm, int type) { CMeasurePlugin* measure = (CMeasurePlugin*)rm; @@ -85,7 +85,7 @@ void* RmGet(void* rm, int type) return NULL; } -void RmExecute(void* skin, LPCWSTR command) +void __stdcall RmExecute(void* skin, LPCWSTR command) { CMeterWindow* mw = (CMeterWindow*)skin; diff --git a/Library/Export.h b/Library/Export.h index 43ab5c0c..abe09688 100644 --- a/Library/Export.h +++ b/Library/Export.h @@ -25,31 +25,26 @@ #define LIBRARY_DECLSPEC __declspec(dllimport) #endif // LIBRARY_EXPORTS -#ifdef __cplusplus -#define LIBRARY_EXPORT extern "C" LIBRARY_DECLSPEC -#define PLUGIN_EXPORT extern "C" __declspec(dllexport) -#else -#define LIBRARY_EXPORT LIBRARY_DECLSPEC -#define PLUGIN_EXPORT __declspec(dllexport) -#endif // __cplusplus +#define LIBRARY_EXPORT EXTERN_C LIBRARY_DECLSPEC +#define PLUGIN_EXPORT EXTERN_C __declspec(dllexport) // // Exported functions // - +EXTERN_C #ifdef __cplusplus -LIBRARY_EXPORT LPCWSTR RmReadString(void* rm, LPCWSTR option, LPCWSTR defValue, BOOL replaceMeasures = TRUE); +LIBRARY_EXPORT LPCWSTR __stdcall RmReadString(void* rm, LPCWSTR option, LPCWSTR defValue, BOOL replaceMeasures = TRUE); #else -LIBRARY_EXPORT LPCWSTR RmReadString(void* rm, LPCWSTR option, LPCWSTR defValue, BOOL replaceMeasures); +LIBRARY_EXPORT LPCWSTR __stdcall RmReadString(void* rm, LPCWSTR option, LPCWSTR defValue, BOOL replaceMeasures); #endif // __cplusplus -LIBRARY_EXPORT double RmReadFormula(void* rm, LPCWSTR option, double defValue); +LIBRARY_EXPORT double __stdcall RmReadFormula(void* rm, LPCWSTR option, double defValue); -LIBRARY_EXPORT LPCWSTR RmPathToAbsolute(void* rm, LPCWSTR relativePath); +LIBRARY_EXPORT LPCWSTR __stdcall RmPathToAbsolute(void* rm, LPCWSTR relativePath); -LIBRARY_EXPORT void RmExecute(void* skin, LPCWSTR command); +LIBRARY_EXPORT void __stdcall RmExecute(void* skin, LPCWSTR command); -LIBRARY_EXPORT void* RmGet(void* rm, int type); +LIBRARY_EXPORT void* __stdcall RmGet(void* rm, int type); enum RmGetType { diff --git a/Library/Exports.def b/Library/Exports.def new file mode 100644 index 00000000..ffe05eb2 --- /dev/null +++ b/Library/Exports.def @@ -0,0 +1,7 @@ +LIBRARY +EXPORTS + RmReadString + RmReadFormula + RmPathToAbsolute + RmExecute + RmGet diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj index 5c8529ec..aea549ec 100644 --- a/Library/Library.vcxproj +++ b/Library/Library.vcxproj @@ -124,6 +124,7 @@ .\x32/Debug/Rainmeter.lib MachineX86 Winmm.dll;Version.dll + Exports.def @@ -168,6 +169,7 @@ .\x64/Debug/Rainmeter.lib MachineX64 Winmm.dll;Version.dll + Exports.def @@ -210,7 +212,6 @@ ../TestBench/x32/Release/Rainmeter.dll true lua/lib;%(AdditionalLibraryDirectories) - true .\x32/Release/Rainmeter.pdb .\x32/Release/Rainmeter.lib MachineX86 @@ -218,6 +219,7 @@ true true Winmm.dll;Version.dll + Exports.def @@ -264,6 +266,7 @@ true true Winmm.dll;Version.dll + Exports.def @@ -913,6 +916,9 @@ + + + diff --git a/Library/Library.vcxproj.filters b/Library/Library.vcxproj.filters index 1e0885cb..126b1345 100644 --- a/Library/Library.vcxproj.filters +++ b/Library/Library.vcxproj.filters @@ -587,4 +587,9 @@ Resource Files + + + Source Files + + \ No newline at end of file diff --git a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj index be5216dc..91174888 100644 --- a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj +++ b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj @@ -119,7 +119,6 @@ ../../TestBench/x32/Release/Plugins/AdvancedCPU.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/AdvancedCPU.pdb .\x32/Release/AdvancedCPU.lib MachineX86 diff --git a/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj b/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj index 63b00051..8cf66d96 100644 --- a/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj +++ b/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj @@ -200,7 +200,6 @@ ../../TestBench/x32/Release/Plugins/CoreTemp.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/CoreTemp.pdb .\x32/Release/CoreTemp.lib MachineX86 @@ -246,7 +245,6 @@ ../../TestBench/x64/Release/Plugins/CoreTemp.dll true ..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories) - false .\x64/Release/CoreTemp.pdb .\x64/Release/CoreTemp.lib MachineX64 diff --git a/Plugins/PluginExample/ExamplePlugin.c b/Plugins/PluginExample/ExamplePlugin.c deleted file mode 100644 index b5b7b0b9..00000000 --- a/Plugins/PluginExample/ExamplePlugin.c +++ /dev/null @@ -1,122 +0,0 @@ -/* - Copyright (C) 2001 Kimmo Pekkola - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#include -#include -#include "../../Library/Export.h" // Rainmeter's exported functions - -//#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point - -/* The exported functions */ -__declspec( dllexport ) UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id); -__declspec( dllexport ) void Finalize(HMODULE instance, UINT id); -__declspec( dllexport ) UINT Update(UINT id); -__declspec( dllexport ) UINT GetPluginVersion(); -__declspec( dllexport ) LPCTSTR GetPluginAuthor(); - -/* Couple of globals */ -static UINT g_Phase = 100; -static UINT g_CurrentPhase = 0; - -/* - This function is called when the measure is initialized. - The function must return the maximum value that can be measured. - The return value can also be 0, which means that Rainmeter will - track the maximum value automatically. The parameters for this - function are: - - instance The instance of this DLL - iniFile The name of the ini-file (usually Rainmeter.ini) - section The name of the section in the ini-file for this measure - id The identifier for the measure. This is used to identify the measures that use the same plugin. -*/ -UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id) -{ - /* - Read our own settings from the ini-file - The ReadConfigString can be used for this purpose. Plugins - can also read the config some other way (e.g. with - GetPrivateProfileInt, but in that case the variables - do not work. - */ - LPCTSTR data = ReadConfigString(section, L"PhaseShift", L"0"); - if (data) - { - g_CurrentPhase = _wtoi(data); - } - - data = ReadConfigString(section, L"Phase", L"100"); - if (data) - { - g_Phase = _wtoi(data); - } - - return 1000; /* We'll return values from 0 to 1000 */ -} - -/* - This function is called when new value should be measured. - The function returns the new value. -*/ -UINT Update(UINT id) -{ - /* - This measure doesn't measure anything. It's just an - example how to create Rainmeter plugins. We'll just - return sine curve so that the meter shows something. - */ - - double value = 6.283185 * ((double)g_CurrentPhase / (double)g_Phase); - value = sin(value); - - g_CurrentPhase++; - if(g_CurrentPhase > g_Phase) - { - g_CurrentPhase = 0; - } - - return (UINT)((value + 1.0) * 500.0); -} - -/* - If the measure needs to free resources before quitting. - The plugin can export Finalize function, which is called - when Rainmeter quits (or refreshes). -*/ -void Finalize(HMODULE instance, UINT id) -{ - /* Nothing to do here */ -} - -/* - Returns the version number of the plugin. The value - can be calculated like this: Major * 1000 + Minor. - So, e.g. 2.31 would be 2031. -*/ -UINT GetPluginVersion() -{ - return 1001; -} - -/* - Returns the author of the plugin for the about dialog. -*/ -LPCTSTR GetPluginAuthor() -{ - return L"Rainy (rainy@iki.fi)"; -} diff --git a/Plugins/PluginExample/PluginExample.rc b/Plugins/PluginExample/PluginExample.rc deleted file mode 100644 index d1d3b35e..00000000 --- a/Plugins/PluginExample/PluginExample.rc +++ /dev/null @@ -1,48 +0,0 @@ -// Microsoft Developer Studio generated resource script. -// - -#include "../../Version.h" -#define APSTUDIO_READONLY_SYMBOLS -#include "windows.h" -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,0,0 - PRODUCTVERSION PRODUCTVER - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904E4" - BEGIN - VALUE "FileDescription", "Example Plugin for Rainmeter" - VALUE "FileVersion", "1.1.0.0" - VALUE "InternalName", "ExamplePlugin" - VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" - VALUE "OriginalFilename", "ExamplePlugin.dll" - VALUE "ProductName", "Rainmeter" -#ifdef _WIN64 - VALUE "ProductVersion", STRPRODUCTVER " (64-bit)" -#else - VALUE "ProductVersion", STRPRODUCTVER " (32-bit)" -#endif //_WIN64 - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END diff --git a/Plugins/PluginExample/PluginExample.vcxproj b/Plugins/PluginExample/PluginExample.vcxproj deleted file mode 100644 index 6bd6239e..00000000 --- a/Plugins/PluginExample/PluginExample.vcxproj +++ /dev/null @@ -1,282 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93} - - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - true - - - DynamicLibrary - false - Unicode - $(COMPILER64) - - - DynamicLibrary - false - Unicode - $(COMPILER64) - true - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)TestBench\x32\$(Configuration)\Plugins\ - .\x32\$(Configuration)\ - false - $(SolutionDir)TestBench\x64\$(Configuration)\Plugins\ - .\x64\$(Configuration)\ - false - $(SolutionDir)TestBench\x32\$(Configuration)\Plugins\ - .\x32\$(Configuration)\ - true - $(SolutionDir)TestBench\x64\$(Configuration)\Plugins\ - .\x64\$(Configuration)\ - true - ExamplePlugin - ExamplePlugin - ExamplePlugin - ExamplePlugin - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\x32/Release/PluginExample.tlb - - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGINEXAMPLE_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - .\x32/Release/PluginExample.pch - .\x32/Release/ - .\x32/Release/ - .\x32/Release/ - Level3 - true - ProgramDatabase - 4018;4090;4114;4351;4786;4800;4996 - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Rainmeter.lib;%(AdditionalDependencies) - ../../TestBench/x32/Release/Plugins/ExamplePlugin.dll - true - ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true - .\x32/Release/ExamplePlugin.pdb - .\x32/Release/ExamplePlugin.lib - MachineX86 - .rdata=.text - true - true - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\x64/Release/PluginExample.tlb - - - - - /GL %(AdditionalOptions) - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGINEXAMPLE_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\x64/Release/PluginExample.pch - .\x64/Release/ - .\x64/Release/ - .\x64/Release/ - Level3 - true - ProgramDatabase - 4018;4090;4114;4351;4786;4800;4996 - - - NDEBUG;_WIN64;%(PreprocessorDefinitions) - 0x0409 - - - /LTCG %(AdditionalOptions) - Rainmeter.lib;%(AdditionalDependencies) - ../../TestBench/x64/Release/Plugins/ExamplePlugin.dll - true - ..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories) - .\x64/Release/ExamplePlugin.pdb - .\x64/Release/ExamplePlugin.lib - MachineX64 - .rdata=.text - true - true - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\x32/Debug/PluginExample.tlb - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGINEXAMPLE_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\x32/Debug/PluginExample.pch - .\x32/Debug/ - .\x32/Debug/ - .\x32/Debug/ - Level3 - true - EditAndContinue - 4018;4090;4114;4351;4786;4800;4996 - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ../../TestBench/x32/Debug/Plugins/ExamplePlugin.dll - true - true - .\x32/Debug/ExamplePlugin.pdb - .\x32/Debug/ExamplePlugin.lib - MachineX86 - ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\x64/Debug/PluginExample.tlb - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGINEXAMPLE_EXPORTS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - .\x64/Debug/PluginExample.pch - .\x64/Debug/ - .\x64/Debug/ - .\x64/Debug/ - Level3 - true - ProgramDatabase - 4018;4090;4114;4351;4786;4800;4996 - - - _DEBUG;_WIN64;%(PreprocessorDefinitions) - 0x0409 - - - ../../TestBench/x64/Debug/Plugins/ExamplePlugin.dll - true - true - .\x64/Debug/ExamplePlugin.pdb - .\x64/Debug/ExamplePlugin.lib - MachineX64 - ..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories) - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PLUGINEXAMPLE_EXPORTS - EnableFastChecks - Disabled - WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PLUGINEXAMPLE_EXPORTS - EnableFastChecks - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PLUGINEXAMPLE_EXPORTS - MaxSpeed - WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PLUGINEXAMPLE_EXPORTS - - - - - - - - {be9d2400-7f1c-49d6-8498-5ce495491ad6} - false - - - - - - \ No newline at end of file diff --git a/Plugins/PluginExampleCS/AssemblyInfo.cs b/Plugins/PluginExampleCS/AssemblyInfo.cs deleted file mode 100644 index fb75abfc..00000000 --- a/Plugins/PluginExampleCS/AssemblyInfo.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly: AssemblyCopyright("© 2011 - Birunthan Mohanathas")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion(Rainmeter.Version.Informational)] -[assembly: AssemblyProduct("Rainmeter")] diff --git a/Plugins/PluginExampleCS/Plugin.cs b/Plugins/PluginExampleCS/Plugin.cs deleted file mode 100644 index 21234558..00000000 --- a/Plugins/PluginExampleCS/Plugin.cs +++ /dev/null @@ -1,154 +0,0 @@ -/* - Copyright (C) 2011 Birunthan Mohanathas - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -// Define/undefine to control exports. Undefine to infrom that this plugin does not support -// a particular function. -#define ExportUpdate -#undef ExportGetString -#undef ExportExecuteBang - -using System; -using System.Collections.Generic; -using System.Runtime.InteropServices; -using Rainmeter; - -namespace ExampleCS -{ - /// - /// Represents a measure. Members are specific to a measure. Methods are called by Rainmeter - /// when needed. - /// - internal class Measure - { - /// - /// Called when a measure is created. - /// - internal Measure() - { - } - - /// - /// Called when a measure is destroyed. Use this rather than a destructor to perform - /// cleanup. - /// - internal void Cleanup() - { - } - - /// - /// Called when the measure settings must be (re)read. - /// - internal void Reload(Rainmeter.API rm, ref double maxValue) - { - // Examples: - // string value = rm.ReadString("TestOption", "DefaultValue"); - // double value = rm.ReadFormula("TestOption", 20); - } - - /// - /// Called when the measure settings must be (re)read. - /// -#if ExportUpdate - internal double Update() - { - return 42.0; - } -#endif - - /// - /// Called when the string representation of the measure value is required. - /// - /// - /// Can be called multiple times per update cycle. Do not call heavy functions here. - /// Instead create a string member, set it in Update, and simply return it here. - /// -#if ExportGetString - internal string GetString() - { - return "Hello, world!"; - } -#endif - - /// - /// Called when as a result of a !CommandMeasure bang aimed at the measure. - /// -#if ExportExecuteBang - internal void ExecuteBang(string args) - { - } -#endif - } - - /// - /// Handles communication between Rainmeter and the plugin. - /// - public static class Plugin - { - [DllExport] - public unsafe static void Initialize(void** data) - { - IntPtr dataPtr = (IntPtr)((void*)*data); - Measures.Add(dataPtr, new Measure()); - } - - [DllExport] - public unsafe static void Finalize(void* data) - { - IntPtr dataPtr = (IntPtr)data; - Measures[dataPtr].Cleanup(); - Measures.Remove(dataPtr); - } - - [DllExport] - public unsafe static void Reload(void* data, void* rm, double* maxValue) - { - IntPtr dataPtr = (IntPtr)data; - Measures[dataPtr].Reload(new Rainmeter.API((IntPtr)rm), ref *maxValue); - } - -#if ExportUpdate - [DllExport] - public unsafe static double Update(void* data) - { - IntPtr dataPtr = (IntPtr)data; - return Measures[dataPtr].Update(); - } -#endif - -#if ExportGetString - [DllExport] - public unsafe static char* GetString(void* data) - { - IntPtr dataPtr = (IntPtr)data; - return Rainmeter.API.ToUnsafe(Measures[dataPtr].GetString()); - } -#endif - -#if ExportExecuteBang - [DllExport] - public unsafe static void ExecuteBang(void* data, char* args) - { - IntPtr dataPtr = (IntPtr)data; - Measures[dataPtr].ExecuteBang(new string(args)); - Measures.Remove(dataPtr); - } -#endif - - internal static Dictionary Measures = new Dictionary(); - } -} diff --git a/Plugins/PluginExampleCS/PluginExampleCS.csproj b/Plugins/PluginExampleCS/PluginExampleCS.csproj deleted file mode 100644 index c302d719..00000000 --- a/Plugins/PluginExampleCS/PluginExampleCS.csproj +++ /dev/null @@ -1,100 +0,0 @@ - - - - Debug - x86 - 9.0.30729 - 2.0 - {D31F73ED-3978-44FA-B599-49584BA30D3A} - Library - Properties - ExampleCS - ExampleCS - v2.0 - 512 - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - true - full - false - $(SolutionDir)TestBench\x32\Debug\Plugins\ - TRACE;DEBUG - prompt - 4 - true - 1607 - x86 - - - none - true - $(SolutionDir)TestBench\x32\Release\Plugins\ - TRACE - prompt - 4 - true - 1607 - x86 - - - true - $(SolutionDir)TestBench\x64\Debug\Plugins\ - TRACE;DEBUG;X64 - true - full - x64 - prompt - 1607 - - - $(SolutionDir)TestBench\x64\Release\Plugins\ - TRACE;X64 - true - true - none - x64 - prompt - 1607 - - - OnOutputUpdated - - - - - - - - - - - - - - "$(SolutionDir)Plugins\API\DllExporter.exe" "$(ConfigurationName)" "$(PlatformName)" "$(TargetDir)\" "$(TargetFileName)" "$(TargetedFrameworkDir)\ilasm.exe" "$(FrameworkSDKDir)bin\ildasm.exe" - - \ No newline at end of file diff --git a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj index 48b9a0d9..a538a75b 100644 --- a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj +++ b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj @@ -199,7 +199,6 @@ ../../TestBench/x32/Release/Plugins/FolderInfo.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/FolderInfo.pdb .\x32/Release/FolderInfo.lib MachineX86 diff --git a/Plugins/PluginMediaKey/PluginMediaKey.vcxproj b/Plugins/PluginMediaKey/PluginMediaKey.vcxproj index 47d66eec..bcb5e009 100644 --- a/Plugins/PluginMediaKey/PluginMediaKey.vcxproj +++ b/Plugins/PluginMediaKey/PluginMediaKey.vcxproj @@ -200,7 +200,6 @@ ../../TestBench/x32/Release/Plugins/MediaKey.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/MediaKey.pdb .\x32/Release/MediaKey.lib MachineX86 @@ -246,7 +245,6 @@ ../../TestBench/x64/Release/Plugins/MediaKey.dll true ..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories) - false .\x64/Release/MediaKey.pdb .\x64/Release/MediaKey.lib MachineX64 diff --git a/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj b/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj index aa1af183..f2022e76 100644 --- a/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj +++ b/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj @@ -206,7 +206,6 @@ ../../TestBench/x32/Release/Plugins/NowPlaying.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/NowPlaying.pdb .\x32/Release/NowPlaying.lib MachineX86 @@ -254,7 +253,6 @@ ../../TestBench/x64/Release/Plugins/NowPlaying.dll true ..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories) - false .\x64/Release/NowPlaying.pdb .\x64/Release/NowPlaying.lib MachineX64 diff --git a/Plugins/PluginPerfMon/PluginPerfMon.vcxproj b/Plugins/PluginPerfMon/PluginPerfMon.vcxproj index 6089e08b..4068bc6a 100644 --- a/Plugins/PluginPerfMon/PluginPerfMon.vcxproj +++ b/Plugins/PluginPerfMon/PluginPerfMon.vcxproj @@ -119,7 +119,6 @@ ../../TestBench/x32/Release/Plugins/PerfMon.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/PerfMon.pdb .\x32/Release/PerfMon.lib MachineX86 diff --git a/Plugins/PluginPing/PluginPing.vcxproj b/Plugins/PluginPing/PluginPing.vcxproj index 91d77fbd..ab5050d6 100644 --- a/Plugins/PluginPing/PluginPing.vcxproj +++ b/Plugins/PluginPing/PluginPing.vcxproj @@ -119,7 +119,6 @@ ../../TestBench/x32/Release/Plugins/PingPlugin.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/PingPlugin.pdb .\x32/Release/PingPlugin.lib MachineX86 diff --git a/Plugins/PluginPower/PluginPower.vcxproj b/Plugins/PluginPower/PluginPower.vcxproj index 74cf4480..47308c26 100644 --- a/Plugins/PluginPower/PluginPower.vcxproj +++ b/Plugins/PluginPower/PluginPower.vcxproj @@ -203,7 +203,6 @@ ../../TestBench/x32/Release/Plugins/PowerPlugin.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/PowerPlugin.pdb .\x32/Release/PowerPlugin.lib MachineX86 diff --git a/Plugins/PluginProcess/PluginProcess.vcxproj b/Plugins/PluginProcess/PluginProcess.vcxproj index 1e3a57c0..8c8179f8 100644 --- a/Plugins/PluginProcess/PluginProcess.vcxproj +++ b/Plugins/PluginProcess/PluginProcess.vcxproj @@ -201,7 +201,6 @@ ../../TestBench/x32/Release/Plugins/Process.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/ProcessPlugin.pdb .\x32/Release/ProcessPlugin.lib MachineX86 diff --git a/Plugins/PluginQuote/PluginQuote.vcxproj b/Plugins/PluginQuote/PluginQuote.vcxproj index 280ea51e..15aa9eeb 100644 --- a/Plugins/PluginQuote/PluginQuote.vcxproj +++ b/Plugins/PluginQuote/PluginQuote.vcxproj @@ -119,7 +119,6 @@ ../../TestBench/x32/Release/Plugins/QuotePlugin.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/QuotePlugin.pdb .\x32/Release/QuotePlugin.lib MachineX86 diff --git a/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj b/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj index f609b8c5..1c886107 100644 --- a/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj +++ b/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj @@ -119,7 +119,6 @@ ../../TestBench/x32/Release/Plugins/RecycleManager.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/RecycleManager.pdb false diff --git a/Plugins/PluginResMon/PluginResMon.vcxproj b/Plugins/PluginResMon/PluginResMon.vcxproj index 6b72ab33..94007baa 100644 --- a/Plugins/PluginResMon/PluginResMon.vcxproj +++ b/Plugins/PluginResMon/PluginResMon.vcxproj @@ -119,7 +119,6 @@ ../../TestBench/x32/Release/Plugins/ResMon.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/ResMon.pdb .\x32/Release/ResMon.lib MachineX86 diff --git a/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj b/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj index f031e1aa..a0d5a666 100644 --- a/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj +++ b/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj @@ -119,7 +119,6 @@ ../../TestBench/x32/Release/Plugins/SpeedFanPlugin.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/SpeedFanPlugin.pdb .\x32/Release/SpeedFanPlugin.lib MachineX86 diff --git a/Plugins/PluginSysInfo/PluginSysInfo.vcxproj b/Plugins/PluginSysInfo/PluginSysInfo.vcxproj index 7719c150..6d820db6 100644 --- a/Plugins/PluginSysInfo/PluginSysInfo.vcxproj +++ b/Plugins/PluginSysInfo/PluginSysInfo.vcxproj @@ -119,7 +119,6 @@ ../../TestBench/x32/Release/Plugins/SysInfo.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/SysInfo.pdb .\x32/Release/SysInfo.lib MachineX86 diff --git a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj index c133bb89..48ea1e3a 100644 --- a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj +++ b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj @@ -119,7 +119,6 @@ ../../TestBench/x32/Release/Plugins/VirtualDesktops.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/VirtualDesktops.pdb .\x32/Release/VirtualDesktops.lib MachineX86 diff --git a/Plugins/PluginWebParser/PluginWebParser.vcxproj b/Plugins/PluginWebParser/PluginWebParser.vcxproj index 50d33ba4..d0ac5a47 100644 --- a/Plugins/PluginWebParser/PluginWebParser.vcxproj +++ b/Plugins/PluginWebParser/PluginWebParser.vcxproj @@ -201,7 +201,6 @@ ../../TestBench/x32/Release/Plugins/WebParser.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/WebParser.pdb .\x32/Release/WebParser.lib MachineX86 diff --git a/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj b/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj index 485b4501..cb4fdc9a 100644 --- a/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj +++ b/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj @@ -186,7 +186,6 @@ ../../TestBench/x32/Release/Plugins/WifiStatus.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/WifiStatus.pdb false diff --git a/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj b/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj index 46fd11ee..8409e977 100644 --- a/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj +++ b/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj @@ -200,7 +200,6 @@ ../../TestBench/x32/Release/Plugins/Win7AudioPlugin.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/Win7AudioPlugin.pdb .\x32/Release/Win7AudioPlugin.lib MachineX86 @@ -246,7 +245,6 @@ ../../TestBench/x64/Release/Plugins/Win7AudioPlugin.dll true ..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories) - false .\x64/Release/Win7AudioPlugin.pdb .\x64/Release/Win7AudioPlugin.lib MachineX64 diff --git a/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj b/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj index 609af6e6..7c6ab9e3 100644 --- a/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj +++ b/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj @@ -199,7 +199,6 @@ ../../TestBench/x32/Release/Plugins/WindowMessagePlugin.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/WindowMessagePlugin.pdb .\x32/Release/WindowMessagePlugin.lib MachineX86 diff --git a/Plugins/PluginiTunes/PluginiTunes.vcxproj b/Plugins/PluginiTunes/PluginiTunes.vcxproj index 9b97b2be..550bd41c 100644 --- a/Plugins/PluginiTunes/PluginiTunes.vcxproj +++ b/Plugins/PluginiTunes/PluginiTunes.vcxproj @@ -203,7 +203,6 @@ ../../TestBench/x32/Release/Plugins/iTunesPlugin.dll true ..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories) - true .\x32/Release/iTunesPlugin.pdb .\x32/Release/iTunesPlugin.lib MachineX86 @@ -250,7 +249,6 @@ ../../TestBench/x64/Release/Plugins/iTunesPlugin.dll true ..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories) - true .\x64/Release/iTunesPlugin.pdb .\x64/Release/iTunesPlugin.lib MachineX64 diff --git a/Rainmeter.sln b/Rainmeter.sln index 4c10995d..50b64d96 100644 --- a/Rainmeter.sln +++ b/Rainmeter.sln @@ -18,13 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginAdvancedCPU", "Plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginCoreTemp", "Plugins\PluginCoreTemp\PluginCoreTemp.vcxproj", "{F32FA418-8DF4-4E94-B92B-EBD502F5DC07}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginExample", "Plugins\PluginExample\PluginExample.vcxproj", "{761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginExampleCS", "Plugins\PluginExampleCS\PluginExampleCS.csproj", "{D31F73ED-3978-44FA-B599-49584BA30D3A}" - ProjectSection(ProjectDependencies) = postProject - {49D56CA5-54AB-45C9-A245-EAE588FCBFE1} = {49D56CA5-54AB-45C9-A245-EAE588FCBFE1} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginFolderInfo", "Plugins\PluginFolderInfo\PluginFolderInfo.vcxproj", "{A221819D-4263-42AA-B22A-C022924842A7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginInputText", "Plugins\PluginInputText\PluginInputText.csproj", "{2CFEC79A-E39E-4FFD-ABC2-C4A69DD1E44D}" @@ -130,22 +123,6 @@ Global {F32FA418-8DF4-4E94-B92B-EBD502F5DC07}.Release|Win32.Build.0 = Release|Win32 {F32FA418-8DF4-4E94-B92B-EBD502F5DC07}.Release|x64.ActiveCfg = Release|x64 {F32FA418-8DF4-4E94-B92B-EBD502F5DC07}.Release|x64.Build.0 = Release|x64 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|Win32.ActiveCfg = Debug|Win32 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|Win32.Build.0 = Debug|Win32 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|x64.ActiveCfg = Debug|x64 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|x64.Build.0 = Debug|x64 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|Win32.ActiveCfg = Release|Win32 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|Win32.Build.0 = Release|Win32 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|x64.ActiveCfg = Release|x64 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|x64.Build.0 = Release|x64 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Debug|Win32.ActiveCfg = Debug|x86 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Debug|Win32.Build.0 = Debug|x86 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Debug|x64.ActiveCfg = Debug|x64 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Debug|x64.Build.0 = Debug|x64 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Release|Win32.ActiveCfg = Release|x86 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Release|Win32.Build.0 = Release|x86 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Release|x64.ActiveCfg = Release|x64 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Release|x64.Build.0 = Release|x64 {A221819D-4263-42AA-B22A-C022924842A7}.Debug|Win32.ActiveCfg = Debug|Win32 {A221819D-4263-42AA-B22A-C022924842A7}.Debug|Win32.Build.0 = Debug|Win32 {A221819D-4263-42AA-B22A-C022924842A7}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/RainmeterCPP.sln b/RainmeterCPP.sln index 85b09cee..1bb0857d 100644 --- a/RainmeterCPP.sln +++ b/RainmeterCPP.sln @@ -15,8 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginAdvancedCPU", "Plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginCoreTemp", "Plugins\PluginCoreTemp\PluginCoreTemp.vcxproj", "{F32FA418-8DF4-4E94-B92B-EBD502F5DC07}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginExample", "Plugins\PluginExample\PluginExample.vcxproj", "{761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginFolderInfo", "Plugins\PluginFolderInfo\PluginFolderInfo.vcxproj", "{A221819D-4263-42AA-B22A-C022924842A7}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginiTunes", "Plugins\PluginiTunes\PluginiTunes.vcxproj", "{A2DD3CBE-B140-4892-A875-24107FA52518}" @@ -109,14 +107,6 @@ Global {F32FA418-8DF4-4E94-B92B-EBD502F5DC07}.Release|Win32.Build.0 = Release|Win32 {F32FA418-8DF4-4E94-B92B-EBD502F5DC07}.Release|x64.ActiveCfg = Release|x64 {F32FA418-8DF4-4E94-B92B-EBD502F5DC07}.Release|x64.Build.0 = Release|x64 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|Win32.ActiveCfg = Debug|Win32 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|Win32.Build.0 = Debug|Win32 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|x64.ActiveCfg = Debug|x64 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|x64.Build.0 = Debug|x64 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|Win32.ActiveCfg = Release|Win32 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|Win32.Build.0 = Release|Win32 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|x64.ActiveCfg = Release|x64 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|x64.Build.0 = Release|x64 {A221819D-4263-42AA-B22A-C022924842A7}.Debug|Win32.ActiveCfg = Debug|Win32 {A221819D-4263-42AA-B22A-C022924842A7}.Debug|Win32.Build.0 = Debug|Win32 {A221819D-4263-42AA-B22A-C022924842A7}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/RainmeterCS.sln b/RainmeterCS.sln index f16f3604..da20abb9 100644 --- a/RainmeterCS.sln +++ b/RainmeterCS.sln @@ -3,11 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual C# Express 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DllExporter", "Plugins\API\DllExporter\DllExporter.csproj", "{49D56CA5-54AB-45C9-A245-EAE588FCBFE1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginExampleCS", "Plugins\PluginExampleCS\PluginExampleCS.csproj", "{D31F73ED-3978-44FA-B599-49584BA30D3A}" - ProjectSection(ProjectDependencies) = postProject - {49D56CA5-54AB-45C9-A245-EAE588FCBFE1} = {49D56CA5-54AB-45C9-A245-EAE588FCBFE1} - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginInputText", "Plugins\PluginInputText\PluginInputText.csproj", "{2CFEC79A-E39E-4FFD-ABC2-C4A69DD1E44D}" ProjectSection(ProjectDependencies) = postProject {49D56CA5-54AB-45C9-A245-EAE588FCBFE1} = {49D56CA5-54AB-45C9-A245-EAE588FCBFE1} @@ -29,14 +24,6 @@ Global {49D56CA5-54AB-45C9-A245-EAE588FCBFE1}.Release|x64.Build.0 = Release|x64 {49D56CA5-54AB-45C9-A245-EAE588FCBFE1}.Release|x86.ActiveCfg = Release|x86 {49D56CA5-54AB-45C9-A245-EAE588FCBFE1}.Release|x86.Build.0 = Release|x86 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Debug|x64.ActiveCfg = Debug|x64 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Debug|x64.Build.0 = Debug|x64 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Debug|x86.ActiveCfg = Debug|x86 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Debug|x86.Build.0 = Debug|x86 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Release|x64.ActiveCfg = Release|x64 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Release|x64.Build.0 = Release|x64 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Release|x86.ActiveCfg = Release|x86 - {D31F73ED-3978-44FA-B599-49584BA30D3A}.Release|x86.Build.0 = Release|x86 {2CFEC79A-E39E-4FFD-ABC2-C4A69DD1E44D}.Debug|x64.ActiveCfg = Debug|x64 {2CFEC79A-E39E-4FFD-ABC2-C4A69DD1E44D}.Debug|x64.Build.0 = Debug|x64 {2CFEC79A-E39E-4FFD-ABC2-C4A69DD1E44D}.Debug|x86.ActiveCfg = Debug|x86