mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
- Removed support for using Rainmeter.dll as Litestep module
- Merged Rainmeter.dll and Rainmeter.exe - Language resource file now located in \Language\<LanguageName>.dll - Build.bat now automatically builds and packages all languages
This commit is contained in:
@ -65,7 +65,6 @@ typedef std::map<UINT, MeasureInfo*> MeasureIdMap; // measure ID -> MeasureInfo
|
||||
static MeasureIdMap sMeasures;
|
||||
typedef std::map<FolderInfo*, UINT> FolderInfoMap; // FolderInfo -> ref count
|
||||
static FolderInfoMap sFolderRefCount;
|
||||
static bool sInitialized = false;
|
||||
|
||||
static MeasureInfo* GetMeasureInfo(UINT aId)
|
||||
{
|
||||
@ -109,10 +108,6 @@ static FolderInfo* GetFolderInfo(const wchar_t* aPath, const wchar_t* aIniPath)
|
||||
*/
|
||||
UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
|
||||
{
|
||||
if (!sInitialized) {
|
||||
sInitialized = true;
|
||||
}
|
||||
|
||||
MeasureInfo* measureInfo = new MeasureInfo(section);
|
||||
|
||||
const wchar_t* strFolder = ReadConfigString(section, L"Folder", L"");
|
||||
@ -136,17 +131,17 @@ UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
|
||||
}
|
||||
|
||||
const wchar_t* strIncludeSubFolders = ReadConfigString(section, L"IncludeSubFolders", L"");
|
||||
if (_wcsicmp(strIncludeSubFolders, L"1") == 0) {
|
||||
if (wcscmp(strIncludeSubFolders, L"1") == 0) {
|
||||
measureInfo->Folder->IncludeSubFolders(true);
|
||||
}
|
||||
|
||||
const wchar_t* strShowHiddenFiles = ReadConfigString(section, L"IncludeHiddenFiles", L"");
|
||||
if (_wcsicmp(strShowHiddenFiles, L"1") == 0) {
|
||||
if (wcscmp(strShowHiddenFiles, L"1") == 0) {
|
||||
measureInfo->Folder->IncludeHiddenFiles(true);
|
||||
}
|
||||
|
||||
const wchar_t* strShowSystemFiles = ReadConfigString(section, L"IncludeSystemFiles", L"");
|
||||
if (_wcsicmp(strShowSystemFiles, L"1") == 0) {
|
||||
if (wcscmp(strShowSystemFiles, L"1") == 0) {
|
||||
measureInfo->Folder->IncludeSystemFiles(true);
|
||||
}
|
||||
|
||||
@ -176,15 +171,17 @@ double Update2(UINT id)
|
||||
|
||||
switch (measureInfo->Type)
|
||||
{
|
||||
case INFOTYPE_FOLDERSIZE:
|
||||
return (double)measureInfo->Folder->GetSize();
|
||||
break;
|
||||
case INFOTYPE_FILECOUNT:
|
||||
return measureInfo->Folder->GetFileCount();
|
||||
break;
|
||||
case INFOTYPE_FOLDERCOUNT:
|
||||
return measureInfo->Folder->GetFolderCount();
|
||||
break;
|
||||
case INFOTYPE_FOLDERSIZE:
|
||||
return (double)measureInfo->Folder->GetSize();
|
||||
break;
|
||||
|
||||
case INFOTYPE_FILECOUNT:
|
||||
return measureInfo->Folder->GetFileCount();
|
||||
break;
|
||||
|
||||
case INFOTYPE_FOLDERCOUNT:
|
||||
return measureInfo->Folder->GetFolderCount();
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -119,6 +119,7 @@
|
||||
<ProgramDatabaseFile>.\x32/Debug/FolderInfo.pdb</ProgramDatabaseFile>
|
||||
<ImportLibrary>.\x32/Debug/FolderInfo.lib</ImportLibrary>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
@ -158,6 +159,7 @@
|
||||
<ProgramDatabaseFile>.\x64/Debug/FolderInfo.pdb</ProgramDatabaseFile>
|
||||
<ImportLibrary>.\x64/Debug/FolderInfo.lib</ImportLibrary>
|
||||
<TargetMachine>MachineX64</TargetMachine>
|
||||
<AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
@ -173,7 +175,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
@ -196,7 +198,7 @@
|
||||
<AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>../../TestBench/x32/Release/Plugins/FolderInfo.dll</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>.\x32/Release/FolderInfo.pdb</ProgramDatabaseFile>
|
||||
<ImportLibrary>.\x32/Release/FolderInfo.lib</ImportLibrary>
|
||||
@ -220,7 +222,7 @@
|
||||
<AdditionalOptions>/GL %(AdditionalOptions)</AdditionalOptions>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
@ -242,7 +244,7 @@
|
||||
<AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>../../TestBench/x64/Release/Plugins/FolderInfo.dll</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<ProgramDatabaseFile>.\x64/Release/FolderInfo.pdb</ProgramDatabaseFile>
|
||||
<ImportLibrary>.\x64/Release/FolderInfo.lib</ImportLibrary>
|
||||
<TargetMachine>MachineX64</TargetMachine>
|
||||
|
Reference in New Issue
Block a user