diff options
Diffstat (limited to 'protocols/Steam/src')
-rw-r--r-- | protocols/Steam/src/stdafx.cxx (renamed from protocols/Steam/src/stdafx.cpp) | 4 | ||||
-rw-r--r-- | protocols/Steam/src/stdafx.h (renamed from protocols/Steam/src/common.h) | 0 | ||||
-rw-r--r-- | protocols/Steam/src/steam_account.cpp | 2 | ||||
-rw-r--r-- | protocols/Steam/src/steam_avatars.cpp | 2 | ||||
-rw-r--r-- | protocols/Steam/src/steam_contacts.cpp | 2 | ||||
-rw-r--r-- | protocols/Steam/src/steam_dialogs.cpp | 2 | ||||
-rw-r--r-- | protocols/Steam/src/steam_events.cpp | 2 | ||||
-rw-r--r-- | protocols/Steam/src/steam_instances.cpp | 2 | ||||
-rw-r--r-- | protocols/Steam/src/steam_menus.cpp | 2 | ||||
-rw-r--r-- | protocols/Steam/src/steam_messages.cpp | 2 | ||||
-rw-r--r-- | protocols/Steam/src/steam_pooling.cpp | 2 | ||||
-rw-r--r-- | protocols/Steam/src/steam_proto.cpp | 2 | ||||
-rw-r--r-- | protocols/Steam/src/steam_queue.cpp | 2 | ||||
-rw-r--r-- | protocols/Steam/src/steam_utils.cpp | 6 | ||||
-rw-r--r-- | protocols/Steam/src/steam_xstatus.cpp | 6 |
15 files changed, 20 insertions, 18 deletions
diff --git a/protocols/Steam/src/stdafx.cpp b/protocols/Steam/src/stdafx.cxx index 7c6793d8cb..6fe8317684 100644 --- a/protocols/Steam/src/stdafx.cpp +++ b/protocols/Steam/src/stdafx.cxx @@ -1,4 +1,4 @@ -#include "common.h"
+#include "stdafx.h"
int hLangpack;
HINSTANCE g_hInstance;
@@ -27,7 +27,7 @@ DWORD WINAPI DllMain(HINSTANCE hInstance, DWORD, LPVOID) return TRUE;
}
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
{
return &pluginInfo;
}
diff --git a/protocols/Steam/src/common.h b/protocols/Steam/src/stdafx.h index d39881dbd2..d39881dbd2 100644 --- a/protocols/Steam/src/common.h +++ b/protocols/Steam/src/stdafx.h diff --git a/protocols/Steam/src/steam_account.cpp b/protocols/Steam/src/steam_account.cpp index 9ea391ad95..a01bc51e38 100644 --- a/protocols/Steam/src/steam_account.cpp +++ b/protocols/Steam/src/steam_account.cpp @@ -1,4 +1,4 @@ -#include "common.h"
+#include "stdafx.h"
bool CSteamProto::IsOnline()
{
diff --git a/protocols/Steam/src/steam_avatars.cpp b/protocols/Steam/src/steam_avatars.cpp index b0d2cb0bbc..ec2694b878 100644 --- a/protocols/Steam/src/steam_avatars.cpp +++ b/protocols/Steam/src/steam_avatars.cpp @@ -1,4 +1,4 @@ -#include "common.h"
+#include "stdafx.h"
TCHAR* CSteamProto::GetAvatarFilePath(MCONTACT hContact)
{
diff --git a/protocols/Steam/src/steam_contacts.cpp b/protocols/Steam/src/steam_contacts.cpp index 8fca50265a..64c98467de 100644 --- a/protocols/Steam/src/steam_contacts.cpp +++ b/protocols/Steam/src/steam_contacts.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" void CSteamProto::SetContactStatus(MCONTACT hContact, WORD status) { diff --git a/protocols/Steam/src/steam_dialogs.cpp b/protocols/Steam/src/steam_dialogs.cpp index c071c7cc84..e75d1a913f 100644 --- a/protocols/Steam/src/steam_dialogs.cpp +++ b/protocols/Steam/src/steam_dialogs.cpp @@ -1,4 +1,4 @@ -#include "common.h"
+#include "stdafx.h"
CSteamPasswordEditor::CSteamPasswordEditor(CSteamProto *proto) :
CSuper(proto, IDD_PASSWORD_EDITOR, false), m_ok(this, IDOK),
diff --git a/protocols/Steam/src/steam_events.cpp b/protocols/Steam/src/steam_events.cpp index 2da994ebfc..ee4669ca5b 100644 --- a/protocols/Steam/src/steam_events.cpp +++ b/protocols/Steam/src/steam_events.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" int CSteamProto::OnModulesLoaded(WPARAM, LPARAM) { diff --git a/protocols/Steam/src/steam_instances.cpp b/protocols/Steam/src/steam_instances.cpp index 82b62f9654..c2113d3c6c 100644 --- a/protocols/Steam/src/steam_instances.cpp +++ b/protocols/Steam/src/steam_instances.cpp @@ -1,4 +1,4 @@ -#include "common.h"
+#include "stdafx.h"
int CSteamProto::CompareProtos(const CSteamProto *p1, const CSteamProto *p2)
{
diff --git a/protocols/Steam/src/steam_menus.cpp b/protocols/Steam/src/steam_menus.cpp index 4ec5f32339..b4507db158 100644 --- a/protocols/Steam/src/steam_menus.cpp +++ b/protocols/Steam/src/steam_menus.cpp @@ -1,4 +1,4 @@ -#include "common.h"
+#include "stdafx.h"
HANDLE CSteamProto::hChooserMenu;
HGENMENU CSteamProto::contactMenuItems[CMI_MAX];
diff --git a/protocols/Steam/src/steam_messages.cpp b/protocols/Steam/src/steam_messages.cpp index f2f2c51c8a..48f59b0ce6 100644 --- a/protocols/Steam/src/steam_messages.cpp +++ b/protocols/Steam/src/steam_messages.cpp @@ -1,4 +1,4 @@ -#include "common.h"
+#include "stdafx.h"
//void CSteamProto::SendTypingThread(void *arg)
//{
diff --git a/protocols/Steam/src/steam_pooling.cpp b/protocols/Steam/src/steam_pooling.cpp index 1bf9f8314e..e1dcb1ff28 100644 --- a/protocols/Steam/src/steam_pooling.cpp +++ b/protocols/Steam/src/steam_pooling.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" #define POLLING_ERRORS_LIMIT 3 diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp index d144abd8f5..1b005a628d 100644 --- a/protocols/Steam/src/steam_proto.cpp +++ b/protocols/Steam/src/steam_proto.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" CSteamProto::CSteamProto(const char* protoName, const TCHAR* userName) : PROTO<CSteamProto>(protoName, userName), diff --git a/protocols/Steam/src/steam_queue.cpp b/protocols/Steam/src/steam_queue.cpp index d0bd54ad61..dd51f4caee 100644 --- a/protocols/Steam/src/steam_queue.cpp +++ b/protocols/Steam/src/steam_queue.cpp @@ -1,4 +1,4 @@ -#include "common.h"
+#include "stdafx.h"
void CSteamProto::InitQueue()
{
diff --git a/protocols/Steam/src/steam_utils.cpp b/protocols/Steam/src/steam_utils.cpp index 40fd27d888..ea924eac86 100644 --- a/protocols/Steam/src/steam_utils.cpp +++ b/protocols/Steam/src/steam_utils.cpp @@ -1,4 +1,6 @@ -#include "common.h"
+#include "stdafx.h"
+
+#pragma comment(lib, "crypt32.lib")
WORD CSteamProto::SteamToMirandaStatus(int state)
{
@@ -116,7 +118,7 @@ int CSteamProto::RsaEncrypt(const char *pszModulus, const char *data, BYTE *encr goto exit;
}
- DWORD dataSize = strlen(data);
+ DWORD dataSize = (DWORD)strlen(data);
// if data is not allocated just renurn size
if (encryptedData == NULL)
diff --git a/protocols/Steam/src/steam_xstatus.cpp b/protocols/Steam/src/steam_xstatus.cpp index ca20df452a..eee37f824a 100644 --- a/protocols/Steam/src/steam_xstatus.cpp +++ b/protocols/Steam/src/steam_xstatus.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "stdafx.h" #define STATUS_TITLE_MAX 64 #define STATUS_DESC_MAX 250 @@ -6,7 +6,7 @@ static std::vector<int> xstatusIconsValid; static std::map<int, int> xstatusIcons; -int OnReloadIcons(WPARAM wParam, LPARAM lParam) +int OnReloadIcons(WPARAM, LPARAM) { xstatusIconsValid.clear(); return 0; @@ -113,7 +113,7 @@ INT_PTR CSteamProto::OnGetXStatusIcon(WPARAM wParam, LPARAM lParam) return (INT_PTR)GetXStatusIcon(wParam, lParam); } -INT_PTR CSteamProto::OnRequestAdvStatusIconIdx(WPARAM wParam, LPARAM lParam) +INT_PTR CSteamProto::OnRequestAdvStatusIconIdx(WPARAM wParam, LPARAM) { int status = GetContactXStatus(wParam); if (status) |