Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 52175: [FREELDR] Major header cleanup
by tkreuzer＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: tkreuzer Date: Fri Jun 10 17:18:26 2011 New Revision: 52175 URL: http://svn.reactos.org/svn/reactos?rev=52175&view=rev Log: [FREELDR] Major header cleanup Added: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/ (with props) trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h - copied, changed from r52171, trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h - copied unchanged from r52171, trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h (with props) trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pxe.h - copied unchanged from r52171, trunk/reactos/boot/freeldr/freeldr/include/arch/i386/pxe.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h (with props) Removed: trunk/reactos/boot/freeldr/freeldr/include/arch.h trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/pxe.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/realmode.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] Fri Jun 10 17:18:26 2011 @@ -20,8 +20,7 @@ .intel_syntax noprefix #define HEX(y) 0x##y -#define ASM -#include <arch.h> +#include <arch/pc/x86common.h> #include <multiboot.h> .code16 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S [iso-8859-1] Fri Jun 10 17:18:26 2011 @@ -20,8 +20,7 @@ .text .code16 -#define ASM -#include <arch.h> +#include <arch/pc/x86common.h> /* Only these flags are propagated into Int386() */ #define FLAGS_PROP (I386FLAG_CF | \ @@ -172,9 +171,9 @@ movsb /* Restore segment and all other registers */ - - - popal + + + popal popw %gs popw %fs popw %es Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] Fri Jun 10 17:18:26 2011 @@ -1,6 +1,9 @@ #include <ntoskrnl.h> -#define NDEBUG -#include <arch.h> + +/* For KeStallExecutionProcessor */ +#if defined(_M_IX86) || defined(_M_AMD64) +#include <arch/pc/pcbios.h> +#endif VOID NTAPI @@ -75,6 +78,7 @@ KeStallExecutionProcessor( IN ULONG MicroSeconds) { +#if defined(_M_IX86) || defined(_M_AMD64) REGS Regs; ULONG usec_this; @@ -111,4 +115,7 @@ MicroSeconds -= usec_this; } +#else + #error unimplemented +#endif } Removed: trunk/reactos/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch.h (removed) @@ -1,181 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __ASM__ -#pragma once -#endif - -#ifndef HEX -#define HEX(y) 0x##y -#endif - -#ifdef _M_AMD64 -#include <arch/amd64/amd64.h> -#endif - -#if defined (_M_IX86) -/* Defines needed for switching between real and protected mode */ -#define NULL_DESC HEX(00) /* NULL descriptor */ -#define PMODE_CS HEX(08) /* PMode code selector, base 0 limit 4g */ -#define PMODE_DS HEX(10) /* PMode data selector, base 0 limit 4g */ -#define RMODE_CS HEX(18) /* RMode code selector, base 0 limit 64k */ -#define RMODE_DS HEX(20) /* RMode data selector, base 0 limit 64k */ -#endif - -#define CR0_PE_SET HEX(00000001) /* OR this value with CR0 to enable pmode */ -#define CR0_PE_CLR HEX(FFFFFFFE) /* AND this value with CR0 to disable pmode */ - -#define STACK16ADDR HEX(7000) /* The 16-bit stack top will be at 0000:7000 */ -#define STACK32ADDR HEX(78000) /* The 32-bit stack top will be at 7000:8000, or 0x78000 */ - -#if defined (_M_IX86) || defined (_M_AMD64) -#define BIOSCALLBUFFER 0x78000 /* Buffer to store temporary data for any Int386() call */ -#define BIOSCALLBUFSEGMENT 0x7800 /* Buffer to store temporary data for any Int386() call */ -#define BIOSCALLBUFOFFSET 0x0000 /* Buffer to store temporary data for any Int386() call */ -#define FILESYSBUFFER 0x80000 /* Buffer to store file system data (e.g. cluster buffer for FAT) */ -#define DISKREADBUFFER 0x90000 /* Buffer to store data read in from the disk via the BIOS */ -#define DISKREADBUFFER_SIZE 512 -#elif defined(_M_PPC) || defined(_M_MIPS) -#define DISKREADBUFFER 0x80000000 -#define FILESYSBUFFER 0x80000000 -#elif defined(_M_ARM) -extern ULONG gDiskReadBuffer, gFileSysBuffer; -#define DISKREADBUFFER gDiskReadBuffer -#define FILESYSBUFFER gFileSysBuffer -#endif - -/* Makes "x" a global variable or label */ -#define EXTERN(x) .global x; x: - - -// Flag Masks -#define I386FLAG_CF HEX(0001) // Carry Flag -#define I386FLAG_RESV1 HEX(0002) // Reserved - Must be 1 -#define I386FLAG_PF HEX(0004) // Parity Flag -#define I386FLAG_RESV2 HEX(0008) // Reserved - Must be 0 -#define I386FLAG_AF HEX(0010) // Auxiliary Flag -#define I386FLAG_RESV3 HEX(0020) // Reserved - Must be 0 -#define I386FLAG_ZF HEX(0040) // Zero Flag -#define I386FLAG_SF HEX(0080) // Sign Flag -#define I386FLAG_TF HEX(0100) // Trap Flag (Single Step) -#define I386FLAG_IF HEX(0200) // Interrupt Flag -#define I386FLAG_DF HEX(0400) // Direction Flag -#define I386FLAG_OF HEX(0800) // Overflow Flag - - -#ifndef __ASM__ - -#include <pshpack1.h> -typedef struct -{ - unsigned long eax; - unsigned long ebx; - unsigned long ecx; - unsigned long edx; - - unsigned long esi; - unsigned long edi; - - unsigned short ds; - unsigned short es; - unsigned short fs; - unsigned short gs; - - unsigned long eflags; - -} DWORDREGS; - -typedef struct -{ - unsigned short ax, _upper_ax; - unsigned short bx, _upper_bx; - unsigned short cx, _upper_cx; - unsigned short dx, _upper_dx; - - unsigned short si, _upper_si; - unsigned short di, _upper_di; - - unsigned short ds; - unsigned short es; - unsigned short fs; - unsigned short gs; - - unsigned short flags, _upper_flags; - -} WORDREGS; - -typedef struct -{ - unsigned char al; - unsigned char ah; - unsigned short _upper_ax; - unsigned char bl; - unsigned char bh; - unsigned short _upper_bx; - unsigned char cl; - unsigned char ch; - unsigned short _upper_cx; - unsigned char dl; - unsigned char dh; - unsigned short _upper_dx; - - unsigned short si, _upper_si; - unsigned short di, _upper_di; - - unsigned short ds; - unsigned short es; - unsigned short fs; - unsigned short gs; - - unsigned short flags, _upper_flags; - -} BYTEREGS; - - -typedef union -{ - DWORDREGS x; - DWORDREGS d; - WORDREGS w; - BYTEREGS b; -} REGS; -#include <poppack.h> - -// Int386() -// -// Real mode interrupt vector interface -// -// (E)FLAGS can *only* be returned by this function, not set. -// Make sure all memory pointers are in SEG:OFFS format and -// not linear addresses, unless the interrupt handler -// specifically handles linear addresses. -int Int386(int ivec, REGS* in, REGS* out); - -// This macro tests the Carry Flag -// If CF is set then the call failed (usually) -#define INT386_SUCCESS(regs) ((regs.x.eflags & I386FLAG_CF) == 0) - -void EnableA20(void); - -VOID ChainLoadBiosBootSectorCode(VOID); // Implemented in boot.S -VOID SoftReboot(VOID); // Implemented in boot.S - -VOID DetectHardware(VOID); // Implemented in hardware.c - -#endif /* ! __ASM__ */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Fri Jun 10 17:18:26 2011 @@ -56,11 +56,7 @@ #ifndef ASM VOID FrLdrSetupGdtIdt(VOID); - -#include <arch/i386/realmode.h> -#define FrldrBootDrive *((PULONG)BSS_BootDrive) -#define FrldrBootPartition *((PULONG)BSS_BootPartition) - +#define MachInit PcMachInit #endif /* EOF */ Removed: trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h (removed) @@ -1,94 +1,0 @@ -/* - * FreeLoader - * - * Copyright (C) 2003 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#ifndef __REGISTRY_H -#include "../../reactos/registry.h" -#endif - -#define CONFIG_CMD(bus, dev_fn, where) \ - (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) - - -// -// Static heap for ARC Hardware Component Tree -// 16KB oughta be enough for anyone. -// -#define HW_MAX_ARC_HEAP_SIZE 16 * 1024 - -// -// ARC Component Configuration Routines -// -VOID -NTAPI -FldrCreateSystemKey( - OUT PCONFIGURATION_COMPONENT_DATA *SystemKey -); - -VOID -NTAPI -FldrCreateComponentKey( - IN PCONFIGURATION_COMPONENT_DATA SystemKey, - IN CONFIGURATION_CLASS Class, - IN CONFIGURATION_TYPE Type, - IN IDENTIFIER_FLAG Flags, - IN ULONG Key, - IN ULONG Affinity, - IN PCHAR IdentifierString, - IN PCM_PARTIAL_RESOURCE_LIST ResourceList, - IN ULONG Size, - OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey -); - -/* PROTOTYPES ***************************************************************/ - -/* hardware.c */ - -VOID StallExecutionProcessor(ULONG Microseconds); - -VOID HalpCalibrateStallExecution(VOID); - -/* hwacpi.c */ -VOID DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber); - -/* hwapm.c */ -VOID DetectApmBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber); - -/* hwpci.c */ -VOID DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber); - -/* i386cpu.S */ -ULONG CpuidSupported(VOID); -VOID GetCpuid(ULONG Level, - ULONG *eax, - ULONG *ebx, - ULONG *ecx, - ULONG *edx); -ULONGLONG RDTSC(VOID); - -/* i386pnp.S */ -ULONG_PTR PnpBiosSupported(VOID); -ULONG PnpBiosGetDeviceNodeCount(ULONG *NodeSize, - ULONG *NodeCount); -ULONG PnpBiosGetDeviceNode(UCHAR *NodeId, - UCHAR *NodeBuffer); - -/* EOF */ Removed: trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h (removed) @@ -1,62 +1,0 @@ -/* $Id: machpc.h 32135 2008-02-05 11:13:17Z ros-arm-bringup $ - * - * FreeLoader - * - * Copyright (C) 2003 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#ifndef __MEMORY_H -#include "mm.h" -#endif - -#define MachInit PcMachInit -VOID PcMachInit(const char *CmdLine); - -VOID PcConsPutChar(int Ch); -BOOLEAN PcConsKbHit(VOID); -int PcConsGetCh(VOID); - -VOID PcVideoClearScreen(UCHAR Attr); -VIDEODISPLAYMODE PcVideoSetDisplayMode(char *DisplayMode, BOOLEAN Init); -VOID PcVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth); -ULONG PcVideoGetBufferSize(VOID); -VOID PcVideoSetTextCursorPosition(ULONG X, ULONG Y); -VOID PcVideoHideShowTextCursor(BOOLEAN Show); -VOID PcVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y); -VOID PcVideoCopyOffScreenBufferToVRAM(PVOID Buffer); -BOOLEAN PcVideoIsPaletteFixed(VOID); -VOID PcVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); -VOID PcVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); -VOID PcVideoSync(VOID); -VOID PcVideoPrepareForReactOS(IN BOOLEAN Setup); -VOID PcPrepareForReactOS(IN BOOLEAN Setup); - -ULONG PcMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); - -BOOLEAN PcDiskGetBootPath(char *BootPath, unsigned Size); -BOOLEAN PcDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); -BOOLEAN PcDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); -BOOLEAN PcDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); -ULONG PcDiskGetCacheableBlockCount(ULONG DriveNumber); - -TIMEINFO* PcGetTime(VOID); - -PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID); - -/* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] Fri Jun 10 17:18:26 2011 @@ -35,3 +35,7 @@ extern ULONG SecondLevelDcacheFillSize; extern ULONG SecondLevelIcacheSize; extern ULONG SecondLevelIcacheFillSize; + +extern ULONG gDiskReadBuffer, gFileSysBuffer; +#define DISKREADBUFFER gDiskReadBuffer +#define FILESYSBUFFER gFileSysBuffer Removed: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h (removed) @@ -1,97 +1,0 @@ -/* - * FreeLoader - * - * Copyright (C) 2003 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#ifndef __REGISTRY_H -#include "../../reactos/registry.h" -#endif - -#define CONFIG_CMD(bus, dev_fn, where) \ - (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) - - -// -// Static heap for ARC Hardware Component Tree -// 16KB oughta be enough for anyone. -// -#define HW_MAX_ARC_HEAP_SIZE 16 * 1024 - -// -// ARC Component Configuration Routines -// -VOID -NTAPI -FldrCreateSystemKey( - OUT PCONFIGURATION_COMPONENT_DATA *SystemKey -); - -VOID -NTAPI -FldrCreateComponentKey( - IN PCONFIGURATION_COMPONENT_DATA SystemKey, - IN CONFIGURATION_CLASS Class, - IN CONFIGURATION_TYPE Type, - IN IDENTIFIER_FLAG Flags, - IN ULONG Key, - IN ULONG Affinity, - IN PCHAR IdentifierString, - IN PCM_PARTIAL_RESOURCE_LIST ResourceList, - IN ULONG Size, - OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey -); - -/* PROTOTYPES ***************************************************************/ - -/* hardware.c */ - -VOID StallExecutionProcessor(ULONG Microseconds); - -VOID HalpCalibrateStallExecution(VOID); - -/* hwacpi.c */ -VOID DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber); - -/* hwapm.c */ -VOID DetectApmBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber); - -/* hwpci.c */ -VOID DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber); - -/* i386cpu.S */ -ULONG CpuidSupported(VOID); -VOID GetCpuid(ULONG Level, - ULONG *eax, - ULONG *ebx, - ULONG *ecx, - ULONG *edx); -ULONGLONG RDTSC(VOID); - -/* i386pnp.S */ -ULONG PnpBiosSupported(VOID); -ULONG PnpBiosGetDeviceNodeCount(ULONG *NodeSize, - ULONG *NodeCount); -ULONG PnpBiosGetDeviceNode(UCHAR *NodeId, - UCHAR *NodeBuffer); - -/* i386pxe.S */ -USHORT PxeCallApi(USHORT Segment, USHORT Offset, USHORT Service, VOID* Parameter); - -/* EOF */ Removed: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h (removed) @@ -1,61 +1,0 @@ -/* $Id$ - * - * FreeLoader - * - * Copyright (C) 2003 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#ifndef __MEMORY_H -#include "mm.h" -#endif - -VOID PcMachInit(const char *CmdLine); - -VOID PcConsPutChar(int Ch); -BOOLEAN PcConsKbHit(VOID); -int PcConsGetCh(VOID); - -VOID PcVideoClearScreen(UCHAR Attr); -VIDEODISPLAYMODE PcVideoSetDisplayMode(char *DisplayMode, BOOLEAN Init); -VOID PcVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth); -ULONG PcVideoGetBufferSize(VOID); -VOID PcVideoSetTextCursorPosition(ULONG X, ULONG Y); -VOID PcVideoHideShowTextCursor(BOOLEAN Show); -VOID PcVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y); -VOID PcVideoCopyOffScreenBufferToVRAM(PVOID Buffer); -BOOLEAN PcVideoIsPaletteFixed(VOID); -VOID PcVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); -VOID PcVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); -VOID PcVideoSync(VOID); -VOID PcVideoPrepareForReactOS(IN BOOLEAN Setup); -VOID PcPrepareForReactOS(IN BOOLEAN Setup); - -ULONG PcMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); - -BOOLEAN PcDiskGetBootPath(char *BootPath, unsigned Size); -BOOLEAN PcDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); -BOOLEAN PcDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); -BOOLEAN PcDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); -ULONG PcDiskGetCacheableBlockCount(ULONG DriveNumber); - -TIMEINFO* PcGetTime(VOID); - -PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID); - -/* EOF */ Removed: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/pxe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/pxe.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/pxe.h (removed) @@ -1,602 +1,0 @@ -#ifndef _PXE_ -#define _PXE_ - -/* Basic types */ - -typedef UINT16 OFF16; -typedef UINT16 PXENV_EXIT; -typedef UINT16 PXENV_STATUS; -typedef UINT16 SEGSEL; -typedef UINT16 UDP_PORT; -typedef UINT32 ADDR32; - -#include <pshpack1.h> - -#define IP_ADDR_LEN 4 -typedef union -{ - UINT32 num; - UINT8 array[IP_ADDR_LEN]; -} IP4; - -#define MAC_ADDR_LEN 16 -typedef UINT8 MAC_ADDR[MAC_ADDR_LEN]; - -typedef struct s_SEGDESC -{ - UINT16 segment_address; - UINT32 physical_address; - UINT16 seg_size; -} SEGDESC; - -typedef struct s_SEGOFF16 -{ - OFF16 offset; - SEGSEL segment; -} SEGOFF16; - -typedef struct s_PXE -{ - UINT8 Signature[4]; - UINT8 StructLength; - UINT8 StructCksum; - UINT8 StructRev; - UINT8 reserved1; - SEGOFF16 UNDIROMID; - SEGOFF16 BaseROMID; - SEGOFF16 EntryPointSP; - SEGOFF16 EntryPointESP; - SEGOFF16 StatusCallout; - UINT8 reserved2; - UINT8 SegDescCnt; - SEGSEL FirstSelector; - SEGDESC Stack; - SEGDESC UNDIData; - SEGDESC UNDICode; - SEGDESC UNDICodeWrite; - SEGDESC BC_Data; - SEGDESC BC_Code; - SEGDESC BC_CodeWrite; -} PXE, *PPXE; - -/* PXENV structures */ - -typedef struct s_PXENV_START_UNDI -{ - PXENV_STATUS Status; - UINT16 AX; - UINT16 BX; - UINT16 DX; - UINT16 DI; - UINT16 ES; -} t_PXENV_START_UNDI; - -typedef struct s_PXENV_UNDI_STARTUP -{ - PXENV_STATUS Status; -} t_PXENV_UNDI_STARTUP; - -typedef struct s_PXENV_UNDI_CLEANUP -{ - PXENV_STATUS Status; -} t_PXENV_UNDI_CLEANUP; - -typedef struct s_PXENV_UNDI_INITIALIZE -{ - PXENV_STATUS Status; - ADDR32 ProtocolIni; - UINT8 reserved[8]; -} t_PXENV_UNDI_INITIALIZE; - -#define MAXNUM_MCADDR 8 -typedef struct s_PXENV_UNDI_MCAST_ADDRESS -{ - UINT16 MCastAddrCount; - MAC_ADDR McastAddr[MAXNUM_MCADDR]; -} t_PXENV_UNDI_MCAST_ADDRESS; - -typedef struct s_PXENV_UNDI_RESET -{ - PXENV_STATUS Status; - t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf; -} t_PXENV_UNDI_RESET; - -typedef struct s_PXENV_UNDI_SHUTDOWN -{ - PXENV_STATUS Status; -} t_PXENV_UNDI_SHUTDOWN; - -typedef struct s_PXENV_UNDI_OPEN -{ - PXENV_STATUS Status; - UINT16 OpenFlag; - UINT16 PktFilter; -#define FLTR_DIRECTED 0x01 -#define FLTR_BRDCST 0x02 -#define FLTR_PRMSCS 0x04 -#define FLTR_SRC_RTG 0x08 - - t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf; -} t_PXENV_UNDI_OPEN; - -typedef struct s_PXENV_UNDI_CLOSE -{ - PXENV_STATUS Status; -} t_PXENV_UNDI_CLOSE; - -typedef struct s_PXENV_UNDI_TRANSMIT -{ - PXENV_STATUS Status; - UINT8 Protocol; -#define P_UNKNOWN 0 -#define P_IP 1 -#define P_ARP 2 -#define P_RARP 3 - - UINT8 XmitFlag; -#define XMT_DESTADDR 0x00 -#define XMT_BROADCAST 0x01 - - SEGOFF16 DestAddr; - SEGOFF16 TBD; - UINT32 Reserved[2]; -} t_PXENV_UNDI_TRANSMIT; - -#define MAX_DATA_BLKS 8 -typedef struct s_PXENV_UNDI_TBD -{ - UINT16 ImmedLength; - SEGOFF16 Xmit; - UINT16 DataBlkCount; - struct DataBlk - { - UINT8 TDPtrType; - UINT8 TDRsvdByte; - UINT8 TDDataLen; - SEGOFF16 TDDataPtr; - } DataBlock[MAX_DATA_BLKS]; -} t_PXENV_UNDI_TBD; - -typedef struct s_PXENV_UNDI_SET_MCAST_ADDRESS -{ - PXENV_STATUS Status; - t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf; -} t_PXENV_UNDI_SET_MCAST_ADDRESS; - -typedef struct s_PXENV_UNDI_SET_STATION_ADDRESS -{ - PXENV_STATUS Status; - MAC_ADDR StationAddress; -} t_PXENV_UNDI_SET_STATION_ADDRESS; - -typedef struct s_PXENV_UNDI_SET_PACKET_FILTER -{ - PXENV_STATUS Status; - UINT8 filter; -} t_PXENV_UNDI_SET_PACKET_FILTER; - -typedef struct s_PXENV_UNDI_GET_INFORMATION -{ - PXENV_STATUS Status; - UINT16 BaseIo; - UINT16 IntNumber; - UINT16 MaxTranUnit; - UINT16 HwType; -#define ETHER_TYPE 1 -#define EXP_ETHER_TYPE 2 -#define IEEE_TYPE 3 -#define ARCNET_TYPE 4 - - UINT16 HwAddrLen; - MAC_ADDR CurrentNodeAddress; - MAC_ADDR PermNodeAddress; - SEGSEL ROMAddress; - UINT16 RxBufCt; - UINT16 TxBufCt; -} t_PXENV_UNDI_GET_INFORMATION; - -typedef struct s_PXENV_UNDI_GET_STATISTICS -{ - PXENV_STATUS Status; - UINT32 XmtGoodFrames; - UINT32 RcvGoodFrames; - UINT32 RcvCRCErrors; - UINT32 RcvResourceErrors; -} t_PXENV_UNDI_GET_STATISTICS; - -typedef struct s_PXENV_UNDI_CLEAR_STATISTICS -{ - PXENV_STATUS Status; -} t_PXENV_UNDI_CLEAR_STATISTICS; - -typedef struct s_PXENV_UNDI_INITIATE_DIAGS -{ - PXENV_STATUS Status; -} t_PXENV_UNDI_INITIATE_DIAGS; - -typedef struct s_PXENV_UNDI_FORCE_INTERRUPT -{ - PXENV_STATUS Status; -} t_PXENV_UNDI_FORCE_INTERRUPT; - -typedef struct s_PXENV_UNDI_GET_MCAST_ADDRESS -{ - PXENV_STATUS Status; - IP4 InetAddr; - MAC_ADDR MediaAddr; -} t_PXENV_UNDI_GET_MCAST_ADDRESS; - -typedef struct s_PXENV_UNDI_GET_NIC_TYPE -{ - PXENV_STATUS Status; - UINT8 NicType; -#define PCI_NIC 2 -#define PnP_NIC 3 -#define CardBus_NIC 4 - - union - { - struct - { - UINT16 Vendor_ID; - UINT16 Dev_ID; - UINT8 Base_Class; - UINT8 Sub_Class; - UINT8 Prog_Intf; - UINT8 Rev; - UINT16 BusDevFunc; - UINT16 SubVendor_ID; - UINT16 SubDevice_ID; - } pci, cardbus; - struct - { - UINT32 EISA_Dev_ID; - UINT8 Base_Class; - UINT8 Sub_Class; - UINT8 Prog_Intf; - UINT16 CardSelNum; - } pnp; - } info; -} t_PXENV_UNDI_GET_NIC_TYPE; - -typedef struct s_PXENV_UNDI_GET_IFACE_INFO -{ - PXENV_STATUS Status; - UINT8 IfaceType[16]; - UINT32 LinkSpeed; - UINT32 ServiceFlags; - UINT32 Reserved[4]; -} t_PXENV_UNDI_GET_IFACE_INFO; - -typedef struct s_PXENV_UNDI_ISR -{ - PXENV_STATUS Status; - UINT16 FuncFlag; - UINT16 BufferLength; - UINT16 FrameLength; - UINT16 FrameHeaderLength; - SEGOFF16 Frame; - UINT8 ProtType; - UINT8 PktType; -} t_PXENV_UNDI_ISR; - -#define PXENV_UNDI_ISR_IN_START 1 -#define PXENV_UNDI_ISR_IN_PROCESS 2 -#define PXENV_UNDI_ISR_IN_GET_NEXT 3 - -/* One of these will be returned for PXENV_UNDI_ISR_IN_START */ -#define PXENV_UNDI_ISR_OUT_OURS 0 -#define PXENV_UNDI_ISR_OUT_NOT_OURS 1 - -/* One of these will be returned for PXENV_UNDI_ISR_IN_PROCESS and PXENV_UNDI_ISR_IN_GET_NEXT */ -#define PXENV_UNDI_ISR_OUT_DONE 0 -#define PXENV_UNDI_ISR_OUT_TRANSMIT 2 -#define PXENV_UNDI_ISR_OUT_RECEIVE 3 -#define PXENV_UNDI_ISR_OUT_BUSY 4 - -typedef struct s_PXENV_UNDI_GET_STATE -{ - PXENV_STATUS Status; -#define PXE_UNDI_GET_STATE_STARTED 1 -#define PXE_UNDI_GET_STATE_INITIALIZED 2 -#define PXE_UNDI_GET_STATE_OPENED 3 - UINT8 UNDIState; -} t_PXENV_UNDI_GET_STATE; - -typedef struct s_PXENV_STOP_UNDI -{ - PXENV_STATUS Status; -} t_PXENV_STOP_UNDI; - -typedef struct s_PXENV_TFTP_OPEN -{ - PXENV_STATUS Status; - IP4 ServerIPAddress; - IP4 GatewayIPAddress; - UINT8 FileName[128]; - UDP_PORT TFTPPort; - UINT16 PacketSize; -} t_PXENV_TFTP_OPEN; - -typedef struct s_PXENV_TFTP_CLOSE -{ - PXENV_STATUS Status; -} t_PXENV_TFTP_CLOSE; - -typedef struct s_PXENV_TFTP_READ -{ - PXENV_STATUS Status; - UINT16 PacketNumber; - UINT16 BufferSize; - SEGOFF16 Buffer; -} t_PXENV_TFTP_READ; - -typedef struct s_PXENV_TFTP_READ_FILE -{ - PXENV_STATUS Status; - UINT8 FileName[128]; - UINT32 BufferSize; - ADDR32 Buffer; - IP4 ServerIPAddress; - IP4 GatewayIPAddress; - IP4 McastIPAddress; - UDP_PORT TFTPClntPort; - UDP_PORT TFTPSvrPort; - UINT16 TFTPOpenTimeOut; - UINT16 TFTPReopenDelay; -} t_PXENV_TFTP_READ_FILE; - -typedef struct s_PXENV_TFTP_GET_FSIZE -{ - PXENV_STATUS Status; - IP4 ServerIPAddress; - IP4 GatewayIPAddress; - UINT8 FileName[128]; - UINT32 FileSize; -} t_PXENV_TFTP_GET_FSIZE; - -typedef struct s_PXENV_UDP_OPEN -{ - PXENV_STATUS Status; - IP4 src_ip; -} t_PXENV_UDP_OPEN; - -typedef struct s_PXENV_UDP_CLOSE -{ - PXENV_STATUS Status; -} t_PXENV_UDP_CLOSE; - -typedef struct s_PXENV_UDP_READ -{ - PXENV_STATUS Status; - IP4 ip; - IP4 dest_ip; - UDP_PORT s_port; - UDP_PORT d_port; - UINT16 buffer_size; - SEGOFF16 buffer; -} t_PXENV_UDP_READ; - -typedef struct s_PXENV_UDP_WRITE -{ - PXENV_STATUS Status; - IP4 ip; - IP4 gw; - UDP_PORT src_port; - UDP_PORT dst_port; - UINT16 buffer_size; - SEGOFF16 buffer; -} t_PXENV_UDP_WRITE; - -typedef struct s_PXENV_UNLOAD_STACK -{ - PXENV_STATUS Status; - UINT8 reserved[10]; -} t_PXENV_UNLOAD_STACK; - -typedef struct s_PXENV_GET_CACHED_INFO -{ - PXENV_STATUS Status; - UINT16 PacketType; -#define PXENV_PACKET_TYPE_DHCP_DISCOVER 1 -#define PXENV_PACKET_TYPE_DHCP_ACK 2 -#define PXENV_PACKET_TYPE_CACHED_REPLY 3 - UINT16 BufferSize; - SEGOFF16 Buffer; - UINT16 BufferLimit; -} t_PXENV_GET_CACHED_INFO; - -typedef struct s_PXENV_START_BASE -{ - PXENV_STATUS Status; -} t_PXENV_START_BASE; - -typedef struct s_PXENV_STOP_BASE -{ - PXENV_STATUS Status; -} t_PXENV_STOP_BASE; - -typedef struct bootph -{ - UINT8 opcode; -#define BOOTP_REQ 1 -#define BOOTP_REP 2 - - UINT8 Hardware; - UINT8 Hardlen; - UINT8 Gatehops; - UINT32 ident; - UINT16 seconds; - UINT16 Flags; -#define BOOTP_BCAST 0x8000 - - IP4 cip; - IP4 yip; - IP4 sip; - IP4 gip; - MAC_ADDR CAddr; - UINT8 Sname[64]; - UINT8 bootfile[128]; - union - { -#define BOOTP_DHCPVEND 1024 /* DHCP extended vendor field size */ - UINT8 d[BOOTP_DHCPVEND]; - struct - { - UINT8 magic[4]; -#define VM_RFC1048 0x63825363 - UINT32 flags; - UINT8 pad[56]; - } v; - } vendor; -} BOOTPLAYER; - -#include <poppack.h> - -/* Exit codes returned in AX by a PXENV API service */ -#define PXENV_EXIT_SUCCESS 0x0000 -#define PXENV_EXIT_FAILURE 0x0001 - -/* Generic API status & error codes that are reported by the loader */ -#define PXENV_STATUS_SUCCESS 0x00 -#define PXENV_STATUS_FAILURE 0x01 /* General failure */ -#define PXENV_STATUS_BAD_FUNC 0x02 /* Invalid function number */ -#define PXENV_STATUS_UNSUPPORTED 0x03 /* Function is not yet supported */ -#define PXENV_STATUS_KEEP_UNDI 0x04 /* UNDI must not be unloaded from base memory */ -#define PXENV_STATUS_KEEP_ALL 0x05 -#define PXENV_STATUS_OUT_OF_RESOURCES 0x06 /* Base code and UNDI must not be unloaded from base memory */ - -/* ARP errors (0x10 to 0x1f) */ -#define PXENV_STATUS_ARP_TIMEOUT 0x11 - -/* Base code state errors */ -#define PXENV_STATUS_UDP_CLOSED 0x18 -#define PXENV_STATUS_UDP_OPEN 0x19 -#define PXENV_STATUS_TFTP_CLOSED 0x1a -#define PXENV_STATUS_TFTP_OPEN 0x1b - -/* BIOS/system errors (0x20 to 0x2f) */ -#define PXENV_STATUS_MCOPY_PROBLEM 0x20 -#define PXENV_STATUS_BIS_INTEGRITY_FAILURE 0x21 -#define PXENV_STATUS_BIS_VALIDATE_FAILURE 0x22 -#define PXENV_STATUS_BIS_INIT_FAILURE 0x23 -#define PXENV_STATUS_BIS_SHUTDOWN_FAILURE 0x24 -#define PXENV_STATUS_BIS_GBOA_FAILURE 0x25 -#define PXENV_STATUS_BIS_FREE_FAILURE 0x26 -#define PXENV_STATUS_BIS_GSI_FAILURE 0x27 -#define PXENV_STATUS_BIS_BAD_CKSUM 0x28 - -/* TFTP/MTFTP errors (0x30 to 0x3f) */ -#define PXENV_STATUS_TFTP_CANNOT_ARP_ADDRESS 0x30 -#define PXENV_STATUS_TFTP_OPEN_TIMEOUT 0x32 -#define PXENV_STATUS_TFTP_UNKNOWN_OPCODE 0x33 -#define PXENV_STATUS_TFTP_READ_TIMEOUT 0x35 -#define PXENV_STATUS_TFTP_ERROR_OPCODE 0x36 -#define PXENV_STATUS_TFTP_CANNOT_OPEN_CONNECTION 0x38 -#define PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION 0x39 -#define PXENV_STATUS_TFTP_TOO_MANY_PACKAGES 0x3a -#define PXENV_STATUS_TFTP_FILE_NOT_FOUND 0x3b -#define PXENV_STATUS_TFTP_ACCESS_VIOLATION 0x3c -#define PXENV_STATUS_TFTP_NO_MCAST_ADDRESS 0x3d -#define PXENV_STATUS_TFTP_NO_FILESIZE 0x3e -#define PXENV_STATUS_TFTP_INVALID_PACKET_SIZE 0x3f - -/* Reserved errors (0x40 to 0x4f) */ - -/* DHCP/BOOTP errors (0x50 to 0x5f) */ -#define PXENV_STATUS_DHCP_TIMEOUT 0x51 -#define PXENV_STATUS_DHCP_NO_IP_ADDRESS 0x52 -#define PXENV_STATUS_DHCP_NO_BOOTFILE_NAME 0x53 -#define PXENV_STATUS_DHCP_BAD_IP_ADDRESS 0x54 - -/* Driver errors (0x60 to 0x6f) */ -/* These errors are for UNDI compatible NIC drivers */ -#define PXENV_STATUS_UNDI_INVALID_FUNCTION 0x60 -#define PXENV_STATUS_UNDI_MEDIATEST_FAILED 0x61 -#define PXENV_STATUS_UNDI_CANNOT_INIT_NIC_FOR_MCAST 0x62 -#define PXENV_STATUS_UNDI_CANNOT_INITIALIZE_NIC 0x63 -#define PXENV_STATUS_UNDI_CANNOT_INITIALIZE_PHY 0x64 -#define PXENV_STATUS_UNDI_CANNOT_READ_CONFIG_DATA 0x65 -#define PXENV_STATUS_UNDI_CANNOT_READ_INIT_DATA 0x66 -#define PXENV_STATUS_UNDI_BAD_MAC_ADDRESS 0x67 -#define PXENV_STATUS_UNDI_BAD_EEPROM_CHECKSUM 0x68 -#define PXENV_STATUS_UNDI_ERROR_SETTING_ISR 0x69 -#define PXENV_STATUS_UNDI_INVALID_STATE 0x6a -#define PXENV_STATUS_UNDI_TRANSMIT_ERROR 0x6b -#define PXENV_STATUS_UNDI_INVALID_PARAMETER 0x6c - -/* ROM and NBP bootstrap errors (0x70 to 0x7f) */ -#define PXENV_STATUS_BSTRAP_PROMPT_MENU 0x74 -#define PXENV_STATUS_BSTRAP_MCAST_ADDR 0x76 -#define PXENV_STATUS_BSTRAP_MISSING_LIST 0x77 -#define PXENV_STATUS_BSTRAP_NO_RESPONSE 0x78 -#define PXENV_STATUS_BSTRAP_FILE_TOO_BIG 0x79 - -/* Environment NBP errors (0x80 to 0x8f) */ - -/* Reserved errors (0x90 to 0x9f) */ - -/* Misc. errors (0xa0 to 0xaf) */ -#define PXENV_STATUS_BINL_CANCELED_BY_KEYSTROKE 0xa0 -#define PXENV_STATUS_BINL_NO_PXE_SERVER 0xa1 -#define PXENV_STATUS_NOT_AVAILABLE_IN_PMODE 0xa2 -#define PXENV_STATUS_NOT_AVAILABLE_IN_RMODE 0xa3 - -/* BUSD errors (0xb0 to 0xbf) */ -#define PXENV_STATUS_BUSD_DEVICE_NOT_SUPPORTED 0xb0 - -/* Loader errors (0xc0 to 0xcf) */ -#define PXENV_STATUS_LOADER_NO_FREE_BASE_MEMORY 0xc0 -#define PXENV_STATUS_LOADER_NO_BC_ROMID 0xc1 -#define PXENV_STATUS_LOADER_BAD_BC_ROMID 0xc2 -#define PXENV_STATUS_LOADER_BAD_BC_RUNTIME_IMAGE 0xc3 -#define PXENV_STATUS_LOADER_NO_UNDI_ROMID 0xc4 -#define PXENV_STATUS_LOADER_BAD_UNDI_ROMID 0xc5 -#define PXENV_STATUS_LOADER_BAD_UNDI_DRIVER_IMAGE 0xc6 -#define PXENV_STATUS_LOADER_NO_PXE_STRUCT 0xc8 -#define PXENV_STATUS_LOADER_NO_PXENV_STRUCT 0xc9 -#define PXENV_STATUS_LOADER_UNDI_START 0xca -#define PXENV_STATUS_LOADER_BC_START 0xcb - -/* Vendor errors (0xd0 to 0xff) */ - -/* PXENV API services */ -#define PXENV_START_UNDI 0x00 -#define PXENV_UNDI_STARTUP 0x01 -#define PXENV_UNDI_CLEANUP 0x02 -#define PXENV_UNDI_INITIALIZE 0x03 -#define PXENV_UNDI_RESET_ADAPTER 0x04 -#define PXENV_UNDI_SHUTDOWN 0x05 -#define PXENV_UNDI_OPEN 0x06 -#define PXENV_UNDI_CLOSE 0x07 -#define PXENV_UNDI_TRANSMIT 0x08 -#define PXENV_UNDI_SET_MCAST_ADDRESS 0x09 -#define PXENV_UNDI_SET_STATION_ADDRESS 0x0a -#define PXENV_UNDI_SET_PACKET_FILTER 0x0b -#define PXENV_UNDI_GET_INFORMATION 0x0c -#define PXENV_UNDI_GET_STATISTICS 0x0d -#define PXENV_UNDI_CLEAR_STATISTICS 0x0e -#define PXENV_UNDI_INITIATE_DIAGS 0x0f -#define PXENV_UNDI_FORCE_INTERRUPT 0x10 -#define PXENV_UNDI_GET_MCAST_ADDRESS 0x11 -#define PXENV_UNDI_GET_NIC_TYPE 0x12 -#define PXENV_UNDI_GET_IFACE_INFO 0x13 -#define PXENV_UNDI_ISR 0x14 -#define PXENV_UNDI_GET_STATE 0x15 -#define PXENV_STOP_UNDI 0x15 -#define PXENV_TFTP_OPEN 0x20 -#define PXENV_TFTP_CLOSE 0x21 -#define PXENV_TFTP_READ 0x22 -#define PXENV_TFTP_READ_FILE 0x23 -#define PXENV_TFTP_GET_FSIZE 0x25 -#define PXENV_UDP_OPEN 0x30 -#define PXENV_UDP_CLOSE 0x31 -#define PXENV_UDP_READ 0x32 -#define PXENV_UDP_WRITE 0x33 -#define PXENV_UNLOAD_STACK 0x70 -#define PXENV_GET_CACHED_INFO 0x71 -#define PXENV_RESTART_TFTP 0x73 -#define PXENV_START_BASE 0x75 -#define PXENV_STOP_BASE 0x76 - -#endif Removed: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/realmode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/realmode.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/realmode.h (removed) @@ -1,13 +1,0 @@ - - -/* These addresses specify the realmode "BSS section" */ -#define BSS_START HEX(7000) -#define BSS_CallbackAddress BSS_START + 0 -#define BSS_CallbackReturn BSS_START + 8 -#define BSS_BootDrive BSS_START + 16 -#define BSS_BootPartition BSS_START + 20 - -#define PE_LOAD_BASE HEX(9000) -#define IMAGE_DOS_HEADER_e_lfanew 36 -#define IMAGE_FILE_HEADER_SIZE 20 -#define IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint 16 Propchange: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Jun 10 17:18:26 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h (from r52171, trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h [iso-8859-1] Fri Jun 10 17:18:26 2011 @@ -19,10 +19,6 @@ */ #pragma once - -#ifndef __REGISTRY_H -#include "../../reactos/registry.h" -#endif #define CONFIG_CMD(bus, dev_fn, where) \ (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) @@ -85,7 +81,7 @@ ULONGLONG RDTSC(VOID); /* i386pnp.S */ -ULONG PnpBiosSupported(VOID); +ULONG_PTR PnpBiosSupported(VOID); ULONG PnpBiosGetDeviceNodeCount(ULONG *NodeSize, ULONG *NodeCount); ULONG PnpBiosGetDeviceNode(UCHAR *NodeId, Added: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h (added) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h [iso-8859-1] Fri Jun 10 17:18:26 2011 @@ -1,0 +1,98 @@ +#ifndef __ASM__ + +#include <pshpack1.h> +typedef struct +{ + unsigned long eax; + unsigned long ebx; + unsigned long ecx; + unsigned long edx; + + unsigned long esi; + unsigned long edi; + + unsigned short ds; + unsigned short es; + unsigned short fs; + unsigned short gs; + + unsigned long eflags; + +} DWORDREGS; + +typedef struct +{ + unsigned short ax, _upper_ax; + unsigned short bx, _upper_bx; + unsigned short cx, _upper_cx; + unsigned short dx, _upper_dx; + + unsigned short si, _upper_si; + unsigned short di, _upper_di; + + unsigned short ds; + unsigned short es; + unsigned short fs; + unsigned short gs; + + unsigned short flags, _upper_flags; + +} WORDREGS; + +typedef struct +{ + unsigned char al; + unsigned char ah; + unsigned short _upper_ax; + unsigned char bl; + unsigned char bh; + unsigned short _upper_bx; + unsigned char cl; + unsigned char ch; + unsigned short _upper_cx; + unsigned char dl; + unsigned char dh; + unsigned short _upper_dx; + + unsigned short si, _upper_si; + unsigned short di, _upper_di; + + unsigned short ds; + unsigned short es; + unsigned short fs; + unsigned short gs; + + unsigned short flags, _upper_flags; + +} BYTEREGS; + + +typedef union +{ + DWORDREGS x; + DWORDREGS d; + WORDREGS w; + BYTEREGS b; +} REGS; +#include <poppack.h> + +// Int386() +// +// Real mode interrupt vector interface +// +// (E)FLAGS can *only* be returned by this function, not set. +// Make sure all memory pointers are in SEG:OFFS format and +// not linear addresses, unless the interrupt handler +// specifically handles linear addresses. +int Int386(int ivec, REGS* in, REGS* out); + +// This macro tests the Carry Flag +// If CF is set then the call failed (usually) +#define INT386_SUCCESS(regs) ((regs.x.eflags & I386FLAG_CF) == 0) + +void EnableA20(void); +VOID ChainLoadBiosBootSectorCode(VOID); // Implemented in boot.S +VOID SoftReboot(VOID); // Implemented in boot.S +VOID DetectHardware(VOID); // Implemented in hardware.c + +#endif /* ! __ASM__ */ Propchange: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h (added) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Fri Jun 10 17:18:26 2011 @@ -1,0 +1,57 @@ + +#ifndef HEX +#define HEX(y) 0x##y +#endif + +/* Memory layout */ +#define STACK16ADDR HEX(7000) /* The 16-bit stack top will be at 0000:7000 */ +#define BSS_START HEX(7000) +#define FREELDR_BASE HEX(8000) +#define FREELDR_PE_BASE HEX(9000) +#define STACK32ADDR HEX(78000) /* The 32-bit stack top will be at 7000:8000, or 0x78000 */ +#define BIOSCALLBUFFER HEX(78000) /* Buffer to store temporary data for any Int386() call */ +#define BIOSCALLBUFSEGMENT HEX(7800) /* Buffer to store temporary data for any Int386() call */ +#define BIOSCALLBUFOFFSET HEX(0000) /* Buffer to store temporary data for any Int386() call */ +#define FILESYSBUFFER HEX(80000) /* Buffer to store file system data (e.g. cluster buffer for FAT) */ +#define DISKREADBUFFER HEX(90000) /* Buffer to store data read in from the disk via the BIOS */ +#define DISKREADBUFFER_SIZE 512 + +/* These addresses specify the realmode "BSS section" layout */ +#define BSS_CallbackAddress BSS_START + 0 +#define BSS_CallbackReturn BSS_START + 8 +#define BSS_BootDrive BSS_START + 16 +#define BSS_BootPartition BSS_START + 20 + +#ifdef _M_AMD64 +#define FrldrBootDrive *((PULONG)BSS_BootDrive) +#define FrldrBootPartition *((PULONG)BSS_BootPartition) +#endif + +// Flag Masks +#define I386FLAG_CF HEX(0001) // Carry Flag +#define I386FLAG_RESV1 HEX(0002) // Reserved - Must be 1 +#define I386FLAG_PF HEX(0004) // Parity Flag +#define I386FLAG_RESV2 HEX(0008) // Reserved - Must be 0 +#define I386FLAG_AF HEX(0010) // Auxiliary Flag +#define I386FLAG_RESV3 HEX(0020) // Reserved - Must be 0 +#define I386FLAG_ZF HEX(0040) // Zero Flag +#define I386FLAG_SF HEX(0080) // Sign Flag +#define I386FLAG_TF HEX(0100) // Trap Flag (Single Step) +#define I386FLAG_IF HEX(0200) // Interrupt Flag +#define I386FLAG_DF HEX(0400) // Direction Flag +#define I386FLAG_OF HEX(0800) // Overflow Flag + +#define CR0_PE_SET HEX(00000001) /* OR this value with CR0 to enable pmode */ +#define CR0_PE_CLR HEX(FFFFFFFE) /* AND this value with CR0 to disable pmode */ + +/* Defines needed for switching between real and protected mode */ +#ifdef _M_IX86 +#define NULL_DESC HEX(00) /* NULL descriptor */ +#define PMODE_CS HEX(08) /* PMode code selector, base 0 limit 4g */ +#define PMODE_DS HEX(10) /* PMode data selector, base 0 limit 4g */ +#define RMODE_CS HEX(18) /* RMode code selector, base 0 limit 64k */ +#define RMODE_DS HEX(20) /* RMode data selector, base 0 limit 64k */ +#endif + +/* Makes "x" a global variable or label */ +#define EXTERN(x) .global x; x: Propchange: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Fri Jun 10 17:18:26 2011 @@ -29,6 +29,7 @@ #define ROUND_UP(n, align) \ ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) +/* public headers */ #define NTOSAPI #define printf TuiPrintf #include <ntddk.h> @@ -45,78 +46,80 @@ #include <stdio.h> #include <ctype.h> #include <rosldr.h> +#include <rtl.h> +#include <ntdddisk.h> +#include <internal/hal.h> +#include <drivers/pci/pci.h> +#include <reactos/buildno.h> +#include <winerror.h> + +/* internal headers */ #include <arcemul.h> -#include <arch.h> -#include <rtl.h> +#include <bytesex.h> +#include <bget.h> +#include <cache.h> +#include <cmdline.h> +#include <comm.h> #include <disk.h> #include <fs.h> -#include <ui.h> +#include <inffile.h> +#include <inifile.h> +#include <keycodes.h> +#include <linux.h> +#include <machine.h> +#include <mm.h> #include <multiboot.h> -#include <mm.h> -#include <cache.h> -#include <machine.h> -#include <inifile.h> -#include <inffile.h> -#include <video.h> +#include <options.h> +#include <oslist.h> #include <ramdisk.h> #include <reactos.h> #include <registry.h> +#include <ui.h> +#include <ver.h> +#include <video.h> #include <winldr.h> -#include <ntdddisk.h> -#include <internal/hal.h> + /* file system headers */ #include <fs/ext2.h> #include <fs/fat.h> #include <fs/ntfs.h> #include <fs/iso.h> #include <fs/pxe.h> + /* ui support */ #include <ui/gui.h> #include <ui/minitui.h> #include <ui/noui.h> #include <ui/tui.h> -/* arch files */ + +/* arch specific includes */ #if defined(_M_IX86) #include <arch/i386/custom.h> #include <arch/i386/drivemap.h> -#include <arch/i386/hardware.h> #include <arch/i386/i386.h> -#include <arch/i386/machpc.h> #include <arch/i386/machxbox.h> #include <arch/i386/miscboot.h> -#include <arch/i386/pxe.h> +#include <arch/pc/hardware.h> +#include <arch/pc/machpc.h> +#include <arch/pc/x86common.h> +#include <arch/pc/pcbios.h> +#include <arch/pc/pxe.h> #include <internal/i386/intrin_i.h> +#elif defined(_M_AMD64) +#include <arch/amd64/amd64.h> +#include <arch/pc/hardware.h> +#include <arch/pc/machpc.h> +#include <arch/pc/x86common.h> +#include <arch/pc/pcbios.h> +#include <arch/pc/pxe.h> +#include <internal/amd64/intrin_i.h> #elif defined(_M_PPC) #include <arch/powerpc/hardware.h> #elif defined(_M_ARM) #include <arch/arm/hardware.h> #elif defined(_M_MIPS) #include <arch/mips/arcbios.h> -#elif defined(_M_AMD64) -#include <arch/amd64/hardware.h> -#include <arch/amd64/machpc.h> -#include <arch/i386/pxe.h> -#include <internal/amd64/intrin_i.h> #endif -/* misc files */ -#include <keycodes.h> -#include <ver.h> -#include <cmdline.h> -#include <bget.h> -#include <winerror.h> -/* Needed by boot manager */ -#include <oslist.h> -#include <options.h> -#include <linux.h> -/* Externals */ -#include <reactos/rossym.h> -#include <reactos/buildno.h> -/* Needed if debuging is enabled */ -#include <comm.h> -/* Swap */ -#include <bytesex.h> -/* Internal shared PCI header */ -#include <drivers/pci/pci.h> VOID BootMain(LPSTR CmdLine); VOID RunLoader(VOID);

1 0

[ilardig] 52174: Fix build.
by ilardig＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: ilardig Date: Fri Jun 10 16:00:50 2011 New Revision: 52174 URL: http://svn.reactos.org/svn/reactos?rev=52174&view=rev Log: Fix build. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Jun 10 16:00:50 2011 @@ -141,7 +141,7 @@ dll\cpl\desk\desk.cpl 1 dll\cpl\hdwwiz\hdwwiz.cpl 1 dll\cpl\input\input.dll 1 -dll\cpl\inetcpl\incetcpl.cpl 1 +dll\cpl\inetcpl\inetcpl.cpl 1 dll\cpl\intl\intl.cpl 1 dll\cpl\joy\joy.cpl 1 ;dll\cpl\liccpa\liccpa.cpl 1

1 0

[ilardig] 52173: [inetcpl] - Initial import from Wine 1.3.21
by ilardig＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: ilardig Date: Fri Jun 10 15:45:51 2011 New Revision: 52173 URL: http://svn.reactos.org/svn/reactos?rev=52173&view=rev Log: [inetcpl] - Initial import from Wine 1.3.21 Added: trunk/reactos/dll/cpl/inetcpl/ (with props) trunk/reactos/dll/cpl/inetcpl/content.c (with props) trunk/reactos/dll/cpl/inetcpl/general.c (with props) trunk/reactos/dll/cpl/inetcpl/inetcpl.c (with props) trunk/reactos/dll/cpl/inetcpl/inetcpl.h (with props) trunk/reactos/dll/cpl/inetcpl/inetcpl.ico (with props) trunk/reactos/dll/cpl/inetcpl/inetcpl.rbuild (with props) trunk/reactos/dll/cpl/inetcpl/inetcpl.rc (with props) trunk/reactos/dll/cpl/inetcpl/inetcpl.spec (with props) trunk/reactos/dll/cpl/inetcpl/inetcpl.svg (with props) trunk/reactos/dll/cpl/inetcpl/lang/ (with props) trunk/reactos/dll/cpl/inetcpl/lang/He.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/pt-PT.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc (with props) trunk/reactos/dll/cpl/inetcpl/security.c (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/cpl/cpl.rbuild trunk/reactos/include/reactos/wine/commctrl.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=521… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=521… Added: trunk/reactos/dll/cpl/inetcpl/content.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/content.c?… Added: trunk/reactos/dll/cpl/inetcpl/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/general.c?… Added: trunk/reactos/dll/cpl/inetcpl/inetcpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.c?… Added: trunk/reactos/dll/cpl/inetcpl/inetcpl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.h?… Added: trunk/reactos/dll/cpl/inetcpl/inetcpl.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.ic… Added: trunk/reactos/dll/cpl/inetcpl/inetcpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rb… Added: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc… Added: trunk/reactos/dll/cpl/inetcpl/inetcpl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.sp… Added: trunk/reactos/dll/cpl/inetcpl/inetcpl.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.sv… Added: trunk/reactos/dll/cpl/inetcpl/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/He.rc… Added: trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc… Added: trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/de-DE… Added: trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/en-US… Added: trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/fr-FR… Added: trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/it-IT… Added: trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ja-JP… Added: trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ko-KR… Added: trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/lt-LT… Added: trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/nl-NL… Added: trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pl-PL… Added: trunk/reactos/dll/cpl/inetcpl/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pt-PT… Added: trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ru-RU… Added: trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/sv-SE… Added: trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/uk-UA… Added: trunk/reactos/dll/cpl/inetcpl/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/security.c… Modified: trunk/reactos/include/reactos/wine/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/commc…

1 0

[tkreuzer] 52172: [FREELDR] Fix MSVC and amd64 build
by tkreuzer＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: tkreuzer Date: Fri Jun 10 12:55:14 2011 New Revision: 52172 URL: http://svn.reactos.org/svn/reactos?rev=52172&view=rev Log: [FREELDR] Fix MSVC and amd64 build Added: trunk/reactos/boot/freeldr/freeldr/arch/amd64/stubs.S (with props) trunk/reactos/boot/freeldr/freeldr/include/arch/i386/realmode.h (with props) Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h trunk/reactos/boot/freeldr/freeldr/include/disk.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -18,9 +18,14 @@ arch/i386/arch.S) endif() elseif(ARCH MATCHES amd64) - list(APPEND FREELDR_STARTUP_SOURCE - arch/i386/fathelp.S - arch/amd64/arch.S) + if(MSVC) + list(APPEND FREELDR_BASE64K_SOURCE + arch/amd64/stubs.S) + else() + list(APPEND FREELDR_STARTUP_SOURCE + arch/i386/fathelp.S + arch/amd64/arch.S) + endif() endif() if(ARCH MATCHES i386) @@ -39,12 +44,14 @@ arch/i386/i386bug.c) endif() elseif(ARCH MATCHES amd64) + if(NOT MSVC) list(APPEND FREELDR_BASE64K_SOURCE arch/i386/drvmap.S arch/i386/i386cpu.S arch/i386/i386idt.S arch/i386/i386trap.S arch/amd64/mb.S) + endif() endif() set_source_files_properties(${FREELDR_BASE64K_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_") @@ -60,7 +67,7 @@ disk/disk.c disk/partition.c disk/ramdisk.c - disk/scsiport.c + #disk/scsiport.c fs/ext2.c fs/fat.c fs/fs.c @@ -148,6 +155,25 @@ arch/i386/xboxvideo.c windows/i386/ntsetup.c windows/i386/wlmemory.c) +elseif(ARCH MATCHES amd64) + list(APPEND FREELDR_ARCH_SOURCE + arch/amd64/loader.c + arch/i386/hardware.c + arch/i386/hwacpi.c + arch/i386/hwapm.c + arch/i386/hwpci.c + arch/i386/i386rtl.c + arch/i386/i386disk.c + arch/i386/i386vid.c + arch/i386/machpc.c + arch/i386/ntoskrnl.c + arch/i386/pccons.c + arch/i386/pcdisk.c + arch/i386/pcmem.c + arch/i386/pcrtc.c + arch/i386/pcvideo.c + windows/amd64/ntsetup.c + windows/amd64/wlmemory.c) else() #TBD endif() Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -25,21 +25,21 @@ /* checkPoint Charlie - where it all began... */ mov si, offset CheckPoint0 - call writestr + call writestr /* Setup a real mode stack */ mov sp, stack16 /* Zero BootDrive and BootPartition */ xor eax, eax - mov BootDrive, eax - mov BootPartition, eax + mov FrldrBootDrive, eax + mov FrldrBootPartition, eax /* Store the boot drive */ - mov BootDrive, dl + mov FrldrBootDrive, dl /* Store the boot partition */ - mov BootPartition, dh + mov FrldrBootPartition, dh /* Load the GDT */ lgdt gdtptr @@ -50,16 +50,16 @@ /* checkPoint Charlie - where it all began... */ mov si, offset CheckPoint1 - call writestr - + call writestr + call x86_16_BuildPageTables - + /* checkPoint Charlie - where it all began... */ mov si, offset CheckPoint2 - call writestr + call writestr /* Check if CPU supports CPUID */ - + pushfd pop eax mov ebx, eax @@ -70,8 +70,8 @@ pop eax cmp eax,ebx jz NO_CPUID_SUPPORT_DETECTED - - /* CPUID support detected - getting the PAE/PGE */ + + /* CPUID support detected - getting the PAE/PGE */ mov eax,1 // Fn0000_0001 - PAE in EDX[6] cpuid @@ -79,24 +79,24 @@ and edx,0x00a0 test edx,edx // are PAE and PGE bits set? jz NO_X64_SUPPORT_DETECTED - + /* PAE and PGE are here */ - + xor edx, edx mov eax, 0x80000001 cpuid and edx, 0x20000000 test edx,edx jz NO_X64_SUPPORT_DETECTED - + /* X64 Processor */ - + /* checkPoint Charlie - where it all began... */ mov si, offset CheckPoint3 - call writestr + call writestr jmp switch64 - + NO_X64_SUPPORT_DETECTED: mov si, offset NotAnX64Processor // Loading message call writestr @@ -129,7 +129,7 @@ // mov ds, ax // mov word ptr ds:[0xb8002], 0x0e02 + '2' - + /* Return into real mode */ call x86_64_SwitchToReal .code16 @@ -169,7 +169,7 @@ ret /* - * We define 512 2MB pages at the start of memory, so we can access the first + * We define 512 2MB pages at the start of memory, so we can access the first * 1 GB as if paging was disabled */ x86_16_BuildPageTables: @@ -238,7 +238,7 @@ popad popfd ret - + writechr: pushf @@ -252,7 +252,7 @@ //.global x86_16_SwitchToLong x86_16_SwitchToLong: - + cli xor ax,ax @@ -332,7 +332,7 @@ /* Step 2 - disable long mode in EFER MSR */ // mov ecx, 0xC0000080 // Specify EFER MSR -// rdmsr +// rdmsr // and eax, ~0x00000100 // Disable EFER.LME // wrmsr @@ -408,12 +408,12 @@ .long gdt /* Base Address */ -.global BootDrive -BootDrive: +.global FrldrBootDrive +FrldrBootDrive: .long 0 - -.global BootPartition -BootPartition: + +.global FrldrBootPartition +FrldrBootPartition: .long 0 .global NotAnX64Processor @@ -431,12 +431,12 @@ CheckPoint0: .ascii "Starting FreeLoader..." .byte 0x0d, 0x0a, 0 - + .global CheckPoint1 CheckPoint1: .ascii "FreeLoader[16-bit]: building page tables..." .byte 0x0d, 0x0a, 0 - + .global CheckPoint2 CheckPoint2: .ascii "FreeLoader[16-bit]: checking CPU for x64 long mode..." Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -27,7 +27,6 @@ ULONG_PTR GdtBase, IdtBase, TssBase; extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; -PPAGE_DIRECTORY_AMD64 pPML4; PVOID pIdt, pGdt; /* FUNCTIONS *****************************************************************/ Added: trunk/reactos/boot/freeldr/freeldr/arch/amd64/stubs.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/stubs.S (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/stubs.S [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -1,0 +1,48 @@ + + +#include <asm.inc> + +EXTERN BootMain:PROC + +.code64 + +/* 64 bit entry point */ +PUBLIC mainCRTStartup +mainCRTStartup: + jmp BootMain + +PUBLIC Int386 +Int386: + ret + +PUBLIC __lgdt +__lgdt: + +PUBLIC __ltr +__ltr: + +PUBLIC PxeCallApi +PxeCallApi: + .long 0 + +PUBLIC PageDirectoryStart +PageDirectoryStart: + .long 0 + +PUBLIC PageDirectoryEnd +PageDirectoryEnd: + .long 0 + +PUBLIC PnpBiosGetDeviceNode +PnpBiosGetDeviceNode: + .long 0 + +PUBLIC PnpBiosGetDeviceNodeCount +PnpBiosGetDeviceNodeCount: + .long 0 + +PUBLIC PnpBiosSupported +PnpBiosSupported: + .long 0 + +END Propchange: trunk/reactos/boot/freeldr/freeldr/arch/amd64/stubs.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -14,10 +14,10 @@ // globals -PUBLIC _BootPartition -_BootPartition: -PUBLIC _BootDrive -_BootDrive: +PUBLIC _FrldrBootPartition +_FrldrBootPartition: +PUBLIC _FrldrBootDrive +_FrldrBootDrive: PUBLIC _PageDirectoryStart _PageDirectoryStart: Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -132,18 +132,21 @@ /* FIXME */ else if (DiskReadBootRecord(FrldrBootDrive, 0, &MasterBootRecord)) { + ULONG BootPartition; + /* This is a hard disk */ - - if (!DiskGetActivePartitionEntry(FrldrBootDrive, &PartitionEntry, &FrldrBootPartition)) + if (!DiskGetActivePartitionEntry(FrldrBootDrive, &PartitionEntry, &BootPartition)) { DbgPrint("Invalid active partition information\n"); return FALSE; } - if (Size <= sizeof(Path) + 18 + strlen(Device) + strlen(Partition)) - { - return FALSE; - } + FrldrBootPartition = BootPartition; + + if (Size <= sizeof(Path) + 18 + strlen(Device) + strlen(Partition)) + { + return FALSE; + } strcpy(BootPath, Path); @@ -158,7 +161,7 @@ strcat(BootPath, "partition("); strcat(BootPath, Partition); strcat(BootPath, ")"); - } + } else { /* This is a CD-ROM drive */ Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -10,6 +10,33 @@ #include <ntdddisk.h> #include <stdio.h> #include <stdarg.h> + +#undef ScsiPortLogError +#undef ScsiPortMoveMemory +#undef ScsiPortWritePortBufferUchar +#undef ScsiPortWritePortBufferUlong +#undef ScsiPortWritePortBufferUshort +#undef ScsiPortWritePortUchar +#undef ScsiPortWritePortUlong +#undef ScsiPortWritePortUshort +#undef ScsiPortWriteRegisterBufferUchar +#undef ScsiPortWriteRegisterBufferUlong +#undef ScsiPortWriteRegisterBufferUshort +#undef ScsiPortWriteRegisterUchar +#undef ScsiPortWriteRegisterUlong +#undef ScsiPortWriteRegisterUshort +#undef ScsiPortReadPortBufferUchar +#undef ScsiPortReadPortBufferUlong +#undef ScsiPortReadPortBufferUshort +#undef ScsiPortReadPortUchar +#undef ScsiPortReadPortUlong +#undef ScsiPortReadPortUshort +#undef ScsiPortReadRegisterBufferUchar +#undef ScsiPortReadRegisterBufferUlong +#undef ScsiPortReadRegisterBufferUshort +#undef ScsiPortReadRegisterUchar +#undef ScsiPortReadRegisterUlong +#undef ScsiPortReadRegisterUshort #define NDEBUG #include <debug.h> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -54,17 +54,6 @@ RunLoader(); } -#ifdef _MSC_VER -long _ftol2(double f) -{ - return _ftol(f); -} -long _ftol2_sse(double f) -{ - return _ftol(f); -} -#endif - // We need to emulate these, because the original ones don't work in freeldr int __cdecl wctomb(char *mbchar, wchar_t wchar) { Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -18,7 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef __ASM__ #pragma once +#endif // This is needed because headers define wrong one for ReactOS #undef KIP0PCRADDRESS @@ -49,16 +51,15 @@ #define APIC_PHYS_BASE 0xfee00000 -#define NUM_PAGES_KERNEL +#define NUM_PAGES_KERNEL #ifndef ASM -typedef struct _PAGE_DIRECTORY_AMD64 -{ - HARDWARE_PTE Pde[512]; -} PAGE_DIRECTORY_AMD64, *PPAGE_DIRECTORY_AMD64; - VOID FrLdrSetupGdtIdt(VOID); + +#include <arch/i386/realmode.h> +#define FrldrBootDrive *((PULONG)BSS_BootDrive) +#define FrldrBootPartition *((PULONG)BSS_BootPartition) #endif Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -49,6 +49,7 @@ ULONG PcMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); +BOOLEAN PcDiskGetBootPath(char *BootPath, unsigned Size); BOOLEAN PcDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN PcDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN PcDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); Added: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/realmode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/realmode.h (added) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/realmode.h [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -1,0 +1,13 @@ + + +/* These addresses specify the realmode "BSS section" */ +#define BSS_START HEX(7000) +#define BSS_CallbackAddress BSS_START + 0 +#define BSS_CallbackReturn BSS_START + 8 +#define BSS_BootDrive BSS_START + 16 +#define BSS_BootPartition BSS_START + 20 + +#define PE_LOAD_BASE HEX(9000) +#define IMAGE_DOS_HEADER_e_lfanew 36 +#define IMAGE_FILE_HEADER_SIZE 20 +#define IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint 16 Propchange: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/realmode.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -123,8 +123,10 @@ BOOLEAN DiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); // Implemented in i386disk.c BOOLEAN DiskIsDriveRemovable(ULONG DriveNumber); VOID DiskStopFloppyMotor(VOID); // Implemented in i386disk.c +#ifndef _M_AMD64 extern ULONG FrldrBootDrive; extern ULONG FrldrBootPartition; +#endif BOOLEAN DiskGetBootPath(char *BootPath, unsigned Size); Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Fri Jun 10 12:55:14 2011 @@ -95,6 +95,7 @@ #elif defined(_M_AMD64) #include <arch/amd64/hardware.h> #include <arch/amd64/machpc.h> +#include <arch/i386/pxe.h> #include <internal/amd64/intrin_i.h> #endif /* misc files */

1 0

[tkreuzer] 52171: {FREELDR] Rename global variables BootDrive to FrldrBootDrive and BootPartition to FrldrBootPartition
by tkreuzer＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: tkreuzer Date: Fri Jun 10 12:12:16 2011 New Revision: 52171 URL: http://svn.reactos.org/svn/reactos?rev=52171&view=rev Log: {FREELDR] Rename global variables BootDrive to FrldrBootDrive and BootPartition to FrldrBootPartition Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/include/disk.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] Fri Jun 10 12:12:16 2011 @@ -50,14 +50,14 @@ /* Zero BootDrive and BootPartition */ xor eax, eax - mov dword ptr [_BootDrive], eax - mov dword ptr [_BootPartition], eax + mov dword ptr [_FrldrBootDrive], eax + mov dword ptr [_FrldrBootPartition], eax /* Store the boot drive */ - mov byte ptr [_BootDrive], dl + mov byte ptr [_FrldrBootDrive], dl /* Store the boot partition */ - mov byte ptr [_BootPartition], dh + mov byte ptr [_FrldrBootPartition], dh /* GO! */ push eax @@ -302,7 +302,7 @@ /* Align 32 bits boundary */ .align 4 - + /* Multiboot header */ MultibootHeader: /* magic */ @@ -400,12 +400,12 @@ mov eax, [ebx + MB_INFO_BOOT_DEVICE_OFFSET] shr eax, 16 inc al - mov byte ptr _BootPartition, al - mov byte ptr _BootDrive, ah + mov byte ptr _FrldrBootPartition, al + mov byte ptr _FrldrBootDrive, ah jmp mb6 mb5: /* No boot device known, assume first partition of first harddisk */ - mov byte ptr _BootDrive, HEX(80) - mov byte ptr _BootPartition, 1 + mov byte ptr _FrldrBootDrive, HEX(80) + mov byte ptr _FrldrBootPartition, 1 mb6: /* Check for command line */ mov eax, offset cmdline @@ -415,7 +415,7 @@ mb7: /* GO! */ - push eax + push eax call _BootMain mbfail: @@ -496,8 +496,8 @@ cmdline: .fill CMDLINE_SIZE, 1, 0 -EXTERN(_BootDrive) +EXTERN(_FrldrBootDrive) .long 0 - -EXTERN(_BootPartition) + +EXTERN(_FrldrBootPartition) .long 0 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S [iso-8859-1] Fri Jun 10 12:12:16 2011 @@ -31,7 +31,7 @@ .code16 /* Set the boot drive */ - movb (_BootDrive),%dl + movb (_FrldrBootDrive),%dl /* Load segment registers */ cli Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Fri Jun 10 12:12:16 2011 @@ -736,7 +736,7 @@ DPRINTM(DPRINT_HWDETECT, "Floppy count: %u\n", FloppyCount); - + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); PartialResourceList = MmHeapAlloc(Size); @@ -808,11 +808,11 @@ ULONG Size; ULONG i; BOOLEAN Changed; - + /* Count the number of visible drives */ DiskReportError(FALSE); DiskCount = 0; - + /* There are some really broken BIOSes out there. There are even BIOSes * that happily report success when you ask them to read from non-existent * harddisks. So, we set the buffer to known contents first, then try to @@ -838,7 +838,7 @@ DiskReportError(TRUE); DPRINTM(DPRINT_HWDETECT, "BIOS reports %d harddisk%s\n", (int)DiskCount, (DiskCount == 1) ? "": "s"); - + /* Allocate resource descriptor */ Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; @@ -849,7 +849,7 @@ "Failed to allocate resource descriptor\n"); return NULL; } - + /* Initialize resource descriptor */ memset(PartialResourceList, 0, Size); PartialResourceList->Version = 1; @@ -860,7 +860,7 @@ PartialResourceList->PartialDescriptors[0].Flags = 0; PartialResourceList->PartialDescriptors[0].u.DeviceSpecificData.DataSize = sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; - + /* Get harddisk Int13 geometry data */ Int13Drives = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); for (i = 0; i < DiskCount; i++) @@ -872,7 +872,7 @@ Int13Drives[i].SectorsPerTrack = Geometry.Sectors; Int13Drives[i].MaxHeads = Geometry.Heads - 1; Int13Drives[i].NumberDrives = DiskCount; - + DPRINTM(DPRINT_HWDETECT, "Disk %x: %u Cylinders %u Heads %u Sectors %u Bytes\n", 0x80 + i, @@ -954,7 +954,7 @@ 0, &ControllerKey); DPRINTM(DPRINT_HWDETECT, "Created key: DiskController\\0\n"); - + /* Create and fill subkey for each harddisk */ for (i = 0; i < DiskCount; i++) { @@ -962,7 +962,7 @@ ULONG Size; CHAR Identifier[20]; - if (BootDrive == 0x80 + i) + if (FrldrBootDrive == 0x80 + i) BootDriveReported = TRUE; /* Get disk values */ @@ -986,15 +986,15 @@ MachDiskGetBootPath(BootPath, sizeof(BootPath)); /* Add it, if it's a floppy or cdrom */ - if ((BootDrive >= 0x80 && !BootDriveReported) || - DiskIsDriveRemovable(BootDrive)) + if ((FrldrBootDrive >= 0x80 && !BootDriveReported) || + DiskIsDriveRemovable(FrldrBootDrive)) { /* TODO: Check if it's really a cdrom drive */ ULONG* Buffer; ULONG Checksum = 0; /* Read the MBR */ - if (!MachDiskReadLogicalSectors(BootDrive, 16ULL, 1, (PVOID)DISKREADBUFFER)) + if (!MachDiskReadLogicalSectors(FrldrBootDrive, 16ULL, 1, (PVOID)DISKREADBUFFER)) { DPRINTM(DPRINT_HWDETECT, "Reading MBR failed\n"); return; @@ -1746,9 +1746,9 @@ Size, &ControllerKey); DPRINTM(DPRINT_HWDETECT, "Created key: KeyboardController\\0\n"); - + MmHeapFree(PartialResourceList); - + DetectKeyboardPeripheral(ControllerKey); } @@ -2049,14 +2049,14 @@ /* Create the 'System' key */ SystemKey = DetectSystem(); - + /* Detect buses */ DetectPciBios(SystemKey, &BusNumber); DetectApmBios(SystemKey, &BusNumber); DetectPnpBios(SystemKey, &BusNumber); DetectIsaBios(SystemKey, &BusNumber); DetectAcpiBios(SystemKey, &BusNumber); - + DPRINTM(DPRINT_HWDETECT, "DetectHardware() Done\n"); return SystemKey; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S [iso-8859-1] Fri Jun 10 12:12:16 2011 @@ -30,7 +30,7 @@ .code16 /* Set the boot drive */ - movb (_BootDrive),%dl + movb (_FrldrBootDrive),%dl /* Load segment registers */ cli @@ -66,7 +66,7 @@ .code16 /* Set the boot drive */ - movb (_BootDrive),%dl + movb (_FrldrBootDrive),%dl /* Load segment registers */ cli Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Fri Jun 10 12:12:16 2011 @@ -111,7 +111,7 @@ PARTITION_TABLE_ENTRY PartitionEntry; MASTER_BOOT_RECORD MasterBootRecord; - if (BootDrive < 0x80) + if (FrldrBootDrive < 0x80) { /* This is a floppy */ @@ -124,17 +124,17 @@ strcat(BootPath, "fdisk"); - _itoa(BootDrive, Device, 10); + _itoa(FrldrBootDrive, Device, 10); strcat(BootPath, "("); strcat(BootPath, Device); strcat(BootPath, ")"); } /* FIXME */ - else if (DiskReadBootRecord(BootDrive, 0, &MasterBootRecord)) + else if (DiskReadBootRecord(FrldrBootDrive, 0, &MasterBootRecord)) { /* This is a hard disk */ - if (!DiskGetActivePartitionEntry(BootDrive, &PartitionEntry, &BootPartition)) + if (!DiskGetActivePartitionEntry(FrldrBootDrive, &PartitionEntry, &FrldrBootPartition)) { DbgPrint("Invalid active partition information\n"); return FALSE; @@ -149,12 +149,12 @@ strcat(BootPath, "rdisk"); - _itoa(BootDrive - 0x80, Device, 10); + _itoa(FrldrBootDrive - 0x80, Device, 10); strcat(BootPath, "("); strcat(BootPath, Device); strcat(BootPath, ")"); - _itoa(BootPartition, Partition, 10); + _itoa(FrldrBootPartition, Partition, 10); strcat(BootPath, "partition("); strcat(BootPath, Partition); strcat(BootPath, ")"); @@ -172,7 +172,7 @@ strcat(BootPath, "cdrom"); - _itoa(BootDrive - 0x80, Device, 10); + _itoa(FrldrBootDrive - 0x80, Device, 10); strcat(BootPath, "("); strcat(BootPath, Device); strcat(BootPath, ")"); Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Fri Jun 10 12:12:16 2011 @@ -123,8 +123,8 @@ BOOLEAN DiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); // Implemented in i386disk.c BOOLEAN DiskIsDriveRemovable(ULONG DriveNumber); VOID DiskStopFloppyMotor(VOID); // Implemented in i386disk.c -extern ULONG BootDrive; -extern ULONG BootPartition; +extern ULONG FrldrBootDrive; +extern ULONG FrldrBootPartition; BOOLEAN DiskGetBootPath(char *BootPath, unsigned Size);

1 0

[cmihail] 52170: [AFD, TCPIP] Bind issue seems solved now. Server app can be restarted without failing at binding. More information is at r52166. Patch by cgutman.
by cmihail＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: cmihail Date: Fri Jun 10 09:24:29 2011 New Revision: 52170 URL: http://svn.reactos.org/svn/reactos?rev=52170&view=rev Log: [AFD, TCPIP] Bind issue seems solved now. Server app can be restarted without failing at binding. More information is at r52166. Patch by cgutman. Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/bind.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/lock.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/bind.c [iso-8859-1] Fri Jun 10 09:24:29 2011 @@ -65,6 +65,7 @@ PAFD_BIND_DATA BindReq; AFD_DbgPrint(MID_TRACE,("Called\n")); + DbgPrint("[AFD, AfdBindSocket] Called\n"); if ( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); @@ -109,6 +110,8 @@ if (NT_SUCCESS(Status)) FCB->State = SOCKET_STATE_BOUND; + DbgPrint("[AFD, AfdBindSocket] Leaving\n"); + /* MSAFD relies on us returning the address file handle in the IOSB */ return UnlockAndMaybeComplete( FCB, Status, Irp, (ULONG_PTR)FCB->AddressFile.Handle ); } Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c [iso-8859-1] Fri Jun 10 09:24:29 2011 @@ -114,22 +114,22 @@ NTSTATUS Status = STATUS_SUCCESS; PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; - PLIST_ENTRY NextIrpEntry, QeltEntry; + PLIST_ENTRY NextIrpEntry; PIRP NextIrp; DbgPrint("[AFD, ListenComplete] Called\n"); - if( !SocketAcquireStateLock( FCB ) ) + if ( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; FCB->ListenIrp.InFlightRequest = NULL; DbgPrint("[AFD, ListenComplete] FCB->State = 0x%x (should be 0x%x)\n", FCB->State, SOCKET_STATE_CLOSED); - if( FCB->State == SOCKET_STATE_CLOSED ) + if ( FCB->State == SOCKET_STATE_CLOSED ) { /* Cleanup our IRP queue because the FCB is being destroyed */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_PREACCEPT] ) ) + while ( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_PREACCEPT] ) ) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_PREACCEPT]); NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); @@ -140,13 +140,6 @@ IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } - /* Free all pending connections */ - while( !IsListEmpty( &FCB->PendingConnections ) ) { - QeltEntry = RemoveHeadList(&FCB->PendingConnections); - Qelt = CONTAINING_RECORD(QeltEntry, AFD_TDI_OBJECT_QELT, ListEntry); - ExFreePool(Qelt); - } - /* Free ConnectionReturnInfo and ConnectionCallInfo */ if (FCB->ListenIrp.ConnectionReturnInfo) { @@ -165,7 +158,13 @@ } AFD_DbgPrint(MID_TRACE,("Completing listen request.\n")); - AFD_DbgPrint(MID_TRACE,("IoStatus was %x\n", FCB->ListenIrp.Iosb.Status)); + AFD_DbgPrint(MID_TRACE,("IoStatus was %x\n", Irp->IoStatus.Status)); + + if (Irp->IoStatus.Status != STATUS_SUCCESS) + { + SocketStateUnlock(FCB); + return Irp->IoStatus.Status; + } DbgPrint("[AFD, ListenComplete] Completing listen request.\n"); DbgPrint("[AFD, ListenComplete] IoStatus was %x\n", FCB->ListenIrp.Iosb.Status); @@ -202,7 +201,7 @@ } /* Satisfy a pre-accept request if one is available */ - if( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_PREACCEPT] ) && + if ( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_PREACCEPT] ) && !IsListEmpty( &FCB->PendingConnections ) ) { PLIST_ENTRY PendingIrp = @@ -240,7 +239,7 @@ } /* Trigger a select return if appropriate */ - if( !IsListEmpty( &FCB->PendingConnections ) ) + if ( !IsListEmpty( &FCB->PendingConnections ) ) { FCB->PollState |= AFD_EVENT_ACCEPT; FCB->PollStatus[FD_ACCEPT_BIT] = STATUS_SUCCESS; Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/lock.c [iso-8859-1] Fri Jun 10 09:24:29 2011 @@ -252,10 +252,38 @@ } NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ) { + NTSTATUS Status; + + /* Add the IRP to the queue in all cases (so AfdCancelHandler will work properly) */ InsertTailList( &FCB->PendingIrpList[Function], - &Irp->Tail.Overlay.ListEntry ); - IoMarkIrpPending(Irp); - (void)IoSetCancelRoutine(Irp, AfdCancelHandler); + &Irp->Tail.Overlay.ListEntry ); + + /* Acquire the cancel spin lock and check the cancel bit */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + if (!Irp->Cancel) + { + /* We are not cancelled; we're good to go so + * set the cancel routine, release the cancel spin lock, + * mark the IRP as pending, and + * return STATUS_PENDING to the caller + */ + (void)IoSetCancelRoutine(Irp, AfdCancelHandler); + IoReleaseCancelSpinLock(Irp->CancelIrql); + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + } + else + { + /* We were already cancelled before we were able to register our cancel routine + * so we are to call the cancel routine ourselves right here to cancel the IRP + * (which handles all the stuff we do above) and return STATUS_CANCELLED to the caller + */ + AfdCancelHandler(IoGetCurrentIrpStackLocation(Irp)->DeviceObject, + Irp); + Status = STATUS_CANCELLED; + } + SocketStateUnlock( FCB ); - return STATUS_PENDING; -} + + return Status; +} Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c [iso-8859-1] Fri Jun 10 09:24:29 2011 @@ -258,7 +258,7 @@ AFD_DbgPrint(MID_TRACE, ("AfdCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); - DbgPrint("[AfdCreate] Created socket\n"); + DbgPrint("[AFD, AfdCreate] Called\n"); DeviceExt = DeviceObject->DeviceExtension; FileObject = IrpSp->FileObject; @@ -368,6 +368,8 @@ Irp->IoStatus.Status = Status; IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + DbgPrint("[AFD, AfdCreate] Leaving. Status = 0x%x\n"); + return Status; } @@ -383,10 +385,12 @@ DbgPrint("[AFD, AfdCleanupSocket] Called\n"); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket(Irp); + if ( !SocketAcquireStateLock( FCB ) ) + return LostSocket(Irp); for (Function = 0; Function < MAX_FUNCTIONS; Function++) { + /* Cancel IRPs from MSAFD to AFD (pending IRPs) */ CurrentEntry = FCB->PendingIrpList[Function].Flink; while (CurrentEntry != &FCB->PendingIrpList[Function]) { @@ -415,15 +419,18 @@ PAFD_FCB FCB = FileObject->FsContext; UINT i; PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; + PAFD_TDI_OBJECT_QELT Qelt; + PLIST_ENTRY QeltEntry; + AFD_DbgPrint(MID_TRACE, ("AfdClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); - DbgPrint("[AfdCloseSocket] Called\n"); + DbgPrint("[AFD, AfdCloseSocket] Called\n"); if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - DbgPrint("[AfdCloseSocket] Setting closed state\n"); + DbgPrint("[AFD, AfdCloseSocket] Setting closed state\n"); FCB->State = SOCKET_STATE_CLOSED; FCB->PollState = AFD_EVENT_CLOSE; @@ -435,7 +442,8 @@ InFlightRequest[2] = &FCB->SendIrp; InFlightRequest[3] = &FCB->ConnectIrp; - /* Cancel our pending requests */ + /* Cancel our pending _In Flight_ IRPs + That is IRPs from AFD -> tcpip*/ for( i = 0; i < IN_FLIGHT_REQUESTS; i++ ) { if( InFlightRequest[i]->InFlightRequest ) @@ -448,6 +456,24 @@ KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); + ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_CONNECT])); + ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND])); + ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_RECV])); + ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_PREACCEPT])); + + while (!IsListEmpty(&FCB->PendingConnections)) + { + QeltEntry = RemoveHeadList(&FCB->PendingConnections); + Qelt = CONTAINING_RECORD(QeltEntry, AFD_TDI_OBJECT_QELT, ListEntry); + + /* We have to close all pending connections or the listen won't get closed */ + TdiDisassociateAddressFile(Qelt->Object.Object); + ObDereferenceObject(Qelt->Object.Object); + ZwClose(Qelt->Object.Handle); + + ExFreePool(Qelt); + } + SocketStateUnlock( FCB ); if( FCB->EventSelect ) @@ -489,7 +515,7 @@ if( FCB->Connection.Object ) { TdiDisassociateAddressFile(FCB->Connection.Object); - ObDereferenceObject(FCB->Connection.Object); + ObDereferenceObject(FCB->Connection.Object); } if( FCB->AddressFile.Object ) @@ -499,7 +525,7 @@ { if (ZwClose(FCB->AddressFile.Handle) == STATUS_INVALID_HANDLE) { - DbgPrint("[AfdCloseSocket] INVALID ADDRESS FILE HANDLE VALUE: %x %x\n", FCB->AddressFile.Handle, FCB->AddressFile.Object); + DbgPrint("[AFD, AfdCloseSocket] INVALID ADDRESS FILE HANDLE VALUE: %x %x\n", FCB->AddressFile.Handle, FCB->AddressFile.Object); } } @@ -507,7 +533,7 @@ { if (ZwClose(FCB->Connection.Handle) == STATUS_INVALID_HANDLE) { - DbgPrint("[AfdCloseSocket] INVALID CONNECTION HANDLE VALUE: %x %x\n", FCB->Connection.Handle, FCB->Connection.Object); + DbgPrint("[AFD, AfdCloseSocket] INVALID CONNECTION HANDLE VALUE: %x %x\n", FCB->Connection.Handle, FCB->Connection.Object); } } @@ -521,7 +547,7 @@ IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); AFD_DbgPrint(MID_TRACE, ("Returning success.\n")); - DbgPrint("[AfdCloseSocket] Leaving\n"); + DbgPrint("[AFD, AfdCloseSocket] Leaving\n"); return STATUS_SUCCESS; } @@ -793,6 +819,33 @@ return (Status); } +VOID +CleanupPendingIrp(PIRP Irp, PIO_STACK_LOCATION IrpSp, PAFD_ACTIVE_POLL Poll) +{ + PAFD_RECV_INFO RecvReq; + PAFD_SEND_INFO SendReq; + PAFD_POLL_INFO PollReq; + + if (IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_AFD_RECV || + IrpSp->MajorFunction == IRP_MJ_READ) + { + RecvReq = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, FALSE); + } + else if (IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_AFD_SEND || + IrpSp->MajorFunction == IRP_MJ_WRITE) + { + SendReq = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + } + else if (IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_AFD_SELECT) + { + PollReq = Irp->AssociatedIrp.SystemBuffer; + ZeroEvents(PollReq->Handles, PollReq->HandleCount); + SignalSocket(Poll, NULL, PollReq, STATUS_CANCELLED); + } +} + VOID NTAPI AfdCancelHandler(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -800,39 +853,46 @@ PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - UINT Function; - PAFD_RECV_INFO RecvReq; - PAFD_SEND_INFO SendReq; + ULONG Function, IoctlCode; + PIRP CurrentIrp; PLIST_ENTRY CurrentEntry; - PIRP CurrentIrp; PAFD_DEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; KIRQL OldIrql; PAFD_ACTIVE_POLL Poll; - PAFD_POLL_INFO PollReq; IoReleaseCancelSpinLock(Irp->CancelIrql); - + if (!SocketAcquireStateLock(FCB)) return; - - ASSERT(IrpSp->MajorFunction == IRP_MJ_DEVICE_CONTROL); - - switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + + switch (IrpSp->MajorFunction) + { + case IRP_MJ_DEVICE_CONTROL: + IoctlCode = IrpSp->Parameters.DeviceIoControl.IoControlCode; + break; + + case IRP_MJ_READ: + IoctlCode = IOCTL_AFD_RECV; + break; + + case IRP_MJ_WRITE: + IoctlCode = IOCTL_AFD_SEND; + break; + + default: + ASSERT(FALSE); + SocketStateUnlock(FCB); + return; + } + + switch (IoctlCode) { case IOCTL_AFD_RECV: - RecvReq = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, FALSE); - /* Fall through */ - case IOCTL_AFD_RECV_DATAGRAM: Function = FUNCTION_RECV; break; case IOCTL_AFD_SEND: - SendReq = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); - /* Fall through */ - case IOCTL_AFD_SEND_DATAGRAM: Function = FUNCTION_SEND; break; @@ -852,14 +912,13 @@ while (CurrentEntry != &DeviceExt->Polls) { Poll = CONTAINING_RECORD(CurrentEntry, AFD_ACTIVE_POLL, ListEntry); - CurrentIrp = Poll->Irp; - PollReq = CurrentIrp->AssociatedIrp.SystemBuffer; - - if (CurrentIrp == Irp) + + if (Irp == Poll->Irp) { - ZeroEvents(PollReq->Handles, PollReq->HandleCount); - SignalSocket(Poll, NULL, PollReq, STATUS_CANCELLED); - break; + CleanupPendingIrp(Irp, IrpSp, Poll); + KeReleaseSpinLock(&DeviceExt->Lock, OldIrql); + SocketStateUnlock(FCB); + return; } else { @@ -869,8 +928,9 @@ KeReleaseSpinLock(&DeviceExt->Lock, OldIrql); - /* IRP already completed by SignalSocket */ SocketStateUnlock(FCB); + + DbgPrint("WARNING!!! IRP cancellation race could lead to a process hang! (IOCTL_AFD_SELECT)\n"); return; default: @@ -887,7 +947,9 @@ if (CurrentIrp == Irp) { RemoveEntryList(CurrentEntry); - break; + CleanupPendingIrp(Irp, IrpSp, NULL); + UnlockAndMaybeComplete(FCB, STATUS_CANCELLED, Irp, 0); + return; } else { @@ -895,7 +957,9 @@ } } - UnlockAndMaybeComplete(FCB, STATUS_CANCELLED, Irp, 0); + SocketStateUnlock(FCB); + + DbgPrint("WARNING!!! IRP cancellation race could lead to a process hang! (Function: %d)\n", Function); } static VOID NTAPI Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c [iso-8859-1] Fri Jun 10 09:24:29 2011 @@ -185,9 +185,12 @@ FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */ - FCB->PollState |= AFD_EVENT_SEND; - FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; - PollReeval( FCB->DeviceExt, FCB->FileObject ); + if (Irp->IoStatus.Status == STATUS_SUCCESS) + { + FCB->PollState |= AFD_EVENT_SEND; + FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } if( FCB->State == SOCKET_STATE_CLOSED ) { /* Cleanup our IRP queue because the FCB is being destroyed */ Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Jun 10 09:24:29 2011 @@ -647,21 +647,22 @@ * when a new connection arrives. */ /* The important thing to note here is that the irp we'll complete belongs * to the socket to be accepted onto, not the listener */ - if( NT_SUCCESS(Status) && !Connection->AddressFile->Listener ) + if ( NT_SUCCESS(Status) && !Connection->AddressFile->Listener ) { Connection->AddressFile->Listener = TCPAllocateConnectionEndpoint( NULL ); - if( !Connection->AddressFile->Listener ) + if ( !Connection->AddressFile->Listener ) Status = STATUS_NO_MEMORY; - if( NT_SUCCESS(Status) ) { + if ( NT_SUCCESS(Status) ) + { Connection->AddressFile->Listener->AddressFile = Connection->AddressFile; - Status = TCPSocket( Connection->AddressFile->Listener, - Connection->AddressFile->Family, - SOCK_STREAM, - Connection->AddressFile->Protocol ); + Status = TCPSocket( Connection->AddressFile->Listener, + Connection->AddressFile->Family, + SOCK_STREAM, + Connection->AddressFile->Protocol ); } if ( NT_SUCCESS(Status) ) Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Fri Jun 10 09:24:29 2011 @@ -239,6 +239,7 @@ PADDRESS_FILE AddrFile; TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); + DbgPrint("[TCPIP, FileOpenAddress] Called. Proto %d\n", Protocol); AddrFile = ExAllocatePoolWithTag(NonPagedPool, sizeof(ADDRESS_FILE), ADDR_FILE_TAG); @@ -359,6 +360,7 @@ &AddressFileListLock); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + DbgPrint("[TCPIP, FileOpenAddress] Leaving\n"); return STATUS_SUCCESS; } @@ -376,6 +378,8 @@ { PADDRESS_FILE AddrFile = Request->Handle.AddressHandle; KIRQL OldIrql; + + DbgPrint("[TCPIP, FileCloseAddress] Called\n"); if (!Request->Handle.AddressHandle) return STATUS_INVALID_PARAMETER; @@ -393,6 +397,7 @@ DereferenceObject(AddrFile); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + DbgPrint("[TCPIP, FileCloseAddress] Leaving\n"); return STATUS_SUCCESS; } Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Fri Jun 10 09:24:29 2011 @@ -260,43 +260,50 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IrpSp; - PTRANSPORT_CONTEXT Context; - TDI_REQUEST Request; - NTSTATUS Status; - - IrpSp = IoGetCurrentIrpStackLocation(Irp); - Context = IrpSp->FileObject->FsContext; - if (!Context) { - TI_DbgPrint(MIN_TRACE, ("Parameters are invalid.\n")); - return STATUS_INVALID_PARAMETER; - } - - switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { - case TDI_TRANSPORT_ADDRESS_FILE: - Request.Handle.AddressHandle = Context->Handle.AddressHandle; - Status = FileCloseAddress(&Request); - break; - - case TDI_CONNECTION_FILE: - Request.Handle.ConnectionContext = Context->Handle.ConnectionContext; - Status = FileCloseConnection(&Request); - break; - - case TDI_CONTROL_CHANNEL_FILE: - Request.Handle.ControlChannel = Context->Handle.ControlChannel; - Status = FileCloseControlChannel(&Request); - break; - - default: - DbgPrint("Unknown type %d\n", (ULONG_PTR)IrpSp->FileObject->FsContext2); - Status = STATUS_INVALID_PARAMETER; - break; - } - - Irp->IoStatus.Status = Status; - - return Irp->IoStatus.Status; + PIO_STACK_LOCATION IrpSp; + PTRANSPORT_CONTEXT Context; + TDI_REQUEST Request; + NTSTATUS Status; + + DbgPrint("[TCPIP, TiCloseFileObject] Called\n"); + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + Context = IrpSp->FileObject->FsContext; + if (!Context) + { + TI_DbgPrint(MIN_TRACE, ("Parameters are invalid.\n")); + return STATUS_INVALID_PARAMETER; + } + + switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) + { + case TDI_TRANSPORT_ADDRESS_FILE: + DbgPrint("[TCPIP, TiCloseFileObject] Closing address file\n"); + Request.Handle.AddressHandle = Context->Handle.AddressHandle; + Status = FileCloseAddress(&Request); + break; + + case TDI_CONNECTION_FILE: + Request.Handle.ConnectionContext = Context->Handle.ConnectionContext; + Status = FileCloseConnection(&Request); + break; + + case TDI_CONTROL_CHANNEL_FILE: + Request.Handle.ControlChannel = Context->Handle.ControlChannel; + Status = FileCloseControlChannel(&Request); + break; + + default: + DbgPrint("Unknown type %d\n", (ULONG_PTR)IrpSp->FileObject->FsContext2); + Status = STATUS_INVALID_PARAMETER; + break; + } + + Irp->IoStatus.Status = Status; + + DbgPrint("[TCPIP, TiCloseFileObject] Leaving. Status = 0x%x\n", Status); + + return Irp->IoStatus.Status; }

1 0

[nyadav] 52169: [AUDSRV] More Style Fixes
by nyadav＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: nyadav Date: Fri Jun 10 07:00:52 2011 New Revision: 52169 URL: http://svn.reactos.org/svn/reactos?rev=52169&view=rev Log: [AUDSRV] More Style Fixes Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c branches/nyadav-audio-branch/base/services/audsrv/rpc.c branches/nyadav-audio-branch/base/services/audsrv/stream.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] Fri Jun 10 07:00:52 2011 @@ -8,96 +8,106 @@ */ #include "audsrv.h" -void * MixS8(MixerEngine * mixer,int buffer) +void * MixS8(MixerEngine * mixer, + int buffer) { return NULL; } -void * MixS16(MixerEngine * mixer,int buffer) +void * MixS16(MixerEngine * mixer, + int buffer) { - int length=0; - short minsamplevalue,maxsamplevalue; - float coefficient = 1.0; - int streamcount = 0,i; - PSHORT localsinkbuf,localsrcbuf; - ServerStream * stream = mixer->serverstreamlist; + int length=0; + short minsamplevalue,maxsamplevalue; + float coefficient = 1.0; + int streamcount = 0,i; + PSHORT localsinkbuf,localsrcbuf; + ServerStream * stream = mixer->serverstreamlist; - /*TODOAssert(mixer->serverstreamlist == NULL)*/ + /*TODOAssert(mixer->serverstreamlist == NULL)*/ - /*Find the Longest Buffer within all ServerStreams*/ - length = stream->length_filtered; - while(stream->next != NULL) - { - if(stream->length_filtered > length && stream->ready == TRUE ) - length = stream->length_filtered; - stream = stream->next; - } + /*Find the Longest Buffer within all ServerStreams*/ + length = stream->length_filtered; + while(stream->next != NULL) + { + if(stream->length_filtered > length && stream->ready == TRUE ) + length = stream->length_filtered; + stream = stream->next; + } - /*Allocate MasterBuffer*/ + /*Allocate MasterBuffer*/ mixer->masterbuf[buffer] = HeapAlloc(GetProcessHeap(), 0, length); - localsinkbuf = mixer->masterbuf[buffer]; + localsinkbuf = mixer->masterbuf[buffer]; mixer->bytes_to_play = length; - /*Perform Actual Mixing*/ - stream = mixer->serverstreamlist; - minsamplevalue = *(short *) stream->minsamplevalue; - maxsamplevalue = *(short *) stream->maxsamplevalue; - while(stream->next != NULL) - { - localsrcbuf = stream->filteredbuf; - if(stream->ready == TRUE ) - { - if( *(short *)stream->maxsamplevalue != maxsamplevalue || - *(short *)stream->minsamplevalue != minsamplevalue ) - { - if( (float) maxsamplevalue / (float)*(short *)stream->maxsamplevalue < - (float) minsamplevalue / (float)*(short *)stream->minsamplevalue ) - coefficient = (float) maxsamplevalue / (float)*(short *)stream->maxsamplevalue; - else - coefficient = (float) minsamplevalue / (float)*(short *)stream->minsamplevalue; - - for(i=0;i<stream->length_filtered;i++) - { - localsinkbuf[i] = (short) (( (localsinkbuf[i] * streamcount) + ((short)((float) localsrcbuf[i] ) * coefficient) ) / (streamcount +1)); - } - } - } - stream->ready = 0; - streamcount++; - stream = stream->next; - } + /*Perform Actual Mixing*/ + stream = mixer->serverstreamlist; + minsamplevalue = *(short *) stream->minsamplevalue; + maxsamplevalue = *(short *) stream->maxsamplevalue; + while(stream->next != NULL) + { + localsrcbuf = stream->filteredbuf; + if(stream->ready == TRUE ) + { + if( *(short *)stream->maxsamplevalue != maxsamplevalue || + *(short *)stream->minsamplevalue != minsamplevalue ) + { + if( (float) maxsamplevalue / (float)*(short *)stream->maxsamplevalue < + (float) minsamplevalue / (float)*(short *)stream->minsamplevalue ) + coefficient = (float) maxsamplevalue / (float)*(short *)stream->maxsamplevalue; + else + coefficient = (float) minsamplevalue / (float)*(short *)stream->minsamplevalue; + + for(i=0;i<stream->length_filtered;i++) + { + localsinkbuf[i] = (short) (( (localsinkbuf[i] * streamcount) + ((short)((float) localsrcbuf[i] ) * coefficient) ) / (streamcount +1)); + } + } + } + stream->ready = 0; + streamcount++; + stream = stream->next; + } CopyMemory(mixer->masterbuf[buffer],mixer->serverstreamlist->filteredbuf,mixer->serverstreamlist->length_filtered); return NULL; } -void * MixS32(MixerEngine * mixer,int buffer) +void * MixS32(MixerEngine * mixer, + int buffer) { return NULL; } -void * MixS64(MixerEngine * mixer,int buffer) +void * MixS64(MixerEngine * mixer, + int buffer) { return NULL; } -void * MixU8(MixerEngine * mixer,int buffer) +void * MixU8(MixerEngine * mixer, + int buffer) { return NULL; } -void * MixU16(MixerEngine * mixer,int buffer) +void * MixU16(MixerEngine * mixer, + int buffer) { return NULL; } -void * MixU32(MixerEngine * mixer,int buffer) +void * MixU32(MixerEngine * mixer, + int buffer) { return NULL; } -void * MixU64(MixerEngine * mixer,int buffer) +void * MixU64(MixerEngine * mixer, + int buffer) { return NULL; } -void * MixFL32(MixerEngine * mixer,int buffer) +void * MixFL32(MixerEngine * mixer, + int buffer) { return NULL; } -void * MixFL64(MixerEngine * mixer,int buffer) +void * MixFL64(MixerEngine * mixer, + int buffer) { return NULL; } Modified: branches/nyadav-audio-branch/base/services/audsrv/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] Fri Jun 10 07:00:52 2011 @@ -51,7 +51,15 @@ /*************************RPC Functions**********************************/ -long AUDInitStream( IN RPC_BINDING_HANDLE hBinding,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) +long AUDInitStream( IN RPC_BINDING_HANDLE hBinding, + LONG frequency, + int channels, + int bitspersample, + int datatype, + ULONG channelmask, + int volume, + int mute, + float balance ) { long stream; Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Fri Jun 10 07:00:52 2011 @@ -88,7 +88,14 @@ /*Clean Stream's data*/ } -long AddStream(LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) +long AddStream(LONG frequency, + int channels, + int bitspersample, + int datatype, + ULONG channelmask, + int volume, + int mute, + float balance ) { ServerStream * newstream,*localstream; DWORD dwID; Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Fri Jun 10 07:00:52 2011 @@ -14,7 +14,15 @@ /*Initialize an audio stream *Return -1 if callbacks are NULL pointers */ -WINAPI int InitStream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) +WINAPI int InitStream (ClientStream * clientstream, + LONG frequency, + int channels, + int bitspersample, + int datatype, + ULONG channelmask, + int volume, + int mute, + float balance) { long streamid; @@ -75,8 +83,8 @@ break; } - if(clientstream->dead) - break; + if(clientstream->dead) + break; /*Check Connection Status If not connected call Connect()*/ /*If connected Properly call the remote audsrv_play() function,This will be a blocking call, placing a dummy wait function here is a good idea.*/ @@ -98,17 +106,20 @@ return 0; } -WINAPI int Volume(ClientStream * clientstream, int * volume ) +WINAPI int Volume(ClientStream * clientstream, + int * volume ) { return 0; } -WINAPI int SetVolume(ClientStream * clientstream ,const int newvolume) +WINAPI int SetVolume(ClientStream * clientstream , + const int newvolume) { return 0; } -WINAPI int Write(ClientStream * clientstream ,const char * aData) +WINAPI int Write(ClientStream * clientstream , + const char * aData) { if(clientstream->dead) return -1; @@ -118,12 +129,14 @@ return 0; } -WINAPI int SetBalance(ClientStream * clientstream ,float balance) +WINAPI int SetBalance(ClientStream * clientstream , + float balance) { return 0; } -WINAPI int GetBalance(ClientStream * clientstream ,float * balance) +WINAPI int GetBalance(ClientStream * clientstream , + float * balance) { return 0; } Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] Fri Jun 10 07:00:52 2011 @@ -51,7 +51,8 @@ } int __cdecl -wmain(int argc, char* argv[]) +wmain(int argc, + char* argv[]) { int error; DWORD dwID;

1 0

[tfaber] 52168: [KMTESTS] - add basic driver that can list/run tests and log messages
by tfaber＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: tfaber Date: Fri Jun 10 05:34:00 2011 New Revision: 52168 URL: http://svn.reactos.org/svn/reactos?rev=52168&view=rev Log: [KMTESTS] - add basic driver that can list/run tests and log messages Added: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h (with props) branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/ (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.rc (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Fri Jun 10 05:34:00 2011 @@ -1,6 +1,32 @@ include_directories( include) +# +# subdirectories containing special-purpose drivers +# +#add_subdirectory(something) + +# +# kmtest_drv.sys driver +# +list(APPEND KMTEST_DRV_SOURCE + kmtest_drv/kmtest_drv.c + kmtest_drv/log.c + kmtest_drv/testlist.c + + kmtest_drv/kmtest_drv.rc) + +add_library(kmtest_drv SHARED ${KMTEST_DRV_SOURCE}) + +set_module_type(kmtest_drv kernelmodedriver) +target_link_libraries(kmtest_drv ${PSEH_LIB}) +add_importlibs(kmtest_drv ntoskrnl hal) + +add_cd_file(TARGET kmtest_drv DESTINATION reactos/system32/drivers FOR all) + +# +# kmtest.exe loader application +# set_rc_compiler() add_definitions(-D_DLL -D__USE_CRTIMP) Modified: branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/d… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild [iso-8859-1] Fri Jun 10 05:34:00 2011 @@ -5,4 +5,5 @@ <xi:include href="something/something_drv.rbuild" /> </directory>--> <xi:include href="kmtest.rbuild" /> + <xi:include href="kmtest_drv.rbuild" /> </group> Added: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h [iso-8859-1] Fri Jun 10 05:34:00 2011 @@ -1,0 +1,21 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Driver logging function declarations + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#ifndef _KMTEST_LOG_H_ +#define _KMTEST_LOG_H_ + +#include <ntddk.h> + +NTSTATUS LogInit(VOID); +VOID LogFree(VOID); + +VOID LogPrint(IN PCSTR Message); +VOID LogPrintF(IN PCSTR Format, ...); +VOID LogVPrintF(IN PCSTR Format, va_list Arguments); +SIZE_T LogRead(OUT PVOID Buffer, IN SIZE_T BufferSize); + +#endif /* !defined _KMTEST_LOG_H_ */ Propchange: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Fri Jun 10 05:34:00 2011 @@ -1,0 +1,25 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite test declarations + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#ifndef _KMTEST_TEST_H_ +#define _KMTEST_TEST_H_ + +#include <kmt_log.h> + +typedef void KMT_TESTFUNC(void); + +typedef struct +{ + const char *TestName; + KMT_TESTFUNC *TestFunction; +} KMT_TEST, *PKMT_TEST; + +typedef const KMT_TEST CKMT_TEST, *PCKMT_TEST; + +extern const KMT_TEST TestList[]; + +#endif /* !defined _KMTEST_TEST_H_ */ Propchange: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Jun 10 05:34:00 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Fri Jun 10 05:34:00 2011 @@ -1,0 +1,12 @@ +<module name="kmtest_drv" type="kernelmodedriver" installbase="system32/drivers" installname="kmtest_drv.sys"> + <include base="kmtest_drv">include</include> + <library>ntoskrnl</library> + <library>ntdll</library> + <library>hal</library> + <library>pseh</library> + <directory name="kmtest_drv"> + <file>kmtest_drv.c</file> + <file>log.c</file> + <file>testlist.c</file> + </directory> +</module> Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] Fri Jun 10 05:34:00 2011 @@ -1,0 +1,282 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Driver + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <ntddk.h> +#include <ntstrsafe.h> +#include <limits.h> + +//#define NDEBUG +#include <debug.h> + +#include <kmt_public.h> +#include <kmt_log.h> +#include <kmt_test.h> + +/* Prototypes */ +DRIVER_INITIALIZE DriverEntry; +static DRIVER_UNLOAD DriverUnload; +static DRIVER_DISPATCH DriverCreateClose; +static DRIVER_DISPATCH DriverIoControl; +static DRIVER_DISPATCH DriverRead; + +/* Globals */ +static PDEVICE_OBJECT MainDeviceObject; + +/* Entry */ +/** + * @name DriverEntry + * + * Driver Entry point. + * + * @param DriverObject + * Driver Object + * @param RegistryPath + * Driver Registry Path + * + * @return Status + */ +NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING DeviceName; + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + DPRINT("DriverEntry\n"); + + Status = LogInit(); + + if (!NT_SUCCESS(Status)) + goto cleanup; + + RtlInitUnicodeString(&DeviceName, L"\\Device\\Kmtest"); + Status = IoCreateDevice(DriverObject, 0, &DeviceName, FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN | FILE_READ_ONLY_DEVICE, + TRUE, &MainDeviceObject); + + if (!NT_SUCCESS(Status)) + goto cleanup; + + DPRINT("DriverEntry. Created DeviceObject %p\n", + MainDeviceObject); + MainDeviceObject->Flags |= DO_DIRECT_IO; + + DriverObject->DriverUnload = DriverUnload; + DriverObject->MajorFunction[IRP_MJ_CREATE] = DriverCreateClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = DriverCreateClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DriverIoControl; + DriverObject->MajorFunction[IRP_MJ_READ] = DriverRead; + +cleanup: + if (MainDeviceObject && !NT_SUCCESS(Status)) + { + IoDeleteDevice(MainDeviceObject); + MainDeviceObject = NULL; + } + + return Status; +} + +/* Dispatch functions */ +/** + * @name DriverUnload + * + * Driver cleanup funtion. + * + * @param DriverObject + * Driver Object + */ +static VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); + + UNREFERENCED_PARAMETER(DriverObject); + + DPRINT("DriverUnload\n"); + + if (MainDeviceObject) + IoDeleteDevice(MainDeviceObject); + + LogFree(); +} + +/** + * @name DriverCreateClose + * + * Driver Dispatch function for CreateFile/CloseHandle. + * + * @param DeviceObject + * Device Object + * @param Irp + * I/O request packet + * + * @return Status + */ +static NTSTATUS NTAPI DriverCreateClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +{ + NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION IoStackLocation; + + PAGED_CODE(); + + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + DPRINT("DriverCreateClose. Function=%s, DeviceObject=%p\n", + IoStackLocation->MajorFunction == IRP_MJ_CREATE ? "Create" : "Close", + DeviceObject); + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +/** + * @name DriverIoControl + * + * Driver Dispatch function for DeviceIoControl. + * + * @param DeviceObject + * Device Object + * @param Irp + * I/O request packet + * + * @return Status + */ +static NTSTATUS NTAPI DriverIoControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +{ + NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION IoStackLocation; + ULONG Length = 0; + + PAGED_CODE(); + + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + DPRINT("DriverIoControl. Code=0x%08X, DeviceObject=%p\n", + IoStackLocation->Parameters.DeviceIoControl.IoControlCode, + DeviceObject); + + switch (IoStackLocation->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_KMTEST_GET_TESTS: + { + PCKMT_TEST TestEntry; + LPSTR OutputBuffer = Irp->AssociatedIrp.SystemBuffer; + size_t Remaining = IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength; + + DPRINT("DriverIoControl. IOCTL_KMTEST_GET_TESTS, outlen=%lu\n", + IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength); + + for (TestEntry = TestList; TestEntry->TestName; ++TestEntry) + { + RtlStringCbCopyExA(OutputBuffer, Remaining, TestEntry->TestName, &OutputBuffer, &Remaining, 0); + if (Remaining) + { + *OutputBuffer++ = '\0'; + --Remaining; + } + } + if (Remaining) + { + *OutputBuffer++ = '\0'; + --Remaining; + } + Length = IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength - Remaining; + break; + } + case IOCTL_KMTEST_RUN_TEST: + { + ANSI_STRING TestName; + PCKMT_TEST TestEntry; + + DPRINT("DriverIoControl. IOCTL_KMTEST_RUN_TEST, inlen=%lu, outlen=%lu\n", + IoStackLocation->Parameters.DeviceIoControl.InputBufferLength, + IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength); + TestName.Length = TestName.MaximumLength = (USHORT)min(IoStackLocation->Parameters.DeviceIoControl.InputBufferLength, USHRT_MAX); + TestName.Buffer = Irp->AssociatedIrp.SystemBuffer; + DPRINT("DriverIoControl. Run test: %Z\n", &TestName); + + for (TestEntry = TestList; TestEntry->TestName; ++TestEntry) + { + ANSI_STRING EntryName; + RtlInitAnsiString(&EntryName, TestEntry->TestName); + + if (!RtlCompareString(&TestName, &EntryName, FALSE)) + { + DPRINT1("DriverIoControl. Starting test %Z\n", &EntryName); + TestEntry->TestFunction(); + DPRINT1("DriverIoControl. Finished test %Z\n", &EntryName); + break; + } + } + + if (!TestEntry->TestName) + Status = STATUS_OBJECT_NAME_INVALID; + + break; + } + default: + DPRINT1("DriverIoControl. Invalid IoCtl code 0x%08X\n", + IoStackLocation->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Length; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +/** + * @name DriverRead + * + * Driver Dispatch function for ReadFile. + * + * @param DeviceObject + * Device Object + * @param Irp + * I/O request packet + * + * @return Status + */ +static NTSTATUS NTAPI DriverRead(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +{ + NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION IoStackLocation; + PVOID ReadBuffer; + SIZE_T Length; + + PAGED_CODE(); + + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + DPRINT("DriverRead. Offset=%I64u, Length=%lu, DeviceObject=%p\n", + IoStackLocation->Parameters.Read.ByteOffset.QuadPart, + IoStackLocation->Parameters.Read.Length, + DeviceObject); + + ReadBuffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + + Length = LogRead(ReadBuffer, IoStackLocation->Parameters.Read.Length); + + DPRINT("DriverRead. Length of data read: %lu\n", + Length); + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Length; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.rc (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.rc [iso-8859-1] Fri Jun 10 05:34:00 2011 @@ -1,0 +1,15 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Driver Resource File + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <windows.h> + +#define REACTOS_FILETYPE VFT_DRV +#define REACTOS_FILESUBTYPE VFT2_DRV_SYSTEM +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Kernel-Mode Test Suite Driver\0" +#define REACTOS_STR_INTERNAL_NAME "kmtest.sys\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kmtest.sys\0" +#include <reactos/version.rc> Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c [iso-8859-1] Fri Jun 10 05:34:00 2011 @@ -1,0 +1,151 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Driver logging functions + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <ntddk.h> +#include <ntstrsafe.h> + +#include <kmt_log.h> + +#define LOGBUFFER_MAX (1024UL * 1024) +static PCHAR LogBuffer; +static SIZE_T LogOffset; + +#define LOG_TAG 'LtmK' + +/* TODO: allow concurrent log buffer access */ + +/** + * @name LogInit + * + * Initialize logging mechanism. Call from DriverEntry. + * + * @return Status + */ +NTSTATUS LogInit(VOID) +{ + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + LogBuffer = ExAllocatePoolWithTag(NonPagedPool, LOGBUFFER_MAX, LOG_TAG); + + if (!LogBuffer) + Status = STATUS_INSUFFICIENT_RESOURCES; + + return Status; +} + +/** + * @name LogFree + * + * Clean up logging mechanism. Call from Unload. + * + * @return None + */ +VOID LogFree(VOID) +{ + PAGED_CODE(); + + ExFreePoolWithTag(LogBuffer, LOG_TAG); +} + +/** + * @name LogPrint + * + * Print a log message. + * + * @param Message + * Ansi string to be logged + * + * @return None + */ +VOID LogPrint(IN PCSTR Message) +{ + SIZE_T MessageLength = strlen(Message); + ASSERT(LogOffset + MessageLength + 1 < LOGBUFFER_MAX); + RtlCopyMemory(&LogBuffer[LogOffset], Message, MessageLength + 1); + LogOffset += MessageLength; +} + +/** + * @name LogPrintF + * + * Print a formatted log message. + * + * @param Format + * printf-like format string + * @param ... + * Arguments corresponding to the format + * + * @return None + */ +VOID LogPrintF(IN PCSTR Format, ...) +{ + va_list Arguments; + PAGED_CODE(); + va_start(Arguments, Format); + LogVPrintF(Format, Arguments); + va_end(Arguments); +} + +/** + * @name LogVPrintF + * + * Print a formatted log message. + * + * @param Format + * printf-like format string + * @param Arguments + * Arguments corresponding to the format + * + * @return None + */ +VOID LogVPrintF(IN PCSTR Format, va_list Arguments) +{ + CHAR Buffer[1024]; + SIZE_T BufferLength; + /* TODO: make this work from any IRQL */ + PAGED_CODE(); + + RtlStringCbVPrintfA(Buffer, sizeof Buffer, Format, Arguments); + + BufferLength = strlen(Buffer); + ASSERT(LogOffset + BufferLength + 1 < LOGBUFFER_MAX); + RtlCopyMemory(&LogBuffer[LogOffset], Buffer, BufferLength + 1); + LogOffset += BufferLength; +} + +/** + * @name LogRead + * + * Retrieve data from the log buffer. + * + * @param Buffer + * Buffer to copy log data to + * @param BufferSize + * Maximum number of bytes to copy + * + * @return Number of bytes copied + */ +SIZE_T LogRead(OUT PVOID Buffer, IN SIZE_T BufferSize) +{ + SIZE_T Size; + PAGED_CODE(); + + Size = min(BufferSize, LogOffset); + RtlCopyMemory(Buffer, LogBuffer, Size); + + if (BufferSize < LogOffset) + { + SIZE_T SizeLeft = LogOffset - BufferSize; + RtlMoveMemory(LogBuffer, &LogBuffer[LogOffset], SizeLeft); + LogOffset = SizeLeft; + } + else + LogOffset = 0; + + return Size; +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Jun 10 05:34:00 2011 @@ -1,0 +1,14 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Driver test list + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <stddef.h> +#include <kmt_test.h> + +const KMT_TEST TestList[] = +{ + { NULL, NULL } +}; Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[nyadav] 52167: [AUDSRV] mixer routine for signed 16 bit data
by nyadav＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: nyadav Date: Thu Jun 9 23:06:06 2011 New Revision: 52167 URL: http://svn.reactos.org/svn/reactos?rev=52167&view=rev Log: [AUDSRV] mixer routine for signed 16 bit data Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c branches/nyadav-audio-branch/base/services/audsrv/audsrv.h branches/nyadav-audio-branch/base/services/audsrv/mixer.c branches/nyadav-audio-branch/base/services/audsrv/stream.c branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] Thu Jun 9 23:06:06 2011 @@ -159,7 +159,7 @@ MixAndFill(MixerEngine * mixer, int buffer) { - while(WaitForSingleObject(mixer->streampresent, + while(WaitForSingleObject(mixer->newStreamEvent, 100) != 0) { if(mixer->dead) @@ -583,7 +583,7 @@ FALSE, NULL); - pengine->streampresent=CreateEvent(NULL, + pengine->newStreamEvent=CreateEvent(NULL, TRUE, FALSE, NULL); @@ -625,7 +625,7 @@ pengine->masterbuf[1] = NULL; pengine->played=CreateEvent(NULL,FALSE,FALSE,NULL); pengine->filled=CreateEvent(NULL,FALSE,FALSE,NULL); - pengine->streampresent=CreateEvent(NULL,TRUE,FALSE,NULL); + pengine->newStreamEvent=CreateEvent(NULL,TRUE,FALSE,NULL); SetConsoleCtrlHandler(Close,TRUE); SpawnMixerThread(pengine); SpawnPlayerThread(pengine); Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Thu Jun 9 23:06:06 2011 @@ -69,7 +69,7 @@ long streamidpool; HANDLE played; HANDLE filled; - HANDLE streampresent; + HANDLE newStreamEvent; HANDLE mixerthread; HANDLE playerthread; HANDLE rpcthread; Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] Thu Jun 9 23:06:06 2011 @@ -14,9 +14,58 @@ } void * MixS16(MixerEngine * mixer,int buffer) { - mixer->masterbuf[buffer] = HeapAlloc(GetProcessHeap(), 0, mixer->serverstreamlist->length_filtered); + int length=0; + short minsamplevalue,maxsamplevalue; + float coefficient = 1.0; + int streamcount = 0,i; + PSHORT localsinkbuf,localsrcbuf; + ServerStream * stream = mixer->serverstreamlist; + + /*TODOAssert(mixer->serverstreamlist == NULL)*/ + + /*Find the Longest Buffer within all ServerStreams*/ + length = stream->length_filtered; + while(stream->next != NULL) + { + if(stream->length_filtered > length && stream->ready == TRUE ) + length = stream->length_filtered; + stream = stream->next; + } + + /*Allocate MasterBuffer*/ + mixer->masterbuf[buffer] = HeapAlloc(GetProcessHeap(), 0, length); + localsinkbuf = mixer->masterbuf[buffer]; + mixer->bytes_to_play = length; + + /*Perform Actual Mixing*/ + stream = mixer->serverstreamlist; + minsamplevalue = *(short *) stream->minsamplevalue; + maxsamplevalue = *(short *) stream->maxsamplevalue; + while(stream->next != NULL) + { + localsrcbuf = stream->filteredbuf; + if(stream->ready == TRUE ) + { + if( *(short *)stream->maxsamplevalue != maxsamplevalue || + *(short *)stream->minsamplevalue != minsamplevalue ) + { + if( (float) maxsamplevalue / (float)*(short *)stream->maxsamplevalue < + (float) minsamplevalue / (float)*(short *)stream->minsamplevalue ) + coefficient = (float) maxsamplevalue / (float)*(short *)stream->maxsamplevalue; + else + coefficient = (float) minsamplevalue / (float)*(short *)stream->minsamplevalue; + + for(i=0;i<stream->length_filtered;i++) + { + localsinkbuf[i] = (short) (( (localsinkbuf[i] * streamcount) + ((short)((float) localsrcbuf[i] ) * coefficient) ) / (streamcount +1)); + } + } + } + stream->ready = 0; + streamcount++; + stream = stream->next; + } CopyMemory(mixer->masterbuf[buffer],mixer->serverstreamlist->filteredbuf,mixer->serverstreamlist->length_filtered); - mixer->bytes_to_play = mixer->serverstreamlist->length_filtered; return NULL; } Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Thu Jun 9 23:06:06 2011 @@ -192,7 +192,7 @@ localstream = localstream->next; localstream->next = newstream; } - SetEvent(pengine->streampresent); + SetEvent(pengine->newStreamEvent); return newstream->streamid; error: Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] Thu Jun 9 23:06:06 2011 @@ -12,6 +12,9 @@ #include <audsrvapi.h> #include <stdio.h> +#include <debug.h> +#include <windows.h> +#include <winbase.h> void OpenComplete (int error ); void BufferCopied (int error ); @@ -28,7 +31,7 @@ DWORD WINAPI RunAudioThread(LPVOID param) { ClientStream * localstream = (ClientStream *) param; - playaudio(localstream); + PlayAudio(localstream); return 0; } @@ -45,7 +48,6 @@ } void PlayComplete (int error ) { - OutputDebugStringA("Playback Completed\n"); } int __cdecl @@ -55,11 +57,11 @@ DWORD dwID; HANDLE audiothread = NULL; char input='\0'; - OutputDebugStringA("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n"); + printf("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n"); //if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) printf(""); /*[out]HANDLE * streamhandle,[in] long frequency,[in] int number of channels,[in] int bitspersample,[in]ULONG channelmask,[in] int volume,[in] int mute,[in] float balance*/ - error = initstream ( &clientstream , + error = InitStream ( &clientstream , 44100 , 2 , 16 , @@ -71,20 +73,17 @@ if ( error ) { - OutputDebugStringA("Failed to Initialize Stream.Error \n"); goto error; } else { - OutputDebugStringA("StreamID : %ld\n",clientstream.stream); audiothread = CreateThread(NULL,0,RunAudioThread,&clientstream,0,&dwID); } while ( input != 'a' ) scanf("%c",&input); - OutputDebugStringA("Stoping Audio Stream.\n"); - stopaudio(&clientstream); + StopAudio(&clientstream); WaitForSingleObject(audiothread,INFINITE); return 0; Modified: branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] Thu Jun 9 23:06:06 2011 @@ -24,7 +24,7 @@ } ClientStream; /********************API Functions******************/ -WINAPI int initstream (ClientStream * clientstream, +WINAPI int InitStream (ClientStream * clientstream, LONG frequency, int channels, int bitspersample, @@ -34,8 +34,8 @@ int mute, float balance); -WINAPI int playaudio ( ClientStream * clientstream); -WINAPI int stopaudio (ClientStream * clientstream ); +WINAPI int PlayAudio ( ClientStream * clientstream); +WINAPI int StopAudio (ClientStream * clientstream ); WINAPI int Volume(ClientStream * clientstream, int * volume );

1 0

[cgutman] 52166: [AFD] - Cleanup the pending connection list before closing the FCB - Fixes yet another socket closure bug
by cgutman＠svn.reactos.org 09 Jun '11

09 Jun '11

Author: cgutman Date: Thu Jun 9 22:38:38 2011 New Revision: 52166 URL: http://svn.reactos.org/svn/reactos?rev=52166&view=rev Log: [AFD] - Cleanup the pending connection list before closing the FCB - Fixes yet another socket closure bug Modified: trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Thu Jun 9 22:38:38 2011 @@ -95,7 +95,7 @@ NTSTATUS Status = STATUS_SUCCESS; PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; - PLIST_ENTRY NextIrpEntry, QeltEntry; + PLIST_ENTRY NextIrpEntry; PIRP NextIrp; if( !SocketAcquireStateLock( FCB ) ) @@ -113,13 +113,6 @@ if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } - - /* Free all pending connections */ - while( !IsListEmpty( &FCB->PendingConnections ) ) { - QeltEntry = RemoveHeadList(&FCB->PendingConnections); - Qelt = CONTAINING_RECORD(QeltEntry, AFD_TDI_OBJECT_QELT, ListEntry); - ExFreePool(Qelt); } /* Free ConnectionReturnInfo and ConnectionCallInfo */ Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Thu Jun 9 22:38:38 2011 @@ -394,6 +394,9 @@ PAFD_FCB FCB = FileObject->FsContext; UINT i; PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; + PAFD_TDI_OBJECT_QELT Qelt; + PLIST_ENTRY QeltEntry; + AFD_DbgPrint(MID_TRACE, ("AfdClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); @@ -420,6 +423,24 @@ } KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); + + ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_CONNECT])); + ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND])); + ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_RECV])); + ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_PREACCEPT])); + + while (!IsListEmpty(&FCB->PendingConnections)) + { + QeltEntry = RemoveHeadList(&FCB->PendingConnections); + Qelt = CONTAINING_RECORD(QeltEntry, AFD_TDI_OBJECT_QELT, ListEntry); + + /* We have to close all pending connections or the listen won't get closed */ + TdiDisassociateAddressFile(Qelt->Object.Object); + ObDereferenceObject(Qelt->Object.Object); + ZwClose(Qelt->Object.Handle); + + ExFreePool(Qelt); + } SocketStateUnlock( FCB );

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