Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 31422: - Removed magic value use - Deactivated temporarily pidl work because of unwanted effects - Fixed the a bug : user can now enter the path in browse dialog, and it will be used (if correct)
by pschweitzer＠svn.reactos.org 24 Dec '07

24 Dec '07

Author: pschweitzer Date: Mon Dec 24 21:31:47 2007 New Revision: 31422 URL: http://svn.reactos.org/svn/reactos?rev=31422&view=rev Log: - Removed magic value use - Deactivated temporarily pidl work because of unwanted effects - Fixed the a bug : user can now enter the path in browse dialog, and it will be used (if correct) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Mon Dec 24 21:31:47 2007 @@ -36,7 +36,7 @@ GetDlgItemTextW(hwnd, ID_OUTDIR, outdir, MAX_PATH); if (writelog && (logdir[0] != 0)) - if (GetFileAttributes(logdir) == 0xFFFFFFFF) + if (0 > (LONG)GetFileAttributes(logdir)) if (CreateDirectoryW(logdir, NULL) == 0) { LoadString(hInstance, MSG_DIREFAILED, msgerror, 256); @@ -252,6 +252,12 @@ return FALSE; } return TRUE; +} + +INT CALLBACK +BrowseProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + return FALSE; } INT_PTR CALLBACK @@ -340,13 +346,18 @@ { ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); PathInfo.hwndOwner = Dlg; - PathInfo.ulFlags = BIF_EDITBOX; + PathInfo.ulFlags = BIF_EDITBOX | BIF_VALIDATE; + PathInfo.lpfn = (BFFCALLBACK)BrowseProc; +#if 0 SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidl); PathInfo.pidlRoot = pidl; +#endif if ((wParam == ID_BROWSEMGW) || (wParam == ID_BROWSEOBJ) || (wParam == ID_BROWSEOUT)) { +#if 0 HINSTANCE hDLL; ILCREATEFROMPATHW ILCreateFromPathW; +#endif Control = ID_MGWDIR; IDText = MSG_FINDMGWDIR; if (wParam == ID_BROWSEOBJ) @@ -359,6 +370,7 @@ Control = ID_OUTDIR; IDText = MSG_FINDOUTDIR; } +#if 0 hDLL = LoadLibrary(L"shell32.dll"); if (hDLL) { @@ -370,6 +382,7 @@ } FreeLibrary(hDLL); } +#endif } LoadString(hInstance, IDText, Text, 512); PathInfo.lpszTitle = Text; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h Mon Dec 24 21:31:47 2007 @@ -16,7 +16,9 @@ #define MINGWVERSION L"\\4.1.3" +#if 0 typedef LPITEMIDLIST (CALLBACK* ILCREATEFROMPATHW)(LPCWSTR path); +#endif typedef struct _SETTINGS {

1 0

[pschweitzer] 31421: Fixed a typo in usetup French translation
by pschweitzer＠svn.reactos.org 24 Dec '07

24 Dec '07

Author: pschweitzer Date: Mon Dec 24 20:54:36 2007 New Revision: 31421 URL: http://svn.reactos.org/svn/reactos?rev=31421&view=rev Log: Fixed a typo in usetup French translation Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Mon Dec 24 20:54:36 2007 @@ -490,7 +490,7 @@ { 10, 6, - "Le systeme s'assure quer toutes les donnees sont ecrites sur le disque", + "Le systeme s'assure que toutes les donnees sont ecrites sur le disque", TEXT_NORMAL }, {

1 0

[pschweitzer] 31420: Removed an old hack that's not necessary any longer since r31418 (2nd stage localization).
by pschweitzer＠svn.reactos.org 24 Dec '07

24 Dec '07

Author: pschweitzer Date: Mon Dec 24 15:12:18 2007 New Revision: 31420 URL: http://svn.reactos.org/svn/reactos?rev=31420&view=rev Log: Removed an old hack that's not necessary any longer since r31418 (2nd stage localization). Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Mon Dec 24 15:12:18 2007 @@ -826,10 +826,6 @@ InitializeSetupActionLog(FALSE); LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS"); - /* Set user langage to the system language */ - SetUserDefaultLCID(GetSystemDefaultLCID()); - SetThreadLocale(GetSystemDefaultLCID()); - if (!InitializeProfiles()) { DebugPrint("InitializeProfiles() failed");

1 0

[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

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