Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[navaraf] 16978: Use mapped sections for fonts instead of paged pool memory.
by navaraf＠svn.reactos.com 02 Aug '05

02 Aug '05

Use mapped sections for fonts instead of paged pool memory. Modified: branches/win32k rewrite attempt/win32k/objects/text.c _____ Modified: branches/win32k rewrite attempt/win32k/objects/text.c --- branches/win32k rewrite attempt/win32k/objects/text.c 2005-08-02 20:33:33 UTC (rev 16977) +++ branches/win32k rewrite attempt/win32k/objects/text.c 2005-08-02 20:34:51 UTC (rev 16978) @@ -256,22 +256,24 @@ HANDLE FileHandle; OBJECT_ATTRIBUTES ObjectAttributes; FILE_STANDARD_INFORMATION FileStdInfo; - PVOID Buffer; + PVOID Buffer = NULL; IO_STATUS_BLOCK Iosb; INT Error; FT_Face Face; ANSI_STRING AnsiFaceName; PFONT_ENTRY Entry; + PSECTION_OBJECT SectionObject; + ULONG ViewSize = 0; /* Open the font file */ InitializeObjectAttributes(&ObjectAttributes, FileName, 0, NULL, NULL); Status = ZwOpenFile( &FileHandle, - GENERIC_READ | SYNCHRONIZE, + FILE_GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &Iosb, - 0, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) @@ -280,59 +282,25 @@ return 0; } - /* Get the size of the file */ - - Status = ZwQueryInformationFile( - FileHandle, - &Iosb, - &FileStdInfo, - sizeof(FileStdInfo), - FileStandardInformation); - + Status = MmCreateSection(&SectionObject, SECTION_ALL_ACCESS, + NULL, NULL, PAGE_READONLY, + 0, FileHandle, NULL); if (!NT_SUCCESS(Status)) { - DPRINT("Could not get file size\n"); + DPRINT("Could not map file: %wZ\n", FileName); ZwClose(FileHandle); return 0; } - /* Allocate pageable memory for the font */ + ZwClose(FileHandle); - Buffer = ExAllocatePoolWithTag( - PagedPool, - FileStdInfo.EndOfFile.u.LowPart, - TAG_FNTFILE); - - if (Buffer == NULL) - { - DPRINT("Could not allocate memory for font"); - ZwClose(FileHandle); - return 0; - } - - /* Load the font into memory chunk */ - - Status = ZwReadFile( - FileHandle, - NULL, - NULL, - NULL, - &Iosb, - Buffer, - FileStdInfo.EndOfFile.u.LowPart, - NULL, - NULL); - + Status = MmMapViewInSystemSpace(SectionObject, &Buffer, &ViewSize); if (!NT_SUCCESS(Status)) { - DPRINT("Could not read the font file into memory"); - ExFreePool(Buffer); - ZwClose(FileHandle); - return 0; + DPRINT("Could not map file: %wZ\n", FileName); + return Status; } - ZwClose(FileHandle); - IntLockFreeType; Error = FT_New_Memory_Face( library, @@ -348,7 +316,7 @@ DPRINT("Unknown font file format\n"); else DPRINT("Error reading font file (error code: %u)\n", Error); - ExFreePool(Buffer); + ObDereferenceObject(SectionObject); return 0; } @@ -356,7 +324,7 @@ if (!Entry) { FT_Done_Face(Face); - ExFreePool(Buffer); + ObDereferenceObject(SectionObject); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; } @@ -365,7 +333,7 @@ if(FontGDI == NULL) { FT_Done_Face(Face); - ExFreePool(Buffer); + ObDereferenceObject(SectionObject); ExFreePool(Entry); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0;

1 0

[navaraf] 16977: Use mapped sections for fonts instead of paged pool memory.
by navaraf＠svn.reactos.com 02 Aug '05

02 Aug '05

Use mapped sections for fonts instead of paged pool memory. Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-08-02 20:17:01 UTC (rev 16976) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-08-02 20:33:33 UTC (rev 16977) @@ -256,22 +256,24 @@ HANDLE FileHandle; OBJECT_ATTRIBUTES ObjectAttributes; FILE_STANDARD_INFORMATION FileStdInfo; - PVOID Buffer; + PVOID Buffer = NULL; IO_STATUS_BLOCK Iosb; INT Error; FT_Face Face; ANSI_STRING AnsiFaceName; PFONT_ENTRY Entry; + PSECTION_OBJECT SectionObject; + ULONG ViewSize = 0; /* Open the font file */ InitializeObjectAttributes(&ObjectAttributes, FileName, 0, NULL, NULL); Status = ZwOpenFile( &FileHandle, - GENERIC_READ | SYNCHRONIZE, + FILE_GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &Iosb, - 0, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) @@ -280,59 +282,25 @@ return 0; } - /* Get the size of the file */ - - Status = ZwQueryInformationFile( - FileHandle, - &Iosb, - &FileStdInfo, - sizeof(FileStdInfo), - FileStandardInformation); - + Status = MmCreateSection(&SectionObject, SECTION_ALL_ACCESS, + NULL, NULL, PAGE_READONLY, + 0, FileHandle, NULL); if (!NT_SUCCESS(Status)) { - DPRINT("Could not get file size\n"); + DPRINT("Could not map file: %wZ\n", FileName); ZwClose(FileHandle); return 0; } - /* Allocate pageable memory for the font */ + ZwClose(FileHandle); - Buffer = ExAllocatePoolWithTag( - PagedPool, - FileStdInfo.EndOfFile.u.LowPart, - TAG_FNTFILE); - - if (Buffer == NULL) - { - DPRINT("Could not allocate memory for font"); - ZwClose(FileHandle); - return 0; - } - - /* Load the font into memory chunk */ - - Status = ZwReadFile( - FileHandle, - NULL, - NULL, - NULL, - &Iosb, - Buffer, - FileStdInfo.EndOfFile.u.LowPart, - NULL, - NULL); - + Status = MmMapViewInSystemSpace(SectionObject, &Buffer, &ViewSize); if (!NT_SUCCESS(Status)) { - DPRINT("Could not read the font file into memory"); - ExFreePool(Buffer); - ZwClose(FileHandle); - return 0; + DPRINT("Could not map file: %wZ\n", FileName); + return Status; } - ZwClose(FileHandle); - IntLockFreeType; Error = FT_New_Memory_Face( library, @@ -348,7 +316,7 @@ DPRINT("Unknown font file format\n"); else DPRINT("Error reading font file (error code: %u)\n", Error); - ExFreePool(Buffer); + ObDereferenceObject(SectionObject); return 0; } @@ -356,7 +324,7 @@ if (!Entry) { FT_Done_Face(Face); - ExFreePool(Buffer); + ObDereferenceObject(SectionObject); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; } @@ -365,7 +333,7 @@ if(FontGDI == NULL) { FT_Done_Face(Face); - ExFreePool(Buffer); + ObDereferenceObject(SectionObject); ExFreePool(Entry); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; @@ -1559,7 +1527,7 @@ } } - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + BitmapObj = BITMAPOBJ_LockBitmap(DC_BITMAP(dc)); if ( !BitmapObj ) { goto fail; @@ -1574,7 +1542,7 @@ YStart = Start.y + dc->w.DCOrgY; /* Create the brushes */ - PalDestGDI = PALETTE_LockPalette(dc->w.hPalette); + PalDestGDI = PALETTE_LockPalette(DC_PALETTE(dc)); if ( !PalDestGDI ) Mode = PAL_RGB; else @@ -1582,7 +1550,7 @@ Mode = PalDestGDI->Mode; PALETTE_UnlockPalette(PalDestGDI); } - XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL); + XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, DC_PALETTE(dc), NULL); if ( !XlateObj ) { goto fail; @@ -1612,7 +1580,7 @@ } IntGdiInitBrushInstance(&BrushBgInst, BrushBg, NULL); } - XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, dc->w.hPalette); + XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, DC_PALETTE(dc)); if ( !XlateObj2 ) { goto fail;

1 0

[ea] 16976: A really simple Win32 implementation of 'hostname'.
by ea＠svn.reactos.com 02 Aug '05

02 Aug '05

A really simple Win32 implementation of 'hostname'. Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/subsys/system/directory.xml Added: trunk/reactos/subsys/system/hostname/ Added: trunk/reactos/subsys/system/hostname/hostname.c Added: trunk/reactos/subsys/system/hostname/hostname.rc Added: trunk/reactos/subsys/system/hostname/hostname.xml _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-08-02 18:21:48 UTC (rev 16975) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-08-02 20:17:01 UTC (rev 16976) @@ -175,6 +175,7 @@ subsys\system\dhcp\dhcp.exe 1 subsys\system\sm\sm.exe 1 subsys\system\expand\expand.exe 1 +subsys\system\hostname\hostname.exe 1 services\eventlog\eventlog.exe 1 services\rpcss\rpcss.exe 1 services\umpnpmgr\umpnpmgr.exe 1 _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-08-02 18:21:48 UTC (rev 16975) +++ trunk/reactos/subsys/system/directory.xml 2005-08-02 20:17:01 UTC (rev 16976) @@ -73,6 +73,9 @@ <directory name="winlogon"> <xi:include href="winlogon/winlogon.xml" /> </directory> +<directory name="hostname"> + <xi:include href="hostname/hostname.xml" /> +</directory> <directory name="welcome"> <xi:include href="welcome/welcome.xml" /> </directory> _____ Added: trunk/reactos/subsys/system/hostname/hostname.c --- trunk/reactos/subsys/system/hostname/hostname.c 2005-08-02 18:21:48 UTC (rev 16975) +++ trunk/reactos/subsys/system/hostname/hostname.c 2005-08-02 20:17:01 UTC (rev 16976) @@ -0,0 +1,58 @@ +/* + * ReactOS Win32 Applications + * Copyright (C) 2005 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. + */ +/* $Id$ + * + * COPYRIGHT : See COPYING in the top level directory + * PROJECT : ReactOS/Win32 get host name + * FILE : subsys/system/hostname/hostname.c + * PROGRAMMER: Emanuele Aliberti (ea(a)reactos.com) + */ +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +int main (int argc, char ** argv) +{ + if (1 == argc) + { + TCHAR ComputerName [MAX_COMPUTERNAME_LENGTH + 1]; + DWORD ComputerNameSize = sizeof ComputerName / sizeof ComputerName[0]; + + ZeroMemory (ComputerName, ComputerNameSize); + if (GetComputerName(ComputerName, & ComputerNameSize)) + { + printf ("%s\n", ComputerName); + return EXIT_SUCCESS; + } + fprintf (stderr, "%s: Win32 error %ld.\n", + argv[0], GetLastError()); + return EXIT_FAILURE; + }else{ + if (0 == strcmp(argv[1],"-s")) + { + fprintf(stderr,"%s: -s not supported.\n",argv[0]); + return EXIT_FAILURE; + }else{ + printf("Print the current host's name.\n\nhostname\n"); + } + } + return EXIT_SUCCESS; +} +/* EOF */ Property changes on: trunk/reactos/subsys/system/hostname/hostname.c ___________________________________________________________________ Name: svn:keywords + author id date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/hostname/hostname.rc --- trunk/reactos/subsys/system/hostname/hostname.rc 2005-08-02 18:21:48 UTC (rev 16975) +++ trunk/reactos/subsys/system/hostname/hostname.rc 2005-08-02 20:17:01 UTC (rev 16976) @@ -0,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "Win32 Get local host name\0" +#define REACTOS_STR_INTERNAL_NAME "hostname\0" +#define REACTOS_STR_ORIGINAL_FILENAME "hostname.exe\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/subsys/system/hostname/hostname.rc ___________________________________________________________________ Name: svn:keywords + author id date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/hostname/hostname.xml --- trunk/reactos/subsys/system/hostname/hostname.xml 2005-08-02 18:21:48 UTC (rev 16975) +++ trunk/reactos/subsys/system/hostname/hostname.xml 2005-08-02 20:17:01 UTC (rev 16976) @@ -0,0 +1,7 @@ +<module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe" warnings="true"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <file>hostname.c</file> + <file>hostname.rc</file> +</module> + Property changes on: trunk/reactos/subsys/system/hostname/hostname.xml ___________________________________________________________________ Name: svn:keywords + author id date revision Name: svn:eol-style + native

1 0

[navaraf] 16975: Fix linux build.
by navaraf＠svn.reactos.com 02 Aug '05

02 Aug '05

Fix linux build. Modified: trunk/reactos/tools/pefixup.c _____ Modified: trunk/reactos/tools/pefixup.c --- trunk/reactos/tools/pefixup.c 2005-08-02 18:13:21 UTC (rev 16974) +++ trunk/reactos/tools/pefixup.c 2005-08-02 18:21:48 UTC (rev 16975) @@ -25,6 +25,10 @@ #include <string.h> #include <fcntl.h> +#ifndef O_BINARY +#define O_BINARY 0 +#endif + /* The following definitions are ripped from MinGW W32API headers. We don't use these headers directly in order to allow compilation on Linux hosts. */

1 0

[navaraf] 16974: Fix the -sections option of PEFIXUP tool and adapt RBUILD to use it.
by navaraf＠svn.reactos.com 02 Aug '05

02 Aug '05

Fix the -sections option of PEFIXUP tool and adapt RBUILD to use it. Modified: trunk/reactos/tools/pefixup.c Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h _____ Modified: trunk/reactos/tools/pefixup.c --- trunk/reactos/tools/pefixup.c 2005-08-02 16:13:02 UTC (rev 16973) +++ trunk/reactos/tools/pefixup.c 2005-08-02 18:13:21 UTC (rev 16974) @@ -332,9 +332,6 @@ i < nt_header->OptionalHeader.NumberOfRvaAndSizes; i++, section_header++) { - if (section_header->VirtualAddress) - break; - if (!strcmp(section_header->Name, ".text") || !strcmp(section_header->Name, ".data") || !strcmp(section_header->Name, ".idata") || _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-08-02 16:13:02 UTC (rev 16973) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-08-02 18:13:21 UTC (rev 16974) @@ -1412,7 +1412,8 @@ const string& linker, const string& linkerParameters, const string& objectsMacro, - const string& libsMacro ) + const string& libsMacro, + const string& pefixupParameters ) { string target ( GetTargetMacro ( module ) ); string target_folder ( GetDirectory ( GetTargetFilename ( module, NULL ) ) ); @@ -1451,8 +1452,9 @@ GetLinkerMacro ().c_str () ); fprintf ( fMakefile, - "\t$(Q)$(PEFIXUP_TARGET) %s -exports\n", - target.c_str () ); + "\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n", + target.c_str (), + pefixupParameters.c_str() ); fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", @@ -1468,6 +1470,14 @@ objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); + + if ( pefixupParameters.length() != 0 ) + { + fprintf ( fMakefile, + "\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n", + target.c_str (), + pefixupParameters.c_str() ); + } } GenerateBuildMapCode (); @@ -2166,7 +2176,8 @@ "${gcc}", linkerParameters, objectsMacro, - libsMacro ); + libsMacro, + "-sections" ); } else { @@ -2252,7 +2263,8 @@ "${gcc}", linkerParameters, objectsMacro, - libsMacro ); + libsMacro, + "-sections" ); } else { @@ -2299,7 +2311,8 @@ "${gcc}", linkerParameters, objectsMacro, - libsMacro ); + libsMacro, + "-sections" ); } else { @@ -2345,7 +2358,8 @@ "${gcc}", linkerParameters, objectsMacro, - libsMacro ); + libsMacro, + "" ); } else { @@ -2391,7 +2405,8 @@ "${gcc}", linkerParameters, objectsMacro, - libsMacro ); + libsMacro, + "" ); } else { @@ -2443,7 +2458,8 @@ linker, linkerParameters, objectsMacro, - libsMacro ); + libsMacro, + "" ); } else { @@ -2495,7 +2511,8 @@ linker, linkerParameters, objectsMacro, - libsMacro ); + libsMacro, + "" ); } else { @@ -2547,7 +2564,8 @@ linker, linkerParameters, objectsMacro, - libsMacro ); + libsMacro, + "" ); } else { @@ -3046,7 +3064,8 @@ linker, linkerParameters, objectsMacro, - libsMacro ); + libsMacro, + "" ); } else { _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-08-02 16:13:02 UTC (rev 16973) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-08-02 18:13:21 UTC (rev 16974) @@ -113,7 +113,8 @@ const std::string& linker, const std::string& linkerParameters, const std::string& objectsMacro, - const std::string& libsMacro ); + const std::string& libsMacro, + const std::string& pefixupParameters ); void GeneratePhonyTarget() const; void GenerateRules (); void GenerateImportLibraryTargetIfNeeded ();

1 0

[chorns] 16973: Locate latest revision ISO
by chorns＠svn.reactos.com 02 Aug '05

02 Aug '05

Locate latest revision ISO Modified: trunk/cis/ReactOS.RevisionISO/index.php _____ Modified: trunk/cis/ReactOS.RevisionISO/index.php --- trunk/cis/ReactOS.RevisionISO/index.php 2005-08-02 16:11:13 UTC (rev 16972) +++ trunk/cis/ReactOS.RevisionISO/index.php 2005-08-02 16:13:02 UTC (rev 16973) @@ -109,9 +109,12 @@ </td> </tr> <tr> - <td colspan="7"> + <td colspan="4"> <input type="submit" name="getnextiso" value="Next ISO" tabindex="4" style="border: 1px solid #000000"></input> </td> + <td colspan="3" align="right"> + <input type="submit" name="getlatestiso" value="Latest ISO" tabindex="5" style="border: 1px solid #000000"></input> + </td> </tr> </table> @@ -139,7 +142,7 @@ <?php } -function getNextRevisionISO($branch, $revision) +function locateRevisionISO($branch, $revision, $latest) { $revision = intval($revision); $path = ISO_PATH . "\\" . $branch; @@ -153,14 +156,17 @@ $d->close(); if (is_array($filelist)) { - usort($filelist, "dm_usort_cmp_desc"); + $sortFunction = $latest ? "dm_usort_cmp" : "dm_usort_cmp_desc"; + usort($filelist, $sortFunction); reset($filelist); while (list($key, $filename) = each($filelist)) { if (ereg('ReactOS-' . $branch . '-r([0-9]*).iso', $filename, $regs)) { $thisRevision = intval($regs[1]); - if ($thisRevision > $revision) + if (($latest) && ($thisRevision < $revision)) return $regs[1]; + else if ($thisRevision > $revision) + return $regs[1]; $lastRevision = $thisRevision; } } @@ -169,7 +175,16 @@ return ""; } +function getNextRevisionISO($branch, $revision) +{ + return locateRevisionISO($branch, $revision, false); +} +function getLatestRevisionISO($branch) +{ + return locateRevisionISO($branch, 999999, true); +} + function main() { $branch = $_POST["branch"]; @@ -199,6 +214,12 @@ printMenu(getNextRevisionISO($_POST["branch"], $_POST["revision"])); printFooter(); } +else if (!empty($_POST["getlatestiso"]) && !empty($_POST["branch"])) +{ + printHeader(); + printMenu(getLatestRevisionISO($_POST["branch"])); + printFooter(); +} else { printHeader();

1 0

[ea] 16972: Modify NTDLL!DbgSsInitialize/4 signature.
by ea＠svn.reactos.com 02 Aug '05

02 Aug '05

Modify NTDLL!DbgSsInitialize/4 signature. Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/lib/ntdll/dbg/debug.c _____ Modified: trunk/reactos/include/ndk/umfuncs.h --- trunk/reactos/include/ndk/umfuncs.h 2005-08-02 15:58:41 UTC (rev 16971) +++ trunk/reactos/include/ndk/umfuncs.h 2005-08-02 16:11:13 UTC (rev 16972) @@ -99,7 +99,7 @@ STDCALL DbgSsInitialize( HANDLE ReplyPort, - ULONG Unknown1, + PVOID Callback, ULONG Unknown2, ULONG Unknown3 ); _____ Modified: trunk/reactos/lib/ntdll/dbg/debug.c --- trunk/reactos/lib/ntdll/dbg/debug.c 2005-08-02 15:58:41 UTC (rev 16971) +++ trunk/reactos/lib/ntdll/dbg/debug.c 2005-08-02 16:11:13 UTC (rev 16972) @@ -19,6 +19,7 @@ static HANDLE DbgSsApiPort = NULL; static HANDLE DbgSsReplyPort = NULL; +static NTSTATUS (STDCALL * DbgSsCallback)(PVOID,PVOID) = NULL; typedef struct _LPC_DBGSS_MESSAGE @@ -77,7 +78,7 @@ */ NTSTATUS STDCALL DbgSsInitialize(HANDLE ReplyPort, - ULONG Unknown1, + PVOID Callback, ULONG Unknown2, ULONG Unknown3) { @@ -102,7 +103,7 @@ return Status; DbgSsReplyPort = ReplyPort; -// UnknownData1 = Unknown1; + DbgSsCallback = Callback; // UnknownData2 = Unknown2; // UnknownData3 = Unknown3;

1 0

[chorns] 16971: Locate next revision ISO
by chorns＠svn.reactos.com 02 Aug '05

02 Aug '05

Locate next revision ISO Modified: trunk/cis/ReactOS.RevisionISO/index.php _____ Modified: trunk/cis/ReactOS.RevisionISO/index.php --- trunk/cis/ReactOS.RevisionISO/index.php 2005-08-02 14:01:43 UTC (rev 16970) +++ trunk/cis/ReactOS.RevisionISO/index.php 2005-08-02 15:58:41 UTC (rev 16971) @@ -7,6 +7,11 @@ return ($a > $b) ? -1 : 1; } +function dm_usort_cmp_desc ($a, $b) { + if ($a == $b) return 0; + return ($a > $b) ? 1 : -1; +} + function printHeader() { ?> @@ -34,7 +39,7 @@ <?php } -function printMenu() +function printMenu($revision) { ?> <table border="0" class="box" cellpadding="5"> @@ -58,7 +63,7 @@ $i = 0; $dirlist = array(); while (false !== ($entry = $d->read())) { - if ((strcasecmp($entry, ".") != 0) && (strcasecmp($entry, "..") != 0) && is_dir(ISO_PATH . "\\" . $entry)=="dir") { + if ((strcasecmp($entry, ".") != 0) && (strcasecmp($entry, "..") != 0) && is_dir(ISO_PATH . "\\" . $entry) == "dir") { $dirlist[$i++] = $entry; } } @@ -88,7 +93,6 @@ </td> <td> <?php - $revision = $_POST["revision"]; echo "<input type=\"text\" name=\"revision\" size=\"10\" maxlength=\"10\" tabindex=\"2\" value=\"" . $revision . "\"></input>"; ?> </td> @@ -99,6 +103,16 @@ <input type="submit" name="getiso" value="Download" tabindex="3" style="border: 1px solid #000000"></input> </td> </tr> +<tr> + <td colspan="7"> + <hr size="2" width="100%" /> + </td> +</tr> +<tr> + <td colspan="7"> + <input type="submit" name="getnextiso" value="Next ISO" tabindex="4" style="border: 1px solid #000000"></input> + </td> +</tr> </table> </td> @@ -125,6 +139,37 @@ <?php } +function getNextRevisionISO($branch, $revision) +{ + $revision = intval($revision); + $path = ISO_PATH . "\\" . $branch; + $d = dir($path); + $i = 0; + $filelist = array(); + while (false !== ($entry = $d->read())) { + if (is_dir($path . "\\" . $entry) != "dir") + $filelist[$i++] = $entry; + } + $d->close(); + + if (is_array($filelist)) { + usort($filelist, "dm_usort_cmp_desc"); + reset($filelist); + while (list($key, $filename) = each($filelist)) { + if (ereg('ReactOS-' . $branch . '-r([0-9]*).iso', $filename, $regs)) + { + $thisRevision = intval($regs[1]); + if ($thisRevision > $revision) + return $regs[1]; + $lastRevision = $thisRevision; + } + } + } + + return ""; +} + + function main() { $branch = $_POST["branch"]; @@ -140,7 +185,7 @@ else { printHeader(); - printMenu(); + printMenu($_POST["revision"]); echo "<br><b>No ISO exist for branch '" . $branch . "' and revision " . $revision . ".</b><br><br>"; printFooter(); } @@ -148,10 +193,16 @@ if (!empty($_POST["getiso"]) && !empty($_POST["branch"]) && !empty($_POST["revision"]) && is_numeric($_POST["revision"])) main(); +else if (!empty($_POST["getnextiso"]) && !empty($_POST["branch"]) && !empty($_POST["revision"]) && is_numeric($_POST["revision"])) +{ + printHeader(); + printMenu(getNextRevisionISO($_POST["branch"], $_POST["revision"])); + printFooter(); +} else { printHeader(); - printMenu(); + printMenu($_POST["revision"]); printFooter(); }

1 0

[ion] 16970: - Remove CmpFindObject hack and use ObFindObject with on-demand ObjectCreateInfo.
by ion＠svn.reactos.com 02 Aug '05

02 Aug '05

- Remove CmpFindObject hack and use ObFindObject with on-demand ObjectCreateInfo. - Note that the code is still wrong and will be fixed soon. Modified: trunk/reactos/ntoskrnl/cm/cm.h Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/registry.c _____ Modified: trunk/reactos/ntoskrnl/cm/cm.h --- trunk/reactos/ntoskrnl/cm/cm.h 2005-08-02 13:53:52 UTC (rev 16969) +++ trunk/reactos/ntoskrnl/cm/cm.h 2005-08-02 14:01:43 UTC (rev 16970) @@ -744,11 +744,4 @@ CmiSaveTempHive (PREGISTRY_HIVE Hive, HANDLE FileHandle); -/* TEMPORARY HACK UNTIL PROPER PARSE ROUTINES SOON. DO NOT REMOVE -- Alex */ -NTSTATUS -CmpFindObject(POBJECT_ATTRIBUTES ObjectAttributes, - PVOID* ReturnedObject, - PUNICODE_STRING RemainingPath, - POBJECT_TYPE ObjectType); - #endif /*__INCLUDE_CM_H*/ _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-08-02 13:53:52 UTC (rev 16969) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-08-02 14:01:43 UTC (rev 16970) @@ -30,138 +30,6 @@ /* FUNCTIONS ****************************************************************/ -/* TEMPORARY HACK UNTIL PROPER PARSE ROUTINES SOON. DO NOT REMOVE -- Alex */ -NTSTATUS -CmpFindObject(POBJECT_ATTRIBUTES ObjectAttributes, - PVOID* ReturnedObject, - PUNICODE_STRING RemainingPath, - POBJECT_TYPE ObjectType) -{ - PVOID NextObject; - PVOID CurrentObject; - PVOID RootObject; - POBJECT_HEADER CurrentHeader; - NTSTATUS Status; - PWSTR current; - UNICODE_STRING PathString; - ULONG Attributes; - PUNICODE_STRING ObjectName; - - PAGED_CODE(); - - DPRINT("CmpFindObject(ObjectAttributes 0x%p, ReturnedObject 0x%p, " - "RemainingPath 0x%p)\n",ObjectAttributes,ReturnedObject,RemainingPath); - DPRINT("ObjectAttributes->ObjectName %wZ\n", - ObjectAttributes->ObjectName); - - RtlInitUnicodeString (RemainingPath, NULL); - - if (ObjectAttributes->RootDirectory == NULL) - { - ObReferenceObjectByPointer(NameSpaceRoot, - DIRECTORY_TRAVERSE, - NULL, - UserMode); - CurrentObject = NameSpaceRoot; - } - else - { - Status = ObReferenceObjectByHandle(ObjectAttributes->RootDirectory, - 0, - NULL, - UserMode, - &CurrentObject, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - - ObjectName = ObjectAttributes->ObjectName; - if (ObjectName->Length == 0 || - ObjectName->Buffer[0] == UNICODE_NULL) - { - *ReturnedObject = CurrentObject; - return STATUS_SUCCESS; - } - - if (ObjectAttributes->RootDirectory == NULL && - ObjectName->Buffer[0] != L'\\') - { - ObDereferenceObject (CurrentObject); - return STATUS_UNSUCCESSFUL; - } - - /* Create a zero-terminated copy of the object name */ - PathString.Length = ObjectName->Length; - PathString.MaximumLength = ObjectName->Length + sizeof(WCHAR); - PathString.Buffer = ExAllocatePool (NonPagedPool, - PathString.MaximumLength); - if (PathString.Buffer == NULL) - { - ObDereferenceObject (CurrentObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyMemory (PathString.Buffer, - ObjectName->Buffer, - ObjectName->Length); - PathString.Buffer[PathString.Length / sizeof(WCHAR)] = UNICODE_NULL; - - current = PathString.Buffer; - - RootObject = CurrentObject; - Attributes = ObjectAttributes->Attributes; - if (ObjectType == ObSymbolicLinkType) - Attributes |= OBJ_OPENLINK; - - while (TRUE) - { - DPRINT("current %S\n",current); - CurrentHeader = BODY_TO_HEADER(CurrentObject); - - DPRINT("Current ObjectType %wZ\n", - &CurrentHeader->Type->Name); - - if (CurrentHeader->Type->TypeInfo.ParseProcedure == NULL) - { - DPRINT("Current object can't parse\n"); - break; - } - Status = CurrentHeader->Type->TypeInfo.ParseProcedure(CurrentObject, - &NextObject, - &PathString, - &current, - Attributes); - if (Status == STATUS_REPARSE) - { - /* reparse the object path */ - NextObject = NameSpaceRoot; - current = PathString.Buffer; - - ObReferenceObjectByPointer(NextObject, - DIRECTORY_TRAVERSE, - NULL, - UserMode); - } - - if (NextObject == NULL) - { - break; - } - ObDereferenceObject(CurrentObject); - CurrentObject = NextObject; - } - - if (current) - RtlpCreateUnicodeString (RemainingPath, current, NonPagedPool); - RtlFreeUnicodeString (&PathString); - *ReturnedObject = CurrentObject; - - return STATUS_SUCCESS; -} - /* * @implemented */ @@ -322,6 +190,8 @@ NTSTATUS Status; PVOID Object; PWSTR Start; + UNICODE_STRING ObjectName; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; unsigned i; PAGED_CODE(); @@ -331,10 +201,26 @@ KeyHandle, ObjectAttributes->RootDirectory); - Status = CmpFindObject(ObjectAttributes, - &Object, - &RemainingPath, - CmiKeyType); + /* Capture all the info */ + DPRINT("Capturing Create Info\n"); + Status = ObpCaptureObjectAttributes(ObjectAttributes, + KeGetPreviousMode(), + CmiKeyType, + &ObjectCreateInfo, + &ObjectName); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); + return Status; + } + + Status = ObFindObject(&ObjectCreateInfo, + &ObjectName, + (PVOID*)&Object, + &RemainingPath, + CmiKeyType); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) { DPRINT("CmpFindObject failed, Status: 0x%x\n", Status); @@ -1238,6 +1124,8 @@ PVOID Object; HANDLE hKey; NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING ObjectName; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; PAGED_CODE(); @@ -1277,11 +1165,28 @@ /*if (ObjectAttributes->ObjectName->Length > MAX_NAME_LENGTH) return(STATUS_BUFFER_OVERFLOW);*/ + /* Capture all the info */ + DPRINT("Capturing Create Info\n"); + Status = ObpCaptureObjectAttributes(ObjectAttributes, + PreviousMode, + CmiKeyType, + &ObjectCreateInfo, + &ObjectName); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); + return Status; + } + RemainingPath.Buffer = NULL; - Status = CmpFindObject(ObjectAttributes, - &Object, - &RemainingPath, - CmiKeyType); + + Status = ObFindObject(&ObjectCreateInfo, + &ObjectName, + (PVOID*)&Object, + &RemainingPath, + CmiKeyType); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) { DPRINT("CmpFindObject() returned 0x%08lx\n", Status); _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-08-02 13:53:52 UTC (rev 16969) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-08-02 14:01:43 UTC (rev 16970) @@ -695,14 +695,32 @@ PKEY_OBJECT NewKey; NTSTATUS Status; PWSTR SubName; + UNICODE_STRING ObjectName; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; DPRINT("CmiConnectHive(%p, %p) called.\n", KeyObjectAttributes, RegistryHive); + + /* Capture all the info */ + DPRINT("Capturing Create Info\n"); + Status = ObpCaptureObjectAttributes(KeyObjectAttributes, + KernelMode, + CmiKeyType, + &ObjectCreateInfo, + &ObjectName); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); + return Status; + } - Status = CmpFindObject(KeyObjectAttributes, - (PVOID*)&ParentKey, - &RemainingPath, - CmiKeyType); + Status = ObFindObject(&ObjectCreateInfo, + &ObjectName, + (PVOID*)&ParentKey, + &RemainingPath, + CmiKeyType); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) { return Status;

1 0

[navaraf] 16969: Fix some pointer casts.
by navaraf＠svn.reactos.com 02 Aug '05

02 Aug '05

Fix some pointer casts. Modified: trunk/reactos/ntoskrnl/ldr/loader.c _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-08-02 13:52:10 UTC (rev 16968) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-08-02 13:53:52 UTC (rev 16969) @@ -1375,8 +1375,8 @@ ? RVA(BaseAddress, ExFunctions[Ordinal - ExportDir->Base] ) : NULL; - if (((ULONG)Function >= (ULONG)ExportDir) && - ((ULONG)Function < (ULONG)ExportDir + (ULONG)ExportDirSize)) + if (((ULONG_PTR)Function >= (ULONG_PTR)ExportDir) && + ((ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize)) { DPRINT("Forward: %s\n", (PCHAR)Function); Function = LdrPEFixupForward((PCHAR)Function);

1 0

← Newer
1
...
60
61
62
63
64
65
66
67
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005