| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 Eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 return _Module.UnregisterServer(TRUE); | 111 return _Module.UnregisterServer(TRUE); |
| 112 } | 112 } |
| 113 | 113 |
| 114 void InitPlugin(bool isInstall) | 114 void InitPlugin(bool isInstall) |
| 115 { | 115 { |
| 116 CPluginSettings* settings = CPluginSettings::GetInstance(); | 116 CPluginSettings* settings = CPluginSettings::GetInstance(); |
| 117 | 117 |
| 118 if (isInstall) | 118 if (isInstall) |
| 119 { | 119 { |
| 120 DEBUG_GENERAL( | 120 DEBUG_GENERAL( |
| 121 L"========================================================================
========\nINSTALLER " + | 121 L"========================================================================
========\n" |
| 122 CString(IEPLUGIN_VERSION) + | 122 L"INSTALLER " IEPLUGIN_VERSION L"\n" |
| 123 L"\n======================================================================
==========") | 123 L"========================================================================
========") |
| 124 } | 124 } |
| 125 else | 125 else |
| 126 { | 126 { |
| 127 DEBUG_GENERAL( | 127 DEBUG_GENERAL( |
| 128 L"========================================================================
========\nUPDATER " + | 128 L"========================================================================
========\n" |
| 129 CString(IEPLUGIN_VERSION) + | 129 L"UPDATER " IEPLUGIN_VERSION L"\n" |
| 130 L"\n======================================================================
==========") | 130 L"========================================================================
========") |
| 131 } | 131 } |
| 132 | 132 |
| 133 // Post async plugin error | 133 // Post async plugin error |
| 134 CPluginError pluginError; | 134 CPluginError pluginError; |
| 135 while (LogQueue::PopFirstPluginError(pluginError)) | 135 while (LogQueue::PopFirstPluginError(pluginError)) |
| 136 { | 136 { |
| 137 LogQueue::LogPluginError(pluginError.GetErrorCode(), pluginError.GetErrorId(
), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, pluginE
rror.GetProcessId(), pluginError.GetThreadId()); | 137 LogQueue::LogPluginError(pluginError.GetErrorCode(), pluginError.GetErrorId(
), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, pluginE
rror.GetProcessId(), pluginError.GetThreadId()); |
| 138 } | 138 } |
| 139 } | 139 } |
| 140 | 140 |
| 141 // Called from installer | 141 // Called from installer |
| 142 EXTERN_C void STDAPICALLTYPE OnInstall(MSIHANDLE hInstall, MSIHANDLE tmp) | 142 EXTERN_C void STDAPICALLTYPE OnInstall(MSIHANDLE hInstall, MSIHANDLE tmp) |
| 143 { | 143 { |
| 144 InitPlugin(true); | 144 InitPlugin(true); |
| 145 } | 145 } |
| 146 | 146 |
| 147 // Called from updater | 147 // Called from updater |
| 148 EXTERN_C void STDAPICALLTYPE OnUpdate(void) | 148 EXTERN_C void STDAPICALLTYPE OnUpdate(void) |
| 149 { | 149 { |
| 150 InitPlugin(false); | 150 InitPlugin(false); |
| 151 } | 151 } |
| OLD | NEW |