diff options
| author | George Hazan <ghazan@miranda.im> | 2021-12-19 17:28:12 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-12-19 17:28:12 +0300 |
| commit | 0ea58a3f52fbebe2532e2b19a08b1a0422d7296e (patch) | |
| tree | 63cf880a33a8af1797cab24c7e3101d751e38ed6 /include | |
| parent | f37d8e059796ae661318656939d577198c67db3b (diff) | |
Windows API declarations isolated inside modules
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_fontservice.h | 4 | ||||
| -rw-r--r-- | include/m_hotkeys.h | 4 | ||||
| -rw-r--r-- | include/m_srmm_int.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/m_fontservice.h b/include/m_fontservice.h index d95642d3b5..61ac81df28 100644 --- a/include/m_fontservice.h +++ b/include/m_fontservice.h @@ -112,8 +112,8 @@ EXTERN_C MIR_APP_DLL(int) Font_RegisterW(FontIDW *pFont, HPLUGIN); // global default font is gotten using SPI_GETICONTITLELOGFONT, color COLOR_WINDOWTEXT, size 8.
// returns the font's colour
-EXTERN_C MIR_APP_DLL(COLORREF) Font_Get(const char *szGroup, const char *szName, struct LOGFONTA *pFont);
-EXTERN_C MIR_APP_DLL(COLORREF) Font_GetW(const wchar_t *wszGroup, const wchar_t *wszName, struct LOGFONTW *pFont);
+EXTERN_C MIR_APP_DLL(COLORREF) Font_Get(const char *szGroup, const char *szName, LOGFONTA *pFont);
+EXTERN_C MIR_APP_DLL(COLORREF) Font_GetW(const wchar_t *wszGroup, const wchar_t *wszName, LOGFONTW *pFont);
__forceinline COLORREF Font_Get(FontID &p, LOGFONTA *pFont)
{ return Font_Get(p.group, p.name, pFont);
diff --git a/include/m_hotkeys.h b/include/m_hotkeys.h index 6c6eea4c7a..712af60f15 100644 --- a/include/m_hotkeys.h +++ b/include/m_hotkeys.h @@ -64,7 +64,7 @@ EXTERN_C MIR_APP_DLL(int) Hotkey_Unregister(const char *pszName); // Checks if "manual" hotkey was activated and returns its id.
// Returns lParam associated with activated hotkey
-EXTERN_C MIR_APP_DLL(int) Hotkey_Check(struct MSG *pEvent, const char *pszSection);
+EXTERN_C MIR_APP_DLL(int) Hotkey_Check(MSG *pEvent, const char *pszSection);
/////////////////////////////////////////////////////////////////////////////////////////
// Subclasss/unsubclass edit box to act as hotkey control
@@ -84,7 +84,7 @@ EXTERN_C MIR_APP_DLL(void) Hotkey_Unsubclass(HWND hwndEdit); // This event is fired when hotkeys were changed
// wParam = lParam = 0
-#define ME_HOTKEYS_CHANGED "CoreHotkeys/Changed"
+#define ME_HOTKEYS_CHANGED "CoreHotkeys/Changed"
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h index 7dc1d9cb62..99369c026d 100644 --- a/include/m_srmm_int.h +++ b/include/m_srmm_int.h @@ -279,7 +279,7 @@ class CMsgDialog : public CSrmmBaseDialog {}; ///////////////////////////////////////////////////////////////////////////////////////// // receives LOGSTREAMDATA* as the first parameter -EXTERN_C MIR_APP_DLL(DWORD) CALLBACK Srmm_LogStreamCallback(UINT_PTR dwCookie, BYTE *pbBuff, LONG cb, LONG *pcb); +EXTERN_C MIR_APP_DLL(DWORD) CALLBACK Srmm_LogStreamCallback(DWORD_PTR dwCookie, BYTE *pbBuff, LONG cb, LONG *pcb); ///////////////////////////////////////////////////////////////////////////////////////// // sends a message to all SRMM windows |