diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/m_core.h | 2 | ||||
-rw-r--r-- | include/m_system.h | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/m_core.h b/include/m_core.h index e1f1efdb13..2ec8c006df 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -110,7 +110,7 @@ typedef INT_PTR (*MIRANDASERVICEOBJPARAM)(void*, WPARAM, LPARAM, LPARAM); MIR_CORE_DLL(HANDLE) CreateHookableEvent(const char *name); MIR_CORE_DLL(int) DestroyHookableEvent(HANDLE hEvent); MIR_CORE_DLL(int) SetHookDefaultForHookableEvent(HANDLE hEvent, MIRANDAHOOK pfnHook); -MIR_CORE_DLL(int) CallPluginEventHook(HINSTANCE hInst, HANDLE hEvent, WPARAM wParam = 0, LPARAM lParam = 0); +MIR_CORE_DLL(int) CallPluginEventHook(HINSTANCE hInst, const char *pszEvent, WPARAM wParam = 0, LPARAM lParam = 0); MIR_CORE_DLL(int) CallObjectEventHook(void *pObject, HANDLE hEvent, WPARAM wParam = 0, LPARAM lParam = 0); MIR_CORE_DLL(int) NotifyEventHooks(HANDLE hEvent, WPARAM wParam = 0, LPARAM lParam = 0); MIR_CORE_DLL(int) NotifyFastHook(HANDLE hEvent, WPARAM wParam = 0, LPARAM lParam = 0); diff --git a/include/m_system.h b/include/m_system.h index 1f7f134d65..b2abca8722 100644 --- a/include/m_system.h +++ b/include/m_system.h @@ -98,8 +98,8 @@ EXTERN_C MIR_APP_DLL(class CDlgBase *) Miranda_GetSystemWindow(); typedef void (CALLBACK *MWaitableStub)(void); typedef void (CALLBACK *MWaitableStubEx)(void*); -EXTERN_C MIR_APP_DLL(void) Miranda_WaitOnHandle(MWaitableStub pFunc, HANDLE hEvent = nullptr); -EXTERN_C MIR_APP_DLL(void) Miranda_WaitOnHandleEx(MWaitableStubEx pFunc, void *pInfo); +EXTERN_C MIR_CORE_DLL(void) Miranda_WaitOnHandle(MWaitableStub pFunc, HANDLE hEvent = nullptr); +EXTERN_C MIR_CORE_DLL(void) Miranda_WaitOnHandleEx(MWaitableStubEx pFunc, void *pInfo); // wParam = 0 (ignored) // lParam = 0 (ignored) @@ -110,7 +110,10 @@ EXTERN_C MIR_APP_DLL(void) Miranda_WaitOnHandleEx(MWaitableStubEx pFunc, void *p #define ME_SYSTEM_PRESHUTDOWN "Miranda/System/PShutdown" // Returns true when Miranda has got WM_QUIT and is in the process of shutting down -EXTERN_C MIR_APP_DLL(bool) Miranda_IsTerminated(void); +EXTERN_C MIR_CORE_DLL(bool) Miranda_IsTerminated(void); + +// Enables termination flag +EXTERN_C MIR_CORE_DLL(void) Miranda_SetTerminated(void); // Check if everyone is happy to exit // if everyone acknowleges OK to exit then returns true, otherwise false @@ -121,7 +124,7 @@ EXTERN_C MIR_APP_DLL(bool) Miranda_OkToExit(void); EXTERN_C MIR_APP_DLL(void) Miranda_Close(void); // returns the last window tick where a monitored event was seen, currently WM_CHAR/WM_MOUSEMOVE -EXTERN_C MIR_APP_DLL(uint32_t) Miranda_GetIdle(void); +EXTERN_C MIR_CORE_DLL(uint32_t) Miranda_GetIdle(void); /////////////////////////////////////////////////////////////////////////////// |