regedit: Use BOOL type where appropriate (try 2)
Frédéric Delanoy
frederic.delanoy at gmail.com
Wed Oct 16 05:29:22 CDT 2013
try 2: Avoid changing SendMessage calls
---
programs/regedit/edit.c | 14 +++++++-------
programs/regedit/framewnd.c | 32 ++++++++++++++++----------------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c
index e211ff8..f9ed631 100644
--- a/programs/regedit/edit.c
+++ b/programs/regedit/edit.c
@@ -128,7 +128,7 @@ static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName);
SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, stringValueData);
CheckRadioButton(hwndDlg, IDC_DWORD_HEX, IDC_DWORD_DEC, isDecimal ? IDC_DWORD_DEC : IDC_DWORD_HEX);
- return TRUE;
+ return 1;
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDC_DWORD_HEX:
@@ -149,10 +149,10 @@ static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
/* Fall through */
case IDCANCEL:
EndDialog(hwndDlg, wParam);
- return TRUE;
+ return 1;
}
}
- return FALSE;
+ return 0;
}
static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -171,7 +171,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara
else
SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName);
SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData);
- return TRUE;
+ return 1;
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
@@ -194,13 +194,13 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara
error_code_messagebox(hwndDlg, lRet);
EndDialog(hwndDlg, 0);
}
- return TRUE;
+ return 1;
case IDCANCEL:
EndDialog(hwndDlg, 0);
- return TRUE;
+ return 1;
}
}
- return FALSE;
+ return 0;
}
static BOOL check_value(HWND hwnd, HKEY hKey, LPCWSTR valueName)
diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c
index 2e28670..e56adcf 100644
--- a/programs/regedit/framewnd.c
+++ b/programs/regedit/framewnd.c
@@ -508,13 +508,13 @@ static INT_PTR CALLBACK find_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPA
CheckDlgButton(hwndDlg, IDC_FIND_WHOLE, searchMask&SEARCH_WHOLE ? BST_CHECKED : BST_UNCHECKED);
SendMessageW(hwndValue, EM_SETLIMITTEXT, 127, 0);
SetWindowTextW(hwndValue, searchString);
- return TRUE;
+ return 1;
case WM_COMMAND:
switch(LOWORD(wParam)) {
case IDC_VALUE_NAME:
if (HIWORD(wParam) == EN_UPDATE) {
EnableWindow(GetDlgItem(hwndDlg, IDOK), GetWindowTextLengthW(hwndValue)>0);
- return TRUE;
+ return 1;
}
break;
case IDOK:
@@ -528,14 +528,14 @@ static INT_PTR CALLBACK find_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPA
GetWindowTextW(hwndValue, searchString, 128);
EndDialog(hwndDlg, IDOK);
}
- return TRUE;
+ return 1;
case IDCANCEL:
EndDialog(hwndDlg, IDCANCEL);
- return TRUE;
+ return 1;
}
break;
}
- return FALSE;
+ return 0;
}
static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -554,14 +554,14 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w
SetWindowTextW(hwndValue, ItemPath);
SendMessageW(hwndValue, EM_SETLIMITTEXT, 127, 0);
HeapFree(GetProcessHeap(), 0, ItemPath);
- return TRUE;
+ return 1;
}
case WM_COMMAND:
switch(LOWORD(wParam)) {
case IDC_VALUE_NAME:
if (HIWORD(wParam) == EN_UPDATE) {
EnableWindow(GetDlgItem(hwndDlg, IDOK), GetWindowTextLengthW(hwndValue) > 0);
- return TRUE;
+ return 1;
}
break;
case IDOK:
@@ -569,14 +569,14 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w
GetWindowTextW(hwndValue, favoriteName, 128);
EndDialog(hwndDlg, IDOK);
}
- return TRUE;
+ return 1;
case IDCANCEL:
EndDialog(hwndDlg, IDCANCEL);
- return TRUE;
+ return 1;
}
break;
}
- return FALSE;
+ return 0;
}
static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -608,7 +608,7 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w
RegCloseKey(hKey);
}
else
- return FALSE;
+ return 0;
EnableWindow(GetDlgItem(hwndDlg, IDOK), i != 0);
SendMessageW(hwndList, LB_SETCURSEL, 0, 0);
return TRUE;
@@ -618,7 +618,7 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w
case IDC_NAME_LIST:
if (HIWORD(wParam) == LBN_SELCHANGE) {
EnableWindow(GetDlgItem(hwndDlg, IDOK), lParam != -1);
- return TRUE;
+ return 1;
}
break;
case IDOK: {
@@ -633,17 +633,17 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w
EndDialog(hwndDlg, IDOK);
HeapFree(GetProcessHeap(), 0, lpName);
}
- return TRUE;
+ return 1;
}
case IDCANCEL:
EndDialog(hwndDlg, IDCANCEL);
- return TRUE;
+ return 1;
}
break;
}
- return FALSE;
+ return 0;
}
-
+
/*******************************************************************************
*
* FUNCTION: _CmdWndProc(HWND, unsigned, WORD, LONG)
--
1.8.4
More information about the wine-patches
mailing list