Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[hpoussin] 29130: Send the right inf file handle to SetupCloseInfFile().

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Sep 21 17:00:16 2007 New Revision: 29130 URL: http://svn.reactos.org/svn/reactos?rev=29130&view=rev Log: Send the right inf file handle to SetupCloseInfFile(). Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Fri Sep 21 17:00:16 2007 @@ -474,7 +474,7 @@ if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"Signature", &Context)) { DPRINT("SetupFindFirstLineW() failed for section 'Unattend'\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } @@ -482,7 +482,7 @@ if (!INF_GetData(&Context, NULL, &Value)) { DPRINT("INF_GetData() failed for key 'Signature'\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } @@ -490,7 +490,7 @@ if (_wcsicmp(Value, L"$ReactOS$") != 0) { DPRINT("Signature not $ReactOS$\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } @@ -498,19 +498,19 @@ if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"UnattendSetupEnabled", &Context)) { DPRINT("Can't find key 'UnattendSetupEnabled'\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } if (!INF_GetData(&Context, NULL, &Value)) { DPRINT("Can't read key 'UnattendSetupEnabled'\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } if (_wcsicmp(Value, L"yes") != 0) { DPRINT("Unattend setup is disabled by 'UnattendSetupEnabled' key!\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } @@ -518,13 +518,13 @@ if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationDiskNumber", &Context)) { DPRINT("SetupFindFirstLine() failed for key 'DestinationDiskNumber'\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } if (!SetupGetIntField(&Context, 1, &IntValue)) { DPRINT("SetupGetIntField() failed for key 'DestinationDiskNumber'\n"); - SetupCloseInfFile(&UnattendInf); + SetupCloseInfFile(UnattendInf); return; } UnattendDestinationDiskNumber = (LONG)IntValue;

17 years, 1 month

[hpoussin] 29129: Fix typo

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Sep 21 16:45:39 2007 New Revision: 29129 URL: http://svn.reactos.org/svn/reactos?rev=29129&view=rev Log: Fix typo Modified: trunk/reactos/dll/win32/setupapi/stringtable.c Modified: trunk/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringt… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stringtable.c (original) +++ trunk/reactos/dll/win32/setupapi/stringtable.c Fri Sep 21 16:45:39 2007 @@ -73,7 +73,7 @@ pStringTable->pSlots = MyMalloc(sizeof(TABLE_SLOT) * TABLE_DEFAULT_SIZE); if (pStringTable->pSlots == NULL) { - MyFree(pStringTable->pSlots); + MyFree(pStringTable); return NULL; } @@ -122,7 +122,7 @@ pStringTable->pSlots = MyMalloc(sizeof(TABLE_SLOT) * TABLE_DEFAULT_SIZE); if (pStringTable->pSlots == NULL) { - MyFree(pStringTable->pSlots); + MyFree(pStringTable); return NULL; }

17 years, 1 month

[jimtabor] 29127: - Fixed CMP_UnregisterNotification. Add IN, sorry.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Sep 21 04:07:26 2007 New Revision: 29127 URL: http://svn.reactos.org/svn/reactos?rev=29127&view=rev Log: - Fixed CMP_UnregisterNotification. Add IN, sorry. Modified: trunk/reactos/include/ddk/cfgmgr32.h Modified: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… ============================================================================== --- trunk/reactos/include/ddk/cfgmgr32.h (original) +++ trunk/reactos/include/ddk/cfgmgr32.h Fri Sep 21 04:07:26 2007 @@ -624,7 +624,7 @@ CMAPI CONFIGRET WINAPI -CMP_UnregisterNotification(ULONG luhDevNotify); +CMP_UnregisterNotification(IN ULONG luhDevNotify); /* FIXME: Missing CMP_WaitNoPendingInstallEvents */ /* FIXME: Missing CMP_WaitServicesAvailable */

17 years, 1 month

[jimtabor] 29126: - Add CMP_RegisterNotification and CMP_UnregisterNotification. Both called from User32.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Sep 21 04:05:17 2007 New Revision: 29126 URL: http://svn.reactos.org/svn/reactos?rev=29126&view=rev Log: - Add CMP_RegisterNotification and CMP_UnregisterNotification. Both called from User32. Modified: trunk/reactos/include/ddk/cfgmgr32.h Modified: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… ============================================================================== --- trunk/reactos/include/ddk/cfgmgr32.h (original) +++ trunk/reactos/include/ddk/cfgmgr32.h Fri Sep 21 04:05:17 2007 @@ -605,7 +605,14 @@ CMP_Init_Detection( IN DWORD dwMagic); -/* FIXME: Missing CMP_RegisterNotification */ +CMAPI +CONFIGRET +WINAPI +CMP_RegisterNotification( + IN HANDLE hRecipient, + IN LPVOID lpvNotificationFilter, + IN DWORD dwFlags, + OUT PULONG pluhDevNotify); CMAPI CONFIGRET @@ -614,7 +621,11 @@ IN DWORD dwMagic, IN DWORD dwProcessId); -/* FIXME: Missing CMP_UnregisterNotification */ +CMAPI +CONFIGRET +WINAPI +CMP_UnregisterNotification(ULONG luhDevNotify); + /* FIXME: Missing CMP_WaitNoPendingInstallEvents */ /* FIXME: Missing CMP_WaitServicesAvailable */

17 years, 1 month

[cfinck] 29125: Change the file names of the Catalan resource files from "ca-CA" to "ca-ES". Thanks to Marc Piulachs for noticing this. Also fixed the sublang in the catalan "msconfig" resource file (thx to EmuandCo :-P) See issue #2662 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Sep 21 00:57:28 2007 New Revision: 29125 URL: http://svn.reactos.org/svn/reactos?rev=29125&view=rev Log: Change the file names of the Catalan resource files from "ca-CA" to "ca-ES". Thanks to Marc Piulachs for noticing this. Also fixed the sublang in the catalan "msconfig" resource file (thx to EmuandCo :-P) See issue #2662 for more details. Added: trunk/reactos/base/applications/cacls/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/cacls/lang/ca-CA.rc trunk/reactos/base/applications/calc/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/calc/lang/ca-CA.rc trunk/reactos/base/applications/charmap/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/charmap/lang/ca-CA.rc trunk/reactos/base/applications/cmdutils/find/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/cmdutils/find/lang/ca-CA.rc trunk/reactos/base/applications/cmdutils/more/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/cmdutils/more/lang/ca-CA.rc trunk/reactos/base/applications/control/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/control/lang/ca-CA.rc trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc trunk/reactos/base/applications/games/winemine/lang/ca-ES.rc - copied unchanged from r29123, trunk/reactos/base/applications/games/winemine/lang/ca-CA.rc trunk/reactos/base/applications/msconfig/lang/ca-ES.rc - copied, changed from r29123, trunk/reactos/base/applications/msconfig/lang/ca-CA.rc Removed: trunk/reactos/base/applications/cacls/lang/ca-CA.rc trunk/reactos/base/applications/calc/lang/ca-CA.rc trunk/reactos/base/applications/charmap/lang/ca-CA.rc trunk/reactos/base/applications/cmdutils/find/lang/ca-CA.rc trunk/reactos/base/applications/cmdutils/more/lang/ca-CA.rc trunk/reactos/base/applications/control/lang/ca-CA.rc trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc trunk/reactos/base/applications/games/winemine/lang/ca-CA.rc trunk/reactos/base/applications/msconfig/lang/ca-CA.rc Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/calc/rsrc.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/cmdutils/find/rsrc.rc trunk/reactos/base/applications/cmdutils/more/rsrc.rc trunk/reactos/base/applications/control/rsrc.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/msconfig/rsrc.rc Removed: trunk/reactos/base/applications/cacls/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/cacls/lang/ca-CA.rc (removed) @@ -1,74 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - -IDS_HELP, "Mostra o modifica la llista de control d'accés (ACLs) dels fitxers\n\n\ -CACLS fitxer [/T] [/E] [/C] [/G user:perm [...]] [/R usuari [...]]\n\ - [/P user:perm [...]] [/D usuari [...]]\n\ - fitxer Mostra ACLs.\n\ - /T Canvia el ACLs dels fitxers especificats al\n\ - directori actual i tots els seus subdirectoris.\n\ - /E Edita ACL en comptes de substituir-lo.\n\ - /C Continua en cas d'error d'accés.\n\ - /G user:perm Assegura els drets d'accés especificats per al usuari.\n\ - perm pot ser: R Lectura\n\ - W Escriptura\n\ - C Modificació (Escriptura)\n\ - F Control total\n\ - /R usuari Revoca els drets d'accés especificats per al usuari(només vàlid amb /E).\n\ - /P user:perm Canvia els drets d'accés especificats per al usuari.\n\ - perm pot ser: N Cap\n\ - R Lectura\n\ - W Escriptura\n\ - C Modificació (Escriptura)\n\ - F Control total\n\ - /D usuari Denega els drets d'accés especificats per al usuari.\n\ -Es possible utilitzar comodins per especificar més d'un fitxer per comanda.\n\ -Podeu especificar més d'un usuari per comanda.\n\n\ -Abreviacions:\n\ - CI - Container heredat.\n\ - ACE s'heredarà per directoris.\n\ - OI - Objecte heredat.\n\ - ACE s'heredarà per fitxers.\n\ - IO - Només heredat.\n\ - ACE no s'aplicarà al directori/fitxer actual.\n" - -IDS_ABBR_CI, "(CI)" -IDS_ABBR_OI, "(OI)" -IDS_ABBR_IO, "(IO)" -IDS_ABBR_FULL, "F" -IDS_ABBR_READ, "R" -IDS_ABBR_WRITE, "W" -IDS_ABBR_CHANGE, "C" -IDS_ABBR_NONE, "N" -IDS_ALLOW, "" -IDS_DENY, "(DENEGAT)" -IDS_SPECIAL_ACCESS, "(accés especial:)" -IDS_GENERIC_READ, "GENERIC_READ" -IDS_GENERIC_WRITE, "GENERIC_WRITE" -IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" -IDS_GENERIC_ALL, "GENERIC_ALL" -IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" -IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" -IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" -IDS_FILE_READ_DATA, "FILE_READ_DATA" -IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" -IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" -IDS_FILE_READ_EA, "FILE_READ_EA" -IDS_FILE_WRITE_EA, "FILE_WRITE_EA" -IDS_FILE_EXECUTE, "FILE_EXECUTE" -IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" -IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" -IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" -IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" -IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" -IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" -IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" -IDS_SYNCHRONIZE, "SYNCHRONIZE" -IDS_WRITE_OWNER, "WRITE_OWNER" -IDS_WRITE_DAC, "WRITE_DAC" -IDS_READ_CONTROL, "READ_CONTROL" -IDS_DELETE, "DELETE" -IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" -} Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -9,7 +9,7 @@ /* include localised resources */ #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Removed: trunk/reactos/base/applications/calc/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/calc/lang/ca-CA.rc (removed) @@ -1,163 +1,0 @@ -/* - * WineCalc (En.rc) - * - * Copyright 2003 James Briggs - * - * This library 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. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "windows.h" -#include "resource.h" -#include "winecalc.h" - -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_APPNAME, "Calculadora" - - IDS_COPYRIGHT1, "Calculadora 5.0. Sota llicenia LGPL 2" - IDS_COPYRIGHT2 "Copyright 2003, James Briggs" - IDS_COPYRIGHT3 "San Jose, California, USA" - IDS_COPYRIGHT4 "james(a)ActionMessage.com" - IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" - - IDS_BTN_BACKSPACE, "Retrocés" - IDS_BTN_CLEAR_ENTRY, "CE" - IDS_BTN_CLEAR_ALL, "C" - IDS_BTN_MEM_CLEAR, "MC" - IDS_BTN_MEM_RECALL, "MR" - IDS_BTN_MEM_STORE, "MS" - IDS_BTN_MEM_PLUS, "M+" - IDS_BTN_MEM_STATUS_M, "M" - IDS_BTN_SQRT, "sqrt" - IDS_BTN_DEGREES, "Sexagesimal" - IDS_BTN_RADIANS, "Radiant" - IDS_BTN_GRADS, "Graus" - IDS_BTN_SHRT_HEX "Hex" - IDS_BTN_SHRT_DEC "Dec" - IDS_BTN_SHRT_OCT "Oct" - IDS_BTN_SHRT_BIN "Bin" - IDS_ERR_INVALID_INPUT, "Entrada invàlida per la funció." - IDS_ERR_DIVIDE_BY_ZERO, "No puc dividir per zero." - IDS_ERR_UNDEFINED, "El resultat de la funció és indefinit." -} - -MAIN_MENU MENU DISCARDABLE -{ - POPUP "&Edita" { - MENUITEM "&Copia Ctrl+C", IDM_COPY - MENUITEM "E&nganxa Ctrl+V", IDM_PASTE - } - POPUP "&Vista" { - MENUITEM "Estandard", IDM_MODE_STANDARD - MENUITEM "Científica", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Agrupació de dígits", IDM_DIGIT_GROUPING - } - POPUP "&Ajuda" { - MENUITEM "Temes d'ajuda", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "En quant a la Calculadora", IDM_ABOUT - } -} - -SCIMS_MENU MENU DISCARDABLE -{ - POPUP "&Edita" { - MENUITEM "&Copia Ctrl+C", IDM_COPY - MENUITEM "E&ngancxa Ctrl+V", IDM_PASTE - } - POPUP "&Vista" { - MENUITEM "Estandard", IDM_MODE_STANDARD - MENUITEM "Científica", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Hexadecimal\tF5", ID_CALC_NS_HEX - MENUITEM "Decimal\tF6", ID_CALC_NS_DEC - MENUITEM "Octal\tF7", ID_CALC_NS_OCT - MENUITEM "Binària\tF8", ID_CALC_NS_BIN - MENUITEM SEPARATOR - MENUITEM "Sexagesimal\tF2", ID_CALC_MS_DEGREES - MENUITEM "Radiants\tF3", ID_CALC_MS_RADIANS - MENUITEM "Graus\tF4", ID_CALC_MS_GRADS - MENUITEM SEPARATOR - MENUITEM "Agrupació de digits", IDM_DIGIT_GROUPING - } - POPUP "&Ajuda" { - MENUITEM "Temes d'ajuda", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "En quant a la Calculadora", IDM_ABOUT - } -} - -SCIWS_MENU MENU DISCARDABLE -{ - POPUP "&Edita" { - MENUITEM "&Copia Ctrl+C", IDM_COPY - MENUITEM "E&nganxa Ctrl+V", IDM_PASTE - } - POPUP "&Vista" { - MENUITEM "Estandard", IDM_MODE_STANDARD - MENUITEM "Cientifica", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Hexadecimal\tF5", ID_CALC_NS_HEX - MENUITEM "Decimal\tF6", ID_CALC_NS_DEC - MENUITEM "Octal\tF7", ID_CALC_NS_OCT - MENUITEM "Binària\tF8", ID_CALC_NS_BIN - MENUITEM SEPARATOR - MENUITEM "Qword\tF12", ID_CALC_WS_QWORD - MENUITEM "Dword\tF2", ID_CALC_WS_DWORD - MENUITEM "Word\tF3", ID_CALC_WS_WORD - MENUITEM "Byte\tF4", ID_CALC_WS_BYTE - MENUITEM SEPARATOR - MENUITEM "Agrupació de digits", IDM_DIGIT_GROUPING - } - POPUP "&Ajuda" { - MENUITEM "Temes d'ajuda", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "En quant a la Calculadora", IDM_ABOUT - } -} - -MAIN_MENU ACCELERATORS -BEGIN - VK_F1, IDV_HELP, VIRTKEY -END - -DLG_ABOUT DIALOG 12,0,120,82 -CAPTION "En quant a GNU winecalc" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -BEGIN - DEFPUSHBUTTON "Acceptar", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -WHATS_THIS_MENU MENU DISCARDABLE -{ - POPUP "" { - MENUITEM "Què es això?", IDM_WHATS_THIS - } -} - -DLG_STATS DIALOG 12,0,125,78 -CAPTION "Cuadre Estadístic" -FONT 9, "Tahoma" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -BEGIN - DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&CÀRREGA", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "C&D" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP -END - Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… ============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc (original) +++ trunk/reactos/base/applications/calc/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -26,7 +26,7 @@ IDI_CALCICON ICON "calculator.ico" #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" Removed: trunk/reactos/base/applications/charmap/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/charmap/lang/ca-CA.rc (removed) @@ -1,35 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 -CAPTION "Mapa de caràcters" -FONT 8,"MS Sans Serif",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX -BEGIN - LTEXT "Font :", IDC_STATIC, 6, 7, 24, 9 - COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS - PUSHBUTTON "Ajuda", IDC_CMHELP, 249, 5, 35, 13 - CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 - LTEXT "Caràcters a copiar :", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "Selecciona", IDC_SELECT, 194, 186, 46, 13 - PUSHBUTTON "Copia", IDC_COPY, 244, 186, 46, 13, WS_DISABLED - //AUTOCHECKBOX "Vista avançada", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP - //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY -END - -IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "En quanta al Mapa de caràcters" -FONT 8,"MS Sans Serif",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Tancar", IDOK, 75, 162, 44, 15 - ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\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., 675 Mass Ave, Cambridge, MA 02139, USA." - IDS_ABOUT "&En quant a..." -END Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -8,7 +8,7 @@ IDI_ICON ICON "res/charmap.ico" #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/en-US.rc" #include "lang/de-DE.rc" #include "lang/es-ES.rc" Removed: trunk/reactos/base/applications/cmdutils/find/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/lang/ca-CA.rc (removed) @@ -1,17 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - -IDS_USAGE, "FIND: Mostra totes les linies que continguin una determinada cadena de caràcters.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"Cadena de caràcters\" [ file... ]\n\ - /C Conta el numero de linies que contenen la cadena de caràcters\n\ - /I Ignore case\n\ - /N Numero de linies mostrades, començant per la primera\n\ - /V Mostra les linies que no contenen la cadena de caràcters" - -IDS_NO_SUCH_FILE, "FIND: %s: No he trobat el fitxer\n" - -IDS_CANNOT_OPEN, "FIND: %s: No puc obrir el fitxer\n" - -} Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -1,7 +1,7 @@ #include <windows.h> #include "resource.h" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/ru-RU.rc" Removed: trunk/reactos/base/applications/cmdutils/more/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/ca-CA.rc (removed) @@ -1,15 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_USAGE, "Mostra en pantalla el contingut pàgina per pàgina.\n\n\ - MORE < [Unitat:][Ruta]Nom del fitxer\n\ - Instrucció | MORE \n\ - MORE [Unitat:][Ruta]Nom del fitxer\n\n\ - [Unitat:][Ruta]Nom del fitxer Un fitxer, el contingut del qual serà mostrat.\n\ - Instrucció\t\t Una instrucció, el resultat de la qual serà mostrada.\n\n\ - Al visualitzar ""-- Continua --"" heu de premer qualsevol tecla per visualitzar la següent pàgina.\n" - - IDS_CONTINUE, " -- Continua (100%) -- " - IDS_FILE_ACCESS, "No puc accedir al fitxer %s." -} Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -1,7 +1,7 @@ #include <windows.h> #include "resource.h" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" Removed: trunk/reactos/base/applications/control/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/control/lang/ca-CA.rc (removed) @@ -1,27 +1,0 @@ -// Catalan language resource file (Hiper, equip Capdelluç) - -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "&Fitxer" - BEGIN - MENUITEM "&Tancar", IDM_CLOSE - END - POPUP "&Veure" - BEGIN - MENUITEM "Icones grans", IDM_LARGEICONS - MENUITEM "Icones petites", IDM_SMALLICONS - MENUITEM "Llista", IDM_LIST - MENUITEM "Detalls", IDM_DETAILS - END - POPUP "Ajuda" - BEGIN - MENUITEM "En quant a", IDM_ABOUT - END -END Modified: trunk/reactos/base/applications/control/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/rsrc.rc (original) +++ trunk/reactos/base/applications/control/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -9,7 +9,7 @@ /* include localised resources */ #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/cs-CZ.rc" #include "lang/da-DK.rc" #include "lang/de-DE.rc" Removed: trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc (removed) @@ -1,85 +1,0 @@ -/* - * PROJECT: Solitaire - * LICENSE: Freeware, permission to use under Public Domain - * FILE: base/applications/games/solitaire/ca-CA.rc - * PURPOSE: Catalan Language File for Solitaire - * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) - */ -#include "resource.h" - -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - - -/* Dialogs */ - -IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT -CAPTION "Options" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Cartes", -1, 7, 7, 65, 40 - AUTORADIOBUTTON "Treu-ne &Una", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "Treu-ne &Tres", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - - AUTOCHECKBOX "&Mostra el temps", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED - AUTOCHECKBOX "&Barra d'estat", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP - - DEFPUSHBUTTON "Acceptar", IDOK, 35, 97, 50, 14 - PUSHBUTTON "CancelÂ·lar", IDCANCEL, 101, 97, 50, 14 -END - - -IDD_CARDBACK DIALOGEX 6, 6, 221, 96 -CAPTION "Seleccioneu l'anvers" -FONT 8, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT -BEGIN - CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 - CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 - CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 - CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "Acceptar", IDOK, 104, 77, 54, 13 - PUSHBUTTON "CancelÂ·lar", IDCANCEL, 162, 77, 54, 13 -END - - -/* Strings */ - -STRINGTABLE -BEGIN - IDS_SOL_NAME "Solitari" - IDS_SOL_ABOUT "Solitari per J Brown\n\nCardLib versio 1.0." - IDS_SOL_QUIT "Voleu sortir del joc actual?" - IDS_SOL_WIN "Felicitats, heu guanyat!!" -END - - -/* Menus */ - -IDR_MENU1 MENU DISCARDABLE -BEGIN - POPUP "&Joc" - BEGIN - MENUITEM "R&eparteix\tF2", IDM_GAME_NEW - MENUITEM SEPARATOR - MENUITEM "&Barallar...", IDM_GAME_DECK - MENUITEM "&Opcions...", IDM_GAME_OPTIONS - MENUITEM SEPARATOR - MENUITEM "&Sortida", IDM_GAME_EXIT - END - POPUP "&Ajuda" - BEGIN - MENUITEM "&Contingut\tF1", IDM_HELP_CONTENTS - MENUITEM "E&n quant a", IDM_HELP_ABOUT - END -END - - - -/* Accelerator */ - -IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE -BEGIN - VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT - VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT -END Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -6,7 +6,7 @@ IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico" #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Removed: trunk/reactos/base/applications/games/winemine/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/ca-CA.rc (removed) @@ -1,83 +1,0 @@ -#include "resource.h" - -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -STRINGTABLE { - IDS_APPNAME, "Cercamines" - -} - -MENU_WINEMINE MENU DISCARDABLE -{ - POPUP "&Opcions" { - MENUITEM "&Nou", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "In&terrogant (?)", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Principiant", IDM_BEGINNER - MENUITEM "&Avançat", IDM_ADVANCED - MENUITEM "&Expert", IDM_EXPERT - MENUITEM "Pe&rsonalitzat", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "&Sortida", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "&Millors Temps", IDM_TIMES - MENUITEM "En q&uant a", IDM_ABOUT - } -} - -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Millors temps" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Millors Temps", IDNONE, 10, 10, 140, 45 - LTEXT "Principiant", IDNONE, 20, 20, 40, 8 - LTEXT "Avançat", IDNONE, 20, 30, 40, 8 - LTEXT "Expert", IDNONE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "Acceptar", IDOK, 55, 60, 50, 15 -} - -DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Felicitats!" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Si us plau, entreu el vostre nom", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Acceptar", IDOK, 60, 40, 40, 15 -} - -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Joc Personalitzat" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Files", IDNONE, 5, 5, 30, 10 - LTEXT "Columnes", IDNONE, 5, 35, 30, 10 - LTEXT "Mines", IDNONE, 5, 65, 30, 10 - EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER - DEFPUSHBUTTON "Acceptar", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Cancel·lar", IDCANCEL, 40, 50, 50, 15 -} - -DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "En quant a" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Cercamines", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 110, 10 - LTEXT "sota llicència Wine", IDNONE, 35, 35, 100, 10 - ICON IDI_WINEMINE, IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "Acceptar", IDOK, 50, 60, 55, 15 -} Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/rsrc.rc (original) +++ trunk/reactos/base/applications/games/winemine/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -12,7 +12,7 @@ /* include localised resources */ #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Removed: trunk/reactos/base/applications/msconfig/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/ca-CA.rc (removed) @@ -1,174 +1,0 @@ -LANGUAGE LANG_CATALAN, SUBLANG_NEUTRAL - -IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 -STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | - WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | - WS_THICKFRAME -CAPTION "Progrma de configuracio del sistema" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 - DEFPUSHBUTTON "Acceptar", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Ajuda", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Cancel·lar", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Aplicar", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_STARTUP_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 -STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 - PUSHBUTTON "A&ctivar-ho tot",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 - PUSHBUTTON "&Deactivar-ho tot",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 -END - -IDD_SYSTEM_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 -STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148 - PUSHBUTTON "P&uja", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 - PUSHBUTTON "&Baixa", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 - - PUSHBUTTON "Ac&tiva", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 - PUSHBUTTON "D&esactiva", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 - - PUSHBUTTON "&Busca", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 - PUSHBUTTON "&Nou", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 - PUSHBUTTON "Ed&ita", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 - - PUSHBUTTON "A&ctivar-ho tot", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 - PUSHBUTTON "&Deactivar-ho tot",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 -END - -IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 -STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 - EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY - PUSHBUTTON "&Executa", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 -STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 - PUSHBUTTON "A&ctivar-ho tot",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 - PUSHBUTTON "&Deactivar-ho tot",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 -END - -IDD_GENERAL_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 -STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Seleccio d'arrencada", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT - CONTROL "Arrencada &Normal - Carrega tots els serveis i controladors", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 - CONTROL "Arrencada de &Diagnostic - Nomes carrega els seveis i controladors basics", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 - CONTROL "Seleccio &Manual", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "&Processos del fitxer SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "&Serveis del sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "P&rogrames del menu inici", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 -END - -IDD_FREELDR_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 -STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 - PUSHBUTTON "&Prova camins d'arrencada", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 - PUSHBUTTON "&Fes-ho per defecte", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 - PUSHBUTTON "P&uja", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 - PUSHBUTTON "&Baixa", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "&Opcions d'arrencada", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/&SAFEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 - CHECKBOX "/BOO&TLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 - CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 - CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 - PUSHBUTTON "Op&cions Avançades...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "Temps:", -1, 280, 91, 30, 10 - EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "sec.", -1, 340, 91, 15, 10 -END - -IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE 0, 0, 175, 175 -STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" -BEGIN - CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 - EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 - CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 - CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 - COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP - CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 - CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10 - CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 - EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT - CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10 - CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 - COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP - CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 - COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP - CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 - EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT - CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 - PUSHBUTTON "Acceptar", IDC_OK, 20, 160, 50, 12 - PUSHBUTTON "Cancel·lar", IDC_CANCEL, 100, 160, 50, 12 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_MSCONFIG "Programa de configuracio de sistema" - IDS_TAB_GENERAL "General" - IDS_TAB_SYSTEM "SYSTEM.INI" - IDS_TAB_FREELDR "FREELDR.INI" - IDS_TAB_SERVICES "Serveis" - IDS_TAB_STARTUP "Arrencada" - IDS_TAB_TOOLS "Eines" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_COLUMN_SERVICE "Servei" - IDS_SERVICES_COLUMN_REQ "Obligatori" - IDS_SERVICES_COLUMN_VENDOR "Fabricant" - IDS_SERVICES_COLUMN_STATUS "Estat" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLS_COLUMN_NAME "Nom" - IDS_TOOLS_COLUMN_DESCR "Descripcio" - - IDS_TOOLS_CMD_NAME "Consola" - IDS_TOOLS_CMD_DESCR "" - IDS_TOOLS_CMD_CMD "cmd.exe" - - IDS_TOOLS_INFO_NAME "Versio" - IDS_TOOLS_INFO_DESCR "Mostra informacio de la versio." - IDS_TOOLS_INFO_CMD "winver.exe" - - IDS_TOOLS_REGEDIT_NAME "Editor del registre" - IDS_TOOLS_REGEDIT_DESCR "Obre l'editor del registre." - IDS_TOOLS_REGEDIT_CMD "regedit.exe" - - IDS_TOOLS_SYSDM_NAME "Propietats del sistema" - IDS_TOOLS_SYSDM_DESCR "Mostra la informacio d'aquest ordinador." - IDS_TOOLS_SYSDM_CMD "control" - IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" - - IDS_STARTUP_COLUMN_ELEMENT "Element" - IDS_STARTUP_COLUMN_CMD "Command" - IDS_STARTUP_COLUMN_PATH "Path" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_STATUS_RUNNING "En marxa" - IDS_SERVICES_STATUS_STOPPED "Parat" - IDS_SERVICES_YES "Si" - IDS_SERVICES_UNKNOWN "Indeterminat" -END Copied: trunk/reactos/base/applications/msconfig/lang/ca-ES.rc (from r29123, trunk/reactos/base/applications/msconfig/lang/ca-CA.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/ca-ES.rc Fri Sep 21 00:57:28 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_CATALAN, SUBLANG_NEUTRAL +LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/rsrc.rc (original) +++ trunk/reactos/base/applications/msconfig/rsrc.rc Fri Sep 21 00:57:28 2007 @@ -10,7 +10,7 @@ /* include localised resources */ #include "lang/bg-BG.rc" -#include "lang/ca-CA.rc" +#include "lang/ca-ES.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc"

17 years, 1 month

[cfinck] 29124: Updated Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2661 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Sep 20 22:40:55 2007 New Revision: 29124 URL: http://svn.reactos.org/svn/reactos?rev=29124&view=rev Log: Updated Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2661 for more details. Added: trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc Modified: trunk/reactos/base/applications/msconfig/lang/uk-UA.rc trunk/reactos/boot/freeldr/fdebug/fdebug.rc Modified: trunk/reactos/base/applications/msconfig/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/uk-UA.rc Thu Sep 20 22:40:55 2007 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/msconfig/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for msconfig - * TRANSLATOR: Rostislav Zabolotny + * TRANSLATOR: Rostislav Zabolotny, Artem Reznikov */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -36,18 +36,18 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148 - PUSHBUTTON "Move &Up", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 - PUSHBUTTON "Move &Down", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 + PUSHBUTTON "Â&ãîðó", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 + PUSHBUTTON "Â&íèç", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 - PUSHBUTTON "&Enable", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 - PUSHBUTTON "D&isable", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 + PUSHBUTTON "&Ââ³ìêíóòè", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 + PUSHBUTTON "Â&èìêíóòè", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 - PUSHBUTTON "&Find", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 - PUSHBUTTON "&New", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 - PUSHBUTTON "Edi&t", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 + PUSHBUTTON "&Çíàéòè", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 + PUSHBUTTON "&Ñòâîðèòè", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 + PUSHBUTTON "&Ïðàâêà", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 - PUSHBUTTON "Ena&ble All", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 - PUSHBUTTON "Disable A&ll",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 + PUSHBUTTON "Ââ&³ìêíóòè Âñå", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "Âè&ìêíóòè Âñå",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 END IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc Thu Sep 20 22:40:55 2007 @@ -16,4 +16,4 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/tr-TR.rc" - +#include "lang/uk-UA.rc" Added: trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/u… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc (added) +++ trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc Thu Sep 20 22:40:55 2007 @@ -1,0 +1,191 @@ +///////////////////////////////////////////////////////////////////////////// +// Ukrainian resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +#pragma code_page(1251) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDC_FDEBUG MENU DISCARDABLE +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM "&Ï³äêëþ÷èòè", IDM_FILE_CONNECT + MENUITEM "&Â³äêëþ÷èòè", IDM_FILE_DISCONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Î÷èñòèòè åêðàí", IDM_FILE_CLEARDISPLAY + MENUITEM SEPARATOR + MENUITEM "Ïî÷àòè &çàõîïëåííÿ", IDM_FILE_STARTCAPTURE + MENUITEM "Çóïèíèòè ç&àõîïëåííÿ", IDM_FILE_STOPCAPTURE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Ëîêàëüíà â³äïîâ³äü", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "Â&èõ³ä", IDM_EXIT + END + POPUP "&Äîâ³äêà" + BEGIN + MENUITEM "&Ïðî ïðîãðàìó ...", IDM_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDC_FDEBUG ACCELERATORS MOVEABLE PURE +BEGIN + 63, IDM_ABOUT, ASCII, ALT // "?" + 47, IDM_ABOUT, ASCII, ALT // "/" +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_CONNECTION, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 189 + TOPMARGIN, 7 + BOTTOMMARGIN, 93 + END + + IDD_CAPTURE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 244 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ïðî ïðîãðàìó Íàëàãîäæóâà÷ FreeLoader" +FONT 8, "Tahoma" +BEGIN + CONTROL "Íàëàãîäæóâà÷ FreeLoader v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_FDEBUG,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_CONNECTION DIALOG DISCARDABLE 0, 0, 196, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Íàñòðîéêè ç'ºäíàííÿ" +FONT 8, "Tahoma" +BEGIN + LTEXT "Ââåä³òü COM-ïîðò (íàïð. COM1):",IDC_STATIC,7,7,108,8 + EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL + LTEXT "Ââåä³òü øâèäê³ñòü ïåðåäà÷³ (íàïð. 115200):",IDC_STATIC,7,38,114, + 8 + EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,45,79,50,14 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,100,79,50,14 +END + +IDD_CAPTURE DIALOG DISCARDABLE 0, 0, 251, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ôàéë çàõîïëåííÿ" +FONT 8, "Tahoma" +BEGIN + LTEXT "²ì'ÿ ôàéëó çàõîïëåííÿ:",IDC_STATIC,7,17,62,8 + EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL + PUSHBUTTON "&Îãëÿä",IDC_BROWSE,194,26,50,14 + DEFPUSHBUTTON "OK",IDOK,139,74,50,14 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,194,74,50,14 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "fdebug" + IDS_HELLO "Ïðèâ³ò Ñâ³ò!" + IDC_FDEBUG "FDEBUG" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\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 // Ukrainian resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED +

17 years, 1 month

[tkreuzer] 29123: - make gdi object's type field more windows compatible, using only the basetype in the upper 16 bits - On windows deleted objects have a KernelData value != NULL, so don't check for that when validating a handle, instead check if the type field in the upper 16 bits is 0

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Sep 20 20:13:55 2007 New Revision: 29123 URL: http://svn.reactos.org/svn/reactos?rev=29123&view=rev Log: - make gdi object's type field more windows compatible, using only the basetype in the upper 16 bits - On windows deleted objects have a KernelData value != NULL, so don't check for that when validating a handle, instead check if the type field in the upper 16 bits is 0 Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Thu Sep 20 20:13:55 2007 @@ -94,9 +94,8 @@ BOOL GdiIsHandleValid(HGDIOBJ hGdiObj) { PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); - if(Entry->KernelData != NULL && - (Entry->Type & GDI_HANDLE_TYPE_MASK) == - (LONG)GDI_HANDLE_GET_TYPE(hGdiObj)) + if((Entry->Type & GDI_ENTRY_BASETYPE_MASK) != 0 && + (Entry->Type << GDI_ENTRY_UPPER_SHIFT) == GDI_HANDLE_GET_UPPER(hGdiObj)) { HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); if(pid == NULL || pid == CurrentProcessId) @@ -110,9 +109,8 @@ BOOL GdiGetHandleUserData(HGDIOBJ hGdiObj, PVOID *UserData) { PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); - if(Entry->KernelData != NULL && - (Entry->Type & GDI_HANDLE_TYPE_MASK) == - (LONG)GDI_HANDLE_GET_TYPE(hGdiObj)) + if((Entry->Type & GDI_ENTRY_BASETYPE_MASK) != 0 && + (Entry->Type << GDI_ENTRY_UPPER_SHIFT) == GDI_HANDLE_GET_UPPER(hGdiObj)) { HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); if(pid == NULL || pid == CurrentProcessId) Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Sep 20 20:13:55 2007 @@ -33,6 +33,7 @@ #define GDI_ENTRY_STOCK_MASK 0x00000080 #define GDI_ENTRY_REUSE_MASK 0x0000ff00 #define GDI_ENTRY_REUSE_INC 0x00000100 +#define GDI_ENTRY_BASETYPE_MASK 0x001f0000 #define GDI_ENTRY_REUSECNT_SHIFT 8 #define GDI_ENTRY_UPPER_SHIFT 16 Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Thu Sep 20 20:13:55 2007 @@ -316,10 +316,10 @@ DPRINT1("%s: Attempted to lock object 0x%x, wrong reuse counter (Handle: 0x%x, Entry: 0x%x)\n", Function, hObj, GDI_HANDLE_GET_REUSECNT(hObj), GDI_ENTRY_GET_REUSECNT(Entry->Type)); } - else if (GDI_HANDLE_GET_TYPE(hObj) != GDI_HANDLE_GET_TYPE(Entry->Type)) + else if (GDI_HANDLE_GET_TYPE(hObj) != ((Entry->Type << GDI_ENTRY_UPPER_SHIFT) & GDI_HANDLE_TYPE_MASK)) { DPRINT1("%s: Attempted to lock object 0x%x, type mismatch (Handle: 0x%x, Entry: 0x%x)\n", - Function, hObj, GDI_HANDLE_GET_TYPE(hObj), GDI_HANDLE_GET_TYPE(Entry->Type)); + Function, hObj, GDI_HANDLE_GET_TYPE(hObj), (Entry->Type << GDI_ENTRY_UPPER_SHIFT) & GDI_HANDLE_TYPE_MASK); } else { @@ -403,10 +403,10 @@ RtlZeroMemory(ObjectBody, GetObjectSize(TypeIndex)); - /* FIXME: On Windows the higher 16 bit of the type field don't always match - the type from the handle, it is probably a storage type - (type = pen, storage = brush) */ - TypeInfo = (ObjectType & GDI_HANDLE_TYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); + /* On Windows the higher 16 bit of the type field don't contain the + full type from the handle, but the base type. + (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ + TypeInfo = (ObjectType & GDI_HANDLE_BASETYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); if(FreeEntry != NULL) @@ -705,7 +705,7 @@ Entry++, Index++) { /* ignore the lock bit */ - if((HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcId && (Entry->Type & ~GDI_HANDLE_REUSE_MASK) != 0) + if((HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcId && (Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0) { HGDIOBJ ObjectHandle; @@ -1050,7 +1050,7 @@ Entry = GDI_HANDLE_GET_ENTRY(HandleTable, ObjectHandle); Ret = Entry->KernelData != NULL && - (Entry->Type & ~GDI_HANDLE_REUSE_MASK) != 0 && + (Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 && (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcessId; return Ret; @@ -1060,7 +1060,7 @@ } BOOL INTERNAL_CALL -GDIOBJ_ConvertToStockObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ *hObj) +GDIOBJ_ConvertToStockObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ *phObj) { /* * FIXME !!!!! THIS FUNCTION NEEDS TO BE FIXED - IT IS NOT SAFE WHEN OTHER THREADS @@ -1069,22 +1069,24 @@ PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, LockedProcessId, PrevProcId; PETHREAD Thread; + HGDIOBJ hObj; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif - ASSERT(hObj); - - DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", *hObj); + ASSERT(phObj); + hObj = *phObj; + + DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", hObj); Thread = PsGetCurrentThread(); - if(!GDI_HANDLE_IS_STOCKOBJ(*hObj)) + if(!GDI_HANDLE_IS_STOCKOBJ(hObj)) { ProcessId = PsGetCurrentProcessId(); LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); - Entry = GDI_HANDLE_GET_ENTRY(HandleTable, *hObj); + Entry = GDI_HANDLE_GET_ENTRY(HandleTable, hObj); LockHandle: /* lock the object, we must not convert stock objects, so don't check!!! */ @@ -1096,16 +1098,11 @@ /* we're locking an object that belongs to our process. First calculate the new object type including the stock object flag and then try to exchange it.*/ - /* FIXME: On Windows the higher 16 bit of the type field don't always match - the type from the handle, it is probably a storage type - (type = pen, storage = brush) */ - NewType = GDI_HANDLE_GET_TYPE(*hObj); - NewType |= GDI_HANDLE_GET_UPPER(*hObj) >> GDI_ENTRY_UPPER_SHIFT; - - /* This is the type that the object should have right now, save it */ - OldType = NewType; + OldType = ((ULONG)hObj & GDI_HANDLE_BASETYPE_MASK); + OldType |= GDI_HANDLE_GET_UPPER(hObj) >> GDI_ENTRY_UPPER_SHIFT; + /* As the object should be a stock object, set it's flag, but only in the lower 16 bits */ - NewType |= GDI_ENTRY_STOCK_MASK; + NewType = OldType | GDI_ENTRY_STOCK_MASK; /* Try to exchange the type field - but only if the old (previous type) matches! */ PrevType = InterlockedCompareExchange(&Entry->Type, NewType, OldType); @@ -1146,7 +1143,8 @@ /* remove the process id lock and make it global */ (void)InterlockedExchangePointer(&Entry->ProcessId, GDI_GLOBAL_PROCESS); - *hObj = (HGDIOBJ)((ULONG)(*hObj) | GDI_HANDLE_STOCK_MASK); + hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); + *phObj = hObj; /* we're done, successfully converted the object */ return TRUE;

17 years, 1 month

[hpoussin] 29122: Do not forget to release the rundown protection. See issue #2348 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Sep 20 18:54:43 2007 New Revision: 29122 URL: http://svn.reactos.org/svn/reactos?rev=29122&view=rev Log: Do not forget to release the rundown protection. See issue #2348 for more details. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Thu Sep 20 18:54:43 2007 @@ -916,6 +916,7 @@ /* Release the lock and rundown */ ExReleasePushLockShared(&Process->ProcessLock); KeLeaveCriticalRegion(); + ExReleaseRundownProtection(&Process->RundownProtect); } else {

17 years, 1 month

[jimtabor] 29121: User32: - Implement ValidateHandle. - Copied handle_to_entry and header information from win32k. Yes I know, duplication etc. Just for now. - Add tested validation object types and as per revision 29105. Those object types now match. - In dllmain.c, the gHandleTable pointer is set from Win32k GetW32ProcessInfo. - Tested it, failed. The pointer does match with win32k gHandleTable.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Sep 20 18:26:43 2007 New Revision: 29121 URL: http://svn.reactos.org/svn/reactos?rev=29121&view=rev Log: User32: - Implement ValidateHandle. - Copied handle_to_entry and header information from win32k. Yes I know, duplication etc. Just for now. - Add tested validation object types and as per revision 29105. Those object types now match. - In dllmain.c, the gHandleTable pointer is set from Win32k GetW32ProcessInfo. - Tested it, failed. The pointer does match with win32k gHandleTable. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/misc/misc.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h Thu Sep 20 18:26:43 2007 @@ -130,12 +130,14 @@ /* Internal Thread Data */ extern HINSTANCE User32Instance; +/* Critical Section*/ +extern RTL_CRITICAL_SECTION User32Crit; + typedef struct _USER32_TRACKINGLIST { TRACKMOUSEEVENT tme; POINT pos; /* center of hover rectangle */ UINT_PTR timer; } USER32_TRACKINGLIST,*PUSER32_TRACKINGLIST; - typedef struct _USER32_THREAD_DATA { @@ -145,7 +147,7 @@ } USER32_THREAD_DATA, *PUSER32_THREAD_DATA; PUSER32_THREAD_DATA User32GetThreadData(); - + DEVMODEW * STDCALL GdiConvertToDevmodeW(DEVMODEA *dm); @@ -163,6 +165,7 @@ #define SPY_RESULT_OK 0x0001 #define SPY_RESULT_INVALIDHWND 0x0003 #define SPY_RESULT_DEFWND 0x0005 + extern const char *SPY_GetMsgName(UINT msg, HWND hWnd); extern const char *SPY_GetVKeyName(WPARAM wParam); @@ -172,5 +175,48 @@ extern int SPY_Init(void); +/* Validate window handle types */ +#define VALIDATE_TYPE_FREE 0 +#define VALIDATE_TYPE_WIN 1 +#define VALIDATE_TYPE_MENU 2 +#define VALIDATE_TYPE_CURSOR 3 +#define VALIDATE_TYPE_MWPOS 4 +#define VALIDATE_TYPE_HOOK 5 +#define VALIDATE_TYPE_CALLPROC 7 +#define VALIDATE_TYPE_ACCEL 8 +#define VALIDATE_TYPE_MONITOR 12 + +#define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ +#define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ +#define NB_USER_HANDLES ((LAST_USER_HANDLE - FIRST_USER_HANDLE + 1) >> 1) +#define USER_HANDLE_TO_INDEX(hwnd) ((LOWORD(hwnd) - FIRST_USER_HANDLE) >> 1) + +#define USER_HEADER_TO_BODY(ObjectHeader) \ + ((PVOID)(((PUSER_OBJECT_HEADER)ObjectHeader) + 1)) + +#define USER_BODY_TO_HEADER(ObjectBody) \ + ((PUSER_OBJECT_HEADER)(((PUSER_OBJECT_HEADER)ObjectBody) - 1)) + +typedef struct _USER_HANDLE_ENTRY +{ + void *ptr; /* pointer to object */ + PW32THREADINFO pti; // pointer to Win32ThreadInfo + unsigned short type; /* object type (0 if free) */ + unsigned short generation; /* generation counter */ +} USER_HANDLE_ENTRY, * PUSER_HANDLE_ENTRY; + +typedef struct _USER_HANDLE_TABLE +{ + PUSER_HANDLE_ENTRY handles; + PUSER_HANDLE_ENTRY freelist; + int nb_handles; + int allocated_handles; +} USER_HANDLE_TABLE, * PUSER_HANDLE_TABLE; + +extern PUSER_HANDLE_TABLE gHandleTable; + +PUSER_HANDLE_ENTRY FASTCALL GetUser32Handle(HANDLE); +PVOID FASTCALL ValidateHandle(HANDLE, UINT); + #endif /* EOF */ Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c Thu Sep 20 18:26:43 2007 @@ -4,6 +4,8 @@ static ULONG User32TlsIndex; HINSTANCE User32Instance; +PUSER_HANDLE_TABLE gHandleTable = NULL; + PUSER32_THREAD_DATA User32GetThreadData() @@ -49,7 +51,11 @@ (PVOID)User32SetupDefaultCursors; NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALLBACK_HOOKPROC] = (PVOID)User32CallHookProcFromKernel; - + { + PW32THREADINFO ti = (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo; + PW32PROCESSINFO pi = ti->pi; + gHandleTable = (PUSER_HANDLE_TABLE) pi->UserHandleTable; + } /* Allocate an index for user32 thread local data. */ User32TlsIndex = TlsAlloc(); if (User32TlsIndex != TLS_OUT_OF_INDEXES) Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c Thu Sep 20 18:26:43 2007 @@ -268,3 +268,78 @@ return TRUE; } + +PUSER_HANDLE_ENTRY +FASTCALL +GetUser32Handle(HANDLE handle) +{ + PUSER_HANDLE_TABLE ht = gHandleTable; + USHORT generation; + + DPRINT1("Main Handle Table %x\n", ht); + + INT Index = (((UINT)handle & 0xffff) - FIRST_USER_HANDLE) >> 1; + + if (Index < 0 || Index >= ht->nb_handles) return NULL; + + if (!ht->handles[Index].type) return NULL; + + generation = (UINT)handle >> 16; + + if (generation == ht->handles[Index].generation || !generation || generation == 0xffff) + return &ht->handles[Index]; + + return NULL; +} + +// +// Validate Handle and return the pointer to the object. +// +PVOID +FASTCALL +ValidateHandle(HANDLE handle, UINT uType) +{ + PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); + + if (uType == VALIDATE_TYPE_WIN) + { + if (handle == ClientInfo->hWND) return ClientInfo->pvWND; + } + + PUSER_HANDLE_ENTRY pEntry = GetUser32Handle(handle); + +// Must have an entry and must be the same type! + if ( (!pEntry) || (pEntry->type != uType) ) + { + switch ( uType ) + { // Test (with wine too) confirms these results! + case VALIDATE_TYPE_WIN: + SetLastError(ERROR_INVALID_WINDOW_HANDLE); + break; + case VALIDATE_TYPE_MENU: + SetLastError(ERROR_INVALID_MENU_HANDLE); + break; + case VALIDATE_TYPE_CURSOR: + SetLastError(ERROR_INVALID_CURSOR_HANDLE); + break; + case VALIDATE_TYPE_MWPOS: + SetLastError(ERROR_INVALID_DWP_HANDLE); + break; + case VALIDATE_TYPE_HOOK: + SetLastError(ERROR_INVALID_HOOK_HANDLE); + break; + case VALIDATE_TYPE_ACCEL: + SetLastError(ERROR_INVALID_ACCEL_HANDLE); + break; + default: + SetLastError(ERROR_INVALID_HANDLE); + } + return NULL; + } + + if (!(NtUserValidateHandleSecure(handle, FALSE))) return NULL; + + return pEntry->ptr; +} + +

17 years, 1 month

[hpoussin] 29120: [FORMATTING] Tabs vs space, { } placement, ... No code change

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Sep 20 17:53:38 2007 New Revision: 29120 URL: http://svn.reactos.org/svn/reactos?rev=29120&view=rev Log: [FORMATTING] Tabs vs space, { } placement, ... No code change Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c (original) +++ trunk/reactos/base/applications/network/ping/ping.c Thu Sep 20 17:53:38 2007 @@ -1,11 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS ping utility - * FILE: apps/net/ping/ping.c + * FILE: base/applications/network/ping/ping.c * PURPOSE: Network test utility - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 01/09/2000 Created + * PROGRAMMERS: */ #include <winsock2.h> @@ -14,13 +12,9 @@ #include <string.h> #include <stdio.h> +#define NDEBUG + #ifndef _MSC_VER - -/* FIXME: Where should this be? */ -#ifdef CopyMemory -#undef CopyMemory -#endif -#define CopyMemory(Destination, Source, Length) memcpy(Destination, Source, Length); /* Should be in the header files somewhere (exported by ntdll.dll) */ long atol(const char *str); @@ -33,47 +27,46 @@ #endif /* _MSC_VER */ -#ifdef DBG -#undef DBG -#endif - /* General ICMP constants */ -#define ICMP_MINSIZE 8 /* Minimum ICMP packet size */ -#define ICMP_MAXSIZE 65535 /* Maximum ICMP packet size */ +#define ICMP_MINSIZE 8 /* Minimum ICMP packet size */ +#define ICMP_MAXSIZE 65535 /* Maximum ICMP packet size */ /* ICMP message types */ -#define ICMPMSG_ECHOREQUEST 8 /* ICMP ECHO request message */ -#define ICMPMSG_ECHOREPLY 0 /* ICMP ECHO reply message */ +#define ICMPMSG_ECHOREQUEST 8 /* ICMP ECHO request message */ +#define ICMPMSG_ECHOREPLY 0 /* ICMP ECHO reply message */ #pragma pack(4) /* IPv4 header structure */ -typedef struct _IPv4_HEADER { - unsigned char IHL:4; - unsigned char Version:4; - unsigned char TOS; - unsigned short Length; - unsigned short Id; - unsigned short FragFlags; - unsigned char TTL; - unsigned char Protocol; - unsigned short Checksum; - unsigned int SrcAddress; - unsigned int DstAddress; +typedef struct _IPv4_HEADER +{ + unsigned char IHL:4; + unsigned char Version:4; + unsigned char TOS; + unsigned short Length; + unsigned short Id; + unsigned short FragFlags; + unsigned char TTL; + unsigned char Protocol; + unsigned short Checksum; + unsigned int SrcAddress; + unsigned int DstAddress; } IPv4_HEADER, *PIPv4_HEADER; /* ICMP echo request/reply header structure */ -typedef struct _ICMP_HEADER { - unsigned char Type; - unsigned char Code; - unsigned short Checksum; - unsigned short Id; - unsigned short SeqNum; +typedef struct _ICMP_HEADER +{ + unsigned char Type; + unsigned char Code; + unsigned short Checksum; + unsigned short Id; + unsigned short SeqNum; } ICMP_HEADER, *PICMP_HEADER; -typedef struct _ICMP_ECHO_PACKET { - ICMP_HEADER Icmp; - LARGE_INTEGER Timestamp; +typedef struct _ICMP_ECHO_PACKET +{ + ICMP_HEADER Icmp; + LARGE_INTEGER Timestamp; } ICMP_ECHO_PACKET, *PICMP_ECHO_PACKET; #pragma pack(1) @@ -105,7 +98,7 @@ LARGE_INTEGER TicksPerUs; /* Ticks per microsecond */ BOOL UsePerformanceCounter; -#ifdef DBG +#ifndef NDEBUG /* Display the contents of a buffer */ static VOID DisplayBuffer( PVOID Buffer, @@ -117,25 +110,25 @@ printf("Buffer (0x%p) Size (0x%lX).\n", Buffer, Size); p = (PCHAR)Buffer; - for (i = 0; i < Size; i++) { - if (i % 16 == 0) { - printf("\n"); - } - printf("%02X ", (p[i]) & 0xFF); - } -} -#endif /* DBG */ + for (i = 0; i < Size; i++) + { + if (i % 16 == 0) + printf("\n"); + printf("%02X ", (p[i]) & 0xFF); + } +} +#endif /* !NDEBUG */ /* Display usage information on screen */ static VOID Usage(VOID) { - printf("\nUsage: ping [-t] [-n count] [-l size] [-w timeout] destination-host\n\n"); - printf("Options:\n"); - printf(" -t Ping the specified host until stopped.\n"); - printf(" To stop - type Control-C.\n"); - printf(" -n count Number of echo requests to send.\n"); - printf(" -l size Send buffer size.\n"); - printf(" -w timeout Timeout in milliseconds to wait for each reply.\n\n"); + printf("\nUsage: ping [-t] [-n count] [-l size] [-w timeout] destination-host\n\n"); + printf("Options:\n"); + printf(" -t Ping the specified host until stopped.\n"); + printf(" To stop - type Control-C.\n"); + printf(" -n count Number of echo requests to send.\n"); + printf(" -l size Send buffer size.\n"); + printf(" -w timeout Timeout in milliseconds to wait for each reply.\n\n"); } /* Reset configuration to default values */ @@ -153,20 +146,21 @@ Timeout = 1000; UsePerformanceCounter = QueryPerformanceFrequency(&PerformanceCounterFrequency); - if (UsePerformanceCounter) { + if (UsePerformanceCounter) + { /* Performance counters may return incorrect results on some multiprocessor platforms so we restrict execution on the first processor. This may fail on Windows NT so we fall back to GetCurrentTick() for timing */ - if (SetThreadAffinityMask (GetCurrentThread(), 1) == 0) { + if (SetThreadAffinityMask (GetCurrentThread(), 1) == 0) UsePerformanceCounter = FALSE; - } /* Convert frequency to ticks per millisecond */ TicksPerMs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000; /* And to ticks per microsecond */ TicksPerUs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000000; } - if (!UsePerformanceCounter) { + if (!UsePerformanceCounter) + { /* 1 tick per millisecond for GetCurrentTick() */ TicksPerMs.QuadPart = 1; /* GetCurrentTick() cannot handle microseconds */ @@ -183,7 +177,8 @@ i = 0; Length = (UINT)_tcslen(String); while ((i < Length) && ((String[i] < '0') || (String[i] > '9'))) i++; - if ((i >= Length) || ((String[i] < '0') || (String[i] > '9'))) { + if ((i >= Length) || ((String[i] < '0') || (String[i] > '9'))) + { InvalidOption = TRUE; return 0; } @@ -198,9 +193,11 @@ ULONG Value; Value = GetULONG(String1); - if (InvalidOption) { + if (InvalidOption) + { InvalidOption = FALSE; - if (String2[0] != '-') { + if (String2[0] != '-') + { Value = GetULONG(String2); if (!InvalidOption) *i += 1; @@ -216,63 +213,69 @@ INT i; BOOL ShowUsage; BOOL FoundTarget; -//#if 1 -// lstrcpy(TargetName, "127.0.0.1"); -// PingCount = 1; -// return TRUE; -//#endif - if (argc < 2) { + if (argc < 2) ShowUsage = TRUE; - } else { + else ShowUsage = FALSE; - } FoundTarget = FALSE; InvalidOption = FALSE; - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - switch (argv[i][1]) { - case 't': NeverStop = TRUE; break; - case 'a': ResolveAddresses = TRUE; break; - case 'n': PingCount = GetULONG2(&argv[i][2], argv[i + 1], &i); break; - case 'l': - DataSize = GetULONG2(&argv[i][2], argv[i + 1], &i); - if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET)) { - printf("Bad value for option -l, valid range is from 0 to %d.\n", - ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET)); + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '-') + { + switch (argv[i][1]) + { + case 't': NeverStop = TRUE; break; + case 'a': ResolveAddresses = TRUE; break; + case 'n': PingCount = GetULONG2(&argv[i][2], argv[i + 1], &i); break; + case 'l': + DataSize = GetULONG2(&argv[i][2], argv[i + 1], &i); + if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET)) + { + printf("Bad value for option -l, valid range is from 0 to %d.\n", + ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET)); + return FALSE; + } + break; + case 'f': DontFragment = TRUE; break; + case 'i': TTLValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break; + case 'v': TOSValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break; + case 'w': Timeout = GetULONG2(&argv[i][2], argv[i + 1], &i); break; + default: + printf("Bad option %s.\n", argv[i]); + Usage(); return FALSE; - } - break; - case 'f': DontFragment = TRUE; break; - case 'i': TTLValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break; - case 'v': TOSValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break; - case 'w': Timeout = GetULONG2(&argv[i][2], argv[i + 1], &i); break; - default: - printf("Bad option %s.\n", argv[i]); - Usage(); - return FALSE; } - if (InvalidOption) { + if (InvalidOption) + { printf("Bad option format %s.\n", argv[i]); return FALSE; } - } else { - if (FoundTarget) { + } + else + { + if (FoundTarget) + { printf("Bad parameter %s.\n", argv[i]); return FALSE; - } else { - lstrcpy(TargetName, argv[i]); + } + else + { + lstrcpy(TargetName, argv[i]); FoundTarget = TRUE; } } } - if ((!ShowUsage) && (!FoundTarget)) { + if ((!ShowUsage) && (!FoundTarget)) + { printf("Name or IP address of destination host must be specified.\n"); return FALSE; } - if (ShowUsage) { + if (ShowUsage) + { Usage(); return FALSE; } @@ -284,7 +287,8 @@ { ULONG sum = 0; - while (size > 1) { + while (size > 1) + { sum += *data++; size -= sizeof(USHORT); } @@ -303,20 +307,22 @@ { WORD wVersionRequested; WSADATA WsaData; - INT Status; + INT Status; ULONG Addr; PHOSTENT phe; wVersionRequested = MAKEWORD(2, 2); Status = WSAStartup(wVersionRequested, &WsaData); - if (Status != 0) { + if (Status != 0) + { printf("Could not initialize winsock dll.\n"); return FALSE; } IcmpSock = WSASocket(AF_INET, SOCK_RAW, IPPROTO_ICMP, NULL, 0, 0); - if (IcmpSock == INVALID_SOCKET) { + if (IcmpSock == INVALID_SOCKET) + { printf("Could not create socket (#%d).\n", WSAGetLastError()); return FALSE; } @@ -324,30 +330,30 @@ ZeroMemory(&Target, sizeof(Target)); phe = NULL; Addr = inet_addr(TargetName); - if (Addr == INADDR_NONE) { + if (Addr == INADDR_NONE) + { phe = gethostbyname(TargetName); - if (phe == NULL) { + if (phe == NULL) + { printf("Unknown host %s.\n", TargetName); return FALSE; } } - if (phe != NULL) { + if (phe != NULL) CopyMemory(&Target.sin_addr, phe->h_addr, phe->h_length); - } else { + else Target.sin_addr.s_addr = Addr; - } - - if (phe != NULL) { - Target.sin_family = phe->h_addrtype; - } else { + + if (phe != NULL) + Target.sin_family = phe->h_addrtype; + else Target.sin_family = AF_INET; - } - - TargetIP = inet_ntoa(Target.sin_addr); - CurrentSeqNum = 0; - SentCount = 0; - LostCount = 0; + + TargetIP = inet_ntoa(Target.sin_addr); + CurrentSeqNum = 0; + SentCount = 0; + LostCount = 0; MinRTT.QuadPart = 0; MaxRTT.QuadPart = 0; SumRTT.QuadPart = 0; @@ -366,8 +372,10 @@ static VOID QueryTime(PLARGE_INTEGER Time) { - if (UsePerformanceCounter) { - if (QueryPerformanceCounter(Time) == 0) { + if (UsePerformanceCounter) + { + if (QueryPerformanceCounter(Time) == 0) + { /* This should not happen, but we fall back to GetCurrentTick() if it does */ Time->u.LowPart = (ULONG)GetTickCount(); @@ -380,7 +388,9 @@ UsePerformanceCounter = FALSE; } - } else { + } + else + { Time->u.LowPart = (ULONG)GetTickCount(); Time->u.HighPart = 0; } @@ -394,7 +404,7 @@ LargeTime.QuadPart = Time.QuadPart / TicksPerMs.QuadPart; _i64toa(LargeTime.QuadPart, Convstr, 10); - strcpy(String, Convstr); + strcpy(String, Convstr); strcat(String, "ms"); } @@ -404,7 +414,7 @@ { PIPv4_HEADER IpHeader; PICMP_ECHO_PACKET Icmp; - UINT IphLength; + UINT IphLength; CHAR Time[100]; LARGE_INTEGER RelativeTime; LARGE_INTEGER LargeTime; @@ -414,26 +424,29 @@ IphLength = IpHeader->IHL * 4; - if (size < IphLength + ICMP_MINSIZE) { -#ifdef DBG + if (size < IphLength + ICMP_MINSIZE) + { +#ifndef NDEBUG printf("Bad size (0x%X < 0x%X)\n", size, IphLength + ICMP_MINSIZE); -#endif /* DBG */ +#endif /* !NDEBUG */ return FALSE; } Icmp = (PICMP_ECHO_PACKET)(buffer + IphLength); - if (Icmp->Icmp.Type != ICMPMSG_ECHOREPLY) { -#ifdef DBG + if (Icmp->Icmp.Type != ICMPMSG_ECHOREPLY) + { +#ifndef NDEBUG printf("Bad ICMP type (0x%X should be 0x%X)\n", Icmp->Icmp.Type, ICMPMSG_ECHOREPLY); -#endif /* DBG */ - return FALSE; - } - - if (Icmp->Icmp.Id != (USHORT)GetCurrentProcessId()) { -#ifdef DBG +#endif /* !NDEBUG */ + return FALSE; + } + + if (Icmp->Icmp.Id != (USHORT)GetCurrentProcessId()) + { +#ifndef NDEBUG printf("Bad ICMP id (0x%X should be 0x%X)\n", Icmp->Icmp.Id, (USHORT)GetCurrentProcessId()); -#endif /* DBG */ +#endif /* !NDEBUG */ return FALSE; } @@ -441,10 +454,13 @@ RelativeTime.QuadPart = (LargeTime.QuadPart - Icmp->Timestamp.QuadPart); - if ((RelativeTime.QuadPart / TicksPerMs.QuadPart) < 1) { + if ((RelativeTime.QuadPart / TicksPerMs.QuadPart) < 1) + { strcpy(Sign, "<"); strcpy(Time, "1ms"); - } else { + } + else + { strcpy(Sign, "="); TimeToMsString(Time, RelativeTime); } @@ -452,16 +468,17 @@ printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL); - if (RelativeTime.QuadPart < MinRTT.QuadPart || !MinRTTSet) { - MinRTT.QuadPart = RelativeTime.QuadPart; + if (RelativeTime.QuadPart < MinRTT.QuadPart || !MinRTTSet) + { + MinRTT.QuadPart = RelativeTime.QuadPart; MinRTTSet = TRUE; } - if (RelativeTime.QuadPart > MaxRTT.QuadPart) - MaxRTT.QuadPart = RelativeTime.QuadPart; + if (RelativeTime.QuadPart > MaxRTT.QuadPart) + MaxRTT.QuadPart = RelativeTime.QuadPart; SumRTT.QuadPart += RelativeTime.QuadPart; - return TRUE; + return TRUE; } /* Send and receive one ping */ @@ -477,7 +494,8 @@ /* Account for extra space for IP header when packet is received */ Size = DataSize + 128; Buffer = GlobalAlloc(0, Size); - if (!Buffer) { + if (!Buffer) + { printf("Not enough free resources available.\n"); return FALSE; } @@ -488,7 +506,7 @@ /* Assemble ICMP echo request packet */ Packet->Icmp.Type = ICMPMSG_ECHOREQUEST; Packet->Icmp.Code = 0; - Packet->Icmp.Id = (USHORT)GetCurrentProcessId(); + Packet->Icmp.Id = (USHORT)GetCurrentProcessId(); Packet->Icmp.SeqNum = htons((USHORT)CurrentSeqNum); Packet->Icmp.Checksum = 0; @@ -501,31 +519,32 @@ CurrentSeqNum++; - /* Send ICMP echo request */ + /* Send ICMP echo request */ FD_ZERO(&Fds); FD_SET(IcmpSock, &Fds); Timeval.tv_sec = Timeout / 1000; Timeval.tv_usec = Timeout % 1000; Status = select(0, NULL, &Fds, NULL, &Timeval); - if ((Status != SOCKET_ERROR) && (Status != 0)) { - -#ifdef DBG + if ((Status != SOCKET_ERROR) && (Status != 0)) + { + +#ifndef NDEBUG printf("Sending packet\n"); DisplayBuffer(Buffer, sizeof(ICMP_ECHO_PACKET) + DataSize); printf("\n"); -#endif /* DBG */ +#endif /* !NDEBUG */ Status = sendto(IcmpSock, Buffer, sizeof(ICMP_ECHO_PACKET) + DataSize, 0, (SOCKADDR*)&Target, sizeof(Target)); SentCount++; } - if (Status == SOCKET_ERROR) { - if (WSAGetLastError() == WSAEHOSTUNREACH) { + if (Status == SOCKET_ERROR) + { + if (WSAGetLastError() == WSAEHOSTUNREACH) printf("Destination host unreachable.\n"); - } else { + else printf("Could not transmit data (%d).\n", WSAGetLastError()); - } GlobalFree(Buffer); return FALSE; } @@ -537,18 +556,21 @@ Timeval.tv_usec = Timeout % 1000; Status = select(0, &Fds, NULL, NULL, &Timeval); - if ((Status != SOCKET_ERROR) && (Status != 0)) { + if ((Status != SOCKET_ERROR) && (Status != 0)) + { Length = sizeof(From); Status = recvfrom(IcmpSock, Buffer, Size, 0, &From, &Length); -#ifdef DBG +#ifndef NDEBUG printf("Received packet\n"); DisplayBuffer(Buffer, Status); printf("\n"); -#endif /* DBG */ - } - if (Status == SOCKET_ERROR) { - if (WSAGetLastError() != WSAETIMEDOUT) { +#endif /* !NDEBUG */ + } + if (Status == SOCKET_ERROR) + { + if (WSAGetLastError() != WSAETIMEDOUT) + { printf("Could not receive data (%d).\n", WSAGetLastError()); GlobalFree(Buffer); return FALSE; @@ -556,14 +578,16 @@ Status = 0; } - if (Status == 0) { + if (Status == 0) + { printf("Request timed out.\n"); LostCount++; GlobalFree(Buffer); return TRUE; } - if (!DecodeResponse(Buffer, Status, (PSOCKADDR_IN)&From)) { + if (!DecodeResponse(Buffer, Status, (PSOCKADDR_IN)&From)) + { /* FIXME: Wait again as it could be another ICMP message type */ printf("Request timed out (incomplete datagram received).\n"); LostCount++; @@ -584,26 +608,27 @@ Reset(); - if ((ParseCmdline(argc, argv)) && (Setup())) { + if ((ParseCmdline(argc, argv)) && (Setup())) + { printf("\nPinging %s [%s] with %d bytes of data:\n\n", TargetName, TargetIP, DataSize); - Count = 0; - while ((NeverStop) || (Count < PingCount)) { - Ping(); - Sleep(Timeout); - Count++; - }; + Count = 0; + while ((NeverStop) || (Count < PingCount)) + { + Ping(); + Sleep(Timeout); + Count++; + }; Cleanup(); - /* Calculate avarage round trip time */ - if ((SentCount - LostCount) > 0) { + /* Calculate avarage round trip time */ + if ((SentCount - LostCount) > 0) AvgRTT.QuadPart = SumRTT.QuadPart / (SentCount - LostCount); - } else { + else AvgRTT.QuadPart = 0; - } /* Calculate loss percent */ Count = SentCount ? (LostCount * 100) / SentCount : 0; @@ -623,7 +648,7 @@ printf(" Minimum = %s, Maximum = %s, Average = %s\n", MinTime, MaxTime, AvgTime); } - return 0; + return 0; } /* EOF */

17 years, 1 month

← Newer
1
...
17
18
19
20
21
22
23
...
59
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 September 2007