Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[frik85] 14355: Remove all hardcode english phrases from the source code and add the phrases to the resource file.

by frik85＠svn.reactos.com

Remove all hardcode english phrases from the source code and add the phrases to the resource file. Modified: trunk/reactos/subsys/system/taskmgr/De.rc Modified: trunk/reactos/subsys/system/taskmgr/En.rc Modified: trunk/reactos/subsys/system/taskmgr/affinity.c Modified: trunk/reactos/subsys/system/taskmgr/applpage.c Modified: trunk/reactos/subsys/system/taskmgr/column.c Modified: trunk/reactos/subsys/system/taskmgr/debug.c Modified: trunk/reactos/subsys/system/taskmgr/endproc.c Modified: trunk/reactos/subsys/system/taskmgr/priority.c Modified: trunk/reactos/subsys/system/taskmgr/resource.h Modified: trunk/reactos/subsys/system/taskmgr/run.c Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.c Modified: trunk/reactos/subsys/system/taskmgr/trayicon.c _____ Modified: trunk/reactos/subsys/system/taskmgr/De.rc --- trunk/reactos/subsys/system/taskmgr/De.rc 2005-03-27 19:57:26 UTC (rev 14354) +++ trunk/reactos/subsys/system/taskmgr/De.rc 2005-03-27 20:01:18 UTC (rev 14355) @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////// ///// -// Deutsch (Austria) -// resources by Klemens Friedl frik85 at hotmail dot com http://www.reactos.net.tc +// Deutsch +// resource file by Klemens Friedl (frik85(a)reactos.at; http://frik85.reactos.at) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 @@ -649,5 +649,63 @@ IDS_LICENSE "Dieses Programm ist kostenlos; Sie k÷nnen es frei verteilen mit od. ohne ?nderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation ver÷ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spõtere Version (ihrer Wahl).\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." END -#endif // Deutsch (Austria) resources by Klemens Friedl +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Anwendnungen" + IDS_TAB_PROCESSES "Prozesse" + IDS_TAB_PERFORMANCE "Systemleistung" + IDS_TAB_TASK "Anwendung" + IDS_TAB_STATUS "Status" + IDS_TAB_IMAGENAME "Name" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "Benutzername" + IDS_TAB_SESSIONID "Sitzungserkennung" + IDS_TAB_CPU "CPU-Auslastung" + IDS_TAB_CPUTIME "CPU-Zeit" + IDS_TAB_MEMUSAGE "Speicherauslastung" + IDS_TAB_PEAKMEMUSAGE "Verõnd. der Speicherauslastung" + IDS_TAB_MEMDELTA "Maximale Speicherauslastung" + IDS_TAB_PAGEFAULT "Seitenfehler" + IDS_TAB_PFDELTA "Maximale Seitenfehler" + IDS_TAB_VMSIZE "Virtuelle Arbeitsspeichergr÷?e" + IDS_TAB_PAGEDPOOL "Paged Pool" + IDS_TAB_NPPOOL "NP Pool" + IDS_TAB_BASEPRI "Basispri" + IDS_TAB_HANDLES "Handleanzahl" + IDS_TAB_THREADS "Threadanzahl" + IDS_TAB_USERPBJECTS "Benutzer-Objekte" + IDS_TAB_GDIOBJECTS "GDI-Objekte" + IDS_TAB_IOREADS "E/A (Lesen)" + IDS_TAB_IOWRITES "E/A (Schreiben)" + IDS_TAB_IOOTHER "E/A (Andere)" + IDS_TAB_IOREADBYTES "E/A-Bytes (Lesen)" + IDS_TAB_IOWRITESBYTES "E/A-Bytes (Schreiben)" + IDS_TAB_IOOTHERBYTES "E/A-Bytes (Andere)" + IDS_MENU_SELECTCOLUMNS "&Spalten auswõhlen..." + IDS_MENU_16BITTASK "&16-Bit-Tasks anzeigen" + IDS_MENU_WINDOWS "&Fenster" + IDS_MENU_LARGEICONS "&Gro?e Symbole" + IDS_MENU_SMALLICONS "Kl&eine Symbole" + IDS_MENU_DETAILS "&Details" + IDS_MENU_ONEGRAPHALLCPUS "&Alle CPUs in einem Diagramm" + IDS_MENU_ONEGRAPHPERCPU "&Ein Diagramm pro CPU" + IDS_MENU_CPUHISTORY "&CPU Verlauf" + IDS_MENU_SHOWKERNELTIMES "&Kernel-Zeiten anzeigen" + IDS_CREATENEWTASK "Neuen Task erstellen" + IDS_CREATENEWTASK_DESC "Geben Sie Programme, Ordner, Dokumente oder Internetressourcen an, die ge÷ffnet werden sollen." + IDS_MSG_ACCESSPROCESSAFF "Unable to Access or Set Process Affinity" + IDS_MSG_PROCESSONEPRO "Der Prozess muss eine Zugeh÷rigkeit zu mindestens einem Prozessor aufweisen." + IDS_MSG_INVALIDOPTION "Ung³ltige Auswahl" + IDS_MSG_UNABLEDEBUGPROCESS "Unable to Debug Process" + IDS_MSG_WARNINGDEBUG "WARNUNG: Das Debuggen dieses Prozesses kann zu Datenverlust f³hren.\nSind Sie sicher, dass Sie diesen Prozess debuggen m÷chten?" + IDS_MSG_TASKMGRWARNING "Warnung vom Task-Manager" + IDS_MSG_WARNINGTERMINATING "WARNUNG: Das Abbrechen eines Prozesses kann zu\nunerw³nschten Ergebnissen, einschlie?lich Datenverlust und\nSysteminstabilitõt, f³hren. Zustand und Daten des Prozesses\nwerden nicht mher gespeichert. Sind Sie sicher, dass Sie\nden Prozess abbrechen m÷chten?" + IDS_MSG_UNABLETERMINATEPRO "Unable to Terminate Process" + IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" + IDS_MSG_WARNINGCHANGEPRIORITY "WARNUNG: Das ?ndern der Prioritõtsklasse dieses Prozesses\nkann zu unerw³nschten Ergebnissen, einschl. Systeminstabilitõt, f³hren.\nSind Sie sicher, dass Sie õndern m÷chten?" + IDS_MSG_TRAYICONCPUUSAGE "CPU-Auslastung: %d%%" + +END + +#endif //////////////////////////////////////////////////////////////////////// ///// _____ Modified: trunk/reactos/subsys/system/taskmgr/En.rc --- trunk/reactos/subsys/system/taskmgr/En.rc 2005-03-27 19:57:26 UTC (rev 14354) +++ trunk/reactos/subsys/system/taskmgr/En.rc 2005-03-27 20:01:18 UTC (rev 14355) @@ -604,6 +604,66 @@ IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Applications" + IDS_TAB_PROCESSES "Processes" + IDS_TAB_PERFORMANCE "Performance" + IDS_TAB_TASK "Task" + IDS_TAB_STATUS "Status" + IDS_TAB_IMAGENAME "Image Name" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "Username" + IDS_TAB_SESSIONID "Session ID" + IDS_TAB_CPU "CPU" + IDS_TAB_CPUTIME "CPU Time" + IDS_TAB_MEMUSAGE "Mem Usage" + IDS_TAB_PEAKMEMUSAGE "Peak Mem Usage" + IDS_TAB_MEMDELTA "Mem Delta" + IDS_TAB_PAGEFAULT "Page Faults" + IDS_TAB_PFDELTA "PF Delta" + IDS_TAB_VMSIZE "VM Size" + IDS_TAB_PAGEDPOOL "Paged Pool" + IDS_TAB_NPPOOL "NP Pool" + IDS_TAB_BASEPRI "Base Pri" + IDS_TAB_HANDLES "Handles" + IDS_TAB_THREADS "Threads" + IDS_TAB_USERPBJECTS "USER Objects" + IDS_TAB_GDIOBJECTS "GDI Objects" + IDS_TAB_IOREADS "I/O Reads" + IDS_TAB_IOWRITES "I/O Writes" + IDS_TAB_IOOTHER "I/O Other" + IDS_TAB_IOREADBYTES "I/O Read Bytes" + IDS_TAB_IOWRITESBYTES "I/O Write Bytes" + IDS_TAB_IOOTHERBYTES "I/O Other Bytes" + IDS_MENU_SELECTCOLUMNS "&Select Columns..." + IDS_MENU_16BITTASK "&Show 16-bit tasks" + IDS_MENU_WINDOWS "&Windows" + IDS_MENU_LARGEICONS "Lar&ge Icons" + IDS_MENU_SMALLICONS "S&mall Icons" + IDS_MENU_DETAILS "&Details" + IDS_MENU_ONEGRAPHALLCPUS "&One Graph, All CPUs" + IDS_MENU_ONEGRAPHPERCPU "One Graph &Per CPU" + IDS_MENU_CPUHISTORY "&CPU History" + IDS_MENU_SHOWKERNELTIMES "&Show Kernel Times" + IDS_CREATENEWTASK "Create New Task" + IDS_CREATENEWTASK_DESC "Type the name of a program, folder, document, or Internet resource, and Task Manager will open it for you." + IDS_MSG_ACCESSPROCESSAFF "Unable to Access or Set Process Affinity" + IDS_MSG_PROCESSONEPRO "The process must have affinity with at least one processor." + IDS_MSG_INVALIDOPTION "Invalid Option" + IDS_MSG_UNABLEDEBUGPROCESS "Unable to Debug Process" + IDS_MSG_WARNINGDEBUG "WARNING: Debugging this process may result in loss of data.\nAre you sure you wish to attach the debugger?" + IDS_MSG_TASKMGRWARNING "Task Manager Warning" + IDS_MSG_WARNINGTERMINATING "WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?" + IDS_MSG_UNABLETERMINATEPRO "Unable to Terminate Process" + IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" + IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" + IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" + +END + + #endif // English (U.S.) resources //////////////////////////////////////////////////////////////////////// ///// _____ Modified: trunk/reactos/subsys/system/taskmgr/affinity.c --- trunk/reactos/subsys/system/taskmgr/affinity.c 2005-03-27 19:57:26 UTC (rev 14354) +++ trunk/reactos/subsys/system/taskmgr/affinity.c 2005-03-27 20:01:18 UTC (rev 14355) @@ -4,6 +4,7 @@ * affinity.cpp * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * 2005 Klemens Friedl <frik85(a)reactos.at> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,12 +35,14 @@ #include "perfdata.h" HANDLE hProcessAffinityHandle; +TCHAR szTemp[256]; +TCHAR szTempA[256]; INT_PTR CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); void ProcessPage_OnSetAffinity(void) { - LV_ITEM lvitem; + LV_ITEM lvitem; ULONG Index; DWORD dwProcessId; TCHAR strErrorText[260]; @@ -59,7 +62,8 @@ hProcessAffinityHandle = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION, FALSE, dwProcessId); if (!hProcessAffinityHandle) { GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Access or Set Process Affinity"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } DialogBox(hInst, MAKEINTRESOURCE(IDD_AFFINITY_DIALOG), hMainWnd, AffinityDialogWndProc); @@ -86,7 +90,8 @@ if (!GetProcessAffinityMask(hProcessAffinityHandle, &dwProcessAffinityMask, &dwSystemAffinityMask)) { GetLastErrorText(strErrorText, 260); EndDialog(hDlg, 0); - MessageBox(hMainWnd, strErrorText, _T("Unable to Access or Set Process Affinity"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } /* @@ -321,7 +326,9 @@ * of it's cpu time. */ if (!dwProcessAffinityMask) { - MessageBox(hDlg, _T("The process must have affinity with at least one processor."), _T("Invalid Option"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_PROCESSONEPRO, szTemp, 256); + LoadString(hInst, IDS_MSG_INVALIDOPTION, szTempA, 256); + MessageBox(hDlg, szTemp, szTempA, MB_OK|MB_ICONSTOP); return TRUE; } @@ -331,7 +338,8 @@ if (!SetProcessAffinityMask(hProcessAffinityHandle, dwProcessAffinityMask)) { GetLastErrorText(strErrorText, 260); EndDialog(hDlg, LOWORD(wParam)); - MessageBox(hMainWnd, strErrorText, _T("Unable to Access or Set Process Affinity"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } EndDialog(hDlg, LOWORD(wParam)); _____ Modified: trunk/reactos/subsys/system/taskmgr/applpage.c --- trunk/reactos/subsys/system/taskmgr/applpage.c 2005-03-27 19:57:26 UTC (rev 14354) +++ trunk/reactos/subsys/system/taskmgr/applpage.c 2005-03-27 20:01:18 UTC (rev 14355) @@ -4,6 +4,7 @@ * applicationpage.cpp * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * 2005 Klemens Friedl <frik85(a)reactos.at> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -95,12 +96,13 @@ /* Initialize the application page's controls */ column.mask = LVCF_TEXT|LVCF_WIDTH; - _tcscpy(szTemp, _T("Task")); + + LoadString(hInst, IDS_TAB_TASK, szTemp, 256); column.pszText = szTemp; column.cx = 250; ListView_InsertColumn(hApplicationPageListCtrl, 0, &column); /* Add the "Task" column */ column.mask = LVCF_TEXT|LVCF_WIDTH; - _tcscpy(szTemp, _T("Status")); + LoadString(hInst, IDS_TAB_STATUS, szTemp, 256); column.pszText = szTemp; column.cx = 95; ListView_InsertColumn(hApplicationPageListCtrl, 1, &column); /* Add the "Status" column */ _____ Modified: trunk/reactos/subsys/system/taskmgr/column.c --- trunk/reactos/subsys/system/taskmgr/column.c 2005-03-27 19:57:26 UTC (rev 14354) +++ trunk/reactos/subsys/system/taskmgr/column.c 2005-03-27 20:01:18 UTC (rev 14355) @@ -4,6 +4,7 @@ * column.cpp * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * 2005 Klemens Friedl <frik85(a)reactos.at> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ #include "procpage.h" UINT ColumnDataHints[25]; +TCHAR szTemp[256]; int InsertColumn(int nCol, LPCTSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); INT_PTR CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); @@ -40,57 +42,127 @@ { int size; - if (TaskManagerSettings.Column_ImageName) - InsertColumn(0, _T("Image Name"), LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[0], -1); - if (TaskManagerSettings.Column_PID) - InsertColumn(1, _T("PID"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[1], -1); - if (TaskManagerSettings.Column_UserName) - InsertColumn(2, _T("Username"), LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[2], -1); - if (TaskManagerSettings.Column_SessionID) - InsertColumn(3, _T("Session ID"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[3], -1); - if (TaskManagerSettings.Column_CPUUsage) - InsertColumn(4, _T("CPU"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[4], -1); - if (TaskManagerSettings.Column_CPUTime) - InsertColumn(5, _T("CPU Time"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[5], -1); - if (TaskManagerSettings.Column_MemoryUsage) - InsertColumn(6, _T("Mem Usage"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[6], -1); - if (TaskManagerSettings.Column_PeakMemoryUsage) - InsertColumn(7, _T("Peak Mem Usage"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[7], -1); - if (TaskManagerSettings.Column_MemoryUsageDelta) - InsertColumn(8, _T("Mem Delta"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[8], -1); - if (TaskManagerSettings.Column_PageFaults) - InsertColumn(9, _T("Page Faults"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[9], -1); - if (TaskManagerSettings.Column_PageFaultsDelta) - InsertColumn(10, _T("PF Delta"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[10], -1); - if (TaskManagerSettings.Column_VirtualMemorySize) - InsertColumn(11, _T("VM Size"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[11], -1); - if (TaskManagerSettings.Column_PagedPool) - InsertColumn(12, _T("Paged Pool"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[12], -1); - if (TaskManagerSettings.Column_NonPagedPool) - InsertColumn(13, _T("NP Pool"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[13], -1); - if (TaskManagerSettings.Column_BasePriority) - InsertColumn(14, _T("Base Pri"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[14], -1); - if (TaskManagerSettings.Column_HandleCount) - InsertColumn(15, _T("Handles"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[15], -1); - if (TaskManagerSettings.Column_ThreadCount) - InsertColumn(16, _T("Threads"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[16], -1); - if (TaskManagerSettings.Column_USERObjects) - InsertColumn(17, _T("USER Objects"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[17], -1); - if (TaskManagerSettings.Column_GDIObjects) - InsertColumn(18, _T("GDI Objects"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[18], -1); - if (TaskManagerSettings.Column_IOReads) - InsertColumn(19, _T("I/O Reads"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[19], -1); - if (TaskManagerSettings.Column_IOWrites) - InsertColumn(20, _T("I/O Writes"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[20], -1); - if (TaskManagerSettings.Column_IOOther) - InsertColumn(21, _T("I/O Other"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[21], -1); - if (TaskManagerSettings.Column_IOReadBytes) - InsertColumn(22, _T("I/O Read Bytes"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[22], -1); - if (TaskManagerSettings.Column_IOWriteBytes) - InsertColumn(23, _T("I/O Write Bytes"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[23], -1); - if (TaskManagerSettings.Column_IOOtherBytes) - InsertColumn(24, _T("I/O Other Bytes"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[24], -1); + if (TaskManagerSettings.Column_ImageName) { + LoadString(hInst, IDS_TAB_IMAGENAME, szTemp, 256); + InsertColumn(0, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[0], -1); + } + if (TaskManagerSettings.Column_PID) { + LoadString(hInst, IDS_TAB_PID, szTemp, 256); + InsertColumn(1, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[1], -1); + } + if (TaskManagerSettings.Column_UserName) { + LoadString(hInst, IDS_TAB_USERNAME, szTemp, 256); + InsertColumn(2, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[2], -1); + } + if (TaskManagerSettings.Column_SessionID) { + LoadString(hInst, IDS_TAB_SESSIONID, szTemp, 256); + InsertColumn(3, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[3], -1); + } + if (TaskManagerSettings.Column_CPUUsage) { + LoadString(hInst, IDS_TAB_CPU, szTemp, 256); + InsertColumn(4, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[4], -1); + } + if (TaskManagerSettings.Column_CPUTime) { + LoadString(hInst, IDS_TAB_CPUTIME, szTemp, 256); + InsertColumn(5, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[5], -1); + } + + if (TaskManagerSettings.Column_MemoryUsage) { + LoadString(hInst, IDS_TAB_MEMUSAGE, szTemp, 256); + InsertColumn(6, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[6], -1); + } + + if (TaskManagerSettings.Column_PeakMemoryUsage) { + LoadString(hInst, IDS_TAB_PEAKMEMUSAGE, szTemp, 256); + InsertColumn(7, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[7], -1); + } + + if (TaskManagerSettings.Column_MemoryUsageDelta) { + LoadString(hInst, IDS_TAB_MEMDELTA, szTemp, 256); + InsertColumn(8, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[8], -1); + } + + if (TaskManagerSettings.Column_PageFaults) { + LoadString(hInst, IDS_TAB_PAGEFAULT, szTemp, 256); + InsertColumn(9, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[9], -1); + } + + if (TaskManagerSettings.Column_PageFaultsDelta) { + LoadString(hInst, IDS_TAB_PFDELTA, szTemp, 256); + InsertColumn(10, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[10], -1); + } + + if (TaskManagerSettings.Column_VirtualMemorySize) { + LoadString(hInst, IDS_TAB_VMSIZE, szTemp, 256); + InsertColumn(11, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[11], -1); + } + + if (TaskManagerSettings.Column_PagedPool) { + LoadString(hInst, IDS_TAB_PAGEDPOOL, szTemp, 256); + InsertColumn(12, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[12], -1); + } + + if (TaskManagerSettings.Column_NonPagedPool) { + LoadString(hInst, IDS_TAB_NPPOOL, szTemp, 256); + InsertColumn(13, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[13], -1); + } + + if (TaskManagerSettings.Column_BasePriority) { + LoadString(hInst, IDS_TAB_BASEPRI, szTemp, 256); + InsertColumn(14, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[14], -1); + } + + if (TaskManagerSettings.Column_HandleCount) { + LoadString(hInst, IDS_TAB_HANDLES, szTemp, 256); + InsertColumn(15, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[15], -1); + } + + if (TaskManagerSettings.Column_ThreadCount) { + LoadString(hInst, IDS_TAB_THREADS, szTemp, 256); + InsertColumn(16, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[16], -1); + } + + if (TaskManagerSettings.Column_USERObjects) { + LoadString(hInst, IDS_TAB_USERPBJECTS, szTemp, 256); + InsertColumn(17, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[17], -1); + } + + if (TaskManagerSettings.Column_GDIObjects) { + LoadString(hInst, IDS_TAB_GDIOBJECTS, szTemp, 256); + InsertColumn(18, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[18], -1); + } + + if (TaskManagerSettings.Column_IOReads) { + LoadString(hInst, IDS_TAB_IOREADS, szTemp, 256); + InsertColumn(19, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[19], -1); + } + + if (TaskManagerSettings.Column_IOWrites) { + LoadString(hInst, IDS_TAB_IOWRITES, szTemp, 256); + InsertColumn(20, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[20], -1); + } + + if (TaskManagerSettings.Column_IOOther) { + LoadString(hInst, IDS_TAB_IOOTHER, szTemp, 256); + InsertColumn(21, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[21], -1); + } + + if (TaskManagerSettings.Column_IOReadBytes) { + LoadString(hInst, IDS_TAB_IOREADBYTES, szTemp, 256); + InsertColumn(22, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[22], -1); + } + + if (TaskManagerSettings.Column_IOWriteBytes) { + LoadString(hInst, IDS_TAB_IOWRITESBYTES, szTemp, 256); + InsertColumn(23, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[23], -1); + } + + if (TaskManagerSettings.Column_IOOtherBytes) { + LoadString(hInst, IDS_TAB_IOOTHERBYTES, szTemp, 256); + InsertColumn(24, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[24], -1); + } + size = SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); SendMessage(hProcessPageHeaderCtrl, HDM_SETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); @@ -196,127 +268,176 @@ SendMessage(hProcessPageHeaderCtrl, HDM_GETITEM, i, (LPARAM) &hditem); - if (_tcsicmp(text, _T("Image Name")) == 0) + LoadString(hInst, IDS_TAB_IMAGENAME, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_ImageName = TRUE; TaskManagerSettings.ColumnSizeArray[0] = hditem.cxy; } - if (_tcsicmp(text, _T("PID")) == 0) + + LoadString(hInst, IDS_TAB_PID, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_PID = TRUE; TaskManagerSettings.ColumnSizeArray[1] = hditem.cxy; } - if (_tcsicmp(text, _T("Username")) == 0) + + LoadString(hInst, IDS_TAB_USERNAME, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_UserName = TRUE; TaskManagerSettings.ColumnSizeArray[2] = hditem.cxy; } - if (_tcsicmp(text, _T("Session ID")) == 0) + + LoadString(hInst, IDS_TAB_SESSIONID, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_SessionID = TRUE; TaskManagerSettings.ColumnSizeArray[3] = hditem.cxy; } - if (_tcsicmp(text, _T("CPU")) == 0) + + LoadString(hInst, IDS_TAB_CPU, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_CPUUsage = TRUE; TaskManagerSettings.ColumnSizeArray[4] = hditem.cxy; } - if (_tcsicmp(text, _T("CPU Time")) == 0) + + LoadString(hInst, IDS_TAB_CPUTIME, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_CPUTime = TRUE; TaskManagerSettings.ColumnSizeArray[5] = hditem.cxy; } - if (_tcsicmp(text, _T("Mem Usage")) == 0) + + LoadString(hInst, IDS_TAB_MEMUSAGE, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_MemoryUsage = TRUE; TaskManagerSettings.ColumnSizeArray[6] = hditem.cxy; } - if (_tcsicmp(text, _T("Peak Mem Usage")) == 0) + + LoadString(hInst, IDS_TAB_PEAKMEMUSAGE, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_PeakMemoryUsage = TRUE; TaskManagerSettings.ColumnSizeArray[7] = hditem.cxy; } - if (_tcsicmp(text, _T("Mem Delta")) == 0) + + LoadString(hInst, IDS_TAB_MEMDELTA, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_MemoryUsageDelta = TRUE; TaskManagerSettings.ColumnSizeArray[8] = hditem.cxy; } - if (_tcsicmp(text, _T("Page Faults")) == 0) + + LoadString(hInst, IDS_TAB_PAGEFAULT, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_PageFaults = TRUE; TaskManagerSettings.ColumnSizeArray[9] = hditem.cxy; } - if (_tcsicmp(text, _T("PF Delta")) == 0) + + LoadString(hInst, IDS_TAB_PFDELTA, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_PageFaultsDelta = TRUE; TaskManagerSettings.ColumnSizeArray[10] = hditem.cxy; } - if (_tcsicmp(text, _T("VM Size")) == 0) + + LoadString(hInst, IDS_TAB_VMSIZE, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_VirtualMemorySize = TRUE; TaskManagerSettings.ColumnSizeArray[11] = hditem.cxy; } - if (_tcsicmp(text, _T("Paged Pool")) == 0) + + LoadString(hInst, IDS_TAB_PAGEDPOOL, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_PagedPool = TRUE; TaskManagerSettings.ColumnSizeArray[12] = hditem.cxy; } - if (_tcsicmp(text, _T("NP Pool")) == 0) + + LoadString(hInst, IDS_TAB_NPPOOL, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_NonPagedPool = TRUE; TaskManagerSettings.ColumnSizeArray[13] = hditem.cxy; } - if (_tcsicmp(text, _T("Base Pri")) == 0) + + LoadString(hInst, IDS_TAB_BASEPRI, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_BasePriority = TRUE; TaskManagerSettings.ColumnSizeArray[14] = hditem.cxy; } - if (_tcsicmp(text, _T("Handles")) == 0) + + LoadString(hInst, IDS_TAB_HANDLES, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_HandleCount = TRUE; TaskManagerSettings.ColumnSizeArray[15] = hditem.cxy; } - if (_tcsicmp(text, _T("Threads")) == 0) + + LoadString(hInst, IDS_TAB_THREADS, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_ThreadCount = TRUE; TaskManagerSettings.ColumnSizeArray[16] = hditem.cxy; } - if (_tcsicmp(text, _T("USER Objects")) == 0) + + LoadString(hInst, IDS_TAB_USERPBJECTS, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_USERObjects = TRUE; TaskManagerSettings.ColumnSizeArray[17] = hditem.cxy; } - if (_tcsicmp(text, _T("GDI Objects")) == 0) + + LoadString(hInst, IDS_TAB_GDIOBJECTS, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_GDIObjects = TRUE; TaskManagerSettings.ColumnSizeArray[18] = hditem.cxy; } - if (_tcsicmp(text, _T("I/O Reads")) == 0) + + LoadString(hInst, IDS_TAB_IOREADS, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_IOReads = TRUE; TaskManagerSettings.ColumnSizeArray[19] = hditem.cxy; } - if (_tcsicmp(text, _T("I/O Writes")) == 0) + + LoadString(hInst, IDS_TAB_IOWRITES, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_IOWrites = TRUE; TaskManagerSettings.ColumnSizeArray[20] = hditem.cxy; } - if (_tcsicmp(text, _T("I/O Other")) == 0) + + LoadString(hInst, IDS_TAB_IOOTHER, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_IOOther = TRUE; TaskManagerSettings.ColumnSizeArray[21] = hditem.cxy; } - if (_tcsicmp(text, _T("I/O Read Bytes")) == 0) + + LoadString(hInst, IDS_TAB_IOREADBYTES, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_IOReadBytes = TRUE; TaskManagerSettings.ColumnSizeArray[22] = hditem.cxy; } - if (_tcsicmp(text, _T("I/O Write Bytes")) == 0) + + LoadString(hInst, IDS_TAB_IOWRITESBYTES, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_IOWriteBytes = TRUE; TaskManagerSettings.ColumnSizeArray[23] = hditem.cxy; } - if (_tcsicmp(text, _T("I/O Other Bytes")) == 0) + + LoadString(hInst, IDS_TAB_IOOTHERBYTES, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) { TaskManagerSettings.Column_IOOtherBytes = TRUE; TaskManagerSettings.ColumnSizeArray[24] = hditem.cxy; @@ -491,55 +612,104 @@ SendMessage(hProcessPageHeaderCtrl, HDM_GETITEM, Index, (LPARAM) &hditem); - if (_tcsicmp(text, _T("Image Name")) == 0) + LoadString(hInst, IDS_TAB_IMAGENAME, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_IMAGENAME; - if (_tcsicmp(text, _T("PID")) == 0) + + LoadString(hInst, IDS_TAB_PID, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_PID; - if (_tcsicmp(text, _T("Username")) == 0) + + LoadString(hInst, IDS_TAB_USERNAME, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_USERNAME; - if (_tcsicmp(text, _T("Session ID")) == 0) + + LoadString(hInst, IDS_TAB_SESSIONID, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_SESSIONID; - if (_tcsicmp(text, _T("CPU")) == 0) + + LoadString(hInst, IDS_TAB_CPU, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_CPUUSAGE; - if (_tcsicmp(text, _T("CPU Time")) == 0) + + LoadString(hInst, IDS_TAB_CPUTIME, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_CPUTIME; - if (_tcsicmp(text, _T("Mem Usage")) == 0) + + LoadString(hInst, IDS_TAB_MEMUSAGE, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_MEMORYUSAGE; - if (_tcsicmp(text, _T("Peak Mem Usage")) == 0) + + LoadString(hInst, IDS_TAB_PEAKMEMUSAGE, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_PEAKMEMORYUSAGE; - if (_tcsicmp(text, _T("Mem Delta")) == 0) + + LoadString(hInst, IDS_TAB_MEMDELTA, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_MEMORYUSAGEDELTA; - if (_tcsicmp(text, _T("Page Faults")) == 0) + + LoadString(hInst, IDS_TAB_PAGEFAULT, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_PAGEFAULTS; - if (_tcsicmp(text, _T("PF Delta")) == 0) + + LoadString(hInst, IDS_TAB_PFDELTA, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_PAGEFAULTSDELTA; - if (_tcsicmp(text, _T("VM Size")) == 0) + + LoadString(hInst, IDS_TAB_VMSIZE, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_VIRTUALMEMORYSIZE; - if (_tcsicmp(text, _T("Paged Pool")) == 0) + + LoadString(hInst, IDS_TAB_PAGEDPOOL, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_PAGEDPOOL; - if (_tcsicmp(text, _T("NP Pool")) == 0) + + LoadString(hInst, IDS_TAB_NPPOOL, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_NONPAGEDPOOL; - if (_tcsicmp(text, _T("Base Pri")) == 0) + + LoadString(hInst, IDS_TAB_BASEPRI, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_BASEPRIORITY; - if (_tcsicmp(text, _T("Handles")) == 0) + + LoadString(hInst, IDS_TAB_HANDLES, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_HANDLECOUNT; - if (_tcsicmp(text, _T("Threads")) == 0) + + LoadString(hInst, IDS_TAB_THREADS, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_THREADCOUNT; - if (_tcsicmp(text, _T("USER Objects")) == 0) + + LoadString(hInst, IDS_TAB_USERPBJECTS, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_USEROBJECTS; - if (_tcsicmp(text, _T("GDI Objects")) == 0) + + LoadString(hInst, IDS_TAB_GDIOBJECTS, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_GDIOBJECTS; - if (_tcsicmp(text, _T("I/O Reads")) == 0) + + LoadString(hInst, IDS_TAB_IOREADS, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_IOREADS; - if (_tcsicmp(text, _T("I/O Writes")) == 0) + + LoadString(hInst, IDS_TAB_IOWRITES, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_IOWRITES; - if (_tcsicmp(text, _T("I/O Other")) == 0) + + LoadString(hInst, IDS_TAB_IOOTHER, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_IOOTHER; - if (_tcsicmp(text, _T("I/O Read Bytes")) == 0) + + LoadString(hInst, IDS_TAB_IOREADBYTES, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_IOREADBYTES; - if (_tcsicmp(text, _T("I/O Write Bytes")) == 0) + + LoadString(hInst, IDS_TAB_IOWRITESBYTES, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_IOWRITEBYTES; - if (_tcsicmp(text, _T("I/O Other Bytes")) == 0) + + LoadString(hInst, IDS_TAB_IOOTHERBYTES, szTemp, 256); + if (_tcsicmp(text, szTemp) == 0) ColumnDataHints[Index] = COLUMN_IOOTHERBYTES; } } _____ Modified: trunk/reactos/subsys/system/taskmgr/debug.c --- trunk/reactos/subsys/system/taskmgr/debug.c 2005-03-27 19:57:26 UTC (rev 14354) +++ trunk/reactos/subsys/system/taskmgr/debug.c 2005-03-27 20:01:18 UTC (rev 14355) @@ -4,6 +4,7 @@ * debug.cpp * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * 2005 Klemens Friedl <frik85(a)reactos.at> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,18 +36,21 @@ void ProcessPage_OnDebug(void) { - LVITEM lvitem; + LVITEM lvitem; ULONG Index; DWORD dwProcessId; TCHAR strErrorText[260]; - HKEY hKey; + HKEY hKey; TCHAR strDebugPath[260]; TCHAR strDebugger[260]; DWORD dwDebuggerSize; - PROCESS_INFORMATION pi; - STARTUPINFO si; - HANDLE hDebugEvent; + PROCESS_INFORMATION pi; + STARTUPINFO si; + HANDLE hDebugEvent; + TCHAR szTemp[256]; + TCHAR szTempA[256]; + for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { memset(&lvitem, 0, sizeof(LVITEM)); @@ -66,17 +70,22 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - if (MessageBox(hMainWnd, _T("WARNING: Debugging this process may result in loss of data.\nAre you sure you wish to attach the debugger?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + LoadString(hInst, IDS_MSG_WARNINGDEBUG, szTemp, 256); + LoadString(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + + if (MessageBox(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) { GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"), 0, KEY_READ, &hKey) != ERROR_SUCCESS) { GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } @@ -84,7 +93,8 @@ if (RegQueryValueEx(hKey, _T("Debugger"), NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) != ERROR_SUCCESS) { GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); RegCloseKey(hKey); return; } @@ -95,7 +105,8 @@ if (!hDebugEvent) { GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } @@ -107,7 +118,8 @@ if (!CreateProcess(NULL, strDebugPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } CloseHandle(hDebugEvent); _____ Modified: trunk/reactos/subsys/system/taskmgr/endproc.c --- trunk/reactos/subsys/system/taskmgr/endproc.c 2005-03-27 19:57:26 UTC (rev 14354) +++ trunk/reactos/subsys/system/taskmgr/endproc.c 2005-03-27 20:01:18 UTC (rev 14355) @@ -4,6 +4,7 @@ * endproc.cpp * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * 2005 Klemens Friedl <frik85(a)reactos.at> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,6 +34,9 @@ #include "procpage.h" #include "perfdata.h" +TCHAR szTemp[256]; +TCHAR szTempA[256]; + void ProcessPage_OnEndProcess(void) { LVITEM lvitem; @@ -60,7 +64,9 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - if (MessageBox(hMainWnd, _T("WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + LoadString(hInst, IDS_MSG_WARNINGTERMINATING, szTemp, 256); + LoadString(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + if (MessageBox(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) return; hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); @@ -68,14 +74,16 @@ if (!hProcess) { GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Terminate Process"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } if (!TerminateProcess(hProcess, 0)) { GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Terminate Process"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } CloseHandle(hProcess); @@ -108,7 +116,9 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - if (MessageBox(hMainWnd, _T("WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + LoadString(hInst, IDS_MSG_WARNINGTERMINATING, szTemp, 256); + LoadString(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + if (MessageBox(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) return; hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); @@ -116,14 +126,16 @@ if (!hProcess) { GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Terminate Process"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } if (!TerminateProcess(hProcess, 0)) { GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Terminate Process"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_UNABLETERMINATEPRO, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); } CloseHandle(hProcess); _____ Modified: trunk/reactos/subsys/system/taskmgr/priority.c --- trunk/reactos/subsys/system/taskmgr/priority.c 2005-03-27 19:57:26 UTC (rev 14354) +++ trunk/reactos/subsys/system/taskmgr/priority.c 2005-03-27 20:01:18 UTC (rev 14355) @@ -4,6 +4,7 @@ * priority.c * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * 2005 Klemens Friedl <frik85(a)reactos.at> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,6 +34,9 @@ #include "procpage.h" #include "perfdata.h" +TCHAR szTemp[256]; +TCHAR szTempA[256]; + void ProcessPage_OnSetPriorityRealTime(void) { LVITEM lvitem; @@ -60,7 +64,9 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + 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); @@ -68,14 +74,16 @@ if (!hProcess) { GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + LoadString(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); + MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); return; } if (!SetPriorityClass(hProcess, REALTIME_PRIORITY_CLASS)) { GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); [truncated at 1000 lines; 404 more skipped]

19 years, 9 months

[mf] 14354: - make Shell Hook Messages really work in Windows

by mf＠svn.reactos.com

- make Shell Hook Messages really work in Windows - comments for SHELL32's RegisterShellHook() Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.h Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp Modified: trunk/reactos/subsys/system/explorer/utility/utility.cpp Modified: trunk/reactos/subsys/system/explorer/utility/utility.h Modified: trunk/reactos/subsys/system/explorer/utility/window.cpp Modified: trunk/reactos/subsys/system/explorer/utility/window.h _____ Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp --- trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-03-27 19:57:20 UTC (rev 14353) +++ trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-03-27 19:57:26 UTC (rev 14354) @@ -436,7 +436,7 @@ case WM_DESTROY: ///@todo use IShellBrowser::GetViewStateStream() and _pShellView->SaveViewState() to store view state - + if (SetShellWindow) SetShellWindow(0); break; _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-03-27 19:57:20 UTC (rev 14353) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-03-27 19:57:26 UTC (rev 14354) @@ -736,7 +736,6 @@ extraBtns.idCommand = ID_WEB_WINDOW; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); -#define W_VER_NT 0 if ((HIWORD(GetVersion())>>14) == W_VER_NT) { // insert NT object namespace button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("NT Obj\0")); _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-03-27 19:57:20 UTC (rev 14353) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-03-27 19:57:26 UTC (rev 14354) @@ -1952,7 +1952,6 @@ // Show "Run..." dialog if (RunFileDlg) { #ifndef _ROS_ /* FIXME: our shell32 always expects Ansi strings */ -#define W_VER_NT 0 if ((HIWORD(GetVersion())>>14) == W_VER_NT) { WCHAR wTitle[40], wText[256]; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-03-27 19:57:20 UTC (rev 14353) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-03-27 19:57:26 UTC (rev 14354) @@ -36,7 +36,17 @@ DynamicFct<BOOL (WINAPI*)(HWND hwnd)> g_RegisterShellHookWindow(TEXT("user32"), "RegisterShellHookWindow"); DynamicFct<BOOL (WINAPI*)(HWND hwnd)> g_DeregisterShellHookWindow(TEXT("user32"), "DeregisterShellHookWindow"); +/* +DynamicFct<BOOL (WINAPI*)(HWND hWnd, DWORD dwType)> g_RegisterShellHook(TEXT("shell32"), (LPCSTR)0xb5); + // constants for RegisterShellHook() +#define RSH_UNREGISTER 0 +#define RSH_REGISTER 1 +#define RSH_REGISTER_PROGMAN 2 +#define RSH_REGISTER_TASKMAN 3 +*/ + + TaskBarEntry::TaskBarEntry() { _id = 0; @@ -59,13 +69,30 @@ TaskBar::TaskBar(HWND hwnd) : super(hwnd), - WM_SHELLHOOK(RegisterWindowMessage(TEXT("SHELLHOOK"))) + WM_SHELLHOOK(RegisterWindowMessage(WINMSG_SHELLHOOK)) { _last_btn_width = 0; + + _mmMetrics_org.cbSize = sizeof(MINIMIZEDMETRICS); + + SystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(_mmMetrics_org), &_mmMetrics_org, 0); + + // configure the window manager to hide windows when they are minimized + // This is neccessary to enable shell hook messages. + if (!(_mmMetrics_org.iArrange & ARW_HIDE)) { + MINIMIZEDMETRICS _mmMetrics_new = _mmMetrics_org; + + _mmMetrics_new.iArrange |= ARW_HIDE; + + SystemParametersInfo(SPI_SETMINIMIZEDMETRICS, sizeof(_mmMetrics_new), &_mmMetrics_new, 0); + } } TaskBar::~TaskBar() { +// if (g_RegisterShellHook) +// (*g_RegisterShellHook)(_hwnd, RSH_UNREGISTER); + if (g_DeregisterShellHookWindow) (*g_DeregisterShellHookWindow)(_hwnd); else @@ -73,6 +100,8 @@ if (g_SetTaskmanWindow) (*g_SetTaskmanWindow)(0); + + SystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(_mmMetrics_org), &_mmMetrics_org, 0); } HWND TaskBar::Create(HWND hwndParent) @@ -105,7 +134,7 @@ _next_id = IDC_FIRST_APP; - // register ourselved as task manager window to make the following call to RegisterShellHookWindow working + // register the taskbar window as task manager window to make the following call to RegisterShellHookWindow working if (g_SetTaskmanWindow) (*g_SetTaskmanWindow)(_hwnd); @@ -118,6 +147,16 @@ SetTimer(_hwnd, 0, 200, NULL); } +/* Alternatively we could use the RegisterShellHook() function in SHELL32, but this is not yet implemented in the WINE code. + if (g_RegisterShellHook) { + (*g_RegisterShellHook)(0, RSH_REGISTER); + + if ((HIWORD(GetVersion())>>14) == W_VER_NT) + (*g_RegisterShellHook)(_hwnd, RSH_REGISTER_TASKMAN); + else + (*g_RegisterShellHook)(_hwnd, RSH_REGISTER); + } +*/ Refresh(); return 0; @@ -156,6 +195,10 @@ case HSHELL_WINDOWDESTROYED: case HSHELL_WINDOWACTIVATED: case HSHELL_REDRAW: +#ifdef HSHELL_FLASH + case HSHELL_FLASH: + case HSHELL_RUDEAPPACTIVATED: +#endif Refresh(); break; } @@ -409,6 +452,7 @@ entry._fsState = btn.fsState; +#ifdef _ROS_ // now handled by activating the ARW_HIDE flag with SystemParametersInfo(SPI_SETMINIMIZEDMETRICS) // move minimized windows out of sight if (IsIconic(hwnd)) { RECT rect; @@ -418,6 +462,7 @@ if (rect.bottom > 0) SetWindowPos(hwnd, 0, -32000, -32000, 0, 0, SWP_NOSIZE|SWP_NOZORDER|SWP_NOACTIVATE); } +#endif } return TRUE; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.h --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.h 2005-03-27 19:57:20 UTC (rev 14353) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.h 2005-03-27 19:57:26 UTC (rev 14354) @@ -85,6 +85,7 @@ int _next_id; WindowHandle _last_foreground_wnd; int _last_btn_width; + MINIMIZEDMETRICS _mmMetrics_org; const UINT WM_SHELLHOOK; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp --- trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp 2005-03-27 19:57:20 UTC (rev 14353) +++ trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp 2005-03-27 19:57:26 UTC (rev 14354) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public _____ Modified: trunk/reactos/subsys/system/explorer/utility/utility.cpp --- trunk/reactos/subsys/system/explorer/utility/utility.cpp 2005-03-27 19:57:20 UTC (rev 14353) +++ trunk/reactos/subsys/system/explorer/utility/utility.cpp 2005-03-27 19:57:26 UTC (rev 14354) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public _____ Modified: trunk/reactos/subsys/system/explorer/utility/utility.h --- trunk/reactos/subsys/system/explorer/utility/utility.h 2005-03-27 19:57:20 UTC (rev 14353) +++ trunk/reactos/subsys/system/explorer/utility/utility.h 2005-03-27 19:57:26 UTC (rev 14354) @@ -59,7 +59,9 @@ #define _MAX_PATH 260 #endif +#define W_VER_NT 0 // constant for HIWORD(GetVersion())>>14 + #ifdef __cplusplus extern "C" { #endif _____ Modified: trunk/reactos/subsys/system/explorer/utility/window.cpp --- trunk/reactos/subsys/system/explorer/utility/window.cpp 2005-03-27 19:57:20 UTC (rev 14353) +++ trunk/reactos/subsys/system/explorer/utility/window.cpp 2005-03-27 19:57:26 UTC (rev 14354) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public _____ Modified: trunk/reactos/subsys/system/explorer/utility/window.h --- trunk/reactos/subsys/system/explorer/utility/window.h 2005-03-27 19:57:20 UTC (rev 14353) +++ trunk/reactos/subsys/system/explorer/utility/window.h 2005-03-27 19:57:26 UTC (rev 14354) @@ -984,7 +984,9 @@ #define WINMSG_TASKBARCREATED TEXT("TaskbarCreated") +#define WINMSG_SHELLHOOK TEXT("SHELLHOOK") + struct TrayIcon { TrayIcon(HWND hparent, UINT id)

19 years, 9 months

[greatlrd] 14353: New ico from Mindflyer <mf@mufunyo.net>

by greatlrd＠svn.reactos.com

New ico from Mindflyer <mf(a)mufunyo.net> Swedish translation of explorer By David Nordenberg dnordenberg(a)users.sourceforge.net Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/explorer/res/computer.ico Modified: trunk/reactos/subsys/system/explorer/res/explorer.ico Modified: trunk/reactos/subsys/system/explorer/res/folder.ico _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-03-27 19:50:50 UTC (rev 14352) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-03-27 19:57:20 UTC (rev 14353) @@ -736,7 +736,7 @@ BEGIN MENUITEM "&Next Level\t+", 301 MENUITEM "Expand &Tree\t*", 302 - MENUITEM "Expand &all\tStrg+*", 303 + MENUITEM "Expand &all\tCtrl+*", 303 MENUITEM "Collapse &Tree\t-", 304 MENUITEM SEPARATOR MENUITEM "&Mark Childs", 505 @@ -1976,8 +1976,498 @@ #endif // Portuguese (Portugal) resources //////////////////////////////////////////////////////////////////////// ///// +/////////////////////////////////////////////////////////////////////// ////// +// Swedish (SE) resources +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SWE) +#ifdef _WIN32 +LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH +#pragma code_page(850) +#endif //_WIN32 +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Arkiv" + BEGIN + MENUITEM "&Avsluta", ID_FILE_EXIT + END + POPUP "&Visa" + BEGIN + MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR + MENUITEM "&Extrafõlt", ID_VIEW_EXTRA_BAR + MENUITEM "E&nhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "S&idfõlt", ID_VIEW_SIDE_BAR + MENUITEM "&Statusfõlt", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Uppdatera\tF5", ID_REFRESH + MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&F÷nster" + BEGIN + MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW + MENUITEM "Íverlappande\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ + MENUITEM "Ordna &vertikalt\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT + MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE + END + POPUP "&Verktyg" + BEGIN + MENUITEM "&Alternativ", ID_TOOLS_OPTIONS + END + POPUP "&Hjõlp" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Om &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_WINEFILE MENU FIXED IMPURE +BEGIN + POPUP "&Arkiv" + BEGIN + MENUITEM "&Íppna\tEnter", 101 + MENUITEM "&Flytta...\tF7", 106 + MENUITEM "&Kopiera...\tF8", 107 + MENUITEM "&I urklipp...\tF9", 118 + MENUITEM "&Ta bort\tDel", 108 + MENUITEM "&Byt namn...", 109 + MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "&Komprimera...", 119 + MENUITEM "Packa &upp...", 120 + MENUITEM SEPARATOR + MENUITEM "&K÷r...", ID_EXECUTE + MENUITEM "&Skriv ut...", 102 + MENUITEM "Associera...", 103 + MENUITEM SEPARATOR + MENUITEM "Skapa mapp...", ID_EXECUTE + MENUITEM "&S÷k...", 104 + MENUITEM "&Võlj filer...", 116 + MENUITEM SEPARATOR + MENUITEM "&Avsluta\tAlt+X", ID_FILE_EXIT + END + POPUP "&Disk" + BEGIN + MENUITEM "&Kopiera disk...", 201 + MENUITEM "&Namnge disk...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formatera disk...", 203 + MENUITEM SEPARATOR + MENUITEM "Anslut &Nõtverksenhet", 252 + MENUITEM "&Koppla ifrÕn Nõtverksenhet", 253 + MENUITEM SEPARATOR + MENUITEM "Dela ut...", 254 + MENUITEM "&Ta bort utdelning...", 255 + MENUITEM SEPARATOR + MENUITEM "&Võlj enhet...", 251 + END + POPUP "&Mappar" + BEGIN + MENUITEM "&Nõsta nivÕ\t+", 301 + MENUITEM "Ut÷ka &trõd\t*", 302 + MENUITEM "Ut÷ka &alla\tCtrl+*", 303 + MENUITEM "Kollapsa &trõd\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Markera undermappar", 505 + END + POPUP "&Visa" + BEGIN + MENUITEM "&Trõd och mapp", 413 + MENUITEM "Bara tr&õd", 411 + MENUITEM "Bara &mapp", 412 + MENUITEM SEPARATOR + MENUITEM "De&la", 414 + MENUITEM SEPARATOR + MENUITEM "&Namn", ID_VIEW_NAME + MENUITEM "&Alla Fildetaljer", ID_VIEW_ALL_ATTRIBUTES + , CHECKED + MENUITEM "&Vissa detaljer...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Sortera efter namn", 404 + MENUITEM "Sortera efter t&yp", 405 + MENUITEM "Sortera efter st&orlek", 406 + MENUITEM "Sortera efter &datum", 407 + MENUITEM SEPARATOR + MENUITEM "Sortera efter &...", 409 + END + POPUP "&Instõllningar" + BEGIN + MENUITEM "&Bekrõftelse...", 65535 + MENUITEM "&Teckensnitt...", 65535 + MENUITEM "&Konfigurera verktygsfõlt...", 65535 + MENUITEM SEPARATOR + MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Enhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Sidfõlt", ID_VIEW_SIDE_BAR + MENUITEM "St&atusfõlt", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM SEPARATOR + MENUITEM "&Symbol efter k÷rning", 65535 + MENUITEM "&Spara õndringar vid stõngning", 511 + END + POPUP "&Sõkerhet" + BEGIN + MENUITEM "&?tkomst...", 605 + MENUITEM "&Loggning...", 606 + MENUITEM "&?gare...", 607 + END + POPUP "&F÷nster" + BEGIN + MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW + MENUITEM "Íverlappande\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ + MENUITEM "Ordna &vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT + MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT + MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE + MENUITEM "&Uppdatera\tF5", ID_REFRESH + END + POPUP "&?" + BEGIN + MENUITEM "&Hjõlp õmnen\tF1", ID_HELP + MENUITEM "Hjõlp &s÷k...\tF1", ID_HELP + MENUITEM "&Anvõnda hjõlpen\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Information om &Winefile...", ID_ABOUT_WINEFILE + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Instõllningar...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Aktivitetshanteraren...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Íppna volymkontroll", ID_TRAY_VOLUME + MENUITEM "Justera ljudinstõllningar", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Visa dolda ikoner", ID_SHOW_HIDDEN_ICONS + MENUITEM "Visa &ikonknapp", ID_SHOW_ICON_BUTTON + MENUITEM "&Konfigurera meddelanden...", ID_CONFIG_NOTIFYAREA + MENUITEM "Justera &datum och &tid...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Arkiv" + BEGIN + MENUITEM "&Avsluta", ID_FILE_EXIT + END + POPUP "&Visa" + BEGIN + MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR + MENUITEM "&Sidfõlt", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Statusfõlt", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Uppdatera\tF5", ID_REFRESH + MENUITEM "&Fullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&Verktyg" + BEGIN + MENUITEM "&Alternativ", ID_TOOLS_OPTIONS + END + POPUP "&Hjõlp" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Om &OS...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "K÷r" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 + CONTROL "&Kommando:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "&Som symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&Avbryt",2,158,23,47,14 + PUSHBUTTON "&Hjõlp",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "S÷k program pÕ startmenyn" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filter:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Kontrollera poster",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Skrivbordsinstõllningar" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Võlj frÕn vilket h÷rn ock Õt vilket hÕll du f÷redrar att rada upp ikonerna:", + IDC_STATIC,7,7,166,8 + CONTROL "võ. och nerÕt",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "÷vre Õt h÷.",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "÷vre Õt võ.",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "h÷. och nerÕt",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "võ. och uppÕt",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "nedre Õt h÷.",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "nedre Õt võ.",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "h÷. och uppÕt",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "sidor och ner",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "kanter",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "runt om",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Visa &versionsnummer",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Aktivitetsfõltsinstõllningar" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "visa &klockan",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "&G÷m inaktiva meddelandeikoner", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&Meddelanden...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Startmenyinstõllningar" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Instõllningar f÷r meddelandeikoner" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Hjõlptext:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "&F÷nstertitel:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "&Moduls÷kvõg:",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Visningslõge",IDC_LABEL4,7,96,157,28 + CONTROL "v&isa",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,33,10 + CONTROL "&d÷lj",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,29,10 + CONTROL "d÷lj a&utomatiskt",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&Senast õndrad:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "visa d&olda",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Avbryt",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 188, 126 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Võlj MDI / SDI Lõge" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Võlj det grõnssnitt du f÷redrar:", + IDC_STATIC,7,7,160,8 + CONTROL "&MDI (multiple document interface)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,121,10 + CONTROL "&SDI (single document interface)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,53,115,10 + LTEXT "Den hõr instõllningen kommer att gõlla som standard i alla nya explorer-f÷nster.", + IDC_STATIC,7,76,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,105,50,14,WS_GROUP + PUSHBUTTON "&Avbryt",IDCANCEL,106,105,50,14 +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_SEARCH_PROGRAM, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 193 + TOPMARGIN, 7 + BOTTOMMARGIN, 58 + END + + IDD_DESKBAR_DESKTOP, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 205 + TOPMARGIN, 7 + BOTTOMMARGIN, 187 + END + + IDD_DESKBAR_TASKBAR, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 203 + TOPMARGIN, 7 + BOTTOMMARGIN, 187 + END + + IDD_DESKBAR_STARTMENU, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 203 + TOPMARGIN, 7 + BOTTOMMARGIN, 187 + END + + IDD_NOTIFYAREA, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 201 + TOPMARGIN, 7 + BOTTOMMARGIN, 167 + END + + IDD_MDI_SDI, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 181 + TOPMARGIN, 7 + BOTTOMMARGIN, 119 + END +END +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos Explorer" + IDS_START "Start" + IDS_LOGOFF "Logga ut..." + IDS_SHUTDOWN "Stõng av..." + IDS_LAUNCH "K÷r..." + IDS_START_HELP "Hjõlp" + IDS_SEARCH_FILES "S÷k..." + IDS_DOCUMENTS "Dokument" + IDS_FAVORITES "Favoriter" + IDS_PROGRAMS "Program" + IDS_SETTINGS "Instõllningar" + IDS_EXPLORE "Utforska" + IDS_EMPTY "(tom)" + IDS_RECENT "Senaste dokumenten" + IDS_ADMIN "Administration" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "Nõtverk" + IDS_CONNECTIONS "Nõtverksanslutningar" + IDS_DRIVES "Enheter" + IDS_SEARCH_COMPUTER "S÷k dator..." + IDS_SETTINGS_MENU "Instõllningsmeny" + IDS_CONTROL_PANEL "Kontrollpanelen" + IDS_PRINTERS "Skrivare" + IDS_BROWSE "Utforska filer" + IDS_SEARCH_PRG "S÷k program..." + IDS_ALL_USERS "Alla anvõndare\\" + IDS_SEARCH "S÷k" + IDS_ABOUT_EXPLORER "&Om Explorer..." + IDS_LAUNCH_MANY_PROGRAMS + "Du har valt fler õn ett program.\n?r du sõker pÕ att du vill ÷ppna dem alla?" + IDS_DESKTOPBAR_SETTINGS "Skrivbordsinstõllningar" + IDS_DESKTOP "Skrivbord" + IDS_TASKBAR "Aktivitetsfõlt" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Startmeny" + IDS_MINIMIZE_ALL "minimera alla f÷nster" + IDS_DESKTOP_NUM "Skrivbord %d" + IDS_VOLUME "Volym" + IDS_ITEMS_CUR "aktuella saker" + IDS_ITEMS_CONFIGURED "konfiguration" + IDS_ITEMS_VISIBLE "synlig" + IDS_ITEMS_HIDDEN "dold" + IDS_NOTIFY_SHOW "visa" + IDS_NOTIFY_HIDE "d÷lj" + IDS_NOTIFY_AUTOHIDE "d÷lj automatiskt" + IDS_SHOW_HIDDEN_ICONS "Visa dolda ikoner" + IDS_HIDE_ICONS "D÷lj ikoner" +END + +#endif // Swedish (SE) resources +/////////////////////////////////////////////////////////////////////// ////// + + #ifndef APSTUDIO_INVOKED //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/subsys/system/explorer/res/computer.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/explorer.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/folder.ico (Binary files differ)

19 years, 9 months

[greatlrd] 14352: New ico from Mindflyer <mf@mufunyo.net>

by greatlrd＠svn.reactos.com

New ico from Mindflyer <mf(a)mufunyo.net> Modified: trunk/reactos/subsys/system/cmd/res/terminal.ico _____ Modified: trunk/reactos/subsys/system/cmd/res/terminal.ico (Binary files differ)

19 years, 9 months

[mf] 14351: launch shell DDE server

by mf＠svn.reactos.com

launch shell DDE server Modified: trunk/reactos/subsys/system/explorer/explorer.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-03-27 16:32:06 UTC (rev 14350) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-03-27 18:13:43 UTC (rev 14351) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -45,6 +45,9 @@ extern "C" int initialize_gdb_stub(); // start up GDB stub +DynamicLoadLibFct<void(__stdcall*)(BOOL)> g_SHDOCVW_ShellDDEInit(TEXT("SHDOCVW"), 118); + + ExplorerGlobals g_Globals; @@ -826,6 +829,10 @@ // another undocumented event: "Global\\msgina: ReturnToWelcome" if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); + + // launch the shell DDE server + if (g_SHDOCVW_ShellDDEInit) + (*g_SHDOCVW_ShellDDEInit)(TRUE); } @@ -889,5 +896,9 @@ // write configuration file g_Globals.write_persistent(); + // shutdown the shell DDE server + if (g_SHDOCVW_ShellDDEInit) + (*g_SHDOCVW_ShellDDEInit)(FALSE); + return ret; }

19 years, 9 months

[mf] 14350: hide login screen to make the login on XP faster

by mf＠svn.reactos.com

hide login screen to make the login on XP faster Modified: trunk/reactos/subsys/system/explorer/explorer.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-03-27 13:03:30 UTC (rev 14349) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-03-27 16:32:06 UTC (rev 14350) @@ -705,6 +705,19 @@ #endif // __MINGW && UNICODE +static bool SetShellReadyEvent(LPCTSTR evtName) +{ + HANDLE hEvent = OpenEvent(EVENT_MODIFY_STATE, FALSE, evtName); + if (!hEvent) + return false; + + SetEvent(hEvent); + CloseHandle(hEvent); + + return true; +} + + int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nShowCmd) { CONTEXT("WinMain()"); @@ -758,11 +771,15 @@ } startup_desktop = TRUE; - } else + } else { // create desktop window and task bar only, if there is no other shell and we are // the first explorer instance + // MS Explorer looks additionally into the registry entry HKCU\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\shell, + // to decide wether it is currently configured as shell application. startup_desktop = !any_desktop_running; + } + bool autostart = !any_desktop_running; // disable autostart if the SHIFT key is pressed @@ -803,6 +820,15 @@ } #endif + + if (startup_desktop) { + // hide the XP login screen (Credit to Nicolas Escuder) + // another undocumented event: "Global\\msgina: ReturnToWelcome" + if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) + SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); + } + + bool use_gdb_stub = false; // !IsDebuggerPresent(); if (_tcsstr(lpCmdLine,TEXT("-debug"))) @@ -842,6 +868,7 @@ g_Globals._desktops.get_current_Desktop()->_hwndDesktop = g_Globals._hwndDesktop; #endif + /**TODO launching autostart programs can be moved into a background thread. */ if (autostart) { char* argv[] = {"", "s"}; // call startup routine in SESSION_START mode startup(2, argv);

19 years, 9 months

[navaraf] 14349: Fix memory leak I introduced in revision 14343 and fix buffer size calculation to save 4 bytes.

by navaraf＠svn.reactos.com

Fix memory leak I introduced in revision 14343 and fix buffer size calculation to save 4 bytes. Modified: trunk/reactos/lib/kernel32/misc/ldr.c _____ Modified: trunk/reactos/lib/kernel32/misc/ldr.c --- trunk/reactos/lib/kernel32/misc/ldr.c 2005-03-27 13:02:06 UTC (rev 14348) +++ trunk/reactos/lib/kernel32/misc/ldr.c 2005-03-27 13:03:30 UTC (rev 14349) @@ -56,10 +56,10 @@ Length = (lpModuleEnd - lpModule) + 1; } - Length += GetCurrentDirectoryW(0, NULL) + 1; - Length += GetSystemDirectoryW(NULL, 0) + 1; - Length += GetWindowsDirectoryW(NULL, 0) + 1; - Length += GetEnvironmentVariableW(L"PATH", NULL, 0) + 1; + Length += GetCurrentDirectoryW(0, NULL); + Length += GetSystemDirectoryW(NULL, 0); + Length += GetWindowsDirectoryW(NULL, 0); + Length += GetEnvironmentVariableW(L"PATH", NULL, 0); EnvironmentBufferW = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length * sizeof(WCHAR)); @@ -181,8 +181,9 @@ SearchPath = GetDllLoadPath( dwFlags & LOAD_WITH_ALTERED_SEARCH_PATH ? lpLibFileName : NULL); - RtlInitUnicodeString (&DllName, (LPWSTR)lpLibFileName); + RtlInitUnicodeString(&DllName, (LPWSTR)lpLibFileName); Status = LdrLoadDll(SearchPath, dwFlags, &DllName, (PVOID*)&hInst); + RtlFreeHeap(RtlGetProcessHeap(), 0, SearchPath); if ( !NT_SUCCESS(Status)) { SetLastErrorByStatus (Status);

19 years, 9 months

[ekohl] 14348: Added handling of unsigned type. Patch by Jacek Caban (from WINE).

by ekohl＠svn.reactos.com

Added handling of unsigned type. Patch by Jacek Caban (from WINE). Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/y.tab.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-03-27 12:47:43 UTC (rev 14347) +++ trunk/reactos/tools/widl/ChangeLog 2005-03-27 13:02:06 UTC (rev 14348) @@ -1,5 +1,12 @@ ChangeLog +2005-03-27 Jacek Caban (from WINE) + + tools/widl/parser.y + tools/widl/y.tab.c + +Added handling of unsigned type + 2005-03-25 ekohl tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/parser.y --- trunk/reactos/tools/widl/parser.y 2005-03-27 12:47:43 UTC (rev 14347) +++ trunk/reactos/tools/widl/parser.y 2005-03-27 13:02:06 UTC (rev 14348) @@ -561,6 +561,8 @@ default: break; } } + | tUNSIGNED { $$ = make_type(RPC_FC_ULONG, &std_int); + $$->sign = -1; } | tFLOAT { $$ = make_type(RPC_FC_FLOAT, NULL); } | tDOUBLE { $$ = make_type(RPC_FC_DOUBLE, NULL); } | tBOOLEAN { $$ = make_type(RPC_FC_SMALL, &std_bool); } _____ Modified: trunk/reactos/tools/widl/y.tab.c --- trunk/reactos/tools/widl/y.tab.c 2005-03-27 12:47:43 UTC (rev 14347) +++ trunk/reactos/tools/widl/y.tab.c 2005-03-27 13:02:06 UTC (rev 14348) @@ -232,7 +232,7 @@ static type_t std_uhyper = { "MIDL_uhyper" }; -#line 109 "parser.y" +#line 106 "parser.y" typedef union { attr_t *attr; expr_t *expr; @@ -323,13 +323,13 @@ 482, 486, 488, 493, 494, 497, 500, 504, 507, 509, 514, 522, 523, 525, 526, 528, 530, 532, 534, 536, 538, 540, 542, 544, 546, 549, 552, 554, 556, 558, - 560, 562, 563, 565, 567, 570, 573, 576, 579, 581, - 583, 586, 589, 592, 597, 598, 601, 604, 607, 610, - 613, 616, 620, 623, 627, 633, 634, 637, 640, 643, - 646, 652, 660, 662, 665, 668, 671, 674, 677, 682, - 685, 688, 690, 692, 696, 698, 702, 704, 706, 712, - 714, 716, 718, 721, 723, 726, 728, 731, 733, 736, - 741, 747, 758, 760 + 560, 562, 564, 565, 567, 569, 572, 575, 578, 581, + 583, 585, 588, 591, 594, 599, 600, 603, 606, 609, + 612, 615, 618, 622, 625, 629, 635, 636, 639, 642, + 645, 648, 654, 662, 664, 667, 670, 673, 676, 679, + 684, 687, 690, 692, 694, 698, 700, 704, 706, 708, + 714, 716, 718, 720, 723, 725, 728, 730, 733, 735, + 738, 743, 749, 760, 762 }; static const short yyrhs[] = { 144, @@ -388,59 +388,59 @@ 0, 0, 184, 0, 0, 3, 0, 4, 0, 3, 0, 4, 0, 60, 0, 94, 0, 115, 0, 22, 0, 117, 0, 187, 0, 96, 187, 0, 111, 187, - 0, 50, 0, 42, 0, 20, 0, 47, 0, 52, - 0, 0, 70, 0, 70, 0, 99, 186, 0, 95, - 186, 0, 76, 186, 0, 59, 186, 0, 71, 0, - 28, 0, 29, 3, 0, 29, 4, 0, 161, 188, - 0, 189, 135, 191, 136, 0, 0, 191, 192, 0, - 160, 202, 0, 40, 3, 0, 40, 4, 0, 161, - 193, 0, 86, 139, 0, 195, 180, 132, 0, 77, - 139, 0, 196, 181, 132, 0, 194, 135, 195, 196, - 136, 0, 0, 139, 4, 0, 72, 3, 0, 72, - 4, 0, 161, 199, 0, 200, 198, 135, 146, 136, - 0, 200, 139, 3, 135, 150, 146, 136, 0, 197, - 0, 199, 132, 0, 193, 132, 0, 78, 3, 0, - 78, 4, 0, 161, 203, 0, 204, 135, 146, 136, - 0, 126, 207, 0, 32, 206, 0, 184, 0, 206, - 0, 133, 207, 134, 0, 207, 0, 208, 120, 207, - 0, 92, 0, 110, 0, 103, 183, 135, 178, 136, - 0, 116, 0, 4, 0, 185, 0, 32, 211, 0, - 171, 0, 46, 3, 0, 210, 0, 103, 3, 0, - 213, 0, 109, 3, 0, 108, 160, 211, 208, 0, - 109, 183, 135, 178, 136, 0, 109, 183, 104, 133, - 180, 134, 182, 135, 165, 136, 0, 5, 0, 5, - 142, 5, 0 + 0, 111, 0, 50, 0, 42, 0, 20, 0, 47, + 0, 52, 0, 0, 70, 0, 70, 0, 99, 186, + 0, 95, 186, 0, 76, 186, 0, 59, 186, 0, + 71, 0, 28, 0, 29, 3, 0, 29, 4, 0, + 161, 188, 0, 189, 135, 191, 136, 0, 0, 191, + 192, 0, 160, 202, 0, 40, 3, 0, 40, 4, + 0, 161, 193, 0, 86, 139, 0, 195, 180, 132, + 0, 77, 139, 0, 196, 181, 132, 0, 194, 135, + 195, 196, 136, 0, 0, 139, 4, 0, 72, 3, + 0, 72, 4, 0, 161, 199, 0, 200, 198, 135, + 146, 136, 0, 200, 139, 3, 135, 150, 146, 136, + 0, 197, 0, 199, 132, 0, 193, 132, 0, 78, + 3, 0, 78, 4, 0, 161, 203, 0, 204, 135, + 146, 136, 0, 126, 207, 0, 32, 206, 0, 184, + 0, 206, 0, 133, 207, 134, 0, 207, 0, 208, + 120, 207, 0, 92, 0, 110, 0, 103, 183, 135, + 178, 136, 0, 116, 0, 4, 0, 185, 0, 32, + 211, 0, 171, 0, 46, 3, 0, 210, 0, 103, + 3, 0, 213, 0, 109, 3, 0, 108, 160, 211, + 208, 0, 109, 183, 135, 178, 136, 0, 109, 183, + 104, 133, 180, 134, 182, 135, 165, 136, 0, 5, + 0, 5, 142, 5, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 229, 232, 233, 234, 235, 236, 237, 238, 241, 242, - 243, 244, 245, 246, 249, 250, 251, 254, 255, 256, - 257, 258, 259, 260, 261, 262, 265, 267, 270, 273, - 275, 277, 280, 281, 284, 287, 288, 289, 293, 297, - 300, 306, 313, 314, 315, 318, 319, 320, 323, 324, - 327, 331, 332, 333, 336, 338, 339, 340, 341, 342, - 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, - 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, - 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, - 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, - 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, - 393, 394, 397, 398, 401, 402, 407, 411, 417, 424, - 425, 426, 429, 430, 436, 441, 447, 455, 456, 469, - 470, 473, 474, 475, 476, 477, 478, 479, 480, 481, - 482, 483, 484, 485, 486, 487, 488, 489, 490, 493, - 494, 497, 503, 508, 509, 514, 515, 516, 517, 520, - 523, 534, 535, 538, 539, 540, 543, 545, 546, 547, - 548, 551, 552, 553, 554, 555, 567, 568, 569, 570, - 571, 574, 575, 578, 579, 580, 581, 582, 583, 584, - 587, 588, 591, 597, 602, 603, 606, 610, 611, 614, - 626, 627, 630, 631, 634, 649, 650, 653, 654, 657, - 665, 673, 680, 683, 685, 688, 689, 692, 697, 703, - 704, 707, 708, 709, 712, 714, 717, 719, 722, 732, - 733, 734, 735, 736, 737, 738, 739, 740, 741, 744, - 756, 760, 773, 775 + 226, 229, 230, 231, 232, 233, 234, 235, 238, 239, + 240, 241, 242, 243, 246, 247, 248, 251, 252, 253, + 254, 255, 256, 257, 258, 259, 262, 264, 267, 270, + 272, 274, 277, 278, 281, 284, 285, 286, 290, 294, + 297, 303, 310, 311, 312, 315, 316, 317, 320, 321, + 324, 328, 329, 330, 333, 335, 336, 337, 338, 339, + 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, + 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, + 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, + 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, + 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, + 390, 391, 394, 395, 398, 399, 404, 408, 414, 421, + 422, 423, 426, 427, 433, 438, 444, 452, 453, 466, + 467, 470, 471, 472, 473, 474, 475, 476, 477, 478, + 479, 480, 481, 482, 483, 484, 485, 486, 487, 490, + 491, 494, 500, 505, 506, 511, 512, 513, 514, 517, + 520, 531, 532, 535, 536, 537, 540, 542, 543, 544, + 545, 548, 549, 550, 551, 552, 564, 566, 567, 568, + 569, 570, 573, 574, 577, 578, 579, 580, 581, 582, + 583, 586, 587, 590, 596, 601, 602, 605, 609, 610, + 613, 625, 626, 629, 630, 633, 648, 649, 652, 653, + 656, 664, 672, 679, 682, 684, 687, 688, 691, 696, + 702, 703, 706, 707, 708, 711, 713, 716, 718, 721, + 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, + 743, 755, 759, 772, 774 }; #endif @@ -498,13 +498,13 @@ 175, 176, 177, 178, 178, 179, 179, 179, 179, 180, 181, 182, 182, 183, 183, 183, 184, 184, 184, 184, 184, 185, 185, 185, 185, 185, 185, 185, 185, 185, - 185, 186, 186, 187, 187, 187, 187, 187, 187, 187, - 188, 188, 189, 190, 191, 191, 192, 193, 193, 194, - 195, 195, 196, 196, 197, 198, 198, 199, 199, 200, - 201, 201, 201, 202, 202, 203, 203, 204, 205, 206, - 206, 207, 207, 207, 208, 208, 209, 209, 210, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 212, - 213, 213, 214, 214 + 185, 185, 186, 186, 187, 187, 187, 187, 187, 187, + 187, 188, 188, 189, 190, 191, 191, 192, 193, 193, + 194, 195, 195, 196, 196, 197, 198, 198, 199, 199, + 200, 201, 201, 201, 202, 202, 203, 203, 204, 205, + 206, 206, 207, 207, 207, 208, 208, 209, 209, 210, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 212, 213, 213, 214, 214 }; static const short yyr2[] = { 0, @@ -526,60 +526,60 @@ 3, 1, 4, 0, 2, 2, 3, 2, 1, 4, 7, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, - 1, 0, 1, 1, 2, 2, 2, 2, 1, 1, - 2, 2, 2, 4, 0, 2, 2, 2, 2, 2, - 2, 3, 2, 3, 5, 0, 2, 2, 2, 2, - 5, 7, 1, 2, 2, 2, 2, 2, 4, 2, - 2, 1, 1, 3, 1, 3, 1, 1, 5, 1, - 1, 1, 2, 1, 2, 1, 2, 1, 2, 4, - 5, 10, 1, 3 + 1, 1, 0, 1, 1, 2, 2, 2, 2, 1, + 1, 2, 2, 2, 4, 0, 2, 2, 2, 2, + 2, 2, 3, 2, 3, 5, 0, 2, 2, 2, + 2, 5, 7, 1, 2, 2, 2, 2, 2, 4, + 2, 2, 1, 1, 3, 1, 3, 1, 1, 5, + 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, + 4, 5, 10, 1, 3 }; static const short yydefact[] = { 2, 1, 0, 0, 0, 164, 0, 0, 0, 164, 49, 164, 18, 0, 8, 20, 9, 23, 9, 7, 0, - 0, 0, 0, 0, 5, 0, 0, 213, 0, 206, - 4, 3, 0, 6, 0, 0, 0, 231, 179, 172, - 190, 0, 178, 164, 180, 177, 181, 182, 184, 189, - 182, 182, 0, 182, 164, 164, 0, 230, 173, 234, - 232, 174, 236, 0, 238, 0, 198, 199, 165, 166, - 0, 0, 0, 208, 209, 0, 0, 50, 0, 55, + 0, 0, 0, 0, 5, 0, 0, 214, 0, 207, + 4, 3, 0, 6, 0, 0, 0, 232, 180, 172, + 191, 0, 179, 164, 181, 178, 182, 183, 185, 190, + 183, 183, 0, 183, 164, 164, 177, 231, 173, 235, + 233, 174, 237, 0, 239, 0, 199, 200, 165, 166, + 0, 0, 0, 209, 210, 0, 0, 50, 0, 55, 56, 0, 0, 59, 60, 61, 62, 63, 0, 0, 67, 0, 0, 71, 72, 0, 0, 0, 0, 0, 78, 0, 80, 0, 0, 83, 84, 0, 86, 87, 88, 89, 90, 91, 92, 0, 94, 95, 96, 97, - 98, 227, 99, 100, 0, 102, 103, 0, 0, 0, - 228, 0, 108, 109, 0, 0, 0, 52, 112, 0, - 0, 0, 0, 0, 0, 193, 200, 210, 218, 19, - 21, 22, 195, 215, 0, 214, 0, 0, 15, 24, - 25, 26, 233, 235, 183, 188, 187, 186, 175, 185, - 237, 239, 176, 167, 168, 169, 170, 171, 0, 0, + 98, 228, 99, 100, 0, 102, 103, 0, 0, 0, + 229, 0, 108, 109, 0, 0, 0, 52, 112, 0, + 0, 0, 0, 0, 0, 194, 201, 211, 219, 19, + 21, 22, 196, 216, 0, 215, 0, 0, 15, 24, + 25, 26, 234, 236, 184, 189, 188, 187, 175, 186, + 238, 240, 176, 167, 168, 169, 170, 171, 0, 0, 120, 0, 28, 154, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 130, 0, 130, 0, 0, 0, 0, 0, 0, 0, 51, 29, 14, 0, 12, 11, 10, 13, 32, - 191, 192, 30, 216, 217, 31, 49, 0, 49, 0, - 207, 15, 49, 0, 27, 0, 122, 123, 126, 153, - 49, 0, 0, 0, 222, 223, 225, 240, 49, 49, + 192, 193, 30, 217, 218, 31, 49, 0, 49, 0, + 208, 15, 49, 0, 27, 0, 122, 123, 126, 153, + 49, 0, 0, 0, 223, 224, 226, 241, 49, 49, 0, 134, 132, 133, 0, 0, 0, 0, 0, 152, 0, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 131, 0, - 0, 0, 0, 0, 0, 243, 0, 0, 53, 0, - 194, 0, 196, 201, 0, 0, 0, 49, 0, 49, - 219, 17, 0, 0, 119, 127, 121, 0, 159, 229, - 0, 50, 155, 0, 221, 220, 0, 0, 0, 241, + 0, 0, 0, 0, 0, 244, 0, 0, 53, 0, + 195, 0, 197, 202, 0, 0, 0, 49, 0, 49, + 220, 17, 0, 0, 119, 127, 121, 0, 159, 230, + 0, 50, 155, 0, 222, 221, 0, 0, 0, 242, 57, 0, 145, 146, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58, 65, 64, 66, 68, 69, 70, 73, 74, 75, 76, 77, 79, 81, 0, 130, 85, 93, 101, 104, 105, 106, 107, - 0, 110, 111, 54, 197, 203, 0, 202, 205, 0, - 15, 211, 113, 16, 124, 125, 238, 158, 156, 224, - 226, 162, 0, 149, 0, 142, 143, 136, 137, 139, - 138, 140, 141, 0, 151, 82, 129, 244, 43, 204, + 0, 110, 111, 54, 198, 204, 0, 203, 206, 0, + 15, 212, 113, 16, 124, 125, 239, 158, 156, 225, + 227, 162, 0, 149, 0, 142, 143, 136, 137, 139, + 138, 140, 141, 0, 151, 82, 129, 245, 43, 205, 49, 114, 0, 157, 0, 163, 148, 147, 0, 130, - 160, 212, 0, 115, 135, 0, 0, 46, 33, 0, - 45, 0, 44, 230, 0, 38, 34, 36, 0, 0, - 0, 0, 242, 116, 47, 0, 161, 0, 0, 43, + 160, 213, 0, 115, 135, 0, 0, 46, 33, 0, + 45, 0, 44, 231, 0, 38, 34, 36, 0, 0, + 0, 0, 243, 116, 47, 0, 161, 0, 0, 43, 0, 49, 48, 37, 43, 33, 40, 49, 118, 33, 39, 0, 117, 0, 42, 41, 0, 0, 0 }; @@ -1390,161 +1390,161 @@ switch (yyn) { case 1: -#line 229 "parser.y" +#line 226 "parser.y" { write_proxies(yyvsp[0].ifref); write_client(yyvsp[0].ifref); write_server(yyvsp[0].ifref); ; break;} case 2: -#line 232 "parser.y" +#line 229 "parser.y" { yyval.ifref = NULL; ; break;} case 3: -#line 233 "parser.y" +#line 230 "parser.y" { yyval.ifref = yyvsp[-1].ifref; ; break;} case 4: -#line 234 "parser.y" +#line 231 "parser.y" { yyval.ifref = make_ifref(yyvsp[0].type); LINK(yyval.ifref, yyvsp[-1].ifref); ; break;} case 5: -#line 235 "parser.y" +#line 232 "parser.y" { yyval.ifref = yyvsp[-1].ifref; add_coclass(yyvsp[0].clas); ; break;} case 6: -#line 236 "parser.y" +#line 233 "parser.y" { yyval.ifref = yyvsp[-1].ifref; add_module(yyvsp[0].type); ; break;} case 7: -#line 237 "parser.y" +#line 234 "parser.y" { yyval.ifref = yyvsp[-1].ifref; ; break;} case 8: -#line 238 "parser.y" +#line 235 "parser.y" { yyval.ifref = yyvsp[-1].ifref; ; break;} case 9: -#line 241 "parser.y" +#line 238 "parser.y" {; break;} case 10: -#line 242 "parser.y" +#line 239 "parser.y" { if (!parse_only) add_interface(yyvsp[0].type); ; break;} case 11: -#line 243 "parser.y" +#line 240 "parser.y" { if (!parse_only) add_interface(yyvsp[0].type); ; break;} case 12: -#line 244 "parser.y" +#line 241 "parser.y" { if (!parse_only) add_coclass(yyvsp[0].clas); ; break;} case 13: -#line 245 "parser.y" +#line 242 "parser.y" { if (!parse_only) add_module(yyvsp[0].type); ; break;} case 14: -#line 246 "parser.y" +#line 243 "parser.y" {; break;} case 15: -#line 249 "parser.y" +#line 246 "parser.y" { yyval.func = NULL; ; break;} case 16: -#line 250 "parser.y" +#line 247 "parser.y" { yyval.func = yyvsp[-1].func; LINK(yyval.func, yyvsp[-2].func); ; break;} case 17: -#line 251 "parser.y" +#line 248 "parser.y" { yyval.func = yyvsp[-1].func; ; break;} case 18: -#line 254 "parser.y" +#line 251 "parser.y" {; break;} case 19: -#line 255 "parser.y" +#line 252 "parser.y" { if (!parse_only && do_header) { write_constdef(yyvsp[-1].var); } ; break;} case 20: -#line 256 "parser.y" +#line 253 "parser.y" {; break;} case 21: -#line 257 "parser.y" +#line 254 "parser.y" { if (!parse_only && do_header) { write_type(header, yyvsp[-1].type, NULL, NULL); fprintf(header, ";\n\n"); } ; break;} case 22: -#line 258 "parser.y" +#line 255 "parser.y" { if (!parse_only && do_header) { write_externdef(yyvsp[-1].var); } ; break;} case 23: -#line 259 "parser.y" +#line 256 "parser.y" {; break;} case 24: -#line 260 "parser.y" +#line 257 "parser.y" { if (!parse_only && do_header) { write_type(header, yyvsp[-1].type, NULL, NULL); fprintf(header, ";\n\n"); } ; break;} case 25: -#line 261 "parser.y" +#line 258 "parser.y" {; break;} case 26: -#line 262 "parser.y" +#line 259 "parser.y" { if (!parse_only && do_header) { write_type(header, yyvsp[-1].type, NULL, NULL); fprintf(header, ";\n\n"); } ; break;} case 27: -#line 265 "parser.y" +#line 262 "parser.y" { if (!parse_only && do_header) fprintf(header, "%s\n", yyvsp[-1].str); ; break;} case 28: -#line 267 "parser.y" +#line 264 "parser.y" { assert(yychar == YYEMPTY); if (!do_import(yyvsp[-1].str)) yychar = aEOF; ; break;} case 29: -#line 270 "parser.y" +#line 267 "parser.y" {; break;} case 30: -#line 273 "parser.y" +#line 270 "parser.y" { yyval.str = yyvsp[0].str; ; break;} case 31: -#line 275 "parser.y" +#line 272 "parser.y" { start_typelib(yyvsp[-1].str, yyvsp[-2].attr); ; break;} case 32: -#line 277 "parser.y" +#line 274 "parser.y" { end_typelib(); ; break;} case 33: -#line 280 "parser.y" +#line 277 "parser.y" { yyval.var = NULL; ; break;} case 35: -#line 284 "parser.y" +#line 281 "parser.y" { yyval.var = NULL; ; break;} case 37: -#line 288 "parser.y" +#line 285 "parser.y" { LINK(yyvsp[0].var, yyvsp[-2].var); yyval.var = yyvsp[0].var; ; break;} case 39: -#line 293 "parser.y" +#line 290 "parser.y" { yyval.var = yyvsp[-1].var; set_type(yyval.var, yyvsp[-2].tref, yyvsp[0].expr); yyval.var->attrs = yyvsp[-3].attr; ; break;} case 40: -#line 297 "parser.y" +#line 294 "parser.y" { yyval.var = yyvsp[-1].var; set_type(yyval.var, yyvsp[-2].tref, yyvsp[0].expr); ; break;} case 41: -#line 300 "parser.y" +#line 297 "parser.y" { yyval.var = yyvsp[-3].var; yyval.var->ptr_level--; set_type(yyval.var, yyvsp[-4].tref, NULL); @@ -1553,7 +1553,7 @@ ; break;} case 42: -#line 306 "parser.y" +#line 303 "parser.y" { yyval.var = yyvsp[-3].var; yyval.var->ptr_level--; set_type(yyval.var, yyvsp[-4].tref, NULL); @@ -1561,299 +1561,299 @@ ; break;} case 43: -#line 313 "parser.y" +#line 310 "parser.y" { yyval.expr = NULL; ; break;} case 44: -#line 314 "parser.y" +#line 311 "parser.y" { yyval.expr = yyvsp[-1].expr; ; break;} case 45: -#line 315 "parser.y" +#line 312 "parser.y" { yyval.expr = make_expr(EXPR_VOID); ; break;} case 47: -#line 319 "parser.y" +#line 316 "parser.y" { LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; break;} case 48: -#line 320 "parser.y" +#line 317 "parser.y" { LINK(yyvsp[0].expr, yyvsp[-3].expr); yyval.expr = yyvsp[0].expr; ; break;} case 49: -#line 323 "parser.y" +#line 320 "parser.y" { yyval.attr = NULL; ; break;} case 51: -#line 328 "parser.y" +#line 325 "parser.y" { yyval.attr = yyvsp[-1].attr; ; break;} case 53: -#line 332 "parser.y" +#line 329 "parser.y" { LINK(yyvsp[0].attr, yyvsp[-2].attr); yyval.attr = yyvsp[0].attr; ; break;} case 54: -#line 333 "parser.y" +#line 330 "parser.y" { LINK(yyvsp[0].attr, yyvsp[-3].attr); yyval.attr = yyvsp[0].attr; ; break;} case 55: -#line 337 "parser.y" +#line 334 "parser.y" { yyval.attr = make_attr(ATTR_ASYNC); ; break;} case 56: -#line 338 "parser.y" +#line 335 "parser.y" { yyval.attr = make_attr(ATTR_AUTO_HANDLE); ; break;} case 57: -#line 339 "parser.y" +#line 336 "parser.y" { yyval.attr = make_attrp(ATTR_CALLAS, yyvsp[-1].var); ; break;} case 58: -#line 340 "parser.y" +#line 337 "parser.y" { yyval.attr = make_attrp(ATTR_CASE, yyvsp[-1].expr); ; break;} case 59: -#line 341 "parser.y" +#line 338 "parser.y" { yyval.attr = make_attrv(ATTR_CONTEXTHANDLE, 0); ; break;} case 60: -#line 342 "parser.y" +#line 339 "parser.y" { yyval.attr = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ ; break;} case 61: -#line 343 "parser.y" +#line 340 "parser.y" { yyval.attr = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ ; break;} case 62: -#line 344 "parser.y" +#line 341 "parser.y" { yyval.attr = make_attr(ATTR_CONTROL); ; break;} case 63: -#line 345 "parser.y" +#line 342 "parser.y" { yyval.attr = make_attr(ATTR_DEFAULT); ; break;} case 64: -#line 346 "parser.y" +#line 343 "parser.y" { yyval.attr = make_attrp(ATTR_DEFAULTVALUE_EXPR, yyvsp[-1].expr); ; break;} case 65: -#line 347 "parser.y" +#line 344 "parser.y" { yyval.attr = make_attrp(ATTR_DEFAULTVALUE_STRING, yyvsp[-1].str); ; break;} case 66: -#line 348 "parser.y" +#line 345 "parser.y" { yyval.attr = make_attrp(ATTR_DLLNAME, yyvsp[-1].str); ; break;} case 67: -#line 349 "parser.y" +#line 346 "parser.y" { yyval.attr = make_attr(ATTR_DUAL); ; break;} case 68: -#line 350 "parser.y" +#line 347 "parser.y" { yyval.attr = make_attrp(ATTR_ENDPOINT, yyvsp[-1].str); ; break;} case 69: -#line 351 "parser.y" +#line 348 "parser.y" { yyval.attr = make_attrp(ATTR_ENTRY_STRING, yyvsp[-1].str); ; break;} case 70: -#line 352 "parser.y" +#line 349 "parser.y" { yyval.attr = make_attrp(ATTR_ENTRY_ORDINAL, yyvsp[-1].expr); ; break;} case 71: -#line 353 "parser.y" +#line 350 "parser.y" { yyval.attr = make_attr(ATTR_EXPLICIT_HANDLE); ; break;} case 72: -#line 354 "parser.y" +#line 351 "parser.y" { yyval.attr = make_attr(ATTR_HANDLE); ; break;} case 73: -#line 355 "parser.y" +#line 352 "parser.y" { yyval.attr = make_attrp(ATTR_HELPCONTEXT, yyvsp[-1].expr); ; break;} case 74: -#line 356 "parser.y" +#line 353 "parser.y" { yyval.attr = make_attrp(ATTR_HELPFILE, yyvsp[-1].str); ; break;} case 75: -#line 357 "parser.y" +#line 354 "parser.y" { yyval.attr = make_attrp(ATTR_HELPSTRING, yyvsp[-1].str); ; break;} case 76: -#line 358 "parser.y" +#line 355 "parser.y" { yyval.attr = make_attrp(ATTR_HELPSTRINGCONTEXT, yyvsp[-1].expr); ; break;} case 77: -#line 359 "parser.y" +#line 356 "parser.y" { yyval.attr = make_attrp(ATTR_HELPSTRINGDLL, yyvsp[-1].str); ; break;} case 78: -#line 360 "parser.y" +#line 357 "parser.y" { yyval.attr = make_attr(ATTR_HIDDEN); ; break;} case 79: -#line 361 "parser.y" +#line 358 "parser.y" { yyval.attr = make_attrp(ATTR_ID, yyvsp[-1].expr); ; break;} case 80: -#line 362 "parser.y" +#line 359 "parser.y" { yyval.attr = make_attr(ATTR_IDEMPOTENT); ; break;} case 81: -#line 363 "parser.y" +#line 360 "parser.y" { yyval.attr = make_attrp(ATTR_IIDIS, yyvsp[-1].var); ; break;} case 82: -#line 364 "parser.y" +#line 361 "parser.y" { yyval.attr = make_attrp(ATTR_IMPLICIT_HANDLE, yyvsp[-1].str); ; break;} case 83: -#line 365 "parser.y" +#line 362 "parser.y" { yyval.attr = make_attr(ATTR_IN); ; break;} case 84: -#line 366 "parser.y" +#line 363 "parser.y" { yyval.attr = make_attr(ATTR_INPUTSYNC); ; break;} case 85: -#line 367 "parser.y" +#line 364 "parser.y" { yyval.attr = make_attrp(ATTR_LENGTHIS, yyvsp[-1].expr); ; break;} case 86: -#line 368 "parser.y" +#line 365 "parser.y" { yyval.attr = make_attr(ATTR_LOCAL); ; break;} case 87: -#line 369 "parser.y" +#line 366 "parser.y" { yyval.attr = make_attr(ATTR_NONCREATABLE); ; break;} case 88: -#line 370 "parser.y" +#line 367 "parser.y" { yyval.attr = make_attr(ATTR_OBJECT); ; break;} case 89: -#line 371 "parser.y" +#line 368 "parser.y" { yyval.attr = make_attr(ATTR_ODL); ; break;} case 90: -#line 372 "parser.y" +#line 369 "parser.y" { yyval.attr = make_attr(ATTR_OLEAUTOMATION); ; break;} case 91: -#line 373 "parser.y" +#line 370 "parser.y" { yyval.attr = make_attr(ATTR_OPTIONAL); ; break;} case 92: -#line 374 "parser.y" +#line 371 "parser.y" { yyval.attr = make_attr(ATTR_OUT); ; break;} case 93: -#line 375 "parser.y" +#line 372 "parser.y" { yyval.attr = make_attrv(ATTR_POINTERDEFAULT, yyvsp[-1].num); ; break;} case 94: -#line 376 "parser.y" +#line 373 "parser.y" { yyval.attr = make_attr(ATTR_PROPGET); ; break;} case 95: -#line 377 "parser.y" +#line 374 "parser.y" { yyval.attr = make_attr(ATTR_PROPPUT); ; break;} case 96: -#line 378 "parser.y" +#line 375 "parser.y" { yyval.attr = make_attr(ATTR_PROPPUTREF); ; break;} case 97: -#line 379 "parser.y" +#line 376 "parser.y" { yyval.attr = make_attr(ATTR_PUBLIC); ; break;} case 98: -#line 380 "parser.y" +#line 377 "parser.y" { yyval.attr = make_attr(ATTR_READONLY); ; break;} case 99: -#line 381 "parser.y" +#line 378 "parser.y" { yyval.attr = make_attr(ATTR_RESTRICTED); ; break;} case 100: -#line 382 "parser.y" +#line 379 "parser.y" { yyval.attr = make_attr(ATTR_RETVAL); ; break;} case 101: -#line 383 "parser.y" +#line 380 "parser.y" { yyval.attr = make_attrp(ATTR_SIZEIS, yyvsp[-1].expr); ; break;} case 102: -#line 384 "parser.y" +#line 381 "parser.y" { yyval.attr = make_attr(ATTR_SOURCE); ; break;} case 103: -#line 385 "parser.y" +#line 382 "parser.y" { yyval.attr = make_attr(ATTR_STRING); ; break;} case 104: -#line 386 "parser.y" +#line 383 "parser.y" { yyval.attr = make_attrp(ATTR_SWITCHIS, yyvsp[-1].expr); ; break;} case 105: -#line 387 "parser.y" +#line 384 "parser.y" { yyval.attr = make_attrp(ATTR_SWITCHTYPE, type_ref(yyvsp[-1].tref)); ; break;} case 106: -#line 388 "parser.y" +#line 385 "parser.y" { yyval.attr = make_attrp(ATTR_TRANSMITAS, type_ref(yyvsp[-1].tref)); ; break;} case 107: -#line 389 "parser.y" +#line 386 "parser.y" { yyval.attr = make_attrp(ATTR_UUID, yyvsp[-1].uuid); ; break;} case 108: -#line 390 "parser.y" +#line 387 "parser.y" { yyval.attr = make_attr(ATTR_V1ENUM); ; break;} case 109: -#line 391 "parser.y" +#line 388 "parser.y" { yyval.attr = make_attr(ATTR_VARARG); ; break;} case 110: -#line 392 "parser.y" +#line 389 "parser.y" { yyval.attr = make_attrv(ATTR_VERSION, yyvsp[-1].num); ; break;} case 111: -#line 393 "parser.y" +#line 390 "parser.y" { yyval.attr = make_attrp(ATTR_WIREMARSHAL, type_ref(yyvsp[-1].tref)); ; break;} case 112: -#line 394 "parser.y" +#line 391 "parser.y" { yyval.attr = make_attrv(ATTR_POINTERTYPE, yyvsp[0].num); ; break;} case 115: -#line 401 "parser.y" +#line 398 "parser.y" { yyval.var = NULL; ; break;} case 116: -#line 402 "parser.y" +#line 399 "parser.y" { if (yyvsp[0].var) { LINK(yyvsp[0].var, yyvsp[-1].var); yyval.var = yyvsp[0].var; } else { yyval.var = yyvsp[-1].var; } ; break;} case 117: -#line 407 "parser.y" +#line 404 "parser.y" { attr_t *a = make_attrp(ATTR_CASE, yyvsp[-2].expr); yyval.var = yyvsp[0].var; if (!yyval.var) yyval.var = make_var(NULL); LINK(a, yyval.var->attrs); yyval.var->attrs = a; ; break;} case 118: -#line 411 "parser.y" +#line 408 "parser.y" { attr_t *a = make_attr(ATTR_DEFAULT); yyval.var = yyvsp[0].var; if (!yyval.var) yyval.var = make_var(NULL); LINK(a, yyval.var->attrs); yyval.var->attrs = a; ; break;} case 119: -#line 417 "parser.y" +#line 414 "parser.y" { yyval.var = reg_const(yyvsp[-2].var); set_type(yyval.var, yyvsp[-3].tref, NULL); yyval.var->eval = yyvsp[0].expr; @@ -1861,22 +1861,22 @@ ; break;} case 120: -#line 424 "parser.y" +#line 421 "parser.y" { yyval.var = NULL; ; break;} case 121: -#line 425 "parser.y" +#line 422 "parser.y" { yyval.var = yyvsp[-1].var; ; break;} case 124: -#line 430 "parser.y" +#line 427 "parser.y" { LINK(yyvsp[0].var, yyvsp[-2].var); yyval.var = yyvsp[0].var; if (yyvsp[-2].var && !yyvsp[0].var->eval) yyvsp[0].var->lval = yyvsp[-2].var->lval + 1; ; break;} case 125: -#line 436 "parser.y" +#line 433 "parser.y" { yyval.var = reg_const(yyvsp[-2].var); yyval.var->eval = yyvsp[0].expr; yyval.var->lval = yyvsp[0].expr->cval; @@ -1884,14 +1884,14 @@ ; break;} case 126: -#line 441 "parser.y" +#line 438 "parser.y" { yyval.var = reg_const(yyvsp[0].var); yyval.var->lval = 0; /* default for first enum entry */ yyval.var->type = make_type(RPC_FC_LONG, &std_int); ; break;} case 127: -#line 447 "parser.y" +#line 444 "parser.y" { yyval.type = get_typev(RPC_FC_ENUM16, yyvsp[-3].var, tsENUM); yyval.type->fields = yyvsp[-1].var; yyval.type->defined = TRUE; @@ -1900,134 +1900,134 @@ ; break;} case 129: -#line 456 "parser.y" +#line 453 "parser.y" { LINK(yyvsp[0].expr, yyvsp[-2].expr); yyval.expr = yyvsp[0].expr; ; break;} case 130: -#line 469 "parser.y" +#line 466 "parser.y" { yyval.expr = make_expr(EXPR_VOID); ; break;} case 132: -#line 473 "parser.y" +#line 470 "parser.y" { yyval.expr = make_exprl(EXPR_NUM, yyvsp[0].num); ; break;} case 133: -#line 474 "parser.y" +#line 471 "parser.y" { yyval.expr = make_exprl(EXPR_HEXNUM, yyvsp[0].num); ; break;} case 134: -#line 475 "parser.y" +#line 472 "parser.y" { yyval.expr = make_exprs(EXPR_IDENTIFIER, yyvsp[0].str); ; break;} case 135: -#line 476 "parser.y" +#line 473 "parser.y" { yyval.expr = make_expr3(EXPR_COND, yyvsp[-4].expr, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 136: -#line 477 "parser.y" +#line 474 "parser.y" { yyval.expr = make_expr2(EXPR_OR , yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 137: -#line 478 "parser.y" +#line 475 "parser.y" { yyval.expr = make_expr2(EXPR_AND, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 138: -#line 479 "parser.y" +#line 476 "parser.y" { yyval.expr = make_expr2(EXPR_ADD, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 139: -#line 480 "parser.y" +#line 477 "parser.y" { yyval.expr = make_expr2(EXPR_SUB, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 140: -#line 481 "parser.y" +#line 478 "parser.y" { yyval.expr = make_expr2(EXPR_MUL, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 141: -#line 482 "parser.y" +#line 479 "parser.y" { yyval.expr = make_expr2(EXPR_DIV, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 142: -#line 483 "parser.y" +#line 480 "parser.y" { yyval.expr = make_expr2(EXPR_SHL, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 143: -#line 484 "parser.y" +#line 481 "parser.y" { yyval.expr = make_expr2(EXPR_SHR, yyvsp[-2].expr, yyvsp[0].expr); ; break;} case 144: -#line 485 "parser.y" +#line 482 "parser.y" { yyval.expr = make_expr1(EXPR_NOT, yyvsp[0].expr); ; break;} case 145: -#line 486 "parser.y" +#line 483 "parser.y" { yyval.expr = make_expr1(EXPR_NEG, yyvsp[0].expr); ; break;} case 146: -#line 487 "parser.y" +#line 484 "parser.y" { yyval.expr = make_expr1(EXPR_PPTR, yyvsp[0].expr); ; break;} case 147: [truncated at 1000 lines; 591 more skipped]

19 years, 9 months

[greatlrd] 14347:

by greatlrd＠svn.reactos.com

Modified: branches/ros-branch-0_2_6/reactos/lib/dinput/mouse.c _____ Modified: branches/ros-branch-0_2_6/reactos/lib/dinput/mouse.c --- branches/ros-branch-0_2_6/reactos/lib/dinput/mouse.c 2005-03-27 12:03:59 UTC (rev 14346) +++ branches/ros-branch-0_2_6/reactos/lib/dinput/mouse.c 2005-03-27 12:47:43 UTC (rev 14347) @@ -871,6 +871,7 @@ static POINT point; int calc; int count_button; +int add = 0; #endif @@ -880,7 +881,6 @@ if (flags != DIGDD_PEEK) { -getmousesvalue(iface); b[0] = ((GetKeyState(VK_LBUTTON) & 0x80) ? 0xFF : 0x00); b[1] = ((GetKeyState(VK_RBUTTON) & 0x80) ? 0xFF : 0x00); b[2] = ((GetKeyState(VK_MBUTTON) & 0x80) ? 0xFF : 0x00); @@ -899,14 +899,13 @@ if (This->acquired == 0) { WARN(" application tries to get data from an unacquired device !\n"); - //return DIERR_NOTACQUIRED; + return DIERR_NOTACQUIRED; // windows does not get any data if // we do not call manual to mouse Acquire // this is only need if some apps calling on getdevice data direcly // in windows GetdeviceData does always update first the data // then return it. - SysMouseAImpl_Acquire(iface); } @@ -915,6 +914,7 @@ #ifdef __REACTOS__ + if (*entries == 0) return DIERR_INVALIDPARAM; if (dodsize < sizeof(DIDEVICEOBJECTDATA_DX3)) { @@ -924,48 +924,58 @@ if (This->data_queue==NULL) { WARN("No buffer have been set up !\n"); return DIERR_NOTINITIALIZED; - } - - FIXME("This is broken in Tribes ??, need right implant of the buffer!!!!!!!!\n"); + } +/* this code are not need it but if we want 100% compatible + with ms we should keep it. but the mouse will be choppy + in Unreal 2004 Demo + if (GetTickCount()-time <50) { *entries=0; return DI_OK; } - time = GetTickCount(); - - +*/ + if (GetTickCount()-time <50) + { + add=0; + } + else + { + add=1; + time = GetTickCount(); + } for (count=0;count<*entries;count++) { - if (save_point.x != point.x) { - dod[count_ent].dwOfs = DIMOFS_X; + + if (save_point.x != point.x) { + dod[count_ent].dwOfs = DIMOFS_X; - dod[count_ent].dwData = point.x - save_point.x; - dod[count_ent].dwTimeStamp = time +1; - dod[count_ent].dwSequence = last_event++; - count_ent++; - save_point.x = point.x; - } + dod[count_ent].dwData = point.x - save_point.x; + dod[count_ent].dwTimeStamp = GetTickCount(); + dod[count_ent].dwSequence = last_event+=add; + count_ent++; + save_point.x = point.x; + } - else if (save_point.y != point.y) { - dod[count_ent].dwOfs = DIMOFS_Y; - dod[count_ent].dwData = point.y - save_point.y; + else if (save_point.y != point.y) { + dod[count_ent].dwOfs = DIMOFS_Y; + dod[count_ent].dwData = point.y - save_point.y; - dod[count_ent].dwTimeStamp = time +1; - dod[count_ent].dwSequence = last_event++; - count_ent++; - save_point.y = point.y; - } - + dod[count_ent].dwTimeStamp = GetTickCount(); + dod[count_ent].dwSequence = last_event+=add; + count_ent++; + save_point.y = point.y; + } + else if (save_b[0] != b[0]) { dod[count_ent].dwOfs = DIMOFS_BUTTON0; dod[count_ent].dwData = b[0]; - dod[count_ent].dwTimeStamp = time +1; - dod[count_ent].dwSequence = last_event++; + dod[count_ent].dwTimeStamp = GetTickCount(); + dod[count_ent].dwSequence = last_event+=add; count_ent++; save_b[0] = b[0]; } @@ -974,8 +984,8 @@ dod[count_ent].dwOfs = DIMOFS_BUTTON1; dod[count_ent].dwData = b[1]; - dod[count_ent].dwTimeStamp = time +1; - dod[count_ent].dwSequence = last_event++; + dod[count_ent].dwTimeStamp = GetTickCount(); + dod[count_ent].dwSequence = last_event+=add; count_ent++; save_b[1] = b[1]; } @@ -984,8 +994,8 @@ dod[count_ent].dwOfs = DIMOFS_BUTTON2; dod[count_ent].dwData = b[2]; - dod[count_ent].dwTimeStamp = time +1; - dod[count_ent].dwSequence = last_event++; + dod[count_ent].dwTimeStamp = GetTickCount(); + dod[count_ent].dwSequence = last_event+=add; count_ent++; save_b[2] = b[2]; } @@ -994,26 +1004,17 @@ dod[count_ent].dwOfs = DIMOFS_BUTTON3; dod[count_ent].dwData = b[3]; - dod[count_ent].dwTimeStamp = time +1; - dod[count_ent].dwSequence = last_event++; + dod[count_ent].dwTimeStamp = GetTickCount(); + dod[count_ent].dwSequence = last_event+=add; count_ent++; save_b[3] = b[3]; } - - else if (save_b[4] != b[4]) { - dod[count_ent].dwOfs = DIMOFS_BUTTON4; - - dod[count_ent].dwData = b[4]; - dod[count_ent].dwTimeStamp = time +1; - dod[count_ent].dwSequence = last_event++; - count_ent++; - save_b[4] = b[4]; - } } // end for +SetCursorPos(point.x, point.y); *entries = count_ent; #endif

19 years, 9 months

[hpoussin] 14346: Saveliy Tretiakov <saveliyt@mail.ru>

by hpoussin＠svn.reactos.com

Saveliy Tretiakov <saveliyt(a)mail.ru> - Implement ClearCommError - Correct badly implemented apis: ClearCommBreak, EscapeCommFunction, GetCommMask, GetCommModemStatus, GetCommState, GetCommTimeouts, PurgeComm, SetCommBreak, SetCommMask, SetCommTimeouts, SetCommState, SetupComm, TransmitCommChar, WaitCommEvent Modified: trunk/reactos/lib/kernel32/misc/comm.c _____ Modified: trunk/reactos/lib/kernel32/misc/comm.c --- trunk/reactos/lib/kernel32/misc/comm.c 2005-03-27 11:14:30 UTC (rev 14345) +++ trunk/reactos/lib/kernel32/misc/comm.c 2005-03-27 12:03:59 UTC (rev 14346) @@ -7,10 +7,14 @@ * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) * modified from WINE [ Onno Hovers, (onno(a)stack.urc.tue.nl) ] * Robert Dickenson (robd(a)mok.lvcom.com) + * Saveliy Tretiakov (saveliyt(a)mail.ru) * UPDATE HISTORY: * Created 01/11/98 - * RDD (30/09/2002) implemented many function bodies to call serial driver. - * KJK (11/02/2003) implemented BuildCommDCB & BuildCommDCBAndTimeouts + * RDD (30/09/2002) implemented many function bodies to call serial driver. + * KJK (11/02/2003) implemented BuildCommDCB & BuildCommDCBAndTimeouts + * ST (21/03/2005) implemented GetCommProperties + * ST (24/03/2005) implemented ClearCommError. Corrected many functions. + * */ #include <k32.h> @@ -760,66 +764,70 @@ STDCALL ClearCommBreak(HANDLE hFile) { - BOOL result = FALSE; - DWORD dwBytesReturned; - - if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; - } - result = DeviceIoControl(hFile, IOCTL_SERIAL_SET_BREAK_OFF, NULL, 0, NULL, 0, &dwBytesReturned, NULL); - return TRUE; + DWORD dwBytesReturned; + return DeviceIoControl(hFile, IOCTL_SERIAL_SET_BREAK_OFF, + NULL, 0, NULL, 0, &dwBytesReturned, NULL); } /* - * @unimplemented + * @implemented */ BOOL STDCALL -ClearCommError(HANDLE hFile, LPDWORD lpErrors, LPCOMSTAT lpStat) +ClearCommError(HANDLE hFile, LPDWORD lpErrors, LPCOMSTAT lpComStat) { - BOOL result = FALSE; + BOOL status = FALSE; DWORD dwBytesReturned; + SERIAL_STATUS SerialStatus; + + status = DeviceIoControl(hFile, IOCTL_SERIAL_GET_COMMSTATUS, NULL, 0, + &SerialStatus, sizeof(SERIAL_STATUS), &dwBytesReturned, NULL); + + if(!NT_SUCCESS(status)) + { + return status; + } + + if(lpErrors) + { + *lpErrors = 0; + if(SerialStatus.Errors & SERIAL_ERROR_BREAK) + *lpErrors |= CE_BREAK; + if(SerialStatus.Errors & SERIAL_ERROR_FRAMING) + *lpErrors |= CE_FRAME; + if(SerialStatus.Errors & SERIAL_ERROR_OVERRUN) + *lpErrors |= CE_OVERRUN; + if(SerialStatus.Errors & SERIAL_ERROR_QUEUEOVERRUN ) + *lpErrors |= CE_RXOVER; + if(SerialStatus.Errors & SERIAL_ERROR_PARITY) + *lpErrors |= CE_RXPARITY; + } + + if (lpComStat) + { + ZeroMemory(lpComStat, sizeof(COMSTAT)); + + if(SerialStatus.HoldReasons & SERIAL_TX_WAITING_FOR_CTS) + lpComStat->fCtsHold = TRUE; + if(SerialStatus.HoldReasons & SERIAL_TX_WAITING_FOR_DSR) + lpComStat->fDsrHold = TRUE; + if(SerialStatus.HoldReasons & SERIAL_TX_WAITING_FOR_DCD) + lpComStat->fRlsdHold = TRUE; + if(SerialStatus.HoldReasons & SERIAL_TX_WAITING_FOR_XON) + lpComStat->fXoffHold = TRUE; + if(SerialStatus.HoldReasons & SERIAL_TX_WAITING_XOFF_SENT) + lpComStat->fXoffSent = TRUE; + + if(SerialStatus.EofReceived) + lpComStat->fEof = TRUE; + + if(SerialStatus.WaitForImmediate) + lpComStat->fTxim = TRUE; - if (hFile == INVALID_HANDLE_VALUE) { - //SetLastError(CE_MODE); - return FALSE; + lpComStat->cbInQue = SerialStatus.AmountInInQueue; + lpComStat->cbOutQue = SerialStatus.AmountInOutQueue; } - if (lpErrors == NULL) { - DPRINT("ERROR: GetCommState() - NULL Errors pointer\n"); - return FALSE; - } -// *lpErrors = CE_BREAK; -// *lpErrors = CE_FRAME; -// *lpErrors = CE_IOE; -// *lpErrors = CE_MODE; -// *lpErrors = CE_OVERRUN; -// *lpErrors = CE_RXOVER; -// *lpErrors = CE_RXPARITY; -// *lpErrors = CE_TXFULL; -/* -CE_BREAK The hardware detected a break condition. -CE_FRAME The hardware detected a framing error. -CE_IOE An I/O error occurred during communications with the device. -CE_MODE The requested mode is not supported, or the hFile parameter is invalid. If this value is specified, it is the only valid error. -CE_OVERRUN A character-buffer overrun has occurred. The next character is lost. -CE_RXOVER An input buffer overflow has occurred. There is either no room in the input buffer, or a character was received after the end-of-file (EOF) character. -CE_RXPARITY The hardware detected a parity error. -CE_TXFULL The application tried to transmit a character, but the output buffer was full. - */ - result = DeviceIoControl(hFile, IOCTL_SERIAL_RESET_DEVICE, NULL, 0, NULL, 0, &dwBytesReturned, NULL); - - if (lpStat != NULL) { - lpStat->fCtsHold = 0; - lpStat->fDsrHold = 0; - lpStat->fRlsdHold = 0; - lpStat->fXoffHold = 0; - lpStat->fXoffSent = 0; - lpStat->fEof = 0; - lpStat->fTxim = 0; - lpStat->cbInQue = 0; - lpStat->cbOutQue = 0; - } return TRUE; } @@ -858,9 +866,6 @@ BOOL result = FALSE; DWORD dwBytesReturned; - if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; - } switch (dwFunc) { case CLRDTR: // Clears the DTR (data-terminal-ready) signal. result = DeviceIoControl(hFile, IOCTL_SERIAL_CLR_DTR, NULL, 0, NULL, 0, &dwBytesReturned, NULL); @@ -891,7 +896,7 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); break; } - return TRUE; + return result; } @@ -914,15 +919,9 @@ STDCALL GetCommMask(HANDLE hFile, LPDWORD lpEvtMask) { - BOOL result = FALSE; DWORD dwBytesReturned; - - if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; - } - result = DeviceIoControl(hFile, IOCTL_SERIAL_GET_WAIT_MASK, + return DeviceIoControl(hFile, IOCTL_SERIAL_GET_WAIT_MASK, NULL, 0, lpEvtMask, sizeof(DWORD), &dwBytesReturned, NULL); - return TRUE; } @@ -933,15 +932,10 @@ STDCALL GetCommModemStatus(HANDLE hFile, LPDWORD lpModemStat) { - BOOL result = FALSE; DWORD dwBytesReturned; - if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; - } - result = DeviceIoControl(hFile, IOCTL_SERIAL_GET_MODEMSTATUS, + return DeviceIoControl(hFile, IOCTL_SERIAL_GET_MODEMSTATUS, NULL, 0, lpModemStat, sizeof(DWORD), &dwBytesReturned, NULL); - return TRUE; } @@ -975,10 +969,6 @@ DPRINT("GetCommState(%d, %p)\n", hFile, lpDCB); - if (hFile == INVALID_HANDLE_VALUE) { - DPRINT("ERROR: GetCommState() - INVALID_HANDLE_VALUE\n"); - return FALSE; - } if (lpDCB == NULL) { DPRINT("ERROR: GetCommState() - NULL DCB pointer\n"); return FALSE; @@ -1079,20 +1069,16 @@ STDCALL GetCommTimeouts(HANDLE hFile, LPCOMMTIMEOUTS lpCommTimeouts) { - BOOL result = FALSE; DWORD dwBytesReturned; - if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; - } if (lpCommTimeouts == NULL) { return FALSE; } - result = DeviceIoControl(hFile, IOCTL_SERIAL_GET_TIMEOUTS, + + return DeviceIoControl(hFile, IOCTL_SERIAL_GET_TIMEOUTS, NULL, 0, lpCommTimeouts, sizeof(COMMTIMEOUTS), &dwBytesReturned, NULL); - return TRUE; } @@ -1127,15 +1113,10 @@ STDCALL PurgeComm(HANDLE hFile, DWORD dwFlags) { - BOOL result = FALSE; DWORD dwBytesReturned; - if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; - } - result = DeviceIoControl(hFile, IOCTL_SERIAL_PURGE, + return DeviceIoControl(hFile, IOCTL_SERIAL_PURGE, &dwFlags, sizeof(DWORD), NULL, 0, &dwBytesReturned, NULL); - return TRUE; } @@ -1146,14 +1127,9 @@ STDCALL SetCommBreak(HANDLE hFile) { - BOOL result = FALSE; DWORD dwBytesReturned; - if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; - } - result = DeviceIoControl(hFile, IOCTL_SERIAL_SET_BREAK_ON, NULL, 0, NULL, 0, &dwBytesReturned, NULL); - return TRUE; + return DeviceIoControl(hFile, IOCTL_SERIAL_SET_BREAK_ON, NULL, 0, NULL, 0, &dwBytesReturned, NULL); } @@ -1176,15 +1152,10 @@ STDCALL SetCommMask(HANDLE hFile, DWORD dwEvtMask) { - BOOL result = FALSE; DWORD dwBytesReturned; - if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; - } - result = DeviceIoControl(hFile, IOCTL_SERIAL_SET_WAIT_MASK, + return DeviceIoControl(hFile, IOCTL_SERIAL_SET_WAIT_MASK, &dwEvtMask, sizeof(DWORD), NULL, 0, &dwBytesReturned, NULL); - return TRUE; } @@ -1205,10 +1176,6 @@ DPRINT("SetCommState(%d, %p) - ENTERED\n", hFile, lpDCB); - if (hFile == INVALID_HANDLE_VALUE) { - DPRINT("SetCommState() - ERROR: INVALID_HANDLE_VALUE\n"); - return FALSE; - } if (lpDCB == NULL) { DPRINT("SetCommState() - ERROR: NULL DCB pointer passed\n"); return FALSE; @@ -1326,13 +1293,9 @@ STDCALL SetCommTimeouts(HANDLE hFile, LPCOMMTIMEOUTS lpCommTimeouts) { - BOOL result = FALSE; DWORD dwBytesReturned; SERIAL_TIMEOUTS Timeouts; - if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; - } if (lpCommTimeouts == NULL) { return FALSE; } @@ -1341,9 +1304,9 @@ Timeouts.ReadTotalTimeoutConstant = lpCommTimeouts->ReadTotalTimeoutConstant; Timeouts.WriteTotalTimeoutMultiplier = lpCommTimeouts->WriteTotalTimeoutMultiplier; Timeouts.WriteTotalTimeoutConstant = lpCommTimeouts->WriteTotalTimeoutConstant; - result = DeviceIoControl(hFile, IOCTL_SERIAL_SET_TIMEOUTS, + + return DeviceIoControl(hFile, IOCTL_SERIAL_SET_TIMEOUTS, &Timeouts, sizeof(Timeouts), NULL, 0, &dwBytesReturned, NULL); - return TRUE; } @@ -1378,18 +1341,13 @@ STDCALL SetupComm(HANDLE hFile, DWORD dwInQueue, DWORD dwOutQueue) { - BOOL result = FALSE; DWORD dwBytesReturned; SERIAL_QUEUE_SIZE QueueSize; - if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; - } QueueSize.InSize = dwInQueue; QueueSize.OutSize = dwOutQueue; - result = DeviceIoControl(hFile, IOCTL_SERIAL_SET_QUEUE_SIZE, + return DeviceIoControl(hFile, IOCTL_SERIAL_SET_QUEUE_SIZE, &QueueSize, sizeof(QueueSize), NULL, 0, &dwBytesReturned, NULL); - return TRUE; } @@ -1400,15 +1358,9 @@ STDCALL TransmitCommChar(HANDLE hFile, char cChar) { - BOOL result = FALSE; DWORD dwBytesReturned; - - if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; - } - result = DeviceIoControl(hFile, IOCTL_SERIAL_IMMEDIATE_CHAR, + return DeviceIoControl(hFile, IOCTL_SERIAL_IMMEDIATE_CHAR, &cChar, sizeof(cChar), NULL, 0, &dwBytesReturned, NULL); - return TRUE; } @@ -1419,18 +1371,14 @@ STDCALL WaitCommEvent(HANDLE hFile, LPDWORD lpEvtMask, LPOVERLAPPED lpOverlapped) { - BOOL result = FALSE; DWORD dwBytesReturned; - if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; - } if (lpEvtMask == NULL) { return FALSE; } - result = DeviceIoControl(hFile, IOCTL_SERIAL_WAIT_ON_MASK, + + return DeviceIoControl(hFile, IOCTL_SERIAL_WAIT_ON_MASK, NULL, 0, lpEvtMask, sizeof(DWORD), &dwBytesReturned, lpOverlapped); - return TRUE; } /* EOF */

19 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005