diff options
author | George Hazan <george.hazan@gmail.com> | 2012-11-28 12:32:41 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2012-11-28 12:32:41 +0000 |
commit | 81dfe1bf71946f983584f6241d97046d5f897857 (patch) | |
tree | e68b18d3108ab3832fd6063a023d4326c9c4667e /src/core | |
parent | 2bce9eed3fa90110623a3fb5ef38cb7890420634 (diff) |
- removed borkred clutch for RecvChain;
- fixed problems with PROTOTYPE_VIRTUAL registration
- restored hMainThreadId variable in miranda32.exe
git-svn-id: http://svn.miranda-ng.org/main/trunk@2536 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/miranda.cpp | 2 | ||||
-rw-r--r-- | src/core/miranda.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/core/miranda.cpp b/src/core/miranda.cpp index 9f0da67b09..66a3ca8e80 100644 --- a/src/core/miranda.cpp +++ b/src/core/miranda.cpp @@ -85,6 +85,7 @@ static char *pszWaitServices[MAXIMUM_WAIT_OBJECTS-1]; static int waitObjectCount = 0;
HANDLE hMirandaShutdown;
HINSTANCE hInst;
+DWORD hMainThreadId;
int hLangpack = 0;
bool bModulesLoadedFired = false;
@@ -210,6 +211,7 @@ void CheckRestart() int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int)
{
hInst = hInstance;
+ hMainThreadId = GetCurrentThreadId();
CmdLine_Parse(cmdLine);
setlocale(LC_ALL, "");
diff --git a/src/core/miranda.h b/src/core/miranda.h index 49fbfa68ae..3cfaab2b76 100644 --- a/src/core/miranda.h +++ b/src/core/miranda.h @@ -132,6 +132,7 @@ void KillModuleSounds(int hLangpack); /**** miranda.cpp **********************************************************************/
extern HINSTANCE hInst;
+extern DWORD hMainThreadId;
extern HANDLE hOkToExitEvent, hModulesLoadedEvent, hevLoadModule, hevUnloadModule;
/**** newplugins.cpp *******************************************************************/
|