diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-08-02 19:48:45 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-08-02 19:48:45 +0000 |
| commit | 517ae9d0ea44732e39af40c290c116aec99420cd (patch) | |
| tree | f010848f9801b4779a3564ea2c20df7ffb78a51d /src/mir_core | |
| parent | 655324f9dab084d47263f7510288ee3938d7f2e4 (diff) | |
mir_ptr<> shall be initialized by NULL by default
git-svn-id: http://svn.miranda-ng.org/main/trunk@5554 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/mir_core')
| -rw-r--r-- | src/mir_core/modules.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mir_core/modules.cpp b/src/mir_core/modules.cpp index 853205ba01..bbbdfc2f61 100644 --- a/src/mir_core/modules.cpp +++ b/src/mir_core/modules.cpp @@ -262,13 +262,13 @@ MIR_CORE_DLL(int) NotifyEventHooks(HANDLE hEvent, WPARAM wParam, LPARAM lParam) if ( GetCurrentThreadId() == mainThreadId)
return CallHookSubscribers((THook*)hEvent, wParam, lParam);
- mir_ptr<THookToMainThreadItem> item;
- item->hDoneEvent = getThreadEvent();
- item->hook = (THook*)hEvent;
- item->wParam = wParam;
- item->lParam = lParam;
- QueueMainThread(HookToMainAPCFunc, item, item->hDoneEvent);
- return item->result;
+ THookToMainThreadItem item;
+ item.hDoneEvent = getThreadEvent();
+ item.hook = (THook*)hEvent;
+ item.wParam = wParam;
+ item.lParam = lParam;
+ QueueMainThread(HookToMainAPCFunc, &item, item.hDoneEvent);
+ return item.result;
}
MIR_CORE_DLL(int) NotifyFastHook(HANDLE hEvent, WPARAM wParam, LPARAM lParam)
@@ -551,13 +551,13 @@ MIR_CORE_DLL(INT_PTR) CallServiceSync(const char *name, WPARAM wParam, LPARAM lP if (GetCurrentThreadId() == mainThreadId)
return CallService(name, wParam, lParam);
- mir_ptr<TServiceToMainThreadItem> item;
- item->wParam = wParam;
- item->lParam = lParam;
- item->name = name;
- item->hDoneEvent = getThreadEvent();
- QueueMainThread(CallServiceToMainAPCFunc, item, item->hDoneEvent);
- return item->result;
+ TServiceToMainThreadItem item;
+ item.wParam = wParam;
+ item.lParam = lParam;
+ item.name = name;
+ item.hDoneEvent = getThreadEvent();
+ QueueMainThread(CallServiceToMainAPCFunc, &item, item.hDoneEvent);
+ return item.result;
}
MIR_CORE_DLL(int) CallFunctionAsync(void (__stdcall *func)(void *), void *arg)
|