Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 30297: Many more conversions to Unicode function and type names for taskmgr
by cfinck＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: cfinck Date: Fri Nov 9 18:26:02 2007 New Revision: 30297 URL: http://svn.reactos.org/svn/reactos?rev=30297&view=rev Log: Many more conversions to Unicode function and type names for taskmgr Modified: trunk/reactos/base/applications/taskmgr/about.c trunk/reactos/base/applications/taskmgr/affinity.c trunk/reactos/base/applications/taskmgr/applpage.c trunk/reactos/base/applications/taskmgr/column.c trunk/reactos/base/applications/taskmgr/dbgchnl.c trunk/reactos/base/applications/taskmgr/debug.c trunk/reactos/base/applications/taskmgr/endproc.c trunk/reactos/base/applications/taskmgr/graph.c trunk/reactos/base/applications/taskmgr/graphctl.c trunk/reactos/base/applications/taskmgr/optnmenu.c trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/perfpage.c trunk/reactos/base/applications/taskmgr/priority.c trunk/reactos/base/applications/taskmgr/proclist.c trunk/reactos/base/applications/taskmgr/procpage.c trunk/reactos/base/applications/taskmgr/run.c trunk/reactos/base/applications/taskmgr/taskmgr.c trunk/reactos/base/applications/taskmgr/trayicon.c Modified: trunk/reactos/base/applications/taskmgr/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/about.c (original) +++ trunk/reactos/base/applications/taskmgr/about.c Fri Nov 9 18:26:02 2007 @@ -26,7 +26,7 @@ void OnAbout(void) { - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hMainWnd, AboutDialogWndProc); + DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_ABOUTBOX), hMainWnd, AboutDialogWndProc); } INT_PTR CALLBACK @@ -41,9 +41,9 @@ hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); - LoadString(hInst, IDS_LICENSE, strLicense, 0x1000); + LoadStringW(hInst, IDS_LICENSE, strLicense, 0x1000); - SetWindowText(hLicenseEditWnd, strLicense); + SetWindowTextW(hLicenseEditWnd, strLicense); return TRUE; Modified: trunk/reactos/base/applications/taskmgr/affinity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/affinity.c (original) +++ trunk/reactos/base/applications/taskmgr/affinity.c Fri Nov 9 18:26:02 2007 @@ -62,11 +62,11 @@ hProcessAffinityHandle = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION, FALSE, dwProcessId); if (!hProcessAffinityHandle) { GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(WCHAR)); - LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(WCHAR)); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(WCHAR)); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } - DialogBox(hInst, MAKEINTRESOURCE(IDD_AFFINITY_DIALOG), hMainWnd, AffinityDialogWndProc); + DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_AFFINITY_DIALOG), hMainWnd, AffinityDialogWndProc); if (hProcessAffinityHandle) { CloseHandle(hProcessAffinityHandle); hProcessAffinityHandle = NULL; @@ -91,8 +91,8 @@ if (!GetProcessAffinityMask(hProcessAffinityHandle, &dwProcessAffinityMask, &dwSystemAffinityMask)) { GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(WCHAR)); EndDialog(hDlg, 0); - LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(WCHAR)); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(WCHAR)); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } for (nCpu=0; nCpu<sizeof(dwCpuTable) / sizeof(dwCpuTable[0]); nCpu++) { @@ -106,7 +106,7 @@ * has affinity with */ if (dwProcessAffinityMask & (1 << nCpu)) - SendMessage(GetDlgItem(hDlg, dwCpuTable[nCpu]), BM_SETCHECK, BST_CHECKED, 0); + SendMessageW(GetDlgItem(hDlg, dwCpuTable[nCpu]), BM_SETCHECK, BST_CHECKED, 0); } return TRUE; @@ -132,7 +132,7 @@ * First we have to create a mask out of each * checkbox that the user checked. */ - if (SendMessage(GetDlgItem(hDlg, dwCpuTable[nCpu]), BM_GETCHECK, 0, 0)) + if (SendMessageW(GetDlgItem(hDlg, dwCpuTable[nCpu]), BM_GETCHECK, 0, 0)) dwProcessAffinityMask |= (1 << nCpu); } @@ -143,9 +143,9 @@ * of it's cpu time. */ if (!dwProcessAffinityMask) { - LoadString(hInst, IDS_MSG_PROCESSONEPRO, szTemp, sizeof(szTemp) / sizeof(WCHAR)); - LoadString(hInst, IDS_MSG_INVALIDOPTION, szTempA, sizeof(szTempA) / sizeof(WCHAR)); - MessageBox(hDlg, szTemp, szTempA, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_PROCESSONEPRO, szTemp, sizeof(szTemp) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_MSG_INVALIDOPTION, szTempA, sizeof(szTempA) / sizeof(WCHAR)); + MessageBoxW(hDlg, szTemp, szTempA, MB_OK|MB_ICONSTOP); return TRUE; } @@ -155,8 +155,8 @@ if (!SetProcessAffinityMask(hProcessAffinityHandle, dwProcessAffinityMask)) { GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(WCHAR)); EndDialog(hDlg, LOWORD(wParam)); - LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(WCHAR)); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(WCHAR)); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } EndDialog(hDlg, LOWORD(wParam)); Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c Fri Nov 9 18:26:02 2007 @@ -85,17 +85,17 @@ hApplicationPageSwitchToButton = GetDlgItem(hDlg, IDC_SWITCHTO); hApplicationPageNewTaskButton = GetDlgItem(hDlg, IDC_NEWTASK); - SetWindowText(hApplicationPageListCtrl, L"Tasks"); + SetWindowTextW(hApplicationPageListCtrl, L"Tasks"); /* Initialize the application page's controls */ column.mask = LVCF_TEXT|LVCF_WIDTH; - LoadString(hInst, IDS_TAB_TASK, szTemp, 256); + LoadStringW(hInst, IDS_TAB_TASK, szTemp, 256); column.pszText = szTemp; column.cx = 250; (void)ListView_InsertColumn(hApplicationPageListCtrl, 0, &column); /* Add the "Task" column */ column.mask = LVCF_TEXT|LVCF_WIDTH; - LoadString(hInst, IDS_TAB_STATUS, szTemp, 256); + LoadStringW(hInst, IDS_TAB_STATUS, szTemp, 256); column.pszText = szTemp; column.cx = 95; (void)ListView_InsertColumn(hApplicationPageListCtrl, 1, &column); /* Add the "Status" column */ @@ -129,7 +129,7 @@ ApplicationPage_OnSwitchTo(); break; case IDC_NEWTASK: - SendMessage(hMainWnd, WM_COMMAND, MAKEWPARAM(ID_FILE_NEW, 0), 0); + SendMessageW(hMainWnd, WM_COMMAND, MAKEWPARAM(ID_FILE_NEW, 0), 0); break; } @@ -194,7 +194,7 @@ void UpdateApplicationListControlViewSetting(void) { - DWORD dwStyle = GetWindowLong(hApplicationPageListCtrl, GWL_STYLE); + DWORD dwStyle = GetWindowLongW(hApplicationPageListCtrl, GWL_STYLE); dwStyle &= ~LVS_REPORT; dwStyle &= ~LVS_ICON; @@ -208,7 +208,7 @@ else dwStyle |= LVS_REPORT; - SetWindowLong(hApplicationPageListCtrl, GWL_STYLE, dwStyle); + SetWindowLongW(hApplicationPageListCtrl, GWL_STYLE, dwStyle); RefreshApplicationPage(); } @@ -216,7 +216,7 @@ DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter) { /* Create the event */ - hApplicationPageEvent = CreateEvent(NULL, TRUE, TRUE, NULL); + hApplicationPageEvent = CreateEventW(NULL, TRUE, TRUE, NULL); /* If we couldn't create the event then exit the thread */ if (!hApplicationPageEvent) @@ -267,36 +267,36 @@ bLargeIcon = TaskManagerSettings.View_LargeIcons ? TRUE : FALSE; - GetWindowText(hWnd, szText, 260); /* Get the window text */ + GetWindowTextW(hWnd, szText, 260); /* Get the window text */ /* Check and see if this is a top-level app window */ if ((wcslen(szText) <= 0) || !IsWindowVisible(hWnd) || (GetParent(hWnd) != NULL) || (GetWindow(hWnd, GW_OWNER) != NULL) || - (GetWindowLong(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) + (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) { return TRUE; /* Skip this window */ } /* Get the icon for this window */ hIcon = NULL; - SendMessageTimeout(hWnd, WM_GETICON,bLargeIcon ? ICON_BIG /*1*/ : ICON_SMALL /*0*/, 0, 0, 1000, (PDWORD_PTR)xhIcon); + SendMessageTimeoutW(hWnd, WM_GETICON,bLargeIcon ? ICON_BIG /*1*/ : ICON_SMALL /*0*/, 0, 0, 1000, (PDWORD_PTR)xhIcon); if (!hIcon) { - hIcon = (HICON)(LONG_PTR)GetClassLongPtr(hWnd, bLargeIcon ? GCL_HICON : GCL_HICONSM); - if (!hIcon) hIcon = (HICON)(LONG_PTR)GetClassLongPtr(hWnd, bLargeIcon ? GCL_HICONSM : GCL_HICON); - if (!hIcon) SendMessageTimeout(hWnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)xhIcon); - if (!hIcon) SendMessageTimeout(hWnd, WM_GETICON, bLargeIcon ? ICON_SMALL /*0*/ : ICON_BIG /*1*/, 0, 0, 1000, (PDWORD_PTR)xhIcon); + hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICON : GCL_HICONSM); + if (!hIcon) hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICONSM : GCL_HICON); + if (!hIcon) SendMessageTimeoutW(hWnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)xhIcon); + if (!hIcon) SendMessageTimeoutW(hWnd, WM_GETICON, bLargeIcon ? ICON_SMALL /*0*/ : ICON_BIG /*1*/, 0, 0, 1000, (PDWORD_PTR)xhIcon); } if (!hIcon) - hIcon = LoadIcon(hInst, bLargeIcon ? MAKEINTRESOURCE(IDI_WINDOW) : MAKEINTRESOURCE(IDI_WINDOWSM)); + hIcon = LoadIconW(hInst, bLargeIcon ? MAKEINTRESOURCEW(IDI_WINDOW) : MAKEINTRESOURCEW(IDI_WINDOWSM)); bHung = FALSE; - IsHungAppWindow = (IsHungAppWindowProc)(FARPROC)GetProcAddress(GetModuleHandle(L"USER32.DLL"), "IsHungAppWindow"); + IsHungAppWindow = (IsHungAppWindowProc)(FARPROC)GetProcAddress(GetModuleHandleW(L"USER32.DLL"), "IsHungAppWindow"); if (IsHungAppWindow) bHung = IsHungAppWindow(hWnd); @@ -343,7 +343,7 @@ { /* Check to see if anything needs updating */ if ((pAPLI->hIcon != hIcon) || - (wcsicmp(pAPLI->szTitle, szTitle) != 0) || + (_wcsicmp(pAPLI->szTitle, szTitle) != 0) || (pAPLI->bHung != bHung)) { /* Update the structure */ @@ -397,7 +397,7 @@ !IsWindowVisible(pAPLI->hWnd) || (GetParent(pAPLI->hWnd) != NULL) || (GetWindow(pAPLI->hWnd, GW_OWNER) != NULL) || - (GetWindowLong(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) + (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) { ImageList_Remove(hImageListLarge, item.iItem); ImageList_Remove(hImageListSmall, item.iItem); @@ -520,12 +520,12 @@ { if (pAPLI->bHung) { - LoadString( GetModuleHandle(NULL), IDS_Not_Responding , szMsg, sizeof(szMsg) / sizeof(szMsg[0])); + LoadStringW( GetModuleHandleW(NULL), IDS_Not_Responding , szMsg, sizeof(szMsg) / sizeof(szMsg[0])); wcsncpy(pnmdi->item.pszText, szMsg, pnmdi->item.cchTextMax); } else { - LoadString( GetModuleHandle(NULL), IDS_Running, (LPTSTR) szMsg, sizeof(szMsg) / sizeof(szMsg[0])); + LoadStringW( GetModuleHandleW(NULL), IDS_Running, (LPWSTR) szMsg, sizeof(szMsg) / sizeof(szMsg[0])); wcsncpy(pnmdi->item.pszText, szMsg, pnmdi->item.cchTextMax); } } @@ -588,7 +588,7 @@ GetCursorPos(&pt); - hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_APPLICATION_PAGE_CONTEXT1)); + hMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_APPLICATION_PAGE_CONTEXT1)); hSubMenu = GetSubMenu(hMenu, 0); if (TaskManagerSettings.View_LargeIcons) @@ -611,7 +611,7 @@ GetCursorPos(&pt); - hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_APPLICATION_PAGE_CONTEXT2)); + hMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_APPLICATION_PAGE_CONTEXT2)); hSubMenu = GetSubMenu(hMenu, 0); if (ListView_GetSelectedCount(hApplicationPageListCtrl) == 1) @@ -876,7 +876,7 @@ typedef void (WINAPI *PROCSWITCHTOTHISWINDOW) (HWND, BOOL); PROCSWITCHTOTHISWINDOW SwitchToThisWindow; - HMODULE hUser32 = GetModuleHandle(L"USER32"); + HMODULE hUser32 = GetModuleHandleW(L"USER32"); SwitchToThisWindow = (PROCSWITCHTOTHISWINDOW)GetProcAddress(hUser32, "SwitchToThisWindow"); if (SwitchToThisWindow) { SwitchToThisWindow(pAPLI->hWnd, TRUE); @@ -906,7 +906,7 @@ if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI) { - PostMessage(pAPLI->hWnd, WM_CLOSE, 0, 0); + PostMessageW(pAPLI->hWnd, WM_CLOSE, 0, 0); } } } Modified: trunk/reactos/base/applications/taskmgr/column.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/column.c (original) +++ trunk/reactos/base/applications/taskmgr/column.c Fri Nov 9 18:26:02 2007 @@ -57,7 +57,7 @@ DECLARE_COLUMN_PRESET(IOOTHERBYTES, 70, FALSE) }; -int InsertColumn(int nCol, LPCTSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); +int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); INT_PTR CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); void AddColumns(void) @@ -68,23 +68,23 @@ for (n=0; n<COLUMN_NMAX; n++) { if (TaskManagerSettings.Columns[n]) { - LoadString(hInst, ColumnPresets[n].dwIdsName, szTemp, sizeof(szTemp)/sizeof(WCHAR)); + LoadStringW(hInst, ColumnPresets[n].dwIdsName, szTemp, sizeof(szTemp)/sizeof(WCHAR)); InsertColumn(n, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[n], -1); } } - size = SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); - SendMessage(hProcessPageHeaderCtrl, HDM_SETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); + size = SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); + SendMessageW(hProcessPageHeaderCtrl, HDM_SETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); UpdateColumnDataHints(); } -int InsertColumn(int nCol, LPCTSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem) +int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem) { LVCOLUMN column; column.mask = LVCF_TEXT|LVCF_FMT; - column.pszText = (LPTSTR)lpszColumnHeading; + column.pszText = (LPWSTR)lpszColumnHeading; column.fmt = nFormat; if (nWidth != -1) @@ -117,22 +117,22 @@ } /* Get header order */ - size = SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); - SendMessage(hProcessPageHeaderCtrl, HDM_GETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); + size = SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); + SendMessageW(hProcessPageHeaderCtrl, HDM_GETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); /* Get visible columns */ - for (i=0; i<SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); i++) { + for (i=0; i<SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); i++) { memset(&hditem, 0, sizeof(HDITEM)); hditem.mask = HDI_TEXT|HDI_WIDTH; hditem.pszText = text; hditem.cchTextMax = 260; - SendMessage(hProcessPageHeaderCtrl, HDM_GETITEM, i, (LPARAM) &hditem); + SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEM, i, (LPARAM) &hditem); for (n=0; n<COLUMN_NMAX; n++) { - LoadString(hInst, ColumnPresets[n].dwIdsName, szTemp, sizeof(szTemp)/sizeof(WCHAR)); - if (wcsicmp(text, szTemp) == 0) + LoadStringW(hInst, ColumnPresets[n].dwIdsName, szTemp, sizeof(szTemp)/sizeof(WCHAR)); + if (_wcsicmp(text, szTemp) == 0) { TaskManagerSettings.Columns[n] = TRUE; TaskManagerSettings.ColumnSizeArray[n] = hditem.cxy; @@ -145,7 +145,7 @@ { int i; - if (DialogBox(hInst, MAKEINTRESOURCE(IDD_COLUMNS_DIALOG), hMainWnd, ColumnsDialogWndProc) == IDOK) + if (DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_COLUMNS_DIALOG), hMainWnd, ColumnsDialogWndProc) == IDOK) { for (i=Header_GetItemCount(hProcessPageHeaderCtrl)-1; i>=0; i--) { @@ -172,7 +172,7 @@ for (i=0; i<COLUMN_NMAX; i++) { if (TaskManagerSettings.Columns[i]) - SendMessage(GetDlgItem(hDlg, ColumnPresets[i].dwIdcCtrl), BM_SETCHECK, BST_CHECKED, 0); + SendMessageW(GetDlgItem(hDlg, ColumnPresets[i].dwIdcCtrl), BM_SETCHECK, BST_CHECKED, 0); } return TRUE; @@ -187,7 +187,7 @@ if (LOWORD(wParam) == IDOK) { for (i=0; i<COLUMN_NMAX; i++) - TaskManagerSettings.Columns[i] = (BOOL) SendMessage(GetDlgItem(hDlg, ColumnPresets[i].dwIdcCtrl), BM_GETCHECK, 0, 0); + TaskManagerSettings.Columns[i] = (BOOL) SendMessageW(GetDlgItem(hDlg, ColumnPresets[i].dwIdcCtrl), BM_GETCHECK, 0, 0); EndDialog(hDlg, LOWORD(wParam)); return TRUE; @@ -207,7 +207,7 @@ WCHAR szTemp[256]; unsigned int i; - for (Index=0; Index<(ULONG)SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); Index++) + for (Index=0; Index<(ULONG)SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); Index++) { memset(&hditem, 0, sizeof(HDITEM)); @@ -215,11 +215,11 @@ hditem.pszText = text; hditem.cchTextMax = 260; - SendMessage(hProcessPageHeaderCtrl, HDM_GETITEM, Index, (LPARAM) &hditem); + SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEM, Index, (LPARAM) &hditem); for (i=0; i<COLUMN_NMAX; i++) { - LoadString(hInst, ColumnPresets[i].dwIdsName, szTemp, sizeof(szTemp)/sizeof(WCHAR)); - if (wcsicmp(text, szTemp) == 0) + LoadStringW(hInst, ColumnPresets[i].dwIdsName, szTemp, sizeof(szTemp)/sizeof(WCHAR)); + if (_wcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = i; } } Modified: trunk/reactos/base/applications/taskmgr/dbgchnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/dbgchnl.c (original) +++ trunk/reactos/base/applications/taskmgr/dbgchnl.c Fri Nov 9 18:26:02 2007 @@ -96,7 +96,7 @@ struct cce_user { - LPCTSTR name; /* channel to look for */ + LPCWSTR name; /* channel to look for */ unsigned value, mask; /* how to change channel */ unsigned done; /* number of successful changes */ unsigned notdone; /* number of unsuccessful changes */ @@ -292,9 +292,9 @@ hProcess = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_READ, FALSE, get_selected_pid()); if (!hProcess) return; /* FIXME messagebox */ - SendMessage(hChannelLV, WM_SETREDRAW, FALSE, 0); + SendMessageW(hChannelLV, WM_SETREDRAW, FALSE, 0); enum_channel(hProcess, list_channel_CB, (void*)hChannelLV, TRUE); - SendMessage(hChannelLV, WM_SETREDRAW, TRUE, 0); + SendMessageW(hChannelLV, WM_SETREDRAW, TRUE, 0); CloseHandle(hProcess); } @@ -354,7 +354,7 @@ if (!hProcess) return; /* FIXME message box */ lhti.pt = nmia->ptAction; hChannelLV = GetDlgItem(hDlg, IDC_DEBUG_CHANNELS_LIST); - SendMessage(hChannelLV, LVM_SUBITEMHITTEST, 0, (LPARAM)&lhti); + SendMessageW(hChannelLV, LVM_SUBITEMHITTEST, 0, (LPARAM)&lhti); if (nmia->iSubItem >= 1 && nmia->iSubItem <= 4) { WCHAR val[2]; @@ -405,5 +405,5 @@ void ProcessPage_OnDebugChannels(void) { - DialogBox(hInst, (LPCTSTR)IDD_DEBUG_CHANNELS_DIALOG, hMainWnd, DebugChannelsDlgProc); -} + DialogBoxW(hInst, (LPCWSTR)IDD_DEBUG_CHANNELS_DIALOG, hMainWnd, DebugChannelsDlgProc); +} Modified: trunk/reactos/base/applications/taskmgr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/debug.c (original) +++ trunk/reactos/base/applications/taskmgr/debug.c Fri Nov 9 18:26:02 2007 @@ -34,7 +34,7 @@ WCHAR strDebugger[260]; DWORD dwDebuggerSize; PROCESS_INFORMATION pi; - STARTUPINFO si; + STARTUPINFOW si; HANDLE hDebugEvent; WCHAR szTemp[256]; WCHAR szTempA[256]; @@ -59,56 +59,56 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - LoadString(hInst, IDS_MSG_WARNINGDEBUG, szTemp, 256); - LoadString(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + LoadStringW(hInst, IDS_MSG_WARNINGDEBUG, szTemp, 256); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBox(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", 0, KEY_READ, &hKey) != ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", 0, KEY_READ, &hKey) != ERROR_SUCCESS) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } dwDebuggerSize = 260; - if (RegQueryValueEx(hKey, L"Debugger", NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) != ERROR_SUCCESS) + if (RegQueryValueExW(hKey, L"Debugger", NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) != ERROR_SUCCESS) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); RegCloseKey(hKey); return; } RegCloseKey(hKey); - hDebugEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + hDebugEvent = CreateEventW(NULL, FALSE, FALSE, NULL); if (!hDebugEvent) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } - wsprintf(strDebugPath, strDebugger, dwProcessId, hDebugEvent); + wsprintfW(strDebugPath, strDebugger, dwProcessId, hDebugEvent); memset(&pi, 0, sizeof(PROCESS_INFORMATION)); - memset(&si, 0, sizeof(STARTUPINFO)); - si.cb = sizeof(STARTUPINFO); - if (!CreateProcess(NULL, strDebugPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + memset(&si, 0, sizeof(STARTUPINFOW)); + si.cb = sizeof(STARTUPINFOW); + if (!CreateProcessW(NULL, strDebugPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } CloseHandle(hDebugEvent); Modified: trunk/reactos/base/applications/taskmgr/endproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/endproc.c (original) +++ trunk/reactos/base/applications/taskmgr/endproc.c Fri Nov 9 18:26:02 2007 @@ -53,9 +53,9 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - LoadString(hInst, IDS_MSG_WARNINGTERMINATING, szTemp, 256); - LoadString(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBox(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, szTemp, 256); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) return; hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); @@ -63,16 +63,16 @@ if (!hProcess) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } if (!TerminateProcess(hProcess, 0)) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } CloseHandle(hProcess); @@ -105,9 +105,9 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - LoadString(hInst, IDS_MSG_WARNINGTERMINATING, szTemp, 256); - LoadString(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBox(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, szTemp, 256); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) return; hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); @@ -115,16 +115,16 @@ if (!hProcess) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } if (!TerminateProcess(hProcess, 0)) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } CloseHandle(hProcess); Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c (original) +++ trunk/reactos/base/applications/taskmgr/graph.c Fri Nov 9 18:26:02 2007 @@ -102,7 +102,7 @@ hdc = BeginPaint(hWnd, &ps); - WindowId = GetWindowLong(hWnd, GWL_ID); + WindowId = GetWindowLongW(hWnd, GWL_ID); switch (WindowId) { @@ -126,7 +126,7 @@ /* * We pass on all non-handled messages */ - return CallWindowProc((WNDPROC)OldGraphWndProc, hWnd, message, wParam, lParam); + return CallWindowProcW((WNDPROC)OldGraphWndProc, hWnd, message, wParam, lParam); } void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) @@ -166,7 +166,7 @@ if (CpuUsage <= 0) CpuUsage = 0; if (CpuUsage > 100) CpuUsage = 100; - wsprintf(Text, L"%d%%", (int)CpuUsage); + wsprintfW(Text, L"%d%%", (int)CpuUsage); /* * Draw the font text onto the graph @@ -175,7 +175,7 @@ InflateRect(&rcText, -2, -2); crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); hOldFont = SelectObject(hDC, GetStockObject(DEFAULT_GUI_FONT)); - DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + DrawTextW(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); SelectObject(hDC, hOldFont); SetTextColor(hDC, crPrevForeground); @@ -335,9 +335,9 @@ CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); if (CommitChargeTotal > 1024) - wsprintf(Text, L"%d MB", (int)(CommitChargeTotal / 1024)); + wsprintfW(Text, L"%d MB", (int)(CommitChargeTotal / 1024)); else - wsprintf(Text, L"%d K", (int)CommitChargeTotal); + wsprintfW(Text, L"%d K", (int)CommitChargeTotal); /* * Draw the font text onto the graph */ @@ -345,7 +345,7 @@ InflateRect(&rcText, -2, -2); crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); hOldFont = SelectObject(hDC, GetStockObject(DEFAULT_GUI_FONT)); - DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + DrawTextW(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); SelectObject(hDC, hOldFont); SetTextColor(hDC, crPrevForeground); Modified: trunk/reactos/base/applications/taskmgr/graphctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graphctl.c (original) +++ trunk/reactos/base/applications/taskmgr/graphctl.c Fri Nov 9 18:26:02 2007 @@ -644,5 +644,5 @@ /* * We pass on all non-handled messages */ - return CallWindowProc((WNDPROC)OldGraphCtrlWndProc, hWnd, message, wParam, lParam); -} + return CallWindowProcW((WNDPROC)OldGraphCtrlWndProc, hWnd, message, wParam, lParam); +} Modified: trunk/reactos/base/applications/taskmgr/optnmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/optnmenu.c (original) +++ trunk/reactos/base/applications/taskmgr/optnmenu.c Fri Nov 9 18:26:02 2007 @@ -40,7 +40,7 @@ * Check or uncheck the always on top menu item * and update main window. */ - if ((GetWindowLong(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0) + if ((GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0) { CheckMenuItem(hOptionsMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND|MF_UNCHECKED); TaskManagerSettings.AlwaysOnTop = FALSE; Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c Fri Nov 9 18:26:02 2007 @@ -76,14 +76,14 @@ } } -static void SidToUserName(PSID Sid, LPTSTR szBuffer, DWORD BufferSize) +static void SidToUserName(PSID Sid, LPWSTR szBuffer, DWORD BufferSize) { static WCHAR szDomainNameUnused[255]; DWORD DomainNameLen = sizeof(szDomainNameUnused) / sizeof(szDomainNameUnused[0]); SID_NAME_USE Use; if (Sid != NULL) - LookupAccountSid(NULL, Sid, szBuffer, &BufferSize, szDomainNameUnused, &DomainNameLen, &Use); + LookupAccountSidW(NULL, Sid, szBuffer, &BufferSize, szDomainNameUnused, &DomainNameLen, &Use); } void PerfDataRefresh(void) @@ -260,7 +260,7 @@ if (pSPI->ImageName.Buffer) wcscpy(pPerfData[Idx].ImageName, pSPI->ImageName.Buffer); else - LoadString(hInst, IDS_IDLE_PROCESS, pPerfData[Idx].ImageName, + LoadStringW(hInst, IDS_IDLE_PROCESS, pPerfData[Idx].ImageName, sizeof(pPerfData[Idx].ImageName) / sizeof(pPerfData[Idx].ImageName[0])); pPerfData[Idx].ProcessId = pSPI->UniqueProcessId; @@ -368,7 +368,7 @@ return (ULONG)dbKernelTime; } -BOOL PerfDataGetImageName(ULONG Index, LPTSTR lpImageName, int nMaxCount) +BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, int nMaxCount) { BOOL bSuccessful; @@ -420,7 +420,7 @@ return ProcessId; } -BOOL PerfDataGetUserName(ULONG Index, LPTSTR lpUserName, int nMaxCount) +BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount) { BOOL bSuccessful; Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfpage.c (original) +++ trunk/reactos/base/applications/taskmgr/perfpage.c Fri Nov 9 18:26:02 2007 @@ -198,10 +198,10 @@ /* * Subclass graph buttons */ - OldGraphWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtr(hPerformancePageCpuUsageGraph, GWL_WNDPROC, (LONG_PTR)Graph_WndProc); - SetWindowLongPtr(hPerformancePageMemUsageGraph, GWL_WNDPROC, (LONG_PTR)Graph_WndProc); - OldGraphCtrlWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtr(hPerformancePageMemUsageHistoryGraph, GWL_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); - SetWindowLongPtr(hPerformancePageCpuUsageHistoryGraph, GWL_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); + OldGraphWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hPerformancePageCpuUsageGraph, GWL_WNDPROC, (LONG_PTR)Graph_WndProc); + SetWindowLongPtrW(hPerformancePageMemUsageGraph, GWL_WNDPROC, (LONG_PTR)Graph_WndProc); + OldGraphCtrlWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hPerformancePageMemUsageHistoryGraph, GWL_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); + SetWindowLongPtrW(hPerformancePageCpuUsageHistoryGraph, GWL_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); return TRUE; case WM_COMMAND: @@ -333,13 +333,13 @@ WCHAR szMemUsage[256]; /* Create the event */ - hPerformancePageEvent = CreateEvent(NULL, TRUE, TRUE, NULL); + hPerformancePageEvent = CreateEventW(NULL, TRUE, TRUE, NULL); /* If we couldn't create the event then exit the thread */ if (!hPerformancePageEvent) return 0; - LoadString(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, 256); + LoadStringW(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, 256); while (1) { @@ -368,13 +368,13 @@ CommitChargeLimit = PerfDataGetCommitChargeLimitK(); CommitChargePeak = PerfDataGetCommitChargePeakK(); _ultow(CommitChargeTotal, Text, 10); - SetWindowText(hPerformancePageCommitChargeTotalEdit, Text); + SetWindowTextW(hPerformancePageCommitChargeTotalEdit, Text); _ultow(CommitChargeLimit, Text, 10); - SetWindowText(hPerformancePageCommitChargeLimitEdit, Text); + SetWindowTextW(hPerformancePageCommitChargeLimitEdit, Text); _ultow(CommitChargePeak, Text, 10); - SetWindowText(hPerformancePageCommitChargePeakEdit, Text); - wsprintf(Text, szMemUsage, CommitChargeTotal, CommitChargeLimit); - SendMessage(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text); + SetWindowTextW(hPerformancePageCommitChargePeakEdit, Text); + wsprintfW(Text, szMemUsage, CommitChargeTotal, CommitChargeLimit); + SendMessageW(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text); /* * Update the kernel memory info @@ -383,11 +383,11 @@ KernelMemoryPaged = PerfDataGetKernelMemoryPagedK(); KernelMemoryNonPaged = PerfDataGetKernelMemoryNonPagedK(); _ultow(KernelMemoryTotal, Text, 10); - SetWindowText(hPerformancePageKernelMemoryTotalEdit, Text); + SetWindowTextW(hPerformancePageKernelMemoryTotalEdit, Text); _ultow(KernelMemoryPaged, Text, 10); - SetWindowText(hPerformancePageKernelMemoryPagedEdit, Text); + SetWindowTextW(hPerformancePageKernelMemoryPagedEdit, Text); _ultow(KernelMemoryNonPaged, Text, 10); - SetWindowText(hPerformancePageKernelMemoryNonPagedEdit, Text); + SetWindowTextW(hPerformancePageKernelMemoryNonPagedEdit, Text); /* * Update the physical memory info @@ -396,11 +396,11 @@ PhysicalMemoryAvailable = PerfDataGetPhysicalMemoryAvailableK(); PhysicalMemorySystemCache = PerfDataGetPhysicalMemorySystemCacheK(); _ultow(PhysicalMemoryTotal, Text, 10); - SetWindowText(hPerformancePagePhysicalMemoryTotalEdit, Text); + SetWindowTextW(hPerformancePagePhysicalMemoryTotalEdit, Text); _ultow(PhysicalMemoryAvailable, Text, 10); - SetWindowText(hPerformancePagePhysicalMemoryAvailableEdit, Text); + SetWindowTextW(hPerformancePagePhysicalMemoryAvailableEdit, Text); _ultow(PhysicalMemorySystemCache, Text, 10); - SetWindowText(hPerformancePagePhysicalMemorySystemCacheEdit, Text); + SetWindowTextW(hPerformancePagePhysicalMemorySystemCacheEdit, Text); /* * Update the totals info @@ -409,11 +409,11 @@ TotalThreads = PerfDataGetTotalThreadCount(); TotalProcesses = PerfDataGetProcessCount(); _ultow(TotalHandles, Text, 10); - SetWindowText(hPerformancePageTotalsHandleCountEdit, Text); + SetWindowTextW(hPerformancePageTotalsHandleCountEdit, Text); _ultow(TotalThreads, Text, 10); - SetWindowText(hPerformancePageTotalsThreadCountEdit, Text); + SetWindowTextW(hPerformancePageTotalsThreadCountEdit, Text); _ultow(TotalProcesses, Text, 10); - SetWindowText(hPerformancePageTotalsProcessCountEdit, Text); + SetWindowTextW(hPerformancePageTotalsProcessCountEdit, Text); /* * Redraw the graphs Modified: trunk/reactos/base/applications/taskmgr/priority.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/priority.c (original) +++ trunk/reactos/base/applications/taskmgr/priority.c Fri Nov 9 18:26:02 2007 @@ -53,26 +53,26 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - LoadString(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); - LoadString(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBox(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + return; + + hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); + + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } if (!SetPriorityClass(hProcess, REALTIME_PRIORITY_CLASS)) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } CloseHandle(hProcess); @@ -105,26 +105,26 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - LoadString(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); - LoadString(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBox(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + return; + + hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); + + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } if (!SetPriorityClass(hProcess, HIGH_PRIORITY_CLASS)) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } CloseHandle(hProcess); @@ -157,26 +157,26 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - LoadString(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); - LoadString(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBox(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + return; + + hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); + + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } if (!SetPriorityClass(hProcess, ABOVE_NORMAL_PRIORITY_CLASS)) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } CloseHandle(hProcess); @@ -209,26 +209,26 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - LoadString(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); - LoadString(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBox(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + return; + + hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); + + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } if (!SetPriorityClass(hProcess, NORMAL_PRIORITY_CLASS)) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } CloseHandle(hProcess); @@ -261,26 +261,26 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - LoadString(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); - LoadString(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBox(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + return; + + hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); + + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } if (!SetPriorityClass(hProcess, BELOW_NORMAL_PRIORITY_CLASS)) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } CloseHandle(hProcess); @@ -313,27 +313,27 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - LoadString(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); - LoadString(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBox(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + return; + + hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); + + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } if (!SetPriorityClass(hProcess, IDLE_PRIORITY_CLASS)) { GetLastErrorText(strErrorText, 260); - LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); - } - - CloseHandle(hProcess); -} + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + } + + CloseHandle(hProcess); +} Modified: trunk/reactos/base/applications/taskmgr/proclist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/proclist.c (original) +++ trunk/reactos/base/applications/taskmgr/proclist.c Fri Nov 9 18:26:02 2007 @@ -62,7 +62,7 @@ /* * Get the background brush */ - hbrBackground = (HBRUSH)(LONG_PTR) GetClassLongPtr(hWnd, GCL_HBRBACKGROUND); + hbrBackground = (HBRUSH)(LONG_PTR) GetClassLongPtrW(hWnd, GCL_HBRBACKGROUND); /* * Calculate the clip rect by getting the RECT @@ -73,12 +73,12 @@ * use icons in this list control. */ rcClip.left = LVIR_BOUNDS; - SendMessage(hWnd, LVM_GETITEMRECT, 0, (LPARAM)&rcClip); + SendMessageW(hWnd, LVM_GETITEMRECT, 0, (LPARAM)&rcClip); rcClip.left = LVIR_BOUNDS; - SendMessage(hWnd, LVM_GETITEMRECT, ListView_GetItemCount(hWnd) - 1, (LPARAM)&rcItem); + SendMessageW(hWnd, LVM_GETITEMRECT, ListView_GetItemCount(hWnd) - 1, (LPARAM)&rcItem); rcClip.bottom = rcItem.bottom; rcClip.left = LVIR_ICON; - SendMessage(hWnd, LVM_GETITEMRECT, 0, (LPARAM)&rcItem); + SendMessageW(hWnd, LVM_GETITEMRECT, 0, (LPARAM)&rcItem); rcClip.left = rcItem.right; /* @@ -109,5 +109,5 @@ /* * We pass on all messages except WM_ERASEBKGND */ - return CallWindowProc(OldProcessListWndProc, hWnd, message, wParam, lParam); + return CallWindowProcW(OldProcessListWndProc, hWnd, message, wParam, lParam); } Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c Fri Nov 9 18:26:02 2007 @@ -35,7 +35,7 @@ static HANDLE hProcessPageEvent = NULL; /* When this event becomes signaled then we refresh the process list */ void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam); -void CommaSeparateNumberString(LPTSTR strNumber, int nMaxCount); +void CommaSeparateNumberString(LPWSTR strNumber, int nMaxCount); void ProcessPageShowContextMenu(DWORD dwProcessId); DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); @@ -71,8 +71,8 @@ /* * Set the font, title, and extended window styles for the list control */ - SendMessage(hProcessPageListCtrl, WM_SETFONT, SendMessage(hProcessPage, WM_GETFONT, 0, 0), TRUE); - SetWindowText(hProcessPageListCtrl, L"Processes"); + SendMessageW(hProcessPageListCtrl, WM_SETFONT, SendMessageW(hProcessPage, WM_GETFONT, 0, 0), TRUE); + SetWindowTextW(hProcessPageListCtrl, L"Processes"); (void)ListView_SetExtendedListViewStyle(hProcessPageListCtrl, ListView_GetExtendedListViewStyle(hProcessPageListCtrl) | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP); AddColumns(); @@ -80,7 +80,7 @@ /* * Subclass the process list control so we can intercept WM_ERASEBKGND */ - OldProcessListWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtr(hProcessPageListCtrl, GWL_WNDPROC, (LONG_PTR)ProcessListWndProc); + OldProcessListWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hProcessPageListCtrl, GWL_WNDPROC, (LONG_PTR)ProcessListWndProc); /* Start our refresh thread */ hRefreshThread = CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, NULL); @@ -189,13 +189,13 @@ if (ColumnDataHints[ColumnIndex] == COLUMN_IMAGENAME) PerfDataGetImageName(Index, pnmdi->item.pszText, pnmdi->item.cchTextMax); if (ColumnDataHints[ColumnIndex] == COLUMN_PID) - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetProcessId(Index)); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetProcessId(Index)); if (ColumnDataHints[ColumnIndex] == COLUMN_USERNAME) PerfDataGetUserName(Index, pnmdi->item.pszText, pnmdi->item.cchTextMax); if (ColumnDataHints[ColumnIndex] == COLUMN_SESSIONID) - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetSessionId(Index)); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetSessionId(Index)); if (ColumnDataHints[ColumnIndex] == COLUMN_CPUUSAGE) - wsprintf(pnmdi->item.pszText, L"%02d", PerfDataGetCPUUsage(Index)); + wsprintfW(pnmdi->item.pszText, L"%02d", PerfDataGetCPUUsage(Index)); if (ColumnDataHints[ColumnIndex] == COLUMN_CPUTIME) { DWORD dwHours; @@ -212,115 +212,115 @@ dwMinutes = (DWORD)((time.QuadPart % 36000000000LL) / 600000000LL); dwSeconds = (DWORD)(((time.QuadPart % 36000000000LL) % 600000000LL) / 10000000LL); #endif - wsprintf(pnmdi->item.pszText, L"%d:%02d:%02d", dwHours, dwMinutes, dwSeconds); + wsprintfW(pnmdi->item.pszText, L"%d:%02d:%02d", dwHours, dwMinutes, dwSeconds); } if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGE) { - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetWorkingSetSizeBytes(Index) / 1024); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetWorkingSetSizeBytes(Index) / 1024); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); wcscat(pnmdi->item.pszText, L" K"); } if (ColumnDataHints[ColumnIndex] == COLUMN_PEAKMEMORYUSAGE) { - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetPeakWorkingSetSizeBytes(Index) / 1024); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetPeakWorkingSetSizeBytes(Index) / 1024); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); wcscat(pnmdi->item.pszText, L" K"); } if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGEDELTA) { - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetWorkingSetSizeDelta(Index) / 1024); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetWorkingSetSizeDelta(Index) / 1024); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); wcscat(pnmdi->item.pszText, L" K"); } if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTS) { - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetPageFaultCount(Index)); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetPageFaultCount(Index)); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); } if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTSDELTA) { - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetPageFaultCountDelta(Index)); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetPageFaultCountDelta(Index)); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); } if (ColumnDataHints[ColumnIndex] == COLUMN_VIRTUALMEMORYSIZE) { - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetVirtualMemorySizeBytes(Index) / 1024); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetVirtualMemorySizeBytes(Index) / 1024); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); wcscat(pnmdi->item.pszText, L" K"); } if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEDPOOL) { - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetPagedPoolUsagePages(Index) / 1024); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetPagedPoolUsagePages(Index) / 1024); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); wcscat(pnmdi->item.pszText, L" K"); } if (ColumnDataHints[ColumnIndex] == COLUMN_NONPAGEDPOOL) { - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetNonPagedPoolUsagePages(Index) / 1024); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetNonPagedPoolUsagePages(Index) / 1024); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); wcscat(pnmdi->item.pszText, L" K"); } if (ColumnDataHints[ColumnIndex] == COLUMN_BASEPRIORITY) - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetBasePriority(Index)); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetBasePriority(Index)); if (ColumnDataHints[ColumnIndex] == COLUMN_HANDLECOUNT) { - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetHandleCount(Index)); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetHandleCount(Index)); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); } if (ColumnDataHints[ColumnIndex] == COLUMN_THREADCOUNT) { - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetThreadCount(Index)); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetThreadCount(Index)); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); } if (ColumnDataHints[ColumnIndex] == COLUMN_USEROBJECTS) { - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetUSERObjectCount(Index)); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetUSERObjectCount(Index)); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); } if (ColumnDataHints[ColumnIndex] == COLUMN_GDIOBJECTS) { - wsprintf(pnmdi->item.pszText, L"%d", PerfDataGetGDIObjectCount(Index)); + wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetGDIObjectCount(Index)); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); } if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADS) { PerfDataGetIOCounters(Index, &iocounters); - /* wsprintf(pnmdi->item.pszText, L"%d", iocounters.ReadOperationCount); */ + /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.ReadOperationCount); */ _ui64tow(iocounters.ReadOperationCount, pnmdi->item.pszText, 10); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); } if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITES) { PerfDataGetIOCounters(Index, &iocounters); - /* wsprintf(pnmdi->item.pszText, L"%d", iocounters.WriteOperationCount); */ + /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.WriteOperationCount); */ _ui64tow(iocounters.WriteOperationCount, pnmdi->item.pszText, 10); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); } if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHER) { PerfDataGetIOCounters(Index, &iocounters); - /* wsprintf(pnmdi->item.pszText, L"%d", iocounters.OtherOperationCount); */ + /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.OtherOperationCount); */ _ui64tow(iocounters.OtherOperationCount, pnmdi->item.pszText, 10); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); } if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADBYTES) { PerfDataGetIOCounters(Index, &iocounters); - /* wsprintf(pnmdi->item.pszText, L"%d", iocounters.ReadTransferCount); */ + /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.ReadTransferCount); */ _ui64tow(iocounters.ReadTransferCount, pnmdi->item.pszText, 10); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); } if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITEBYTES) { PerfDataGetIOCounters(Index, &iocounters); - /* wsprintf(pnmdi->item.pszText, L"%d", iocounters.WriteTransferCount); */ + /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.WriteTransferCount); */ _ui64tow(iocounters.WriteTransferCount, pnmdi->item.pszText, 10); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); } if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHERBYTES) { PerfDataGetIOCounters(Index, &iocounters); - /* wsprintf(pnmdi->item.pszText, L"%d", iocounters.OtherTransferCount); */ + /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.OtherTransferCount); */ _ui64tow(iocounters.OtherTransferCount, pnmdi->item.pszText, 10); CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); } @@ -385,7 +385,7 @@ } -void CommaSeparateNumberString(LPTSTR strNumber, int nMaxCount) +void CommaSeparateNumberString(LPWSTR strNumber, int nMaxCount) { WCHAR temp[260]; UINT i, j, k; @@ -420,7 +420,7 @@ GetCursorPos(&pt); GetSystemInfo(&si); - hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_PROCESS_PAGE_CONTEXT)); + hMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_PROCESS_PAGE_CONTEXT)); hSubMenu = GetSubMenu(hMenu, 0); hPriorityMenu = GetSubMenu(hSubMenu, 4); @@ -455,10 +455,10 @@ break; } - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { dwDebuggerSize = 260; - if (RegQueryValueEx(hKey, L"Debugger", NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) == ERROR_SUCCESS) + if (RegQueryValueExW(hKey, L"Debugger", NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) == ERROR_SUCCESS) { for (Idx=0; Idx<wcslen(strDebugger); Idx++) strDebugger[Idx] = toupper(strDebugger[Idx]); @@ -491,14 +491,14 @@ WCHAR szCpuUsage[256], szProcesses[256]; /* Create the event */ - hProcessPageEvent = CreateEvent(NULL, TRUE, TRUE, NULL); + hProcessPageEvent = CreateEventW(NULL, TRUE, TRUE, NULL); /* If we couldn't create the event then exit the thread */ if (!hProcessPageEvent) return 0; - LoadString(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256); - LoadString(hInst, IDS_STATUS_PROCESSES, szProcesses, 256); + LoadStringW(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256); + LoadStringW(hInst, IDS_STATUS_PROCESSES, szProcesses, 256); while (1) { DWORD dwWaitVal; @@ -517,21 +517,21 @@ /* Reset our event */ ResetEvent(hProcessPageEvent); - if ((ULONG)SendMessage(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0) != PerfDataGetProcessCount()) - SendMessage(hProcessPageListCtrl, LVM_SETITEMCOUNT, PerfDataGetProcessCount(), /*LVSICF_NOINVALIDATEALL|*/LVSICF_NOSCROLL); + if ((ULONG)SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0) != PerfDataGetProcessCount()) + SendMessageW(hProcessPageListCtrl, LVM_SETITEMCOUNT, PerfDataGetProcessCount(), /*LVSICF_NOINVALIDATEALL|*/LVSICF_NOSCROLL); if (IsWindowVisible(hProcessPage)) InvalidateRect(hProcessPageListCtrl, NULL, FALSE); if (OldProcessorUsage != PerfDataGetProcessorUsage()) { OldProcessorUsage = PerfDataGetProcessorUsage(); - wsprintf(text, szCpuUsage, OldProcessorUsage); - SendMessage(hStatusWnd, SB_SETTEXT, 1, (LPARAM)text); + wsprintfW(text, szCpuUsage, OldProcessorUsage); + SendMessageW(hStatusWnd, SB_SETTEXT, 1, (LPARAM)text); } if (OldProcessCount != PerfDataGetProcessCount()) { OldProcessCount = PerfDataGetProcessCount(); - wsprintf(text, szProcesses, OldProcessCount); - SendMessage(hStatusWnd, SB_SETTEXT, 0, (LPARAM)text); + wsprintfW(text, szProcesses, OldProcessCount); + SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)text); } } } Modified: trunk/reactos/base/applications/taskmgr/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/run.c (original) +++ trunk/reactos/base/applications/taskmgr/run.c Fri Nov 9 18:26:02 2007 @@ -31,11 +31,11 @@ WCHAR szText[256]; /* Load language strings from resource file */ - LoadString(hInst, IDS_CREATENEWTASK, szTitle, sizeof(szTitle) / sizeof(szTitle[0])); - LoadString(hInst, IDS_CREATENEWTASK_DESC, szText, sizeof(szText) / sizeof(szText[0])); + LoadStringW(hInst, IDS_CREATENEWTASK, szTitle, sizeof(szTitle) / sizeof(szTitle[0])); + LoadStringW(hInst, IDS_CREATENEWTASK_DESC, szText, sizeof(szText) / sizeof(szText[0])); - hShell32 = LoadLibrary(L"SHELL32.DLL"); + hShell32 = LoadLibraryW(L"SHELL32.DLL"); RunFileDlg = (RUNFILEDLG)(FARPROC)GetProcAddress(hShell32, (LPCSTR)0x3D); /* Show "Run..." dialog */ Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c Fri Nov 9 18:26:02 2007 @@ -67,7 +67,7 @@ /* Get a token for this process. */ if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) { /* Get the LUID for the debug privilege. */ - LookupPrivilegeValue(NULL, SE_DEBUG_NAME, &tkp.Privileges[0].Luid); + LookupPrivilegeValueW(NULL, SE_DEBUG_NAME, &tkp.Privileges[0].Luid); tkp.PrivilegeCount = 1; /* one privilege to set */ tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; @@ -85,7 +85,7 @@ return -1; } - DialogBox(hInst, (LPCTSTR)IDD_TASKMGR_DIALOG, NULL, TaskManagerWndProc); + DialogBoxW(hInst, (LPCWSTR)IDD_TASKMGR_DIALOG, NULL, TaskManagerWndProc); /* Save our settings to the registry */ SaveSettings(); @@ -170,7 +170,7 @@ ProcessPage_OnViewSelectColumns(); break; case ID_VIEW_REFRESH: - PostMessage(hDlg, WM_TIMER, 0, 0); + PostMessageW(hDlg, WM_TIMER, 0, 0); break; case ID_WINDOWS_TILEHORIZONTALLY: ApplicationPage_OnWindowsTileHorizontally(); @@ -252,9 +252,9 @@ GetCursorPos(&pt); - OnTop = ((GetWindowLong(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); - - hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_TRAY_POPUP)); + OnTop = ((GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); + + hMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_TRAY_POPUP)); hPopupMenu = GetSubMenu(hMenu, 0); if(IsWindowVisible(hMainWnd)) @@ -356,7 +356,7 @@ TaskManagerSettings.Maximized = TRUE; else TaskManagerSettings.Maximized = FALSE; - return DefWindowProc(hDlg, message, wParam, lParam); + return DefWindowProcW(hDlg, message, wParam, lParam); case WM_TIMER: /* Refresh the performance data */ @@ -384,7 +384,7 @@ void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr) { SetBkColor(hDC, clr); - ExtTextOut(hDC, 0, 0, ETO_OPAQUE, lpRect, NULL, 0, NULL); + ExtTextOutW(hDC, 0, 0, ETO_OPAQUE, lpRect, NULL, 0, NULL); } void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr) @@ -396,7 +396,7 @@ rect.top = y; rect.right = x + cx; rect.bottom = y + cy; - ExtTextOut(hDC, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL); + ExtTextOutW(hDC, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL); } void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight) @@ -426,7 +426,7 @@ WCHAR szTemp[256]; TCITEM item; - SendMessage(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER))); + SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER))); /* Initialize the Windows Common Controls DLL */ InitCommonControls(); @@ -445,32 +445,32 @@ nParts[0] = 100; nParts[1] = 210; nParts[2] = 400; - SendMessage(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); /* Create tab pages */ hTabWnd = GetDlgItem(hWnd, IDC_TAB); #if 1 - hApplicationPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_APPLICATION_PAGE), hWnd, ApplicationPageWndProc); - hProcessPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PROCESS_PAGE), hWnd, ProcessPageWndProc); - hPerformancePage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PERFORMANCE_PAGE), hWnd, PerformancePageWndProc); + hApplicationPage = CreateDialogW(hInst, MAKEINTRESOURCEW(IDD_APPLICATION_PAGE), hWnd, ApplicationPageWndProc); + hProcessPage = CreateDialogW(hInst, MAKEINTRESOURCEW(IDD_PROCESS_PAGE), hWnd, ProcessPageWndProc); + hPerformancePage = CreateDialogW(hInst, MAKEINTRESOURCEW(IDD_PERFORMANCE_PAGE), hWnd, PerformancePageWndProc); #else - hApplicationPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_APPLICATION_PAGE), hTabWnd, ApplicationPageWndProc); - hProcessPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PROCESS_PAGE), hTabWnd, ProcessPageWndProc); - hPerformancePage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PERFORMANCE_PAGE), hTabWnd, PerformancePageWndProc); + hApplicationPage = CreateDialogW(hInst, MAKEINTRESOURCEW(IDD_APPLICATION_PAGE), hTabWnd, ApplicationPageWndProc); + hProcessPage = CreateDialogW(hInst, MAKEINTRESOURCEW(IDD_PROCESS_PAGE), hTabWnd, ProcessPageWndProc); + hPerformancePage = CreateDialogW(hInst, MAKEINTRESOURCEW(IDD_PERFORMANCE_PAGE), hTabWnd, PerformancePageWndProc); #endif /* Insert tabs */ - LoadString(hInst, IDS_TAB_APPS, szTemp, 256); + LoadStringW(hInst, IDS_TAB_APPS, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; (void)TabCtrl_InsertItem(hTabWnd, 0, &item); - LoadString(hInst, IDS_TAB_PROCESSES, szTemp, 256); + LoadStringW(hInst, IDS_TAB_PROCESSES, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; (void)TabCtrl_InsertItem(hTabWnd, 1, &item); - LoadString(hInst, IDS_TAB_PERFORMANCE, szTemp, 256); + LoadStringW(hInst, IDS_TAB_PERFORMANCE, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; @@ -633,13 +633,13 @@ /* Update the status bar size */ GetWindowRect(hStatusWnd, &rc); - SendMessage(hStatusWnd, WM_SIZE, nType, MAKELPARAM(cx, cy + (rc.bottom - rc.top))); + SendMessageW(hStatusWnd, WM_SIZE, nType, MAKELPARAM(cx, cy + (rc.bottom - rc.top))); /* Update the status bar pane sizes */ nParts[0] = bInMenuLoop ? -1 : 100; nParts[1] = 210; nParts[2] = cx; - SendMessage(hStatusWnd, SB_SETPARTS, bInMenuLoop ? 1 : 3, (LPARAM) (LPINT) nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, bInMenuLoop ? 1 : 3, (LPARAM) (LPINT) nParts); /* Resize the tab control */ GetWindowRect(hTabWnd, &rc); @@ -714,11 +714,11 @@ TaskManagerSettings.ShowKernelTimes = FALSE; /* Open the key */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, szSubKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_CURRENT_USER, szSubKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) return; /* Read the settings */ dwSize = sizeof(TASKMANAGER_SETTINGS); - RegQueryValueEx(hKey, L"Preferences", NULL, NULL, (LPBYTE)&TaskManagerSettings, &dwSize); + RegQueryValueExW(hKey, L"Preferences", NULL, NULL, (LPBYTE)&TaskManagerSettings, &dwSize); /* * ATM, the 'ImageName' column is always visible @@ -740,16 +740,16 @@ /* Open (or create) the key */ hKey = NULL; - RegCreateKeyEx(HKEY_CURRENT_USER, szSubKey1, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); + RegCreateKeyExW(HKEY_CURRENT_USER, szSubKey1, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); RegCloseKey(hKey); hKey = NULL; - RegCreateKeyEx(HKEY_CURRENT_USER, szSubKey2, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); + RegCreateKeyExW(HKEY_CURRENT_USER, szSubKey2, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); RegCloseKey(hKey); hKey = NULL; - if (RegCreateKeyEx(HKEY_CURRENT_USER, szSubKey3, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + if (RegCreateKeyExW(HKEY_CURRENT_USER, szSubKey3, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) return; /* Save the settings */ - RegSetValueEx(hKey, L"Preferences", 0, REG_BINARY, (LPBYTE)&TaskManagerSettings, sizeof(TASKMANAGER_SETTINGS)); + RegSetValueExW(hKey, L"Preferences", 0, REG_BINARY, (LPBYTE)&TaskManagerSettings, sizeof(TASKMANAGER_SETTINGS)); /* Close the key */ RegCloseKey(hKey); } @@ -761,7 +761,7 @@ hMenu = GetMenu(hMainWnd); hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX); - OnTop = ((GetWindowLong(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); + OnTop = ((GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); OpenIcon(hMainWnd); SetForegroundWindow(hMainWnd); @@ -774,9 +774,9 @@ /* Update the status bar pane sizes */ nParts = -1; - SendMessage(hStatusWnd, SB_SETPARTS, 1, (LPARAM) (LPINT)&nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, 1, (LPARAM) (LPINT)&nParts); bInMenuLoop = TRUE; - SendMessage(hStatusWnd, SB_SETTEXT, (WPARAM)0, (LPARAM)L""); + SendMessageW(hStatusWnd, SB_SETTEXT, (WPARAM)0, (LPARAM)L""); } void TaskManager_OnExitMenuLoop(HWND hWnd) @@ -786,8 +786,8 @@ WCHAR text[260]; WCHAR szCpuUsage[256], szProcesses[256]; - LoadString(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256); - LoadString(hInst, IDS_STATUS_PROCESSES, szProcesses, 256); + LoadStringW(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256); + LoadStringW(hInst, IDS_STATUS_PROCESSES, szProcesses, 256); bInMenuLoop = FALSE; /* Update the status bar pane sizes */ @@ -795,12 +795,12 @@ nParts[0] = 100; nParts[1] = 210; nParts[2] = rc.right; - SendMessage(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); - SendMessage(hStatusWnd, SB_SETTEXT, 0, (LPARAM)L""); - wsprintf(text, szCpuUsage, PerfDataGetProcessorUsage()); - SendMessage(hStatusWnd, SB_SETTEXT, 1, (LPARAM)text); - wsprintf(text, szProcesses, PerfDataGetProcessCount()); - SendMessage(hStatusWnd, SB_SETTEXT, 0, (LPARAM)text); + SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); + SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)L""); + wsprintfW(text, szCpuUsage, PerfDataGetProcessorUsage()); + SendMessageW(hStatusWnd, SB_SETTEXT, 1, (LPARAM)text); + wsprintfW(text, szProcesses, PerfDataGetProcessCount()); + SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)text); } void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu) @@ -808,15 +808,15 @@ WCHAR str[100]; wcscpy(str, L""); - if (LoadString(hInst, nItemID, str, 100)) { + if (LoadStringW(hInst, nItemID, str, 100)) { /* load appropriate string */ - LPTSTR lpsz = str; + LPWSTR lpsz = str; /* first newline terminates actual string */ lpsz = wcschr(lpsz, '\n'); if (lpsz != NULL) *lpsz = '\0'; } - SendMessage(hStatusWnd, SB_SETTEXT, 0, (LPARAM)str); + SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)str); } void TaskManager_OnViewUpdateSpeedHigh(void) @@ -872,7 +872,7 @@ void TaskManager_OnViewRefresh(void) { - PostMessage(hMainWnd, WM_TIMER, 0, 0); + PostMessageW(hMainWnd, WM_TIMER, 0, 0); } void TaskManager_OnViewUpdateSpeedPaused(void) @@ -916,20 +916,20 @@ ShowWindow(hPerformancePage, SW_HIDE); BringWindowToTop(hApplicationPage); - LoadString(hInst, IDS_MENU_LARGEICONS, szTemp, 256); - AppendMenu(hViewMenu, MF_STRING, ID_VIEW_LARGE, szTemp); - - LoadString(hInst, IDS_MENU_SMALLICONS, szTemp, 256); - AppendMenu(hViewMenu, MF_STRING, ID_VIEW_SMALL, szTemp); - - LoadString(hInst, IDS_MENU_DETAILS, szTemp, 256); - AppendMenu(hViewMenu, MF_STRING, ID_VIEW_DETAILS, szTemp); + LoadStringW(hInst, IDS_MENU_LARGEICONS, szTemp, 256); + AppendMenuW(hViewMenu, MF_STRING, ID_VIEW_LARGE, szTemp); + + LoadStringW(hInst, IDS_MENU_SMALLICONS, szTemp, 256); + AppendMenuW(hViewMenu, MF_STRING, ID_VIEW_SMALL, szTemp); + + LoadStringW(hInst, IDS_MENU_DETAILS, szTemp, 256); + AppendMenuW(hViewMenu, MF_STRING, ID_VIEW_DETAILS, szTemp); if (GetMenuItemCount(hMenu) <= 4) { - hSubMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_WINDOWSMENU)); - - LoadString(hInst, IDS_MENU_WINDOWS, szTemp, 256); - InsertMenu(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT_PTR) hSubMenu, szTemp); + hSubMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_WINDOWSMENU)); + + LoadStringW(hInst, IDS_MENU_WINDOWS, szTemp, 256); + InsertMenuW(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT_PTR) hSubMenu, szTemp); DrawMenuBar(hMainWnd); } @@ -951,11 +951,11 @@ ShowWindow(hPerformancePage, SW_HIDE); BringWindowToTop(hProcessPage); - LoadString(hInst, IDS_MENU_SELECTCOLUMNS, szTemp, 256); - AppendMenu(hViewMenu, MF_STRING, ID_VIEW_SELECTCOLUMNS, szTemp); - - LoadString(hInst, IDS_MENU_16BITTASK, szTemp, 256); - AppendMenu(hOptionsMenu, MF_STRING, ID_OPTIONS_SHOW16BITTASKS, szTemp); + LoadStringW(hInst, IDS_MENU_SELECTCOLUMNS, szTemp, 256); + AppendMenuW(hViewMenu, MF_STRING, ID_VIEW_SELECTCOLUMNS, szTemp); + + LoadStringW(hInst, IDS_MENU_16BITTASK, szTemp, 256); + AppendMenuW(hOptionsMenu, MF_STRING, ID_OPTIONS_SHOW16BITTASKS, szTemp); if (TaskManagerSettings.Show16BitTasks) CheckMenuItem(hOptionsMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND|MF_CHECKED); @@ -981,17 +981,17 @@ } hSubMenu = CreatePopupMenu(); - LoadString(hInst, IDS_MENU_ONEGRAPHALLCPUS, szTemp, 256); - AppendMenu(hSubMenu, MF_STRING, ID_VIEW_CPUHISTORY_ONEGRAPHALL, szTemp); - - LoadString(hInst, IDS_MENU_ONEGRAPHPERCPU, szTemp, 256); - AppendMenu(hSubMenu, MF_STRING, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, szTemp); - - LoadString(hInst, IDS_MENU_CPUHISTORY, szTemp, 256); - AppendMenu(hViewMenu, MF_STRING|MF_POPUP, (UINT_PTR) hSubMenu, szTemp); - - LoadString(hInst, IDS_MENU_SHOWKERNELTIMES, szTemp, 256); - AppendMenu(hViewMenu, MF_STRING, ID_VIEW_SHOWKERNELTIMES, szTemp); + LoadStringW(hInst, IDS_MENU_ONEGRAPHALLCPUS, szTemp, 256); + AppendMenuW(hSubMenu, MF_STRING, ID_VIEW_CPUHISTORY_ONEGRAPHALL, szTemp); + + LoadStringW(hInst, IDS_MENU_ONEGRAPHPERCPU, szTemp, 256); + AppendMenuW(hSubMenu, MF_STRING, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, szTemp); + + LoadStringW(hInst, IDS_MENU_CPUHISTORY, szTemp, 256); + AppendMenuW(hViewMenu, MF_STRING|MF_POPUP, (UINT_PTR) hSubMenu, szTemp); + + LoadStringW(hInst, IDS_MENU_SHOWKERNELTIMES, szTemp, 256); + AppendMenuW(hViewMenu, MF_STRING, ID_VIEW_SHOWKERNELTIMES, szTemp); if (TaskManagerSettings.ShowKernelTimes) CheckMenuItem(hViewMenu, ID_VIEW_SHOWKERNELTIMES, MF_BYCOMMAND|MF_CHECKED); @@ -1009,16 +1009,16 @@ } } -LPTSTR GetLastErrorText(LPTSTR lpszBuf, DWORD dwSize) +LPWSTR GetLastErrorText(LPWSTR lpszBuf, DWORD dwSize) { DWORD dwRet; - LPTSTR lpszTemp = NULL; - - dwRet = FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |FORMAT_MESSAGE_ARGUMENT_ARRAY, + LPWSTR lpszTemp = NULL; + + dwRet = FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |FORMAT_MESSAGE_ARGUMENT_ARRAY, NULL, GetLastError(), LANG_NEUTRAL, - (LPTSTR)&lpszTemp, + (LPWSTR)&lpszTemp, 0, NULL ); @@ -1026,8 +1026,8 @@ if (!dwRet || ( (long)dwSize < (long)dwRet+14)) { lpszBuf[0] = L'\0'; } else { - lpszTemp[lstrlen(lpszTemp)-2] = L'\0'; /*remove cr and newline character */ - wsprintf(lpszBuf, L"%s (0x%x)", lpszTemp, (int)GetLastError()); + lpszTemp[lstrlenW(lpszTemp)-2] = L'\0'; /*remove cr and newline character */ + wsprintfW(lpszBuf, L"%s (0x%x)", lpszTemp, (int)GetLastError()); } if (lpszTemp) { LocalFree((HLOCAL)lpszTemp); Modified: trunk/reactos/base/applications/taskmgr/trayicon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/trayicon.c (original) +++ trunk/reactos/base/applications/taskmgr/trayicon.c Fri Nov 9 18:26:02 2007 @@ -54,8 +54,8 @@ /* * Load the bitmaps */ - hBitmap = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_TRAYICON)); - hBitmapMask = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_TRAYMASK)); + hBitmap = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_TRAYICON)); + hBitmapMask = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_TRAYMASK)); if (!hBitmap || !hBitmapMask) goto done; @@ -132,16 +132,16 @@ BOOL TrayIcon_ShellAddTrayIcon(void) { - NOTIFYICONDATA nid; + NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; WCHAR szMsg[256]; - memset(&nid, 0, sizeof(NOTIFYICONDATA)); + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); hIcon = TrayIcon_GetProcessorUsageIcon(); - nid.cbSize = sizeof(NOTIFYICONDATA); + nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; @@ -149,10 +149,10 @@ nid.hIcon = hIcon; - LoadString( GetModuleHandle(NULL), IDS_MSG_TRAYICONCPUUSAGE, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); - wsprintf(nid.szTip, szMsg, PerfDataGetProcessorUsage()); - - bRetVal = Shell_NotifyIcon(NIM_ADD, &nid); + LoadStringW( GetModuleHandleW(NULL), IDS_MSG_TRAYICONCPUUSAGE, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); + wsprintfW(nid.szTip, szMsg, PerfDataGetProcessorUsage()); + + bRetVal = Shell_NotifyIconW(NIM_ADD, &nid); if (hIcon) DestroyIcon(hIcon); @@ -162,43 +162,43 @@ BOOL TrayIcon_ShellRemoveTrayIcon(void) { - NOTIFYICONDATA nid; + NOTIFYICONDATAW nid; BOOL bRetVal; - memset(&nid, 0, sizeof(NOTIFYICONDATA)); - - nid.cbSize = sizeof(NOTIFYICONDATA); + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); + + nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = 0; nid.uCallbackMessage = WM_ONTRAYICON; - bRetVal = Shell_NotifyIcon(NIM_DELETE, &nid); + bRetVal = Shell_NotifyIconW(NIM_DELETE, &nid); return bRetVal; } BOOL TrayIcon_ShellUpdateTrayIcon(void) { - NOTIFYICONDATA nid; + NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; WCHAR szTemp[256]; - memset(&nid, 0, sizeof(NOTIFYICONDATA)); + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); hIcon = TrayIcon_GetProcessorUsageIcon(); - nid.cbSize = sizeof(NOTIFYICONDATA); + nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; - LoadString(hInst, IDS_MSG_TRAYICONCPUUSAGE, szTemp, 256); - wsprintf(nid.szTip, szTemp, PerfDataGetProcessorUsage()); - - bRetVal = Shell_NotifyIcon(NIM_MODIFY, &nid); + LoadStringW(hInst, IDS_MSG_TRAYICONCPUUSAGE, szTemp, 256); + wsprintfW(nid.szTip, szTemp, PerfDataGetProcessorUsage()); + + bRetVal = Shell_NotifyIconW(NIM_MODIFY, &nid); if (hIcon) DestroyIcon(hIcon);

1 0

[fireball] 30296: Dmitry Chapyshev <lentind@yandex.ru> - Small visual improvements in 24 and 8 bpp icons. - Create 8bpp or 24bpp icons if they were missing somewhere.
by fireball＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: fireball Date: Fri Nov 9 18:15:38 2007 New Revision: 30296 URL: http://svn.reactos.org/svn/reactos?rev=30296&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Small visual improvements in 24 and 8 bpp icons. - Create 8bpp or 24bpp icons if they were missing somewhere. Modified: trunk/reactos/dll/cpl/access/resources/applet.ico trunk/reactos/dll/cpl/appwiz/resources/1503.ico trunk/reactos/dll/cpl/appwiz/resources/1504.ico trunk/reactos/dll/cpl/appwiz/resources/1505.ico trunk/reactos/dll/cpl/desk/resources/applet.ico trunk/reactos/dll/win32/shell32/res/icons/1001.ico trunk/reactos/dll/win32/shell32/res/icons/13.ico trunk/reactos/dll/win32/shell32/res/icons/15.ico trunk/reactos/dll/win32/shell32/res/icons/16.ico trunk/reactos/dll/win32/shell32/res/icons/172.ico trunk/reactos/dll/win32/shell32/res/icons/191.ico trunk/reactos/dll/win32/shell32/res/icons/192.ico trunk/reactos/dll/win32/shell32/res/icons/20.ico trunk/reactos/dll/win32/shell32/res/icons/240.ico trunk/reactos/dll/win32/shell32/res/icons/268.ico trunk/reactos/dll/win32/shell32/res/icons/290.ico trunk/reactos/dll/win32/shell32/res/icons/30.ico trunk/reactos/dll/win32/shell32/res/icons/32.ico trunk/reactos/dll/win32/shell32/res/icons/326.ico trunk/reactos/dll/win32/shell32/res/icons/33.ico trunk/reactos/dll/win32/shell32/res/icons/37.ico trunk/reactos/dll/win32/shell32/res/icons/4.ico Modified: trunk/reactos/dll/cpl/access/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resources/a… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/appwiz/resources/1503.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/1… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/appwiz/resources/1504.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/1… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/appwiz/resources/1505.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/1… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/desk/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resources/app… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/1001.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/13.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/15.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/16.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/172.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/191.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/192.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/20.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/240.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/268.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/290.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/30.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/32.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/326.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/33.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/37.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/4.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available.

1 0

[greatlrd] 30295: Implement KsCreateAllocator, KsCreateClock, KsCreatePin, KsCreateTopologyNode stub : KsiCreateObjectType all functions are call to KsiCreateObjectType, so they are not really implement. Old code from 2004, it have not been cleanup for KsiCreateObjectType, the new ks.h header I wrote is now ready for this code. This module can not be merge to trunk until the new ks.h is ready.
by greatlrd＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: greatlrd Date: Fri Nov 9 18:08:44 2007 New Revision: 30295 URL: http://svn.reactos.org/svn/reactos?rev=30295&view=rev Log: Implement KsCreateAllocator, KsCreateClock, KsCreatePin, KsCreateTopologyNode stub : KsiCreateObjectType all functions are call to KsiCreateObjectType, so they are not really implement. Old code from 2004, it have not been cleanup for KsiCreateObjectType, the new ks.h header I wrote is now ready for this code. This module can not be merge to trunk until the new ks.h is ready. Modified: branches/reactx/reactos/dll/directx/ksuser/ksuser.c branches/reactx/reactos/dll/directx/ksuser/ksuser.h Modified: branches/reactx/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ksus… ============================================================================== --- branches/reactx/reactos/dll/directx/ksuser/ksuser.c (original) +++ branches/reactx/reactos/dll/directx/ksuser/ksuser.c Fri Nov 9 18:08:44 2007 @@ -1,27 +1,82 @@ -#define _KSDDK_ -#include <windows.h> -#include <ks.h> #include "ksuser.h" -#include <debug.h> +NTSTATUS NTAPI KsiCreateObjectType( HANDLE hHandle, PVOID guidstr, PVOID Buffer, ULONG BufferSize, ACCESS_MASK DesiredAccess, PHANDLE phHandle); +NTSTATUS +NTAPI +KsiCreateObjectType( HANDLE hHandle, + PVOID IID, + PVOID Buffer, + ULONG BufferSize, + ACCESS_MASK DesiredAccess, + PHANDLE phHandle) +{ + UNIMPLEMENTED + return 0; +} - - +/*++ +* @name KsCreateAllocator +* @implemented +* +* The function KsCreateAllocator +* +* @param +* +* @param +* +* @param ACCESS_MASK DesiredAccess +* Desrided access +* +* @param +* +* @return +* Return NTSTATUS error code or sussess code. +* +* @remarks. +* none +* +*--*/ KSDDKAPI NTSTATUS NTAPI KsCreateAllocator(HANDLE ConnectionHandle, PKSALLOCATOR_FRAMING AllocatorFraming, PHANDLE AllocatorHandle) + { - - return 0; + return KsiCreateObjectType( ConnectionHandle, + KSSTRING_Allocator, + (PVOID) AllocatorFraming, + sizeof(KSALLOCATOR_FRAMING), + GENERIC_READ, + AllocatorHandle); } -/* +/*++ +* @name KsCreateClock +* @implemented +* +* The function KsCreateClock +* +* @param +* +* @param +* +* @param ACCESS_MASK DesiredAccess +* Desrided access +* +* @param +* +* @return +* Return NTSTATUS error code or sussess code. +* +* @remarks. +* none +* +*--*/ KSDDKAPI NTSTATUS NTAPI @@ -29,10 +84,38 @@ PKSCLOCK_CREATE ClockCreate, PHANDLE ClockHandle) { - UNIMPLEMENTED - return 0; + return KsiCreateObjectType( ConnectionHandle, + KSSTRING_Clock, + (PVOID) ClockCreate, + sizeof(KSCLOCK_CREATE), + GENERIC_READ, + ClockHandle); } + + +/*++ +* @name KsCreatePin +* @implemented +* +* The function KsCreatePin +* +* @param +* +* @param +* +* @param ACCESS_MASK DesiredAccess +* Desrided access +* +* @param +* +* @return +* Return NTSTATUS error code or sussess code. +* +* @remarks. +* none +* +*--*/ KSDDKAPI NTSTATUS NTAPI @@ -41,10 +124,41 @@ ACCESS_MASK DesiredAccess, OUT PHANDLE ConnectionHandle) { - UNIMPLEMENTED - return 0; + return KsiCreateObjectType(FilterHandle, + KSSTRING_Pin, + Connect, + sizeof(KSPIN_CONNECT), + DesiredAccess, + ConnectionHandle); + } +/*++ +* @name KsCreateTopologyNode +* @implemented +* +* The function KsCreateTopologyNode creates a handle to a topology node instance +* +* @param HANDLE ParentHandle +* Handle to parent when want to use when we created the node on +* +* +* @param PKSNODE_CREATE NodeCreate +* topology node parameters to use when it is create +* +* @param ACCESS_MASK DesiredAccess +* Desrided access +* +* @param PHANDLE NodeHandle +* Location for the topology node handle +* +* @return +* Return NTSTATUS error code or sussess code. +* +* @remarks. +* none +* +*--*/ KSDDKAPI NTSTATUS NTAPI @@ -53,10 +167,14 @@ IN ACCESS_MASK DesiredAccess, OUT PHANDLE NodeHandle) { - UNIMPLEMENTED - return 0; + return KsiCreateObjectType( ParentHandle, + KSSTRING_TopologyNode, + (PVOID) NodeCreate, + sizeof(KSNODE_CREATE), + DesiredAccess, + NodeHandle); } -*/ + BOOL APIENTRY Modified: branches/reactx/reactos/dll/directx/ksuser/ksuser.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ksus… ============================================================================== --- branches/reactx/reactos/dll/directx/ksuser/ksuser.h (original) +++ branches/reactx/reactos/dll/directx/ksuser/ksuser.h Fri Nov 9 18:08:44 2007 @@ -1,3 +1,16 @@ + + + +#define _KSDDK_ #include <windows.h> +#ifndef NTSTATUS + #define NTSTATUS DWORD +#endif +#include <ks.h> +#include <debug.h> + + + +

1 0

[fireball] 30294: Dmitry Chapyshev <lentind@yandex.ru> - Start implementing telephon.cpl. - Delete flags.ico from intl.cpl, it's unused.
by fireball＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: fireball Date: Fri Nov 9 17:56:33 2007 New Revision: 30294 URL: http://svn.reactos.org/svn/reactos?rev=30294&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Start implementing telephon.cpl. - Delete flags.ico from intl.cpl, it's unused. Added: trunk/reactos/dll/cpl/telephon/ trunk/reactos/dll/cpl/telephon/lang/ trunk/reactos/dll/cpl/telephon/lang/en-US.rc (with props) trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc (with props) trunk/reactos/dll/cpl/telephon/manifest.xml (with props) trunk/reactos/dll/cpl/telephon/resource.h (with props) trunk/reactos/dll/cpl/telephon/resources/ trunk/reactos/dll/cpl/telephon/resources/applet.ico (with props) trunk/reactos/dll/cpl/telephon/rsrc.rc (with props) trunk/reactos/dll/cpl/telephon/telephon.c (with props) trunk/reactos/dll/cpl/telephon/telephon.def (with props) trunk/reactos/dll/cpl/telephon/telephon.h (with props) trunk/reactos/dll/cpl/telephon/telephon.rbuild (with props) trunk/reactos/dll/cpl/telephon/telephon.rc (with props) Removed: trunk/reactos/dll/cpl/intl/resources/flags.ico Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/cpl/cpl.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=302… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Fri Nov 9 17:56:33 2007 @@ -5,6 +5,7 @@ <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> <property name="BASEADDRESS_COMCAT" value="0x20A50000" /> <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> + <property name="BASEADDRESS_TELEPHON" value="0x58750000" /> <property name="BASEADDRESS_PWRCFG" value="0x587e0000" /> <property name="BASEADDRESS_MMSYS" value="0x588a0000" /> <property name="BASEADDRESS_JOY" value="0x589b0000" /> Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=302… ============================================================================== --- trunk/reactos/dll/cpl/cpl.rbuild (original) +++ trunk/reactos/dll/cpl/cpl.rbuild Fri Nov 9 17:56:33 2007 @@ -40,6 +40,9 @@ <directory name="sysdm"> <xi:include href="sysdm/sysdm.rbuild" /> </directory> +<directory name="telephon"> + <xi:include href="telephon/telephon.rbuild" /> +</directory> <directory name="timedate"> <xi:include href="timedate/timedate.rbuild" /> </directory> Removed: trunk/reactos/dll/cpl/intl/resources/flags.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/resources/fla… ============================================================================== Binary file - no diff available. Added: trunk/reactos/dll/cpl/telephon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/en-U… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/en-US.rc (added) +++ trunk/reactos/dll/cpl/telephon/lang/en-US.rc Fri Nov 9 17:56:33 2007 @@ -1,0 +1,7 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Phone and Modem Options" + IDS_CPLSYSTEMDESCRIPTION "Configure your telephone dialing rules and modem settings." +END Propchange: trunk/reactos/dll/cpl/telephon/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ru-R… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc (added) +++ trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc Fri Nov 9 17:56:33 2007 @@ -1,0 +1,7 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Òåëåôîí è ìîäåì" + IDS_CPLSYSTEMDESCRIPTION "Íàñòðîéêà ïðàâèë íàáîðà íîìåðà è äðóãèõ ïàðàìåòðîâ ïðè ðàáîòå ñ ìîäåìîì." +END Propchange: trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/telephon/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/manifest.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/manifest.xml (added) +++ trunk/reactos/dll/cpl/telephon/manifest.xml Fri Nov 9 17:56:33 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Propchange: trunk/reactos/dll/cpl/telephon/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/telephon/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/resource.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/resource.h (added) +++ trunk/reactos/dll/cpl/telephon/resource.h Fri Nov 9 17:56:33 2007 @@ -1,0 +1,13 @@ +#ifndef __CPL_RESOURCE_H +#define __CPL_RESOURCE_H + +/* icons */ +#define IDI_CPLSYSTEM 100 + +/* strings */ +#define IDS_CPLSYSTEMNAME 1001 +#define IDS_CPLSYSTEMDESCRIPTION 2001 + +#endif /* __CPL_RESOURCE_H */ + +/* EOF */ Propchange: trunk/reactos/dll/cpl/telephon/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/telephon/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/telephon/resources/applet.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/telephon/rsrc.rc (added) +++ trunk/reactos/dll/cpl/telephon/rsrc.rc Fri Nov 9 17:56:33 2007 @@ -1,0 +1,5 @@ +#include "resource.h" +#include <windows.h> + +#include "lang/en-US.rc" +#include "lang/ru-RU.rc" Propchange: trunk/reactos/dll/cpl/telephon/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/telephon/telephon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/telephon.c (added) +++ trunk/reactos/dll/cpl/telephon/telephon.c Fri Nov 9 17:56:33 2007 @@ -1,0 +1,121 @@ +/* + * ReactOS + * Copyright (C) 2007 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * + * PROJECT: ReactOS Software Control Panel + * FILE: dll/cpl/telephon/telephon.c + * PURPOSE: ReactOS Software Control Panel + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * UPDATE HISTORY: + * 10-19-2007 Created + */ + +#include "telephon.h" + +#define NUM_APPLETS (1) + +LONG CALLBACK SystemApplet(VOID); +HINSTANCE hApplet = 0; + +/* Applets */ + +APPLET Applets[NUM_APPLETS] = +{ + {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} +}; + +/* First Applet */ +LONG CALLBACK +SystemApplet(VOID) +{ + PROPSHEETPAGE psp[1]; + PROPSHEETHEADER psh; + TCHAR Caption[1024]; + + LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + psh.pszCaption = Caption; + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nStartPage = 0; + psh.ppsp = psp; + psh.pfnCallback = NULL; + + //InitPropSheetPage(&psp[0], IDD_PROPPAGE, (DLGPROC)PageProc); + + return (LONG)(PropertySheet(&psh) != -1); +} + + +/* Control Panel Callback */ +LONG CALLBACK +CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + CPLINFO *CPlInfo; + DWORD i; + + UNREFERENCED_PARAMETER(hwndCPl); + + i = (DWORD)lParam1; + switch (uMsg) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return NUM_APPLETS; + + case CPL_INQUIRE: + CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + break; + + case CPL_DBLCLK: + Applets[i].AppletProc(); + break; + } + + return FALSE; +} + + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(lpvReserved); + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + CoInitialize(NULL); + hApplet = hinstDLL; + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/cpl/telephon/telephon.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/telephon/telephon.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/telephon.def (added) +++ trunk/reactos/dll/cpl/telephon/telephon.def Fri Nov 9 17:56:33 2007 @@ -1,0 +1,6 @@ +LIBRARY telephon.cpl + +EXPORTS +CPlApplet + +; EOF Propchange: trunk/reactos/dll/cpl/telephon/telephon.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/telephon/telephon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/telephon.h (added) +++ trunk/reactos/dll/cpl/telephon/telephon.h Fri Nov 9 17:56:33 2007 @@ -1,0 +1,32 @@ +#ifndef __CPL_TELEPHON_H +#define __CPL_TELEPHON_H + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> + +#include "resource.h" + +typedef LONG (CALLBACK *CPLAPPLET_PROC)(VOID); + +typedef struct +{ + int idIcon; + int idName; + int idDescription; + CPLAPPLET_PROC AppletProc; +} APPLET, *PAPPLET; + + +extern HINSTANCE hApplet; + +void ShowLastWin32Error(HWND hWndOwner); + +#endif /* __CPL_TELEPHON_H */ + +/* EOF */ Propchange: trunk/reactos/dll/cpl/telephon/telephon.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/telephon/telephon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/telephon.rbuild (added) +++ trunk/reactos/dll/cpl/telephon/telephon.rbuild Fri Nov 9 17:56:33 2007 @@ -1,0 +1,19 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="telephon" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TELEPHON}" installbase="system32" installname="telephon.cpl" unicode="yes"> + <importlibrary definition="telephon.def" /> + <include base="telephon">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>comctl32</library> + <library>msvcrt</library> + <library>ole32</library> + <library>uuid</library> + <library>shell32</library> + <file>telephon.c</file> + <file>telephon.rc</file> +</module> Propchange: trunk/reactos/dll/cpl/telephon/telephon.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/telephon/telephon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/telephon.rc (added) +++ trunk/reactos/dll/cpl/telephon/telephon.rc Fri Nov 9 17:56:33 2007 @@ -1,0 +1,20 @@ +#include "resource.h" +#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" +#define REACTOS_STR_INTERNAL_NAME "telephon\0" +#define REACTOS_STR_ORIGINAL_FILENAME "telephon.cpl\0" +#ifdef _MSC_VER +#include <../../../reactos/version.rc> +#else +#include <reactos/version.rc> +#endif + +123 24 DISCARDABLE "manifest.xml" + +IDI_CPLSYSTEM ICON "resources/applet.ico" + +#include "rsrc.rc" Propchange: trunk/reactos/dll/cpl/telephon/telephon.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 30293: update the new ks-h with one more struct
by greatlrd＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: greatlrd Date: Fri Nov 9 17:21:55 2007 New Revision: 30293 URL: http://svn.reactos.org/svn/reactos?rev=30293&view=rev Log: update the new ks-h with one more struct Modified: branches/reactx/reactos/include/dxsdk/ks.h Modified: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h (original) +++ branches/reactx/reactos/include/dxsdk/ks.h Fri Nov 9 17:21:55 2007 @@ -4,10 +4,6 @@ #if !defined(_KS_) #define _KS_ - -#ifndef _NTDDK_ -#define NTSTATUS -#endif #if defined(__TCS__) #define _KS_NO_ANONYMOUS_STRUCTURES_ 1 @@ -1190,6 +1186,11 @@ ULONG Reserved; } KSALLOCATOR_FRAMING, *PKSALLOCATOR_FRAMING; +typedef struct +{ + ULONG CreateFlags; +} KSCLOCK_CREATE, *PKSCLOCK_CREATE; + #define DEFINE_KSPROPERTY_ITEM_GENERAL_COMPONENTID(Handler)\ DEFINE_KSPROPERTY_ITEM(KSPROPERTY_GENERAL_COMPONENTID, (Handler), sizeof(KSPROPERTY), sizeof(KSCOMPONENTID), NULL, NULL, 0, NULL, NULL, 0) @@ -1376,12 +1377,9 @@ #define KSDDKAPI DECLSPEC_IMPORT #endif -KSDDKAPI -NTSTATUS -NTAPI -KsCreateAllocator(IN HANDLE ConnectionHandle, - IN PKSALLOCATOR_FRAMING AllocatorFraming, - OUT PHANDLE AllocatorHandle); + + + #if defined(__cplusplus)

1 0

[fireball] 30292: - This one is not needed anymore (_LIBCNT_ is defined in libcntpr.rbuild, PCH is precomp.h).
by fireball＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: fireball Date: Fri Nov 9 15:25:10 2007 New Revision: 30292 URL: http://svn.reactos.org/svn/reactos?rev=30292&view=rev Log: - This one is not needed anymore (_LIBCNT_ is defined in libcntpr.rbuild, PCH is precomp.h). Removed: trunk/reactos/lib/sdk/crt/libcntpr.h Removed: trunk/reactos/lib/sdk/crt/libcntpr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.h?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.h (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.h (removed) @@ -1,22 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS System Libraries - * FILE: lib/sdk/libcntpr/libcntpr.h - * PURPOSE: NT Private CRT - * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#ifndef _LIBCNT_ -#define _LIBCNT_ - -// -// C Headers -// -#include <stdlib.h> -#include <stdio.h> - -#endif /* _LIBCNT_ */ - -/* EOF */

1 0

[fireball] 30291: - Build crt and libcntpr from one source tree (using conditional code and/or different source files where code is not shared).
by fireball＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: fireball Date: Fri Nov 9 15:20:16 2007 New Revision: 30291 URL: http://svn.reactos.org/svn/reactos?rev=30291&view=rev Log: - Build crt and libcntpr from one source tree (using conditional code and/or different source files where code is not shared). Added: trunk/reactos/lib/sdk/crt/libcntpr.h (contents, props changed) - copied, changed from r30261, trunk/reactos/lib/sdk/libcntpr/libcntpr.h trunk/reactos/lib/sdk/crt/libcntpr.rbuild (contents, props changed) - copied, changed from r30261, trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild trunk/reactos/lib/sdk/crt/math/i386/alldiv_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/alldiv_asm.s trunk/reactos/lib/sdk/crt/math/i386/alldvrm_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/alldvrm_asm.s trunk/reactos/lib/sdk/crt/math/i386/allmul_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/allmul_asm.s trunk/reactos/lib/sdk/crt/math/i386/allrem_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/allrem_asm.s trunk/reactos/lib/sdk/crt/math/i386/allshl_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/allshl_asm.s trunk/reactos/lib/sdk/crt/math/i386/allshr_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/allshr_asm.s trunk/reactos/lib/sdk/crt/math/i386/aulldiv_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/aulldiv_asm.s trunk/reactos/lib/sdk/crt/math/i386/aulldvrm_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/aulldvrm_asm.s trunk/reactos/lib/sdk/crt/math/i386/aullrem_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/aullrem_asm.s trunk/reactos/lib/sdk/crt/math/i386/aullshr_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/aullshr_asm.s trunk/reactos/lib/sdk/crt/math/i386/ceil_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/ceil_asm.s trunk/reactos/lib/sdk/crt/math/i386/cos_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s trunk/reactos/lib/sdk/crt/math/i386/fabs_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s trunk/reactos/lib/sdk/crt/math/i386/floor_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/floor_asm.s trunk/reactos/lib/sdk/crt/math/i386/ftol_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/ftol_asm.s trunk/reactos/lib/sdk/crt/math/i386/log_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s trunk/reactos/lib/sdk/crt/math/i386/sin_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s trunk/reactos/lib/sdk/crt/math/i386/sqrt_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s trunk/reactos/lib/sdk/crt/math/i386/tan_asm.s - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s trunk/reactos/lib/sdk/crt/math/rand_nt.c - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/rand.c trunk/reactos/lib/sdk/crt/string/sscanf.c - copied, changed from r30261, trunk/reactos/lib/sdk/libcntpr/string/sscanf.c trunk/reactos/lib/sdk/crt/string/strcspn.c - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/string/strcspn.c trunk/reactos/lib/sdk/crt/string/strspn.c - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/string/strspn.c trunk/reactos/lib/sdk/crt/string/strxspn.h - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/string/strxspn.h Removed: trunk/reactos/lib/sdk/libcntpr/ Modified: trunk/reactos/lib/sdk/crt/README.txt trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s trunk/reactos/lib/sdk/crt/string/atoi.c trunk/reactos/lib/sdk/crt/string/splitp.c trunk/reactos/lib/sdk/crt/wine/scanf.h trunk/reactos/lib/sdk/sdk.rbuild Modified: trunk/reactos/lib/sdk/crt/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/README.txt?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/README.txt (original) +++ trunk/reactos/lib/sdk/crt/README.txt Fri Nov 9 15:20:16 2007 @@ -7,7 +7,7 @@ TODO List: Implement the remaining functions that are commented out in the .def file Update source code headers for the license information. -Compleate the W32API conversion for all source files. +Complete the W32API conversion for all source files. Write a decent regression test suite. Convert all C++ style comments to C style comments. ???? Copied: trunk/reactos/lib/sdk/crt/libcntpr.h (from r30261, trunk/reactos/lib/sdk/libcntpr/libcntpr.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.h?p2=… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/libcntpr.h (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.h Fri Nov 9 15:20:16 2007 @@ -1,22 +1,22 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS System Libraries - * FILE: lib/sdk/libcntpr/libcntpr.h - * PURPOSE: NT Private CRT - * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#ifndef _LIBCNT_ -#define _LIBCNT_ - -// -// C Headers -// -#include <stdlib.h> -#include <stdio.h> - -#endif /* _LIBCNT_ */ - -/* EOF */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/sdk/libcntpr/libcntpr.h + * PURPOSE: NT Private CRT + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#ifndef _LIBCNT_ +#define _LIBCNT_ + +// +// C Headers +// +#include <stdlib.h> +#include <stdio.h> + +#endif /* _LIBCNT_ */ + +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/libcntpr.h ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/lib/sdk/crt/libcntpr.rbuild (from r30261, trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild Fri Nov 9 15:20:16 2007 @@ -1,162 +1,177 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="libcntpr" type="staticlibrary"> - <define name="__NO_CTYPE_INLINES" /> - <define name="NO_RTL_INLINES" /> - <define name="_NTSYSTEM_" /> - <define name="_NTDLLBUILD_" /> - <define name="_SEH_NO_NATIVE_NLG" /> - <if property="ARCH" value="i386"> - <define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define> - </if> - <include base="libcntpr">.</include> - - <directory name="except"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>chkstk_asm.s</file> - <file>seh.s</file> - </directory> - </if> - <if property="ARCH" value="powerpc"> - <directory name="powerpc"> - <file>chkstk_asm.s</file> - <file>seh.s</file> - </directory> - </if> - </directory> - <directory name="math"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>alldiv_asm.s</file> - <file>alldvrm_asm.s</file> - <file>allmul_asm.s</file> - <file>allrem_asm.s</file> - <file>allshl_asm.s</file> - <file>allshr_asm.s</file> - <file>atan_asm.s</file> - <file>aulldiv_asm.s</file> - <file>aulldvrm_asm.s</file> - <file>aullrem_asm.s</file> - <file>aullshr_asm.s</file> - <file>ceil_asm.s</file> - <file>cos_asm.s</file> - <file>fabs_asm.s</file> - <file>floor_asm.s</file> - <file>ftol_asm.s</file> - <file>log_asm.s</file> - <file>pow_asm.s</file> - <file>sin_asm.s</file> - <file>sqrt_asm.s</file> - <file>tan_asm.s</file> - </directory> - </if> - <file>abs.c</file> - <file>bsearch.c</file> - <file>labs.c</file> - <file>rand.c</file> - </directory> - - <directory name="mem"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>memchr_asm.s</file> - <file>memcpy_asm.s</file> - <file>memmove_asm.s</file> - <file>memset_asm.s</file> - </directory> - </if> - <ifnot property="ARCH" value="i386"> - <file>memchr.c</file> - <file>memcpy.c</file> - <file>memmove.c</file> - <file>memset.c</file> - </ifnot> - <file>memccpy.c</file> - <file>memcmp.c</file> - <file>memicmp.c</file> - </directory> - - <directory name="string"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>strcat_asm.s</file> - <file>strchr_asm.s</file> - <file>strcmp_asm.s</file> - <file>strcpy_asm.s</file> - <file>strlen_asm.s</file> - <file>strncat_asm.s</file> - <file>strncmp_asm.s</file> - <file>strncpy_asm.s</file> - <file>strnlen_asm.s</file> - <file>strrchr_asm.s</file> - <file>wcscat_asm.s</file> - <file>wcschr_asm.s</file> - <file>wcscmp_asm.s</file> - <file>wcscpy_asm.s</file> - <file>wcslen_asm.s</file> - <file>wcsncat_asm.s</file> - <file>wcsncmp_asm.s</file> - <file>wcsncpy_asm.s</file> - <file>wcsnlen_asm.s</file> - <file>wcsrchr_asm.s</file> - </directory> - </if> - <ifnot property="ARCH" value="i386"> - <file>strcat.c</file> - <file>strchr.c</file> - <file>strcmp.c</file> - <file>strcpy.c</file> - <file>strlen.c</file> - <file>strncat.c</file> - <file>strncmp.c</file> - <file>strncpy.c</file> - <file>strnlen.c</file> - <file>strrchr.c</file> - <file>wcscat.c</file> - <file>wcschr.c</file> - <file>wcscmp.c</file> - <file>wcscpy.c</file> - <file>wcslen.c</file> - <file>wcsncat.c</file> - <file>wcsncmp.c</file> - <file>wcsncpy.c</file> - <file>wcsnlen.c</file> - <file>wcsrchr.c</file> - </ifnot> - <file>ctype.c</file> - <file>strcspn.c</file> - <file>stricmp.c</file> - <file>strnicmp.c</file> - <file>strlwr.c</file> - <file>strrev.c</file> - <file>strset.c</file> - <file>strstr.c</file> - <file>strupr.c</file> - <file>strpbrk.c</file> - <file>strspn.c</file> - <file>wstring.c</file> - <file>wcsrev.c</file> - <file>wcsnset.c</file> - <file>atoi64.c</file> - <file>atoi.c</file> - <file>atol.c</file> - <file>itoa.c</file> - <file>itow.c</file> - <file>lfind.c</file> - <file>mbstowcs.c</file> - <file>splitp.c</file> - <file>strtol.c</file> - <file>strtoul.c</file> - <file>strtoull.c</file> - <file>wcstol.c</file> - <file>wcstombs.c</file> - <file>wcstoul.c</file> - <file>wtoi64.c</file> - <file>wtoi.c</file> - <file>wtol.c</file> - <file>sscanf.c</file> - </directory> - - <pch>libcntpr.h</pch> -</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="libcntpr" type="staticlibrary"> + <include base="crt">.</include> + <include base="crt">include</include> + <define name="__NO_CTYPE_INLINES" /> + <define name="NO_RTL_INLINES" /> + <define name="_NTSYSTEM_" /> + <define name="_NTDLLBUILD_" /> + <define name="_SEH_NO_NATIVE_NLG" /> + <define name="_LIBCNT_" /> + <if property="ARCH" value="i386"> + <define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define> + </if> + + <directory name="except_nt"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>chkstk_asm.s</file> + <file>seh.s</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>chkstk_asm.s</file> + <file>seh.s</file> + </directory> + </if> + </directory> + <directory name="math"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>alldiv_asm.s</file> + <file>alldvrm_asm.s</file> + <file>allmul_asm.s</file> + <file>allrem_asm.s</file> + <file>allshl_asm.s</file> + <file>allshr_asm.s</file> + <file>atan_asm.s</file> + <file>aulldiv_asm.s</file> + <file>aulldvrm_asm.s</file> + <file>aullrem_asm.s</file> + <file>aullshr_asm.s</file> + <file>ceil_asm.s</file> + <file>cos_asm.s</file> + <file>fabs_asm.s</file> + <file>floor_asm.s</file> + <file>ftol_asm.s</file> + <file>log_asm.s</file> + <file>pow_asm.s</file> + <file>sin_asm.s</file> + <file>sqrt_asm.s</file> + <file>tan_asm.s</file> + </directory> + </if> + <file>abs.c</file> + <file>labs.c</file> + <file>rand_nt.c</file> + </directory> + + <directory name="mem"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>memchr_asm.s</file> + <file>memcpy_asm.s</file> + <file>memmove_asm.s</file> + <file>memset_asm.s</file> + </directory> + </if> + <ifnot property="ARCH" value="i386"> + <file>memchr.c</file> + <file>memcpy.c</file> + <file>memmove.c</file> + <file>memset.c</file> + </ifnot> + <file>memccpy.c</file> + <file>memcmp.c</file> + <file>memicmp.c</file> + </directory> + + <directory name="search"> + <file>bsearch.c</file> + <file>lfind.c</file> + </directory> + + <directory name="string"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>strcat_asm.s</file> + <file>strchr_asm.s</file> + <file>strcmp_asm.s</file> + <file>strcpy_asm.s</file> + <file>strlen_asm.s</file> + <file>strncat_asm.s</file> + <file>strncmp_asm.s</file> + <file>strncpy_asm.s</file> + <file>strnlen_asm.s</file> + <file>strrchr_asm.s</file> + <file>wcscat_asm.s</file> + <file>wcschr_asm.s</file> + <file>wcscmp_asm.s</file> + <file>wcscpy_asm.s</file> + <file>wcslen_asm.s</file> + <file>wcsncat_asm.s</file> + <file>wcsncmp_asm.s</file> + <file>wcsncpy_asm.s</file> + <file>wcsnlen_asm.s</file> + <file>wcsrchr_asm.s</file> + </directory> + </if> + <ifnot property="ARCH" value="i386"> + <file>strcat.c</file> + <file>strchr.c</file> + <file>strcmp.c</file> + <file>strcpy.c</file> + <file>strlen.c</file> + <file>strncat.c</file> + <file>strncmp.c</file> + <file>strncpy.c</file> + <file>strnlen.c</file> + <file>strrchr.c</file> + <file>wcscat.c</file> + <file>wcschr.c</file> + <file>wcscmp.c</file> + <file>wcscpy.c</file> + <file>wcslen.c</file> + <file>wcsncat.c</file> + <file>wcsncmp.c</file> + <file>wcsncpy.c</file> + <file>wcsnlen.c</file> + <file>wcsrchr.c</file> + </ifnot> + <file>ctype.c</file> + <file>strcspn.c</file> + <file>stricmp.c</file> + <file>strnicmp.c</file> + <file>strlwr.c</file> + <file>strrev.c</file> + <file>strset.c</file> + <file>strstr.c</file> + <file>strupr.c</file> + <file>strpbrk.c</file> + <file>strspn.c</file> + <file>atoi64.c</file> + <file>atoi.c</file> + <file>atol.c</file> + <file>itoa.c</file> + <file>itow.c</file> + <file>mbstowcs_nt.c</file> + <file>splitp.c</file> + <file>sscanf.c</file> + <file>strtol.c</file> + <file>strtoul.c</file> + <file>strtoull.c</file> + <file>wcstol.c</file> + <file>wcstombs_nt.c</file> + <file>wcstoul.c</file> + <file>wtoi64.c</file> + <file>wtoi.c</file> + <file>wtol.c</file> + </directory> + + <directory name="wstring"> + <file>wcsicmp.c</file> + <file>wcslwr.c</file> + <file>wcsnicmp.c</file> + <file>wcsupr.c</file> + <file>wcscspn.c</file> + <file>wcspbrk.c</file> + <file>wcsset.c</file> + <file>wcsspn.c</file> + <file>wcsstr.c</file> + <file>wcsrev.c</file> + </directory> + + <pch>precomp.h</pch> +</module> Propchange: trunk/reactos/lib/sdk/crt/libcntpr.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/atan… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s (original) +++ trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s Fri Nov 9 15:20:16 2007 @@ -1,22 +1,50 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * PURPOSE: - * FILE: - * PROGRAMER: Magnus Olsen (magnus(a)greatlord.com) - * + * PURPOSE: Run-Time Library + * FILE: lib/rtl/i386/atan.S + * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ .globl _atan - + .intel_syntax noprefix /* FUNCTIONS ***************************************************************/ _atan: push ebp - mov ebp,esp - fld qword ptr [ebp+8] - fpatan + mov ebp,esp + fld qword ptr [ebp+8] // Load real from stack + fld1 // Load constant 1 + fpatan // Take the arctangent pop ebp ret Modified: trunk/reactos/lib/sdk/crt/string/atoi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atoi.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/atoi.c (original) +++ trunk/reactos/lib/sdk/crt/string/atoi.c Fri Nov 9 15:20:16 2007 @@ -1,5 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> +#include <tchar.h> /* * @implemented Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c (original) +++ trunk/reactos/lib/sdk/crt/string/splitp.c Fri Nov 9 15:20:16 2007 @@ -1,4 +1,5 @@ #include <precomp.h> +#include <tchar.h> /* * @implemented Copied: trunk/reactos/lib/sdk/crt/string/sscanf.c (from r30261, trunk/reactos/lib/sdk/libcntpr/string/sscanf.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/sscanf.… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/string/sscanf.c (original) +++ trunk/reactos/lib/sdk/crt/string/sscanf.c Fri Nov 9 15:20:16 2007 @@ -1,10 +1,13 @@ -/**/ -#define WIN32_NO_STATUS -#include <windows.h> -#include <ndk/umtypes.h> -#include <ndk/rtlfuncs.h> -#include <stdlib.h> -#include <stdarg.h> +#include <precomp.h> + +#include <wchar.h> +#include <ctype.h> + +#define NDEBUG +#include <internal/debug.h> + +#define WARN DPRINT1 + #define EOF (-1) @@ -23,7 +26,7 @@ #undef WIDE_SCANF #undef CONSOLE #define STRING 1 -#include "scanf.h" +#include "wine/scanf.h" int sscanf(const char *str, const char *format, ...) { Modified: trunk/reactos/lib/sdk/crt/wine/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/scanf.h?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/scanf.h (original) +++ trunk/reactos/lib/sdk/crt/wine/scanf.h Fri Nov 9 15:20:16 2007 @@ -460,7 +460,11 @@ int invert = 0; /* Set if we are NOT to find the chars */ /* Init our bitmap */ +#ifdef _LIBCNT_ + Mask = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8); +#else Mask = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8); +#endif RtlInitializeBitMap(&bitMask, Mask, _BITMAPSIZE_); /* Read the format */ @@ -506,7 +510,11 @@ } /* terminate */ if (!suppress) *sptr = 0; +#ifdef _LIBCNT_ + RtlFreeHeap(RtlGetProcessHeap(), 0, Mask); +#else HeapFree(GetProcessHeap(), 0, Mask); +#endif } break; default: Modified: trunk/reactos/lib/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/sdk.rbuild?rev=302… ============================================================================== --- trunk/reactos/lib/sdk/sdk.rbuild (original) +++ trunk/reactos/lib/sdk/sdk.rbuild Fri Nov 9 15:20:16 2007 @@ -3,12 +3,10 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="crt"> <xi:include href="crt/crt.rbuild" /> + <xi:include href="crt/libcntpr.rbuild" /> </directory> <directory name="dxguid"> <xi:include href="dxguid/dxguid.rbuild" /> - </directory> - <directory name="libcntpr"> - <xi:include href="libcntpr/libcntpr.rbuild" /> </directory> <directory name="nt"> <xi:include href="nt/nt.rbuild" />

1 0

[gedmurphy] 30290: missed a few
by gedmurphy＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: gedmurphy Date: Fri Nov 9 14:47:10 2007 New Revision: 30290 URL: http://svn.reactos.org/svn/reactos?rev=30290&view=rev Log: missed a few Modified: trunk/reactos/base/applications/charmap/about.c trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/lrgcell.c trunk/reactos/base/applications/charmap/map.c trunk/reactos/base/applications/charmap/precomp.h Modified: trunk/reactos/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/about.c (original) +++ trunk/reactos/base/applications/charmap/about.c Fri Nov 9 14:47:10 2007 @@ -34,10 +34,10 @@ 0); if (hIcon) { - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + SendMessageW(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); } hLicenseEditWnd = GetDlgItem(hDlg, Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c (original) +++ trunk/reactos/base/applications/charmap/charmap.c Fri Nov 9 14:47:10 2007 @@ -107,7 +107,7 @@ { lpFontName = HeapAlloc(GetProcessHeap(), 0, - (Len + 1) * sizeof(TCHAR)); + (Len + 1) * sizeof(WCHAR)); if (lpFontName) { @@ -138,7 +138,7 @@ { lpText = HeapAlloc(GetProcessHeap(), 0, - (Len + 2) * sizeof(TCHAR)); + (Len + 2) * sizeof(WCHAR)); if (lpText) { @@ -267,10 +267,10 @@ case IDC_SELECT: { - TCHAR ch; + WCHAR ch; HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP); - ch = (TCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0); + ch = (WCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0); if (ch) { @@ -343,10 +343,10 @@ INT WINAPI -_tWinMain(HINSTANCE hInst, - HINSTANCE hPrev, - LPTSTR Cmd, - int iCmd) +wWinMain(HINSTANCE hInst, + HINSTANCE hPrev, + LPWSTR Cmd, + int iCmd) { INITCOMMONCONTROLSEX iccx; INT Ret = 1; Modified: trunk/reactos/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lrgcell.c (original) +++ trunk/reactos/base/applications/charmap/lrgcell.c Fri Nov 9 14:47:10 2007 @@ -29,7 +29,7 @@ { lpFontName = HeapAlloc(GetProcessHeap(), 0, - (Len + 1) * sizeof(TCHAR)); + (Len + 1) * sizeof(WCHAR)); if (lpFontName) { Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c (original) +++ trunk/reactos/base/applications/charmap/map.c Fri Nov 9 14:47:10 2007 @@ -220,10 +220,10 @@ mnmh.ch = ch; - Ret = SendMessage(infoPtr->hParent, - WM_NOTIFY, - (WPARAM)mnmh.hdr.idFrom, - (LPARAM)&mnmh); + Ret = SendMessageW(infoPtr->hParent, + WM_NOTIFY, + (WPARAM)mnmh.hdr.idFrom, + (LPARAM)&mnmh); } return Ret; Modified: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h (original) +++ trunk/reactos/base/applications/charmap/precomp.h Fri Nov 9 14:47:10 2007 @@ -2,7 +2,6 @@ #define __CHARMAP_PRECOMP_H #include <windows.h> #include <stdio.h> -#include <tchar.h> #include <commctrl.h> #include "resource.h"

1 0

[gedmurphy] 30289: convert to unicode in an attempt to address bug 2805
by gedmurphy＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: gedmurphy Date: Fri Nov 9 14:40:54 2007 New Revision: 30289 URL: http://svn.reactos.org/svn/reactos?rev=30289&view=rev Log: convert to unicode in an attempt to address bug 2805 Modified: trunk/reactos/base/applications/charmap/about.c trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/lrgcell.c trunk/reactos/base/applications/charmap/map.c trunk/reactos/base/applications/charmap/precomp.h Modified: trunk/reactos/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/about.c (original) +++ trunk/reactos/base/applications/charmap/about.c Fri Nov 9 14:40:54 2007 @@ -24,30 +24,34 @@ case WM_INITDIALOG: { HWND hLicenseEditWnd; - TCHAR strLicense[700]; + WCHAR strLicense[700]; - hIcon = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_ICON), - IMAGE_ICON, - 16, - 16, - 0); - - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + hIcon = LoadImageW(hInstance, + MAKEINTRESOURCEW(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (hIcon) + { + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); + } hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); - LoadString(hInstance, - IDS_LICENSE, - strLicense, - sizeof(strLicense) / sizeof(TCHAR)); + if (LoadStringW(hInstance, + IDS_LICENSE, + strLicense, + sizeof(strLicense) / sizeof(WCHAR))) + { + SetWindowTextW(hLicenseEditWnd, + strLicense); + } - SetWindowText(hLicenseEditWnd, - strLicense); return TRUE; } @@ -72,8 +76,8 @@ VOID ShowAboutDlg(HWND hWndParent) { - DialogBox(hInstance, - MAKEINTRESOURCE(IDD_ABOUTBOX), - hWndParent, - AboutDialogProc); + DialogBoxW(hInstance, + MAKEINTRESOURCEW(IDD_ABOUTBOX), + hWndParent, + AboutDialogProc); } Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c (original) +++ trunk/reactos/base/applications/charmap/charmap.c Fri Nov 9 14:40:54 2007 @@ -15,39 +15,39 @@ /* Font-enumeration callback */ static int CALLBACK -EnumFontNames(ENUMLOGFONTEX *lpelfe, - NEWTEXTMETRICEX *lpntme, +EnumFontNames(ENUMLOGFONTEXW *lpelfe, + NEWTEXTMETRICEXW *lpntme, DWORD FontType, LPARAM lParam) { HWND hwndCombo = (HWND)lParam; - TCHAR *pszName = lpelfe->elfLogFont.lfFaceName; + LPWSTR pszName = lpelfe->elfLogFont.lfFaceName; /* make sure font doesn't already exist in our list */ - if(SendMessage(hwndCombo, - CB_FINDSTRING, - 0, - (LPARAM)pszName) == CB_ERR) + if(SendMessageW(hwndCombo, + CB_FINDSTRING, + 0, + (LPARAM)pszName) == CB_ERR) { INT idx; BOOL fFixed; BOOL fTrueType; /* add the font */ - idx = (INT)SendMessage(hwndCombo, - CB_ADDSTRING, - 0, - (LPARAM)pszName); + idx = (INT)SendMessageW(hwndCombo, + CB_ADDSTRING, + 0, + (LPARAM)pszName); /* record the font's attributes (Fixedwidth and Truetype) */ fFixed = (lpelfe->elfLogFont.lfPitchAndFamily & FIXED_PITCH) ? TRUE : FALSE; fTrueType = (lpelfe->elfLogFont.lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE; /* store this information in the list-item's userdata area */ - SendMessage(hwndCombo, - CB_SETITEMDATA, - idx, - MAKEWPARAM(fFixed, fTrueType)); + SendMessageW(hwndCombo, + CB_SETITEMDATA, + idx, + MAKEWPARAM(fFixed, fTrueType)); } return 1; @@ -59,35 +59,35 @@ FillFontStyleComboList(HWND hwndCombo) { HDC hdc; - LOGFONT lf; + LOGFONTW lf; /* FIXME: for fun, draw each font in its own style */ HFONT hFont = GetStockObject(DEFAULT_GUI_FONT); - SendMessage(hwndCombo, - WM_SETFONT, - (WPARAM)hFont, - 0); + SendMessageW(hwndCombo, + WM_SETFONT, + (WPARAM)hFont, + 0); lf.lfCharSet = DEFAULT_CHARSET; - lf.lfFaceName[0] = _T('\0'); // all fonts + lf.lfFaceName[0] = L'\0'; // all fonts lf.lfPitchAndFamily = 0; hdc = GetDC(hwndCombo); /* store the list of fonts in the combo */ - EnumFontFamiliesEx(hdc, - &lf, - (FONTENUMPROC)EnumFontNames, - (LPARAM)hwndCombo, - 0); + EnumFontFamiliesExW(hdc, + &lf, + (FONTENUMPROCW)EnumFontNames, + (LPARAM)hwndCombo, + 0); ReleaseDC(hwndCombo, hdc); - SendMessage(hwndCombo, - CB_SETCURSEL, - 0, - 0); + SendMessageW(hwndCombo, + CB_SETCURSEL, + 0, + 0); } @@ -96,12 +96,12 @@ { HWND hCombo; HWND hMap; - LPTSTR lpFontName; + LPWSTR lpFontName; INT Len; hCombo = GetDlgItem(hDlg, IDC_FONTCOMBO); - Len = GetWindowTextLength(hCombo); + Len = GetWindowTextLengthW(hCombo); if (Len != 0) { @@ -111,17 +111,17 @@ if (lpFontName) { - SendMessage(hCombo, - WM_GETTEXT, - Len + 1, - (LPARAM)lpFontName); + SendMessageW(hCombo, + WM_GETTEXT, + Len + 1, + (LPARAM)lpFontName); hMap = GetDlgItem(hDlg, IDC_FONTMAP); - SendMessage(hMap, - FM_SETFONT, - 0, - (LPARAM)lpFontName); + SendMessageW(hMap, + FM_SETFONT, + 0, + (LPARAM)lpFontName); } } } @@ -129,9 +129,9 @@ static VOID AddCharToSelection(HWND hText, - TCHAR ch) -{ - LPTSTR lpText; + WCHAR ch) +{ + LPWSTR lpText; INT Len = GetWindowTextLength(hText); if (Len != 0) @@ -142,22 +142,22 @@ if (lpText) { - LPTSTR lpStr = lpText; - - SendMessage(hText, - WM_GETTEXT, - Len + 1, - (LPARAM)lpStr); + LPWSTR lpStr = lpText; + + SendMessageW(hText, + WM_GETTEXT, + Len + 1, + (LPARAM)lpStr); lpStr += Len; *lpStr = ch; lpStr++; - *lpStr = _T('\0'); - - SendMessage(hText, - WM_SETTEXT, - 0, - (LPARAM)lpText); + *lpStr = L'\0'; + + SendMessageW(hText, + WM_SETTEXT, + 0, + (LPARAM)lpText); HeapFree(GetProcessHeap(), 0, @@ -166,15 +166,15 @@ } else { - TCHAR szText[2]; + WCHAR szText[2]; szText[0] = ch; - szText[1] = _T('\0'); - - SendMessage(hText, - WM_SETTEXT, - 0, - (LPARAM)szText); + szText[1] = L'\0'; + + SendMessageW(hText, + WM_SETTEXT, + 0, + (LPARAM)szText); } } @@ -185,35 +185,42 @@ WPARAM wParam, LPARAM lParam) { + static HICON hSmIcon; + static HICON hBgIcon; + switch(Message) { case WM_INITDIALOG: { - HICON hSmIcon; - HICON hBgIcon; HMENU hSysMenu; - hSmIcon = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_ICON), - IMAGE_ICON, - 16, - 16, - 0); - hBgIcon = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_ICON), - IMAGE_ICON, - 32, - 32, - 0); - - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hSmIcon); - SendMessage(hDlg, - WM_SETICON, - ICON_BIG, - (LPARAM)hBgIcon); + hSmIcon = LoadImageW(hInstance, + MAKEINTRESOURCEW(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (hSmIcon) + { + SendMessageW(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hSmIcon); + } + + hBgIcon = LoadImageW(hInstance, + MAKEINTRESOURCEW(IDI_ICON), + IMAGE_ICON, + 32, + 32, + 0); + if (hBgIcon) + { + SendMessageW(hDlg, + WM_SETICON, + ICON_BIG, + (LPARAM)hBgIcon); + } FillFontStyleComboList(GetDlgItem(hDlg, IDC_FONTCOMBO)); @@ -224,30 +231,24 @@ FALSE); if (hSysMenu != NULL) { - LPCTSTR lpAboutText = NULL; - - if (LoadString(hInstance, - IDS_ABOUT, - (LPTSTR)&lpAboutText, - 0)) + LPCWSTR lpAboutText = NULL; + + if (LoadStringW(hInstance, + IDS_ABOUT, + (LPWSTR)&lpAboutText, + 0)) { - AppendMenu(hSysMenu, - MF_SEPARATOR, - 0, - NULL); - AppendMenu(hSysMenu, - MF_STRING, - ID_ABOUT, - lpAboutText); + AppendMenuW(hSysMenu, + MF_SEPARATOR, + 0, + NULL); + AppendMenuW(hSysMenu, + MF_STRING, + ID_ABOUT, + lpAboutText); } } return TRUE; - } - break; - - case WM_CLOSE: - { - EndDialog(hDlg, 0); } break; @@ -269,7 +270,7 @@ TCHAR ch; HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP); - ch = (TCHAR) SendMessage(hMap, FM_GETCHAR, 0, 0); + ch = (TCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0); if (ch) { @@ -281,6 +282,10 @@ } case IDOK: + if (hSmIcon) + DestroyIcon(hSmIcon); + if (hBgIcon) + DestroyIcon(hBgIcon); EndDialog(hDlg, 0); break; } @@ -321,6 +326,14 @@ } break; + case WM_CLOSE: + if (hSmIcon) + DestroyIcon(hSmIcon); + if (hBgIcon) + DestroyIcon(hBgIcon); + EndDialog(hDlg, 0); + break; + default: return FALSE; } @@ -346,10 +359,10 @@ if (RegisterMapClasses(hInstance)) { - Ret = DialogBox(hInstance, - MAKEINTRESOURCE(IDD_CHARMAP), - NULL, - (DLGPROC)DlgProc) >= 0; + Ret = DialogBoxW(hInstance, + MAKEINTRESOURCEW(IDD_CHARMAP), + NULL, + (DLGPROC)DlgProc) >= 0; UnregisterMapClasses(hInstance); } Modified: trunk/reactos/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lrgcell.c (original) +++ trunk/reactos/base/applications/charmap/lrgcell.c Fri Nov 9 14:40:54 2007 @@ -13,17 +13,17 @@ static HFONT SetLrgFont(PMAP infoPtr) { - LOGFONT lf; + LOGFONTW lf; HFONT hFont = NULL; HDC hdc; HWND hCombo; - LPTSTR lpFontName; + LPWSTR lpFontName; INT Len; hCombo = GetDlgItem(infoPtr->hParent, IDC_FONTCOMBO); - Len = GetWindowTextLength(hCombo); + Len = GetWindowTextLengthW(hCombo); if (Len != 0) { @@ -33,10 +33,10 @@ if (lpFontName) { - SendMessage(hCombo, - WM_GETTEXT, - 31, - (LPARAM)lpFontName); + SendMessageW(hCombo, + WM_GETTEXT, + 31, + (LPARAM)lpFontName); ZeroMemory(&lf, sizeof(lf)); @@ -48,10 +48,10 @@ hdc); lf.lfCharSet = DEFAULT_CHARSET; - lstrcpy(lf.lfFaceName, - lpFontName); + wcscpy(lf.lfFaceName, + lpFontName); - hFont = CreateFontIndirect(&lf); + hFont = CreateFontIndirectW(&lf); HeapFree(GetProcessHeap(), 0, @@ -75,7 +75,7 @@ static RECT rc; static HFONT hFont = NULL; - infoPtr = (PMAP)GetWindowLongPtr(hwnd, + infoPtr = (PMAP)GetWindowLongPtrW(hwnd, GWLP_USERDATA); if (infoPtr == NULL && uMsg != WM_CREATE) @@ -87,11 +87,11 @@ { case WM_CREATE: { - infoPtr = (PMAP)(((LPCREATESTRUCT)lParam)->lpCreateParams); + infoPtr = (PMAP)(((LPCREATESTRUCTW)lParam)->lpCreateParams); - SetWindowLongPtr(hwnd, - GWLP_USERDATA, - (LONG_PTR)infoPtr); + SetWindowLongPtrW(hwnd, + GWLP_USERDATA, + (LONG_PTR)infoPtr); hFont = SetLrgFont(infoPtr); @@ -128,11 +128,11 @@ hOldFont = SelectObject(hdc, hFont); - DrawText(hdc, - &infoPtr->pActiveCell->ch, - 1, - &rc, - DT_CENTER | DT_VCENTER | DT_SINGLELINE); + DrawTextW(hdc, + &infoPtr->pActiveCell->ch, + 1, + &rc, + DT_CENTER | DT_VCENTER | DT_SINGLELINE); SelectObject(hdc, hOldFont); @@ -152,10 +152,10 @@ default: { HandleDefaultMessage: - Ret = DefWindowProc(hwnd, - uMsg, - wParam, - lParam); + Ret = DefWindowProcW(hwnd, + uMsg, + wParam, + lParam); break; } } Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c (original) +++ trunk/reactos/base/applications/charmap/map.c Fri Nov 9 14:40:54 2007 @@ -9,12 +9,12 @@ #include <precomp.h> -static const TCHAR szMapWndClass[] = TEXT("FontMapWnd"); -static const TCHAR szLrgCellWndClass[] = TEXT("LrgCellWnd"); +static const WCHAR szMapWndClass[] = L"FontMapWnd"; +static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd"; static VOID TagFontToCell(PCELL pCell, - TCHAR ch) + WCHAR ch) { pCell->ch = ch; } @@ -82,7 +82,7 @@ HDC hdc) { HFONT hOldFont; - TCHAR ch; + WCHAR ch; INT x, y; hOldFont = SelectObject(hdc, @@ -91,15 +91,15 @@ for (y = 0; y < YCELLS; y++) for (x = 0; x < XCELLS; x++) { - ch = (TCHAR)((256 * infoPtr->iPage) + (XCELLS * y) + x); + ch = (WCHAR)((256 * infoPtr->iPage) + (XCELLS * y) + x); TagFontToCell(&infoPtr->Cells[y][x], ch); - DrawText(hdc, - &ch, - 1, - &infoPtr->Cells[y][x].CellInt, - DT_CENTER | DT_VCENTER | DT_SINGLELINE); + DrawTextW(hdc, + &ch, + 1, + &infoPtr->Cells[y][x].CellInt, + DT_CENTER | DT_VCENTER | DT_SINGLELINE); } SelectObject(hdc, @@ -124,18 +124,18 @@ XLARGE - XCELLS, YLARGE - YCELLS); - infoPtr->hLrgWnd = CreateWindowEx(0, - szLrgCellWndClass, - NULL, - WS_CHILDWINDOW | WS_VISIBLE, - rLarge.left, - rLarge.top, - rLarge.right - rLarge.left, - rLarge.bottom - rLarge.top, - infoPtr->hParent, - NULL, - hInstance, - infoPtr); + infoPtr->hLrgWnd = CreateWindowExW(0, + szLrgCellWndClass, + NULL, + WS_CHILDWINDOW | WS_VISIBLE, + rLarge.left, + rLarge.top, + rLarge.right - rLarge.left, + rLarge.bottom - rLarge.top, + infoPtr->hParent, + NULL, + hInstance, + infoPtr); if (!infoPtr->hLrgWnd) return FALSE; @@ -175,7 +175,7 @@ static VOID SetFont(PMAP infoPtr, - LPTSTR lpFontName) + LPWSTR lpFontName) { HDC hdc; @@ -183,7 +183,7 @@ DeleteObject(infoPtr->hFont); ZeroMemory(&infoPtr->CurrentFont, - sizeof(LOGFONT)); + sizeof(LOGFONTW)); hdc = GetDC(infoPtr->hMapWnd); infoPtr->CurrentFont.lfHeight = GetDeviceCaps(hdc, @@ -191,10 +191,10 @@ ReleaseDC(infoPtr->hMapWnd, hdc); infoPtr->CurrentFont.lfCharSet = DEFAULT_CHARSET; - lstrcpy(infoPtr->CurrentFont.lfFaceName, - lpFontName); - - infoPtr->hFont = CreateFontIndirect(&infoPtr->CurrentFont); + wcscpy(infoPtr->CurrentFont.lfFaceName, + lpFontName); + + infoPtr->hFont = CreateFontIndirectW(&infoPtr->CurrentFont); InvalidateRect(infoPtr->hMapWnd, NULL, @@ -205,7 +205,7 @@ static LRESULT NotifyParentOfSelection(PMAP infoPtr, UINT code, - TCHAR ch) + WCHAR ch) { LRESULT Ret = 0; @@ -311,9 +311,9 @@ if (infoPtr) { SetLastError(0); - SetWindowLongPtr(hwnd, - 0, - (DWORD_PTR)infoPtr); + SetWindowLongPtrW(hwnd, + 0, + (DWORD_PTR)infoPtr); if (GetLastError() == 0) { ZeroMemory(infoPtr, @@ -375,8 +375,7 @@ } infoPtr->iPage = max(0, - min(infoPtr->iPage, - 255)); + min(infoPtr->iPage, 255)); SetScrollPos(infoPtr->hMapWnd, SB_VERT, @@ -440,8 +439,8 @@ PMAP infoPtr; LRESULT Ret = 0; - infoPtr = (PMAP)GetWindowLongPtr(hwnd, - 0); + infoPtr = (PMAP)GetWindowLongPtrW(hwnd, + 0); switch (uMsg) { @@ -487,7 +486,7 @@ case FM_SETFONT: { - LPTSTR lpFontName = (LPTSTR)lParam; + LPWSTR lpFontName = (LPWSTR)lParam; SetFont(infoPtr, lpFontName); @@ -518,18 +517,18 @@ HeapFree(GetProcessHeap(), 0, infoPtr); - SetWindowLongPtr(hwnd, - 0, - (DWORD_PTR)NULL); + SetWindowLongPtrW(hwnd, + 0, + (DWORD_PTR)NULL); break; } default: { - Ret = DefWindowProc(hwnd, - uMsg, - wParam, - lParam); + Ret = DefWindowProcW(hwnd, + uMsg, + wParam, + lParam); break; } } @@ -541,24 +540,24 @@ BOOL RegisterMapClasses(HINSTANCE hInstance) { - WNDCLASS wc = {0}; + WNDCLASSW wc = {0}; wc.style = CS_DBLCLKS; wc.lpfnWndProc = MapWndProc; wc.cbWndExtra = sizeof(PMAP); wc.hInstance = hInstance; - wc.hCursor = LoadCursor(NULL, - (LPTSTR)IDC_ARROW); + wc.hCursor = LoadCursorW(NULL, + (LPWSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wc.lpszClassName = szMapWndClass; - if (RegisterClass(&wc)) + if (RegisterClassW(&wc)) { wc.lpfnWndProc = LrgCellWndProc; wc.cbWndExtra = 0; wc.lpszClassName = szLrgCellWndClass; - return RegisterClass(&wc) != 0; + return RegisterClassW(&wc) != 0; } return FALSE; @@ -567,9 +566,9 @@ VOID UnregisterMapClasses(HINSTANCE hInstance) { - UnregisterClass(szMapWndClass, + UnregisterClassW(szMapWndClass, hInstance); - UnregisterClass(szLrgCellWndClass, + UnregisterClassW(szLrgCellWndClass, hInstance); } Modified: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h (original) +++ trunk/reactos/base/applications/charmap/precomp.h Fri Nov 9 14:40:54 2007 @@ -23,7 +23,7 @@ RECT CellInt; BOOL bActive; BOOL bLarge; - TCHAR ch; + WCHAR ch; } CELL, *PCELL; typedef struct _MAP @@ -36,13 +36,13 @@ CELL Cells[YCELLS][XCELLS]; PCELL pActiveCell; HFONT hFont; - LOGFONT CurrentFont; + LOGFONTW CurrentFont; INT iPage; } MAP, *PMAP; typedef struct { NMHDR hdr; - TCHAR ch; + WCHAR ch; } MAPNOTIFY, *LPMAPNOTIFY;

1 0

[fireball] 30288: - Copy except and memccpy.c from libcntpr.
by fireball＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: fireball Date: Fri Nov 9 14:22:29 2007 New Revision: 30288 URL: http://svn.reactos.org/svn/reactos?rev=30288&view=rev Log: - Copy except and memccpy.c from libcntpr. Added: trunk/reactos/lib/sdk/crt/except_nt/ - copied from r30261, trunk/reactos/lib/sdk/libcntpr/except/ trunk/reactos/lib/sdk/crt/mem/memccpy.c - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/mem/memccpy.c

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs