diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-26 21:40:50 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-26 21:40:50 +0300 |
| commit | 1019387a8f6ccc087a113f138c5237146492a356 (patch) | |
| tree | 50ef616016686e43ae119333ebac88bc90b2ff11 /protocols | |
| parent | d61bc49d53578c26b50531fdec1bbd633e19b6ac (diff) | |
fixes #1527 (Remove obsolete g_hMainThread and QueueUSerAPC from plugins)
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/IcqOscarJ/src/utilities.cpp | 6 | ||||
| -rw-r--r-- | protocols/Sametime/src/sametime_session.cpp | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp index d94cb53319..05d3358153 100644 --- a/protocols/IcqOscarJ/src/utilities.cpp +++ b/protocols/IcqOscarJ/src/utilities.cpp @@ -1322,9 +1322,11 @@ DWORD ICQWaitForSingleObject(HANDLE hObject, DWORD dwMilliseconds, int bWaitAlwa {
DWORD dwResult;
- do { // will get WAIT_IO_COMPLETION for QueueUserAPC(), ignore it unless terminating
+ // will get WAIT_IO_COMPLETION for QueueUserAPC(), ignore it unless terminating
+ do {
dwResult = WaitForSingleObjectEx(hObject, dwMilliseconds, TRUE);
- } while (dwResult == WAIT_IO_COMPLETION && (bWaitAlways || !Miranda_IsTerminated()));
+ }
+ while (dwResult == WAIT_IO_COMPLETION && (bWaitAlways || !Miranda_IsTerminated()));
return dwResult;
}
diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index 686f5e889d..287d2794d8 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -331,16 +331,6 @@ void CSametimeProto::SetSessionAwayMessage(int status, const wchar_t* msgT) SetSessionStatus(status); // update current away message
}
-static VOID CALLBACK NullAPC(DWORD_PTR)
-{
- // This function intentionally left blank
-}
-
-void WakeThread(HANDLE hThread)
-{
- QueueUserAPC(NullAPC, hThread, 0);
-}
-
void __cdecl CSametimeProto::KeepAliveThread(void*)
{
int i = 120;
|