Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 14:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSCONFIG_NEW]: Explicitely use unicode APIs.

Browse source 
svn path=/trunk/; revision=70726
This commit is contained in:
Hermès Bélusca-Maïto 2016-02-13 12:58:41 +00:00
parent f79fbfbb61
commit 92cc24aefe
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/applications/msconfig_new/msconfig.c
View file

@ -190,8 +190,8 @@ int CALLBACK PropSheetCallback(HWND hDlg, UINT message, LPARAM lParam)
/* Set the dialog icons */ /* Set the dialog icons */
hIcon = (HICON)LoadImageW(hInst, MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); hIcon = (HICON)LoadImageW(hInst, MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE);
hIconSm = (HICON)CopyImage(hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_COPYFROMRESOURCE); hIconSm = (HICON)CopyImage(hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_COPYFROMRESOURCE);
SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); SendMessageW(hDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon);
SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); SendMessageW(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm);
/* Sub-class the property sheet window procedure */ /* Sub-class the property sheet window procedure */
wpOrigEditProc = (WNDPROC)SetWindowLongPtr(hDlg, DWLP_DLGPROC, (LONG_PTR)MainWndProc); wpOrigEditProc = (WNDPROC)SetWindowLongPtr(hDlg, DWLP_DLGPROC, (LONG_PTR)MainWndProc);

10
reactos/base/applications/msconfig_new/startuppage.c
View file

@ -32,9 +32,9 @@ StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
hStartupListCtrl = GetDlgItem(hDlg, IDC_STARTUP_LIST); hStartupListCtrl = GetDlgItem(hDlg, IDC_STARTUP_LIST);
hStartupDialog = hDlg; hStartupDialog = hDlg;
dwStyle = (DWORD) SendMessage(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); dwStyle = (DWORD)SendMessageW(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0);
dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES;
SendMessage(hStartupListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); SendMessageW(hStartupListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle);
SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
@ -131,7 +131,7 @@ GetDisabledAutostartEntriesFromRegistry (TCHAR * szBasePath)
{ {
GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); GetLongPathName(Data, Data, (DWORD) _tcsclen(Data));
item.pszText = Data; item.pszText = Data;
SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); SendMessageW(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
} }
} }
} }
@ -184,7 +184,7 @@ GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName )
GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); GetLongPathName(Data, Data, (DWORD) _tcsclen(Data));
item.pszText = Data; item.pszText = Data;
item.iSubItem = 1; item.iSubItem = 1;
SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); SendMessageW(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
} }
switch (PtrToLong(hRootKey)) switch (PtrToLong(hRootKey))
@ -202,7 +202,7 @@ GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName )
_tcscat(Path, KeyName); _tcscat(Path, KeyName);
item.pszText = Path; item.pszText = Path;
item.iSubItem = 2; item.iSubItem = 2;
SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); SendMessageW(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
} }
HeapFree(GetProcessHeap(), 0, Data); HeapFree(GetProcessHeap(), 0, Data);
} }