| OLD | NEW |
| 1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" |
| 2 | 2 |
| 3 #include "PluginIniFile.h" | 3 #include "PluginIniFile.h" |
| 4 #include "PluginChecksum.h" | 4 #include "PluginChecksum.h" |
| 5 #include "PluginHttpRequest.h" | 5 #include "PluginHttpRequest.h" |
| 6 #include "PluginClient.h" | 6 #include "PluginClient.h" |
| 7 #include "PluginSettings.h" | 7 #include "PluginSettings.h" |
| 8 #include "PluginSystem.h" | 8 #include "PluginSystem.h" |
| 9 #include "config.h" | 9 #include "config.h" |
| 10 | 10 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 { | 73 { |
| 74 } | 74 } |
| 75 | 75 |
| 76 | 76 |
| 77 void CPluginHttpRequest::AddPluginId() | 77 void CPluginHttpRequest::AddPluginId() |
| 78 { | 78 { |
| 79 CPluginSettings* settings = CPluginSettings::GetInstance(); | 79 CPluginSettings* settings = CPluginSettings::GetInstance(); |
| 80 | 80 |
| 81 CPluginSystem* system = CPluginSystem::GetInstance(); | 81 CPluginSystem* system = CPluginSystem::GetInstance(); |
| 82 | 82 |
| 83 if (settings->Has(SETTING_PLUGIN_ID)) | |
| 84 { | |
| 85 Add("plugin", settings->GetString(SETTING_PLUGIN_ID)); | |
| 86 } | |
| 87 else | |
| 88 { | |
| 89 Add("plugin", system->GetPluginId()); | |
| 90 } | |
| 91 Add("user", settings->GetString(SETTING_USER_ID)); | |
| 92 Add("password", settings->GetString(SETTING_PLUGIN_PASSWORD)); | |
| 93 | |
| 94 Add("version", IEPLUGIN_VERSION); | 83 Add("version", IEPLUGIN_VERSION); |
| 95 | |
| 96 #ifdef ENTERPRISE | |
| 97 // Add("installerid", INSTALLER_ID); | |
| 98 #endif | |
| 99 } | 84 } |
| 100 | 85 |
| 101 void CPluginHttpRequest::AddOsInfo() | 86 void CPluginHttpRequest::AddOsInfo() |
| 102 { | 87 { |
| 103 DWORD osVersion = ::GetVersion(); | 88 DWORD osVersion = ::GetVersion(); |
| 104 | 89 |
| 105 Add("os1", (LOBYTE(LOWORD(osVersion)))); | 90 Add("os1", (LOBYTE(LOWORD(osVersion)))); |
| 106 Add("os2", (HIBYTE(LOWORD(osVersion)))); | 91 Add("os2", (HIBYTE(LOWORD(osVersion)))); |
| 107 } | 92 } |
| 108 | 93 |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 // Free the memory allocated to the buffer. | 465 // Free the memory allocated to the buffer. |
| 481 } | 466 } |
| 482 | 467 |
| 483 outBuffer.ReleaseBuffer(); | 468 outBuffer.ReleaseBuffer(); |
| 484 | 469 |
| 485 } while (dwSize > 0); | 470 } while (dwSize > 0); |
| 486 } | 471 } |
| 487 | 472 |
| 488 return bResult; | 473 return bResult; |
| 489 } | 474 } |
| OLD | NEW |