Author: hbelusca
Date: Fri Mar 11 22:12:44 2016
New Revision: 70993
URL:
http://svn.reactos.org/svn/reactos?rev=70993&view=rev
Log:
[SHELL32]: Few SendMessageA -> SendMessageW conversions, and whitespace fixes.
Modified:
trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp
Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Fri Mar 11 22:12:44
2016
@@ -84,7 +84,7 @@
int count;
int index;
- count = SendMessage(hDlgCtrl, LB_GETCOUNT, 0, 0);
+ count = SendMessageW(hDlgCtrl, LB_GETCOUNT, 0, 0);
if (count == LB_ERR)
return;
@@ -101,8 +101,8 @@
LPARAM lParam
)
{
- LPMEASUREITEMSTRUCT lpmis;
- LPDRAWITEMSTRUCT lpdis;
+ LPMEASUREITEMSTRUCT lpmis;
+ LPDRAWITEMSTRUCT lpdis;
HICON hIcon;
INT index, count;
WCHAR szText[MAX_PATH], szTitle[100], szFilter[100];
@@ -123,7 +123,7 @@
else
SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName);
- count = SendMessage(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0);
+ count = SendMessageW(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0);
if (count != LB_ERR)
{
if (count > pIconContext->Index)
@@ -189,22 +189,22 @@
}
break;
case WM_MEASUREITEM:
- lpmis = (LPMEASUREITEMSTRUCT) lParam;
+ lpmis = (LPMEASUREITEMSTRUCT) lParam;
lpmis->itemHeight = 32;
lpmis->itemWidth = 64;
- return TRUE;
- case WM_DRAWITEM:
- lpdis = (LPDRAWITEMSTRUCT) lParam;
- if (lpdis->itemID == (UINT)-1)
- {
- break;
- }
- switch (lpdis->itemAction)
- {
- case ODA_SELECT:
+ return TRUE;
+ case WM_DRAWITEM:
+ lpdis = (LPDRAWITEMSTRUCT) lParam;
+ if (lpdis->itemID == (UINT)-1)
+ {
+ break;
+ }
+ switch (lpdis->itemAction)
+ {
+ case ODA_SELECT:
case ODA_DRAWENTIRE:
index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0);
- hIcon =(HICON)SendMessage(lpdis->hwndItem, LB_GETITEMDATA,
lpdis->itemID, (LPARAM) 0);
+ hIcon = (HICON)SendMessageW(lpdis->hwndItem, LB_GETITEMDATA,
lpdis->itemID, 0);
if (lpdis->itemID == (UINT)index)
{
@@ -448,7 +448,7 @@
{
HeapFree(GetProcessHeap(), 0, psz);
HeapFree(GetProcessHeap(), 0, parent);
- SendMessageA (htxt, CB_SETEDITSEL, 0, MAKELPARAM (0,
-1));
+ SendMessageW(htxt, CB_SETEDITSEL, 0, MAKELPARAM (0,
-1));
return TRUE;
}
@@ -499,9 +499,9 @@
if (ofnProc(&ofn))
{
- SetFocus (GetDlgItem (hwnd, IDOK));
- SetWindowTextW (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH),
szFName);
- SendMessageW (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH),
CB_SETEDITSEL, 0, MAKELPARAM (0, -1));
+ SetFocus(GetDlgItem (hwnd, IDOK));
+ SetWindowTextW(GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), szFName);
+ SendMessageW(GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH),
CB_SETEDITSEL, 0, MAKELPARAM (0, -1));
EnableOkButtonFromEditContents(hwnd);
SetFocus (GetDlgItem (hwnd, IDOK));
}
@@ -780,7 +780,7 @@
* exported by ordinal
*/
/*
- * TODO:
+ * TODO:
* - Implement the ability to show either the Welcome Screen or the classic dialog boxes
based upon the
* registry value: SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\LogonType.
*/