Ros-dev

ros-dev@reactos.org

5791 discussions

freeldr
by Timo Kreuzer 15 Jun '11

15 Jun '11

Hi, While taking a short break from my GSOC work, I like to do some work on freeldr. Final goal is to make it work with MSVC, but first I'd like to do a little cleanup, since its a bit messy. First I'd like to know how the state of the old bootcode is and if we still need it and whats left to do to get rid of it. Then I'd suggest to remove the code that draws purple unicorns like it was done for ARM (afaik, we don't use it anyway) I'd also like to fix formatting (tabs -> spaces) Any remarks, objections, wishes, doubts? Regards, Timo

5 10

Re: [ros-dev] [ros-diffs] [tkreuzer] 52237: [DDK] according to WDK FsRtlRemoveBaseMcbEntry
by Pierre Schweitzer 15 Jun '11

15 Jun '11

Thanks for being that efficient for reverting. Less than two days after message on ML. Congratz. Next time I take days off, I won't take four days any longer, in case you would question some other of my patches. I'll also send you my next patches, that way you'll be able to commit them, or just to skip them to prevent any revert.

1 0

Re: [ros-dev] [ros-diffs] [rharabien] 52244: [NTOSKRNL] - Disable displaying string by bootvid after successful kernel phase 1 initialization, so there won't be graphical glitches at the top of screen if system has screen d...
by Alex Ionescu 15 Jun '11

15 Jun '11

Or another way of putting this... ""Fix" 100% correct reverse engineered NT code and break it so that it matches ReactOS's broken Video Driver Framework behaviour, instead of fixing the latter". Never gets old~ -- Best regards, Alex Ionescu On 2011-06-15, at 8:53 AM, rharabien(a)svn.reactos.org wrote: > Author: rharabien > Date: Wed Jun 15 12:53:32 2011 > New Revision: 52244 > > URL: http://svn.reactos.org/svn/reactos?rev=52244&view=rev > Log: > [NTOSKRNL] > - Disable displaying string by bootvid after successful kernel phase 1 initialization, so there won't be graphical glitches at the top of screen if system has screen debugging enabled > - Make screen black right after phase 1 initialization finish instead of waiting 5 seconds. It removes black rectangle which appeared for me in explorer. > - Initialize some global variables in inbv.c (it was done by compiler before) > > Modified: > trunk/reactos/ntoskrnl/ex/init.c > trunk/reactos/ntoskrnl/inbv/inbv.c > trunk/reactos/ntoskrnl/io/iomgr/iomgr.c > > Modified: trunk/reactos/ntoskrnl/ex/init.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=522… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Jun 15 12:53:32 2011 > @@ -1313,7 +1313,7 @@ > size_t Remaining; > PRTL_USER_PROCESS_INFORMATION ProcessInfo; > KEY_VALUE_PARTIAL_INFORMATION KeyPartialInfo; > - UNICODE_STRING KeyName, DebugString; > + UNICODE_STRING KeyName; > OBJECT_ATTRIBUTES ObjectAttributes; > HANDLE KeyHandle, OptionHandle; > PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; > @@ -1925,18 +1925,19 @@ > /* Update progress bar */ > InbvUpdateProgressBar(100); > > - /* Allow strings to be displayed */ > - InbvEnableDisplayString(TRUE); > - > - /* Wait 5 seconds for it to initialize */ > + /* Disallow strings to be displayed */ > + InbvEnableDisplayString(FALSE); > + > + /* Clean the screen */ > + if (InbvBootDriverInstalled) FinalizeBootLogo(); > + > + /* Wait 5 seconds for initial process to initialize */ > Timeout.QuadPart = Int32x32To64(5, -10000000); > Status = ZwWaitForSingleObject(ProcessInfo->ProcessHandle, FALSE, &Timeout); > - if (InbvBootDriverInstalled) FinalizeBootLogo(); > if (Status == STATUS_SUCCESS) > { > /* Failed, display error */ > - RtlInitUnicodeString(&DebugString, L"INIT: Session Manager terminated."); > - ZwDisplayString(&DebugString); > + DPRINT1("INIT: Session Manager terminated.\n"); > > /* Bugcheck the system if SMSS couldn't initialize */ > KeBugCheck(SESSION5_INITIALIZATION_FAILED); > > Modified: trunk/reactos/ntoskrnl/inbv/inbv.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=5… > ============================================================================== > --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Wed Jun 15 12:53:32 2011 > @@ -10,16 +10,16 @@ > KSPIN_LOCK BootDriverLock; > KIRQL InbvOldIrql; > INBV_DISPLAY_STATE InbvDisplayState; > -BOOLEAN InbvBootDriverInstalled; > -BOOLEAN InbvDisplayDebugStrings; > +BOOLEAN InbvBootDriverInstalled = FALSE; > +BOOLEAN InbvDisplayDebugStrings = FALSE; > INBV_DISPLAY_STRING_FILTER InbvDisplayFilter; > ULONG ProgressBarLeft, ProgressBarTop; > -BOOLEAN ShowProgressBar; > +BOOLEAN ShowProgressBar = FALSE; > INBV_PROGRESS_STATE InbvProgressState; > INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters; > ULONG ResourceCount; > PUCHAR ResourceList[64]; > -BOOLEAN SysThreadCreated; > +BOOLEAN SysThreadCreated = FALSE; > ROT_BAR_TYPE RotBarSelection; > ULONG PltRotBarStatus; > BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; > > Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Wed Jun 15 12:53:32 2011 > @@ -480,10 +480,18 @@ > KeSetTimerEx(&IopTimer, ExpireTime, 1000, &IopTimerDpc); > > /* Create Object Types */ > - if (!IopCreateObjectTypes()) return FALSE; > + if (!IopCreateObjectTypes()) > + { > + DPRINT1("IopCreateObjectTypes failed!\n"); > + return FALSE; > + } > > /* Create Object Directories */ > - if (!IopCreateRootDirectories()) return FALSE; > + if (!IopCreateRootDirectories()) > + { > + DPRINT1("IopCreateRootDirectories failed!\n"); > + return FALSE; > + } > > /* Initialize PnP manager */ > IopInitializePlugPlayServices(); > @@ -511,10 +519,19 @@ > IopLoaderBlock = NULL; > > /* Create ARC names for boot devices */ > - if (!NT_SUCCESS(IopCreateArcNames(LoaderBlock))) return FALSE; > + Status = IopCreateArcNames(LoaderBlock); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("IopCreateArcNames failed: %lx\n", Status); > + return FALSE; > + } > > /* Mark the system boot partition */ > - if (!IopMarkBootPartition(LoaderBlock)) return FALSE; > + if (!IopMarkBootPartition(LoaderBlock)) > + { > + DPRINT1("IopMarkBootPartition failed!\n"); > + return FALSE; > + } > > /* Initialize PnP root relations */ > IopEnumerateDevice(IopRootDeviceNode->PhysicalDeviceObject); > @@ -539,7 +556,11 @@ > > /* Convert SystemRoot from ARC to NT path */ > Status = IopReassignSystemRoot(LoaderBlock, &NtBootPath); > - if (!NT_SUCCESS(Status)) return FALSE; > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("IopReassignSystemRoot failed: %lx\n", Status); > + return FALSE; > + } > > /* Set the ANSI_STRING for the root path */ > RootString.MaximumLength = NtSystemRoot.MaximumLength / sizeof(WCHAR); > @@ -550,7 +571,11 @@ > > /* Convert the path into the ANSI_STRING */ > Status = RtlUnicodeStringToAnsiString(&RootString, &NtSystemRoot, FALSE); > - if (!NT_SUCCESS(Status)) return FALSE; > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("RtlUnicodeStringToAnsiString failed: %lx\n", Status); > + return FALSE; > + } > > /* Assign drive letters */ > IoAssignDriveLetters(LoaderBlock, > @@ -560,10 +585,19 @@ > > /* Update system root */ > Status = RtlAnsiStringToUnicodeString(&NtSystemRoot, &RootString, FALSE); > - if (!NT_SUCCESS(Status)) return FALSE; > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("RtlAnsiStringToUnicodeString failed: %lx\n", Status); > + return FALSE; > + } > > /* Load the System DLL and its Entrypoints */ > - if (!NT_SUCCESS(PsLocateSystemDll())) return FALSE; > + Status = PsLocateSystemDll(); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("PsLocateSystemDll failed: %lx\n", Status); > + return FALSE; > + } > > /* Return success */ > return TRUE; > >

2 5

Ge Van Geldorp
by Ged Murphy 14 Jun '11

14 Jun '11

Hi all, I write this mail with great sadness, but I've recently been informed that Ge Van Geldorp, one of the original and important contributers to the ReactOS project has recently passed away. Having met up with him personally, I can say with some confidence that he was not only blessed with an impressive skill in the hobby / industry we all love, but was also a man of great integrity. Being one of my original mentors in reactos, and having spent time busting our guts at various linux projects with him trying to convince the unix fanatics of the merits of NT, I can assure you that this he was both a great colleague and friend. I'm sure all the old school reactos devs would more than agree. I propose we have some sort of eulogy on our homepage. I'd be more than willing to compose something. If people would like to send their thoughts, wishes or memories, I'd be more than happy to compile them. Ged.

5 4

[ros-diffs] [pschweitzer] 49851: [DDK] FsRtlRemoveBaseMcbEntry() return is VOID
by Timo Kreuzer 11 Jun '11

11 Jun '11

>Author: pschweitzer >Date: Sun Nov 28 16:43:40 2010 >New Revision: 49851 > >URL:http://svn.reactos.org/svn/reactos?rev=49851&view=rev <http://svn.reactos.org/svn/reactos?rev=49851&view=rev> >Log: >[DDK] >FsRtlRemoveBaseMcbEntry() return is VOID > >Modified: > trunk/reactos/include/ddk/ntifs.h According to WDK this is wrong. Please revert.

1 0

Re: [ros-dev] Ge Van Geldorp
by caemyr＠myopera.com 11 Jun '11

11 Jun '11

Hiya Managed to find Greg brother's letter to Wine, with bit more details regarding this tragedy. Since GvG was also our man, not only Wine's, perhaps some collaborative effort could be set to commemorate him. With best regards Caemyr -------- Original Message -------- Subject: Date: From: To: RE: Ge van Geldorp Thu, 9 Jun 2011 23:05:46 +0200 Erven Gé van Geldorp <erven.van.geldorp <at> gmail.com> 'Paul Vriens' <paul.vriens.wine <at> gmail.com> Hi all, My name is Arno van Geldorp. I’m the brother of Gé (Greg) van Geldorp. I’m very sorry that I have to inform you that Greg has passed away almost 3 weeks ago. 2 Months earlier he was diagnosed with cancer in a very aggressive form. I know he made his contribution to the Wine project. And that one of them is the WineTestBot. His passing away went so fast that he didn’t have the time to inform me all about it. What he did ask me is to make sure that the server where the WineTestBot is running on will be hosted for at least 2 more years. So we will take care of that. But I don’t know if anyone took over the administration off the server. If anyone took over the administration from Greg could you please contact me at erven.van.geldorp at gmail.com Kind regards, Arno van Geldorp

1 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 52133: [OBJ2BIN] - Add new tool obj2bin, that converts a coff object file into a raw binary file - Move pe/coff types into a common header file pecoff.h
by Alex Ionescu 09 Jun '11

09 Jun '11

Why is this needed? ie: what missing functionality of obj2dump does this tool add? I'm only asking because whenever I build ARM binaries with GCC I use obj2dump to do exactly this -- convert a PE/COFF to a raw binary for the boot-loader or firmware. So maybe I'm missing something? Best regards, Alex Ionescu On Tue, Jun 7, 2011 at 3:29 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Tue Jun 7 19:29:09 2011 > New Revision: 52133 > > URL: http://svn.reactos.org/svn/reactos?rev=52133&view=rev > Log: > [OBJ2BIN] > - Add new tool obj2bin, that converts a coff object file into a raw binary file > - Move pe/coff types into a common header file pecoff.h > > Added: > trunk/reactos/tools/obj2bin/ (with props) > trunk/reactos/tools/obj2bin/CMakeLists.txt (with props) > trunk/reactos/tools/obj2bin/obj2bin.c (with props) > trunk/reactos/tools/pecoff.h (with props) > Modified: > trunk/reactos/tools/CMakeLists.txt > trunk/reactos/tools/rsym/rsym.h > > Modified: trunk/reactos/tools/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=5… > ============================================================================== > --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -6,6 +6,7 @@ > add_subdirectory(gendib) > add_subdirectory(geninc) > add_subdirectory(mkhive) > +add_subdirectory(obj2bin) > add_subdirectory(spec2def) > add_subdirectory(unicode) > > > Propchange: trunk/reactos/tools/obj2bin/ > ------------------------------------------------------------------------------ > --- bugtraq:logregex (added) > +++ bugtraq:logregex Tue Jun 7 19:29:09 2011 > @@ -1,0 +1,2 @@ > +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? > +(\d+) > > Propchange: trunk/reactos/tools/obj2bin/ > ------------------------------------------------------------------------------ > bugtraq:message = See issue #%BUGID% for more details. > > Propchange: trunk/reactos/tools/obj2bin/ > ------------------------------------------------------------------------------ > bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% > > Propchange: trunk/reactos/tools/obj2bin/ > ------------------------------------------------------------------------------ > tsvn:logminsize = 10 > > Added: trunk/reactos/tools/obj2bin/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/CMakeLists.t… > ============================================================================== > --- trunk/reactos/tools/obj2bin/CMakeLists.txt (added) > +++ trunk/reactos/tools/obj2bin/CMakeLists.txt [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -1,0 +1,1 @@ > +add_executable(obj2bin obj2bin.c) > > Propchange: trunk/reactos/tools/obj2bin/CMakeLists.txt > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/tools/obj2bin/obj2bin.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/obj2bin.c?re… > ============================================================================== > --- trunk/reactos/tools/obj2bin/obj2bin.c (added) > +++ trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -1,0 +1,112 @@ > +#include <stdio.h> > +#include <stdlib.h> > +#include "../pecoff.h" > + > +static > +void > +Usage(void) > +{ > + printf("Converts a coff object file into a raw binary file.\n" > + "Syntax: obj2bin <source file> <dest file>\n"); > +} > + > +int main(int argc, char *argv[]) > +{ > + char *pszSourceFile; > + char *pszDestFile; > + FILE *pSourceFile, *pDestFile; > + IMAGE_FILE_HEADER FileHeader; > + IMAGE_SECTION_HEADER SectionHeader; > + unsigned int i, nSize; > + void *pData; > + > + if ((argc != 3) || (strcmp(argv[1], "--help") == 0)) Usage(); > + > + pszSourceFile = argv[1]; > + pszDestFile = argv[2]; > + > + pSourceFile = fopen(pszSourceFile, "rb"); > + if (!pSourceFile) > + { > + fprintf(stderr, "Couldn't open source file '%s'\n", pszSourceFile); > + return -1; > + } > + > + pDestFile = fopen(pszDestFile, "wb"); > + if (!pszDestFile) > + { > + fprintf(stderr, "Couldn't open dest file '%s'\n", pszDestFile); > + return -2; > + } > + > + /* Load the coff header */ > + nSize = fread(&FileHeader, 1, sizeof(FileHeader), pSourceFile); > + if (nSize != sizeof(FileHeader)) > + { > + fprintf(stderr, "Failed to read source file\n"); > + return -3; > + } > + > + /* Jump to section headers (skip optional header) */ > + if (fseek(pSourceFile, FileHeader.SizeOfOptionalHeader, SEEK_CUR)) > + { > + fprintf(stderr, "Failed to set file pointer\n"); > + return -4; > + } > + > + /* Loop all sections */ > + for (i = 0; i < FileHeader.NumberOfSections; i++) > + { > + /* Read section header */ > + nSize = fread(&SectionHeader, 1, sizeof(SectionHeader), pSourceFile); > + if (nSize != sizeof(SectionHeader)) > + { > + fprintf(stderr, "Failed to read section %ld file\n", i); > + return -5; > + } > + > + /* Check if this is '.text' section */ > + if (strcmp(SectionHeader.Name, ".text") == 0) break; > + } > + > + if (i == FileHeader.NumberOfSections) > + { > + fprintf(stderr, "No .text section found\n"); > + return -6; > + } > + > + /* Move file pointer to the start of the section*/ > + if (fseek(pSourceFile, SectionHeader.PointerToRawData, SEEK_SET)) > + { > + fprintf(stderr, "Failed to set file pointer\n"); > + return -7; > + } > + > + /* Allocate memory for the section */ > + pData = malloc(SectionHeader.SizeOfRawData); > + if (!pData) > + { > + fprintf(stderr, "Failed to allocate %ld bytes\n", SectionHeader.SizeOfRawData); > + return -8; > + } > + > + /* Read section data */ > + if (!fread(pData, SectionHeader.SizeOfRawData, 1, pSourceFile)) > + { > + fprintf(stderr, "Failed to read section %ld file\n", i); > + return -5; > + } > + > + /* Write the section to the destination file */ > + if (!fwrite(pData, SectionHeader.SizeOfRawData, 1, pDestFile)) > + { > + fprintf(stderr, "Failed to write data\n"); > + return -9; > + } > + > + fclose(pDestFile); > + fclose(pSourceFile); > + > + return 0; > +} > + > > Propchange: trunk/reactos/tools/obj2bin/obj2bin.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/tools/pecoff.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pecoff.h?rev=52133&v… > ============================================================================== > --- trunk/reactos/tools/pecoff.h (added) > +++ trunk/reactos/tools/pecoff.h [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -1,0 +1,207 @@ > +#pragma once > + > +#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x010b > +#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x020b > + > +#define IMAGE_DOS_MAGIC 0x5a4d > +#define IMAGE_PE_MAGIC 0x00004550 > +#define IMAGE_SIZEOF_SHORT_NAME 8 > + > +#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 > +#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 > +#define IMAGE_FILE_DEBUG_STRIPPED 0x0200 > + > +#define IMAGE_FILE_MACHINE_I386 0x14c > +#define IMAGE_FILE_MACHINE_AMD64 0x8664 > +#define IMAGE_FILE_MACHINE_IA64 0x0200 > + > +#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 > + > +#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 > +#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 > +#define IMAGE_SCN_CNT_CODE 0x00000020 > +#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 > +#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 > +#define IMAGE_SCN_LNK_OTHER 0x00000100 > +#define IMAGE_SCN_LNK_INFO 0x00000200 > +#define IMAGE_SCN_LNK_REMOVE 0x00000800 > +#define IMAGE_SCN_NO_DEFER_SPEC_EXC 0x00004000 > +#define IMAGE_SCN_GPREL 0x00008000 > +#define IMAGE_SCN_MEM_PURGEABLE 0x00020000 > +#define IMAGE_SCN_MEM_LOCKED 0x00040000 > +#define IMAGE_SCN_MEM_PRELOAD 0x00080000 > +#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 > +#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 > +#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 > +#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 > +#define IMAGE_SCN_MEM_SHARED 0x10000000 > +#define IMAGE_SCN_MEM_EXECUTE 0x20000000 > +#define IMAGE_SCN_MEM_READ 0x40000000 > +#define IMAGE_SCN_MEM_WRITE 0x80000000 > + > +#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 > + > +typedef unsigned char BYTE; > +typedef unsigned char UCHAR; > +typedef unsigned short WORD; > +typedef unsigned short USHORT; > +typedef unsigned long long ULONGLONG; > +#if defined(__x86_64__) && !defined(_WIN64) > +typedef signed int LONG; > +typedef unsigned int ULONG; > +typedef unsigned int DWORD; > +#else > +typedef signed long LONG; > +typedef unsigned long ULONG; > +typedef unsigned long DWORD; > +#endif > +#if defined(_WIN64) > +typedef unsigned __int64 ULONG_PTR; > +#else > +#if defined(__x86_64__) && !defined(_WIN64) > +typedef unsigned int ULONG_PTR; > +#else > +typedef unsigned long ULONG_PTR; > +#endif > +#endif > + > +#pragma pack(push,2) > +typedef struct _IMAGE_DOS_HEADER { > + WORD e_magic; > + WORD e_cblp; > + WORD e_cp; > + WORD e_crlc; > + WORD e_cparhdr; > + WORD e_minalloc; > + WORD e_maxalloc; > + WORD e_ss; > + WORD e_sp; > + WORD e_csum; > + WORD e_ip; > + WORD e_cs; > + WORD e_lfarlc; > + WORD e_ovno; > + WORD e_res[4]; > + WORD e_oemid; > + WORD e_oeminfo; > + WORD e_res2[10]; > + LONG e_lfanew; > +} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; > +#pragma pack(pop) > + > +#pragma pack(push,4) > +typedef struct _IMAGE_FILE_HEADER { > + WORD Machine; > + WORD NumberOfSections; > + DWORD TimeDateStamp; > + DWORD PointerToSymbolTable; > + DWORD NumberOfSymbols; > + WORD SizeOfOptionalHeader; > + WORD Characteristics; > +} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; > +#pragma pack(pop) > + > +typedef struct _IMAGE_DATA_DIRECTORY { > + DWORD VirtualAddress; > + DWORD Size; > +} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; > + > +typedef struct _IMAGE_OPTIONAL_HEADER32 { > + WORD Magic; > + BYTE MajorLinkerVersion; > + BYTE MinorLinkerVersion; > + DWORD SizeOfCode; > + DWORD SizeOfInitializedData; > + DWORD SizeOfUninitializedData; > + DWORD AddressOfEntryPoint; > + DWORD BaseOfCode; > + DWORD BaseOfData; > + DWORD ImageBase; > + DWORD SectionAlignment; > + DWORD FileAlignment; > + WORD MajorOperatingSystemVersion; > + WORD MinorOperatingSystemVersion; > + WORD MajorImageVersion; > + WORD MinorImageVersion; > + WORD MajorSubsystemVersion; > + WORD MinorSubsystemVersion; > + DWORD Win32VersionValue; > + DWORD SizeOfImage; > + DWORD SizeOfHeaders; > + DWORD CheckSum; > + WORD Subsystem; > + WORD DllCharacteristics; > + DWORD SizeOfStackReserve; > + DWORD SizeOfStackCommit; > + DWORD SizeOfHeapReserve; > + DWORD SizeOfHeapCommit; > + DWORD LoaderFlags; > + DWORD NumberOfRvaAndSizes; > + IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; > +} IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32; > + > +typedef struct _IMAGE_OPTIONAL_HEADER64 { > + WORD Magic; > + BYTE MajorLinkerVersion; > + BYTE MinorLinkerVersion; > + DWORD SizeOfCode; > + DWORD SizeOfInitializedData; > + DWORD SizeOfUninitializedData; > + DWORD AddressOfEntryPoint; > + DWORD BaseOfCode; > + ULONGLONG ImageBase; > + DWORD SectionAlignment; > + DWORD FileAlignment; > + WORD MajorOperatingSystemVersion; > + WORD MinorOperatingSystemVersion; > + WORD MajorImageVersion; > + WORD MinorImageVersion; > + WORD MajorSubsystemVersion; > + WORD MinorSubsystemVersion; > + DWORD Win32VersionValue; > + DWORD SizeOfImage; > + DWORD SizeOfHeaders; > + DWORD CheckSum; > + WORD Subsystem; > + WORD DllCharacteristics; > + ULONGLONG SizeOfStackReserve; > + ULONGLONG SizeOfStackCommit; > + ULONGLONG SizeOfHeapReserve; > + ULONGLONG SizeOfHeapCommit; > + DWORD LoaderFlags; > + DWORD NumberOfRvaAndSizes; > + IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; > +} IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64; > + > +#ifdef _TARGET_PE64 > +typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; > +typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER; > +#else > +typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER; > +typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER; > +#endif > + > +typedef struct _IMAGE_SECTION_HEADER { > + BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; > + union { > + DWORD PhysicalAddress; > + DWORD VirtualSize; > + } Misc; > + DWORD VirtualAddress; > + DWORD SizeOfRawData; > + DWORD PointerToRawData; > + DWORD PointerToRelocations; > + DWORD PointerToLinenumbers; > + WORD NumberOfRelocations; > + WORD NumberOfLinenumbers; > + DWORD Characteristics; > +} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; > + > +#pragma pack(push,4) > +typedef struct _IMAGE_BASE_RELOCATION { > + DWORD VirtualAddress; > + DWORD SizeOfBlock; > + WORD TypeOffset[1]; > +} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; > +#pragma pack(pop) > + > > Propchange: trunk/reactos/tools/pecoff.h > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: trunk/reactos/tools/rsym/rsym.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.h?rev=5213… > ============================================================================== > --- trunk/reactos/tools/rsym/rsym.h [iso-8859-1] (original) > +++ trunk/reactos/tools/rsym/rsym.h [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -1,209 +1,7 @@ > /* rsym.h */ > > #pragma once > - > -#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x010b > -#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x020b > - > -#define IMAGE_DOS_MAGIC 0x5a4d > -#define IMAGE_PE_MAGIC 0x00004550 > -#define IMAGE_SIZEOF_SHORT_NAME 8 > - > -#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 > -#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 > -#define IMAGE_FILE_DEBUG_STRIPPED 0x0200 > - > -#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 > - > -#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 > -#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 > -#define IMAGE_SCN_CNT_CODE 0x00000020 > -#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 > -#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 > -#define IMAGE_SCN_LNK_OTHER 0x00000100 > -#define IMAGE_SCN_LNK_INFO 0x00000200 > -#define IMAGE_SCN_LNK_REMOVE 0x00000800 > -#define IMAGE_SCN_NO_DEFER_SPEC_EXC 0x00004000 > -#define IMAGE_SCN_GPREL 0x00008000 > -#define IMAGE_SCN_MEM_PURGEABLE 0x00020000 > -#define IMAGE_SCN_MEM_LOCKED 0x00040000 > -#define IMAGE_SCN_MEM_PRELOAD 0x00080000 > -#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 > -#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 > -#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 > -#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 > -#define IMAGE_SCN_MEM_SHARED 0x10000000 > -#define IMAGE_SCN_MEM_EXECUTE 0x20000000 > -#define IMAGE_SCN_MEM_READ 0x40000000 > -#define IMAGE_SCN_MEM_WRITE 0x80000000 > - > -#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 > - > -typedef unsigned char BYTE; > -typedef unsigned char UCHAR; > -typedef unsigned short WORD; > -typedef unsigned short USHORT; > -typedef unsigned long long ULONGLONG; > -#if defined(__x86_64__) && !defined(_WIN64) > -typedef signed int LONG; > -typedef unsigned int ULONG; > -typedef unsigned int DWORD; > -#else > -typedef signed long LONG; > -typedef unsigned long ULONG; > -typedef unsigned long DWORD; > -#endif > -#if defined(_WIN64) > -typedef unsigned __int64 ULONG_PTR; > -#else > -#if defined(__x86_64__) && !defined(_WIN64) > -typedef unsigned int ULONG_PTR; > -#else > -typedef unsigned long ULONG_PTR; > -#endif > -#endif > - > -#pragma pack(push,2) > - > -typedef struct _IMAGE_DOS_HEADER { > - WORD e_magic; > - WORD e_cblp; > - WORD e_cp; > - WORD e_crlc; > - WORD e_cparhdr; > - WORD e_minalloc; > - WORD e_maxalloc; > - WORD e_ss; > - WORD e_sp; > - WORD e_csum; > - WORD e_ip; > - WORD e_cs; > - WORD e_lfarlc; > - WORD e_ovno; > - WORD e_res[4]; > - WORD e_oemid; > - WORD e_oeminfo; > - WORD e_res2[10]; > - LONG e_lfanew; > -} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; > -#pragma pack(pop) > - > -#pragma pack(push,4) > -typedef struct _IMAGE_FILE_HEADER { > - WORD Machine; > - WORD NumberOfSections; > - DWORD TimeDateStamp; > - DWORD PointerToSymbolTable; > - DWORD NumberOfSymbols; > - WORD SizeOfOptionalHeader; > - WORD Characteristics; > -} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; > -#pragma pack(pop) > - > -typedef struct _IMAGE_DATA_DIRECTORY { > - DWORD VirtualAddress; > - DWORD Size; > -} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; > - > -typedef struct _IMAGE_OPTIONAL_HEADER32 { > - WORD Magic; > - BYTE MajorLinkerVersion; > - BYTE MinorLinkerVersion; > - DWORD SizeOfCode; > - DWORD SizeOfInitializedData; > - DWORD SizeOfUninitializedData; > - DWORD AddressOfEntryPoint; > - DWORD BaseOfCode; > - DWORD BaseOfData; > - DWORD ImageBase; > - DWORD SectionAlignment; > - DWORD FileAlignment; > - WORD MajorOperatingSystemVersion; > - WORD MinorOperatingSystemVersion; > - WORD MajorImageVersion; > - WORD MinorImageVersion; > - WORD MajorSubsystemVersion; > - WORD MinorSubsystemVersion; > - DWORD Win32VersionValue; > - DWORD SizeOfImage; > - DWORD SizeOfHeaders; > - DWORD CheckSum; > - WORD Subsystem; > - WORD DllCharacteristics; > - DWORD SizeOfStackReserve; > - DWORD SizeOfStackCommit; > - DWORD SizeOfHeapReserve; > - DWORD SizeOfHeapCommit; > - DWORD LoaderFlags; > - DWORD NumberOfRvaAndSizes; > - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; > -} IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32; > - > -typedef struct _IMAGE_OPTIONAL_HEADER64 { > - WORD Magic; > - BYTE MajorLinkerVersion; > - BYTE MinorLinkerVersion; > - DWORD SizeOfCode; > - DWORD SizeOfInitializedData; > - DWORD SizeOfUninitializedData; > - DWORD AddressOfEntryPoint; > - DWORD BaseOfCode; > - ULONGLONG ImageBase; > - DWORD SectionAlignment; > - DWORD FileAlignment; > - WORD MajorOperatingSystemVersion; > - WORD MinorOperatingSystemVersion; > - WORD MajorImageVersion; > - WORD MinorImageVersion; > - WORD MajorSubsystemVersion; > - WORD MinorSubsystemVersion; > - DWORD Win32VersionValue; > - DWORD SizeOfImage; > - DWORD SizeOfHeaders; > - DWORD CheckSum; > - WORD Subsystem; > - WORD DllCharacteristics; > - ULONGLONG SizeOfStackReserve; > - ULONGLONG SizeOfStackCommit; > - ULONGLONG SizeOfHeapReserve; > - ULONGLONG SizeOfHeapCommit; > - DWORD LoaderFlags; > - DWORD NumberOfRvaAndSizes; > - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; > -} IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64; > - > - > -#ifdef _TARGET_PE64 > -typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; > -typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER; > -#else > -typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER; > -typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER; > -#endif > - > -typedef struct _IMAGE_SECTION_HEADER { > - BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; > - union { > - DWORD PhysicalAddress; > - DWORD VirtualSize; > - } Misc; > - DWORD VirtualAddress; > - DWORD SizeOfRawData; > - DWORD PointerToRawData; > - DWORD PointerToRelocations; > - DWORD PointerToLinenumbers; > - WORD NumberOfRelocations; > - WORD NumberOfLinenumbers; > - DWORD Characteristics; > -} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; > - > -#pragma pack(push,4) > -typedef struct _IMAGE_BASE_RELOCATION { > - DWORD VirtualAddress; > - DWORD SizeOfBlock; > - WORD TypeOffset[1]; > -} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; > -#pragma pack(pop) > +#include "../pecoff.h" > > typedef struct { > USHORT f_magic; /* magic number */ > > >

3 6

Re: [ros-dev] [ros-diffs] [tkreuzer] 52156: [BOOTSECTOR] - export obj2bin on gcc builds, too - Add new macro CreateBootSectorTarget2, which uses portable assembly and use it with isoboot.S. I will replace all bootsectors wi...
by Timo Kreuzer 09 Jun '11

09 Jun '11

Am 09.06.2011 15:56, schrieb tkreuzer(a)svn.reactos.org: > Author: tkreuzer > Date: Thu Jun 9 13:56:44 2011 > New Revision: 52156 > > URL: http://svn.reactos.org/svn/reactos?rev=52156&view=rev > Log: > [BOOTSECTOR] > - export obj2bin on gcc builds, too > - Add new macro CreateBootSectorTarget2, which uses portable assembly and use it with isoboot.S. I will replace all bootsectors with the new code one at a time, and in the end we can eventually drop nmake > - add wrapper isobtrt.S, which defines ROS_REGTEST and includes isoboot.S > I mean of course "drop nasm" not "drop nmake"

1 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 52065: [NTOSKRNL] - renamed Io volumes global to match Windows names (in case of debug) - renamed IopDereferenceVpb() to IopDereferenceVpbAndFree(), IopReferenceVpbForVerify() to IopR...
by Alex Ionescu 07 Jun '11

07 Jun '11

The notification routine can change the list, as there is no lock involved. Therefore, you should grab the next entry before notifying the driver, to maintain a consistent list state. -- Best regards, Alex Ionescu On 2011-06-02, at 1:43 PM, pschweitzer(a)svn.reactos.org wrote: > + DriverNotificationRoutine(DeviceObject, TRUE); > + > + /* Go to the next entry */ > + ListEntry = ListEntry->Flink;

4 15

Re: [ros-dev] [ros-diffs] [cgutman] 52125: [AFD] - Fix IoModifyAccess vs IoReadAccess confusion
by Timo Kreuzer 07 Jun '11

07 Jun '11

I can't get the logic behind this change. Can you explain? Am 07.06.2011 00:55, schrieb cgutman(a)svn.reactos.org: > Author: cgutman > Date: Mon Jun 6 22:55:17 2011 > New Revision: 52125 > > URL: http://svn.reactos.org/svn/reactos?rev=52125&view=rev > Log: > [AFD] > - Fix IoModifyAccess vs IoReadAccess confusion > > Modified: > trunk/reactos/drivers/network/afd/afd/lock.c > > Modified: trunk/reactos/drivers/network/afd/afd/lock.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… > ============================================================================== > --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Mon Jun 6 22:55:17 2011 > @@ -123,7 +123,7 @@ > AFD_DbgPrint(MID_TRACE,("Probe and lock pages\n")); > _SEH2_TRY { > MmProbeAndLockPages( MapBuf[i].Mdl, KernelMode, > - Write ? IoModifyAccess : IoReadAccess ); > + Write ? IoReadAccess : IoModifyAccess ); > } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { > LockFailed = TRUE; > } _SEH2_END; > > >

2 1

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-dev