diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2012-10-16 20:13:24 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2012-10-16 20:13:24 +0000 |
| commit | 0e622404fe197f1ecf1c0f1857bff0b5be58b0b1 (patch) | |
| tree | f49079f4cdfa40ac0240668e2941f3ca2039d5e7 | |
| parent | e13fe448e3a006957227b2de1d39ad9d50274566 (diff) | |
skypekit added to resurces
git-svn-id: http://svn.miranda-ng.org/main/trunk@1966 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/Skype/res/Resource.rc | 1 | ||||
| -rw-r--r-- | protocols/Skype/src/resource.h | 3 | ||||
| -rw-r--r-- | protocols/Skype/src/skype.cpp | 13 |
3 files changed, 13 insertions, 4 deletions
diff --git a/protocols/Skype/res/Resource.rc b/protocols/Skype/res/Resource.rc index 7c8cab1b8a..dddf5e9d91 100644 --- a/protocols/Skype/res/Resource.rc +++ b/protocols/Skype/res/Resource.rc @@ -74,6 +74,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON ICON "Main.ico"
+IDR_RUNTIME BIN "..\\..\\..\\..\\SkypeKit\\SDK\\bin\\windows-x86\\windows-x86-skypekit.exe"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/protocols/Skype/src/resource.h b/protocols/Skype/src/resource.h index 5c008dcaec..99d4d7670d 100644 --- a/protocols/Skype/src/resource.h +++ b/protocols/Skype/src/resource.h @@ -5,6 +5,7 @@ #define IDD_SKYPEACCOUNT 9
#define IDD_OPTIONS 10
#define IDI_ICON 101
+#define IDR_RUNTIME 102
#define IDD_PASSWORDREQUEST 105
#define IDC_SN 1001
#define IDC_PW 1002
@@ -18,7 +19,7 @@ //
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_RESOURCE_VALUE 103
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1004
#define _APS_NEXT_SYMED_VALUE 101
diff --git a/protocols/Skype/src/skype.cpp b/protocols/Skype/src/skype.cpp index d6eb5dd95a..0256f767e0 100644 --- a/protocols/Skype/src/skype.cpp +++ b/protocols/Skype/src/skype.cpp @@ -69,7 +69,7 @@ int LoadKeyPair() return 0;
}
-void StartSkypeRuntime()
+int StartSkypeRuntime()
{
// loading skype runtime
// shitcode
@@ -104,7 +104,7 @@ void StartSkypeRuntime() mir_sntprintf(param, SIZEOF(param), L"-p -p %d", port);
- CreateProcess(
+ int startingrt = CreateProcess(
runtimePath,
param,
NULL,
@@ -115,12 +115,19 @@ void StartSkypeRuntime() NULL,
&cif,
&pi);
+ return startingrt;
+
+ /*HRSRC hrsrc = FindResource(g_hInstance, MAKEINTRESOURCE(IDR_RUNTIME), _T("BIN"));
+ DWORD cb = SizeofResource(g_hInstance, hrsrc);
+ */
+
}
extern "C" int __declspec(dllexport) Load(void)
{
LoadKeyPair();
- StartSkypeRuntime();
+ if (!StartSkypeRuntime())
+ return 1;
g_skype = new CSkype();
g_skype->init(keyBuf, "127.0.0.1", port);
|