Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[weiden] 31419: Remove obsolete debug output
by weiden＠svn.reactos.org 23 Dec '07

23 Dec '07

Author: weiden Date: Mon Dec 24 01:02:05 2007 New Revision: 31419 URL: http://svn.reactos.org/svn/reactos?rev=31419&view=rev Log: Remove obsolete debug output Modified: trunk/reactos/dll/win32/user32/windows/class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c (original) +++ trunk/reactos/dll/win32/user32/windows/class.c Mon Dec 24 01:02:05 2007 @@ -527,8 +527,6 @@ return Wnd->UserData; case GWL_HWNDPARENT: - DbgPrint("GWL_HWNDPARENT\n"); - /* FIXME: Implement in user32 */ { HWND parent = GetAncestor( hWnd, GA_PARENT ); if (parent == GetDesktopWindow()) parent = GetWindow( hWnd, GW_OWNER ); @@ -586,8 +584,6 @@ return Wnd->UserData; case GWL_HWNDPARENT: - DbgPrint("GWL_HWNDPARENT\n"); - /* FIXME: Implement in user32 */ { HWND parent = GetAncestor( hWnd, GA_PARENT ); if (parent == GetDesktopWindow()) parent = GetWindow( hWnd, GW_OWNER );

1 0

[mpiulachs] 31418: - Reorder the pages , the non graphical START_PAGE should be allways the first page to be loaded because it initializes txtsetup.sif - Apply the selected language to the installed OS - Get the list of languages from txtsetup.sif, it will allow us to not include explicitly excluded languages - Various formatting fixes - Add a default language setting to txtsetup.sif
by mpiulachs＠svn.reactos.org 23 Dec '07

23 Dec '07

Author: mpiulachs Date: Sun Dec 23 23:29:52 2007 New Revision: 31418 URL: http://svn.reactos.org/svn/reactos?rev=31418&view=rev Log: - Reorder the pages , the non graphical START_PAGE should be allways the first page to be loaded because it initializes txtsetup.sif - Apply the selected language to the installed OS - Get the list of languages from txtsetup.sif, it will allow us to not include explicitly excluded languages - Various formatting fixes - Add a default language setting to txtsetup.sif Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/settings.c trunk/reactos/base/setup/usetup/settings.h trunk/reactos/base/setup/usetup/usetup.h trunk/reactos/boot/bootdata/txtsetup.sif 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 Sun Dec 23 23:29:52 2007 @@ -545,13 +545,14 @@ static PAGE_NUMBER LanguagePage(PINPUT_RECORD Ir) { + /* Initialize the computer settings list */ if (LanguageList == NULL) { - LanguageList = MUICreateLanguageList(); + LanguageList = CreateLanguageList(SetupInf); if (LanguageList == NULL) { PopupError("Setup failed to initialize available translations", NULL, NULL, POPUP_WAIT_NONE); - return START_PAGE; + return INTRO_PAGE; } } @@ -585,11 +586,12 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - MUISelectLanguage((ULONG)LanguageList->CurrentEntry->UserData); - return START_PAGE; - } - } - return START_PAGE; + MUISelectLanguage((PWCHAR)LanguageList->CurrentEntry->UserData); + return INTRO_PAGE; + } + } + + return INTRO_PAGE; } @@ -695,7 +697,20 @@ CheckUnattendedSetup(); - return INTRO_PAGE; + if (IsUnattendedSetup) + { + //TODO + //read options from inf + ComputerList = CreateComputerTypeList(SetupInf); + DisplayList = CreateDisplayDriverList(SetupInf); + KeyboardList = CreateKeyboardDriverList(SetupInf); + LayoutList = CreateKeyboardLayoutList(SetupInf); + LanguageList = CreateLanguageList(SetupInf); + + return INSTALL_INTRO_PAGE; + } + + return LANGUAGE_PAGE; } @@ -708,17 +723,6 @@ IntroPage(PINPUT_RECORD Ir) { MUIDisplayPage(START_PAGE); - - if (IsUnattendedSetup) - { - //TODO - //read options from inf - ComputerList = CreateComputerTypeList(SetupInf); - DisplayList = CreateDisplayDriverList(SetupInf); - KeyboardList = CreateKeyboardDriverList(SetupInf); - LayoutList = CreateKeyboardLayoutList(SetupInf); - return INSTALL_INTRO_PAGE; - } while (TRUE) { @@ -3044,7 +3048,7 @@ /* Update keyboard layout settings */ CONSOLE_SetStatusText(" Updating keyboard layout settings..."); - if (!ProcessKeyboardLayoutRegistry(LayoutList)) + if (!ProcessKeyboardLayoutRegistry(LanguageList)) { MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; @@ -3411,26 +3415,23 @@ /* Hide the cursor */ CONSOLE_SetCursorType(TRUE, FALSE); - Page = LANGUAGE_PAGE; + Page = START_PAGE; while (Page != REBOOT_PAGE) { CONSOLE_ClearScreen(); - CONSOLE_SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Setup "); - CONSOLE_Flush(); switch (Page) { + /* Start page */ + case START_PAGE: + Page = SetupStartPage(&Ir); + break; /* Language page */ case LANGUAGE_PAGE: Page = LanguagePage(&Ir); break; - /* Start page */ - case START_PAGE: - Page = SetupStartPage(&Ir); - break; - /* License page */ case LICENSE_PAGE: Page = LicensePage(&Ir); Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Sun Dec 23 23:29:52 2007 @@ -1,3 +1,29 @@ +/* + * ReactOS kernel + * Copyright (C) 2008 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: subsys/system/usetup/mui.c + * PURPOSE: Text-mode setup + * PROGRAMMER: + */ + #include "usetup.h" #include "errorcode.h" #include "mui.h" @@ -12,51 +38,71 @@ #include "lang/sv-SE.h" #include "lang/uk-UA.h" +/* The current selected language , by default en-us for now */ +static PWCHAR SelectedLanguageId = L"00000409"; + static MUI_LANGUAGE LanguageList[] = { { - "English", - enUSPages - }, - { - "French", + L"00000409", /* The Language ID */ + L"00000409", /* Default Keyboard Layout for this language */ + L"English", /* Language Name , not used just to make things easier when updating this file */ + enUSPages /* Translated strings */ + }, + { + L"0000040C", + L"0000040C", + L"French", frFRPages }, { - "German", + L"00000407", + L"00000407", + L"German", deDEPages }, { - "Greek", + L"00000408", + L"00000408", + L"Greek", elGRPages }, { - "Italian", + L"00000410", + L"00000410", + L"Italian", itITPages }, { - "Russian", + L"00000419", + L"00000419", + L"Russian", ruRUPages }, { - "Spanish", + L"0000040A", + L"0000040A", + L"Spanish", esESPages }, { - "Swedish", + L"0000041D", + L"0000041D", + L"Swedish", svSEPages }, { - "Ukrainian", + L"00000422", + L"00000422", + L"Ukrainian", ukUAPages }, { + NULL, NULL, NULL } }; - -static ULONG SelectedLanguage = 0; extern VOID @@ -65,62 +111,58 @@ PINPUT_RECORD Ir, ULONG WaitEvent); - -PGENERIC_LIST -MUICreateLanguageList() -{ - PGENERIC_LIST List; - ULONG Index; - - List = CreateGenericList(); - if (List == NULL) - { - return NULL; - } - - Index = 0; - - do - { - AppendGenericListEntry(List, LanguageList[Index].LanguageDescriptor, (PVOID)Index, (Index == 0 ? TRUE : FALSE)); - Index++; - }while(LanguageList[Index].MuiPages && LanguageList[Index].LanguageDescriptor); - - return List; -} - BOOLEAN -MUISelectLanguage(ULONG LanguageIndex) -{ - SelectedLanguage = LanguageIndex; +MUISelectLanguage(PWCHAR LanguageID) +{ + if (LanguageID == NULL) + return FALSE; + + SelectedLanguageId = LanguageID; return TRUE; } - static MUI_ENTRY * -findMUIEntriesOfPage(ULONG PageNumber, MUI_PAGE * Pages) -{ - ULONG Index = 0; +FindMUIEntriesOfPage (ULONG PageNumber) +{ + ULONG muiIndex = 0; + ULONG lngIndex = 0; + MUI_PAGE * Pages = NULL; + do { - if (Pages[Index].Number == PageNumber) + /* First we search the language list till we find current selected language messages */ + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) { - return Pages[Index].MuiEntry; + /* Get all available pages for this language */ + Pages = LanguageList[lngIndex].MuiPages; + + do + { + /* Get page messages */ + if (Pages[muiIndex].Number == PageNumber) + return Pages[muiIndex].MuiEntry; + + muiIndex++; + } + while (Pages[muiIndex].MuiEntry != NULL); } - Index++; - }while(Pages[Index].MuiEntry != NULL); + + lngIndex++; + } + while (LanguageList[lngIndex].MuiPages != NULL); + return NULL; } VOID -MUIDisplayPage(ULONG pg) +MUIDisplayPage(ULONG page) { MUI_ENTRY * entry; int index; int flags; - entry = findMUIEntriesOfPage(pg, LanguageList[SelectedLanguage].MuiPages); + entry = FindMUIEntriesOfPage (page); if (!entry) { PopupError("Error: Failed to find translated page", @@ -152,7 +194,8 @@ break; } index++; - }while(entry[index].Buffer != NULL); + } + while (entry[index].Buffer != NULL); } VOID @@ -173,3 +216,5 @@ Ir, WaitEvent); } + +/* EOF */ Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Sun Dec 23 23:29:52 2007 @@ -17,23 +17,28 @@ typedef struct { - CHAR * LanguageDescriptor; + PWCHAR LanguageID; + PWCHAR LanguageKeyboardLayoutID; + PWCHAR LanguageDescriptor; MUI_PAGE * MuiPages; }MUI_LANGUAGE; -#define TEXT_NORMAL 0 -#define TEXT_HIGHLIGHT 1 -#define TEXT_UNDERLINE 2 -#define TEXT_STATUS 4 +#define TEXT_NORMAL 0 +#define TEXT_HIGHLIGHT 1 +#define TEXT_UNDERLINE 2 +#define TEXT_STATUS 4 + +#define TEXT_ALIGN_DEFAULT 5 +#define TEXT_ALIGN_RIGHT 6 +#define TEXT_ALIGN_LEFT 7 +#define TEXT_ALIGN_CENTER 8 VOID MUIDisplayPage(ULONG PageNumber); -PGENERIC_LIST -MUICreateLanguageList(); - BOOLEAN -MUISelectLanguage(ULONG LanguageIndex); +//MUISelectLanguage(ULONG LanguageIndex); +MUISelectLanguage(PWCHAR LanguageID); #endif Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c (original) +++ trunk/reactos/base/setup/usetup/settings.c Sun Dec 23 23:29:52 2007 @@ -655,6 +655,65 @@ return List; } +PGENERIC_LIST +CreateLanguageList(HINF InfFile) +{ + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + WCHAR DefaultLanguage[20]; + + /* Get default language id */ + if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLanguage", &Context)) + return NULL; + + if (!INF_GetData (&Context, NULL, &KeyValue)) + return NULL; + + wcscpy(DefaultLanguage, KeyValue); + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, + Buffer, + UserData, + _wcsicmp(KeyName, DefaultLanguage) ? FALSE : TRUE); + } + while (SetupFindNextLine(&Context, &Context)); + + return List; +} PGENERIC_LIST CreateKeyboardLayoutList(HINF InfFile) Modified: trunk/reactos/base/setup/usetup/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.h (original) +++ trunk/reactos/base/setup/usetup/settings.h Sun Dec 23 23:29:52 2007 @@ -48,6 +48,9 @@ PGENERIC_LIST CreateKeyboardLayoutList(HINF InfFile); +PGENERIC_LIST +CreateLanguageList(HINF InfFile); + BOOLEAN ProcessKeyboardLayoutRegistry(PGENERIC_LIST List); Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h (original) +++ trunk/reactos/base/setup/usetup/usetup.h Sun Dec 23 23:29:52 2007 @@ -82,8 +82,8 @@ typedef enum _PAGE_NUMBER { - LANGUAGE_PAGE = 0, START_PAGE, + LANGUAGE_PAGE, INTRO_PAGE, LICENSE_PAGE, INSTALL_INTRO_PAGE, Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Sun Dec 23 23:29:52 2007 @@ -58,6 +58,7 @@ OemCodepage = c_437.nls UnicodeCasetable = l_intl.nls DefaultLayout = 00000409 +DefaultLanguage = 00000409 [Computer] pci_up = "Standard-PC" @@ -89,10 +90,6 @@ vbe_1024x768x16 = "VESA Display (1024x768x16)",,VBE,1024,768,16 vbe_1024x768x32 = "VESA Display (1024x768x32)",,VBE,1024,768,32 - - - - [Map.Display] ;<id> = <pnp id string> vga = "VGA Display" @@ -100,6 +97,28 @@ [Keyboard] Default = "XT-, AT- or extended keyboard (83-105 keys)" + +[Language] +;00000403 = "Catalan" +;00000406 = "Danish" +;00000813 = "Dutch" +00000409 = "English" +;0000040B = "Finnish" +0000040C = "French" +00000407 = "German" +;00000408 = "Greek" +;0000040D = "Hebrew" +;0000040E = "Hungarian" +00000410 = "Italian" +;00000411 = "Japanese" +;00000414 = "Norwegian" +;00000415 = "Polish" +;00000816 = "Portuguese" +;00000419 = "Russian" +;0000041B = "Slovak" +0000040A = "Spanish" +00000422 = "Ukrainian" + [KeyboardLayout] 00040402 = "Bulgarian BDS 5237-1978"

1 0

[fireball] 31417: - Fix typos and debug messages.
by fireball＠svn.reactos.org 23 Dec '07

23 Dec '07

Author: fireball Date: Sun Dec 23 22:20:10 2007 New Revision: 31417 URL: http://svn.reactos.org/svn/reactos?rev=31417&view=rev Log: - Fix typos and debug messages. Modified: trunk/reactos/subsystems/win32/win32k/ldr/loader.c Modified: trunk/reactos/subsystems/win32/win32k/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ld… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ldr/loader.c (original) +++ trunk/reactos/subsystems/win32/win32k/ldr/loader.c Sun Dec 23 22:20:10 2007 @@ -225,7 +225,7 @@ /* the driver was not loaded before, so let's do that */ Status = ZwSetSystemInformation(SystemLoadGdiDriverInformation, &GdiDriverInfo, sizeof(SYSTEM_GDI_DRIVER_INFORMATION)); if (!NT_SUCCESS(Status)) { - DPRINT1("ZwSetSystemInformation faild with status 0x%lx\n", Status); + DPRINT1("ZwSetSystemInformation failed with Status 0x%lx\n", Status); } else { hImageHandle = (HANDLE)GdiDriverInfo.ImageAddress; @@ -269,15 +269,15 @@ { NTSTATUS Status; - DPRINT1("hModule=%x\n", hModule); + DPRINT("hModule 0x%x\n", hModule); Status = ZwSetSystemInformation(SystemUnloadGdiDriverInformation, &hModule, sizeof(HANDLE)); if(!NT_SUCCESS(Status)) { - DPRINT1("%s: ZwSetSystemInformation failed with status %x.", - __FUNCTION__, Status); + DPRINT1("ZwSetSystemInformation failed with status 0x%08X\n", + Status); } else {

1 0

[fireball] 31416: Dmitry Philippov <shedon@mail.ru> - The EngLoadImage and EngUnloadImage functions have been fixed to store handles of loaded drivers. EngLoadImage should not fail if a driver is already loaded, it should return a handle of the already loaded driver instead. - The gpDxFuncs variable has been redefined. Earlier, memory was not allocated for this variable, thus resulting in memory corruption.
by fireball＠svn.reactos.org 23 Dec '07

23 Dec '07

Author: fireball Date: Sun Dec 23 22:13:05 2007 New Revision: 31416 URL: http://svn.reactos.org/svn/reactos?rev=31416&view=rev Log: Dmitry Philippov <shedon(a)mail.ru> - The EngLoadImage and EngUnloadImage functions have been fixed to store handles of loaded drivers. EngLoadImage should not fail if a driver is already loaded, it should return a handle of the already loaded driver instead. - The gpDxFuncs variable has been redefined. Earlier, memory was not allocated for this variable, thus resulting in memory corruption. Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/ldr/loader.c trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intddraw.h Sun Dec 23 22:13:05 2007 @@ -8,7 +8,7 @@ #include <reactos/drivers/directx/dxeng.h> /* From ddraw.c */ -extern PDRVFN gpDxFuncs; +extern DRVFN gpDxFuncs[]; typedef BOOL (NTAPI* PGD_DDSETGAMMARAMP)(HANDLE, HDC, LPVOID); typedef BOOL (NTAPI* PGD_DDRELEASEDC)(HANDLE); Modified: trunk/reactos/subsystems/win32/win32k/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ld… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ldr/loader.c (original) +++ trunk/reactos/subsystems/win32/win32k/ldr/loader.c Sun Dec 23 22:13:05 2007 @@ -24,6 +24,16 @@ #define NDEBUG #include <debug.h> + + +typedef struct _DRIVERS +{ + LIST_ENTRY ListEntry; + HANDLE ImageHandle; + UNICODE_STRING DriverName; +}DRIVERS, *PDRIVERS; + +extern LIST_ENTRY GlobalDriverListHead; /* * Blatantly stolen from ldr/utils.c in ntdll. I can't link ntdll from @@ -189,14 +199,47 @@ STDCALL EngLoadImage (LPWSTR DriverName) { - SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo; - NTSTATUS Status; - - RtlInitUnicodeString(&GdiDriverInfo.DriverName, DriverName); - Status = ZwSetSystemInformation(SystemLoadGdiDriverInformation, &GdiDriverInfo, sizeof(SYSTEM_GDI_DRIVER_INFORMATION)); - if (!NT_SUCCESS(Status)) return NULL; - - return (HANDLE)GdiDriverInfo.ImageAddress; + HANDLE hImageHandle = NULL; + SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo; + NTSTATUS Status; + + RtlInitUnicodeString(&GdiDriverInfo.DriverName, DriverName); + if( !IsListEmpty(&GlobalDriverListHead) ) + { + PLIST_ENTRY CurrentEntry = GlobalDriverListHead.Flink; + PDRIVERS Current; + /* probably the driver was already loaded, let's try to find it out */ + while( CurrentEntry != &GlobalDriverListHead ) + { + Current = CONTAINING_RECORD(CurrentEntry, DRIVERS, ListEntry); + if( Current && (0 == RtlCompareUnicodeString(&GdiDriverInfo.DriverName, &Current->DriverName, FALSE)) ) { + hImageHandle = Current->ImageHandle; + break; + } + CurrentEntry = CurrentEntry->Flink; + }; + } + + if( !hImageHandle ) + { + /* the driver was not loaded before, so let's do that */ + Status = ZwSetSystemInformation(SystemLoadGdiDriverInformation, &GdiDriverInfo, sizeof(SYSTEM_GDI_DRIVER_INFORMATION)); + if (!NT_SUCCESS(Status)) { + DPRINT1("ZwSetSystemInformation faild with status 0x%lx\n", Status); + } + else { + hImageHandle = (HANDLE)GdiDriverInfo.ImageAddress; + PDRIVERS DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS)); + DriverInfo->DriverName.MaximumLength = GdiDriverInfo.DriverName.MaximumLength; + DriverInfo->DriverName.Length = GdiDriverInfo.DriverName.Length; + DriverInfo->DriverName.Buffer = ExAllocatePool(PagedPool, GdiDriverInfo.DriverName.MaximumLength); + RtlCopyUnicodeString(&DriverInfo->DriverName, &GdiDriverInfo.DriverName); + DriverInfo->ImageHandle = hImageHandle; + InsertHeadList(&GlobalDriverListHead, &DriverInfo->ListEntry); + } + } + + return hImageHandle; } @@ -226,7 +269,8 @@ { NTSTATUS Status; - DPRINT1("hModule=%x\n", hModule); + DPRINT1("hModule=%x\n", hModule); + Status = ZwSetSystemInformation(SystemUnloadGdiDriverInformation, &hModule, sizeof(HANDLE)); @@ -235,6 +279,30 @@ DPRINT1("%s: ZwSetSystemInformation failed with status %x.", __FUNCTION__, Status); } + else + { + /* remove from the list */ + if( !IsListEmpty(&GlobalDriverListHead) ) + { + PLIST_ENTRY CurrentEntry = GlobalDriverListHead.Flink; + PDRIVERS Current; + /* probably the driver was already loaded, let's try to find it out */ + while( CurrentEntry != &GlobalDriverListHead ) + { + Current = CONTAINING_RECORD(CurrentEntry, DRIVERS, ListEntry); + + if( Current ) { + if(Current->ImageHandle == hModule) { + ExFreePool(Current->DriverName.Buffer); + RemoveEntryList(&Current->ListEntry); + ExFreePool(Current); + break; + } + } + CurrentEntry = CurrentEntry->Flink; + }; + } + } } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c Sun Dec 23 22:13:05 2007 @@ -32,6 +32,8 @@ /* FIXME */ PGDI_HANDLE_TABLE GdiHandleTable = NULL; PSECTION_OBJECT GdiTableSection = NULL; + +LIST_ENTRY GlobalDriverListHead; HANDLE GlobalUserHeap = NULL; PSECTION_OBJECT GlobalUserHeapSection = NULL; @@ -402,6 +404,8 @@ return STATUS_UNSUCCESSFUL; } + /* Initialize a list of loaded drivers in Win32 subsystem */ + InitializeListHead(&GlobalDriverListHead); Status = InitUserImpl(); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sun Dec 23 22:13:05 2007 @@ -18,8 +18,8 @@ extern DRVFN gaEngFuncs; extern ULONG gcEngFuncs; -PDRVFN gpDxFuncs; -HANDLE ghDxGraphics; +DRVFN gpDxFuncs[DXG_INDEX_DxDdIoctl]; +HANDLE ghDxGraphics = NULL; ULONG gdwDirectDrawContext; @@ -126,7 +126,6 @@ STDCALL NtGdiDdCreateDirectDrawObject(HDC hdc) { - PGD_DDCREATEDIRECTDRAWOBJECT pfnDdCreateDirectDrawObject = NULL; NTSTATUS Status; PEPROCESS Proc = NULL; @@ -152,7 +151,6 @@ DPRINT1("Calling dxg.sys DdCreateDirectDrawObject\n"); return pfnDdCreateDirectDrawObject(hdc); - } /*++

1 0

[hpoussin] 31415: Add list of missing exported functions
by hpoussin＠svn.reactos.org 23 Dec '07

23 Dec '07

Author: hpoussin Date: Sun Dec 23 21:29:09 2007 New Revision: 31415 URL: http://svn.reactos.org/svn/reactos?rev=31415&view=rev Log: Add list of missing exported functions Modified: trunk/reactos/dll/win32/samlib/samlib.def Modified: trunk/reactos/dll/win32/samlib/samlib.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.de… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.def (original) +++ trunk/reactos/dll/win32/samlib/samlib.def Sun Dec 23 21:29:09 2007 @@ -1,5 +1,68 @@ LIBRARY SAMLIB.DLL EXPORTS +;SamAddMemberToAlias +;SamAddMemberToGroup +;SamAddMultipleMembersToAlias +;SamChangePasswordUser +;SamChangePasswordUser2 +;SamChangePasswordUser3 +;SamCloseHandle +;SamConnect +;SamConnectWithCreds +;SamCreateAliasInDomain +;SamCreateGroupInDomain +;SamCreateUser2InDomain +;SamCreateUserInDomain +;SamDeleteAlias +;SamDeleteGroup +;SamDeleteUser +;SamEnumerateAliasesInDomain +;SamEnumerateDomainsInSamServer +;SamEnumerateGroupsInDomain +;SamEnumerateUsersInDomain +;SamFreeMemory +;SamGetAliasMembership +;SamGetCompatibilityMode +;SamGetDisplayEnumerationIndex +;SamGetGroupsForUser +;SamGetMembersInAlias +;SamGetMembersInGroup +;SamLookupDomainInSamServer +;SamLookupIdsInDomain +;SamLookupNamesInDomain +;SamOpenAlias +;SamOpenDomain +;SamOpenGroup +;SamOpenUser +;SamQueryDisplayInformation +;SamQueryInformationAlias +;SamQueryInformationDomain +;SamQueryInformationGroup +;SamQueryInformationUser +;SamQuerySecurityObject +;SamRemoveMemberFromAlias +;SamRemoveMemberFromForeignDomain +;SamRemoveMemberFromGroup +;SamRemoveMultipleMembersFromAlias +;SamSetInformationDomain +;SamSetInformationGroup +;SamSetInformationUser +;SamSetMemberAttributesOfGroup +;SamSetSecurityObject +;SamShutdownSamServer +;SamTestPrivateFunctionsDomain +;SamTestPrivateFunctionsUser +;SamiChangeKeys +;SamiChangePasswordUser +;SamiChangePasswordUser2 +;SamiEncryptPasswords +;SamiGetBookKeyInformation +;SamiLmChangePasswordUser +;SamiOemChangePasswordUser2 +;SamiSetBootKeyInformation +;SamiSetDSRMPassword +;SamiSetDSRMPasswordOWF + SamInitializeSAM@0 SamGetDomainSid@4 SamSetDomainSid@4

1 0

[hpoussin] 31414: Fix debug message
by hpoussin＠svn.reactos.org 23 Dec '07

23 Dec '07

Author: hpoussin Date: Sun Dec 23 21:23:03 2007 New Revision: 31414 URL: http://svn.reactos.org/svn/reactos?rev=31414&view=rev Log: Fix debug message Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c Sun Dec 23 21:23:03 2007 @@ -241,7 +241,7 @@ } } #else - DPRINT1("menu search not implemented"); + DPRINT1("Menu search not implemented\n"); mesg = WM_COMMAND; #endif

1 0

[mpiulachs] 31413: - Remove hard-coded reference to cmdstart.bat and load it from registry (Software\Microsoft\Command Processor\Autorun) - Show a simple version information when called without command line parameters like the ms's cmd.exe does.
by mpiulachs＠svn.reactos.org 23 Dec '07

23 Dec '07

Author: mpiulachs Date: Sun Dec 23 16:27:00 2007 New Revision: 31413 URL: http://svn.reactos.org/svn/reactos?rev=31413&view=rev Log: - Remove hard-coded reference to cmdstart.bat and load it from registry (Software\Microsoft\Command Processor\Autorun) - Show a simple version information when called without command line parameters like the ms's cmd.exe does. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Sun Dec 23 16:27:00 2007 @@ -1608,6 +1608,33 @@ } #endif +static VOID +ExecuteAutoRunFile (VOID) +{ + TCHAR autorun[MAX_PATH]; + DWORD len = MAX_PATH; + HKEY hkey; + + if( RegOpenKeyEx(HKEY_LOCAL_MACHINE, + _T("SOFTWARE\\Microsoft\\Command Processor"), + 0, + KEY_READ, + &hkey ) == ERROR_SUCCESS) + { + if(RegQueryValueEx(hkey, + _T("AutoRun"), + 0, + 0, + (LPBYTE)autorun, + &len) == ERROR_SUCCESS) + { + ParseCommandLine (autorun); + } + } + + RegCloseKey(hkey); +} + /* * set up global initializations and process parameters * @@ -1760,16 +1787,17 @@ #endif } } - - /* run cmdstart.bat */ - if (IsExistingFile (_T("cmdstart.bat"))) - { - ParseCommandLine (_T("cmdstart.bat")); - } - else if (IsExistingFile (_T("\\cmdstart.bat"))) - { - ParseCommandLine (_T("\\cmdstart.bat")); - } + else + { + /* Display a simple version string */ + ConOutPrintf(_T("ReactOS Operating System [Version %s-%s]\n"), + _T(KERNEL_RELEASE_STR), + _T(KERNEL_VERSION_BUILD_STR)); + + ConOutPuts (_T("(C) Copyright 1998-2008 ReactOS Team.\n")); + } + + ExecuteAutoRunFile (); #ifdef FEATURE_DIR_STACK /* initialize directory stack */ Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild Sun Dec 23 16:27:00 2007 @@ -1,84 +1,84 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="cmd_base" type="objectlibrary"> - <include base="ReactOS">include/reactos/wine</include> - <include base="cmd_base">.</include> - <define name="ANONYMOUSUNIONS" /> - <define name="_WIN32_WINNT">0x0501</define> - <define name="_DEBUG_MEM" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <pch>precomp.h</pch> - <compilationunit name="unit.c"> - <file>alias.c</file> - <file>attrib.c</file> - <file>batch.c</file> - <file>beep.c</file> - <file>call.c</file> - <file>chcp.c</file> - <file>choice.c</file> - <file>cls.c</file> - <file>cmd.c</file> - <file>cmddbg.c</file> - <file>cmdinput.c</file> - <file>cmdtable.c</file> - <file>color.c</file> - <file>console.c</file> - <file>copy.c</file> - <file>date.c</file> - <file>del.c</file> - <file>delay.c</file> - <file>dir.c</file> - <file>dirstack.c</file> - <file>echo.c</file> - <file>error.c</file> - <file>filecomp.c</file> - <file>for.c</file> - <file>free.c</file> - <file>goto.c</file> - <file>history.c</file> - <file>if.c</file> - <file>internal.c</file> - <file>label.c</file> - <file>locale.c</file> - <file>memory.c</file> - <file>misc.c</file> - <file>move.c</file> - <file>msgbox.c</file> - <file>path.c</file> - <file>pause.c</file> - <file>prompt.c</file> - <file>redir.c</file> - <file>ren.c</file> - <file>replace.c</file> - <file>screen.c</file> - <file>set.c</file> - <file>shift.c</file> - <file>start.c</file> - <file>strtoclr.c</file> - <file>time.c</file> - <file>timer.c</file> - <file>title.c</file> - <file>type.c</file> - <file>ver.c</file> - <file>verify.c</file> - <file>vol.c</file> - <file>where.c</file> - <file>window.c</file> - </compilationunit> -</module> -<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" unicode="yes"> - <include base="ReactOS">include/reactos/wine</include> - <include base="cmd">.</include> - <define name="ANONYMOUSUNIONS" /> - <define name="_WIN32_WINNT">0x0501</define> - <library>cmd_base</library> - <library>kernel32</library> - <library>advapi32</library> - <library>shell32</library> - <library>user32</library> - <file>cmd.rc</file> - <file>main.c</file> -</module> + <module name="cmd_base" type="objectlibrary"> + <include base="ReactOS">include/reactos/wine</include> + <include base="cmd_base">.</include> + <define name="ANONYMOUSUNIONS" /> + <define name="_WIN32_WINNT">0x0501</define> + <define name="_DEBUG_MEM" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <pch>precomp.h</pch> + <compilationunit name="unit.c"> + <file>alias.c</file> + <file>attrib.c</file> + <file>batch.c</file> + <file>beep.c</file> + <file>call.c</file> + <file>chcp.c</file> + <file>choice.c</file> + <file>cls.c</file> + <file>cmd.c</file> + <file>cmddbg.c</file> + <file>cmdinput.c</file> + <file>cmdtable.c</file> + <file>color.c</file> + <file>console.c</file> + <file>copy.c</file> + <file>date.c</file> + <file>del.c</file> + <file>delay.c</file> + <file>dir.c</file> + <file>dirstack.c</file> + <file>echo.c</file> + <file>error.c</file> + <file>filecomp.c</file> + <file>for.c</file> + <file>free.c</file> + <file>goto.c</file> + <file>history.c</file> + <file>if.c</file> + <file>internal.c</file> + <file>label.c</file> + <file>locale.c</file> + <file>memory.c</file> + <file>misc.c</file> + <file>move.c</file> + <file>msgbox.c</file> + <file>path.c</file> + <file>pause.c</file> + <file>prompt.c</file> + <file>redir.c</file> + <file>ren.c</file> + <file>replace.c</file> + <file>screen.c</file> + <file>set.c</file> + <file>shift.c</file> + <file>start.c</file> + <file>strtoclr.c</file> + <file>time.c</file> + <file>timer.c</file> + <file>title.c</file> + <file>type.c</file> + <file>ver.c</file> + <file>verify.c</file> + <file>vol.c</file> + <file>where.c</file> + <file>window.c</file> + </compilationunit> + </module> + <module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" unicode="yes"> + <include base="ReactOS">include/reactos/wine</include> + <include base="cmd">.</include> + <define name="ANONYMOUSUNIONS" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>cmd_base</library> + <library>kernel32</library> + <library>advapi32</library> + <library>shell32</library> + <library>user32</library> + <file>cmd.rc</file> + <file>main.c</file> + </module> </group> Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Sun Dec 23 16:27:00 2007 @@ -7,6 +7,9 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce",,0x00000012 + +; CMD Settings +HKLM,"SOFTWARE\Microsoft\Command Processor","AutoRun",0x00020000,"" ; Uninstall Application list HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",,0x00000010

1 0

[mpiulachs] 31412: Spanish localizations by Remialdo <remialdo at gmail dot com> Updated:intl, mmsys, user32 New:mstsc, appwiz See issue #2916 for more details.
by mpiulachs＠svn.reactos.org 23 Dec '07

23 Dec '07

Author: mpiulachs Date: Sun Dec 23 12:20:37 2007 New Revision: 31412 URL: http://svn.reactos.org/svn/reactos?rev=31412&view=rev Log: Spanish localizations by Remialdo <remialdo at gmail dot com> Updated:intl,mmsys,user32 New:mstsc,appwiz See issue #2916 for more details. Added: trunk/reactos/base/applications/mstsc/lang/es-ES.rc (with props) trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/cpl/intl/lang/es-ES.rc trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc trunk/reactos/dll/win32/user32/Es.rc Added: trunk/reactos/base/applications/mstsc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/mstsc/lang/es-ES.rc Sun Dec 23 12:20:37 2007 @@ -1,0 +1,68 @@ +/* + *Spanish Language resource file + * Traducido por: Javier Remacha 2007-12-22 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_GENERAL DIALOGEX 0, 0, 242, 175 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Configuración del inicio de sesión",IDC_STATIC,7,7,228,89 + GROUPBOX "Configuración de la conexión",IDC_STATIC,7,103,228,65 + ICON "", IDC_LOGONICON, 15,19,20,20 + LTEXT "Introduzca la dirección del servidor",IDC_STATIC,47,24,81,8 + LTEXT "Servidor:",IDC_STATIC,47,41,25,8 + LTEXT "Nombre de usuario:",IDC_STATIC,47,58,38,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Guardar",IDC_SAVE,67,139,50,14 + PUSHBUTTON "Guardar Como...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "Abrir...",IDC_OPEN,177,139,50,14 + ICON "", IDC_CONNICON, 16,114,20,20 + LTEXT "Guardar esta configuración o abrir una existente",IDC_STATIC,50,115,172,20 +END + +IDD_DISPLAY DIALOGEX 0, 0, 242, 175 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Tamaño del escritorio remoto",IDC_STATIC,7,7,228,68 + GROUPBOX "Colores",IDC_STATIC,7,83,228,85 + ICON "", IDC_REMICON, 15,19,20,20 + ICON "", IDC_COLORSICON, 15,98,20,20 + LTEXT "Elija el tamaño de su escritorio remoto. Arrastre el control deslizante hacia el extremo derecho para el modo de pantalla completa",IDC_STATIC,53,22,175,21 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 + LTEXT "Nota: la configuración en el equipo remoto puede reemplazar esta configuración.",IDC_STATIC,56,143,165,18 + LTEXT "Menos",IDC_STATIC,35,42,15,8 + LTEXT "Más",IDC_STATIC,189,42,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER +END + +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Conexión a Escritorio Remoto" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Conectar",IDOK,147,245,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,203,245,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 +END + + +STRINGTABLE +BEGIN + IDS_TAB_GENERAL "General" + IDS_TAB_DISPLAY "Pantalla" + IDS_256COLORS "256 Colores" + IDS_HIGHCOLOR15 "Color de alta densidad (15 bit)" + IDS_HIGHCOLOR16 "Color de alta densidad (16 bit)" + IDS_HIGHCOLOR24 "Color Verdadero (24 bit)" + IDS_PIXEL "%lux%lu Pixels" + IDS_FULLSCREEN "Pantalla Completa" + IDS_BROWSESERVER "<Buscar más...>" + IDS_HEADERTEXT1 "Escritorio Remoto" + IDS_HEADERTEXT2 "Conexión" +END Propchange: trunk/reactos/base/applications/mstsc/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Sun Dec 23 12:20:37 2007 @@ -18,6 +18,7 @@ #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" #include "lang/ru-RU.rc" Added: trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc (added) +++ trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc Sun Dec 23 12:20:37 2007 @@ -1,0 +1,174 @@ +/* + *Spanish Language resource file + * Traducido por: Javier Remacha 2007-12-22 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Modificar/&Quitar",ID_APP_MODIFYREMOVE + MENUITEM "&Información", ID_APP_INFORMATION + END +END + +IDR_POPUP_UPD MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Quitar", ID_UPD_REMOVE + MENUITEM "&Información", ID_UPD_INFORMATION + END +END + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Cambiar o quitar programas" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,6,16,16 + LTEXT "El siguiente Software puede ser quitado automaticamente. Para quitar un programa o modificar sus componentes instalados, seleccionelo de la lista y presione Modificar/Quitar.",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "Examinar:",-1,PROPSHEETPADDING,33,30,8 + EDITTEXT IDC_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP + LTEXT "Ver:",-1,250,33,30,8 + COMBOBOX IDC_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + CONTROL "", IDC_SOFTWARELIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE + PUSHBUTTON "Modificar/&Quitar", IDC_ADDREMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED + PUSHBUTTON "&Información", IDC_INFO_BUTTON, PROPSHEETPADDING+85, 210, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEUPDATES DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Quitar Actualizaciones" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_UPDATES,-1,PROPSHEETPADDING,6,16,16 + LTEXT "Las siguientes actualizaciones pueden er quitadas automaticamente. Para quitar una actualización, seleccionala de la lista y presiona Quitar.",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "Examinar:",-1,PROPSHEETPADDING,33,30,8 + EDITTEXT IDC_UPD_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP + LTEXT "Ver:",-1,250,33,30,8 + COMBOBOX IDC_UPD_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + CONTROL "", IDC_UPDATESLIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE + PUSHBUTTON "&Quitar", IDC_UPD_REMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED + PUSHBUTTON "&Información", IDC_UPD_INFO_BUTTON, PROPSHEETPADDING+85, 210, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEADD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Añadir nuevos programas" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,10,32,32 + LTEXT "Para instalar un programa nuevo, presione ""Instalar"".",-1,36,11,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Instalar...", IDC_INSTALL, PROPSHEETWIDTH-(90), 46, 80, 14 + LTEXT "", -1, PROPSHEETPADDING, 70, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + ICON IDI_DOWNLOADICO,-1,PROPSHEETPADDING,80,32,32 + LTEXT "Para descargar e instalar nuevas aplicaciones, presione ""Descargar !"".",-1,36,83,PROPSHEETWIDTH-48,17 + PUSHBUTTON "&Descargar !", IDC_ADD_DOWNLOAD_BUTTON, PROPSHEETWIDTH-(90), 125, 80, 14, WS_DISABLED + LTEXT "", -1, PROPSHEETPADDING, 150, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + ICON IDI_APPINETICO,-1,PROPSHEETPADDING,160,32,32 + LTEXT "Presione el botón ""Buscar en Internet"" para buscar nuevas aplicaciones a través de la conexión a Internet.",-1,36,161,PROPSHEETWIDTH-48,17 + PUSHBUTTON "&Propiedades...", IDC_ADD_PROP_BUTTON, PROPSHEETWIDTH-(175), 205, 80, 14, WS_DISABLED + PUSHBUTTON "&Buscar en Internet", IDC_ADD_FIND_BUTTON, PROPSHEETWIDTH-(90), 205, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalador de ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_REACTOS,-1,PROPSHEETPADDING,6,16,16 + LTEXT "",-1,36,7,PROPSHEETWIDTH-48,22 +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crear Enlace" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crear Enlace" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crear acceso directo" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Este asistente le ayudará a crear accesos directos a programas\nlocales o en red, archivos, carpetas, computadoras, o direcciones de\nInternet.", -1, 120, 15, 200, 30 + LTEXT "Escriba la ubicación del elemento:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Examinar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Presione Siguiente para continuar.", -1, 120, 97, 162, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Seleccione un título para el Programa" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Escriba un nombre para este acceso directo:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Haga Click en Finalizar para crear el acceso directo.", -1, 118, 97, 178, 17 +END + +IDD_INFORMATION DIALOG 5, 100, 269, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Información" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDS_INFO_DISPNAME, PROPSHEETPADDING, 6, 258, 15, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Usuario Registrado:", -1, PROPSHEETPADDING, 27, 97, 8 + EDITTEXT IDS_INFO_REGOWNER, PROPSHEETPADDING+97, 25, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Producto ID:", -1, PROPSHEETPADDING, 44, 97, 8 + EDITTEXT IDS_INFO_PRODUCTID, PROPSHEETPADDING+97, 42, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Autor:", -1, PROPSHEETPADDING, 61, 97, 8 + EDITTEXT IDS_INFO_PUBLISHER, PROPSHEETPADDING+97, 59, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Versión:", -1, PROPSHEETPADDING, 78, 97, 8 + EDITTEXT IDS_INFO_VERSION, PROPSHEETPADDING+97, 76, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Contacto:", -1, PROPSHEETPADDING, 95, 97, 8 + EDITTEXT IDS_INFO_CONTACT, PROPSHEETPADDING+97, 93, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Información de Ayuda:", -1, PROPSHEETPADDING, 112, 97, 8 + EDITTEXT IDS_INFO_SUPPORTINFO, PROPSHEETPADDING+97, 110, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Teléfono de Ayuda:", -1, PROPSHEETPADDING, 129, 97, 8 + EDITTEXT IDS_INFO_SUPPORTPHONE, PROPSHEETPADDING+97, 127, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Actualizaciones de Producto:", -1, PROPSHEETPADDING, 146, 97, 8 + EDITTEXT IDS_INFO_PRODUCT_UPDATES, PROPSHEETPADDING+97, 144, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Leeme:", -1, PROPSHEETPADDING, 163, 97, 8 + EDITTEXT IDS_INFO_README, PROPSHEETPADDING+97, 161, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Comentarios:", -1, PROPSHEETPADDING, 180, 97, 8 + EDITTEXT IDS_INFO_COMMENTS, PROPSHEETPADDING+97, 178, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Cerrar", IDCANCEL, 212, 198, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Añadir/Quitar Programas" + IDS_CPLSYSTEMDESCRIPTION "Añade programas y crea accesos directos." + IDS_ERROR "Error" + IDS_UNABLEREAD_UNINSTSTR "Incapaz de leer el archivo de desinstalación. La estrada es incorrecta o fue creada por un instalador MSI." + IDS_UNABLEOPEN_UNINSTKEY "Incapaz de abrir la llave de desinstalación" + IDS_APPLIST "Programas instalados" + IDS_UPDATESLIST "Actualizaciones instaladas" + IDS_LARGEICONS "Iconos Grandes" + IDS_LIST "Lista" + IDS_DETAILS "Detalles" + IDS_CREATE_SHORTCUT "Crear acceso directo" + IDS_ERROR_NOT_FOUND "El archivo %s no fue encontrado." + IDS_UNABLEREAD_INFORMATION "Unable to open Information Keys" + IDS_NO_INFORMATION "Sin información" + IDS_NONE_APP "No hay aplicaciones instaladas." + IDS_NONE_UPD "No hay actualizaciones instaladas." +END Propchange: trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/rsrc.rc (original) +++ trunk/reactos/dll/cpl/appwiz/rsrc.rc Sun Dec 23 12:20:37 2007 @@ -4,6 +4,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/intl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/es-ES.rc Sun Dec 23 12:20:37 2007 @@ -2,6 +2,7 @@ /* *Spanish Language resource file *ReactOs (c) 2005 Samuel Serapión Vega + * actualizado Javier Remacha 2007-12-22 */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -11,16 +12,16 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74 + GROUPBOX "Idioma Primario", -1, 8, 11, 228, 74 ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Seleccione el lenguaje primario y la región que desea usar:", -1, 38, 25, 193, 22 + LTEXT "Seleccione el idioma primario y la región que desea usar:", -1, 38, 25, 193, 22 COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Numeros" +CAPTION "Números" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Property Page 2",-1,73,74,90,8 @@ -32,48 +33,48 @@ CAPTION "Moneda" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE - LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + GROUPBOX "Muestra", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positivo:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Negativo:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "&Símbolo de moneda:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "&Formato de moneda positivo:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "F&ormato de moneda negativo:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Símbolo &decimal:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "&Número de dígitos decimales:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Sí&mbolo de separación de miles:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Número de dígitos en gr&upo:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Tiempo" +CAPTION "Hora" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Ejemplo de Apariencia", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE - LTEXT "Ejemplo de tiempo:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + GROUPBOX "Muestra", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Ejemplo de hora:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "&Formato de Tiempo:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "&Formato de hora:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "&Separador de Tiempo:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP + LTEXT "&Separador de hora:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Símbolo A&M:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Símbolo &PM:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE - LTEXT "Formato de Notación del Tiempo\n\n\ + LTEXT "Notación de formato de hora\n\n\ h = hora m = minuto s = segundo t = am ó pm\n\n\ - h = 12 houras H = 24 houras\n\ + h = 12 horas H = 24 horas\n\ hh, mm, ss = cero inicial h, m, s = sin cero inicial", -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END @@ -81,7 +82,7 @@ IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Dia" +CAPTION "Día" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Property Page 5",-1,73,74,90,8 @@ -100,5 +101,5 @@ STRINGTABLE BEGIN IDS_CPLNAME "Opciones Regionales" - IDS_CPLDESCRIPTION "Seleccione lenguaje y formato numerio, moneda, hora y fecha." + IDS_CPLDESCRIPTION "Seleccione idioma y formato número, moneda, hora y fecha." END Modified: trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc Sun Dec 23 12:20:37 2007 @@ -2,43 +2,43 @@ IDD_VOLUME DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Volume" +CAPTION "Volumen" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 - GROUPBOX "Device volume", -1, 7,30,230,100 + GROUPBOX "Volumen del dispositivo", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 - LTEXT "Low",-1,62,66,30,17 - LTEXT "High",-1,195,66,30,17 - CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 - CHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 - PUSHBUTTON "Ad&vanced...", -1, 150,105,75,15 - GROUPBOX "Speaker settings", -1, 7,140,230,80 + LTEXT "Bajo",-1,62,66,30,17 + LTEXT "Alto",-1,195,66,30,17 + CHECKBOX "&Silencio", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 + CHECKBOX "Colocar un icono de volumen en la &barra de tareas", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 + PUSHBUTTON "Propiedades avan&zadas...", -1, 150,105,75,15 + GROUPBOX "Configuración del altavoz", -1, 7,140,230,80 CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 - LTEXT "Use the settings below to change individual speaker volume and other settings.",-1,70,155,150,36 - PUSHBUTTON "&Speaker Volume...", -1, 70,195,75,15 - PUSHBUTTON "A&dvanced...", -1, 150,195,75,15 + LTEXT "Utilice esta configuración para cambiar el volumen del altavoz y otras configuraciones.",-1,70,155,150,36 + PUSHBUTTON "Vol&umen de altavoz...", -1, 70,195,75,15 + PUSHBUTTON "Propiedades &avanzadas...", -1, 150,195,75,15 END IDD_SOUNDS DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Sounds" +CAPTION "Sonidos" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 - LTEXT "Sound s&cheme:",-1,8,42,150,17 + LTEXT "Una combinación de sonidos es un conjunto de sonidos asociados a sucesos en ReactOS y en los programas. Puede seleccionar una combinación existente o guardar una que haya modificado.",-1,8,7,230,40 + LTEXT "&Combinación de sonidos:",-1,8,42,150,17 COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 - PUSHBUTTON "&Delete", -1, 188,70,50,15 - LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 - LTEXT "&Pogram events:",-1,8,118,150,17 + PUSHBUTTON "G&uardar como...", -1, 134,70,50,15 + PUSHBUTTON "&Eliminar", -1, 188,70,50,15 + LTEXT "Para cambiar los sonidos, haga clic en un suceso de la siguiente lista y elija un sonido que desea utilizar. Puede guardar los cambios como una combinación nueva de sonidos.",-1,8,90,230,40 + LTEXT "&Sucesos de programa:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + LTEXT "S&onidos:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED - PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED + PUSHBUTTON "E&xaminar...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -46,46 +46,46 @@ CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Sound playback", -1, 7,7,230,60 + GROUPBOX "Reproducción de sonido", -1, 7,7,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,20,32,32 - LTEXT "&Default device:",-1,50,20,80,17 + LTEXT "Dispositivo p&redeterminado:",-1,50,20,80,17 COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "&Volume...", -1, 85,47,70,15 - PUSHBUTTON "Adva&nced...", -1, 160,47,70,15 - GROUPBOX "Sound recording", -1, 7,75,230,60 + PUSHBUTTON "&Volumen...", -1, 85,47,70,15 + PUSHBUTTON "Opciones avan&zadas...", -1, 160,47,70,15 + GROUPBOX "Grabación de sonido", -1, 7,75,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,88,32,32 - LTEXT "D&efault device:",-1,50,88,80,17 + LTEXT "Dispositivo pre&determinado:",-1,50,88,80,17 COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "V&olume...", -1, 85,115,70,15 - PUSHBUTTON "Advan&ced...", -1, 160,115,70,15 - GROUPBOX "MIDI music playback", -1, 7,145,230,60 + PUSHBUTTON "V&olumen...", -1, 85,115,70,15 + PUSHBUTTON "Opcione&s avanzadas...", -1, 160,115,70,15 + GROUPBOX "Reproducción de música MIDI", -1, 7,145,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,158,32,32 - LTEXT "De&fault device:",-1,50,158,80,17 + LTEXT "Dispositivo prede&terminado:",-1,50,158,80,17 COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "Volu&me...", -1, 85,185,70,15 - PUSHBUTTON "A&bout...", -1, 160,185,70,15 - CHECKBOX "&Use only default devices", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + PUSHBUTTON "Volu&men...", -1, 85,185,70,15 + PUSHBUTTON "&Acerca de...", -1, 160,185,70,15 + CHECKBOX "&Usar sólo dispositivos predeterminados", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 END IDD_VOICE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Voice" +CAPTION "Voz" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "These settings control volume and advanced options for the voice playback or recording device you selected.",-1,8,7,230,40 - GROUPBOX "Voice playback", -1, 7,37,230,60 + LTEXT "Esta configuración controla el volumen y las opciones avanzadas del dispositivo de reproducción de voz o del dispositivo de grabación de voz seleccionados.",-1,8,7,230,40 + GROUPBOX "Reproducción de voz", -1, 7,37,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,50,32,32 - LTEXT "&Default device:",-1,50,50,80,17 + LTEXT "&Dispositivo predeterminado:",-1,50,50,80,17 COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "&Volume...", -1, 85,77,70,15 - PUSHBUTTON "Adva&nced...", -1, 160,77,70,15 - GROUPBOX "Voice recording", -1, 7,105,230,60 + PUSHBUTTON "&Volumen...", -1, 85,77,70,15 + PUSHBUTTON "Opciones &avanzadas...", -1, 160,77,70,15 + GROUPBOX "Grabación de voz", -1, 7,105,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,118,32,32 - LTEXT "D&efault device:",-1,50,118,80,17 + LTEXT "Dispositivo predet&erminado:",-1,50,118,80,17 COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST - PUSHBUTTON "V&olume...", -1, 85,145,70,15 - PUSHBUTTON "Advan&ced...", -1, 160,145,70,15 - PUSHBUTTON "&Test hardware...", -1, 160,175,70,15 + PUSHBUTTON "Vol&umen...", -1, 85,145,70,15 + PUSHBUTTON "&Opciones avanzadas...", -1, 160,145,70,15 + PUSHBUTTON "&Prueba de hardware...", -1, 160,175,70,15 END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 @@ -97,9 +97,10 @@ STRINGTABLE BEGIN - IDS_CPLNAME "Dispositivos de Audio y Sonido" - IDS_CPLDESCRIPTION "Cambia el esquema de sonidos de su computadora, o configura las propiedades de sus bocinas y dispositivos de grabación." + IDS_CPLNAME "Dispositivos de sonido y audio" + IDS_CPLDESCRIPTION "Cambie la combinación de sonidos para el equipo, o configure los parámetros para sus altavoces y dispositivos de grabación." IDS_NO_SOUND "(None)" END + Modified: trunk/reactos/dll/win32/user32/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/Es.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/user32/Es.rc (original) +++ trunk/reactos/dll/win32/user32/Es.rc Sun Dec 23 12:20:37 2007 @@ -25,7 +25,7 @@ { POPUP "DUMMY" BEGIN - MENUITEM "&Desacer", EM_UNDO + MENUITEM "&Deshacer", EM_UNDO MENUITEM SEPARATOR MENUITEM "Cor&tar", WM_CUT MENUITEM "&Copiar", WM_COPY @@ -59,12 +59,12 @@ IDS_OK, "Acceptar" IDS_CANCEL, "Cancelar" IDS_ABORT, "&Abortar" - IDS_RETRY, "&Retratar" + IDS_RETRY, "&Reintentar" IDS_IGNORE, "&Ignorar" IDS_YES, "&Si" IDS_NO, "&No" IDS_HELP, "Ayuda" - IDS_TRYAGAIN, "&Tratar Otravez" + IDS_TRYAGAIN, "In&tentar Otra vez" IDS_CONTINUE, "&Continuar" } @@ -73,3 +73,4 @@ IDS_MDI_MOREWINDOWS, "&Más Ventanas..." } +

1 0

[jimtabor] 31411: Fix STRGDI structure and update it. Move it into text.h.
by jimtabor＠svn.reactos.org 23 Dec '07

23 Dec '07

Author: jimtabor Date: Sun Dec 23 09:38:08 2007 New Revision: 31411 URL: http://svn.reactos.org/svn/reactos?rev=31411&view=rev Log: Fix STRGDI structure and update it. Move it into text.h. Modified: trunk/reactos/subsystems/win32/win32k/eng/objects.h trunk/reactos/subsystems/win32/win32k/include/text.h Modified: trunk/reactos/subsystems/win32/win32k/eng/objects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/objects.h (original) +++ trunk/reactos/subsystems/win32/win32k/eng/objects.h Sun Dec 23 09:38:08 2007 @@ -21,7 +21,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Internal Objects - * FILE: subsys/win32k/eng/objects.h + * FILE: subsystem/win32/win32k/eng/objects.h * PROGRAMER: Jason Filby * REVISION HISTORY: * 21/8/1999: Created @@ -78,10 +78,6 @@ typedef struct _PATHGDI { PATHOBJ PathObj; } PATHGDI; - -typedef struct _STRGDI { - STROBJ StrObj; -} STRGDI; typedef BOOL (STDCALL *PFN_BitBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *, XLATEOBJ *, RECTL *, POINTL *, POINTL *, Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h Sun Dec 23 09:38:08 2007 @@ -2,15 +2,61 @@ #define _WIN32K_TEXT_H #define TAG_FINF TAG('F', 'I', 'N', 'F') +// +// EXSTROBJ flags. +// +#define TO_MEM_ALLOCATED 0x0001 +#define TO_ALL_PTRS_VALID 0x0002 +#define TO_VALID 0x0004 +#define TO_ESC_NOT_ORIENT 0x0008 +#define TO_PWSZ_ALLOCATED 0x0010 +#define TSIM_UNDERLINE1 0x0020 +#define TSIM_UNDERLINE2 0x0040 +#define TSIM_STRIKEOUT 0x0080 +#define TO_HIGHRESTEXT 0x0100 +#define TO_BITMAPS 0x0200 +#define TO_PARTITION_INIT 0x0400 +#define TO_ALLOC_FACENAME 0x0800 +#define TO_SYS_PARTITION 0x1000 +// +// Extended STROBJ +// +typedef struct _STRGDI +{ + STROBJ StrObj; // Text string object header. + FLONG flTO; + INT cgposCopied; + INT cgposPositionsEnumerated; + PVOID prfo; // PRFONT -> PFONTGDI + PGLYPHPOS pgpos; + POINTFIX ptfxRef; + POINTFIX ptfxUpdate; + POINTFIX ptfxEscapement; + RECTFX rcfx; + FIX fxExtent; + FIX fxExtra; + FIX fxBreakExtra; + DWORD dwCodePage; + INT cExtraRects; + RECTL arclExtra[3]; + RECTL rclBackGroundSave; + PWCHAR pwcPartition; + PLONG plPartition; + PLONG plNext; + PGLYPHPOS pgpNext; + LONG lCurrentFont; + POINTL ptlBaseLineAdjust; + INT cTTSysGlyphs; + INT cSysGlyphs; + INT cDefGlyphs; + INT cNumFaceNameGlyphs; + PVOID pacFaceNameGlyphs; + ULONG acFaceNameGlyphs[8]; +} STRGDI, *PSTRGDI; /* GDI logical font object */ typedef struct { -// HGDIOBJ hHmgr; -// PVOID pvEntry; -// ULONG lucExcLock; -// ULONG Tid; - ENUMLOGFONTEXDVW logfont; //LOGFONTW logfont; FONTOBJ *Font; BOOLEAN Initialized; /* Don't reinitialize for each DC */

1 0

[mpiulachs] 31410: Move ntstatus.h/rc generation from Makefile to ntdll.rbuild
by mpiulachs＠svn.reactos.org 23 Dec '07

23 Dec '07

Author: mpiulachs Date: Sun Dec 23 03:55:02 2007 New Revision: 31410 URL: http://svn.reactos.org/svn/reactos?rev=31410&view=rev Log: Move ntstatus.h/rc generation from Makefile to ntdll.rbuild Modified: trunk/reactos/Makefile trunk/reactos/dll/ntdll/ntdll.rbuild Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=31410&r1=3140… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Sun Dec 23 03:55:02 2007 @@ -372,11 +372,7 @@ ${mkdir} $@ endif -NTDLL_MC = dll$(SEP)ntdll$(SEP)def$(SEP)ntstatus.mc BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h -NTSTATUS_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)ntstatus.h -NTSTATUS_RC = $(INTERMEDIATE_)dll$(SEP)ntdll$(SEP)def$(SEP)ntstatus.rc - include lib/lib.mak include tools/tools.mak @@ -387,8 +383,6 @@ $(BIN2C_TARGET) \ $(BIN2RES_TARGET) \ $(BUILDNO_H) \ - $(NTSTATUS_H) \ - $(NTSTATUS_RC) \ $(GENDIB_DIB_FILES) \ $(NCI_SERVICE_FILES) ifeq ($(ARCH),powerpc) @@ -460,11 +454,6 @@ $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msvc -$(NTSTATUS_H) $(NTSTATUS_RC): $(WMC_TARGET) $(NTDLL_MC) - ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) - ${mkdir} $(INTERMEDIATE_)dll$(SEP)ntdll$(SEP)def 2>$(NUL) - $(ECHO_WMC) - $(Q)$(WMC_TARGET) -i -U -H $(NTSTATUS_H) -o $(NTSTATUS_RC) $(NTDLL_MC) .PHONY: msvc6 msvc6: $(RBUILD_TARGET) $(ECHO_RBUILD) Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild Sun Dec 23 03:55:02 2007 @@ -53,4 +53,8 @@ <directory name="." root="intermediate"> <file>napi.S</file> </directory> + + <directory name="def"> + <file>ntstatus.mc</file> + </directory> </module>

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007