diff options
| author | George Hazan <ghazan@miranda.im> | 2021-12-26 20:31:39 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-12-26 20:31:39 +0300 |
| commit | cddcd7483a7c472598af098e759e5d309024f606 (patch) | |
| tree | b0a227d6e087c41958cc84d27bc323353248aae5 /plugins/MsgPopup/src | |
| parent | 1039b2829a264280493ba0fa979214fe024dc70c (diff) | |
DWORD -> uint32_t
Diffstat (limited to 'plugins/MsgPopup/src')
| -rw-r--r-- | plugins/MsgPopup/src/main.cpp | 7 | ||||
| -rw-r--r-- | plugins/MsgPopup/src/options.cpp | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/plugins/MsgPopup/src/main.cpp b/plugins/MsgPopup/src/main.cpp index bad9fed4d3..6f30cf7dae 100644 --- a/plugins/MsgPopup/src/main.cpp +++ b/plugins/MsgPopup/src/main.cpp @@ -133,10 +133,9 @@ void HookOnImport(HMODULE hModule, char *lpszImpModName, PVOID lpOrigFunc, PVOID if (*ppfn != lpOrigFunc)
continue;
- DWORD oldProtect;
-
g_mod++;
+ DWORD oldProtect;
if (!VirtualProtect((LPVOID)ppfn, sizeof(void*), PAGE_EXECUTE_READWRITE, &oldProtect)) {
if (!g_HookError)
g_HookError = TRUE;
@@ -201,10 +200,10 @@ void LoadConfig() mir_snprintf(szNameTO, "TO%d", indx);
options.FG[indx] = g_plugin.getDword(szNameFG, optionsDefault.FG[indx]);
options.BG[indx] = g_plugin.getDword(szNameBG, optionsDefault.BG[indx]);
- options.Timeout[indx] = g_plugin.getDword(szNameTO, (DWORD)optionsDefault.Timeout[indx]);
+ options.Timeout[indx] = g_plugin.getDword(szNameTO, (uint32_t)optionsDefault.Timeout[indx]);
}
- options.Sound = g_plugin.getByte("Sound", (DWORD)optionsDefault.Sound);
+ options.Sound = g_plugin.getByte("Sound", (uint32_t)optionsDefault.Sound);
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/MsgPopup/src/options.cpp b/plugins/MsgPopup/src/options.cpp index 1c42fc6734..3e8cdfd0fa 100644 --- a/plugins/MsgPopup/src/options.cpp +++ b/plugins/MsgPopup/src/options.cpp @@ -28,7 +28,7 @@ int idOptionControls[4][3] = { IDC_QUESTION_FG, IDC_QUESTION_BG, IDC_TIMEOUT4
};
-static int __inline DBWriteContactSettingDwordDef(MCONTACT hContact, const char *szModule, const char *szSetting, DWORD val, DWORD defValue)
+static int __inline DBWriteContactSettingDwordDef(MCONTACT hContact, const char *szModule, const char *szSetting, uint32_t val, uint32_t defValue)
{
if (val == db_get_dw(hContact, szModule, szSetting, defValue))
return 0;
@@ -78,7 +78,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l if (HIWORD(wParam) != EN_CHANGE) return FALSE;
if ((HWND)lParam != GetFocus()) return FALSE;
- value = (DWORD)GetDlgItemInt(hWnd, LOWORD(wParam), &Translated, TRUE);
+ value = (uint32_t)GetDlgItemInt(hWnd, LOWORD(wParam), &Translated, TRUE);
if (Translated)
options.Timeout[indx] = value;
}
@@ -105,7 +105,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l DBWriteContactSettingDwordDef(0, MODULENAME, szNameFG, options.FG[indx], optionsDefault.FG[indx]);
DBWriteContactSettingDwordDef(0, MODULENAME, szNameBG, options.BG[indx], optionsDefault.BG[indx]);
- DBWriteContactSettingDwordDef(0, MODULENAME, szNameTO, options.Timeout[indx], (DWORD)optionsDefault.Timeout[indx]);
+ DBWriteContactSettingDwordDef(0, MODULENAME, szNameTO, options.Timeout[indx], (uint32_t)optionsDefault.Timeout[indx]);
}
DBWriteContactSettingDwordDef(0, MODULENAME, "Sound", options.Sound, optionsDefault.Sound);
|