Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 19696: - Forgot to add the define which enables _REACTOS_
by ion＠svn.reactos.com 27 Nov '05

27 Nov '05

- Forgot to add the define which enables _REACTOS_ Modified: trunk/reactos/ReactOS.xml _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-11-27 19:40:46 UTC (rev 19695) +++ trunk/reactos/ReactOS.xml 2005-11-27 20:01:57 UTC (rev 19696) @@ -12,6 +12,7 @@ <define name="_M_IX86" /> <define name="_X86_" /> <define name="__i386__" /> + <define name="_REACTOS_" /> <if property="MP" value="1"> <define name="CONFIG_SMP" value="1" /> </if>

1 0

[hpoussin] 19695: Implement most of SetupDiGetClassDevPropertySheetsW
by hpoussin＠svn.reactos.com 27 Nov '05

27 Nov '05

Implement most of SetupDiGetClassDevPropertySheetsW Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-27 19:21:19 UTC (rev 19694) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-27 19:40:46 UTC (rev 19695) @@ -66,12 +66,17 @@ (WINAPI* DEFAULT_CLASS_INSTALL_PROC) ( IN HDEVINFO DeviceInfoSet, IN OUT PSP_DEVINFO_DATA DeviceInfoData); -typedef DWORD +typedef DWORD (CALLBACK* COINSTALLER_PROC) ( IN DI_FUNCTION InstallFunction, IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, IN OUT PCOINSTALLER_CONTEXT_DATA Context); +typedef BOOL +(WINAPI* PROPERTY_PAGE_PROVIDER) ( + IN PSP_PROPSHEETPAGE_REQUEST PropPageRequest, + IN LPFNADDPROPSHEETPAGE fAddFunc, + IN LPARAM lParam); struct CoInstallerElement { @@ -3468,9 +3473,9 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdA( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, - OUT PSTR DeviceInstanceId, + OUT PSTR DeviceInstanceId OPTIONAL, IN DWORD DeviceInstanceIdSize, - OUT PDWORD RequiredSize) + OUT PDWORD RequiredSize OPTIONAL) { PWSTR DeviceInstanceIdW = NULL; BOOL ret = FALSE; @@ -3504,7 +3509,7 @@ } } - TRACE("Returning 0x%p\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -3514,9 +3519,9 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData, - OUT PWSTR DeviceInstanceId, + OUT PWSTR DeviceInstanceId OPTIONAL, IN DWORD DeviceInstanceIdSize, - OUT PDWORD RequiredSize) + OUT PDWORD RequiredSize OPTIONAL) { BOOL ret = FALSE; @@ -3553,11 +3558,150 @@ SetLastError(ERROR_INSUFFICIENT_BUFFER); } - TRACE("Returning 0x%p\n", ret); + TRACE("Returning %d\n", ret); return ret; } /*********************************************************************** + * SetupDiGetClassDevPropertySheetsA(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassDevPropertySheetsA( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN LPPROPSHEETHEADERA PropertySheetHeader, + IN DWORD PropertySheetHeaderPageListSize, + OUT PDWORD RequiredSize OPTIONAL, + IN DWORD PropertySheetType) +{ + FIXME ("Stub %p %p %p %d %p %d\n", + DeviceInfoSet, DeviceInfoData, PropertySheetHeader, PropertySheetHeaderPageListSize, + RequiredSize, PropertySheetType); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +static BOOL WINAPI GetClassDevPropertySheetsCallback( + IN HPROPSHEETPAGE hPropSheetPage, + LPARAM lParam) +{ + FIXME("Need to add a property page!\n"); + return TRUE; +} + +/********************************************************************** * + * SetupDiGetClassDevPropertySheetsW(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetClassDevPropertySheetsW( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN LPPROPSHEETHEADERW PropertySheetHeader, + IN DWORD PropertySheetHeaderPageListSize, + OUT PDWORD RequiredSize OPTIONAL, + IN DWORD PropertySheetType) +{ + struct DeviceInfoSet *list; + BOOL ret = FALSE; + + TRACE("%p %p %p 0%lx %p 0x%lx\n", DeviceInfoSet, DeviceInfoData, + PropertySheetHeader, PropertySheetHeaderPageListSize, + RequiredSize, PropertySheetType); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (!PropertySheetHeader) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (!DeviceInfoData && IsEqualIID(&list->ClassGuid, &GUID_NULL)) + SetLastError(ERROR_INVALID_PARAMETER); + else if (!PropertySheetHeader) + SetLastError(ERROR_INVALID_PARAMETER); + else if (PropertySheetType != DIGCDP_FLAG_ADVANCED + && PropertySheetType != DIGCDP_FLAG_BASIC + /* FIXME: && PropertySheetType != DIGCDP_FLAG_REMOTE_ADVANCED + && PropertySheetType != DIGCDP_FLAG_REMOTE_BASIC*/) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + HKEY hKey = INVALID_HANDLE_VALUE; + SP_PROPSHEETPAGE_REQUEST Request; + LPWSTR PropPageProvider = NULL; + HMODULE hModule = NULL; + PROPERTY_PAGE_PROVIDER pPropPageProvider = NULL; + DWORD dwLength, dwRegType; + DWORD rc; + + if (DeviceInfoData) + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_QUERY_VALUE); + else + { + /* FIXME: what if DeviceInfoSet is a remote device info set? */ + hKey = SetupDiOpenClassRegKey(&list->ClassGuid, KEY_QUERY_VALUE); + } + if (hKey == INVALID_HANDLE_VALUE) + goto cleanup; + + rc = RegQueryValueExW(hKey, L"EnumPropPages32", NULL, &dwRegType, NULL, &dwLength); + if (rc == ERROR_FILE_NOT_FOUND) + { + /* No registry key. As it is optional, don't say it's a bad error */ + if (RequiredSize) + *RequiredSize = 0; + ret = TRUE; + goto cleanup; + } + else if (rc != ERROR_SUCCESS && dwRegType != REG_SZ) + { + SetLastError(rc); + goto cleanup; + } + + PropPageProvider = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(WCHAR)); + if (!PropPageProvider) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + rc = RegQueryValueExW(hKey, L"EnumPropPages32", NULL, NULL, (LPBYTE)PropPageProvider, &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + PropPageProvider[dwLength / sizeof(WCHAR)] = 0; + + rc = GetFunctionPointer(PropPageProvider, &hModule, (PVOID*)&pPropPageProvider); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + + Request.cbSize = sizeof(SP_PROPSHEETPAGE_REQUEST); + Request.PageRequested = SPPSR_ENUM_ADV_DEVICE_PROPERTIES; + Request.DeviceInfoSet = DeviceInfoSet; + Request.DeviceInfoData = DeviceInfoData; + if (RequiredSize) + *RequiredSize = 0; /* FIXME */ + pPropPageProvider(&Request, GetClassDevPropertySheetsCallback, (LPARAM)0); + ret = TRUE; + +cleanup: + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + HeapFree(GetProcessHeap(), 0, PropPageProvider); + FreeFunctionPointer(hModule, pPropPageProvider); + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/********************************************************************** * * SetupDiCreateDevRegKeyA (SETUPAPI.@) */ HKEY WINAPI SetupDiCreateDevRegKeyA( @@ -4289,7 +4433,6 @@ HeapFree(GetProcessHeap(), 0, ProviderName); HeapFree(GetProcessHeap(), 0, DriverVer); - TRACE("Returning %d\n", ret); return ret; } @@ -5719,7 +5862,7 @@ DWORD DoAction; WCHAR SectionName[MAX_PATH]; DWORD SectionNameLength = 0; - HKEY hKey = INVALID_HANDLE_VALUE;; + HKEY hKey = INVALID_HANDLE_VALUE; InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); Result = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-11-27 19:21:19 UTC (rev 19694) +++ trunk/reactos/lib/setupapi/stubs.c 2005-11-27 19:40:46 UTC (rev 19695) @@ -227,36 +227,6 @@ /*********************************************************************** - * SetupDiGetClassDevPropertySheetsA(SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetClassDevPropertySheetsA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, - LPPROPSHEETHEADERA PropertySheetHeader, - DWORD PropertySheetHeaderPageListSize, PDWORD RequiredSize, - DWORD PropertySheetType) -{ - FIXME ("Stub %p %p %p %d %p %d\n", - DeviceInfoSet, DeviceInfoData, PropertySheetHeader, PropertySheetHeaderPageListSize, - RequiredSize, PropertySheetType); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/********************************************************************** * - * SetupDiGetClassDevPropertySheetsW(SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetClassDevPropertySheetsW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, - LPPROPSHEETHEADERW PropertySheetHeader, - DWORD PropertySheetHeaderPageListSize, PDWORD RequiredSize, - DWORD PropertySheetType) -{ - FIXME ("Stub %p %p %p %d %p %d\n", - DeviceInfoSet, DeviceInfoData, PropertySheetHeader, PropertySheetHeaderPageListSize, - RequiredSize, PropertySheetType); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/********************************************************************** * * SetupDiLoadClassIcon(SETUPAPI.@) */ BOOL WINAPI SetupDiLoadClassIcon(CONST GUID *ClassGuid, HICON *LargeIcon, PINT MiniIconIndex)

1 0

[ion] 19694: - Fix compile issues caused by previous patch.
by ion＠svn.reactos.com 27 Nov '05

27 Nov '05

- Fix compile issues caused by previous patch. - Fix KPROFILE definition. - Protect ReactOS-only members of EPROCESS, OBJECT_HEADER, W32_CALLOUT_DATA. - Protect MADDRESS_SPACE for ReactOS only. Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c Modified: trunk/reactos/ntoskrnl/ke/i386/tss.c Modified: trunk/reactos/ntoskrnl/ke/i386/usertrap.c Modified: trunk/reactos/ntoskrnl/ke/i386/v86m.c Modified: trunk/reactos/ntoskrnl/ke/profile.c Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/include/ndk/asm.h 2005-11-27 19:21:19 UTC (rev 19694) @@ -64,6 +64,7 @@ #define KTSS_CR3 0x1C #define KTSS_EFLAGS 0x24 #define KTSS_IOMAPBASE 0x66 +#define KTSS_IO_MAPS 0x68 // // KTHREAD Offsets _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/include/ndk/fixmes.txt 2005-11-27 19:21:19 UTC (rev 19694) @@ -2,13 +2,7 @@ -------------------------------------------------------------- ________________________________________________________________________ ______________ [CRITICAL] - Breaking compatibility with official structures. -|pstypes.h - EPROCESS has ReactOS only fields. Includes ReactOS Internal header. IFDEF_OUT -|pstypes.h - W32_CALLOUT_DATA has ReactOS only fields. IFDEF-OUT |obtypes.h - Object callbacks are ReactOS only definitions. IFDEF-OUT ADDREAL -|obtypes.h - Object Header includes ReactOS only type. IFDEF-OUT -|mmtypes.h - _MADDRESS_SPACE is ReactOS only field. IFDEF-OUT -|ketypes.h - _KPROFILE needs to be updated with new definitions. FIXFIX -|ketypes.h - _KINTERRUPT needs to be verified with new definitions. FIXFIX |haltypes.h - Loader Parameter Block is ReactOS Version, not NT. IFDEF-OUT ADDREAL | [MAJOR] - Using incorrect, missing, or invalid names or definitions. _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/include/ndk/ketypes.h 2005-11-27 19:21:19 UTC (rev 19694) @@ -350,7 +350,7 @@ } CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA; // -// Kernel Memory Node (FIXME: mmtypes? +// Kernel Memory Node // typedef struct _KNODE { @@ -367,25 +367,26 @@ } KNODE, *PKNODE; // -// Kernel Profile Object (FIXME: Fix with new defs) +// Kernel Profile Object // typedef struct _KPROFILE { CSHORT Type; CSHORT Size; - LIST_ENTRY ListEntry; - PVOID RegionStart; - PVOID RegionEnd; + LIST_ENTRY ProfileListEntry; + PKPROCESS Process; + PVOID RangeBase; + PVOID RangeLimit; ULONG BucketShift; PVOID Buffer; + ULONG Segment; + KAFFINITY Affinity; KPROFILE_SOURCE Source; - ULONG Affinity; - BOOLEAN Active; - struct _KPROCESS *Process; + BOOLEAN Started; } KPROFILE, *PKPROFILE; // -// Kernel Interrupt Object (FIXME: Verify) +// Kernel Interrupt Object // typedef struct _KINTERRUPT { _____ Modified: trunk/reactos/include/ndk/mmtypes.h --- trunk/reactos/include/ndk/mmtypes.h 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/include/ndk/mmtypes.h 2005-11-27 19:21:19 UTC (rev 19694) @@ -202,6 +202,7 @@ // // FIXME: REACTOS SPECIFIC HACK IN EPROCESS // +#ifdef _REACTOS_ typedef struct _MADDRESS_SPACE { struct _MEMORY_AREA *MemoryAreaRoot; @@ -211,6 +212,7 @@ PUSHORT PageTableRefCountTable; ULONG PageTableRefCountTableSize; } MADDRESS_SPACE, *PMADDRESS_SPACE; +#endif // // Generic Address Range Structure _____ Modified: trunk/reactos/include/ndk/obtypes.h --- trunk/reactos/include/ndk/obtypes.h 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/include/ndk/obtypes.h 2005-11-27 19:21:19 UTC (rev 19694) @@ -341,11 +341,13 @@ } OBJECT_HEADER_CREATOR_INFO, *POBJECT_HEADER_CREATOR_INFO; // -// FIXME: Object Header +// Object Header // typedef struct _OBJECT_HEADER { - LIST_ENTRY Entry; +#ifdef _REACTOS_ + LIST_ENTRY Entry; // FIXME: REACTOS ONLY +#endif LONG PointerCount; union { _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/include/ndk/pstypes.h 2005-11-27 19:21:19 UTC (rev 19694) @@ -529,10 +529,6 @@ } THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION; #ifndef NTOS_MODE_USER -/* FIXME: see note in mmtypes.h */ -#ifdef _NTOSKRNL_ -#include <internal/mm.h> -#endif // // EPROCESS Quota Structures @@ -690,6 +686,10 @@ UCHAR ActiveFaultCount; /* 24E */ } ETHREAD; +#if defined(_NTOSKRNL_) + #include <internal/mm.h> +#endif + // // Executive Process (EPROCESS) // @@ -818,16 +818,15 @@ MM_AVL_TABLE VadRoot; /* 250 */ ULONG Cookie; /* 270 */ -/*************************************************************** - * REACTOS SPECIFIC START - ***************************************************************/ - /* FIXME WILL BE DEPRECATED WITH PUSHLOCK SUPPORT IN 0.3.0 */ +#ifdef _REACTOS_ + /* FIXME: WILL BE DEPRECATED WITH PUSHLOCK SUPPORT IN 0.3.0*/ KEVENT LockEvent; /* 274 */ ULONG LockCount; /* 284 */ struct _KTHREAD *LockOwner; /* 288 */ - /* FIXME MOVE TO AVL TREES */ + /* FIXME: MOVE TO AVL TREES */ MADDRESS_SPACE AddressSpace; /* 28C */ +#endif } EPROCESS; #include <poppack.h> @@ -919,11 +918,12 @@ OB_DELETE_METHOD WinStaDelete; OB_PARSE_METHOD WinStaParse; OB_OPEN_METHOD WinStaOpen; - - /* FIXME: These are ROS-ONLY and are fixed in a future local patch */ +#ifdef _REACTOS_ + /* FIXME: REACTOS ONLY */ OB_FIND_METHOD WinStaFind; OB_OPEN_METHOD WinStaCreate; OB_CREATE_METHOD DesktopCreate; +#endif } W32_CALLOUT_DATA, *PW32_CALLOUT_DATA; #endif // !NTOS_MODE_USER _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-11-27 19:21:19 UTC (rev 19694) @@ -167,7 +167,7 @@ { Er.ExceptionCode = STATUS_ACCESS_VIOLATION; Er.NumberParameters = 2; - Er.ExceptionInformation[0] = Tf->ErrorCode & 0x1; + Er.ExceptionInformation[0] = Tf->ErrCode & 0x1; Er.ExceptionInformation[1] = (ULONG)Cr2; } else @@ -194,6 +194,7 @@ VOID KiDoubleFaultHandler(VOID) { +#if 0 unsigned int cr2; ULONG StackLimit; ULONG StackBase; @@ -212,7 +213,7 @@ #endif OldTss = KeGetCurrentKPCR()->TSS; - Esp0 = OldTss->Esp; + Esp0 = OldTss->Esp0; /* Get CR2 */ cr2 = Ke386GetCr2(); @@ -394,7 +395,7 @@ } #endif } - +#endif DbgPrint("\n"); for(;;); } @@ -406,8 +407,8 @@ ULONG cr3_; ULONG StackLimit; ULONG Esp0; - ULONG ExceptionNr = (ULONG)Tf->DebugArgMark; - ULONG cr2 = (ULONG)Tf->DebugPointer; + ULONG ExceptionNr = (ULONG)Tf->DbgArgMark; + ULONG cr2 = (ULONG)Tf->DbgArgPointer; Esp0 = (ULONG)Tf; @@ -417,14 +418,14 @@ if (ExceptionNr < ARRAY_SIZE(ExceptionTypeStrings)) { DbgPrint("%s Exception: %d(%x)\n", ExceptionTypeStrings[ExceptionNr], - ExceptionNr, Tf->ErrorCode&0xffff); + ExceptionNr, Tf->ErrCode&0xffff); } else { - DbgPrint("Exception: %d(%x)\n", ExceptionNr, Tf->ErrorCode&0xffff); + DbgPrint("Exception: %d(%x)\n", ExceptionNr, Tf->ErrCode&0xffff); } DbgPrint("Processor: %d CS:EIP %x:%x ", KeGetCurrentProcessorNumber(), - Tf->Cs&0xffff, Tf->Eip); + Tf->SegCs&0xffff, Tf->Eip); KeRosPrintAddress((PVOID)Tf->Eip); DbgPrint("\n"); Ke386GetPageTableDirectory(cr3_); @@ -442,13 +443,13 @@ PsGetCurrentThread()->Cid.UniqueThread); } DbgPrint("\n"); - DbgPrint("DS %x ES %x FS %x GS %x\n", Tf->Ds&0xffff, Tf->Es&0xffff, - Tf->Fs&0xffff, Tf->Gs&0xfff); + DbgPrint("DS %x ES %x FS %x GS %x\n", Tf->SegDs&0xffff, Tf->SegEs&0xffff, + Tf->SegFs&0xffff, Tf->SegGs&0xfff); DbgPrint("EAX: %.8x EBX: %.8x ECX: %.8x\n", Tf->Eax, Tf->Ebx, Tf->Ecx); DbgPrint("EDX: %.8x EBP: %.8x ESI: %.8x ESP: %.8x\n", Tf->Edx, Tf->Ebp, Tf->Esi, Esp0); - DbgPrint("EDI: %.8x EFLAGS: %.8x ", Tf->Edi, Tf->Eflags); - if ((Tf->Cs&0xffff) == KGDT_R0_CODE) + DbgPrint("EDI: %.8x EFLAGS: %.8x ", Tf->Edi, Tf->EFlags); + if ((Tf->SegCs&0xffff) == KGDT_R0_CODE) { DbgPrint("kESP %.8x ", Esp0); if (PsGetCurrentThread() != NULL) @@ -490,21 +491,21 @@ ASSERT(ExceptionNr != 14); /* Store the exception number in an unused field in the trap frame. */ - Tf->DebugArgMark = ExceptionNr; + Tf->DbgArgMark = ExceptionNr; /* Use the address of the trap frame as approximation to the ring0 esp */ Esp0 = (ULONG)&Tf->Eip; /* Get CR2 */ cr2 = Ke386GetCr2(); - Tf->DebugPointer = cr2; + Tf->DbgArgPointer = cr2; /* * If this was a V86 mode exception then handle it specially */ - if (Tf->Eflags & (1 << 17)) + if (Tf->EFlags & (1 << 17)) { - DPRINT("Tf->Eflags, %x, Tf->Eip %x, ExceptionNr: %d\n", Tf->Eflags, Tf->Eip, ExceptionNr); + DPRINT("Tf->Eflags, %x, Tf->Eip %x, ExceptionNr: %d\n", Tf->EFlags, Tf->Eip, ExceptionNr); return(KeV86Exception(ExceptionNr, Tf, cr2)); } @@ -561,7 +562,7 @@ /* * Handle user exceptions differently */ - if ((Tf->Cs & 0xFFFF) == (KGDT_R3_CODE | RPL_MASK)) + if ((Tf->SegCs & 0xFFFF) == (KGDT_R3_CODE | RPL_MASK)) { return(KiUserTrapHandler(Tf, ExceptionNr, (PVOID)cr2)); } @@ -576,15 +577,15 @@ KiEspFromTrapFrame(IN PKTRAP_FRAME TrapFrame) { /* Check if this is user-mode or V86 */ - if ((TrapFrame->Cs & 1) || (TrapFrame->Eflags & X86_EFLAGS_VM)) + if ((TrapFrame->SegCs & MODE_MASK) || (TrapFrame->EFlags & X86_EFLAGS_VM)) { /* Return it directly */ - return TrapFrame->Esp; + return TrapFrame->HardwareEsp; } else { /* Edited frame */ - if (!(TrapFrame->Cs & FRAME_EDITED)) + if (!(TrapFrame->SegCs & FRAME_EDITED)) { /* Return edited value */ return TrapFrame->TempEsp; @@ -592,7 +593,7 @@ else { /* Virgin frame, calculate */ - return (ULONG)&TrapFrame->Esp; + return (ULONG)&TrapFrame->HardwareEsp; } } } @@ -605,10 +606,10 @@ ULONG Previous = KiEspFromTrapFrame(TrapFrame); /* Check if this is user-mode or V86 */ - if ((TrapFrame->Cs & MODE_MASK) || (TrapFrame->Eflags & X86_EFLAGS_VM)) + if ((TrapFrame->SegCs & MODE_MASK) || (TrapFrame->EFlags & X86_EFLAGS_VM)) { /* Write it directly */ - TrapFrame->Esp = Esp; + TrapFrame->HardwareEsp = Esp; } else { @@ -619,7 +620,7 @@ } /* Create an edit frame, check if it was alrady */ - if (!(TrapFrame->Cs & FRAME_EDITED)) + if (!(TrapFrame->SegCs & FRAME_EDITED)) { /* Update the value */ TrapFrame->TempEsp = Esp; @@ -630,8 +631,8 @@ if (Previous != Esp) { /* Save CS */ - TrapFrame->TempCs = TrapFrame->Cs; - TrapFrame->Cs &= ~FRAME_EDITED; + TrapFrame->TempSegCs = TrapFrame->SegCs; + TrapFrame->SegCs &= ~FRAME_EDITED; /* Save ESP */ TrapFrame->TempEsp = Esp; @@ -645,15 +646,15 @@ KiSsFromTrapFrame(IN PKTRAP_FRAME TrapFrame) { /* If this was V86 Mode */ - if (TrapFrame->Eflags & X86_EFLAGS_VM) + if (TrapFrame->EFlags & X86_EFLAGS_VM) { /* Just return it */ - return TrapFrame->Ss; + return TrapFrame->HardwareSegSs; } - else if (TrapFrame->Cs & MODE_MASK) + else if (TrapFrame->SegCs & MODE_MASK) { /* Usermode, return the User SS */ - return TrapFrame->Ss | RPL_MASK; + return TrapFrame->HardwareSegSs | RPL_MASK; } else { @@ -671,15 +672,15 @@ Ss &= 0xFFFF; /* If this was V86 Mode */ - if (TrapFrame->Eflags & X86_EFLAGS_VM) + if (TrapFrame->EFlags & X86_EFLAGS_VM) { /* Just write it */ - TrapFrame->Ss = Ss; + TrapFrame->HardwareSegSs = Ss; } - else if (TrapFrame->Cs & MODE_MASK) + else if (TrapFrame->SegCs & MODE_MASK) { /* Usermode, save the User SS */ - TrapFrame->Ss = Ss | RPL_MASK; + TrapFrame->HardwareSegSs = Ss | RPL_MASK; } } @@ -697,35 +698,35 @@ { /* Check if we went through a V86 switch */ if ((Context->EFlags & X86_EFLAGS_VM) != - (TrapFrame->Eflags & X86_EFLAGS_VM)) + (TrapFrame->EFlags & X86_EFLAGS_VM)) { /* We did, remember this for later */ V86Switch = TRUE; } /* Copy EFLAGS. FIXME: Needs to be sanitized */ - TrapFrame->Eflags = Context->EFlags; + TrapFrame->EFlags = Context->EFlags; /* Copy EBP and EIP */ TrapFrame->Ebp = Context->Ebp; TrapFrame->Eip = Context->Eip; /* Check if we were in V86 Mode */ - if (TrapFrame->Eflags & X86_EFLAGS_VM) + if (TrapFrame->EFlags & X86_EFLAGS_VM) { /* Simply copy the CS value */ - TrapFrame->Cs = Context->SegCs; + TrapFrame->SegCs = Context->SegCs; } else { /* We weren't in V86, so sanitize the CS (FIXME!) */ - TrapFrame->Cs = Context->SegCs; + TrapFrame->SegCs = Context->SegCs; /* Don't let it under 8, that's invalid */ - if ((PreviousMode != KernelMode) && (TrapFrame->Cs < 8)) + if ((PreviousMode != KernelMode) && (TrapFrame->SegCs < 8)) { /* Force it to User CS */ - TrapFrame->Cs = (KGDT_R3_CODE | RPL_MASK); + TrapFrame->SegCs = (KGDT_R3_CODE | RPL_MASK); } } @@ -754,39 +755,39 @@ if ((Context->ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS) { /* Check if we were in V86 Mode */ - if (TrapFrame->Eflags & X86_EFLAGS_VM) + if (TrapFrame->EFlags & X86_EFLAGS_VM) { /* Copy the V86 Segments directlry */ - TrapFrame->V86_Ds = Context->SegDs; - TrapFrame->V86_Es = Context->SegEs; - TrapFrame->V86_Fs = Context->SegFs; - TrapFrame->V86_Gs = Context->SegGs; + TrapFrame->V86Ds = Context->SegDs; + TrapFrame->V86Es = Context->SegEs; + TrapFrame->V86Fs = Context->SegFs; + TrapFrame->V86Gs = Context->SegGs; } - else if (!(TrapFrame->Cs & MODE_MASK)) + else if (!(TrapFrame->SegCs & MODE_MASK)) { /* For user mode, write the values directly */ - TrapFrame->Ds = KGDT_R3_DATA | RPL_MASK; - TrapFrame->Es = KGDT_R3_DATA | RPL_MASK; - TrapFrame->Fs = Context->SegFs; - TrapFrame->Gs = 0; + TrapFrame->SegDs = KGDT_R3_DATA | RPL_MASK; + TrapFrame->SegEs = KGDT_R3_DATA | RPL_MASK; + TrapFrame->SegFs = Context->SegFs; + TrapFrame->SegGs = 0; } else { /* For kernel-mode, return the values */ - TrapFrame->Ds = Context->SegDs; - TrapFrame->Es = Context->SegEs; - TrapFrame->Fs = Context->SegFs; + TrapFrame->SegDs = Context->SegDs; + TrapFrame->SegEs = Context->SegEs; + TrapFrame->SegFs = Context->SegFs; /* Handle GS specially */ - if (TrapFrame->Cs == (KGDT_R3_CODE | RPL_MASK)) + if (TrapFrame->SegCs == (KGDT_R3_CODE | RPL_MASK)) { /* Don't use it, if user */ - TrapFrame->Gs = 0; + TrapFrame->SegGs = 0; } else { /* Copy it if kernel */ - TrapFrame->Gs = Context->SegGs; + TrapFrame->SegGs = Context->SegGs; } } } @@ -828,19 +829,19 @@ /* EBP, EIP and EFLAGS */ Context->Ebp = TrapFrame->Ebp; Context->Eip = TrapFrame->Eip; - Context->EFlags = TrapFrame->Eflags; + Context->EFlags = TrapFrame->EFlags; /* Return the correct CS */ - if (!(TrapFrame->Cs & FRAME_EDITED) && - !(TrapFrame->Eflags & X86_EFLAGS_VM)) + if (!(TrapFrame->SegCs & FRAME_EDITED) && + !(TrapFrame->EFlags & X86_EFLAGS_VM)) { /* Get it from the Temp location */ - Context->SegCs = TrapFrame->TempCs & 0xFFFF; + Context->SegCs = TrapFrame->TempSegCs & 0xFFFF; } else { /* Return it directly */ - Context->SegCs = TrapFrame->Cs & 0xFFFF; + Context->SegCs = TrapFrame->SegCs & 0xFFFF; } /* Get the Ss and ESP */ @@ -852,31 +853,31 @@ if ((Context->ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS) { /* Do V86 Mode first */ - if (TrapFrame->Eflags & X86_EFLAGS_VM) + if (TrapFrame->EFlags & X86_EFLAGS_VM) { /* Return from the V86 location */ - Context->SegGs = TrapFrame->V86_Gs & 0xFFFF; - Context->SegFs = TrapFrame->V86_Fs & 0xFFFF; - Context->SegEs = TrapFrame->V86_Es & 0xFFFF; - Context->SegDs = TrapFrame->V86_Ds & 0xFFFF; + Context->SegGs = TrapFrame->V86Gs & 0xFFFF; + Context->SegFs = TrapFrame->V86Fs & 0xFFFF; + Context->SegEs = TrapFrame->V86Es & 0xFFFF; + Context->SegDs = TrapFrame->V86Ds & 0xFFFF; } else { /* Check if this was a Kernel Trap */ - if (TrapFrame->Cs == KGDT_R0_CODE) + if (TrapFrame->SegCs == KGDT_R0_CODE) { /* Set valid selectors */ - TrapFrame->Gs = 0; - TrapFrame->Fs = KGDT_R0_PCR; - TrapFrame->Es = KGDT_R3_DATA | RPL_MASK; - TrapFrame->Ds = KGDT_R3_DATA | RPL_MASK; + TrapFrame->SegGs = 0; + TrapFrame->SegFs = KGDT_R0_PCR; + TrapFrame->SegEs = KGDT_R3_DATA | RPL_MASK; + TrapFrame->SegDs = KGDT_R3_DATA | RPL_MASK; } /* Return the segments */ - Context->SegGs = TrapFrame->Gs & 0xFFFF; - Context->SegFs = TrapFrame->Fs & 0xFFFF; - Context->SegEs = TrapFrame->Es & 0xFFFF; - Context->SegDs = TrapFrame->Ds & 0xFFFF; + Context->SegGs = TrapFrame->SegGs & 0xFFFF; + Context->SegFs = TrapFrame->SegFs & 0xFFFF; + Context->SegEs = TrapFrame->SegEs & 0xFFFF; + Context->SegDs = TrapFrame->SegDs & 0xFFFF; } } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c --- trunk/reactos/ntoskrnl/ke/i386/fpu.c 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/ntoskrnl/ke/i386/fpu.c 2005-11-27 19:21:19 UTC (rev 19694) @@ -373,7 +373,7 @@ (void) cr0; ASSERT((cr0 & X86_CR0_TS) == X86_CR0_TS); - ASSERT((Tf->Eflags & X86_EFLAGS_VM) == 0); + ASSERT((Tf->EFlags & X86_EFLAGS_VM) == 0); ASSERT((cr0 & X86_CR0_EM) == 0); /* disable scheduler, clear TS in cr0 */ @@ -485,7 +485,7 @@ } KeLowerIrql(OldIrql); - PreviousMode = ((Tf->Cs & 0xffff) == (KGDT_R3_CODE | RPL_MASK)) ? (UserMode) : (KernelMode); + PreviousMode = ((Tf->SegCs & 0xffff) == (KGDT_R3_CODE | RPL_MASK)) ? (UserMode) : (KernelMode); DPRINT("Math/Xmm fault happened! (PreviousMode = %s)\n", (PreviousMode != KernelMode) ? ("UserMode") : ("KernelMode")); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-11-27 19:21:19 UTC (rev 19694) @@ -170,42 +170,42 @@ KeIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame, PKTRAP_FRAME TrapFrame) { - TrapFrame->Gs = (USHORT)IrqTrapFrame->Gs; - TrapFrame->Fs = (USHORT)IrqTrapFrame->Fs; - TrapFrame->Es = (USHORT)IrqTrapFrame->Es; - TrapFrame->Ds = (USHORT)IrqTrapFrame->Ds; + TrapFrame->SegGs = (USHORT)IrqTrapFrame->Gs; + TrapFrame->SegFs = (USHORT)IrqTrapFrame->Fs; + TrapFrame->SegEs = (USHORT)IrqTrapFrame->Es; + TrapFrame->SegDs = (USHORT)IrqTrapFrame->Ds; TrapFrame->Eax = IrqTrapFrame->Eax; TrapFrame->Ecx = IrqTrapFrame->Ecx; TrapFrame->Edx = IrqTrapFrame->Edx; TrapFrame->Ebx = IrqTrapFrame->Ebx; - TrapFrame->Esp = IrqTrapFrame->Esp; + TrapFrame->HardwareEsp = IrqTrapFrame->Esp; TrapFrame->Ebp = IrqTrapFrame->Ebp; TrapFrame->Esi = IrqTrapFrame->Esi; TrapFrame->Edi = IrqTrapFrame->Edi; TrapFrame->Eip = IrqTrapFrame->Eip; - TrapFrame->Cs = IrqTrapFrame->Cs; - TrapFrame->Eflags = IrqTrapFrame->Eflags; + TrapFrame->SegCs = IrqTrapFrame->Cs; + TrapFrame->EFlags = IrqTrapFrame->Eflags; } STATIC VOID KeTrapFrameToIRQTrapFrame(PKTRAP_FRAME TrapFrame, PKIRQ_TRAPFRAME IrqTrapFrame) { - IrqTrapFrame->Gs = TrapFrame->Gs; - IrqTrapFrame->Fs = TrapFrame->Fs; - IrqTrapFrame->Es = TrapFrame->Es; - IrqTrapFrame->Ds = TrapFrame->Ds; + IrqTrapFrame->Gs = TrapFrame->SegGs; + IrqTrapFrame->Fs = TrapFrame->SegFs; + IrqTrapFrame->Es = TrapFrame->SegEs; + IrqTrapFrame->Ds = TrapFrame->SegDs; IrqTrapFrame->Eax = TrapFrame->Eax; IrqTrapFrame->Ecx = TrapFrame->Ecx; IrqTrapFrame->Edx = TrapFrame->Edx; IrqTrapFrame->Ebx = TrapFrame->Ebx; - IrqTrapFrame->Esp = TrapFrame->Esp; + IrqTrapFrame->Esp = TrapFrame->HardwareEsp; IrqTrapFrame->Ebp = TrapFrame->Ebp; IrqTrapFrame->Esi = TrapFrame->Esi; IrqTrapFrame->Edi = TrapFrame->Edi; IrqTrapFrame->Eip = TrapFrame->Eip; - IrqTrapFrame->Cs = TrapFrame->Cs; - IrqTrapFrame->Eflags = TrapFrame->Eflags; + IrqTrapFrame->Cs = TrapFrame->SegCs; + IrqTrapFrame->Eflags = TrapFrame->EFlags; } VOID STDCALL _____ Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c --- trunk/reactos/ntoskrnl/ke/i386/thread.c 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c 2005-11-27 19:21:19 UTC (rev 19694) @@ -95,11 +95,11 @@ } /* Enable Interrupts and disable some unsupported flags right now */ - TrapFrame->Eflags = Context->EFlags | X86_EFLAGS_IF; - TrapFrame->Eflags &= ~(X86_EFLAGS_VM | X86_EFLAGS_NT | X86_EFLAGS_IOPL); + TrapFrame->EFlags = Context->EFlags | X86_EFLAGS_IF; + TrapFrame->EFlags &= ~(X86_EFLAGS_VM | X86_EFLAGS_NT | X86_EFLAGS_IOPL); /* Set the previous mode as user */ - TrapFrame->PreviousMode = UserMode; + TrapFrame->PreviousPreviousMode = UserMode; /* Terminate the Exception Handler List */ TrapFrame->ExceptionList = (PVOID)0xFFFFFFFF; _____ Modified: trunk/reactos/ntoskrnl/ke/i386/tss.c --- trunk/reactos/ntoskrnl/ke/i386/tss.c 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/ntoskrnl/ke/i386/tss.c 2005-11-27 19:21:19 UTC (rev 19694) @@ -16,6 +16,11 @@ /* GLOBALS *******************************************************************/ +typedef struct _KTSSNOIOPM +{ + UCHAR TssData[KTSS_IO_MAPS]; +} KTSSNOIOPM; + static KTSS* Ki386TssArray[MAXIMUM_PROCESSORS]; PVOID Ki386InitialStackArray[MAXIMUM_PROCESSORS]; static KTSSNOIOPM* Ki386TrapTssArray[MAXIMUM_PROCESSORS]; @@ -38,7 +43,7 @@ USHORT Offset; if(EnableDisable > 1) return FALSE; - Offset = (EnableDisable) ? (USHORT) FIELD_OFFSET(KTSS, IoBitmap) : 0xffff; + Offset = (EnableDisable) ? (USHORT) FIELD_OFFSET(KTSS, IoMaps) : 0xffff; oldIrql = KeRaiseIrqlToSynchLevel(); Process->Pcb.IopmOffset = Offset; @@ -62,7 +67,7 @@ oldIrql = KeRaiseIrqlToSynchLevel(); - memcpy(&KeGetCurrentKPCR()->TSS->IoBitmap[0], + memcpy(&KeGetCurrentKPCR()->TSS->IoMaps[0], IOMapStart, 0x2000); @@ -85,7 +90,7 @@ oldIrql = KeRaiseIrqlToSynchLevel(); memcpy(IOMapStart, - &KeGetCurrentKPCR()->TSS->IoBitmap[0], + &KeGetCurrentKPCR()->TSS->IoMaps[0], 0x2000); KeLowerIrql(oldIrql); @@ -96,8 +101,8 @@ Ki386ApplicationProcessorInitializeTSS(VOID) { ULONG cr3_; - KTSS* Tss; - KTSSNOIOPM* TrapTss; + PKTSS Tss; + PKTSS TrapTss; PVOID TrapStack; ULONG Id; PUSHORT Gdt; @@ -113,7 +118,7 @@ TrapStack = ExAllocatePool(NonPagedPool, MM_STACK_SIZE); Ki386TssArray[Id] = Tss; - Ki386TrapTssArray[Id] = TrapTss; + Ki386TrapTssArray[Id] = (KTSSNOIOPM*)TrapTss; Ki386TrapStackArray[Id] = TrapStack; KeGetCurrentKPCR()->TSS = Tss; @@ -121,8 +126,7 @@ Tss->Esp0 = (ULONG)Ki386InitialStackArray[Id] + MM_STACK_SIZE; /* FIXME: - sizeof(FX_SAVE_AREA)? */ Tss->Ss0 = KGDT_R0_DATA; Tss->IoMapBase = 0xFFFF; /* No i/o bitmap */ - Tss->IoBitmap[8192] = 0xFF; - Tss->Ldt = 0; + Tss->LDT = 0; /* * Initialize a descriptor for the TSS @@ -137,20 +141,16 @@ ((base & 0xFF000000) >> 16)); /* Initialize the TSS used for handling double faults. */ - TrapTss->Eflags = 0; + TrapTss->Flags = 0; TrapTss->Esp0 = ((ULONG)TrapStack + MM_STACK_SIZE); /* FIXME: - sizeof(FX_SAVE_AREA)? */ TrapTss->Ss0 = KGDT_R0_DATA; - TrapTss->Esp = ((ULONG)TrapStack + MM_STACK_SIZE); /* FIXME: - sizeof(FX_SAVE_AREA)? */ TrapTss->Cs = KGDT_R0_CODE; TrapTss->Eip = (ULONG)KiTrap8; - TrapTss->Ss = KGDT_R0_DATA; TrapTss->Ds = KGDT_R0_DATA; TrapTss->Es = KGDT_R0_DATA; TrapTss->Fs = KGDT_R0_PCR; TrapTss->IoMapBase = 0xFFFF; /* No i/o bitmap */ - TrapTss->IoBitmap[0] = 0xFF; - TrapTss->Ldt = 0; - TrapTss->Cr3 = cr3_; + TrapTss->LDT = 0; /* * Initialize a descriptor for the trap TSS. @@ -185,6 +185,7 @@ ULONG cr3_; extern unsigned int trap_stack, trap_stack_top; unsigned int base, length; + PKTSS Tss; Ke386GetPageTableDirectory(cr3_); @@ -196,10 +197,8 @@ /* Initialize the boot TSS. */ KiBootTss.Esp0 = (ULONG)init_stack_top - sizeof(FX_SAVE_AREA); KiBootTss.Ss0 = KGDT_R0_DATA; - // KiBootTss.IoMapBase = FIELD_OFFSET(KTSS, IoBitmap); KiBootTss.IoMapBase = 0xFFFF; /* No i/o bitmap */ - KiBootTss.IoBitmap[8192] = 0xFF; - KiBootTss.Ldt = KGDT_LDT; + KiBootTss.LDT = KGDT_LDT; /* * Initialize a descriptor for the TSS @@ -214,20 +213,17 @@ ((base & 0xFF000000) >> 16); /* Initialize the TSS used for handling double faults. */ - KiBootTrapTss.Eflags = 0; - KiBootTrapTss.Esp0 = (ULONG)trap_stack_top; /* FIXME: - sizeof(FX_SAVE_AREA)? */ - KiBootTrapTss.Ss0 = KGDT_R0_DATA; - KiBootTrapTss.Esp = (ULONG)trap_stack_top; /* FIXME: - sizeof(FX_SAVE_AREA)? */ - KiBootTrapTss.Cs = KGDT_R0_CODE; - KiBootTrapTss.Eip = (ULONG)KiTrap8; - KiBootTrapTss.Ss = KGDT_R0_DATA; - KiBootTrapTss.Ds = KGDT_R0_DATA; - KiBootTrapTss.Es = KGDT_R0_DATA; - KiBootTrapTss.Fs = KGDT_R0_PCR; - KiBootTrapTss.IoMapBase = 0xFFFF; /* No i/o bitmap */ - KiBootTrapTss.IoBitmap[0] = 0xFF; - KiBootTrapTss.Ldt = 0x0; - KiBootTrapTss.Cr3 = cr3_; + Tss = (PKTSS)&KiBootTrapTss; + Tss->Flags = 0; + Tss->Esp0 = (ULONG)trap_stack_top; /* FIXME: - sizeof(FX_SAVE_AREA)? */ + Tss->Ss0 = KGDT_R0_DATA; + Tss->Cs = KGDT_R0_CODE; + Tss->Eip = (ULONG)KiTrap8; + Tss->Ds = KGDT_R0_DATA; + Tss->Es = KGDT_R0_DATA; + Tss->Fs = KGDT_R0_PCR; + Tss->IoMapBase = 0xFFFF; /* No i/o bitmap */ + Tss->LDT = 0x0; /* * Initialize a descriptor for the trap TSS. _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usertrap.c --- trunk/reactos/ntoskrnl/ke/i386/usertrap.c 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/ntoskrnl/ke/i386/usertrap.c 2005-11-27 19:21:19 UTC (rev 19694) @@ -117,7 +117,7 @@ if (ExceptionNr == 14) { Er.NumberParameters = 2; - Er.ExceptionInformation[0] = Tf->ErrorCode & 0x1; + Er.ExceptionInformation[0] = Tf->ErrCode & 0x1; Er.ExceptionInformation[1] = (ULONG)Cr2; } else _____ Modified: trunk/reactos/ntoskrnl/ke/i386/v86m.c --- trunk/reactos/ntoskrnl/ke/i386/v86m.c 2005-11-27 18:24:32 UTC (rev 19693) +++ trunk/reactos/ntoskrnl/ke/i386/v86m.c 2005-11-27 19:21:19 UTC (rev 19694) @@ -37,12 +37,12 @@ ULONG i = 0; BOOL Exit = FALSE; - ip = (PUCHAR)((Tf->Cs & 0xFFFF) * 16 + (Tf->Eip & 0xFFFF)); - sp = (PUSHORT)((Tf->Ss & 0xFFFF) * 16 + (Tf->Esp & 0xFFFF)); + ip = (PUCHAR)((Tf->SegCs & 0xFFFF) * 16 + (Tf->Eip & 0xFFFF)); + sp = (PUSHORT)((Tf->HardwareSegSs & 0xFFFF) * 16 + (Tf->HardwareEsp & 0xFFFF)); dsp = (PULONG)sp; DPRINT("KeV86GPF handling %x at %x:%x ss:sp %x:%x Flags %x\n", - ip[0], Tf->Cs, Tf->Eip, Tf->Ss, Tf->Esp, VTf->regs->Flags); + ip[0], Tf->SegCs, Tf->Eip, Tf->Ss, Tf->HardwareEsp, VTf->regs->Flags); while (!Exit) { @@ -113,9 +113,9 @@ Tf->Eip++; if (!BigAddressPrefix) { - Tf->Esp = Tf->Esp - 2; + Tf->HardwareEsp = Tf->HardwareEsp - 2; sp = sp - 1; - sp[0] = (USHORT)(Tf->Eflags & 0xFFFF); + sp[0] = (USHORT)(Tf->EFlags & 0xFFFF); if (VTf->regs->Vif == 1) { sp[0] = (USHORT)(sp[0] | INTERRUPT_FLAG); @@ -127,9 +127,9 @@ } else { - Tf->Esp = Tf->Esp - 4; + Tf->HardwareEsp = Tf->HardwareEsp - 4; dsp = dsp - 1; - dsp[0] = Tf->Eflags; + dsp[0] = Tf->EFlags; dsp[0] = dsp[0] & VALID_FLAGS; if (VTf->regs->Vif == 1) { @@ -157,9 +157,9 @@ Tf->Eip++; if (!BigAddressPrefix) { - Tf->Eflags = Tf->Eflags & (~0xFFFF); - Tf->Eflags = Tf->Eflags | (sp[0] & VALID_FLAGS); - if (Tf->Eflags & INTERRUPT_FLAG) + Tf->EFlags = Tf->EFlags & (~0xFFFF); + Tf->EFlags = Tf->EFlags | (sp[0] & VALID_FLAGS); + if (Tf->EFlags & INTERRUPT_FLAG) { VTf->regs->Vif = 1; } @@ -167,12 +167,12 @@ { VTf->regs->Vif = 0; } - Tf->Eflags = Tf->Eflags | INTERRUPT_FLAG; - Tf->Esp = Tf->Esp + 2; + Tf->EFlags = Tf->EFlags | INTERRUPT_FLAG; + Tf->HardwareEsp = Tf->HardwareEsp + 2; } else { - Tf->Eflags = Tf->Eflags | (dsp[0] & VALID_FLAGS); + Tf->EFlags = Tf->EFlags | (dsp[0] & VALID_FLAGS); if (dsp[0] & INTERRUPT_FLAG) { VTf->regs->Vif = 1; @@ -181,8 +181,8 @@ { VTf->regs->Vif = 0; } - Tf->Eflags = Tf->Eflags | INTERRUPT_FLAG; - Tf->Esp = Tf->Esp + 2; + Tf->EFlags = Tf->EFlags | INTERRUPT_FLAG; + Tf->HardwareEsp = Tf->HardwareEsp + 2; } return(0); } @@ -199,10 +199,10 @@ if (VTf->regs->Flags & KV86M_EMULATE_CLI_STI) { Tf->Eip = sp[0]; - Tf->Cs = sp[1]; - Tf->Eflags = Tf->Eflags & (~0xFFFF); - Tf->Eflags = Tf->Eflags | sp[2]; - if (Tf->Eflags & INTERRUPT_FLAG) + Tf->SegCs = sp[1]; + Tf->EFlags = Tf->EFlags & (~0xFFFF); + Tf->EFlags = Tf->EFlags | sp[2]; + if (Tf->EFlags & INTERRUPT_FLAG) { VTf->regs->Vif = 1; } @@ -210,8 +210,8 @@ { VTf->regs->Vif = 0; } - Tf->Eflags = Tf->Eflags & (~INTERRUPT_FLAG); - Tf->Esp = Tf->Esp + 6; + Tf->EFlags = Tf->EFlags & (~INTERRUPT_FLAG); + Tf->HardwareEsp = Tf->HardwareEsp + 6; return(0); } Exit = TRUE; @@ -433,11 +433,11 @@ { Offset = Offset & 0xFFFF; } - Buffer = (PUCHAR)((Tf->Es * 16) + Offset); + Buffer = (PUCHAR)((Tf->SegEs * 16) + Offset); for (; Count > 0; Count--) { WRITE_PORT_UCHAR(Port, *Buffer); - if (Tf->Eflags & DIRECTION_FLAG) + if (Tf->EFlags & DIRECTION_FLAG) { Buffer++; } @@ -480,11 +480,11 @@ } if (BigDataPrefix) { - BufferL = (PULONG)((Tf->Es * 16) + Offset); + BufferL = (PULONG)((Tf->SegEs * 16) + Offset); } else { - BufferS = (PUSHORT)((Tf->Es * 16) + Offset); + BufferS = (PUSHORT)((Tf->SegEs * 16) + Offset); } for (; Count > 0; Count--) { @@ -496,7 +496,7 @@ { WRITE_PORT_USHORT((PUSHORT)Port, *BufferS); } - if (Tf->Eflags & DIRECTION_FLAG) + if (Tf->EFlags & DIRECTION_FLAG) { if (BigDataPrefix) { @@ -550,11 +550,11 @@ { Offset = Offset & 0xFFFF; } - Buffer = (PUCHAR)((Tf->Es * 16) + Offset); + Buffer = (PUCHAR)((Tf->SegEs * 16) + Offset); for (; Count > 0; Count--) { *Buffer = READ_PORT_UCHAR(Port); - if (Tf->Eflags & DIRECTION_FLAG) + if (Tf->EFlags & DIRECTION_FLAG) { Buffer++; } @@ -597,11 +597,11 @@ } if (BigDataPrefix) { [truncated at 1000 lines; 210 more skipped]

1 0

[ion] 19693: - Remove KTSS_NOIOMP from NDK.
by ion＠svn.reactos.com 27 Nov '05

27 Nov '05

- Remove KTSS_NOIOMP from NDK. - Fix KTSS definition. - Fix KTRAP_FRAME definition. - Fix RTL_PROCESS_BACKTRACE_INFORMATION and RTL_PROCESS_BACKTRACES definitions. - Fix/rename RUNDOWN_DESCRIPTOR definition. - Rename PPF_ definitions to RTL_USER_PROCESS_PARAMETERS_ - Setup a global _REACTOS_ define when code is compiled. - #ifdef out the multiboot flags from the NDK so they'll only be available for ReactOS. Dirty 'hack' until we stop using them. - Update NDK Fixme list, since all major bugs are fixed now. Modified: trunk/reactos/hal/halx86/mp/apic.c Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/ndk/lpctypes.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/lib/rtl/ppb.c Modified: trunk/reactos/lib/rtl/process.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/rundown.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/clock.c Modified: trunk/reactos/ntoskrnl/ke/usercall.c Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/ps/debug.c _____ Modified: trunk/reactos/hal/halx86/mp/apic.c --- trunk/reactos/hal/halx86/mp/apic.c 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/hal/halx86/mp/apic.c 2005-11-27 18:24:32 UTC (rev 19693) @@ -772,21 +772,21 @@ MpsIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame, PKTRAP_FRAME TrapFrame) { - TrapFrame->Gs = (USHORT)IrqTrapFrame->Gs; - TrapFrame->Fs = (USHORT)IrqTrapFrame->Fs; - TrapFrame->Es = (USHORT)IrqTrapFrame->Es; - TrapFrame->Ds = (USHORT)IrqTrapFrame->Ds; + TrapFrame->SegGs = (USHORT)IrqTrapFrame->Gs; + TrapFrame->SegFs = (USHORT)IrqTrapFrame->Fs; + TrapFrame->SegEs = (USHORT)IrqTrapFrame->Es; + TrapFrame->SegDs = (USHORT)IrqTrapFrame->Ds; TrapFrame->Eax = IrqTrapFrame->Eax; TrapFrame->Ecx = IrqTrapFrame->Ecx; TrapFrame->Edx = IrqTrapFrame->Edx; TrapFrame->Ebx = IrqTrapFrame->Ebx; - TrapFrame->Esp = IrqTrapFrame->Esp; + TrapFrame->HardwareEsp = IrqTrapFrame->Esp; TrapFrame->Ebp = IrqTrapFrame->Ebp; TrapFrame->Esi = IrqTrapFrame->Esi; TrapFrame->Edi = IrqTrapFrame->Edi; TrapFrame->Eip = IrqTrapFrame->Eip; - TrapFrame->Cs = IrqTrapFrame->Cs; - TrapFrame->Eflags = IrqTrapFrame->Eflags; + TrapFrame->SegCs = IrqTrapFrame->Cs; + TrapFrame->EFlags = IrqTrapFrame->Eflags; } VOID _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/include/ndk/extypes.h 2005-11-27 18:24:32 UTC (rev 19693) @@ -271,13 +271,13 @@ } EX_FAST_REF, *PEX_FAST_REF; // -// FIXME +// Executive Fast Reference Wait Block // -typedef struct _RUNDOWN_DESCRIPTOR +typedef struct _EX_RUNDOWN_WAIT_BLOCK { - ULONG_PTR References; + ULONG_PTR Count; KEVENT RundownEvent; -} RUNDOWN_DESCRIPTOR, *PRUNDOWN_DESCRIPTOR; +} EX_RUNDOWN_WAIT_BLOCK, *PEX_RUNDOWN_WAIT_BLOCK; // // Callback Object _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/include/ndk/fixmes.txt 2005-11-27 18:24:32 UTC (rev 19693) @@ -2,23 +2,17 @@ -------------------------------------------------------------- ________________________________________________________________________ ______________ [CRITICAL] - Breaking compatibility with official structures. -|pstypes.h - EPROCESS has ReactOS only fields. Includes ReactOS Internal header. -|pstypes.h - W32_CALLOUT_DATA has ReactOS only fields. -|obtypes.h - Object callbacks are ReactOS only definitions. -|obtypes.h - Object Header includes ReactOS only type. -|mmtypes.h - _MADDRESS_SPACE is ReactOS only field. -|ketypes.h - _KPROFILE needs to be updated with new definitions. -|ketypes.h - _KINTERRUPT needs to be verified with new definitions. -|haltypes.h - Loader Parameter Block is ReactOS Version, not NT. +|pstypes.h - EPROCESS has ReactOS only fields. Includes ReactOS Internal header. IFDEF_OUT +|pstypes.h - W32_CALLOUT_DATA has ReactOS only fields. IFDEF-OUT +|obtypes.h - Object callbacks are ReactOS only definitions. IFDEF-OUT ADDREAL +|obtypes.h - Object Header includes ReactOS only type. IFDEF-OUT +|mmtypes.h - _MADDRESS_SPACE is ReactOS only field. IFDEF-OUT +|ketypes.h - _KPROFILE needs to be updated with new definitions. FIXFIX +|ketypes.h - _KINTERRUPT needs to be verified with new definitions. FIXFIX +|haltypes.h - Loader Parameter Block is ReactOS Version, not NT. IFDEF-OUT ADDREAL | [MAJOR] - Using incorrect, missing, or invalid names or definitions. -|i386/ketypes.h - _KTRAP_FRAME definition is broken. -|i386/ketypes.h - _KTSSNOIOPM is not an official type. -|rtltypes.h - PPF_ Defines don't seem to be the real names (try to find them). -|rtltypes.h - _RTL_PROCESS_BACKTRACE_INFORMATION isn't done. -|haltypes.h - Multi-Boot flags are ReactOS Only. -|extypes.h - _RUNDOWN_DESCRIPTOR is possibly incorrect/unofficial. -|extypes.h - Classes 13, 20, 30, 31, 49, 51, 52, 54+ are undefined. +|extypes.h - Classes 13, 20, 30, 31, 49, 51, 52, 54+ are undefined. WONTFIX |_______________________________________________________________________ ______________ _____ Modified: trunk/reactos/include/ndk/haltypes.h --- trunk/reactos/include/ndk/haltypes.h 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/include/ndk/haltypes.h 2005-11-27 18:24:32 UTC (rev 19693) @@ -27,8 +27,9 @@ #ifndef NTOS_MODE_USER // -// Multi-Boot Flags (FIXME) +// Multi-Boot Flags (REMOVE ME) // +#ifdef _REACTOS_ #define MB_FLAGS_MEM_INFO (0x1) #define MB_FLAGS_BOOT_DEVICE (0x2) #define MB_FLAGS_COMMAND_LINE (0x4) @@ -42,6 +43,7 @@ #define MB_FLAGS_APM_TABLE (0x400) #define MB_FLAGS_GRAPHICS_TABLE (0x800) #define MB_FLAGS_ACPI_TABLE (0x1000) +#endif // // HalShutdownSystem Types _____ Modified: trunk/reactos/include/ndk/i386/ketypes.h --- trunk/reactos/include/ndk/i386/ketypes.h 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/include/ndk/i386/ketypes.h 2005-11-27 18:24:32 UTC (rev 19693) @@ -90,11 +90,11 @@ // typedef struct _KTRAP_FRAME { - ULONG DebugEbp; - ULONG DebugEip; - ULONG DebugArgMark; - ULONG DebugPointer; - ULONG TempCs; + ULONG DbgEbp; + ULONG DbgEip; + ULONG DbgArgMark; + ULONG DbgArgPointer; + ULONG TempSegCs; ULONG TempEsp; ULONG Dr0; ULONG Dr1; @@ -102,29 +102,29 @@ ULONG Dr3; ULONG Dr6; ULONG Dr7; - ULONG Gs; - ULONG Es; - ULONG Ds; + ULONG SegGs; + ULONG SegEs; + ULONG SegDs; ULONG Edx; ULONG Ecx; ULONG Eax; - ULONG PreviousMode; - PVOID ExceptionList; - ULONG Fs; + ULONG PreviousPreviousMode; + struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; + ULONG SegFs; ULONG Edi; ULONG Esi; ULONG Ebx; ULONG Ebp; - ULONG ErrorCode; + ULONG ErrCode; ULONG Eip; - ULONG Cs; - ULONG Eflags; - ULONG Esp; - ULONG Ss; - ULONG V86_Es; - ULONG V86_Ds; - ULONG V86_Fs; - ULONG V86_Gs; + ULONG SegCs; + ULONG EFlags; + ULONG HardwareEsp; + ULONG HardwareSegSs; + ULONG V86Es; + ULONG V86Ds; + ULONG V86Fs; + ULONG V86Gs; } KTRAP_FRAME, *PKTRAP_FRAME; // @@ -461,99 +461,45 @@ #pragma pack(pop) // -// FIXME: TSS without I/O Privilege Map +// TSS Definition // -#include <pshpack1.h> -typedef struct _KTSSNOIOPM +typedef struct _KiIoAccessMap { - USHORT PreviousTask; - USHORT Reserved1; - ULONG Esp0; - USHORT Ss0; - USHORT Reserved2; - ULONG Esp1; - USHORT Ss1; - USHORT Reserved3; - ULONG Esp2; - USHORT Ss2; - USHORT Reserved4; - ULONG Cr3; - ULONG Eip; - ULONG Eflags; - ULONG Eax; - ULONG Ecx; - ULONG Edx; - ULONG Ebx; - ULONG Esp; - ULONG Ebp; - ULONG Esi; - ULONG Edi; - USHORT Es; - USHORT Reserved5; - USHORT Cs; - USHORT Reserved6; - USHORT Ss; - USHORT Reserved7; - USHORT Ds; - USHORT Reserved8; - USHORT Fs; - USHORT Reserved9; - USHORT Gs; - USHORT Reserved10; - USHORT Ldt; - USHORT Reserved11; - USHORT Trap; - USHORT IoMapBase; - /* no interrupt redirection map */ - UCHAR IoBitmap[1]; -} KTSSNOIOPM; + UCHAR DirectionMap[32]; + UCHAR IoMap[8196]; +} KIIO_ACCESS_MAP; -// -// TSS Definition -// +#include <pshpack1.h> typedef struct _KTSS { - USHORT PreviousTask; - USHORT Reserved1; + USHORT Backlink; + USHORT Reserved0; ULONG Esp0; USHORT Ss0; - USHORT Reserved2; - ULONG Esp1; - USHORT Ss1; - USHORT Reserved3; - ULONG Esp2; - USHORT Ss2; - USHORT Reserved4; - ULONG Cr3; + USHORT Reserved1; + ULONG NotUsed1[4]; + ULONG CR3; ULONG Eip; - ULONG Eflags; - ULONG Eax; - ULONG Ecx; - ULONG Edx; - ULONG Ebx; - ULONG Esp; - ULONG Ebp; - ULONG Esi; - ULONG Edi; + ULONG NotUsed2[9]; USHORT Es; - USHORT Reserved5; + USHORT Reserved2; USHORT Cs; - USHORT Reserved6; + USHORT Reserved3; USHORT Ss; - USHORT Reserved7; + USHORT Reserved4; USHORT Ds; - USHORT Reserved8; + USHORT Reserved5; USHORT Fs; - USHORT Reserved9; + USHORT Reserved6; USHORT Gs; - USHORT Reserved10; - USHORT Ldt; - USHORT Reserved11; - USHORT Trap; + USHORT Reserved7; + USHORT LDT; + USHORT Reserved8; + USHORT Flags; USHORT IoMapBase; - /* no interrupt redirection map */ - UCHAR IoBitmap[8193]; -} KTSS; + KIIO_ACCESS_MAP IoMaps[1]; + UCHAR IntDirectionMap[32]; +} KTSS, *PKTSS; #include <poppack.h> // _____ Modified: trunk/reactos/include/ndk/lpctypes.h --- trunk/reactos/include/ndk/lpctypes.h 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/include/ndk/lpctypes.h 2005-11-27 18:24:32 UTC (rev 19693) @@ -26,6 +26,12 @@ #include <pstypes.h> // +// Internal helper macro +// +#define N_ROUND_UP(x,s) \ + (((ULONG)(x)+(s)-1) & ~((ULONG)(s)-1)) + +// // Maximum message size that can be sent through an LPC Port without a section // #define PORT_MAXIMUM_MESSAGE_LENGTH 256 @@ -234,9 +240,9 @@ // Maximum total Kernel-Mode LPC Message Structure Size // #define LPCP_MAX_MESSAGE_SIZE \ - ALIGN_UP(PORT_MAXIMUM_MESSAGE_LENGTH + \ + N_ROUND_UP(PORT_MAXIMUM_MESSAGE_LENGTH + \ sizeof(LPCP_MESSAGE) + \ - sizeof(LPCP_CONNECTION_MESSAGE), sizeof(ULONGLONG) * 2) + sizeof(LPCP_CONNECTION_MESSAGE), 16) // // Maximum actual LPC Message Length _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/include/ndk/rtltypes.h 2005-11-27 18:24:32 UTC (rev 19693) @@ -31,17 +31,17 @@ #define RTL_MAXIMUM_ATOM_LENGTH 255 // -// Process Parameters Flags (FIXME: Rename) +// Process Parameters Flags // -#define PPF_NORMALIZED 0x01 -#define PPF_PROFILE_USER 0x02 -#define PPF_PROFILE_SERVER 0x04 -#define PPF_PROFILE_KERNEL 0x08 -#define PPF_UNKNOWN 0x10 -#define PPF_RESERVE_1MB 0x20 -#define PPF_DISABLE_HEAP_CHECKS 0x100 -#define PPF_PROCESS_OR_1 0x200 -#define PPF_PROCESS_OR_2 0x400 +#define RTL_USER_PROCESS_PARAMETERS_NORMALIZED 0x01 +#define RTL_USER_PROCESS_PARAMETERS_PROFILE_USER 0x02 +#define RTL_USER_PROCESS_PARAMETERS_PROFILE_SERVER 0x04 +#define RTL_USER_PROCESS_PARAMETERS_PROFILE_KERNEL 0x08 +#define RTL_USER_PROCESS_PARAMETERS_UNKNOWN 0x10 +#define RTL_USER_PROCESS_PARAMETERS_RESERVE_1MB 0x20 +#define RTL_USER_PROCESS_PARAMETERS_DISABLE_HEAP_CHECKS 0x100 +#define RTL_USER_PROCESS_PARAMETERS_PROCESS_OR_1 0x200 +#define RTL_USER_PROCESS_PARAMETERS_PROCESS_OR_2 0x400 // // Exception Flags @@ -613,14 +613,20 @@ typedef struct _RTL_PROCESS_BACKTRACE_INFORMATION { - /* FIXME */ - ULONG Unknown; + PVOID SymbolicBackTrace; + ULONG TraceCount; + USHORT Index; + USHORT Depth; + PVOID BackTrace[16]; } RTL_PROCESS_BACKTRACE_INFORMATION, *PRTL_PROCESS_BACKTRACE_INFORMATION; typedef struct _RTL_PROCESS_BACKTRACES { - ULONG BackTraceCount; - RTL_PROCESS_BACKTRACE_INFORMATION BackTraceEntry[1]; + ULONG CommittedMemory; + ULONG ReservedMemory; + ULONG NumberOfBackTraceLookups; + ULONG NumberOfBackTraces; + RTL_PROCESS_BACKTRACE_INFORMATION BackTraces[1]; } RTL_PROCESS_BACKTRACES, *PRTL_PROCESS_BACKTRACES; typedef struct _RTL_DEBUG_BUFFER _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/lib/kernel32/process/create.c 2005-11-27 18:24:32 UTC (rev 19693) @@ -580,13 +580,13 @@ /* Handle some Parameter Flags */ ProcessParameters->ConsoleFlags = (CreationFlags & CREATE_NEW_PROCESS_GROUP); ProcessParameters->Flags |= (CreationFlags & PROFILE_USER) ? - PPF_PROFILE_USER : 0; + RTL_USER_PROCESS_PARAMETERS_PROFILE_USER : 0; ProcessParameters->Flags |= (CreationFlags & PROFILE_KERNEL) ? - PPF_PROFILE_KERNEL : 0; + RTL_USER_PROCESS_PARAMETERS_PROFILE_KERNEL : 0; ProcessParameters->Flags |= (CreationFlags & PROFILE_SERVER) ? - PPF_PROFILE_SERVER : 0; + RTL_USER_PROCESS_PARAMETERS_PROFILE_SERVER : 0; ProcessParameters->Flags |= (NtCurrentPeb()->ProcessParameters->Flags & - PPF_DISABLE_HEAP_CHECKS); + RTL_USER_PROCESS_PARAMETERS_DISABLE_HEAP_CHECKS); /* Write the Parameter Block */ Status = NtWriteVirtualMemory(ProcessHandle, _____ Modified: trunk/reactos/lib/rtl/ppb.c --- trunk/reactos/lib/rtl/ppb.c 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/lib/rtl/ppb.c 2005-11-27 18:24:32 UTC (rev 19693) @@ -139,7 +139,7 @@ Param->MaximumLength = RegionSize; Param->Length = Length; - Param->Flags = PPF_NORMALIZED; + Param->Flags = RTL_USER_PROCESS_PARAMETERS_NORMALIZED; Param->Environment = Environment; Param->CurrentDirectory.Handle = CurrentDirectoryHandle; Param->ConsoleHandle = ConsoleHandle; @@ -238,7 +238,7 @@ PRTL_USER_PROCESS_PARAMETERS NTAPI RtlDeNormalizeProcessParams(PRTL_USER_PROCESS_PARAMETERS Params) { - if (Params && (Params->Flags & PPF_NORMALIZED)) + if (Params && (Params->Flags & RTL_USER_PROCESS_PARAMETERS_NORMALIZED)) { DENORMALIZE(Params->CurrentDirectory.DosPath.Buffer, Params); DENORMALIZE(Params->DllPath.Buffer, Params); @@ -249,7 +249,7 @@ DENORMALIZE(Params->ShellInfo.Buffer, Params); DENORMALIZE(Params->RuntimeData.Buffer, Params); - Params->Flags &= ~PPF_NORMALIZED; + Params->Flags &= ~RTL_USER_PROCESS_PARAMETERS_NORMALIZED; } return Params; @@ -263,7 +263,7 @@ PRTL_USER_PROCESS_PARAMETERS NTAPI RtlNormalizeProcessParams(PRTL_USER_PROCESS_PARAMETERS Params) { - if (Params && !(Params->Flags & PPF_NORMALIZED)) + if (Params && !(Params->Flags & RTL_USER_PROCESS_PARAMETERS_NORMALIZED)) { NORMALIZE(Params->CurrentDirectory.DosPath.Buffer, Params); NORMALIZE(Params->DllPath.Buffer, Params); @@ -274,7 +274,7 @@ NORMALIZE(Params->ShellInfo.Buffer, Params); NORMALIZE(Params->RuntimeData.Buffer, Params); - Params->Flags |= PPF_NORMALIZED; + Params->Flags |= RTL_USER_PROCESS_PARAMETERS_NORMALIZED; } return Params; _____ Modified: trunk/reactos/lib/rtl/process.c --- trunk/reactos/lib/rtl/process.c 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/lib/rtl/process.c 2005-11-27 18:24:32 UTC (rev 19693) @@ -80,7 +80,7 @@ ProcessHandle, Peb, ProcessParameters); /* Give the caller 1MB if he requested it */ - if (ProcessParameters->Flags & PPF_RESERVE_1MB) + if (ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_RESERVE_1MB) { /* Give 1MB starting at 0x4 */ BaseAddress = (PVOID)4; _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-11-27 18:24:32 UTC (rev 19693) @@ -250,7 +250,6 @@ ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD); ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread) == KPCR_NPX_THREAD); ASSERT(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0); - ASSERT(FIELD_OFFSET(KTSS, Eflags) == KTSS_EFLAGS); ASSERT(FIELD_OFFSET(KTSS, IoMapBase) == KTSS_IOMAPBASE); ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); } _____ Modified: trunk/reactos/ntoskrnl/ex/rundown.c --- trunk/reactos/ntoskrnl/ex/rundown.c 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/ntoskrnl/ex/rundown.c 2005-11-27 18:24:32 UTC (rev 19693) @@ -123,7 +123,7 @@ if (Current & EX_RUNDOWN_ACTIVE) { /* Get Pointer */ - PRUNDOWN_DESCRIPTOR RundownDescriptor = (PRUNDOWN_DESCRIPTOR)(Current & ~EX_RUNDOWN_ACTIVE); + PEX_RUNDOWN_WAIT_BLOCK RundownDescriptor = (PEX_RUNDOWN_WAIT_BLOCK)(Current & ~EX_RUNDOWN_ACTIVE); if (RundownDescriptor == NULL) { @@ -131,9 +131,9 @@ break; } - Current = RundownDescriptor->References; + Current = RundownDescriptor->Count; - /* Decrease RundownDescriptor->References by Count references */ + /* Decrease RundownDescriptor->Count by Count Count */ for (;;) { ULONG_PTR PrevCount, NewCount; @@ -144,12 +144,12 @@ } else { - NewCount = ((RundownDescriptor->References - (Count >> EX_RUNDOWN_COUNT_SHIFT)) << EX_RUNDOWN_COUNT_SHIFT) | EX_RUNDOWN_ACTIVE; + NewCount = ((RundownDescriptor->Count - (Count >> EX_RUNDOWN_COUNT_SHIFT)) << EX_RUNDOWN_COUNT_SHIFT) | EX_RUNDOWN_ACTIVE; } #ifdef _WIN64 - PrevCount = (ULONG_PTR)InterlockedCompareExchange64((LONGLONG*)&RundownDescriptor->R eferences, (LONGLONG)NewCount, (LONGLONG)Current); + PrevCount = (ULONG_PTR)InterlockedCompareExchange64((LONGLONG*)&RundownDescriptor->C ount, (LONGLONG)NewCount, (LONGLONG)Current); #else - PrevCount = (ULONG_PTR)InterlockedCompareExchange((LONG*)&RundownDescriptor->Referen ces, (LONG)NewCount, (LONG)Current); + PrevCount = (ULONG_PTR)InterlockedCompareExchange((LONG*)&RundownDescriptor->Count, (LONG)NewCount, (LONG)Current); #endif if (PrevCount == Current) { @@ -227,7 +227,7 @@ ) { ULONG_PTR PrevCount, NewPtr, PrevPtr; - RUNDOWN_DESCRIPTOR RundownDescriptor; + EX_RUNDOWN_WAIT_BLOCK RundownDescriptor; PAGED_CODE(); @@ -236,9 +236,9 @@ if (PrevCount != 0 && !(PrevCount & EX_RUNDOWN_ACTIVE)) { /* save the reference counter */ - RundownDescriptor.References = PrevCount >> EX_RUNDOWN_COUNT_SHIFT; + RundownDescriptor.Count = PrevCount >> EX_RUNDOWN_COUNT_SHIFT; - /* Pending references... wait on them to be closed with an event */ + /* Pending Count... wait on them to be closed with an event */ KeInitializeEvent(&RundownDescriptor.RundownEvent, NotificationEvent, FALSE); ASSERT(!((ULONG_PTR)&RundownDescriptor & EX_RUNDOWN_ACTIVE)); @@ -267,7 +267,7 @@ PrevCount = PrevPtr; /* save the changed reference counter and try again */ - RundownDescriptor.References = PrevCount >> EX_RUNDOWN_COUNT_SHIFT; + RundownDescriptor.Count = PrevCount >> EX_RUNDOWN_COUNT_SHIFT; } } } _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-11-27 18:24:32 UTC (rev 19693) @@ -133,18 +133,18 @@ { 4, FIELD_OFFSET(KTRAP_FRAME, Ecx), FIELD_OFFSET(CONTEXT, Ecx), TRUE }, { 4, FIELD_OFFSET(KTRAP_FRAME, Edx), FIELD_OFFSET(CONTEXT, Edx), FALSE }, { 4, FIELD_OFFSET(KTRAP_FRAME, Ebx), FIELD_OFFSET(CONTEXT, Ebx), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Esp), FIELD_OFFSET(CONTEXT, Esp), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, DebugEbp), FIELD_OFFSET(CONTEXT, Ebp), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, HardwareEsp ), FIELD_OFFSET(CONTEXT, Esp), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, DbgEbp), FIELD_OFFSET(CONTEXT, Ebp), TRUE }, { 4, FIELD_OFFSET(KTRAP_FRAME, Esi), FIELD_OFFSET(CONTEXT, Esi), TRUE }, { 4, FIELD_OFFSET(KTRAP_FRAME, Edi), FIELD_OFFSET(CONTEXT, Edi), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, DebugEip), FIELD_OFFSET(CONTEXT, Eip), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Eflags), FIELD_OFFSET(CONTEXT, EFlags), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Cs), FIELD_OFFSET(CONTEXT, SegCs), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Ss), FIELD_OFFSET(CONTEXT, SegSs), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Ds), FIELD_OFFSET(CONTEXT, SegDs), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Es), FIELD_OFFSET(CONTEXT, SegEs), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Fs), FIELD_OFFSET(CONTEXT, SegFs), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Gs), FIELD_OFFSET(CONTEXT, SegGs), TRUE } + { 4, FIELD_OFFSET(KTRAP_FRAME, DbgEip), FIELD_OFFSET(CONTEXT, Eip), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, EFlags), FIELD_OFFSET(CONTEXT, EFlags), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, SegCs), FIELD_OFFSET(CONTEXT, SegCs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, HardwareSegSs), FIELD_OFFSET(CONTEXT, SegSs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, SegDs), FIELD_OFFSET(CONTEXT, SegDs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, SegEs), FIELD_OFFSET(CONTEXT, SegEs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, SegFs), FIELD_OFFSET(CONTEXT, SegFs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, SegGs), FIELD_OFFSET(CONTEXT, SegGs), TRUE } }; static PCHAR GspThreadStates[DeferredReady+1] = @@ -564,7 +564,7 @@ GspGetEspFromTrapFrame(PKTRAP_FRAME TrapFrame) { return KeGetPreviousMode() == KernelMode - ? (LONG) &TrapFrame->Esp : (LONG)TrapFrame->Esp; + ? (LONG) &TrapFrame->HardwareEsp : (LONG)TrapFrame->HardwareEsp; } _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-11-27 18:24:32 UTC (rev 19693) @@ -906,7 +906,7 @@ KeGetCurrentThread()->TrapFrame); /* Don't deliver APCs in V86 mode */ - if (TrapFrame->Eflags & X86_EFLAGS_VM) return; + if (TrapFrame->EFlags & X86_EFLAGS_VM) return; /* Save the full context */ Context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS; @@ -927,7 +927,7 @@ /* Run at APC dispatcher */ TrapFrame->Eip = (ULONG)KeUserApcDispatcher; - TrapFrame->Esp = Stack; + TrapFrame->HardwareEsp = Stack; /* Setup the stack */ *(PULONG_PTR)(Stack + 0 * sizeof(ULONG_PTR)) = (ULONG_PTR)NormalRoutine; _____ Modified: trunk/reactos/ntoskrnl/ke/clock.c --- trunk/reactos/ntoskrnl/ke/clock.c 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/ntoskrnl/ke/clock.c 2005-11-27 18:24:32 UTC (rev 19693) @@ -260,8 +260,8 @@ * Cs bit 0 is always set for user mode if we are in protected mode. * V86 mode is counted as user time. */ - if (TrapFrame->Cs & 0x1 || - TrapFrame->Eflags & X86_EFLAGS_VM) + if (TrapFrame->SegCs & MODE_MASK || + TrapFrame->EFlags & X86_EFLAGS_VM) { InterlockedIncrementUL(&CurrentThread->UserTime); InterlockedIncrementUL(&CurrentProcess->UserTime); _____ Modified: trunk/reactos/ntoskrnl/ke/usercall.c --- trunk/reactos/ntoskrnl/ke/usercall.c 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/ntoskrnl/ke/usercall.c 2005-11-27 18:24:32 UTC (rev 19693) @@ -207,9 +207,9 @@ Thread->Tcb.TrapFrame, sizeof(KTRAP_FRAME) - (4 * sizeof(ULONG))); NewFrame = (PKTRAP_FRAME)((char*)NewStack + StackSize - sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA)); /* We need the stack pointer to remain 4-byte aligned */ - NewFrame->Esp -= (((ArgumentLength + 3) & (~ 0x3)) + (4 * sizeof(ULONG))); + NewFrame->HardwareEsp -= (((ArgumentLength + 3) & (~ 0x3)) + (4 * sizeof(ULONG))); NewFrame->Eip = (ULONG)KeUserCallbackDispatcher; - UserEsp = (PULONG)NewFrame->Esp; + UserEsp = (PULONG)NewFrame->HardwareEsp; UserEsp[0] = 0; /* Return address. */ UserEsp[1] = RoutineIndex; UserEsp[2] = (ULONG)&UserEsp[4]; _____ Modified: trunk/reactos/ntoskrnl/mm/pagefile.c --- trunk/reactos/ntoskrnl/mm/pagefile.c 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/ntoskrnl/mm/pagefile.c 2005-11-27 18:24:32 UTC (rev 19693) @@ -544,7 +544,7 @@ Headers->Type = MmCoreDumpType; if (TrapFrame != NULL) { - if (!(TrapFrame->Eflags & (1 << 17))) + if (!(TrapFrame->EFlags & (1 << 17))) { memcpy(&Headers->TrapFrame, TrapFrame, sizeof(KTRAP_FRAME) - (4 * sizeof(DWORD))); _____ Modified: trunk/reactos/ntoskrnl/ps/debug.c --- trunk/reactos/ntoskrnl/ps/debug.c 2005-11-27 17:05:37 UTC (rev 19692) +++ trunk/reactos/ntoskrnl/ps/debug.c 2005-11-27 18:24:32 UTC (rev 19693) @@ -56,7 +56,7 @@ Event = &GetSetContext->Event; Mode = GetSetContext->Mode; - if (TrapFrame->Cs == KGDT_R0_CODE && Mode != KernelMode) + if (TrapFrame->SegCs == KGDT_R0_CODE && Mode != KernelMode) { GetSetContext->Status = STATUS_ACCESS_DENIED; }

1 0

[hpoussin] 19692: Fix part of bug 1053, by adding other hardware IDs that don't need a driver
by hpoussin＠svn.reactos.com 27 Nov '05

27 Nov '05

Fix part of bug 1053, by adding other hardware IDs that don't need a driver Modified: trunk/reactos/media/inf/machine.inf _____ Modified: trunk/reactos/media/inf/machine.inf --- trunk/reactos/media/inf/machine.inf 2005-11-27 15:59:32 UTC (rev 19691) +++ trunk/reactos/media/inf/machine.inf 2005-11-27 17:05:37 UTC (rev 19692) @@ -35,6 +35,7 @@ %*PNP0A03.DeviceDesc% = PCI_Inst,*PNP0A03 %*PNP0A05.DeviceDesc% = NO_DRV,*PNP0A05 %*PNP0B00.DeviceDesc% = NO_DRV,*PNP0B00 +%*PNP0C01.DeviceDesc% = NO_DRV,*PNP0C01 %*PNP0C02.DeviceDesc% = NO_DRV,*PNP0C02 %*PNP0C04.DeviceDesc% = NO_DRV,*PNP0C04 %*PNP0C0F.DeviceDesc% = NO_DRV,*PNP0C0F @@ -44,7 +45,9 @@ %PCI\CC_0604.DeviceDesc% = PCI_Inst,PCI\CC_0604 [IntelMfg] +%*INT0800.DeviceDesc% = NO_DRV,*INT0800 %PCI\VEN_8086&DEV_1237.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_1237 +%PCI\VEN_8086&DEV_2413.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_2413 %PCI\VEN_8086&DEV_7000.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_8086&DEV_7000 %PCI\VEN_8086&DEV_7110.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_8086&DEV_7110 %PCI\VEN_8086&DEV_7113.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7113 @@ -112,6 +115,7 @@ *PNP0A03.DeviceDesc = "PCI bus" *PNP0A05.DeviceDesc = "Generic ACPI bus" *PNP0B00.DeviceDesc = "AT real-time clock" +*PNP0C01.DeviceDesc = "System board" *PNP0C02.DeviceDesc = "Motherboard resources" *PNP0C04.DeviceDesc = "Math coprocessor" *PNP0C0F.DeviceDesc = "PCI interrupt link device" @@ -121,7 +125,9 @@ PCI\CC_0604.DeviceDesc = "Standard PCI to PCI bridge" IntelMfg = "Intel" -PCI\VEN_8086&DEV_1237.DeviceDesc = "Intel 440FX - 82441FX PMC [Natoma] +*INT0800.DeviceDesc = "Intel 82802 Firmware Hub Device" +PCI\VEN_8086&DEV_1237.DeviceDesc = "Intel 440FX - 82441FX PMC [Natoma]" +PCI\VEN_8086&DEV_2413.DeviceDesc = "Intel 82801AA SMBus" PCI\VEN_8086&DEV_7000.DeviceDesc = "Intel 82371SB PIIX3 PCI to ISA Bridge" PCI\VEN_8086&DEV_7110.DeviceDesc = "Intel 82371AB/EB PCI to ISA Bridge" PCI\VEN_8086&DEV_7113.DeviceDesc = "Intel 82371AB/EB Power Management Controller"

1 0

[hbirr] 19691: Lock the MainResource from fcb, if we are trying to write back a modified cache segment.
by hbirr＠svn.reactos.com 27 Nov '05

27 Nov '05

Lock the MainResource from fcb, if we are trying to write back a modified cache segment. Usually we have to call the callback function from FSD. Modified: trunk/reactos/ntoskrnl/cc/view.c _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-11-27 15:53:46 UTC (rev 19690) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-11-27 15:59:32 UTC (rev 19691) @@ -244,21 +244,34 @@ current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, DirtySegmentListEntry); current_entry = current_entry->Flink; + +// Locked = current->Bcb->Callbacks.AcquireForLazyWrite(current->Bcb->Context, FALSE); + Locked = ExTryToAcquireResourceExclusiveLite(((FSRTL_COMMON_FCB_HEADER*)(current- >Bcb->FileObject->FsContext))->Resource); + if (!Locked) + { + continue; + } Locked = CcTryToAcquireBrokenMutex(&current->Lock); if (!Locked) { +// current->Bcb->Callbacks.ReleaseFromLazyWrite(current->Bcb->Context); + ExReleaseResourceLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb->FileObje ct->FsContext))->Resource); continue; } ASSERT(current->Dirty); if (current->ReferenceCount > 1) { ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&current->Lock); +// current->Bcb->Callbacks.ReleaseFromLazyWrite(current->Bcb->Context); + ExReleaseResourceLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb->FileObje ct->FsContext))->Resource); continue; } ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ViewLock); PagesPerSegment = current->Bcb->CacheSegmentSize / PAGE_SIZE; Status = CcRosFlushCacheSegment(current); ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&current->Lock); +// current->Bcb->Callbacks.ReleaseFromLazyWrite(current->Bcb->Context); + ExReleaseResourceLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb->FileObje ct->FsContext))->Resource); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { DPRINT1("CC: Failed to flush cache segment.\n"); @@ -443,7 +456,7 @@ if (current->FileOffset <= FileOffset && (current->FileOffset + Bcb->CacheSegmentSize) > FileOffset) { - CcRosCacheSegmentIncRefCount(current); + CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&current->Lock); return(current);

1 0

[hbirr] 19690: Use the calculated cluster/offset pair if we extend a file.
by hbirr＠svn.reactos.com 27 Nov '05

27 Nov '05

Use the calculated cluster/offset pair if we extend a file. Modified: trunk/reactos/drivers/fs/vfat/finfo.c _____ Modified: trunk/reactos/drivers/fs/vfat/finfo.c --- trunk/reactos/drivers/fs/vfat/finfo.c 2005-11-27 15:44:36 UTC (rev 19689) +++ trunk/reactos/drivers/fs/vfat/finfo.c 2005-11-27 15:53:46 UTC (rev 19690) @@ -581,13 +581,19 @@ } else { - if (Fcb->LastCluster > 0 && - (Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize) > Fcb->LastOffset) + if (Fcb->LastCluster > 0) { - Status = OffsetToCluster(DeviceExt, Fcb->LastCluster, - Fcb->RFCB.AllocationSize.u.LowPart - - ClusterSize - Fcb->LastOffset, - &Cluster, FALSE); + if (Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize == Fcb->LastOffset) + { + Cluster = Fcb->LastCluster; + Status = STATUS_SUCCESS; + } + else + { + Status = OffsetToCluster(DeviceExt, Fcb->LastCluster, + Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize - Fcb->LastOffset, + &Cluster, FALSE); + } } else { @@ -595,15 +601,22 @@ Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize, &Cluster, FALSE); } + if (!NT_SUCCESS(Status)) + { + return Status; + } - Fcb->LastCluster = Cluster; - Fcb->LastOffset = Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize; + if (Fcb->LastCluster == 0) + { + Fcb->LastCluster = Cluster; + Fcb->LastOffset = Fcb->RFCB.AllocationSize.u.LowPart - ClusterSize; + } /* FIXME: Check status */ /* Cluster points now to the last cluster within the chain */ - Status = OffsetToCluster(DeviceExt, FirstCluster, - ROUND_DOWN(NewSize - 1, ClusterSize), - &NCluster, TRUE); + Status = OffsetToCluster(DeviceExt, Cluster, + ROUND_DOWN(NewSize - 1, ClusterSize) - Fcb->LastOffset, + &NCluster, TRUE); if (NCluster == 0xffffffff || !NT_SUCCESS(Status)) { /* disk is full */

1 0

[hbirr] 19689: - Lock the MainResource if we overwrite or supersede an existing file.
by hbirr＠svn.reactos.com 27 Nov '05

27 Nov '05

- Lock the MainResource if we overwrite or supersede an existing file. - Use given allocation size, if we overwrite or supersede an existing file. Modified: trunk/reactos/drivers/fs/vfat/create.c _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-11-27 15:37:06 UTC (rev 19688) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-11-27 15:44:36 UTC (rev 19689) @@ -442,7 +442,6 @@ PVFATFCB ParentFcb; PWCHAR c, last; BOOLEAN PagingFileCreate = FALSE; - LARGE_INTEGER AllocationSize; BOOLEAN Dots; UNICODE_STRING FileNameU; UNICODE_STRING PathNameU; @@ -565,9 +564,9 @@ if (!NT_SUCCESS (Status)) { if (RequestedDisposition == FILE_CREATE || - RequestedDisposition == FILE_OPEN_IF || - RequestedDisposition == FILE_OVERWRITE_IF || - RequestedDisposition == FILE_SUPERSEDE) + RequestedDisposition == FILE_OPEN_IF || + RequestedDisposition == FILE_OVERWRITE_IF || + RequestedDisposition == FILE_SUPERSEDE) { ULONG Attributes; Attributes = Stack->Parameters.Create.FileAttributes; @@ -586,7 +585,6 @@ } Irp->IoStatus.Information = FILE_CREATED; - VfatSetAllocationSizeInformation(FileObject, pFcb, DeviceExt, @@ -691,13 +689,15 @@ if (RequestedDisposition == FILE_OVERWRITE || - RequestedDisposition == FILE_OVERWRITE_IF) + RequestedDisposition == FILE_OVERWRITE_IF || + RequestedDisposition == FILE_SUPERSEDE) { - AllocationSize.QuadPart = 0; + ExAcquireResourceExclusiveLite(&(pFcb->MainResource), TRUE); Status = VfatSetAllocationSizeInformation (FileObject, - pFcb, - DeviceExt, - &AllocationSize); + pFcb, + DeviceExt, + &Irp->Overlay.AllocationSize); + ExReleaseResourceLite(&(pFcb->MainResource)); if (!NT_SUCCESS (Status)) { VfatCloseFile (DeviceExt, FileObject); @@ -705,15 +705,12 @@ } } - - /* Supersede the file */ if (RequestedDisposition == FILE_SUPERSEDE) { - AllocationSize.QuadPart = 0; - VfatSetAllocationSizeInformation(FileObject, pFcb, DeviceExt, &AllocationSize); Irp->IoStatus.Information = FILE_SUPERSEDED; } - else if (RequestedDisposition == FILE_OVERWRITE || RequestedDisposition == FILE_OVERWRITE_IF) + else if (RequestedDisposition == FILE_OVERWRITE || + RequestedDisposition == FILE_OVERWRITE_IF) { Irp->IoStatus.Information = FILE_OVERWRITTEN; }

1 0

[navaraf] 19688: Use inflib.
by navaraf＠svn.reactos.com 27 Nov '05

27 Nov '05

Use inflib. Modified: trunk/reactos/tools/mkhive/binhive.c Deleted: trunk/reactos/tools/mkhive/infcache.c Deleted: trunk/reactos/tools/mkhive/infcache.h Modified: trunk/reactos/tools/mkhive/mkhive.mak Modified: trunk/reactos/tools/mkhive/reginf.c _____ Modified: trunk/reactos/tools/mkhive/binhive.c --- trunk/reactos/tools/mkhive/binhive.c 2005-11-27 14:51:06 UTC (rev 19687) +++ trunk/reactos/tools/mkhive/binhive.c 2005-11-27 15:37:06 UTC (rev 19688) @@ -829,6 +829,7 @@ { NewBlock = (PCELL_HEADER) ((ULONG_PTR) NewBlock + CellSize); NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize; + ((PCELL_HEADER) (*Block))->CellSize = CellSize; CmiAddFree (RegistryHive, NewBlock, *pBlockOffset + CellSize, @@ -839,8 +840,9 @@ return FALSE; } - memset(*Block, 0, CellSize); - ((PCELL_HEADER)(*Block))->CellSize = -CellSize; + memset((PVOID)((ULONG_PTR)*Block + sizeof(CELL_HEADER)), 0, + CellSize - sizeof(CELL_HEADER)); + ((PCELL_HEADER)(*Block))->CellSize *= -1; return TRUE; } _____ Deleted: trunk/reactos/tools/mkhive/infcache.c --- trunk/reactos/tools/mkhive/infcache.c 2005-11-27 14:51:06 UTC (rev 19687) +++ trunk/reactos/tools/mkhive/infcache.c 2005-11-27 15:37:06 UTC (rev 19688) @@ -1,1489 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS hive maker - * FILE: tools/mkhive/infcache.c - * PURPOSE: INF file parser that caches contents of INF file in memory - * PROGRAMMER: Royce Mitchell III - * Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <ctype.h> - -#include "mkhive.h" -#include "infcache.h" - - -#define CONTROL_Z '\x1a' -#define MAX_SECTION_NAME_LEN 255 -#define MAX_FIELD_LEN 511 /* larger fields get silently truncated */ -/* actual string limit is MAX_INF_STRING_LENGTH+1 (plus terminating null) under Windows */ -#define MAX_STRING_LEN (MAX_INF_STRING_LENGTH+1) - - -typedef struct _INFCACHEFIELD -{ - struct _INFCACHEFIELD *Next; - struct _INFCACHEFIELD *Prev; - - CHAR Data[1]; -} INFCACHEFIELD, *PINFCACHEFIELD; - - -typedef struct _INFCACHELINE -{ - struct _INFCACHELINE *Next; - struct _INFCACHELINE *Prev; - - ULONG FieldCount; - - PCHAR Key; - - PINFCACHEFIELD FirstField; - PINFCACHEFIELD LastField; - -} INFCACHELINE, *PINFCACHELINE; - - -typedef struct _INFCACHESECTION -{ - struct _INFCACHESECTION *Next; - struct _INFCACHESECTION *Prev; - - PINFCACHELINE FirstLine; - PINFCACHELINE LastLine; - - LONG LineCount; - - CHAR Name[1]; -} INFCACHESECTION, *PINFCACHESECTION; - - -typedef struct _INFCACHE -{ - PINFCACHESECTION FirstSection; - PINFCACHESECTION LastSection; - - PINFCACHESECTION StringsSection; -} INFCACHE, *PINFCACHE; - - -/* parser definitions */ - -enum parser_state -{ - LINE_START, /* at beginning of a line */ - SECTION_NAME, /* parsing a section name */ - KEY_NAME, /* parsing a key name */ - VALUE_NAME, /* parsing a value name */ - EOL_BACKSLASH, /* backslash at end of line */ - QUOTES, /* inside quotes */ - LEADING_SPACES, /* leading spaces */ - TRAILING_SPACES, /* trailing spaces */ - COMMENT, /* inside a comment */ - NB_PARSER_STATES -}; - -struct parser -{ - const CHAR *start; /* start position of item being parsed */ - const CHAR *end; /* end of buffer */ - PINFCACHE file; /* file being built */ - enum parser_state state; /* current parser state */ - enum parser_state stack[4]; /* state stack */ - int stack_pos; /* current pos in stack */ - - PINFCACHESECTION cur_section; /* pointer to the section being parsed*/ - PINFCACHELINE line; /* current line */ - unsigned int line_pos; /* current line position in file */ - unsigned int error; /* error code */ - unsigned int token_len; /* current token len */ - CHAR token[MAX_FIELD_LEN+1]; /* current token */ -}; - -typedef const CHAR * (*parser_state_func)( struct parser *parser, const CHAR *pos ); - -/* parser state machine functions */ -static const CHAR *line_start_state( struct parser *parser, const CHAR *pos ); -static const CHAR *section_name_state( struct parser *parser, const CHAR *pos ); -static const CHAR *key_name_state( struct parser *parser, const CHAR *pos ); -static const CHAR *value_name_state( struct parser *parser, const CHAR *pos ); -static const CHAR *eol_backslash_state( struct parser *parser, const CHAR *pos ); -static const CHAR *quotes_state( struct parser *parser, const CHAR *pos ); -static const CHAR *leading_spaces_state( struct parser *parser, const CHAR *pos ); -static const CHAR *trailing_spaces_state( struct parser *parser, const CHAR *pos ); -static const CHAR *comment_state( struct parser *parser, const CHAR *pos ); - -static const parser_state_func parser_funcs[NB_PARSER_STATES] = -{ - line_start_state, /* LINE_START */ - section_name_state, /* SECTION_NAME */ - key_name_state, /* KEY_NAME */ - value_name_state, /* VALUE_NAME */ - eol_backslash_state, /* EOL_BACKSLASH */ - quotes_state, /* QUOTES */ - leading_spaces_state, /* LEADING_SPACES */ - trailing_spaces_state, /* TRAILING_SPACES */ - comment_state /* COMMENT */ -}; - - -/* PRIVATE FUNCTIONS ********************************************************/ - -static PINFCACHELINE -InfpCacheFreeLine (PINFCACHELINE Line) -{ - PINFCACHELINE Next; - PINFCACHEFIELD Field; - - if (Line == NULL) - { - return NULL; - } - - Next = Line->Next; - if (Line->Key != NULL) - { - free (Line->Key); - Line->Key = NULL; - } - - /* Remove data fields */ - while (Line->FirstField != NULL) - { - Field = Line->FirstField->Next; - free (Line->FirstField); - Line->FirstField = Field; - } - Line->LastField = NULL; - - free (Line); - - return Next; -} - - -static PINFCACHESECTION -InfpCacheFreeSection (PINFCACHESECTION Section) -{ - PINFCACHESECTION Next; - - if (Section == NULL) - { - return NULL; - } - - /* Release all keys */ - Next = Section->Next; - while (Section->FirstLine != NULL) - { - Section->FirstLine = InfpCacheFreeLine (Section->FirstLine); - } - Section->LastLine = NULL; - - free (Section); - - return Next; -} - - -static PINFCACHESECTION -InfpCacheFindSection (PINFCACHE Cache, - PCHAR Name) -{ - PINFCACHESECTION Section = NULL; - - if (Cache == NULL || Name == NULL) - { - return NULL; - } - - /* iterate through list of sections */ - Section = Cache->FirstSection; - while (Section != NULL) - { - if (strcasecmp (Section->Name, Name) == 0) - { - return Section; - } - - /* get the next section*/ - Section = Section->Next; - } - - return NULL; -} - - -static PINFCACHESECTION -InfpCacheAddSection (PINFCACHE Cache, - PCHAR Name) -{ - PINFCACHESECTION Section = NULL; - ULONG Size; - - if (Cache == NULL || Name == NULL) - { - DPRINT ("Invalid parameter\n"); - return NULL; - } - - /* Allocate and initialize the new section */ - Size = sizeof(INFCACHESECTION) + strlen (Name); - Section = (PINFCACHESECTION)malloc (Size); - if (Section == NULL) - { - DPRINT ("RtlAllocateHeap() failed\n"); - return NULL; - } - memset (Section, 0, Size); - - /* Copy section name */ - strcpy (Section->Name, Name); - - /* Append section */ - if (Cache->FirstSection == NULL) - { - Cache->FirstSection = Section; - Cache->LastSection = Section; - } - else - { - Cache->LastSection->Next = Section; - Section->Prev = Cache->LastSection; - Cache->LastSection = Section; - } - - return Section; -} - - -static PINFCACHELINE -InfpCacheAddLine (PINFCACHESECTION Section) -{ - PINFCACHELINE Line; - - if (Section == NULL) - { - DPRINT("Invalid parameter\n"); - return NULL; - } - - Line = (PINFCACHELINE)malloc (sizeof(INFCACHELINE)); - if (Line == NULL) - { - DPRINT("RtlAllocateHeap() failed\n"); - return NULL; - } - memset (Line, 0, sizeof(INFCACHELINE)); - - /* Append line */ - if (Section->FirstLine == NULL) - { - Section->FirstLine = Line; - Section->LastLine = Line; - } - else - { - Section->LastLine->Next = Line; - Line->Prev = Section->LastLine; - Section->LastLine = Line; - } - Section->LineCount++; - - return Line; -} - - -static PVOID -InfpAddKeyToLine (PINFCACHELINE Line, - PCHAR Key) -{ - if (Line == NULL) - return NULL; - - if (Line->Key != NULL) - return NULL; - - Line->Key = (PCHAR)malloc (strlen (Key) + 1); - if (Line->Key == NULL) - return NULL; - - strcpy (Line->Key, Key); - - return (PVOID)Line->Key; -} - - -static PVOID -InfpAddFieldToLine (PINFCACHELINE Line, - PCHAR Data) -{ - PINFCACHEFIELD Field; - ULONG Size; - - Size = sizeof(INFCACHEFIELD) + strlen(Data); - Field = (PINFCACHEFIELD)malloc (Size); - if (Field == NULL) - { - return NULL; - } - memset (Field, 0, Size); - strcpy (Field->Data, Data); - - /* Append key */ - if (Line->FirstField == NULL) - { - Line->FirstField = Field; - Line->LastField = Field; - } - else - { - Line->LastField->Next = Field; - Field->Prev = Line->LastField; - Line->LastField = Field; - } - Line->FieldCount++; - - return (PVOID)Field; -} - - -static PINFCACHELINE -InfpCacheFindKeyLine (PINFCACHESECTION Section, - PCHAR Key) -{ - PINFCACHELINE Line; - - Line = Section->FirstLine; - while (Line != NULL) - { - if (Line->Key != NULL && strcasecmp (Line->Key, Key) == 0) - { - return Line; - } - - Line = Line->Next; - } - - return NULL; -} - - -/* push the current state on the parser stack */ -inline static void push_state( struct parser *parser, enum parser_state state ) -{ -// assert( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) ); - parser->stack[parser->stack_pos++] = state; -} - - -/* pop the current state */ -inline static void pop_state( struct parser *parser ) -{ -// assert( parser->stack_pos ); - parser->state = parser->stack[--parser->stack_pos]; -} - - -/* set the parser state and return the previous one */ -inline static enum parser_state set_state( struct parser *parser, enum parser_state state ) -{ - enum parser_state ret = parser->state; - parser->state = state; - return ret; -} - - -/* check if the pointer points to an end of file */ -inline static int is_eof( struct parser *parser, const CHAR *ptr ) -{ - return (ptr >= parser->end || *ptr == CONTROL_Z); -} - - -/* check if the pointer points to an end of line */ -inline static int is_eol( struct parser *parser, const CHAR *ptr ) -{ - return (ptr >= parser->end || - *ptr == CONTROL_Z || - *ptr == '\n' || - (*ptr == '\r' && *(ptr + 1) == '\n')); -} - - -/* push data from current token start up to pos into the current token */ -static int push_token( struct parser *parser, const CHAR *pos ) -{ - ULONG len = pos - parser->start; - const CHAR *src = parser->start; - CHAR *dst = parser->token + parser->token_len; - - if (len > MAX_FIELD_LEN - parser->token_len) - len = MAX_FIELD_LEN - parser->token_len; - - parser->token_len += len; - for ( ; len > 0; len--, dst++, src++) - *dst = *src ? *src : ' '; - *dst = 0; - parser->start = pos; - - return 0; -} - - - -/* add a section with the current token as name */ -static PVOID add_section_from_token( struct parser *parser ) -{ - PINFCACHESECTION Section; - - if (parser->token_len > MAX_SECTION_NAME_LEN) - { - parser->error = STATUS_SECTION_NAME_TOO_LONG; - return NULL; - } - - Section = InfpCacheFindSection (parser->file, - parser->token); - if (Section == NULL) - { - /* need to create a new one */ - Section= InfpCacheAddSection (parser->file, - parser->token); - if (Section == NULL) - { - parser->error = STATUS_NOT_ENOUGH_MEMORY; - return NULL; - } - } - - parser->token_len = 0; - parser->cur_section = Section; - - return (PVOID)Section; -} - - -/* add a field containing the current token to the current line */ -static struct field *add_field_from_token( struct parser *parser, int is_key ) -{ - PVOID field; - - if (!parser->line) /* need to start a new line */ - { - if (parser->cur_section == NULL) /* got a line before the first section */ - { - parser->error = STATUS_WRONG_INF_STYLE; - return NULL; - } - - parser->line = InfpCacheAddLine (parser->cur_section); - if (parser->line == NULL) - goto error; - } - else - { -// assert(!is_key); - } - - if (is_key) - { - field = InfpAddKeyToLine(parser->line, parser->token); - } - else - { - field = InfpAddFieldToLine(parser->line, parser->token); - } - - if (field != NULL) - { - parser->token_len = 0; - return field; - } - -error: - parser->error = STATUS_NOT_ENOUGH_MEMORY; - return NULL; -} - - -/* close the current line and prepare for parsing a new one */ -static void close_current_line( struct parser *parser ) -{ - parser->line = NULL; -} - - - -/* handler for parser LINE_START state */ -static const CHAR *line_start_state( struct parser *parser, const CHAR *pos ) -{ - const CHAR *p; - - for (p = pos; !is_eof( parser, p ); p++) - { - switch(*p) - { - case '\r': - continue; - - case '\n': - parser->line_pos++; - close_current_line( parser ); - break; - - case ';': - push_state( parser, LINE_START ); - set_state( parser, COMMENT ); - return p + 1; - - case '[': - parser->start = p + 1; - set_state( parser, SECTION_NAME ); - return p + 1; - - default: - if (!isspace(*p)) - { - parser->start = p; - set_state( parser, KEY_NAME ); - return p; - } - break; - } - } - close_current_line( parser ); - return NULL; -} - - -/* handler for parser SECTION_NAME state */ -static const CHAR *section_name_state( struct parser *parser, const CHAR *pos ) -{ - const CHAR *p; - - for (p = pos; !is_eol( parser, p ); p++) - { - if (*p == ']') - { - push_token( parser, p ); - if (add_section_from_token( parser ) == NULL) - return NULL; - push_state( parser, LINE_START ); - set_state( parser, COMMENT ); /* ignore everything else on the line */ - return p + 1; - } - } - parser->error = STATUS_BAD_SECTION_NAME_LINE; /* unfinished section name */ - return NULL; -} - - -/* handler for parser KEY_NAME state */ -static const CHAR *key_name_state( struct parser *parser, const CHAR *pos ) -{ - const CHAR *p, *token_end = parser->start; - - for (p = pos; !is_eol( parser, p ); p++) - { - if (*p == ',') break; - switch(*p) - { - - case '=': - push_token( parser, token_end ); - if (!add_field_from_token( parser, 1 )) return NULL; - parser->start = p + 1; - push_state( parser, VALUE_NAME ); - set_state( parser, LEADING_SPACES ); - return p + 1; - case ';': - push_token( parser, token_end ); - if (!add_field_from_token( parser, 0 )) return NULL; - push_state( parser, LINE_START ); - set_state( parser, COMMENT ); - return p + 1; - case '"': - push_token( parser, token_end ); - parser->start = p + 1; - push_state( parser, KEY_NAME ); - set_state( parser, QUOTES ); - return p + 1; - case '\\': - push_token( parser, token_end ); - parser->start = p; - push_state( parser, KEY_NAME ); - set_state( parser, EOL_BACKSLASH ); - return p; - default: - if (!isspace(*p)) token_end = p + 1; - else - { - push_token( parser, p ); - push_state( parser, KEY_NAME ); - set_state( parser, TRAILING_SPACES ); - return p; - } - break; - } - } - push_token( parser, token_end ); - set_state( parser, VALUE_NAME ); - return p; -} - - -/* handler for parser VALUE_NAME state */ -static const CHAR *value_name_state( struct parser *parser, const CHAR *pos ) -{ - const CHAR *p, *token_end = parser->start; - - for (p = pos; !is_eol( parser, p ); p++) - { - switch(*p) - { - case ';': - push_token( parser, token_end ); - if (!add_field_from_token( parser, 0 )) return NULL; - push_state( parser, LINE_START ); - set_state( parser, COMMENT ); - return p + 1; - case ',': - push_token( parser, token_end ); - if (!add_field_from_token( parser, 0 )) return NULL; - parser->start = p + 1; - push_state( parser, VALUE_NAME ); - set_state( parser, LEADING_SPACES ); - return p + 1; - case '"': - push_token( parser, token_end ); - parser->start = p + 1; - push_state( parser, VALUE_NAME ); - set_state( parser, QUOTES ); - return p + 1; - case '\\': - push_token( parser, token_end ); - parser->start = p; - push_state( parser, VALUE_NAME ); - set_state( parser, EOL_BACKSLASH ); - return p; - default: - if (!isspace(*p)) token_end = p + 1; - else - { - push_token( parser, p ); - push_state( parser, VALUE_NAME ); - set_state( parser, TRAILING_SPACES ); - return p; - } - break; - } - } - push_token( parser, token_end ); - if (!add_field_from_token( parser, 0 )) return NULL; - set_state( parser, LINE_START ); - return p; -} - - -/* handler for parser EOL_BACKSLASH state */ -static const CHAR *eol_backslash_state( struct parser *parser, const CHAR *pos ) -{ - const CHAR *p; - - for (p = pos; !is_eof( parser, p ); p++) - { - switch(*p) - { - case '\r': - continue; - - case '\n': - parser->line_pos++; - parser->start = p + 1; - set_state( parser, LEADING_SPACES ); - return p + 1; - - case '\\': - continue; - - case ';': - push_state( parser, EOL_BACKSLASH ); - set_state( parser, COMMENT ); - return p + 1; - - default: - if (isspace(*p)) - continue; - push_token( parser, p ); - pop_state( parser ); - return p; - } - } - parser->start = p; - pop_state( parser ); - - return p; -} - - -/* handler for parser QUOTES state */ -static const CHAR *quotes_state( struct parser *parser, const CHAR *pos ) -{ - const CHAR *p, *token_end = parser->start; - - for (p = pos; !is_eol( parser, p ); p++) - { - if (*p == '"') - { - if (p+1 < parser->end && p[1] == '"') /* double quotes */ - { - push_token( parser, p + 1 ); - parser->start = token_end = p + 2; - p++; - } - else /* end of quotes */ - { - push_token( parser, p ); - parser->start = p + 1; - pop_state( parser ); - return p + 1; - } - } - } - push_token( parser, p ); - pop_state( parser ); - return p; -} - - -/* handler for parser LEADING_SPACES state */ -static const CHAR *leading_spaces_state( struct parser *parser, const CHAR *pos ) -{ - const CHAR *p; - - for (p = pos; !is_eol( parser, p ); p++) - { - if (*p == '\\') - { - parser->start = p; - set_state( parser, EOL_BACKSLASH ); - return p; - } - if (!isspace(*p)) - break; - } - parser->start = p; - pop_state( parser ); - return p; -} - - -/* handler for parser TRAILING_SPACES state */ -static const CHAR *trailing_spaces_state( struct parser *parser, const CHAR *pos ) -{ - const CHAR *p; - - for (p = pos; !is_eol( parser, p ); p++) - { - if (*p == '\\') - { - set_state( parser, EOL_BACKSLASH ); - return p; - } - if (!isspace(*p)) - break; - } - pop_state( parser ); - return p; -} - - -/* handler for parser COMMENT state */ -static const CHAR *comment_state( struct parser *parser, const CHAR *pos ) -{ - const CHAR *p = pos; - - while (!is_eol( parser, p )) - p++; - pop_state( parser ); - return p; -} - - -/* parse a complete buffer */ -static BOOL -InfpParseBuffer (PINFCACHE file, - const CHAR *buffer, - const CHAR *end, - PULONG error_line) -{ - struct parser parser; - const CHAR *pos = buffer; - - parser.start = buffer; - parser.end = end; - parser.file = file; - parser.line = NULL; - parser.state = LINE_START; - parser.stack_pos = 0; - parser.cur_section = NULL; - parser.line_pos = 1; - parser.error = 0; - parser.token_len = 0; - - /* parser main loop */ - while (pos) - pos = (parser_funcs[parser.state])(&parser, pos); - - if (parser.error) - { - if (error_line) - *error_line = parser.line_pos; - return parser.error; - } - - /* find the [strings] section */ - file->StringsSection = InfpCacheFindSection (file, - "Strings"); - - return TRUE; -} - - - -/* PUBLIC FUNCTIONS *********************************************************/ - -BOOL -InfOpenFile(PHINF InfHandle, - PCHAR FileName, - PULONG ErrorLine) -{ - FILE *File; - PCHAR FileBuffer; - ULONG FileLength; - PINFCACHE Cache; - - *InfHandle = NULL; - *ErrorLine = (ULONG)-1; - - /* Open the inf file */ - File = fopen (FileName, "rb"); - if (File == NULL) - { - DPRINT("fopen() failed\n"); - return FALSE; - } - - DPRINT("fopen() successful\n"); - - /* Query file size */ - fseek (File, 0, SEEK_END); - FileLength = ftell (File); - fseek (File, 0, SEEK_SET); - - DPRINT("File size: %lu\n", FileLength); - - /* Allocate file buffer */ - FileBuffer = malloc (FileLength + 1); - if (FileBuffer == NULL) - { - DPRINT1("malloc() failed\n"); - fclose (File); - return FALSE; - } - - /* Read file */ - if (fread (FileBuffer, FileLength, 1, File) < 0) - { - DPRINT ("fread() failed\n"); - fclose (File); - free (FileBuffer); - return FALSE; - } - - fclose (File); - - /* Append string terminator */ - FileBuffer[FileLength] = 0; - - /* Allocate infcache header */ - Cache = (PINFCACHE)malloc (sizeof(INFCACHE)); - if (Cache == NULL) - { - DPRINT("malloc() failed\n"); - free (FileBuffer); - return FALSE; - } - - /* Initialize inicache header */ - memset (Cache, 0, sizeof(INFCACHE)); - - /* Parse the inf buffer */ - if (!InfpParseBuffer (Cache, - FileBuffer, - FileBuffer + FileLength, - ErrorLine)) - { - free (Cache); - free (FileBuffer); - return FALSE; - } - - /* Free file buffer */ - free (FileBuffer); - - *InfHandle = (HINF)Cache; - - return TRUE; -} - - -VOID -InfCloseFile(HINF InfHandle) -{ - PINFCACHE Cache; - - Cache = (PINFCACHE)InfHandle; - [truncated at 1000 lines; 858 more skipped]

1 0

[hpoussin] 19687: Add math coprocessor PNP id. Fixes bug 1052.
by hpoussin＠svn.reactos.com 27 Nov '05

27 Nov '05

Add math coprocessor PNP id. Fixes bug 1052. Modified: trunk/reactos/media/inf/machine.inf _____ Modified: trunk/reactos/media/inf/machine.inf --- trunk/reactos/media/inf/machine.inf 2005-11-27 14:02:58 UTC (rev 19686) +++ trunk/reactos/media/inf/machine.inf 2005-11-27 14:51:06 UTC (rev 19687) @@ -36,6 +36,7 @@ %*PNP0A05.DeviceDesc% = NO_DRV,*PNP0A05 %*PNP0B00.DeviceDesc% = NO_DRV,*PNP0B00 %*PNP0C02.DeviceDesc% = NO_DRV,*PNP0C02 +%*PNP0C04.DeviceDesc% = NO_DRV,*PNP0C04 %*PNP0C0F.DeviceDesc% = NO_DRV,*PNP0C0F %ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton %PCI\CC_0600.DeviceDesc% = NO_DRV,PCI\CC_0600 @@ -112,6 +113,7 @@ *PNP0A05.DeviceDesc = "Generic ACPI bus" *PNP0B00.DeviceDesc = "AT real-time clock" *PNP0C02.DeviceDesc = "Motherboard resources" +*PNP0C04.DeviceDesc = "Math coprocessor" *PNP0C0F.DeviceDesc = "PCI interrupt link device" ACPI\FixedButton.DeviceDesc ="ACPI Fixed Feature Button" PCI\CC_0600.DeviceDesc = "Standard CPU to PCI bridge"

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