Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[janderwald] 48850: [KS] - Simplify KsTopologyPropertyHandler by using KspReadMediaCategory helper - Return correct status code in case of an overflow
by janderwald＠svn.reactos.org 23 Sep '10

23 Sep '10

Author: janderwald Date: Thu Sep 23 11:36:00 2010 New Revision: 48850 URL: http://svn.reactos.org/svn/reactos?rev=48850&view=rev Log: [KS] - Simplify KsTopologyPropertyHandler by using KspReadMediaCategory helper - Return correct status code in case of an overflow Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/topology.c Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Thu Sep 23 11:36:00 2010 @@ -186,3 +186,9 @@ IN PVOID Descriptors, IN ULONG DescriptorSize, OUT PKSPIN_CONNECT* Connect); + +NTSTATUS +KspReadMediaCategory( + IN LPGUID Category, + PKEY_VALUE_PARTIAL_INFORMATION *OutInformation); + Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Thu Sep 23 11:36:00 2010 @@ -147,16 +147,9 @@ IN OUT PVOID Data, IN const KSTOPOLOGY* Topology) { - UNICODE_STRING LocalMachine = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\MediaCategories\\"); - UNICODE_STRING Name = RTL_CONSTANT_STRING(L"Name"); - UNICODE_STRING GuidString; - UNICODE_STRING KeyName; - OBJECT_ATTRIBUTES ObjectAttributes; KSP_NODE * Node; PIO_STACK_LOCATION IoStack; - ULONG Size; NTSTATUS Status; - HANDLE hKey; PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -191,79 +184,26 @@ break; } - Status = RtlStringFromGUID(&Topology->TopologyNodesNames[Node->NodeId], &GuidString); + Status = KspReadMediaCategory((LPGUID)&Topology->TopologyNodesNames[Node->NodeId], &KeyInfo); if (!NT_SUCCESS(Status)) { Irp->IoStatus.Information = 0; break; } - KeyName.Length = 0; - KeyName.MaximumLength = LocalMachine.Length + GuidString.Length + sizeof(WCHAR); - KeyName.Buffer = AllocateItem(PagedPool, KeyName.MaximumLength); - if (!KeyName.Buffer) - { - Irp->IoStatus.Information = 0; - Status = STATUS_INSUFFICIENT_RESOURCES; - RtlFreeUnicodeString(&GuidString); - break; - } - - RtlAppendUnicodeStringToString(&KeyName, &LocalMachine); - RtlAppendUnicodeStringToString(&KeyName, &GuidString); - - RtlFreeUnicodeString(&GuidString); - - InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&hKey, GENERIC_READ, &ObjectAttributes); - - FreeItem(KeyName.Buffer); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwOpenKey() failed with status 0x%08lx\n", Status); - Irp->IoStatus.Information = 0; - break; - } - - Status = ZwQueryValueKey(hKey, &Name, KeyValuePartialInformation, NULL, 0, &Size); - if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) - { - ZwClose(hKey); - Irp->IoStatus.Information = 0; - break; - } - - ASSERT(Size); - KeyInfo = (PKEY_VALUE_PARTIAL_INFORMATION) AllocateItem(NonPagedPool, Size); - if (!KeyInfo) - { - Status = STATUS_NO_MEMORY; - break; - } - - Status = ZwQueryValueKey(hKey, &Name, KeyValuePartialInformation, (PVOID)KeyInfo, Size, &Size); - if (!NT_SUCCESS(Status)) - { - FreeItem(KeyInfo); - ZwClose(hKey); - Irp->IoStatus.Information = 0; - break; - } - - ZwClose(hKey); + Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); + if (KeyInfo->DataLength + sizeof(WCHAR) > IoStack->Parameters.DeviceIoControl.OutputBufferLength) { - Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); - Status = STATUS_MORE_ENTRIES; + Status = STATUS_BUFFER_OVERFLOW; FreeItem(KeyInfo); break; } RtlMoveMemory(Irp->UserBuffer, &KeyInfo->Data, KeyInfo->DataLength); ((LPWSTR)Irp->UserBuffer)[KeyInfo->DataLength / sizeof(WCHAR)] = L'\0'; - Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); FreeItem(KeyInfo); + break; default: Irp->IoStatus.Information = 0;

1 0

[janderwald] 48849: [I8042PRT] - Fix potential buffer overflow
by janderwald＠svn.reactos.org 23 Sep '10

23 Sep '10

Author: janderwald Date: Thu Sep 23 11:32:34 2010 New Revision: 48849 URL: http://svn.reactos.org/svn/reactos?rev=48849&view=rev Log: [I8042PRT] - Fix potential buffer overflow Modified: trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Thu Sep 23 11:32:34 2010 @@ -492,7 +492,7 @@ { PINTERNAL_I8042_HOOK_MOUSE MouseHook; TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_I8042_HOOK_MOUSE\n"); - if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) + if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(INTERNAL_I8042_HOOK_MOUSE)) { Status = STATUS_INVALID_PARAMETER; break;

1 0

[fireball] 48848: - Branch 0.3.12 release.
by fireball＠svn.reactos.org 23 Sep '10

23 Sep '10

Author: fireball Date: Thu Sep 23 09:53:46 2010 New Revision: 48848 URL: http://svn.reactos.org/svn/reactos?rev=48848&view=rev Log: - Branch 0.3.12 release. Added: branches/ros-branch-0_3_12/ - copied from r48847, trunk/

1 0

[akhaldi] 48847: - Bugs 5536, 5614, 5604, 5617 and 5540: Apply translation patches provided by Mario Kacmar, Marcelo Zamperetti, Igor Paliychuk, Paolo Devoti and seven_ro.
by akhaldi＠svn.reactos.org 22 Sep '10

22 Sep '10

Author: akhaldi Date: Wed Sep 22 19:29:20 2010 New Revision: 48847 URL: http://svn.reactos.org/svn/reactos?rev=48847&view=rev Log: - Bugs 5536, 5614, 5604, 5617 and 5540: Apply translation patches provided by Mario Kacmar, Marcelo Zamperetti, Igor Paliychuk, Paolo Devoti and seven_ro. Added: trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc (with props) Modified: trunk/reactos/base/applications/games/spider/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/syssetup.rc Modified: trunk/reactos/base/applications/games/spider/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/it-IT.rc [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -52,10 +52,10 @@ STRINGTABLE BEGIN IDS_SPI_NAME "Spider" - IDS_SPI_ABOUT "Soltiario Spider di Gregor Schneider\n\nCardLib version 1.0" + IDS_SPI_ABOUT "Solitario Spider di Gregor Schneider\n\nCardLib version 1.0" IDS_SPI_QUIT "Chiudere la partita?" IDS_SPI_WIN "Complimenti, hai vinto!" - IDS_SPI_DEAL "Deal again?" + IDS_SPI_DEAL "Nuova partita?" END Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -159,7 +159,7 @@ IDS_CAT_ENGINEER "Scienze" IDS_CAT_FINANCE "Finanza" IDS_CAT_GAMES "Giochi e divertimento" - IDS_CAT_GRAPHICS "Graphica" + IDS_CAT_GRAPHICS "Grafica" IDS_CAT_INTERNET "Internet & rete" IDS_CAT_LIBS "Librerie" IDS_CAT_OFFICE "Ufficio" @@ -171,7 +171,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_APPTITLE "ReactOS Applications Manager" + IDS_APPTITLE "ReactOS Gestione applicazioni" IDS_SEARCH_TEXT "Cerca..." IDS_INSTALL "Installa" IDS_UNINSTALL "Disinstalla" Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 29-08-2009 - * LAST CHANGE: 05-10-2009 + * LAST CHANGE: 26-07-2010 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -143,7 +143,7 @@ IDS_INFO_INSTALLSRC "\nInstall Source: " IDS_INFO_UNINSTALLSTR "\nUninstall String: " IDS_INFO_MODIFYPATH "\nModify Path: " - IDS_INFO_INSTALLDATE "\nInstall Date: " + IDS_INFO_INSTALLDATE "\nDátum intalácie: " END STRINGTABLE DISCARDABLE @@ -193,6 +193,6 @@ IDS_CHOOSE_FOLDER_ERROR "Zvolili ste si neexistujúci prieèinok!" IDS_USER_NOT_ADMIN "Mali by ste by administrátor pre spustenie ""Manaéra aplikácií systému ReactOS""!" IDS_APP_REG_REMOVE "Naozaj chcete vymaza údaje o naintalovanom programe z registrov?" - IDS_INFORMATION "Information" - IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" + IDS_INFORMATION "Informácie" + IDS_UNABLE_TO_REMOVE "Nie je moné odstráni z registrov údaje o programe!" END Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -167,12 +167,12 @@ END POPUP "" BEGIN - MENUITEM "C&ut", ID_HEXEDIT_CUT - MENUITEM "&Copy", ID_HEXEDIT_COPY - MENUITEM "&Paste", ID_HEXEDIT_PASTE - MENUITEM "&Delete", ID_HEXEDIT_DELETE - MENUITEM SEPARATOR - MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + MENUITEM "&Copia", ID_HEXEDIT_COPY + MENUITEM "&Incolla", ID_HEXEDIT_PASTE + MENUITEM "&Taglia", ID_HEXEDIT_CUT + MENUITEM "&Cancella", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "&Seleziona tutto", ID_HEXEDIT_SELECT_ALL END END Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 07-07-2008 - * LAST CHANGE: 28-07-2008 + * LAST CHANGE: 29-07-2010 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -68,29 +68,29 @@ MENUITEM "Rozírit&e¾ná reazcová hodnota", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR - MENUITEM "&Oprávnenia...", ID_EDIT_PERMISSIONS - MENUITEM SEPARATOR - MENUITEM "&Vymaza\tDel", ID_EDIT_DELETE - MENUITEM "&Premenova", ID_EDIT_RENAME - MENUITEM SEPARATOR - MENUITEM "&Kopírova názov k¾úèa", ID_EDIT_COPYKEYNAME - MENUITEM SEPARATOR - MENUITEM "&H¾ada\tCtrl+F", ID_EDIT_FIND - MENUITEM "H¾a&da ïalej\tF3", ID_EDIT_FINDNEXT + MENUITEM "&Oprávnenia...", ID_EDIT_PERMISSIONS + MENUITEM SEPARATOR + MENUITEM "&Vymaza\tDel", ID_EDIT_DELETE + MENUITEM "&Premenova", ID_EDIT_RENAME + MENUITEM SEPARATOR + MENUITEM "&Kopírova názov k¾úèa", ID_EDIT_COPYKEYNAME + MENUITEM SEPARATOR + MENUITEM "&H¾ada\tCtrl+F", ID_EDIT_FIND + MENUITEM "H¾a&da ïalej\tF3", ID_EDIT_FINDNEXT END POPUP "&Zobrazi" BEGIN - MENUITEM "Stavový &riadok", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "Rozde&lenie", ID_VIEW_SPLIT - MENUITEM SEPARATOR - MENUITEM "&Obnovi\tF5", ID_VIEW_REFRESH + MENUITEM "Stavový &riadok", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "Rozde&lenie", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Obnovi\tF5", ID_VIEW_REFRESH END POPUP "&Ob¾úbené" BEGIN - MENUITEM "&Prida k ob¾úbeným", ID_FAVOURITES_ADDTOFAVOURITES + MENUITEM "&Prida k ob¾úbeným", ID_FAVOURITES_ADDTOFAVOURITES , GRAYED - MENUITEM "&Odstráni z ob¾úbených", ID_FAVOURITES_REMOVEFAVOURITE + MENUITEM "&Odstráni z ob¾úbených", ID_FAVOURITES_REMOVEFAVOURITE , GRAYED END POPUP "&Pomocník" @@ -106,36 +106,36 @@ POPUP "" BEGIN MENUITEM "&Zmeni", ID_EDIT_MODIFY - MENUITEM "Zmeni bináre údaje", ID_EDIT_MODIFY_BIN + MENUITEM "Zmeni bináre údaje", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR - MENUITEM "&Vymaza\tDel", ID_EDIT_DELETE - MENUITEM "&Premenova", ID_EDIT_RENAME + MENUITEM "&Vymaza\tDel", ID_EDIT_DELETE + MENUITEM "&Premenova", ID_EDIT_RENAME END POPUP "" BEGIN POPUP "&Nový" BEGIN - MENUITEM "&K¾úè", ID_EDIT_NEW_KEY + MENUITEM "&K¾úè", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Reazcová hodnota", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Binárna hodnota", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD hodnota", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&Viacreazcová hodnota", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "Rozírit&e¾ná reazcová hodnota", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "&Reazcová hodnota", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binárna hodnota", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD hodnota", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Viacreazcová hodnota", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Rozírit&e¾ná reazcová hodnota", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END END POPUP "" BEGIN - MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH + MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH POPUP "&Nový" BEGIN - MENUITEM "&K¾úè", ID_EDIT_NEW_KEY + MENUITEM "&K¾úè", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Reazcová hodnota", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Binárna hodnota", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD hodnota", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&Viacreazcová hodnota", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "Rozírit&e¾ná reazcová hodnota", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "&Reazcová hodnota", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binárna hodnota", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD hodnota", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Viacreazcová hodnota", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Rozírit&e¾ná reazcová hodnota", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM "&Find", ID_EDIT_FIND MENUITEM SEPARATOR @@ -294,12 +294,12 @@ IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" IDS_TOO_BIG_VALUE "Hodnota je príli ve¾ká (%ld)" IDS_MULTI_SZ_EMPTY_STRING "Data of type REG_MULTI_SZ cannot contain empty strings.\nThe empty strings have been removed from the list." - IDS_QUERY_DELETE_KEY_ONE "Are you sure you want to delete this key?" - IDS_QUERY_DELETE_KEY_MORE "Are you sure you want to delete these keys?" - IDS_QUERY_DELETE_KEY_CONFIRM "Confirm Key Delete" - IDS_QUERY_DELETE_ONE "Are you sure you want to delete this value?" - IDS_QUERY_DELETE_MORE "Are you sure you want to delete these values?" - IDS_QUERY_DELETE_CONFIRM "Confirm Value Delete" + IDS_QUERY_DELETE_KEY_ONE "Naozaj chcete vymaza tento k¾úè?" + IDS_QUERY_DELETE_KEY_MORE "Naozaj chcete vymaza tieto k¾úèe?" + IDS_QUERY_DELETE_KEY_CONFIRM "Potvrdi vymazanie k¾úèa" + IDS_QUERY_DELETE_ONE "Naozaj chcete vymaza túto hodnotu?" + IDS_QUERY_DELETE_MORE "Naozaj chcete vymaza tieto hodnoty?" + IDS_QUERY_DELETE_CONFIRM "Potvrdi vymazanie hodnoty" IDS_ERR_DELVAL_CAPTION "Error Deleting Values" IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" @@ -370,8 +370,7 @@ */ IDD_EXPORTRANGE DIALOGEX DISCARDABLE 50, 50, 370, 50 -STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | - WS_BORDER +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Export Range",IDC_STATIC,2,0,366,48 Modified: trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 13-12-2009 - * LAST UPDATE: xx-xx-xxxx + * LAST UPDATE: 26-07-2010 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -46,3 +46,14 @@ IDS_APP_TITLE "reactOS_sndrec32" IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" END + +STRINGTABLE +BEGIN + IDS_STRPOS "Pozícia: %.2f s" + IDS_STRDUR "Dåka: %.2f s" + IDS_STRBUF "Buffer: %.2f kb" //Vyrovnávacia pamä + IDS_STRFMT "%.1f kHz %u bitov" + IDS_STRMONO "mono" + IDS_STRSTEREO "stereo" + IDS_STRCHAN "%s" +END Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -986,13 +986,13 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "Installazione del bootloader sul disco fisso (MBR e VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "Installazione del bootloader sul disco fisso (solo VBR).", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -986,19 +986,19 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "áâ ®¢¨âì § £àã§ç¨ª ¦¥áâª¨© ¤¨áª (MBR ¨ VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "áâ ®¢¨âì § £àã§ç¨ª ¦¥áâª¨© ¤¨áª (â®«ìª® VBR).", TEXT_STYLE_NORMAL }, { 8, 14, - "áâ ®¢ª £¨¡ª¨© ¤¨áª.", + "áâ ®¢¨âì § £àã§ç¨ª £¨¡ª¨© ¤¨áª.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -991,25 +991,25 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¦®àáâª¨© ¤¨áª (MBR i VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¦®àáâª¨© ¤¨áª («¨è¥ VBR).", TEXT_STYLE_NORMAL }, { 8, 14, - "áâ ®¢¨â¨ bootloader ¤¨áª¥âã.", + "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¤¨áª¥âã.", TEXT_STYLE_NORMAL }, { 8, 15, - "¥ ¢áâ ®¢«î¢ â¨ bootloader.", + "¥ ¢áâ ®¢«î¢ â¨ § ¢ â ¦ã¢ ç.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -1,3 +1,8 @@ +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 20-07-2007 + * LAST UPDATE: 26-07-2010 + */ + LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDM_TRAYWND MENU DISCARDABLE @@ -5,7 +10,7 @@ POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "Task Manager", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM "Správca úlo&h", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR MENUITEM "Za&mknú panel úloh", ID_LOCKTASKBAR MENUITEM "&Vlastnosti", ID_SHELL_CMD_PROPERTIES @@ -56,60 +61,60 @@ IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Taskbar" +CAPTION "Panel úloh" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121 + GROUPBOX "Vzh¾ad panela úloh", IDC_STATIC, 6,6,240,121 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 - AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10 - AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10 - AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13,71,200,10 - AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10 - AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 - AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Za&mknú panel úloh", IDC_TASKBARPROP_LOCK, 13,45,200,10 + AUTOCHECKBOX "A&utomaticky skýva panel úloh", IDC_TASKBARPROP_HIDE, 13,58,200,10 + AUTOCHECKBOX "Zo&brazova panel úloh nad ostatnými oknami", IDC_TASKBARPROP_ONTOP, 13,71,200,10 //Ponecha panel úloh nad ostatnými oknami + AUTOCHECKBOX "&Zoskupova podobné tlaèidlá na paneli s nástrojmi", IDC_TASKBARPROP_GROUP, 13,84,200,10 + AUTOCHECKBOX "Zobrazi panel &Rýchle spustenie", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 + AUTOCHECKBOX "Z&obrazi náh¾ady okien (miniatúry)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Start Menu" +CAPTION "Ponuka tart" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 + AUTORADIOBUTTON "Pon&uka tart", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20,17,150,24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED - AUTORADIOBUTTON "Classic Start &menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED + PUSHBUTTON "P&rispôsobi...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED + AUTORADIOBUTTON "Klasická po&nuka tart", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED LTEXT "This menu style gives you the classic look and functionality",-1,20,57,150,24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED - GROUPBOX "Privacy",IDC_STATIC, 7,100,238,42 + PUSHBUTTON "&Prispôsobi...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED + GROUPBOX "Ochrana súkromia",IDC_STATIC, 7,100,238,42 AUTOCHECKBOX "Store and display a list of recently opened &files", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED AUTOCHECKBOX "Store and display a list of recently opened &programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED END IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Notification Area" +CAPTION "Oblas oznámení" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED - GROUPBOX "Icons", IDC_STATIC, 6,33,240,58, WS_DISABLED + GROUPBOX "Ikony", IDC_STATIC, 6,33,240,58, WS_DISABLED LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,48,223,16, WS_DISABLED - AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED - GROUPBOX "System icons", IDC_STATIC, 6,97,240,84, WS_DISABLED - LTEXT "Select which system icons to always show.", IDC_STATIC, 13,112,223,16, WS_DISABLED - AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED - AUTOCHECKBOX "&Volume", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED - AUTOCHECKBOX "&Network", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED - AUTOCHECKBOX "&Power", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED + AUTOCHECKBOX "&Skry neaktívne ikony", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED + PUSHBUTTON "P&rispôsobi...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED + GROUPBOX "Systémové ikony", IDC_STATIC, 6,97,240,84, WS_DISABLED + LTEXT "Vyberte, ktoré systémové ikony sa majú vdy zobrazova.", IDC_STATIC, 13,112,223,16, WS_DISABLED + AUTOCHECKBOX "Ho&diny", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED + AUTOCHECKBOX "&Hlasitos", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED + AUTOCHECKBOX "Si&e", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED + AUTOCHECKBOX "N&apájanie", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED END IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Toolbars" +CAPTION "Panel s nástrojmi" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Select which toolbars to add to the taskbar.", IDC_STATIC, 7,7,223,12, WS_DISABLED + LTEXT "Vyberte, ktoré panely s nástrojmi sa majú prida do panela úloh.", IDC_STATIC, 7,7,223,12, WS_DISABLED CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END @@ -120,10 +125,10 @@ IDS_PROPERTIES "Vl&astnosti" IDS_OPEN_ALL_USERS "&Otvori profil All Users" IDS_EXPLORE_ALL_USERS "&Preskúma profil All Users" - IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." + IDS_STARTUP_ERROR "Systém nemoe spusti prieskumníka, pretoe registre sú pokodené alebo nedostupné." END STRINGTABLE DISCARDABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu Properties" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "Vlastnosti panela úloh a ponuky tart" END Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -110,16 +110,16 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 - LTEXT "Data e ora", IDC_STATIC, 56, 7, 253, 8 + LTEXT "Data e ora", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 56, 17, 137, 10 + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", - DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 10 - LTEXT "Fuso orario", IDC_STATIC, 20, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 20, 52, 201, 93, + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Fuso orario", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Cambia automaticamente con l'ora &legale", - IDC_AUTODAYLIGHT, 20, 124, 201, 10 + IDC_AUTODAYLIGHT, 53, 124, 201, 10 END Added: trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pt… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc (added) +++ trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -1,0 +1,305 @@ +/* + * Copyright (C) 2010 Marcelo Zamperetti - marcelohz(a)gmail.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bem-vindo ao assistente de instalação do ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Este assistente instala o ReactOS no seu computador. Ele "\ + "precisa reunir algumas informações sobre você e seu computador "\ + "para instalar o ReactOS devidamente.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Clique Avançar para continuar a instalação.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Os desenvolvedores do ReactOS gostariam de agradecer aos seguintes projetos Open Source, "\ + "cujo partes foram utilizadas para criar o ReactOS:", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS está licenciado sob a GPL, se você deseja reutilizar ou redistribuir "\ + "(partes) (d)ele você deve respeitar a GPL", + IDC_STATIC,15,110,227,19 + PUSHBUTTON "&Visualizar GPL...",IDC_VIEWGPL,251,110,50,19 + LTEXT "Clique Avançar para continuar com a instalação.",IDC_STATIC,15,136, + 195,17 +END + + +IDD_OWNERPAGE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 + LTEXT "Digite seu nome completo e o nome de sua empresa ou organização.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "No&me:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Organização:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 + LTEXT "Digite um nome para o seu computador com 63 caracteres ou menos. "\ + "Se você está em uma rede, o nome do computador deve ser exclusivo.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "Nome do &Computador:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 + LTEXT "A instalação vai criar uma conta no seu computador chamada Administrator. "\ + "Você pode usar esta conta se precisar de acesso total ao seu computador.", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Digite uma senha para o administrador com 14 caracteres ou menos.", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "Senha do &Administrador:", IDC_STATIC, 54, 104, 105, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "C&onfirma Senha:", IDC_STATIC, 54, 123, 105, 8 + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 + LTEXT "A localidade do sistema deve coincidir com o idioma das aplicações "\ + "que você quer utilizar. A localidade de usuário controla como números, "\ + "moeda e datas aparecem.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "Para alterar a localidade de sistema ou usuário, clique Personalizar.", + IDC_STATIC, 53, 60, 196, 8 + PUSHBUTTON "&Personalizar...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "O layout do teclado controla os caracteres que aparecem quando você digita.", + IDC_STATIC, 53, 86, 253, 8 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Para alterar o layout do teclado, clique Personalizar.", + IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "P&ersonalizar...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 +END + + +IDD_DATETIMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Data e Hora:", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Fuso Horário:", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Ajustar o relógio automaticamente para o horário de &verão", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Finalizando a instalação do ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Finalizando o Assistente de Instalação do ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Você completou a instalação do ReactOS com sucesso.\n\n" \ + "Quando você clicar em Finalizar, o computador será reiniciado.", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "Se houver um cd em algum drive, remova-o. Depois, para "\ + "reiniciar seu computador, clique Finalizar.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_GPL DIALOGEX 0, 0, 333, 230 +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU General Public License" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,141,209,50,14 +END + + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Por favor aguarde..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Agradecimentos" + IDS_ACKSUBTITLE "Os ombros nos quais o ReactOS se apoia e informações de licença" + IDS_OWNERTITLE "Personalize seu Software" + IDS_OWNERSUBTITLE "A Instalação utiliza esta sua informação para personalizar o ReactOS." + IDS_COMPUTERTITLE "Nome do computador e senha do administrador" + IDS_COMPUTERSUBTITLE "Você deve fornecer um nome e senha de administrador para o seu computador." + IDS_LOCALETITLE "Configurações Regionais" + IDS_LOCALESUBTITLE "Você pode personalizar o ReactOS para diferentes regiões e línguas." + IDS_DATETIMETITLE "Data e Hora" + IDS_DATETIMESUBTITLE "Definir a data e a hora corretas para o seu computador." + IDS_PROCESSTITLE "Registrando componentes" + IDS_PROCESSSUBTITLE "Por favor aguarde..." +END + +STRINGTABLE +BEGIN + IDS_CMT_DOWNLOADER "Faça o download e instale várias aplicações" +END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Acessórios" + IDS_CMT_CALC "Iniciar Calculadora" + IDS_CMT_CMD "Abrir prompt de comando" + IDS_CMT_DEVMGMT "Iniciar Gerenciador de Dispositivos" + IDS_CMT_EVENTVIEW "Iniciar Visualizador de Eventos" + IDS_CMT_EXPLORER "Iniciar Explorer" + IDS_CMT_MSCONFIG "Iniciar Software de Configuração do Sistema" + IDS_CMT_NOTEPAD "Iniciar Editor de Texto" + IDS_CMT_RDESKTOP "Iniciar Área de Trabalho Remota" + IDS_CMT_REGEDIT "Iniciar Editor do Registro" + IDS_CMT_SCREENSHOT "Capturar Tela" + IDS_CMT_SERVMAN "Iniciar Gerenciador de Serviços" + IDS_CMT_WORDPAD "Iniciar Editor de Documentos" + IDS_CMT_PAINT "Iniciar Paint" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Jogos" + IDS_CMT_SOLITAIRE "Paciência" + IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Paciência Spider" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "Ferramentas de Sistema" + IDS_CMT_CHARMAP "Mapa de Caracteres" + IDS_CMT_DXDIAG "Iniciar o ReactX-Diagnostic" + IDS_CMT_KBSWITCH "Alterador de Layout de Teclado" +END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Acessibilidade" + IDS_CMT_MAGNIFY "Ampliar" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entretenimento" + IDS_CMT_MPLAY32 "Iniciar Player Multimídia" + IDS_CMT_SNDVOL32 "Iniciar Controle de Volume" + IDS_CMT_SNDREC32 "Iniciar Gravador de Som" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "Instalação do ReactOS" + IDS_UNKNOWN_ERROR "Erro Desconhecido" + IDS_REGISTERING_COMPONENTS "Registrando componentes..." + IDS_LOADLIBRARY_FAILED "LoadLibrary falhou: " + IDS_GETPROCADDR_FAILED "GetProcAddr falhou: " + IDS_REGSVR_FAILED "DllRegisterServer falhou: " + IDS_DLLINSTALL_FAILED "DllInstall falhou: " + IDS_TIMEOUT "Tempo limite esgotado durante registro" + IDS_REASON_UNKNOWN "" +END + +STRINGTABLE +BEGIN + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_CHARMAP "Character Map.lnk" + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_EVENTVIEW "Event Viewer.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" + IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SNDREC32 "Audiorecorder.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" +END + +STRINGTABLE +BEGIN + IDS_WZD_NAME "A Instalação não pode continuar até que você digite seu nome." + IDS_WZD_SETCOMPUTERNAME "A Instalação falhou tentando definir o nome do computador." + IDS_WZD_COMPUTERNAME "A Instalação não pode continuar até que você digite o nome do seu computador." + IDS_WZD_PASSWORDEMPTY "Você deve digitar uma senha." + IDS_WZD_PASSWORDMATCH "As senhas digitadas não coincidem. Por favor, entre com a senha desejada novamente." + IDS_WZD_PASSWORDCHAR "A senha que você digitou contém caracteres inválidos. Por favor digite uma senha diferente." + IDS_WZD_LOCALTIME "A Instalação não pôde definir a hora local." +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Instalando dispositivos..." +END + +/* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] Wed Sep 22 19:29:20 2010 @@ -67,6 +67,7 @@ #include "lang/no-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc"

1 0

[sir_richard] 48846: [FREELDR]: Fix the last remaining build issue. Libgcc needs to be linked to provide umovsi/udivsi, etc (same fix as for setupldr).
by sir_richard＠svn.reactos.org 21 Sep '10

21 Sep '10

Author: sir_richard Date: Tue Sep 21 17:50:01 2010 New Revision: 48846 URL: http://svn.reactos.org/svn/reactos?rev=48846&view=rev Log: [FREELDR]: Fix the last remaining build issue. Libgcc needs to be linked to provide umovsi/udivsi, etc (same fix as for setupldr). Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Tue Sep 21 17:50:01 2010 @@ -33,5 +33,9 @@ <library>rtl</library> <library>libcntpr</library> <library>cportlib</library> + <group linkerset="ld"> + <linkerflag>-static</linkerflag> + <linkerflag>-lgcc</linkerflag> + </group> </module> </ifnot>

1 0

[akhaldi] 48845: [KERNEL32] - Sylvain Petreolle: Fix debug channels for release builds.
by akhaldi＠svn.reactos.org 21 Sep '10

21 Sep '10

Author: akhaldi Date: Tue Sep 21 17:14:22 2010 New Revision: 48845 URL: http://svn.reactos.org/svn/reactos?rev=48845&view=rev Log: [KERNEL32] - Sylvain Petreolle: Fix debug channels for release builds. Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c trunk/reactos/dll/win32/kernel32/file/copy.c trunk/reactos/dll/win32/kernel32/file/create.c trunk/reactos/dll/win32/kernel32/file/curdir.c trunk/reactos/dll/win32/kernel32/file/delete.c trunk/reactos/dll/win32/kernel32/file/dir.c trunk/reactos/dll/win32/kernel32/file/dosdev.c trunk/reactos/dll/win32/kernel32/file/file.c trunk/reactos/dll/win32/kernel32/file/find.c trunk/reactos/dll/win32/kernel32/file/hardlink.c trunk/reactos/dll/win32/kernel32/file/lock.c trunk/reactos/dll/win32/kernel32/file/mailslot.c trunk/reactos/dll/win32/kernel32/file/move.c trunk/reactos/dll/win32/kernel32/file/npipe.c trunk/reactos/dll/win32/kernel32/file/pipe.c trunk/reactos/dll/win32/kernel32/file/rw.c trunk/reactos/dll/win32/kernel32/file/volume.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/misc/actctx.c trunk/reactos/dll/win32/kernel32/misc/format_msg.c trunk/reactos/dll/win32/kernel32/misc/lcformat.c trunk/reactos/dll/win32/kernel32/misc/version.c trunk/reactos/dll/win32/kernel32/process/session.c Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/bi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/bintype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/bintype.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -17,7 +17,7 @@ #include <debug.h> #if DBG -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); #endif /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -17,7 +17,7 @@ #include <debug.h> #if DBG -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); #endif /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/create.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -19,7 +19,7 @@ #include <debug.h> #if DBG -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); #endif #define SYMLINK_FLAG_RELATIVE 1 Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -21,7 +21,7 @@ #include <debug.h> #if DBG -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); #endif /* GLOBAL VARIABLES **********************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/delete.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/delete.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG #include <reactos/debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -18,7 +18,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); UNICODE_STRING DllDirectory = {0, 0, NULL}; Modified: trunk/reactos/dll/win32/kernel32/file/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/do… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dosdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dosdev.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); /* GLOBALS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/find.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/find.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); /* TYPES ********************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/hardlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ha… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/hardlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/hardlink.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/lock.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/lock.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -16,7 +16,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ma… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/mailslot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/mailslot.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -19,7 +19,7 @@ #include <malloc.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); /* GLOBALS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); //#define USING_PROPER_NPFS_WAIT_SEMANTICS Modified: trunk/reactos/dll/win32/kernel32/file/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/pi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/pipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/pipe.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); /* GLOBALS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/rw… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/rw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/rw.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -22,7 +22,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32file; +DEBUG_CHANNEL(kernel32file); #define MAX_DOS_DRIVES 26 Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -8,6 +8,13 @@ #define actctx 202 #define resource 203 #define kernel32session 204 + + +#if DBG +#define DEBUG_CHANNEL(ch) static ULONG gDebugChannel = ch; +#else +#define DEBUG_CHANNEL(ch) +#endif #define TRACE(fmt, ...) TRACE__(gDebugChannel, fmt, ##__VA_ARGS__) #define WARN(fmt, ...) WARN__(gDebugChannel, fmt, ##__VA_ARGS__) Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = actctx; +DEBUG_CHANNEL(actctx); #define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa) Modified: trunk/reactos/dll/win32/kernel32/misc/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/fo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/format_msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/format_msg.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -22,7 +22,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = resource; +DEBUG_CHANNEL(resource); struct format_args { Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -32,7 +32,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = resource; +DEBUG_CHANNEL(resource); #define DATE_DATEVARSONLY 0x0100 /* only date stuff: yMdg */ #define TIME_TIMEVARSONLY 0x0200 /* only time stuff: hHmst */ Modified: trunk/reactos/dll/win32/kernel32/misc/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ve… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/version.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -11,7 +11,7 @@ #include <reactos/buildno.h> #define NDEBUG #include <debug.h> -static ULONG gDebugChannel = kernel32ver; +DEBUG_CHANNEL(kernel32ver); #define UNICODIZE1(x) L##x #define UNICODIZE(x) UNICODIZE1(x) Modified: trunk/reactos/dll/win32/kernel32/process/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/session.c [iso-8859-1] Tue Sep 21 17:14:22 2010 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -//static ULONG gDebugChannel = kernel32session; not actually used +//DEBUG_CHANNEL(kernel32session); not actually used DWORD ActiveConsoleSessionId = 0;

1 0

[sir_richard] 48844: [HAL]: Partly implement HalpAdjustPCIResourceList required for legacy HAL. No actual adjustment is done yet, since the Range package is not implemented. [HAL]: Implement most o...
by sir_richard＠svn.reactos.org 21 Sep '10

21 Sep '10

Author: sir_richard Date: Tue Sep 21 17:07:40 2010 New Revision: 48844 URL: http://svn.reactos.org/svn/reactos?rev=48844&view=rev Log: [HAL]: Partly implement HalpAdjustPCIResourceList required for legacy HAL. No actual adjustment is done yet, since the Range package is not implemented. [HAL]: Implement most of HalpGetISAFixedPCIIrq, other than the legacy PCI IRQ Routing Miniport callbacks, which aren't yet implemented by ReactOS. The Windows PCI Bus Driver seems to work now. Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] Tue Sep 21 17:07:40 2010 @@ -14,6 +14,7 @@ /* GLOBALS *******************************************************************/ +extern BOOLEAN HalpPciLockSettings; ULONG HalpBusType; PCI_TYPE1_CFG_CYCLE_BITS HalpPciDebuggingDevice[2] = {{{{0}}}}; @@ -558,8 +559,42 @@ IN PCI_SLOT_NUMBER PciSlot, OUT PSUPPORTED_RANGE *Range) { - UNIMPLEMENTED; - while (TRUE); + PCI_COMMON_HEADER PciData; + + /* Read PCI configuration data */ + HalGetBusData(PCIConfiguration, + BusHandler->BusNumber, + PciSlot.u.AsULONG, + &PciData, + PCI_COMMON_HDR_LENGTH); + + /* Make sure it's a real device */ + if (PciData.VendorID == PCI_INVALID_VENDORID) return STATUS_UNSUCCESSFUL; + + /* Allocate the supported range structure */ + *Range = ExAllocatePoolWithTag(PagedPool, sizeof(SUPPORTED_RANGE), 'Hal '); + if (!*Range) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set it up */ + RtlZeroMemory(*Range, sizeof(SUPPORTED_RANGE)); + (*Range)->Base = 1; + + /* If the PCI device has no IRQ, nothing to do */ + if (!PciData.u.type0.InterruptPin) return STATUS_SUCCESS; + + /* FIXME: The PCI IRQ Routing Miniport should be called */ + + /* Also if the INT# seems bogus, nothing to do either */ + if ((PciData.u.type0.InterruptLine == 0) || + (PciData.u.type0.InterruptLine == 255)) + { + /* Fake success */ + return STATUS_SUCCESS; + } + + /* Otherwise, the INT# should be valid, return it to the caller */ + (*Range)->Base = PciData.u.type0.InterruptLine; + (*Range)->Limit = PciData.u.type0.InterruptLine; return STATUS_SUCCESS; } @@ -622,10 +657,40 @@ IN PBUS_HANDLER RootHandler, IN OUT PIO_RESOURCE_REQUIREMENTS_LIST *pResourceList) { - /* Not yet supported */ - DbgPrint("HAL: PCI Resource List Adjustment not implemented!"); - while (TRUE); - return STATUS_UNSUCCESSFUL; + PPCIPBUSDATA BusData; + PCI_SLOT_NUMBER SlotNumber; + PSUPPORTED_RANGE Interrupt; + NTSTATUS Status; + + /* Get PCI bus data */ + BusData = BusHandler->BusData; + SlotNumber.u.AsULONG = (*pResourceList)->SlotNumber; + + /* Get the IRQ supported range */ + Status = BusData->GetIrqRange(BusHandler, RootHandler, SlotNumber, &Interrupt); + if (!NT_SUCCESS(Status)) return Status; +#ifndef _MINIHAL_ + /* Handle the /PCILOCK feature */ + if (HalpPciLockSettings) + { + /* /PCILOCK is not yet supported */ + UNIMPLEMENTED; + while (TRUE); + } +#endif + /* Now create the correct resource list based on the supported bus ranges */ +#if 0 + Status = HaliAdjustResourceListRange(BusHandler->BusAddresses, + Interrupt, + pResourceList); +#else + DPRINT1("HAL: No PCI Resource Adjustment done! Hardware may malfunction\n"); + Status = STATUS_SUCCESS; +#endif + + /* Return to caller */ + ExFreePool(Interrupt); + return Status; } NTSTATUS

1 0

[fireball] 48843: - Update 3rd Party Files.txt To Current 3rd Party Releases. See issue #5603 for more details.
by fireball＠svn.reactos.org 21 Sep '10

21 Sep '10

Author: fireball Date: Tue Sep 21 08:30:56 2010 New Revision: 48843 URL: http://svn.reactos.org/svn/reactos?rev=48843&view=rev Log: - Update 3rd Party Files.txt To Current 3rd Party Releases. See issue #5603 for more details. Modified: trunk/reactos/media/doc/3rd Party Files.txt Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Tue Sep 21 08:30:56 2010 @@ -3,13 +3,13 @@ Other Things synched with other projects: Title: RedHat Liberation Fonts -Version: 1.04 -Actual Version: 1.04 +Version: 1.05.2 +Actual Version: 1.06 Website: https://www.redhat.com/promo/fonts/ Title: DejaVu Fonts -Version: 2.30 -Actual Version: 2.30 +Version: 2.31 +Actual Version: 2.32 Website: http://dejavu.sourceforge.net Title: DXTN OpenGL Compression Libs @@ -19,12 +19,12 @@ Title: FreeType Version: 2.3.5 -Actual Version: 2.3.11 +Actual Version: 2.4.2 Website: http://www.freetype.org Title: Mesa3D Version: 7.4 -Actual Version: 7.6 +Actual Version: 7.8.2 Website: http://www.mesa3d.org Title: GNU adns @@ -44,10 +44,10 @@ Title: LibXML Version: 2.7.6 -Actual Version: 2.7.6 +Actual Version: 2.7.7 Website: http://xmlsoft.org Title: ZLib Version: 1.2.3 -Actual Version: 1.2.3 +Actual Version: 1.2.5 Website: http://www.zlib.net

1 0

[fireball] 48842: [DDRAW] - Jerome Gardou: Avoid buffer overrun in IDirectDraw::GetCaps(). See issue #5006 for more details.
by fireball＠svn.reactos.org 21 Sep '10

21 Sep '10

Author: fireball Date: Tue Sep 21 08:24:15 2010 New Revision: 48842 URL: http://svn.reactos.org/svn/reactos?rev=48842&view=rev Log: [DDRAW] - Jerome Gardou: Avoid buffer overrun in IDirectDraw::GetCaps(). See issue #5006 for more details. Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/GetCaps.c Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Ddraw/GetCaps.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Ddraw/GetCaps.c [iso-8859-1] Tue Sep 21 08:24:15 2010 @@ -102,7 +102,7 @@ if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { - memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCAPS_DX3)); + memcpy(myCaps, CoreCaps, sizeof(DDCAPS_DX3)); } myCaps->dwVidMemFree = dwFree; @@ -127,7 +127,7 @@ if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { - memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); + memcpy(myCaps, CoreCaps, sizeof(DDCORECAPS)); } myCaps->dwVidMemFree = dwFree; @@ -153,7 +153,7 @@ if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { - memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); + memcpy(myCaps, CoreCaps, sizeof(DDCORECAPS)); } myCaps->dwVidMemFree = dwFree; @@ -209,7 +209,7 @@ if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { - memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCAPS_DX3)); + memcpy(myCaps, CoreCaps, sizeof(DDCAPS_DX3)); } myCaps->dwVidMemFree = dwFree; @@ -234,7 +234,7 @@ if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { - memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); + memcpy(myCaps, CoreCaps, sizeof(DDCORECAPS)); } myCaps->dwVidMemFree = dwFree; @@ -260,7 +260,7 @@ if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { - memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); + memcpy(myCaps, CoreCaps, sizeof(DDCORECAPS)); } myCaps->dwVidMemFree = dwFree;

1 0

[cgutman] 48841: [LWIP] - Don't call KeSetEvent while holding a spin lock (thanks to lassy for pointing it out) - Don't advance to the next list entry because we are using ExInterlockedRemoveHeadLi...
by cgutman＠svn.reactos.org 21 Sep '10

21 Sep '10

Author: cgutman Date: Tue Sep 21 06:40:41 2010 New Revision: 48841 URL: http://svn.reactos.org/svn/reactos?rev=48841&view=rev Log: [LWIP] - Don't call KeSetEvent while holding a spin lock (thanks to lassy for pointing it out) - Don't advance to the next list entry because we are using ExInterlockedRemoveHeadList - A couple more small code improvements Modified: branches/tcp-rewrite-branch/lib/drivers/lwip/src/sys_arch.c Modified: branches/tcp-rewrite-branch/lib/drivers/lwip/src/sys_arch.c URL: http://svn.reactos.org/svn/reactos/branches/tcp-rewrite-branch/lib/drivers/… ============================================================================== --- branches/tcp-rewrite-branch/lib/drivers/lwip/src/sys_arch.c [iso-8859-1] (original) +++ branches/tcp-rewrite-branch/lib/drivers/lwip/src/sys_arch.c [iso-8859-1] Tue Sep 21 06:40:41 2010 @@ -58,11 +58,13 @@ sys_sem_t sys_sem_new(u8_t count) { - sys_sem_t sem = ExAllocatePool(NonPagedPool, sizeof(KEVENT)); + sys_sem_t sem; + + ASSERT(count == 0 || count == 1); + + sem = ExAllocatePool(NonPagedPool, sizeof(KEVENT)); if (!sem) return SYS_SEM_NULL; - - ASSERT(count == 0 || count == 1); /* It seems lwIP uses the semaphore implementation as either a completion event or a lock * so I optimize for this case by using a synchronization event and setting its initial state @@ -155,19 +157,17 @@ sys_mbox_post(sys_mbox_t mbox, void *msg) { PLWIP_MESSAGE_CONTAINER Container; - KIRQL OldIrql; Container = ExAllocatePool(NonPagedPool, sizeof(*Container)); ASSERT(Container); Container->Message = msg; - KeAcquireSpinLock(&mbox->Lock, &OldIrql); - InsertTailList(&mbox->ListHead, - &Container->ListEntry); + ExInterlockedInsertTailList(&mbox->ListHead, + &Container->ListEntry, + &mbox->Lock); KeSetEvent(&mbox->Event, IO_NO_INCREMENT, FALSE); - KeReleaseSpinLock(&mbox->Lock, OldIrql); } u32_t @@ -201,13 +201,13 @@ ASSERT(Entry); if (IsListEmpty(&mbox->ListHead)) KeClearEvent(&mbox->Event); - Container = CONTAINING_RECORD(Entry, LWIP_MESSAGE_CONTAINER, ListEntry); KeReleaseSpinLock(&mbox->Lock, OldIrql); KeQuerySystemTime(&PostWaitTime); TimeDiff = PostWaitTime.QuadPart - PreWaitTime.QuadPart; TimeDiff /= 10000; + Container = CONTAINING_RECORD(Entry, LWIP_MESSAGE_CONTAINER, ListEntry); Message = Container->Message; ExFreePool(Container); @@ -374,7 +374,5 @@ ZwClose(Container->Handle); } - - CurrentEntry = CurrentEntry->Flink; - } -} + } +}

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
28
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2010