Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[hyperion] 24343: Fixed: - _InterlockedCompareExchange64 (more efficient handling of 64-bit operands) - __writecr0, __writecr3, __writecr4 (for real this time)

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Oct 1 18:49:07 2006 New Revision: 24343 URL: http://svn.reactos.org/svn/reactos?rev=24343&view=rev Log: Fixed: - _InterlockedCompareExchange64 (more efficient handling of 64-bit operands) - __writecr0, __writecr3, __writecr4 (for real this time) Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Sun Oct 1 18:49:07 2006 @@ -210,38 +210,35 @@ static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) { - /* TODO: this form of passing long long values makes GCC generate inefficient code. Use what's used elsewhere */ - union - { - long long ll; - struct + unsigned long lo32Retval = (unsigned long)((Comperand >> 0) & 0xFFFFFFFF); + long hi32Retval = (unsigned long)((Comperand >> 32) & 0xFFFFFFFF); + + unsigned long lo32Exchange = (unsigned long)((Exchange >> 0) & 0xFFFFFFFF); + long hi32Exchange = (unsigned long)((Exchange >> 32) & 0xFFFFFFFF); + + __asm__ + ( + "cmpxchg8b %[Destination]" : + "a" (lo32Retval), "d" (hi32Retval) : + [Destination] "rm" (Destination), "b" (lo32Exchange), "c" (hi32Exchange) : + "memory" + ); + + { + union u_ { - unsigned long lo32; - long hi32; - }; - } - LlRetval = { ll : Comperand }; - - union - { - long long ll; - struct - { - unsigned long lo32; - long hi32; - }; - } - LlExchange = { ll : Exchange }; - - __asm__ - ( - "cmpxchg8b %[Destination]" : - "a" (LlRetval.lo32), "d" (LlRetval.hi32) : - [Destination] "rm" (Destination), "b" (LlExchange.lo32), "c" (LlExchange.hi32) : - "memory" - ); - - return LlRetval.ll; + long long ll; + struct s_ + { + unsigned long lo32; + long hi32; + } + s; + } + u = { s : { lo32 : lo32Retval, hi32 : hi32Retval } }; + + return u.ll; + } } static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) @@ -468,7 +465,7 @@ /*** String operations ***/ -/* NOTE: we don't set a memory barrier in the __stosX functions because Visual C++ doesn't */ +/* NOTE: we don't set a memory clobber in the __stosX functions because Visual C++ doesn't */ static __inline__ __attribute__((always_inline)) void __stosb(unsigned char * Dest, const unsigned char Data, size_t Count) { __asm__ __volatile__ @@ -1006,17 +1003,17 @@ static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) { - __asm__("mov %%cr0, %0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); + __asm__("mov %[Data], %%cr0" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF))); } static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned long long Data) { - __asm__("mov %%cr3, %0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); + __asm__("mov %[Data], %%cr3" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF))); } static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned long long Data) { - __asm__("mov %%cr4, %0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); + __asm__("mov %[Data], %%cr4" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF))); } static __inline__ __attribute__((always_inline)) void __invlpg(void * const Address)

17 years, 11 months

[weiden] 24342: Fix usage of a uninitialized variable, unnecessary goto not replaced by a if(...) statement

by weiden＠svn.reactos.org

Author: weiden Date: Sun Oct 1 18:02:08 2006 New Revision: 24342 URL: http://svn.reactos.org/svn/reactos?rev=24342&view=rev Log: Fix usage of a uninitialized variable, unnecessary goto not replaced by a if(...) statement Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sun Oct 1 18:02:08 2006 @@ -311,11 +311,12 @@ /* Initialize the machine type */ KiInitializeMachineType(); - /* Skip initial setup if this isn't the Boot CPU */ - if (Cpu) goto AppCpuInit; - /* Get GDT, IDT, PCR and TSS pointers */ KiGetMachineBootPointers(&Gdt, &Idt, &Pcr, &Tss); + + /* Skip initial setup if this isn't the Boot CPU */ + if (Cpu) + goto AppCpuInit; /* Setup the TSS descriptors and entries */ Ki386InitializeTss(Tss, Idt, Gdt); @@ -347,8 +348,8 @@ do { /* Loop until execution can continue */ - while (KiFreezeExecutionLock == 1); - } while(InterlockedBitTestAndSet(&KiFreezeExecutionLock, 0)); + while ((volatile KSPIN_LOCK)KiFreezeExecutionLock == 1); + } while(InterlockedBitTestAndSet((PLONG)&KiFreezeExecutionLock, 0)); /* Setup CPU-related fields */ __writefsdword(KPCR_NUMBER, Cpu);

17 years, 11 months

[weiden] 24341: fix __writecr0, __writecr3 and __writecr4

by weiden＠svn.reactos.org

Author: weiden Date: Sun Oct 1 16:33:24 2006 New Revision: 24341 URL: http://svn.reactos.org/svn/reactos?rev=24341&view=rev Log: fix __writecr0, __writecr3 and __writecr4 Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Sun Oct 1 16:33:24 2006 @@ -1006,17 +1006,17 @@ static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) { - __asm__("mov %[value], %%cr0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); + __asm__("mov %%cr0, %0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); } static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned long long Data) { - __asm__("mov %[value], %%cr3" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); + __asm__("mov %%cr3, %0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); } static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned long long Data) { - __asm__("mov %[value], %%cr4" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); + __asm__("mov %%cr4, %0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); } static __inline__ __attribute__((always_inline)) void __invlpg(void * const Address)

17 years, 11 months

[weiden] 24340: Fix function name (fixes a redefinition error)

by weiden＠svn.reactos.org

Author: weiden Date: Sun Oct 1 16:19:36 2006 New Revision: 24340 URL: http://svn.reactos.org/svn/reactos?rev=24340&view=rev Log: Fix function name (fixes a redefinition error) Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Sun Oct 1 16:19:36 2006 @@ -145,7 +145,7 @@ return __sync_fetch_and_and(value, mask); } -static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * const value, const short mask) +static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * const value, const short mask) { return __sync_fetch_and_and(value, mask); }

17 years, 11 months

[hpoussin] 24339: Add ufatx.dll, to be able to create FATX (Xbox file system) partitions

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Oct 1 14:11:46 2006 New Revision: 24339 URL: http://svn.reactos.org/svn/reactos?rev=24339&view=rev Log: Add ufatx.dll, to be able to create FATX (Xbox file system) partitions Added: trunk/reactos/dll/win32/ufatx/ trunk/reactos/dll/win32/ufatx/ufatx.def (with props) trunk/reactos/dll/win32/ufatx/ufatx.rbuild (with props) trunk/reactos/dll/win32/ufatx/ufatx.rc (with props) Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Sun Oct 1 14:11:46 2006 @@ -737,6 +737,7 @@ ; Available file systems HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FAT",0x00000000,"ufat.dll" HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FAT32",0x00000000,"ufat.dll" +HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" Added: trunk/reactos/dll/win32/ufatx/ufatx.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.def?… ============================================================================== --- trunk/reactos/dll/win32/ufatx/ufatx.def (added) +++ trunk/reactos/dll/win32/ufatx/ufatx.def Sun Oct 1 14:11:46 2006 @@ -1,0 +1,3 @@ +LIBRARY UFATX.DLL +EXPORTS +FormatEx=VfatxFormat@24 Propchange: trunk/reactos/dll/win32/ufatx/ufatx.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ufatx/ufatx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.rbui… ============================================================================== --- trunk/reactos/dll/win32/ufatx/ufatx.rbuild (added) +++ trunk/reactos/dll/win32/ufatx/ufatx.rbuild Sun Oct 1 14:11:46 2006 @@ -1,0 +1,10 @@ +<module name="ufatx" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_UFAT}" installbase="system32" installname="ufatx.dll"> + <importlibrary definition="ufatx.def" /> + <include base="ufatx">.</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0600</define> + <library>vfatxlib</library> + <library>ntdll</library> + <file>ufatx.rc</file> +</module> Propchange: trunk/reactos/dll/win32/ufatx/ufatx.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ufatx/ufatx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.rc?r… ============================================================================== --- trunk/reactos/dll/win32/ufatx/ufatx.rc (added) +++ trunk/reactos/dll/win32/ufatx/ufatx.rc Sun Oct 1 14:11:46 2006 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "FATX File System Management\0" +#define REACTOS_STR_INTERNAL_NAME "ufatx\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ufatx.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/ufatx/ufatx.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Sun Oct 1 14:11:46 2006 @@ -229,6 +229,9 @@ <directory name="ufat"> <xi:include href="ufat/ufat.rbuild" /> </directory> +<directory name="ufatx"> + <xi:include href="ufatx/ufatx.rbuild" /> +</directory> <directory name="urlmon"> <xi:include href="urlmon/urlmon.rbuild" /> </directory>

17 years, 11 months

[hpoussin] 24338: Rewrite SetupDiGetClassImageListExW and SetupDiGetClassImageIndex which were completly wrong Add stub for SetupDiDestroyClassImageList Now, you can see some icons in device manager

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Oct 1 13:05:19 2006 New Revision: 24338 URL: http://svn.reactos.org/svn/reactos?rev=24338&view=rev Log: Rewrite SetupDiGetClassImageListExW and SetupDiGetClassImageIndex which were completly wrong Add stub for SetupDiDestroyClassImageList Now, you can see some icons in device manager Modified: trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Sun Oct 1 13:05:19 2006 @@ -670,6 +670,38 @@ } /*********************************************************************** + * SetupDiDestroyClassImageList(SETUPAPI.@) + */ +BOOL WINAPI +SetupDiDestroyClassImageList( + IN PSP_CLASSIMAGELIST_DATA ClassImageListData) +{ + struct ClassImageList *list; + BOOL ret = FALSE; + + TRACE("%p\n", ClassImageListData); + + if (!ClassImageListData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (ClassImageListData->cbSize != sizeof(SP_CLASSIMAGELIST_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if ((list = (struct ClassImageList *)ClassImageListData->Reserved) == NULL) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (list->magic != SETUP_CLASS_IMAGE_LIST_MAGIC) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + //DestroyIcon() + //ImageList_Destroy(); + FIXME("Stub %p\n", ClassImageListData); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/*********************************************************************** * SetupDiGetClassDescriptionA (SETUPAPI.@) */ BOOL WINAPI @@ -1302,28 +1334,21 @@ SetLastError(ERROR_INVALID_PARAMETER); else { - HKEY hKey = INVALID_HANDLE_VALUE; - INT iconIndex; - - /* Read Icon registry entry into Buffer */ - hKey = SetupDiOpenClassRegKeyExW(ClassGuid, KEY_QUERY_VALUE, DIOCR_INTERFACE, list->MachineName, NULL); - if (hKey == INVALID_HANDLE_VALUE) - goto cleanup; - if (!SETUP_GetIconIndex(hKey, &iconIndex)) - goto cleanup; - - if (iconIndex >= 0) - { - SetLastError(ERROR_INVALID_INDEX); - goto cleanup; - } - - *ImageIndex = -iconIndex; - ret = TRUE; - -cleanup: - if (hKey != INVALID_HANDLE_VALUE) - RegCloseKey(hKey); + DWORD i; + + for (i = 0; i < list->NumberOfGuids; i++) + { + if (IsEqualIID(ClassGuid, &list->Guids[i])) + break; + } + + if (i == list->NumberOfGuids || list->IconIndexes[i] < 0) + SetLastError(ERROR_FILE_NOT_FOUND); + else + { + *ImageIndex = list->IconIndexes[i]; + ret = TRUE; + } } TRACE("Returning %d\n", ret); @@ -1388,11 +1413,24 @@ else { struct ClassImageList *list = NULL; + DWORD RequiredSize; + HICON hIcon; DWORD size; - - size = FIELD_OFFSET(struct ClassImageList, szData); - if (MachineName) - size += (strlenW(MachineName) + 3) * sizeof(WCHAR); + INT i; + + /* Get list of all class GUIDs in given computer */ + ret = SetupDiBuildClassInfoListExW( + 0, + NULL, + 0, + &RequiredSize, + MachineName, + NULL); + if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + goto cleanup; + + size = sizeof(struct ClassImageList) + + (sizeof(GUID) + sizeof(INT)) * RequiredSize; list = HeapAlloc(GetProcessHeap(), 0, size); if (!list) { @@ -1400,23 +1438,60 @@ goto cleanup; } list->magic = SETUP_CLASS_IMAGE_LIST_MAGIC; - if (MachineName) - { - list->szData[0] = list->szData[1] = '\\'; - strcpyW(list->szData + 2, MachineName); - list->MachineName = list->szData; - } - else - { - list->MachineName = NULL; - } + list->NumberOfGuids = RequiredSize; + list->Guids = (GUID*)(list + 1); + list->IconIndexes = (INT*)((ULONG_PTR)(list + 1) + sizeof(GUID) * RequiredSize); + + ret = SetupDiBuildClassInfoListExW( + 0, + list->Guids, + list->NumberOfGuids, + &RequiredSize, + MachineName, + NULL); + if (!ret) + goto cleanup; + else if (RequiredSize != list->NumberOfGuids) + { + /* Hm. Class list changed since last call. Ignore + * this case as it should be very rare */ + SetLastError(ERROR_GEN_FAILURE); + ret = FALSE; + goto cleanup; + } + + /* Prepare a HIMAGELIST */ + InitCommonControls(); + ClassImageListData->ImageList = ImageList_Create(16, 16, ILC_COLOR, 100, 10); + if (!ClassImageListData->ImageList) + goto cleanup; ClassImageListData->Reserved = (ULONG_PTR)list; + + /* Now, we "simply" need to load icons associated with all class guids, + * and put their index in the image list in the IconIndexes array */ + for (i = 0; i < list->NumberOfGuids; i++) + { + ret = SetupDiLoadClassIcon( + &list->Guids[i], + &hIcon, + NULL); + if (ret) + list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + else + list->IconIndexes[i] = -1; /* Special value to tell that icon is unavailable */ + } + ret = TRUE; cleanup: if (!ret) - MyFree(list); + { + if (ClassImageListData->Reserved) + SetupDiDestroyClassImageList(ClassImageListData); + else if (list) + MyFree(list); + } } TRACE("Returning %d\n", ret); Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rbuild (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild Sun Oct 1 13:05:19 2006 @@ -17,6 +17,7 @@ <library>uuid</library> <library>wine</library> <library>ntdll</library> + <library>comctl32</library> <library>kernel32</library> <library>advapi32</library> <library>user32</library> Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Sun Oct 1 13:05:19 2006 @@ -201,13 +201,14 @@ { DWORD magic; /* SETUP_CLASS_IMAGE_LIST_MAGIC */ - /* Contains the name of the remote computer ('\\COMPUTERNAME' for example), - * or NULL if related to local machine. Points into szData field at the - * end of the structure */ - PCWSTR MachineName; - - /* Variable size array (contains data for MachineName) */ - WCHAR szData[ANYSIZE_ARRAY]; + /* Number of GUIDs contained in Guids and IconIndexes arrays */ + DWORD NumberOfGuids; + /* Array of GUIDs associated to icons of the image list. Its size + * is NumberOfGuids and is pointing after the end this structure */ + GUID* Guids; + /* Array of corresponding icons index in the image list. Its size + * is NumberOfGuids and is pointing after the end this structure */ + INT* IconIndexes; }; extern HINSTANCE hInstance; Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c Sun Oct 1 13:05:19 2006 @@ -155,18 +155,6 @@ return TRUE; } - -/*********************************************************************** - * SetupDiDestroyClassImageList(SETUPAPI.@) - */ -BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA ClassImageListData) -{ - FIXME ("Stub %p\n", ClassImageListData); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return TRUE; -} - - /*********************************************************************** * SetupDiRegisterDeviceInfo(SETUPAPI.@) */

17 years, 11 months

[ion] 24337: - Fix Ki386InitializeTss to use dynamic GDT calculated from KiGetMachineBootPointers instead of static internal address. Now NTLDR boots us all the way to HalInitializeProcessor.

by ion＠svn.reactos.org

Author: ion Date: Sun Oct 1 11:31:33 2006 New Revision: 24337 URL: http://svn.reactos.org/svn/reactos?rev=24337&view=rev Log: - Fix Ki386InitializeTss to use dynamic GDT calculated from KiGetMachineBootPointers instead of static internal address. Now NTLDR boots us all the way to HalInitializeProcessor. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Sun Oct 1 11:31:33 2006 @@ -61,7 +61,8 @@ FASTCALL Ki386InitializeTss( IN PKTSS Tss, - IN PKIDTENTRY Idt + IN PKIDTENTRY Idt, + IN PKGDTENTRY Gdt ); VOID Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Sun Oct 1 11:31:33 2006 @@ -552,12 +552,13 @@ VOID FASTCALL Ki386InitializeTss(IN PKTSS Tss, - IN PKIDTENTRY Idt) + IN PKIDTENTRY Idt, + IN PKGDTENTRY Gdt) { PKGDTENTRY TssEntry, TaskGateEntry; /* Initialize the boot TSS. */ - TssEntry = &KiBootGdt[KGDT_TSS / sizeof(KGDTENTRY)]; + TssEntry = &Gdt[KGDT_TSS / sizeof(KGDTENTRY)]; TssEntry->HighWord.Bits.Type = I386_TSS; TssEntry->HighWord.Bits.Pres = 1; TssEntry->HighWord.Bits.Dpl = 0; @@ -587,7 +588,7 @@ Tss->Ds = KGDT_R3_DATA | RPL_MASK; /* Setup the Double Trap TSS entry in the GDT */ - TssEntry = &KiBootGdt[KGDT_DF_TSS / sizeof(KGDTENTRY)]; + TssEntry = &Gdt[KGDT_DF_TSS / sizeof(KGDTENTRY)]; TssEntry->HighWord.Bits.Type = I386_TSS; TssEntry->HighWord.Bits.Pres = 1; TssEntry->HighWord.Bits.Dpl = 0; @@ -616,7 +617,7 @@ Tss->Ds = KGDT_R3_DATA | RPL_MASK; /* And its associated TSS Entry */ - TssEntry = &KiBootGdt[KGDT_NMI_TSS / sizeof(KGDTENTRY)]; + TssEntry = &Gdt[KGDT_NMI_TSS / sizeof(KGDTENTRY)]; TssEntry->HighWord.Bits.Type = I386_TSS; TssEntry->HighWord.Bits.Pres = 1; TssEntry->HighWord.Bits.Dpl = 0; Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sun Oct 1 11:31:33 2006 @@ -318,7 +318,7 @@ KiGetMachineBootPointers(&Gdt, &Idt, &Pcr, &Tss); /* Setup the TSS descriptors and entries */ - Ki386InitializeTss(Tss, Idt); + Ki386InitializeTss(Tss, Idt, Gdt); /* Initialize the PCR */ RtlZeroMemory(Pcr, PAGE_SIZE);

17 years, 11 months

[ion] 24336: - Put IDT in RW .data section - Fix Ki386InitializeTss to properly set Boot TSS descriptor data (set it to 32-bits). Also properly setup the DF/NMI Task Gates in the IDT.

by ion＠svn.reactos.org

Author: ion Date: Sun Oct 1 11:24:24 2006 New Revision: 24336 URL: http://svn.reactos.org/svn/reactos?rev=24336&view=rev Log: - Put IDT in RW .data section - Fix Ki386InitializeTss to properly set Boot TSS descriptor data (set it to 32-bits). Also properly setup the DF/NMI Task Gates in the IDT. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Sun Oct 1 11:24:24 2006 @@ -554,12 +554,13 @@ Ki386InitializeTss(IN PKTSS Tss, IN PKIDTENTRY Idt) { - PKGDTENTRY TssEntry; - PKIDTENTRY TaskGateEntry; - PKIDT_ACCESS TaskGateAccess; + PKGDTENTRY TssEntry, TaskGateEntry; /* Initialize the boot TSS. */ TssEntry = &KiBootGdt[KGDT_TSS / sizeof(KGDTENTRY)]; + TssEntry->HighWord.Bits.Type = I386_TSS; + TssEntry->HighWord.Bits.Pres = 1; + TssEntry->HighWord.Bits.Dpl = 0; KiInitializeTSS2(Tss, TssEntry); KiInitializeTSS(Tss); @@ -567,14 +568,11 @@ Ke386SetTr(KGDT_TSS); /* Setup the Task Gate for Double Fault Traps */ - TaskGateEntry = &Idt[8]; - TaskGateAccess = (PKIDT_ACCESS)&TaskGateEntry->Access; -#if 0 - TaskGateAccess->SegmentType = I386_TASK_GATE; - TaskGateAccess->Present = 1; - TaskGateAccess->Dpl = 0; - TaskGateEntry->Selector = KGDT_DF_TSS; -#endif + TaskGateEntry = (PKGDTENTRY)&Idt[8]; + TaskGateEntry->HighWord.Bits.Type = I386_TASK_GATE; + TaskGateEntry->HighWord.Bits.Pres = 1; + TaskGateEntry->HighWord.Bits.Dpl = 0; + ((PKIDTENTRY)TaskGateEntry)->Selector = KGDT_DF_TSS; /* Initialize the TSS used for handling double faults. */ Tss = (PKTSS)KiDoubleFaultTSS; @@ -599,13 +597,11 @@ TssEntry->LimitLow = KTSS_IO_MAPS; /* Now setup the NMI Task Gate */ - TaskGateEntry = &Idt[2]; - TaskGateAccess = (PKIDT_ACCESS)&TaskGateEntry->Access; -#if 0 - TaskGateAccess->SegmentType = I386_TASK_GATE; - TaskGateAccess->Present = 1; - TaskGateEntry->Selector = KGDT_NMI_TSS; -#endif + TaskGateEntry = (PKGDTENTRY)&Idt[2]; + TaskGateEntry->HighWord.Bits.Type = I386_TASK_GATE; + TaskGateEntry->HighWord.Bits.Pres = 1; + TaskGateEntry->HighWord.Bits.Dpl = 0; + ((PKIDTENTRY)TaskGateEntry)->Selector = KGDT_NMI_TSS; /* Initialize the actual TSS */ Tss = (PKTSS)KiNMITSS; Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sun Oct 1 11:24:24 2006 @@ -367,7 +367,7 @@ if (!Cpu) { /* Initialize debugging system */ - KdInitSystem (0, KeLoaderBlock); + KdInitSystem(0, KeLoaderBlock); /* Check for break-in */ if (KdPollBreakIn()) DbgBreakPointWithStatus(1); Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Sun Oct 1 11:24:24 2006 @@ -14,6 +14,7 @@ /* GLOBALS *******************************************************************/ +.data .globl _KiIdt _KiIdt: /* This is the Software Interrupt Table that we handle in this file: */ @@ -87,6 +88,7 @@ .asciz "\n\x7\x7!!! Unexpected Interrupt %02lx !!!\n" /* SOFTWARE INTERRUPT SERVICES ***********************************************/ +.text _KiGetTickCount: _KiCallbackReturn:

17 years, 11 months

[ion] 24335: - Clear KPCR->TEB during bootstrap as well. - Use KPCR_PROCESSOR_NUMBER instead of 0x130.

by ion＠svn.reactos.org

Author: ion Date: Sun Oct 1 10:46:08 2006 New Revision: 24335 URL: http://svn.reactos.org/svn/reactos?rev=24335&view=rev Log: - Clear KPCR->TEB during bootstrap as well. - Use KPCR_PROCESSOR_NUMBER instead of 0x130. Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sun Oct 1 10:46:08 2006 @@ -294,7 +294,7 @@ { /* If this is the boot CPU, set FS and the CPU Number*/ Ke386SetFs(KGDT_R0_PCR); - __writefsdword(0x130, Cpu); + __writefsdword(KPCR_PROCESSOR_NUMBER, Cpu); /* Set the initial stack and idle thread as well */ LoaderBlock->KernelStack = (ULONG_PTR)P0BootStack; @@ -334,6 +334,7 @@ InitialThread->ApcState.Process = &KiInitialProcess.Pcb; /* Clear DR6/7 to cleanup bootloader debugging */ + __writefsdword(KPCR_TEB, 0); __writefsdword(KPCR_DR6, 0); __writefsdword(KPCR_DR7, 0);

17 years, 11 months

[ion] 24334: - Add two more lines in boot.S which detect boot-by-NTLDR and jump into KiSystemService (I thought FreeLdr didn't use the entrypoint, but it looks like it does, so this hack is needed). Detection is done by checking for the high bit in the PLOADER_PARAMETER_BLOCK pointer, which will be set on NT. - Fix a double bug in KiSystemStartup. First, we were setting KPCR->Number instead of KPRCB->Number. Second, we were using KeGetPcr instead of __writefsdword. It worked on ROS because KeGet

by ion＠svn.reactos.org

Author: ion Date: Sun Oct 1 10:43:26 2006 New Revision: 24334 URL: http://svn.reactos.org/svn/reactos?rev=24334&view=rev Log: - Add two more lines in boot.S which detect boot-by-NTLDR and jump into KiSystemService (I thought FreeLdr didn't use the entrypoint, but it looks like it does, so this hack is needed). Detection is done by checking for the high bit in the PLOADER_PARAMETER_BLOCK pointer, which will be set on NT. - Fix a double bug in KiSystemStartup. First, we were setting KPCR->Number instead of KPRCB->Number. Second, we were using KeGetPcr instead of __writefsdword. It worked on ROS because KeGetPcr is hard-coded to ROS's KPCR buffer. Modified: trunk/reactos/ntoskrnl/ke/i386/boot.S trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/boot.S?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/boot.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/boot.S Sun Oct 1 10:43:26 2006 @@ -30,6 +30,11 @@ .text .func NtProcessStartup _NtProcessStartup: - /* Call the main kernel initialization */ + + /* NTLDR Boot: Call the main kernel initialization */ + test dword ptr [esp+4], 0x80000000 + jnz _KiSystemStartup@4 + + /* FREELDR Boot: Cal the FreeLDR wrapper */ jmp @KiRosPrepareForSystemStartup@8 .endfunc Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sun Oct 1 10:43:26 2006 @@ -294,7 +294,7 @@ { /* If this is the boot CPU, set FS and the CPU Number*/ Ke386SetFs(KGDT_R0_PCR); - KeGetPcr()->Number = Cpu; + __writefsdword(0x130, Cpu); /* Set the initial stack and idle thread as well */ LoaderBlock->KernelStack = (ULONG_PTR)P0BootStack;

17 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2006