Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 18:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various application fixes by Jan Roeloffzen, bug #5182, part 1

Browse source 
Notepad: remove unused variable, tabs -> spaces
Regedit: remove unused variable
Calc: dword->bool, remove unused variables, tabs -> spaces

svn path=/trunk/; revision=47458
This commit is contained in:
Gregor Schneider 2010-05-30 20:19:21 +00:00
parent d27f068a19
commit 63313191f0
4 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/base/applications/calc/utl.c
View file

@ -2,7 +2,6 @@
void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
{ {
TCHAR *ptr, *dst;
calc_number_t tmp; calc_number_t tmp;
int width; int width;
@ -21,9 +20,12 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
/* calculate the width of integer number */ /* calculate the width of integer number */
width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1; width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1;
if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH) if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH)
ptr = buffer + _stprintf(buffer, TEXT("%#e"), rpn->f); _stprintf(buffer, TEXT("%#e"), rpn->f);
else { else {
TCHAR *ptr, *dst;
ptr = buffer + _stprintf(buffer, TEXT("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f); ptr = buffer + _stprintf(buffer, TEXT("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
/* format sring ensures there is a '.': */
dst = _tcschr(buffer, TEXT('.')); dst = _tcschr(buffer, TEXT('.'));
while (--ptr > dst) while (--ptr > dst)
if (*ptr != TEXT('0')) if (*ptr != TEXT('0'))

54
reactos/base/applications/calc/winmain.c
View file

@ -861,18 +861,18 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0); n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0);
if (n == (DWORD)-1) if (n == (DWORD)-1)
return TRUE; return TRUE;
PostMessage(GetParent(hWnd), WM_LOAD_STAT, (WPARAM)n, 0); PostMessage(GetParent(hWnd), WM_LOAD_STAT, (WPARAM)n, 0);
return TRUE; return TRUE;
case IDC_BUTTON_CD: case IDC_BUTTON_CD:
n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0); n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0);
if (n == (DWORD)-1) if (n == (DWORD)-1)
return TRUE; return TRUE;
SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0); SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0);
update_n_stats_items(hWnd, buffer); update_n_stats_items(hWnd, buffer);
delete_stat_item(n); delete_stat_item(n);
return TRUE; return TRUE;
case IDC_BUTTON_CAD: case IDC_BUTTON_CAD:
SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0); SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0);
clean_stat_list(); clean_stat_list();
update_n_stats_items(hWnd, buffer); update_n_stats_items(hWnd, buffer);
return TRUE; return TRUE;
@ -910,20 +910,20 @@ static WPARAM idm_2_idc(int idm)
static void CopyMemToClipboard(void *ptr) static void CopyMemToClipboard(void *ptr)
{ {
if(OpenClipboard(NULL)) { if(OpenClipboard(NULL)) {
HGLOBAL clipbuffer; HGLOBAL clipbuffer;
TCHAR *buffer; TCHAR *buffer;
EmptyClipboard(); EmptyClipboard();
clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR)); clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR));
buffer = (TCHAR *)GlobalLock(clipbuffer); buffer = (TCHAR *)GlobalLock(clipbuffer);
_tcscpy(buffer, ptr); _tcscpy(buffer, ptr);
GlobalUnlock(clipbuffer); GlobalUnlock(clipbuffer);
#ifdef UNICODE #ifdef UNICODE
SetClipboardData(CF_UNICODETEXT,clipbuffer); SetClipboardData(CF_UNICODETEXT,clipbuffer);
#else #else
SetClipboardData(CF_TEXT,clipbuffer); SetClipboardData(CF_TEXT,clipbuffer);
#endif #endif
CloseClipboard(); CloseClipboard();
} }
} }
@ -942,16 +942,16 @@ static char *ReadClipboard(void)
char *buffer = NULL; char *buffer = NULL;
if (OpenClipboard(NULL)) { if (OpenClipboard(NULL)) {
HANDLE hData = GetClipboardData(CF_TEXT); HANDLE hData = GetClipboardData(CF_TEXT);
char *fromClipboard; char *fromClipboard;
if (hData != NULL) { if (hData != NULL) {
fromClipboard = (char *)GlobalLock(hData); fromClipboard = (char *)GlobalLock(hData);
if (strlen(fromClipboard)) if (strlen(fromClipboard))
buffer = _strupr(_strdup(fromClipboard)); buffer = _strupr(_strdup(fromClipboard));
GlobalUnlock( hData ); GlobalUnlock( hData );
} }
CloseClipboard(); CloseClipboard();
} }
return buffer; return buffer;
} }
@ -1110,20 +1110,20 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp)
{ {
TCHAR text[64]; TCHAR text[64];
HMENU hMenu = CreatePopupMenu(); HMENU hMenu = CreatePopupMenu();
DWORD idm; BOOL idm;
LoadString(calc.hInstance, IDS_QUICKHELP, text, SIZEOF(text)); LoadString(calc.hInstance, IDS_QUICKHELP, text, SIZEOF(text));
AppendMenu(hMenu, MF_STRING | MF_ENABLED, IDM_HELP_HELP, text); AppendMenu(hMenu, MF_STRING | MF_ENABLED, IDM_HELP_HELP, text);
idm = (DWORD)TrackPopupMenu(hMenu, idm = TrackPopupMenu( hMenu,
TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_RIGHTBUTTON, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_RIGHTBUTTON,
LOWORD(lp), LOWORD(lp),
HIWORD(lp), HIWORD(lp),
0, 0,
hWnd, hWnd,
NULL); NULL);
DestroyMenu(hMenu); DestroyMenu(hMenu);
#ifndef DISABLE_HTMLHELP_SUPPORT #ifndef DISABLE_HTMLHELP_SUPPORT
if (idm != 0) { if (idm) {
HH_POPUP popup; HH_POPUP popup;
memset(&popup, 0, sizeof(popup)); memset(&popup, 0, sizeof(popup));
@ -1139,6 +1139,8 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp)
popup.idString = GetWindowLongPtr((HWND)wp, GWL_ID); popup.idString = GetWindowLongPtr((HWND)wp, GWL_ID);
HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup); HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup);
} }
#else
(void)idm;
#endif #endif
} }

29
reactos/base/applications/notepad/dialog.c
View file

@ -400,7 +400,6 @@ static UINT_PTR CALLBACK DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wPar
{ {
TCHAR szText[128]; TCHAR szText[128];
HWND hCombo; HWND hCombo;
OFNOTIFY *pNotify;
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam);
@ -440,15 +439,13 @@ static UINT_PTR CALLBACK DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wPar
case WM_NOTIFY: case WM_NOTIFY:
if (((NMHDR *) lParam)->code == CDN_FILEOK) if (((NMHDR *) lParam)->code == CDN_FILEOK)
{ {
pNotify = (OFNOTIFY *) lParam;
hCombo = GetDlgItem(hDlg, ID_ENCODING); hCombo = GetDlgItem(hDlg, ID_ENCODING);
if (hCombo) if (hCombo)
Globals.iEncoding = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0); Globals.iEncoding = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0);
hCombo = GetDlgItem(hDlg, ID_EOLN); hCombo = GetDlgItem(hDlg, ID_EOLN);
if (hCombo) if (hCombo)
Globals.iEoln = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0); Globals.iEoln = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0);
} }
break; break;
} }
@ -808,11 +805,11 @@ static INT_PTR CALLBACK DIALOG_GoTo_DialogProc(HWND hwndDialog, UINT uMsg, WPARA
TCHAR szText[32]; TCHAR szText[32];
switch(uMsg) { switch(uMsg) {
case WM_INITDIALOG: case WM_INITDIALOG:
hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER); hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER);
_sntprintf(szText, SIZEOF(szText), _T("%d"), lParam); _sntprintf(szText, SIZEOF(szText), _T("%d"), lParam);
SetWindowText(hTextBox, szText); SetWindowText(hTextBox, szText);
break; break;
case WM_COMMAND: case WM_COMMAND:
if (HIWORD(wParam) == BN_CLICKED) if (HIWORD(wParam) == BN_CLICKED)
{ {
@ -823,11 +820,11 @@ static INT_PTR CALLBACK DIALOG_GoTo_DialogProc(HWND hwndDialog, UINT uMsg, WPARA
EndDialog(hwndDialog, _ttoi(szText)); EndDialog(hwndDialog, _ttoi(szText));
bResult = TRUE; bResult = TRUE;
} }
else if (LOWORD(wParam) == IDCANCEL) else if (LOWORD(wParam) == IDCANCEL)
{ {
EndDialog(hwndDialog, 0); EndDialog(hwndDialog, 0);
bResult = TRUE; bResult = TRUE;
} }
} }
break; break;
} }
@ -862,7 +859,7 @@ VOID DIALOG_GoTo(VOID)
Globals.hMainWnd, DIALOG_GoTo_DialogProc, nLine); Globals.hMainWnd, DIALOG_GoTo_DialogProc, nLine);
if (nLine >= 1) if (nLine >= 1)
{ {
for (i = 0; pszText[i] && (nLine > 1) && (i < nLength - 1); i++) for (i = 0; pszText[i] && (nLine > 1) && (i < nLength - 1); i++)
{ {
if (pszText[i] == '\n') if (pszText[i] == '\n')
@ -870,8 +867,8 @@ VOID DIALOG_GoTo(VOID)
} }
SendMessage(Globals.hEdit, EM_SETSEL, i, i); SendMessage(Globals.hEdit, EM_SETSEL, i, i);
SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0); SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0);
} }
HeapFree(GetProcessHeap(), 0, pszText); HeapFree(GetProcessHeap(), 0, pszText);
} }
VOID DIALOG_StatusBarUpdateCaretPos(VOID) VOID DIALOG_StatusBarUpdateCaretPos(VOID)

7
reactos/base/applications/regedit/edit.c
View file

@ -276,7 +276,6 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
{ {
WNDPROC oldproc; WNDPROC oldproc;
HWND hwndValue; HWND hwndValue;
int len;
TCHAR ValueString[32]; TCHAR ValueString[32];
LPTSTR Remainder; LPTSTR Remainder;
DWORD Base; DWORD Base;
@ -319,7 +318,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
dwordEditMode = EDIT_MODE_HEX; dwordEditMode = EDIT_MODE_HEX;
if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA))) if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
{ {
if ((len = GetWindowTextLength(hwndValue))) if (GetWindowTextLength(hwndValue))
{ {
if (GetWindowText(hwndValue, ValueString, 32)) if (GetWindowText(hwndValue, ValueString, 32))
{ {
@ -339,7 +338,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
dwordEditMode = EDIT_MODE_DEC; dwordEditMode = EDIT_MODE_DEC;
if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA))) if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
{ {
if ((len = GetWindowTextLength(hwndValue))) if (GetWindowTextLength(hwndValue))
{ {
if (GetWindowText(hwndValue, ValueString, 32)) if (GetWindowText(hwndValue, ValueString, 32))
{ {
@ -356,7 +355,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
case IDOK: case IDOK:
if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA))) if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
{ {
if ((len = GetWindowTextLength(hwndValue))) if (GetWindowTextLength(hwndValue))
{ {
if (!GetWindowText(hwndValue, ValueString, 32)) if (!GetWindowText(hwndValue, ValueString, 32))
{ {