| OLD | NEW |
| 1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" |
| 2 | 2 |
| 3 #include <ctime> | 3 #include <ctime> |
| 4 | 4 |
| 5 #include "PluginClass.h" | 5 #include "PluginClass.h" |
| 6 #include "PluginDictionary.h" | |
| 7 #include "PluginSettings.h" | 6 #include "PluginSettings.h" |
| 8 #include "PluginSystem.h" | 7 #include "PluginSystem.h" |
| 9 #include "PluginConfiguration.h" | 8 #include "PluginConfiguration.h" |
| 10 #ifdef SUPPORT_FILTER | 9 #ifdef SUPPORT_FILTER |
| 11 #include "PluginFilter.h" | 10 #include "PluginFilter.h" |
| 12 #endif | 11 #endif |
| 13 #ifdef SUPPORT_CONFIG | 12 #ifdef SUPPORT_CONFIG |
| 14 #include "PluginConfig.h" | 13 #include "PluginConfig.h" |
| 15 #endif | 14 #endif |
| 16 #include "PluginMimeFilterClient.h" | 15 #include "PluginMimeFilterClient.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 | 76 |
| 78 debugText += L"\n=============================================================
==================="; | 77 debugText += L"\n=============================================================
==================="; |
| 79 | 78 |
| 80 DEBUG_GENERAL(debugText) | 79 DEBUG_GENERAL(debugText) |
| 81 | 80 |
| 82 HANDLE hMainThread = GetMainThreadHandle(); | 81 HANDLE hMainThread = GetMainThreadHandle(); |
| 83 | 82 |
| 84 CPluginClient* client = CPluginClient::GetInstance(); | 83 CPluginClient* client = CPluginClient::GetInstance(); |
| 85 client->SetLocalization(); | 84 client->SetLocalization(); |
| 86 | 85 |
| 87 CPluginDictionary::GetInstance(); | |
| 88 | |
| 89 DWORD nNextUserTimerBase = GetTickCount() / TIMER_INTERVAL_USER_REGISTRATION +
1; | 86 DWORD nNextUserTimerBase = GetTickCount() / TIMER_INTERVAL_USER_REGISTRATION +
1; |
| 90 DWORD nUserTimerBaseStep = 1; | 87 DWORD nUserTimerBaseStep = 1; |
| 91 | 88 |
| 92 bool isConfigutationLoaded = false; | 89 bool isConfigutationLoaded = false; |
| 93 | 90 |
| 94 std::auto_ptr<CPluginConfiguration> configuration = std::auto_ptr<CPluginConfi
guration>(new CPluginConfiguration); | 91 std::auto_ptr<CPluginConfiguration> configuration = std::auto_ptr<CPluginConfi
guration>(new CPluginConfiguration); |
| 95 | 92 |
| 96 // -------------------------------------------------------------------- | 93 // -------------------------------------------------------------------- |
| 97 // Welcome / Info page | 94 // Welcome / Info page |
| 98 // -------------------------------------------------------------------- | 95 // -------------------------------------------------------------------- |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 bool isDone = false; | 259 bool isDone = false; |
| 263 | 260 |
| 264 s_criticalSectionLocal.Lock(); | 261 s_criticalSectionLocal.Lock(); |
| 265 { | 262 { |
| 266 isDone = s_isMainThreadDone || mainThread != s_hMainThread; | 263 isDone = s_isMainThreadDone || mainThread != s_hMainThread; |
| 267 } | 264 } |
| 268 s_criticalSectionLocal.Unlock(); | 265 s_criticalSectionLocal.Unlock(); |
| 269 | 266 |
| 270 return isDone; | 267 return isDone; |
| 271 } | 268 } |
| OLD | NEW |