Ros-diffs September 2006

ros-diffs@reactos.org

16 participants
146 discussions

[jimtabor] 23906: User32 bitmap.c: - Patch by Michael Kaufmann - CopyImage: Handle the flags LR_COPYDELETEORG, LR_CREATEDIBSECTION, and LR_MONOCHROME.
by jimtabor＠svn.reactos.org 04 Sep '06

04 Sep '06

Author: jimtabor Date: Mon Sep 4 07:08:18 2006 New Revision: 23906 URL: http://svn.reactos.org/svn/reactos?rev=23906&view=rev Log: User32 bitmap.c: - Patch by Michael Kaufmann - CopyImage: Handle the flags LR_COPYDELETEORG, LR_CREATEDIBSECTION, and LR_MONOCHROME. Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Mon Sep 4 07:08:18 2006 @@ -562,36 +562,200 @@ IN INT desiredy, IN UINT flags) { - HBITMAP res; - BITMAP bm; - +/* + * BUGS + * Only Windows NT 4.0 supports the LR_COPYRETURNORG flag for bitmaps, + * all other versions (95/2000/XP have been tested) ignore it. + * + * NOTES + * If LR_CREATEDIBSECTION is absent, the copy will be monochrome for + * a monochrome source bitmap or if LR_MONOCHROME is present, otherwise + * the copy will have the same depth as the screen. + * The content of the image will only be copied if the bit depth of the + * original image is compatible with the bit depth of the screen, or + * if the source is a DIB section. + * The LR_MONOCHROME flag is ignored if LR_CREATEDIBSECTION is present. + */ switch (type) { case IMAGE_BITMAP: { - DPRINT("WARNING: Incomplete implementation of CopyImage!\n"); - /* - * FIXME: Support flags LR_COPYDELETEORG, LR_COPYFROMRESOURCE, - * LR_COPYRETURNORG, LR_CREATEDIBSECTION and LR_MONOCHROME. - */ - if (!GetObjectW(hnd, sizeof(bm), &bm)) - return NULL; - bm.bmBits = NULL; - if ((res = CreateBitmapIndirect(&bm))) + HBITMAP res = NULL; + DIBSECTION ds; + int objSize; + BITMAPINFO * bi; + + objSize = GetObjectW( hnd, sizeof(ds), &ds ); + if (!objSize) return 0; + if ((desiredx < 0) || (desiredy < 0)) return 0; + + if (flags & LR_COPYFROMRESOURCE) { - char *buf = HeapAlloc(GetProcessHeap(), 0, bm.bmWidthBytes * bm.bmHeight); - if (buf == NULL) - { - DeleteObject(res); - return NULL; - } - GetBitmapBits(hnd, bm.bmWidthBytes * bm.bmHeight, buf); - SetBitmapBits(res, bm.bmWidthBytes * bm.bmHeight, buf); - HeapFree(GetProcessHeap(), 0, buf); + DPRINT1("FIXME: The flag LR_COPYFROMRESOURCE is not implemented for bitmaps\n"); } - return res; + + if (desiredx == 0) desiredx = ds.dsBm.bmWidth; + if (desiredy == 0) desiredy = ds.dsBm.bmHeight; + + /* Allocate memory for a BITMAPINFOHEADER structure and a + color table. The maximum number of colors in a color table + is 256 which corresponds to a bitmap with depth 8. + Bitmaps with higher depths don't have color tables. */ + bi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + if (!bi) return 0; + + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biPlanes = ds.dsBm.bmPlanes; + bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; + bi->bmiHeader.biCompression = BI_RGB; + + if (flags & LR_CREATEDIBSECTION) + { + /* Create a DIB section. LR_MONOCHROME is ignored */ + void * bits; + HDC dc = CreateCompatibleDC(NULL); + + if (objSize == sizeof(DIBSECTION)) + { + /* The source bitmap is a DIB. + Get its attributes to create an exact copy */ + memcpy(bi, &ds.dsBmih, sizeof(BITMAPINFOHEADER)); + } + + /* Get the color table or the color masks */ + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); + + bi->bmiHeader.biWidth = desiredx; + bi->bmiHeader.biHeight = desiredy; + bi->bmiHeader.biSizeImage = 0; + + res = CreateDIBSection(dc, bi, DIB_RGB_COLORS, &bits, NULL, 0); + DeleteDC(dc); + } + else + { + /* Create a device-dependent bitmap */ + + BOOL monochrome = (flags & LR_MONOCHROME); + + if (objSize == sizeof(DIBSECTION)) + { + /* The source bitmap is a DIB section. + Get its attributes */ + HDC dc = CreateCompatibleDC(NULL); + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); + DeleteDC(dc); + + if (!monochrome && ds.dsBm.bmBitsPixel == 1) + { + /* Look if the colors of the DIB are black and white */ + + monochrome = + (bi->bmiColors[0].rgbRed == 0xff + && bi->bmiColors[0].rgbGreen == 0xff + && bi->bmiColors[0].rgbBlue == 0xff + && bi->bmiColors[0].rgbReserved == 0 + && bi->bmiColors[1].rgbRed == 0 + && bi->bmiColors[1].rgbGreen == 0 + && bi->bmiColors[1].rgbBlue == 0 + && bi->bmiColors[1].rgbReserved == 0) + || + (bi->bmiColors[0].rgbRed == 0 + && bi->bmiColors[0].rgbGreen == 0 + && bi->bmiColors[0].rgbBlue == 0 + && bi->bmiColors[0].rgbReserved == 0 + && bi->bmiColors[1].rgbRed == 0xff + && bi->bmiColors[1].rgbGreen == 0xff + && bi->bmiColors[1].rgbBlue == 0xff + && bi->bmiColors[1].rgbReserved == 0); + } + } + else if (!monochrome) + { + monochrome = ds.dsBm.bmBitsPixel == 1; + } + + if (monochrome) + { + res = CreateBitmap(desiredx, desiredy, 1, 1, NULL); + } + else + { + HDC screenDC = GetDC(NULL); + res = CreateCompatibleBitmap(screenDC, desiredx, desiredy); + ReleaseDC(NULL, screenDC); + } + } + + if (res) + { + /* Only copy the bitmap if it's a DIB section or if it's + compatible to the screen */ + BOOL copyContents; + + if (objSize == sizeof(DIBSECTION)) + { + copyContents = TRUE; + } + else + { + HDC screenDC = GetDC(NULL); + int screen_depth = GetDeviceCaps(screenDC, BITSPIXEL); + ReleaseDC(NULL, screenDC); + + copyContents = (ds.dsBm.bmBitsPixel == 1 || ds.dsBm.bmBitsPixel == screen_depth); + } + + if (copyContents) + { + /* The source bitmap may already be selected in a device context, + use GetDIBits/StretchDIBits and not StretchBlt */ + + HDC dc; + void * bits; + + dc = CreateCompatibleDC(NULL); + + bi->bmiHeader.biWidth = ds.dsBm.bmWidth; + bi->bmiHeader.biHeight = ds.dsBm.bmHeight; + bi->bmiHeader.biSizeImage = 0; + bi->bmiHeader.biClrUsed = 0; + bi->bmiHeader.biClrImportant = 0; + + /* Fill in biSizeImage */ + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); + bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bi->bmiHeader.biSizeImage); + + if (bits) + { + HBITMAP oldBmp; + + /* Get the image bits of the source bitmap */ + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, bits, bi, DIB_RGB_COLORS); + + /* Copy it to the destination bitmap */ + oldBmp = SelectObject(dc, res); + StretchDIBits(dc, 0, 0, desiredx, desiredy, + 0, 0, ds.dsBm.bmWidth, ds.dsBm.bmHeight, + bits, bi, DIB_RGB_COLORS, SRCCOPY); + SelectObject(dc, oldBmp); + + HeapFree(GetProcessHeap(), 0, bits); + } + + DeleteDC(dc); + } + + if (flags & LR_COPYDELETEORG) + { + DeleteObject(hnd); + } + } + HeapFree(GetProcessHeap(), 0, bi); + return (HICON)res; } - case IMAGE_ICON: { static BOOL IconMsgDisplayed = FALSE; @@ -602,6 +766,7 @@ IconMsgDisplayed = TRUE; } return CopyIcon(hnd); +// return CURSORICON_ExtCopy(hnd,type, desiredx, desiredy, flags); } case IMAGE_CURSOR: @@ -613,9 +778,13 @@ DPRINT("FIXME: CopyImage doesn't support IMAGE_CURSOR correctly!\n"); IconMsgDisplayed = TRUE; } + /* Should call CURSORICON_ExtCopy but more testing + * needs to be done before we change this + */ + if (flags) DPRINT1("FIXME: Flags are ignored\n"); return CopyCursor(hnd); } } - return NULL; } +

1 0

[jimtabor] 23905: User32 combo.c: - Patch by Dmitry Timoshkov - do not force repainting on WM_WINDOWPOSCHANGED in combobox, it breaks Z-order based painting. - do nothing in the combobox WM_ERASEBKGND handler do all painting in WM_PAINT like Windows does.
by jimtabor＠svn.reactos.org 04 Sep '06

04 Sep '06

Author: jimtabor Date: Mon Sep 4 07:03:14 2006 New Revision: 23905 URL: http://svn.reactos.org/svn/reactos?rev=23905&view=rev Log: User32 combo.c: - Patch by Dmitry Timoshkov - do not force repainting on WM_WINDOWPOSCHANGED in combobox, it breaks Z-order based painting. - do nothing in the combobox WM_ERASEBKGND handler do all painting in WM_PAINT like Windows does. Modified: trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c Mon Sep 4 07:03:14 2006 @@ -909,34 +909,6 @@ return hBkgBrush; } -/*********************************************************************** - * COMBO_EraseBackground - */ -static LRESULT COMBO_EraseBackground( - HWND hwnd, - LPHEADCOMBO lphc, - HDC hParamDC) -{ - HBRUSH hBkgBrush; - HDC hDC; - - if(lphc->wState & CBF_EDIT) - return TRUE; - - hDC = (hParamDC) ? hParamDC - : GetDC(hwnd); - /* - * Retrieve the background brush - */ - hBkgBrush = COMBO_PrepareColors(lphc, hDC); - - FillRect(hDC, &lphc->textRect, hBkgBrush); - - if (!hParamDC) - ReleaseDC(hwnd, hDC); - - return TRUE; -} /*********************************************************************** * COMBO_Paint @@ -962,6 +934,8 @@ hBkgBrush = COMBO_PrepareColors(lphc, hDC); hPrevBrush = SelectObject( hDC, hBkgBrush ); + if (!(lphc->wState & CBF_EDIT)) + FillRect(hDC, &lphc->textRect, hBkgBrush); /* * In non 3.1 look, there is a sunken border on the combobox @@ -1603,7 +1577,7 @@ /*********************************************************************** * COMBO_Size */ -static void COMBO_Size( LPHEADCOMBO lphc ) +static void COMBO_Size( LPHEADCOMBO lphc, BOOL bRedraw ) { CBCalcPlacement(lphc->self, lphc, @@ -1611,7 +1585,7 @@ &lphc->buttonRect, &lphc->droppedRect); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, bRedraw ); } @@ -1904,15 +1878,15 @@ } case WM_PRINTCLIENT: - if (lParam & PRF_ERASEBKGND) - COMBO_EraseBackground(hwnd, lphc, (HDC)wParam); - /* Fallthrough */ case WM_PAINT: /* wParam may contain a valid HDC! */ return COMBO_Paint(lphc, (HDC)wParam); + case WM_ERASEBKGND: - return COMBO_EraseBackground(hwnd, lphc, (HDC)wParam); + /* do all painting in WM_PAINT like Windows does */ + return 1; + case WM_GETDLGCODE: { LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS; @@ -1933,10 +1907,13 @@ * get a WM_SIZE. Since we still want to update the Listbox, we have to * do it here. */ + /* we should not force repainting on WM_WINDOWPOSCHANGED, it breaks + * Z-order based painting. + */ /* fall through */ case WM_SIZE: if( lphc->hWndLBox && - !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc ); + !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, message == WM_SIZE ); return TRUE; case WM_SETFONT: COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam ); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Mon Sep 4 07:03:14 2006 @@ -119,7 +119,7 @@ User32 - reactos/dll/win32/user32/controls/button.c # Synced at 20060621 - reactos/dll/win32/user32/controls/combo.c # Synced at 20060617 + reactos/dll/win32/user32/controls/combo.c # Synced at 20060904 reactos/dll/win32/user32/controls/edit.c # Synced at 20060710 reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 reactos/dll/win32/user32/controls/listbox.c # Synced at 20060616

1 0

[greatlrd] 23904: Adding small hack to getting SetPixel color right when it is more that 3 bytes long. This hack allown us pass one more test. (Debuging in progress)
by greatlrd＠svn.reactos.org 03 Sep '06

03 Sep '06

Author: greatlrd Date: Mon Sep 4 02:54:22 2006 New Revision: 23904 URL: http://svn.reactos.org/svn/reactos?rev=23904&view=rev Log: Adding small hack to getting SetPixel color right when it is more that 3 bytes long. This hack allown us pass one more test. (Debuging in progress) Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Mon Sep 4 02:54:22 2006 @@ -485,14 +485,16 @@ { if (pBmp->dib == NULL) { - ExFreePool(pBmp->SurfObj.pvBits); + if (pBmp->SurfObj.pvBits != NULL) + ExFreePool(pBmp->SurfObj.pvBits); } else { - EngFreeUserMem(pBmp->SurfObj.pvBits); - } - if (pBmp->hDIBPalette) - { + if (pBmp->SurfObj.pvBits != NULL) + EngFreeUserMem(pBmp->SurfObj.pvBits); + } + if (pBmp->hDIBPalette != NULL) + { NtGdiDeleteObject(pBmp->hDIBPalette); } } @@ -1066,11 +1068,27 @@ INT Y, COLORREF Color) { + + DPRINT1("0 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color); + + if (((Color>>24) & 0xff)<0x10) + { + Color = ((Color>>16) & 0x0000ff) | ((Color<<16) & 0xff0000) | (Color & 0x00ff00); + } + + DPRINT1("0 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color); + if (NtGdiSetPixelV(hDC,X,Y,Color)) { - return NtGdiGetPixel(hDC,X,Y); - } - return ((COLORREF) -1); + Color = NtGdiGetPixel(hDC,X,Y); + DPRINT1("1 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color); + return Color; + + } + + Color = ((COLORREF) -1); + DPRINT1("2 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color); + return Color; } BOOL STDCALL

1 0

[ion] 23903: - Final cleanup for now: - main.c -> freeldr.c + cleanups and nice formatitng. - Move out variables that were in main.c to ex\init.c or cpu.c, depending. - Separate i386/kernel.c into i386/kiinit.c for X86-specific intiailization, and /krnlinit.c for portable initialization across all architectures. Also move out global variables appropriately. - main_asm.S -> cpu.S
by ion＠svn.reactos.org 03 Sep '06

03 Sep '06

Author: ion Date: Mon Sep 4 01:06:30 2006 New Revision: 23903 URL: http://svn.reactos.org/svn/reactos?rev=23903&view=rev Log: - Final cleanup for now: - main.c -> freeldr.c + cleanups and nice formatitng. - Move out variables that were in main.c to ex\init.c or cpu.c, depending. - Separate i386/kernel.c into i386/kiinit.c for X86-specific intiailization, and /krnlinit.c for portable initialization across all architectures. Also move out global variables appropriately. - main_asm.S -> cpu.S Added: trunk/reactos/ntoskrnl/ke/freeldr.c - copied, changed from r23901, trunk/reactos/ntoskrnl/ke/main.c trunk/reactos/ntoskrnl/ke/i386/boot.S - copied, changed from r23901, trunk/reactos/ntoskrnl/ke/i386/main_asm.S trunk/reactos/ntoskrnl/ke/i386/kiinit.c - copied, changed from r23901, trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/krnlinit.c Removed: trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/i386/main_asm.S trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/process.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=239… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Mon Sep 4 01:06:30 2006 @@ -27,11 +27,10 @@ // Ke: // // - FIXES: +// * Implement invalid opcode handler (fixes some apps from crashing). // * Get rid of KiRosPrintAddress and use KiDumpParameterImages instead. // * Sanitize some context fields during conversions. -// * Implement stack fault and segment fault handlers. // * Add DR macro/save and VM macro/save. -// * Make boot process more NT-like. // - FEATURES: // * Use Queued Spinlocks for scheduling and dispatching. // * New optimized table-based tick-hashed timer implementation. Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=239… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Mon Sep 4 01:06:30 2006 @@ -14,6 +14,17 @@ #include <internal/debug.h> /* DATA **********************************************************************/ + +#define BUILD_OSCSDVERSION(major, minor) (((major & 0xFF) << 8) | (minor & 0xFF)) + +/* NT Version Info */ +ULONG NtMajorVersion = 5; +ULONG NtMinorVersion = 0; +ULONG NtOSCSDVersion = BUILD_OSCSDVERSION(4, 0); +ULONG NtBuildNumber = KERNEL_VERSION_BUILD; +ULONG NtGlobalFlag = 0; + +ULONG InitSafeBootMode = 0; /* KB83764 */ extern ULONG MmCoreDumpType; extern CHAR KiTimerSystemAuditing; Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Mon Sep 4 01:06:30 2006 @@ -82,9 +82,13 @@ extern ULONG KeProcessorLevel; extern ULONG KeProcessorRevision; extern ULONG KeFeatureBits; +extern ULONG Ke386GlobalPagesEnabled; +extern KNODE KiNode0; extern PKNODE KeNodeBlock[1]; extern UCHAR KeNumberNodes; extern UCHAR KeProcessNodeSeed; +extern ETHREAD KiInitialThread; +extern EPROCESS KiInitialProcess; extern ULONG KiInterruptTemplate[KINTERRUPT_DISPATCH_CODES]; extern PULONG KiInterruptTemplateObject; extern PULONG KiInterruptTemplateDispatch; @@ -801,6 +805,26 @@ IN FLOATING_SAVE_AREA *SaveArea ); +VOID +NTAPI +KiInitSpinLocks( + IN PKPRCB Prcb, + IN CCHAR Number +); + +LARGE_INTEGER +NTAPI +KiComputeReciprocal( + IN LONG Divisor, + OUT PUCHAR Shift +); + +VOID +NTAPI +KiInitSystem( + VOID +); + #include "ke_x.h" #endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */ Copied: trunk/reactos/ntoskrnl/ke/freeldr.c (from r23901, trunk/reactos/ntoskrnl/ke/main.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?p2=t… ============================================================================== --- trunk/reactos/ntoskrnl/ke/main.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Mon Sep 4 01:06:30 2006 @@ -1,76 +1,41 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/main.c - * PURPOSE: Initalizes the kernel - * - * PROGRAMMERS: Alex Ionescu (cleaned up code, moved Executiv stuff to ex/init.c) - * David Welch (welch(a)cwcom.net) + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/freeldr.c + * PURPOSE: FreeLDR Bootstrap Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ -#define BUILD_OSCSDVERSION(major, minor) (((major & 0xFF) << 8) | (minor & 0xFF)) - - -ULONG NtMajorVersion = 5; -ULONG NtMinorVersion = 0; -ULONG NtOSCSDVersion = BUILD_OSCSDVERSION(4, 0); -ULONG NtBuildNumber = KERNEL_VERSION_BUILD; -ULONG NtGlobalFlag = 0; -CHAR KeNumberProcessors; -KAFFINITY KeActiveProcessors = 1; -ROS_LOADER_PARAMETER_BLOCK KeLoaderBlock; -ULONG KeDcacheFlushCount = 0; -ULONG KeIcacheFlushCount = 0; -ULONG KiDmaIoCoherency = 0; /* RISC Architectures only */ -ULONG InitSafeBootMode = 0; /* KB83764 */ - +/* FreeLDR Module Data */ LOADER_MODULE KeLoaderModules[64]; static CHAR KeLoaderModuleStrings[64][256]; -static CHAR KeLoaderCommandLine[256]; +PLOADER_MODULE CachedModules[MaximumCachedModuleType]; + +/* FreeLDR Memory Data */ ADDRESS_RANGE KeMemoryMap[64]; ULONG KeMemoryMapRangeCount; ULONG_PTR FirstKrnlPhysAddr; ULONG_PTR LastKrnlPhysAddr; ULONG_PTR LastKernelAddress; -PVOID KeUserApcDispatcher = NULL; -PVOID KeUserCallbackDispatcher = NULL; -PVOID KeUserExceptionDispatcher = NULL; -PVOID KeRaiseUserExceptionDispatcher = NULL; - -ULONG KeLargestCacheLine = 0x40; /* FIXME: Arch-specific */ - -/* Cached modules from the loader block */ -PLOADER_MODULE CachedModules[MaximumCachedModuleType]; - +/* FreeLDR Loader Data */ +ROS_LOADER_PARAMETER_BLOCK KeLoaderBlock; +static CHAR KeLoaderCommandLine[256]; + +/* FreeLDR PE Hack Data */ extern unsigned int _image_base__; ULONG_PTR KERNEL_BASE = (ULONG_PTR)&_image_base__; - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, _main) -#endif - extern LDR_DATA_TABLE_ENTRY HalModuleObject; -/* FUNCTIONS ****************************************************************/ - -/* - * @implemented - */ -ULONG -STDCALL -KeGetRecommendedSharedDataAlignment(VOID) -{ - return KeLargestCacheLine; -} +/* FUNCTIONS *****************************************************************/ VOID NTAPI @@ -121,7 +86,8 @@ } /* Save data */ - KeLoaderBlock.MmapLength = KeMemoryMapRangeCount * sizeof(ADDRESS_RANGE); + KeLoaderBlock.MmapLength = KeMemoryMapRangeCount * + sizeof(ADDRESS_RANGE); KeLoaderBlock.MmapAddr = (ULONG)KeMemoryMap; } else @@ -148,7 +114,8 @@ OptHead = &NtHeader->OptionalHeader; /* Set Kernel Ending */ - KeLoaderModules[0].ModEnd = KeLoaderModules[0].ModStart + PAGE_ROUND_UP((ULONG)OptHead->SizeOfImage); + KeLoaderModules[0].ModEnd = KeLoaderModules[0].ModStart + + PAGE_ROUND_UP((ULONG)OptHead->SizeOfImage); /* Create a block for each module */ for (i = 1; i < KeLoaderBlock.ModsCount; i++) @@ -180,7 +147,8 @@ } /* Choose last module address as the final kernel address */ - LastKernelAddress = PAGE_ROUND_UP(KeLoaderModules[KeLoaderBlock.ModsCount - 1].ModEnd); + LastKernelAddress = PAGE_ROUND_UP(KeLoaderModules[KeLoaderBlock. + ModsCount - 1].ModEnd); /* Select the HAL Base */ HalBase = KeLoaderModules[1].ModStart; @@ -207,7 +175,9 @@ // // This dirty hack fixes it, and should make symbol lookup work too. // - HalModuleObject.SizeOfImage = RtlImageNtHeader((PVOID)HalModuleObject.DllBase)->OptionalHeader.SizeOfImage; + HalModuleObject.SizeOfImage = RtlImageNtHeader((PVOID)HalModuleObject. + DllBase)-> + OptionalHeader.SizeOfImage; /* Increase the last kernel address with the size of HAL */ LastKernelAddress += PAGE_ROUND_UP(DriverSize); Copied: trunk/reactos/ntoskrnl/ke/i386/boot.S (from r23901, trunk/reactos/ntoskrnl/ke/i386/main_asm.S) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/boot.S?p2… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/main_asm.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/boot.S Mon Sep 4 01:06:30 2006 @@ -1,5 +1,5 @@ /* - * FILE: ntoskrnl/ke/i386/main_asm.S + * FILE: ntoskrnl/ke/i386/boot.S * COPYRIGHT: See COPYING in the top level directory * PURPOSE: Kernel Bootstrap Code * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) 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 Mon Sep 4 01:06:30 2006 @@ -65,6 +65,12 @@ ULONG Ke386GlobalPagesEnabled = FALSE; ULONG Ke386NoExecute = FALSE; BOOLEAN KiI386PentiumLockErrataPresent; +ULONG KeLargestCacheLine = 0x40; +ULONG KeDcacheFlushCount = 0; +ULONG KeIcacheFlushCount = 0; +ULONG KiDmaIoCoherency = 0; +CHAR KeNumberProcessors; +KAFFINITY KeActiveProcessors = 1; /* CPU Signatures */ CHAR CmpIntelID[] = "GenuineIntel"; @@ -769,3 +775,12 @@ _Ke386SetCr(3, _Ke386GetCr(3)); } +/* + * @implemented + */ +ULONG +STDCALL +KeGetRecommendedSharedDataAlignment(VOID) +{ + return KeLargestCacheLine; +} Removed: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c (removed) @@ -1,622 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/kernel.c - * PURPOSE: Initializes the kernel - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> -#include <internal/napi.h> - -/* GLOBALS *******************************************************************/ - -PKPRCB KiProcessorBlock[MAXIMUM_PROCESSORS]; -KNODE KiNode0; -PKNODE KeNodeBlock[1]; -UCHAR KeNumberNodes = 1; -UCHAR KeProcessNodeSeed; -ETHREAD KiInitialThread; -EPROCESS KiInitialProcess; - -extern ULONG Ke386GlobalPagesEnabled; -extern PVOID trap_stack; - -/* System-defined Spinlocks */ -KSPIN_LOCK KiDispatcherLock; -KSPIN_LOCK MmPfnLock; -KSPIN_LOCK MmSystemSpaceLock; -KSPIN_LOCK CcBcbSpinLock; -KSPIN_LOCK CcMasterSpinLock; -KSPIN_LOCK CcVacbSpinLock; -KSPIN_LOCK CcWorkQueueSpinLock; -KSPIN_LOCK NonPagedPoolLock; -KSPIN_LOCK MmNonPagedPoolLock; -KSPIN_LOCK IopCancelSpinLock; -KSPIN_LOCK IopVpbSpinLock; -KSPIN_LOCK IopDatabaseLock; -KSPIN_LOCK IopCompletionLock; -KSPIN_LOCK NtfsStructLock; -KSPIN_LOCK AfdWorkQueueSpinLock; -KSPIN_LOCK KiTimerTableLock[16]; -KSPIN_LOCK KiReverseStallIpiLock; - -KSPIN_LOCK KiFreezeExecutionLock; -KSPIN_LOCK Ki486CompatibilityLock; - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, KeInit1) -#pragma alloc_text(INIT, KeInit2) -#endif - -/* FUNCTIONS *****************************************************************/ - -VOID -NTAPI -KiInitSystem(VOID) -{ - ULONG i; - - /* Initialize Bugcheck Callback data */ - InitializeListHead(&BugcheckCallbackListHead); - InitializeListHead(&BugcheckReasonCallbackListHead); - KeInitializeSpinLock(&BugCheckCallbackLock); - - /* Initialize the Timer Expiration DPC */ - KeInitializeDpc(&KiExpireTimerDpc, KiExpireTimers, NULL); - KeSetTargetProcessorDpc(&KiExpireTimerDpc, 0); - - /* Initialize Profiling data */ - KeInitializeSpinLock(&KiProfileLock); - InitializeListHead(&KiProfileListHead); - InitializeListHead(&KiProfileSourceListHead); - - /* Loop the timer table */ - for (i = 0; i < TIMER_TABLE_SIZE; i++) - { - /* Initialize the list and entries */ - InitializeListHead(&KiTimerTableListHead[i].Entry); - KiTimerTableListHead[i].Time.HighPart = 0xFFFFFFFF; - KiTimerTableListHead[i].Time.LowPart = 0; - } - - /* Initialize old-style list */ - InitializeListHead(&KiTimerListHead); - - /* Initialize the Swap event and all swap lists */ - KeInitializeEvent(&KiSwapEvent, SynchronizationEvent, FALSE); - InitializeListHead(&KiProcessInSwapListHead); - InitializeListHead(&KiProcessOutSwapListHead); - InitializeListHead(&KiStackInSwapListHead); - - /* Initialize the mutex for generic DPC calls */ - KeInitializeMutex(&KiGenericCallDpcMutex, 0); - - /* Initialize the syscall table */ - KeServiceDescriptorTable[0].Base = MainSSDT; - KeServiceDescriptorTable[0].Count = NULL; - KeServiceDescriptorTable[0].Limit = NUMBER_OF_SYSCALLS; - KeServiceDescriptorTable[1].Limit = 0; - KeServiceDescriptorTable[0].Number = MainSSPT; - - /* Copy the the current table into the shadow table for win32k */ - RtlCopyMemory(KeServiceDescriptorTableShadow, - KeServiceDescriptorTable, - sizeof(KeServiceDescriptorTable)); -} - -LARGE_INTEGER -NTAPI -KiComputeReciprocal(IN LONG Divisor, - OUT PUCHAR Shift) -{ - LARGE_INTEGER Reciprocal = {{0}}; - LONG BitCount = 0, Remainder = 1; - - /* Start by calculating the remainder */ - while (Reciprocal.HighPart >= 0) - { - /* Increase the loop (bit) count */ - BitCount++; - - /* Calculate the current fraction */ - Reciprocal.HighPart = (Reciprocal.HighPart << 1) | - (Reciprocal.LowPart >> 31); - Reciprocal.LowPart <<= 1; - - /* Double the remainder and see if we went past the divisor */ - Remainder <<= 1; - if (Remainder >= Divisor) - { - /* Set the low-bit and calculate the new remainder */ - Remainder -= Divisor; - Reciprocal.LowPart |= 1; - } - } - - /* Check if we have a remainder */ - if (Remainder) - { - /* Check if the current fraction value is too large */ - if ((Reciprocal.LowPart == 0xFFFFFFFF) && - (Reciprocal.HighPart == 0xFFFFFFFF)) - { - /* Set the high bit and reduce the bit count */ - Reciprocal.LowPart = 0; - Reciprocal.HighPart = 0x80000000; - BitCount--; - } - else - { - /* Check if only the lowest bits got too large */ - if (Reciprocal.LowPart == 0xFFFFFFFF) - { - /* Reset them and increase the high bits instead */ - Reciprocal.LowPart = 0; - Reciprocal.HighPart++; - } - else - { - /* All is well, increase the low bits */ - Reciprocal.LowPart++; - } - } - } - - /* Now calculate the actual shift and return the reciprocal */ - *Shift = (UCHAR)BitCount - 64; - return Reciprocal; -} - -VOID -NTAPI -KiInitSpinLocks(IN PKPRCB Prcb, - IN CCHAR Number) -{ - ULONG i; - - /* Initialize Dispatcher Fields */ - Prcb->QueueIndex = 1; - Prcb->ReadySummary = 0; - Prcb->DeferredReadyListHead.Next = NULL; - for (i = 0; i < 32; i++) - { - /* Initialize the ready list */ - InitializeListHead(&Prcb->DispatcherReadyListHead[i]); - } - - /* Initialize DPC Fields */ - InitializeListHead(&Prcb->DpcData[DPC_NORMAL].DpcListHead); - KeInitializeSpinLock(&Prcb->DpcData[DPC_NORMAL].DpcLock); - Prcb->DpcData[DPC_NORMAL].DpcQueueDepth = 0; - Prcb->DpcData[DPC_NORMAL].DpcCount = 0; - Prcb->DpcRoutineActive = FALSE; - Prcb->MaximumDpcQueueDepth = KiMaximumDpcQueueDepth; - Prcb->MinimumDpcRate = KiMinimumDpcRate; - Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; - KeInitializeDpc(&Prcb->CallDpc, NULL, NULL); - KeSetTargetProcessorDpc(&Prcb->CallDpc, Number); - KeSetImportanceDpc(&Prcb->CallDpc, HighImportance); - - /* Initialize the Wait List Head */ - InitializeListHead(&Prcb->WaitListHead); - - /* Initialize Queued Spinlocks */ - Prcb->LockQueue[LockQueueDispatcherLock].Next = NULL; - Prcb->LockQueue[LockQueueDispatcherLock].Lock = &KiDispatcherLock; - Prcb->LockQueue[LockQueueExpansionLock].Next = NULL; - Prcb->LockQueue[LockQueueExpansionLock].Lock = NULL; - Prcb->LockQueue[LockQueuePfnLock].Next = NULL; - Prcb->LockQueue[LockQueuePfnLock].Lock = &MmPfnLock; - Prcb->LockQueue[LockQueueSystemSpaceLock].Next = NULL; - Prcb->LockQueue[LockQueueSystemSpaceLock].Lock = &MmSystemSpaceLock; - Prcb->LockQueue[LockQueueBcbLock].Next = NULL; - Prcb->LockQueue[LockQueueBcbLock].Lock = &CcBcbSpinLock; - Prcb->LockQueue[LockQueueMasterLock].Next = NULL; - Prcb->LockQueue[LockQueueMasterLock].Lock = &CcMasterSpinLock; - Prcb->LockQueue[LockQueueVacbLock].Next = NULL; - Prcb->LockQueue[LockQueueVacbLock].Lock = &CcVacbSpinLock; - Prcb->LockQueue[LockQueueWorkQueueLock].Next = NULL; - Prcb->LockQueue[LockQueueWorkQueueLock].Lock = &CcWorkQueueSpinLock; - Prcb->LockQueue[LockQueueNonPagedPoolLock].Next = NULL; - Prcb->LockQueue[LockQueueNonPagedPoolLock].Lock = &NonPagedPoolLock; - Prcb->LockQueue[LockQueueMmNonPagedPoolLock].Next = NULL; - Prcb->LockQueue[LockQueueMmNonPagedPoolLock].Lock = &MmNonPagedPoolLock; - Prcb->LockQueue[LockQueueIoCancelLock].Next = NULL; - Prcb->LockQueue[LockQueueIoCancelLock].Lock = &IopCancelSpinLock; - Prcb->LockQueue[LockQueueIoVpbLock].Next = NULL; - Prcb->LockQueue[LockQueueIoVpbLock].Lock = &IopVpbSpinLock; - Prcb->LockQueue[LockQueueIoDatabaseLock].Next = NULL; - Prcb->LockQueue[LockQueueIoDatabaseLock].Lock = &IopDatabaseLock; - Prcb->LockQueue[LockQueueIoCompletionLock].Next = NULL; - Prcb->LockQueue[LockQueueIoCompletionLock].Lock = &IopCompletionLock; - Prcb->LockQueue[LockQueueNtfsStructLock].Next = NULL; - Prcb->LockQueue[LockQueueNtfsStructLock].Lock = &NtfsStructLock; - Prcb->LockQueue[LockQueueAfdWorkQueueLock].Next = NULL; - Prcb->LockQueue[LockQueueAfdWorkQueueLock].Lock = &AfdWorkQueueSpinLock; - Prcb->LockQueue[LockQueueUnusedSpare16].Next = NULL; - Prcb->LockQueue[LockQueueUnusedSpare16].Lock = NULL; - - /* Loop timer locks */ - for (i = 0; i < LOCK_QUEUE_TIMER_TABLE_LOCKS; i++) - { - /* Initialize the lock and setup the Queued Spinlock */ - KeInitializeSpinLock(&KiTimerTableLock[i]); - Prcb->LockQueue[i].Next = NULL; - Prcb->LockQueue[i].Lock = &KiTimerTableLock[i]; - } - - /* Check if this is the boot CPU */ - if (!Number) - { - /* Initialize the lock themselves */ - KeInitializeSpinLock(&KiDispatcherLock); - KeInitializeSpinLock(&KiReverseStallIpiLock); - KeInitializeSpinLock(&MmPfnLock); - KeInitializeSpinLock(&MmSystemSpaceLock); - KeInitializeSpinLock(&CcBcbSpinLock); - KeInitializeSpinLock(&CcMasterSpinLock); - KeInitializeSpinLock(&CcVacbSpinLock); - KeInitializeSpinLock(&CcWorkQueueSpinLock); - KeInitializeSpinLock(&IopCancelSpinLock); - KeInitializeSpinLock(&IopCompletionLock); - KeInitializeSpinLock(&IopDatabaseLock); - KeInitializeSpinLock(&IopVpbSpinLock); - KeInitializeSpinLock(&NonPagedPoolLock); - KeInitializeSpinLock(&MmNonPagedPoolLock); - KeInitializeSpinLock(&NtfsStructLock); - KeInitializeSpinLock(&AfdWorkQueueSpinLock); - KeInitializeDispatcher(); // ROS OLD DISPATCHER - } -} - -VOID -NTAPI -KiInitializePcr(IN ULONG ProcessorNumber, - IN PKIPCR Pcr, - IN PKIDTENTRY Idt, - IN PKGDTENTRY Gdt, - IN PKTSS Tss, - IN PKTHREAD IdleThread, - IN PVOID DpcStack) -{ - /* Setup the TIB */ - Pcr->NtTib.ExceptionList = EXCEPTION_CHAIN_END; - Pcr->NtTib.StackBase = 0; - Pcr->NtTib.StackLimit = 0; - Pcr->NtTib.Self = 0; - - /* Set the Current Thread */ - //Pcr->PrcbData.CurrentThread = IdleThread; - - /* Set pointers to ourselves */ - Pcr->Self = (PKPCR)Pcr; - Pcr->Prcb = &Pcr->PrcbData; - - /* Set the PCR Version */ - Pcr->MajorVersion = PCR_MAJOR_VERSION; - Pcr->MinorVersion = PCR_MINOR_VERSION; - - /* Set the PCRB Version */ - Pcr->PrcbData.MajorVersion = 1; - Pcr->PrcbData.MinorVersion = 1; - - /* Set the Build Type */ - Pcr->PrcbData.BuildType = 0; - - /* Set the Processor Number and current Processor Mask */ - Pcr->PrcbData.Number = (UCHAR)ProcessorNumber; - Pcr->PrcbData.SetMember = 1 << ProcessorNumber; - - /* Set the PRCB for this Processor */ - KiProcessorBlock[ProcessorNumber] = Pcr->Prcb; - - /* Start us out at PASSIVE_LEVEL */ - Pcr->Irql = PASSIVE_LEVEL; - - /* Set the GDI, IDT, TSS and DPC Stack */ - Pcr->GDT = (PVOID)Gdt; - Pcr->IDT = Idt; - Pcr->TSS = Tss; - Pcr->PrcbData.DpcStack = DpcStack; -} - -VOID -NTAPI -KiInitializeKernel(IN PKPROCESS InitProcess, - IN PKTHREAD InitThread, - IN PVOID IdleStack, - IN PKPRCB Prcb, - IN CCHAR Number, - IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) -{ - BOOLEAN NpxPresent; - ULONG FeatureBits; - LARGE_INTEGER PageDirectory; - PVOID DpcStack; - - /* Detect and set the CPU Type */ - KiSetProcessorType(); - - /* Set CR0 features based on detected CPU */ - KiSetCR0Bits(); - - /* Check if an FPU is present */ - NpxPresent = KiIsNpxPresent(); - - /* Initialize the Power Management Support for this PRCB */ - PoInitializePrcb(Prcb); - - /* Bugcheck if this is a 386 CPU */ - if (Prcb->CpuType == 3) KeBugCheckEx(0x5D, 0x386, 0, 0, 0); - - /* Get the processor features for the CPU */ - FeatureBits = KiGetFeatureBits(); - - /* Save feature bits */ - Prcb->FeatureBits = FeatureBits; - - /* Get cache line information for this CPU */ - KiGetCacheInformation(); - - /* Initialize spinlocks and DPC data */ - KiInitSpinLocks(Prcb, Number); - - /* Check if this is the Boot CPU */ - if (!Number) - { - /* Set Node Data */ - KeNodeBlock[0] = &KiNode0; - Prcb->ParentNode = KeNodeBlock[0]; - KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; - - /* Set boot-level flags */ - KeI386NpxPresent = NpxPresent; - KeI386CpuType = Prcb->CpuType; - KeI386CpuStep = Prcb->CpuStep; - KeProcessorArchitecture = 0; - KeProcessorLevel = (USHORT)Prcb->CpuType; - if (Prcb->CpuID) KeProcessorRevision = Prcb->CpuStep; - KeFeatureBits = FeatureBits; - KeI386FxsrPresent = (KeFeatureBits & KF_FXSR) ? TRUE : FALSE; - KeI386XMMIPresent = (KeFeatureBits & KF_XMMI) ? TRUE : FALSE; - - /* Set the current MP Master KPRCB to the Boot PRCB */ - Prcb->MultiThreadSetMaster = Prcb; - - /* Initialize some spinlocks */ - KeInitializeSpinLock(&KiFreezeExecutionLock); - KeInitializeSpinLock(&Ki486CompatibilityLock); - - /* Initialize portable parts of the OS */ - KiInitSystem(); - - /* Initialize the Idle Process and the Process Listhead */ - InitializeListHead(&KiProcessListHead); - PageDirectory.QuadPart = 0; - KeInitializeProcess(InitProcess, - 0, - 0xFFFFFFFF, - PageDirectory); - InitProcess->QuantumReset = MAXCHAR; - } - else - { - /* FIXME */ - DPRINT1("SMP Boot support not yet present\n"); - } - -#if 0 - /* Setup the Idle Thread */ - KeInitializeThread(InitProcess, - InitThread, - NULL, - NULL, - NULL, - NULL, - NULL, - IdleStack); -#endif - InitThread->NextProcessor = Number; - InitThread->Priority = HIGH_PRIORITY; - InitThread->State = Running; - InitThread->Affinity = 1 << Number; - InitThread->WaitIrql = DISPATCH_LEVEL; - InitProcess->ActiveProcessors = 1 << Number; - - /* Set up the thread-related fields in the PRCB */ - //Prcb->CurrentThread = InitThread; - Prcb->NextThread = NULL; - //Prcb->IdleThread = InitThread; - - /* Initialize the Kernel Executive */ - ExpInitializeExecutive(); - - /* Only do this on the boot CPU */ - if (!Number) - { - /* Calculate the time reciprocal */ - KiTimeIncrementReciprocal = - KiComputeReciprocal(KeMaximumIncrement, - &KiTimeIncrementShiftCount); - - /* Update DPC Values in case they got updated by the executive */ - Prcb->MaximumDpcQueueDepth = KiMaximumDpcQueueDepth; - Prcb->MinimumDpcRate = KiMinimumDpcRate; - Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; - - /* Allocate the DPC Stack */ - DpcStack = MmCreateKernelStack(FALSE); - if (!DpcStack) KeBugCheckEx(NO_PAGES_AVAILABLE, 1, 0, 0, 0); - Prcb->DpcStack = DpcStack; - - /* Allocate the IOPM save area. */ - Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool, - PAGE_SIZE * 2, - TAG('K', 'e', ' ', ' ')); - if (!Ki386IopmSaveArea) - { - /* Bugcheck. We need this for V86/VDM support. */ - KeBugCheckEx(NO_PAGES_AVAILABLE, 2, PAGE_SIZE * 2, 0, 0); - } - } - - /* Free Initial Memory */ - MiFreeInitMemory(); - - while (1) - { - LARGE_INTEGER Timeout; - Timeout.QuadPart = 0x7fffffffffffffffLL; - KeDelayExecutionThread(KernelMode, FALSE, &Timeout); - } - - /* Bug Check and loop forever if anything failed */ - KEBUGCHECK(0); - for(;;); -} - -VOID -NTAPI -KiSystemStartup(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) -{ - ULONG Cpu; - PKIPCR Pcr = (PKIPCR)KPCR_BASE; - PKPRCB Prcb; - - /* Save the loader block and get the current CPU */ - //KeLoaderBlock = LoaderBlock; - Cpu = KeNumberProcessors; - if (!Cpu) - { - /* If this is the boot CPU, set FS and the CPU Number*/ - Ke386SetFs(KGDT_R0_PCR); - KeGetPcr()->Number = Cpu; - } - - /* Skip initial setup if this isn't the Boot CPU */ - if (Cpu) goto AppCpuInit; - - /* Setup the boot (Freeldr should've done), double fault and NMI TSS */ - Ki386InitializeTss(); - - /* Initialize the PCR */ - RtlZeroMemory(Pcr, PAGE_SIZE); - KiInitializePcr(Cpu, - Pcr, - KiIdt, - KiBootGdt, - &KiBootTss, - &KiInitialThread.Tcb, - KiDoubleFaultStack); - - /* Set us as the current process */ - KiInitialThread.Tcb.ApcState.Process = &KiInitialProcess.Pcb; - - /* Clear DR6/7 to cleanup bootloader debugging */ - Pcr->PrcbData.ProcessorState.SpecialRegisters.KernelDr6 = 0; - Pcr->PrcbData.ProcessorState.SpecialRegisters.KernelDr7 = 0; - - /* Load Ring 3 selectors for DS/ES */ - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - - /* Setup CPU-related fields */ -AppCpuInit: - Prcb = Pcr->Prcb; - Pcr->Number = Cpu; - Pcr->SetMember = 1 << Cpu; - Pcr->SetMemberCopy = 1 << Cpu; - Prcb->SetMember = 1 << Cpu; - - /* Initialize the Processor with HAL */ - HalInitializeProcessor(Cpu, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); - - /* Set active processors */ - KeActiveProcessors |= Pcr->SetMember; - KeNumberProcessors++; - - /* Initialize the Debugger for the Boot CPU */ - if (!Cpu) KdInitSystem (0, &KeLoaderBlock); - - /* Check for break-in */ - if (KdPollBreakIn()) DbgBreakPointWithStatus(1); - - /* Raise to HIGH_LEVEL */ - KfRaiseIrql(HIGH_LEVEL); - - /* Call main kernel intialization */ - KiInitializeKernel(&KiInitialProcess.Pcb, - &KiInitialThread.Tcb, - P0BootStack, - Prcb, - Cpu, - LoaderBlock); -} - -VOID -INIT_FUNCTION -NTAPI -KeInit2(VOID) -{ - ULONG Protect; - - /* Check if Fxsr was found */ - if (KeI386FxsrPresent) - { - /* Enable it. FIXME: Send an IPI */ - Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSFXSR); - - /* Check if XMM was found too */ - if (KeI386XMMIPresent) - { - /* Enable it: FIXME: Send an IPI. */ - Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSXMMEXCPT); - - /* FIXME: Implement and enable XMM Page Zeroing for Mm */ - } - } - - if (KeFeatureBits & KF_GLOBAL_PAGE) - { - ULONG Flags; - /* Enable global pages */ - Ke386GlobalPagesEnabled = TRUE; - Ke386SaveFlags(Flags); - Ke386DisableInterrupts(); - Ke386SetCr4(Ke386GetCr4() | X86_CR4_PGE); - Ke386RestoreFlags(Flags); - } - - if (KeFeatureBits & KF_FAST_SYSCALL) - { - extern void KiFastCallEntry(void); - - /* CS Selector of the target segment. */ - Ke386Wrmsr(0x174, KGDT_R0_CODE, 0); - /* Target ESP. */ - Ke386Wrmsr(0x175, 0, 0); - /* Target EIP. */ - Ke386Wrmsr(0x176, (ULONG_PTR)KiFastCallEntry, 0); - } - - /* Does the CPU Support 'prefetchnta' (SSE) */ - if(KeFeatureBits & KF_XMMI) - { - Protect = MmGetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal); - MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect | PAGE_IS_WRITABLE); - /* Replace the ret by a nop */ - *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; - MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect); - } - - /* Set IDT to writable */ - Protect = MmGetPageProtect(NULL, (PVOID)KiIdt); - MmSetPageProtect(NULL, (PVOID)KiIdt, Protect | PAGE_IS_WRITABLE); -} Copied: trunk/reactos/ntoskrnl/ke/i386/kiinit.c (from r23901, trunk/reactos/ntoskrnl/ke/i386/kernel.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Mon Sep 4 01:06:30 2006 @@ -1,280 +1,24 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/kernel.c - * PURPOSE: Initializes the kernel - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/i386/kiinit.c + * PURPOSE: Kernel Initialization for x86 CPUs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> -#include <internal/napi.h> +#include <debug.h> /* GLOBALS *******************************************************************/ -PKPRCB KiProcessorBlock[MAXIMUM_PROCESSORS]; -KNODE KiNode0; -PKNODE KeNodeBlock[1]; -UCHAR KeNumberNodes = 1; -UCHAR KeProcessNodeSeed; -ETHREAD KiInitialThread; -EPROCESS KiInitialProcess; - -extern ULONG Ke386GlobalPagesEnabled; -extern PVOID trap_stack; - -/* System-defined Spinlocks */ -KSPIN_LOCK KiDispatcherLock; -KSPIN_LOCK MmPfnLock; -KSPIN_LOCK MmSystemSpaceLock; -KSPIN_LOCK CcBcbSpinLock; -KSPIN_LOCK CcMasterSpinLock; -KSPIN_LOCK CcVacbSpinLock; -KSPIN_LOCK CcWorkQueueSpinLock; -KSPIN_LOCK NonPagedPoolLock; -KSPIN_LOCK MmNonPagedPoolLock; -KSPIN_LOCK IopCancelSpinLock; -KSPIN_LOCK IopVpbSpinLock; -KSPIN_LOCK IopDatabaseLock; -KSPIN_LOCK IopCompletionLock; -KSPIN_LOCK NtfsStructLock; -KSPIN_LOCK AfdWorkQueueSpinLock; -KSPIN_LOCK KiTimerTableLock[16]; -KSPIN_LOCK KiReverseStallIpiLock; - +/* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; KSPIN_LOCK Ki486CompatibilityLock; -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, KeInit1) -#pragma alloc_text(INIT, KeInit2) -#endif - /* FUNCTIONS *****************************************************************/ - -VOID -NTAPI -KiInitSystem(VOID) -{ - ULONG i; - - /* Initialize Bugcheck Callback data */ - InitializeListHead(&BugcheckCallbackListHead); - InitializeListHead(&BugcheckReasonCallbackListHead); - KeInitializeSpinLock(&BugCheckCallbackLock); - - /* Initialize the Timer Expiration DPC */ - KeInitializeDpc(&KiExpireTimerDpc, KiExpireTimers, NULL); - KeSetTargetProcessorDpc(&KiExpireTimerDpc, 0); - - /* Initialize Profiling data */ - KeInitializeSpinLock(&KiProfileLock); - InitializeListHead(&KiProfileListHead); - InitializeListHead(&KiProfileSourceListHead); - - /* Loop the timer table */ - for (i = 0; i < TIMER_TABLE_SIZE; i++) - { - /* Initialize the list and entries */ - InitializeListHead(&KiTimerTableListHead[i].Entry); - KiTimerTableListHead[i].Time.HighPart = 0xFFFFFFFF; - KiTimerTableListHead[i].Time.LowPart = 0; - } - - /* Initialize old-style list */ - InitializeListHead(&KiTimerListHead); - - /* Initialize the Swap event and all swap lists */ - KeInitializeEvent(&KiSwapEvent, SynchronizationEvent, FALSE); - InitializeListHead(&KiProcessInSwapListHead); - InitializeListHead(&KiProcessOutSwapListHead); - InitializeListHead(&KiStackInSwapListHead); - - /* Initialize the mutex for generic DPC calls */ - KeInitializeMutex(&KiGenericCallDpcMutex, 0); - - /* Initialize the syscall table */ - KeServiceDescriptorTable[0].Base = MainSSDT; - KeServiceDescriptorTable[0].Count = NULL; - KeServiceDescriptorTable[0].Limit = NUMBER_OF_SYSCALLS; - KeServiceDescriptorTable[1].Limit = 0; - KeServiceDescriptorTable[0].Number = MainSSPT; - - /* Copy the the current table into the shadow table for win32k */ - RtlCopyMemory(KeServiceDescriptorTableShadow, - KeServiceDescriptorTable, - sizeof(KeServiceDescriptorTable)); -} - -LARGE_INTEGER -NTAPI -KiComputeReciprocal(IN LONG Divisor, - OUT PUCHAR Shift) -{ - LARGE_INTEGER Reciprocal = {{0}}; - LONG BitCount = 0, Remainder = 1; - - /* Start by calculating the remainder */ - while (Reciprocal.HighPart >= 0) - { - /* Increase the loop (bit) count */ - BitCount++; - - /* Calculate the current fraction */ - Reciprocal.HighPart = (Reciprocal.HighPart << 1) | - (Reciprocal.LowPart >> 31); - Reciprocal.LowPart <<= 1; - - /* Double the remainder and see if we went past the divisor */ - Remainder <<= 1; - if (Remainder >= Divisor) - { - /* Set the low-bit and calculate the new remainder */ - Remainder -= Divisor; - Reciprocal.LowPart |= 1; - } - } - - /* Check if we have a remainder */ - if (Remainder) - { - /* Check if the current fraction value is too large */ - if ((Reciprocal.LowPart == 0xFFFFFFFF) && - (Reciprocal.HighPart == 0xFFFFFFFF)) - { - /* Set the high bit and reduce the bit count */ - Reciprocal.LowPart = 0; - Reciprocal.HighPart = 0x80000000; - BitCount--; - } - else - { - /* Check if only the lowest bits got too large */ - if (Reciprocal.LowPart == 0xFFFFFFFF) - { - /* Reset them and increase the high bits instead */ - Reciprocal.LowPart = 0; - Reciprocal.HighPart++; - } - else - { - /* All is well, increase the low bits */ - Reciprocal.LowPart++; - } - } - } - - /* Now calculate the actual shift and return the reciprocal */ - *Shift = (UCHAR)BitCount - 64; - return Reciprocal; -} - -VOID -NTAPI -KiInitSpinLocks(IN PKPRCB Prcb, - IN CCHAR Number) -{ - ULONG i; - - /* Initialize Dispatcher Fields */ - Prcb->QueueIndex = 1; - Prcb->ReadySummary = 0; - Prcb->DeferredReadyListHead.Next = NULL; - for (i = 0; i < 32; i++) - { - /* Initialize the ready list */ - InitializeListHead(&Prcb->DispatcherReadyListHead[i]); - } - - /* Initialize DPC Fields */ - InitializeListHead(&Prcb->DpcData[DPC_NORMAL].DpcListHead); - KeInitializeSpinLock(&Prcb->DpcData[DPC_NORMAL].DpcLock); - Prcb->DpcData[DPC_NORMAL].DpcQueueDepth = 0; - Prcb->DpcData[DPC_NORMAL].DpcCount = 0; - Prcb->DpcRoutineActive = FALSE; - Prcb->MaximumDpcQueueDepth = KiMaximumDpcQueueDepth; - Prcb->MinimumDpcRate = KiMinimumDpcRate; - Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; - KeInitializeDpc(&Prcb->CallDpc, NULL, NULL); - KeSetTargetProcessorDpc(&Prcb->CallDpc, Number); - KeSetImportanceDpc(&Prcb->CallDpc, HighImportance); - - /* Initialize the Wait List Head */ - InitializeListHead(&Prcb->WaitListHead); - - /* Initialize Queued Spinlocks */ - Prcb->LockQueue[LockQueueDispatcherLock].Next = NULL; - Prcb->LockQueue[LockQueueDispatcherLock].Lock = &KiDispatcherLock; - Prcb->LockQueue[LockQueueExpansionLock].Next = NULL; - Prcb->LockQueue[LockQueueExpansionLock].Lock = NULL; - Prcb->LockQueue[LockQueuePfnLock].Next = NULL; - Prcb->LockQueue[LockQueuePfnLock].Lock = &MmPfnLock; - Prcb->LockQueue[LockQueueSystemSpaceLock].Next = NULL; - Prcb->LockQueue[LockQueueSystemSpaceLock].Lock = &MmSystemSpaceLock; - Prcb->LockQueue[LockQueueBcbLock].Next = NULL; - Prcb->LockQueue[LockQueueBcbLock].Lock = &CcBcbSpinLock; - Prcb->LockQueue[LockQueueMasterLock].Next = NULL; - Prcb->LockQueue[LockQueueMasterLock].Lock = &CcMasterSpinLock; - Prcb->LockQueue[LockQueueVacbLock].Next = NULL; - Prcb->LockQueue[LockQueueVacbLock].Lock = &CcVacbSpinLock; - Prcb->LockQueue[LockQueueWorkQueueLock].Next = NULL; - Prcb->LockQueue[LockQueueWorkQueueLock].Lock = &CcWorkQueueSpinLock; - Prcb->LockQueue[LockQueueNonPagedPoolLock].Next = NULL; - Prcb->LockQueue[LockQueueNonPagedPoolLock].Lock = &NonPagedPoolLock; - Prcb->LockQueue[LockQueueMmNonPagedPoolLock].Next = NULL; - Prcb->LockQueue[LockQueueMmNonPagedPoolLock].Lock = &MmNonPagedPoolLock; - Prcb->LockQueue[LockQueueIoCancelLock].Next = NULL; - Prcb->LockQueue[LockQueueIoCancelLock].Lock = &IopCancelSpinLock; - Prcb->LockQueue[LockQueueIoVpbLock].Next = NULL; - Prcb->LockQueue[LockQueueIoVpbLock].Lock = &IopVpbSpinLock; - Prcb->LockQueue[LockQueueIoDatabaseLock].Next = NULL; - Prcb->LockQueue[LockQueueIoDatabaseLock].Lock = &IopDatabaseLock; - Prcb->LockQueue[LockQueueIoCompletionLock].Next = NULL; - Prcb->LockQueue[LockQueueIoCompletionLock].Lock = &IopCompletionLock; - Prcb->LockQueue[LockQueueNtfsStructLock].Next = NULL; - Prcb->LockQueue[LockQueueNtfsStructLock].Lock = &NtfsStructLock; - Prcb->LockQueue[LockQueueAfdWorkQueueLock].Next = NULL; - Prcb->LockQueue[LockQueueAfdWorkQueueLock].Lock = &AfdWorkQueueSpinLock; - Prcb->LockQueue[LockQueueUnusedSpare16].Next = NULL; - Prcb->LockQueue[LockQueueUnusedSpare16].Lock = NULL; - - /* Loop timer locks */ - for (i = 0; i < LOCK_QUEUE_TIMER_TABLE_LOCKS; i++) - { - /* Initialize the lock and setup the Queued Spinlock */ - KeInitializeSpinLock(&KiTimerTableLock[i]); - Prcb->LockQueue[i].Next = NULL; - Prcb->LockQueue[i].Lock = &KiTimerTableLock[i]; - } - - /* Check if this is the boot CPU */ - if (!Number) - { - /* Initialize the lock themselves */ - KeInitializeSpinLock(&KiDispatcherLock); - KeInitializeSpinLock(&KiReverseStallIpiLock); - KeInitializeSpinLock(&MmPfnLock); - KeInitializeSpinLock(&MmSystemSpaceLock); - KeInitializeSpinLock(&CcBcbSpinLock); - KeInitializeSpinLock(&CcMasterSpinLock); - KeInitializeSpinLock(&CcVacbSpinLock); - KeInitializeSpinLock(&CcWorkQueueSpinLock); - KeInitializeSpinLock(&IopCancelSpinLock); - KeInitializeSpinLock(&IopCompletionLock); - KeInitializeSpinLock(&IopDatabaseLock); - KeInitializeSpinLock(&IopVpbSpinLock); - KeInitializeSpinLock(&NonPagedPoolLock); - KeInitializeSpinLock(&MmNonPagedPoolLock); - KeInitializeSpinLock(&NtfsStructLock); - KeInitializeSpinLock(&AfdWorkQueueSpinLock); - KeInitializeDispatcher(); // ROS OLD DISPATCHER - } -} VOID NTAPI @@ -560,63 +304,3 @@ LoaderBlock); } -VOID -INIT_FUNCTION -NTAPI -KeInit2(VOID) -{ - ULONG Protect; - - /* Check if Fxsr was found */ - if (KeI386FxsrPresent) - { - /* Enable it. FIXME: Send an IPI */ - Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSFXSR); - - /* Check if XMM was found too */ - if (KeI386XMMIPresent) - { - /* Enable it: FIXME: Send an IPI. */ - Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSXMMEXCPT); - - /* FIXME: Implement and enable XMM Page Zeroing for Mm */ - } - } - - if (KeFeatureBits & KF_GLOBAL_PAGE) - { - ULONG Flags; - /* Enable global pages */ - Ke386GlobalPagesEnabled = TRUE; - Ke386SaveFlags(Flags); - Ke386DisableInterrupts(); - Ke386SetCr4(Ke386GetCr4() | X86_CR4_PGE); - Ke386RestoreFlags(Flags); - } - - if (KeFeatureBits & KF_FAST_SYSCALL) - { - extern void KiFastCallEntry(void); - - /* CS Selector of the target segment. */ - Ke386Wrmsr(0x174, KGDT_R0_CODE, 0); - /* Target ESP. */ - Ke386Wrmsr(0x175, 0, 0); - /* Target EIP. */ - Ke386Wrmsr(0x176, (ULONG_PTR)KiFastCallEntry, 0); - } - - /* Does the CPU Support 'prefetchnta' (SSE) */ - if(KeFeatureBits & KF_XMMI) - { - Protect = MmGetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal); - MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect | PAGE_IS_WRITABLE); - /* Replace the ret by a nop */ - *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; - MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect); - } - - /* Set IDT to writable */ - Protect = MmGetPageProtect(NULL, (PVOID)KiIdt); - MmSetPageProtect(NULL, (PVOID)KiIdt, Protect | PAGE_IS_WRITABLE); -} Removed: trunk/reactos/ntoskrnl/ke/i386/main_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/main_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/main_asm.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/main_asm.S (removed) @@ -1,45 +1,0 @@ -/* - * FILE: ntoskrnl/ke/i386/main_asm.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: Kernel Bootstrap Code - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.h> -.intel_syntax noprefix - -/* GLOBALS *******************************************************************/ - -.bss -.align 16 - -/* Kernel Boot Stack */ -.globl _P0BootStack -.space KERNEL_STACK_SIZE -_P0BootStack: - -/* Kernel Double-Fault and Temporary DPC Stack */ -.globl _KiDoubleFaultStack -.space KERNEL_STACK_SIZE -_KiDoubleFaultStack: - -/* FUNCTIONS *****************************************************************/ - -.text -.func NtProcessStartup -_NtProcessStartup: - - /* Load the initial kernel stack */ - lea eax, _P0BootStack - sub eax, (NPX_FRAME_LENGTH + KTRAP_FRAME_LENGTH + KTRAP_FRAME_ALIGN) - mov esp, eax - - /* Save initial CR0 state */ - push CR0_EM + CR0_TS + CR0_MP - - /* Call the main kernel initialization */ - push edx - call _KiRosPrepareForSystemStartup@4 -.endfunc Added: trunk/reactos/ntoskrnl/ke/krnlinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/krnlinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/krnlinit.c (added) +++ trunk/reactos/ntoskrnl/ke/krnlinit.c Mon Sep 4 01:06:30 2006 @@ -1,0 +1,330 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/krnlinit.c + * PURPOSE: Portable part of kernel initialization + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> +#include <internal/napi.h> + +/* GLOBALS *******************************************************************/ + +/* PRCB Array */ +PKPRCB KiProcessorBlock[MAXIMUM_PROCESSORS]; + +/* NUMA Node Support */ +KNODE KiNode0; +PKNODE KeNodeBlock[1]; +UCHAR KeNumberNodes = 1; +UCHAR KeProcessNodeSeed; + +/* Initial Process and Thread */ +ETHREAD KiInitialThread; +EPROCESS KiInitialProcess; + +/* System-defined Spinlocks */ +KSPIN_LOCK KiDispatcherLock; +KSPIN_LOCK MmPfnLock; +KSPIN_LOCK MmSystemSpaceLock; +KSPIN_LOCK CcBcbSpinLock; +KSPIN_LOCK CcMasterSpinLock; +KSPIN_LOCK CcVacbSpinLock; +KSPIN_LOCK CcWorkQueueSpinLock; +KSPIN_LOCK NonPagedPoolLock; +KSPIN_LOCK MmNonPagedPoolLock; +KSPIN_LOCK IopCancelSpinLock; +KSPIN_LOCK IopVpbSpinLock; +KSPIN_LOCK IopDatabaseLock; +KSPIN_LOCK IopCompletionLock; +KSPIN_LOCK NtfsStructLock; +KSPIN_LOCK AfdWorkQueueSpinLock; +KSPIN_LOCK KiTimerTableLock[16]; +KSPIN_LOCK KiReverseStallIpiLock; + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +KiInitSystem(VOID) +{ + ULONG i; + + /* Initialize Bugcheck Callback data */ + InitializeListHead(&BugcheckCallbackListHead); + InitializeListHead(&BugcheckReasonCallbackListHead); + KeInitializeSpinLock(&BugCheckCallbackLock); + + /* Initialize the Timer Expiration DPC */ + KeInitializeDpc(&KiExpireTimerDpc, KiExpireTimers, NULL); + KeSetTargetProcessorDpc(&KiExpireTimerDpc, 0); + + /* Initialize Profiling data */ + KeInitializeSpinLock(&KiProfileLock); + InitializeListHead(&KiProfileListHead); + InitializeListHead(&KiProfileSourceListHead); + + /* Loop the timer table */ + for (i = 0; i < TIMER_TABLE_SIZE; i++) + { + /* Initialize the list and entries */ + InitializeListHead(&KiTimerTableListHead[i].Entry); + KiTimerTableListHead[i].Time.HighPart = 0xFFFFFFFF; + KiTimerTableListHead[i].Time.LowPart = 0; + } + + /* Initialize old-style list */ + InitializeListHead(&KiTimerListHead); + + /* Initialize the Swap event and all swap lists */ + KeInitializeEvent(&KiSwapEvent, SynchronizationEvent, FALSE); + InitializeListHead(&KiProcessInSwapListHead); + InitializeListHead(&KiProcessOutSwapListHead); + InitializeListHead(&KiStackInSwapListHead); + + /* Initialize the mutex for generic DPC calls */ + KeInitializeMutex(&KiGenericCallDpcMutex, 0); + + /* Initialize the syscall table */ + KeServiceDescriptorTable[0].Base = MainSSDT; + KeServiceDescriptorTable[0].Count = NULL; + KeServiceDescriptorTable[0].Limit = NUMBER_OF_SYSCALLS; + KeServiceDescriptorTable[1].Limit = 0; + KeServiceDescriptorTable[0].Number = MainSSPT; + + /* Copy the the current table into the shadow table for win32k */ + RtlCopyMemory(KeServiceDescriptorTableShadow, + KeServiceDescriptorTable, + sizeof(KeServiceDescriptorTable)); +} + +LARGE_INTEGER +NTAPI +KiComputeReciprocal(IN LONG Divisor, + OUT PUCHAR Shift) +{ + LARGE_INTEGER Reciprocal = {{0}}; + LONG BitCount = 0, Remainder = 1; + + /* Start by calculating the remainder */ + while (Reciprocal.HighPart >= 0) + { + /* Increase the loop (bit) count */ + BitCount++; + + /* Calculate the current fraction */ + Reciprocal.HighPart = (Reciprocal.HighPart << 1) | + (Reciprocal.LowPart >> 31); + Reciprocal.LowPart <<= 1; + + /* Double the remainder and see if we went past the divisor */ + Remainder <<= 1; + if (Remainder >= Divisor) + { + /* Set the low-bit and calculate the new remainder */ + Remainder -= Divisor; + Reciprocal.LowPart |= 1; + } + } + + /* Check if we have a remainder */ + if (Remainder) + { + /* Check if the current fraction value is too large */ + if ((Reciprocal.LowPart == 0xFFFFFFFF) && + (Reciprocal.HighPart == 0xFFFFFFFF)) + { + /* Set the high bit and reduce the bit count */ + Reciprocal.LowPart = 0; + Reciprocal.HighPart = 0x80000000; + BitCount--; + } + else + { + /* Check if only the lowest bits got too large */ + if (Reciprocal.LowPart == 0xFFFFFFFF) + { + /* Reset them and increase the high bits instead */ + Reciprocal.LowPart = 0; + Reciprocal.HighPart++; + } + else + { + /* All is well, increase the low bits */ + Reciprocal.LowPart++; + } + } + } + + /* Now calculate the actual shift and return the reciprocal */ + *Shift = (UCHAR)BitCount - 64; + return Reciprocal; +} + +VOID +NTAPI +KiInitSpinLocks(IN PKPRCB Prcb, + IN CCHAR Number) +{ + ULONG i; + + /* Initialize Dispatcher Fields */ + Prcb->QueueIndex = 1; + Prcb->ReadySummary = 0; + Prcb->DeferredReadyListHead.Next = NULL; + for (i = 0; i < 32; i++) + { + /* Initialize the ready list */ + InitializeListHead(&Prcb->DispatcherReadyListHead[i]); + } + + /* Initialize DPC Fields */ + InitializeListHead(&Prcb->DpcData[DPC_NORMAL].DpcListHead); + KeInitializeSpinLock(&Prcb->DpcData[DPC_NORMAL].DpcLock); + Prcb->DpcData[DPC_NORMAL].DpcQueueDepth = 0; + Prcb->DpcData[DPC_NORMAL].DpcCount = 0; + Prcb->DpcRoutineActive = FALSE; + Prcb->MaximumDpcQueueDepth = KiMaximumDpcQueueDepth; + Prcb->MinimumDpcRate = KiMinimumDpcRate; + Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; + KeInitializeDpc(&Prcb->CallDpc, NULL, NULL); + KeSetTargetProcessorDpc(&Prcb->CallDpc, Number); + KeSetImportanceDpc(&Prcb->CallDpc, HighImportance); + + /* Initialize the Wait List Head */ + InitializeListHead(&Prcb->WaitListHead); + + /* Initialize Queued Spinlocks */ + Prcb->LockQueue[LockQueueDispatcherLock].Next = NULL; + Prcb->LockQueue[LockQueueDispatcherLock].Lock = &KiDispatcherLock; + Prcb->LockQueue[LockQueueExpansionLock].Next = NULL; + Prcb->LockQueue[LockQueueExpansionLock].Lock = NULL; + Prcb->LockQueue[LockQueuePfnLock].Next = NULL; + Prcb->LockQueue[LockQueuePfnLock].Lock = &MmPfnLock; + Prcb->LockQueue[LockQueueSystemSpaceLock].Next = NULL; + Prcb->LockQueue[LockQueueSystemSpaceLock].Lock = &MmSystemSpaceLock; + Prcb->LockQueue[LockQueueBcbLock].Next = NULL; + Prcb->LockQueue[LockQueueBcbLock].Lock = &CcBcbSpinLock; + Prcb->LockQueue[LockQueueMasterLock].Next = NULL; + Prcb->LockQueue[LockQueueMasterLock].Lock = &CcMasterSpinLock; + Prcb->LockQueue[LockQueueVacbLock].Next = NULL; + Prcb->LockQueue[LockQueueVacbLock].Lock = &CcVacbSpinLock; + Prcb->LockQueue[LockQueueWorkQueueLock].Next = NULL; + Prcb->LockQueue[LockQueueWorkQueueLock].Lock = &CcWorkQueueSpinLock; + Prcb->LockQueue[LockQueueNonPagedPoolLock].Next = NULL; + Prcb->LockQueue[LockQueueNonPagedPoolLock].Lock = &NonPagedPoolLock; + Prcb->LockQueue[LockQueueMmNonPagedPoolLock].Next = NULL; + Prcb->LockQueue[LockQueueMmNonPagedPoolLock].Lock = &MmNonPagedPoolLock; + Prcb->LockQueue[LockQueueIoCancelLock].Next = NULL; + Prcb->LockQueue[LockQueueIoCancelLock].Lock = &IopCancelSpinLock; + Prcb->LockQueue[LockQueueIoVpbLock].Next = NULL; + Prcb->LockQueue[LockQueueIoVpbLock].Lock = &IopVpbSpinLock; + Prcb->LockQueue[LockQueueIoDatabaseLock].Next = NULL; + Prcb->LockQueue[LockQueueIoDatabaseLock].Lock = &IopDatabaseLock; + Prcb->LockQueue[LockQueueIoCompletionLock].Next = NULL; + Prcb->LockQueue[LockQueueIoCompletionLock].Lock = &IopCompletionLock; + Prcb->LockQueue[LockQueueNtfsStructLock].Next = NULL; + Prcb->LockQueue[LockQueueNtfsStructLock].Lock = &NtfsStructLock; + Prcb->LockQueue[LockQueueAfdWorkQueueLock].Next = NULL; + Prcb->LockQueue[LockQueueAfdWorkQueueLock].Lock = &AfdWorkQueueSpinLock; + Prcb->LockQueue[LockQueueUnusedSpare16].Next = NULL; + Prcb->LockQueue[LockQueueUnusedSpare16].Lock = NULL; + + /* Loop timer locks */ + for (i = 0; i < LOCK_QUEUE_TIMER_TABLE_LOCKS; i++) + { + /* Initialize the lock and setup the Queued Spinlock */ + KeInitializeSpinLock(&KiTimerTableLock[i]); + Prcb->LockQueue[i].Next = NULL; + Prcb->LockQueue[i].Lock = &KiTimerTableLock[i]; + } + + /* Check if this is the boot CPU */ + if (!Number) + { + /* Initialize the lock themselves */ + KeInitializeSpinLock(&KiDispatcherLock); + KeInitializeSpinLock(&KiReverseStallIpiLock); + KeInitializeSpinLock(&MmPfnLock); + KeInitializeSpinLock(&MmSystemSpaceLock); + KeInitializeSpinLock(&CcBcbSpinLock); + KeInitializeSpinLock(&CcMasterSpinLock); + KeInitializeSpinLock(&CcVacbSpinLock); + KeInitializeSpinLock(&CcWorkQueueSpinLock); + KeInitializeSpinLock(&IopCancelSpinLock); + KeInitializeSpinLock(&IopCompletionLock); + KeInitializeSpinLock(&IopDatabaseLock); + KeInitializeSpinLock(&IopVpbSpinLock); + KeInitializeSpinLock(&NonPagedPoolLock); + KeInitializeSpinLock(&MmNonPagedPoolLock); + KeInitializeSpinLock(&NtfsStructLock); + KeInitializeSpinLock(&AfdWorkQueueSpinLock); + KeInitializeDispatcher(); // ROS OLD DISPATCHER + } +} + +/* FIXME: Rename and make portable */ +VOID +NTAPI +KeInit2(VOID) +{ + ULONG Protect; + + /* Check if Fxsr was found */ + if (KeI386FxsrPresent) + { + /* Enable it. FIXME: Send an IPI */ + Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSFXSR); + + /* Check if XMM was found too */ + if (KeI386XMMIPresent) + { + /* Enable it: FIXME: Send an IPI. */ + Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSXMMEXCPT); + + /* FIXME: Implement and enable XMM Page Zeroing for Mm */ + } + } + + if (KeFeatureBits & KF_GLOBAL_PAGE) + { + ULONG Flags; + /* Enable global pages */ + Ke386GlobalPagesEnabled = TRUE; + Ke386SaveFlags(Flags); + Ke386DisableInterrupts(); + Ke386SetCr4(Ke386GetCr4() | X86_CR4_PGE); + Ke386RestoreFlags(Flags); + } + + if (KeFeatureBits & KF_FAST_SYSCALL) + { + extern void KiFastCallEntry(void); + + /* CS Selector of the target segment. */ + Ke386Wrmsr(0x174, KGDT_R0_CODE, 0); + /* Target ESP. */ + Ke386Wrmsr(0x175, 0, 0); + /* Target EIP. */ + Ke386Wrmsr(0x176, (ULONG_PTR)KiFastCallEntry, 0); + } + + /* Does the CPU Support 'prefetchnta' (SSE) */ + if(KeFeatureBits & KF_XMMI) + { + Protect = MmGetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal); + MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect | PAGE_IS_WRITABLE); + /* Replace the ret by a nop */ + *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; + MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect); + } + + /* Set IDT to writable */ + Protect = MmGetPageProtect(NULL, (PVOID)KiIdt); + MmSetPageProtect(NULL, (PVOID)KiIdt, Protect | PAGE_IS_WRITABLE); +} Removed: trunk/reactos/ntoskrnl/ke/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/main.c?rev=239… ============================================================================== --- trunk/reactos/ntoskrnl/ke/main.c (original) +++ trunk/reactos/ntoskrnl/ke/main.c (removed) @@ -1,233 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/main.c - * PURPOSE: Initalizes the kernel - * - * PROGRAMMERS: Alex Ionescu (cleaned up code, moved Executiv stuff to ex/init.c) - * David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* GLOBALS *******************************************************************/ - -#define BUILD_OSCSDVERSION(major, minor) (((major & 0xFF) << 8) | (minor & 0xFF)) - - -ULONG NtMajorVersion = 5; -ULONG NtMinorVersion = 0; -ULONG NtOSCSDVersion = BUILD_OSCSDVERSION(4, 0); -ULONG NtBuildNumber = KERNEL_VERSION_BUILD; -ULONG NtGlobalFlag = 0; -CHAR KeNumberProcessors; -KAFFINITY KeActiveProcessors = 1; -ROS_LOADER_PARAMETER_BLOCK KeLoaderBlock; -ULONG KeDcacheFlushCount = 0; -ULONG KeIcacheFlushCount = 0; -ULONG KiDmaIoCoherency = 0; /* RISC Architectures only */ -ULONG InitSafeBootMode = 0; /* KB83764 */ - -LOADER_MODULE KeLoaderModules[64]; -static CHAR KeLoaderModuleStrings[64][256]; -static CHAR KeLoaderCommandLine[256]; -ADDRESS_RANGE KeMemoryMap[64]; -ULONG KeMemoryMapRangeCount; -ULONG_PTR FirstKrnlPhysAddr; -ULONG_PTR LastKrnlPhysAddr; -ULONG_PTR LastKernelAddress; - -PVOID KeUserApcDispatcher = NULL; -PVOID KeUserCallbackDispatcher = NULL; -PVOID KeUserExceptionDispatcher = NULL; -PVOID KeRaiseUserExceptionDispatcher = NULL; - -ULONG KeLargestCacheLine = 0x40; /* FIXME: Arch-specific */ - -/* Cached modules from the loader block */ -PLOADER_MODULE CachedModules[MaximumCachedModuleType]; - -extern unsigned int _image_base__; -ULONG_PTR KERNEL_BASE = (ULONG_PTR)&_image_base__; - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, _main) -#endif - -extern LDR_DATA_TABLE_ENTRY HalModuleObject; - -/* FUNCTIONS ****************************************************************/ - -/* - * @implemented - */ -ULONG -STDCALL -KeGetRecommendedSharedDataAlignment(VOID) -{ - return KeLargestCacheLine; -} - -VOID -NTAPI -KiRosPrepareForSystemStartup(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) -{ - ULONG i; - ULONG size; - ULONG HalBase; - ULONG DriverBase; - ULONG DriverSize; - PIMAGE_NT_HEADERS NtHeader; - PIMAGE_OPTIONAL_HEADER OptHead; - CHAR* s; - - /* Load the GDT and IDT */ - Ke386SetGlobalDescriptorTable(KiGdtDescriptor); - Ke386SetInterruptDescriptorTable(KiIdtDescriptor); - - /* Copy the Loader Block Data locally since Low-Memory will be wiped */ - memcpy(&KeLoaderBlock, LoaderBlock, sizeof(ROS_LOADER_PARAMETER_BLOCK)); - memcpy(&KeLoaderModules[1], - (PVOID)KeLoaderBlock.ModsAddr, - sizeof(LOADER_MODULE) * KeLoaderBlock.ModsCount); - KeLoaderBlock.ModsCount++; - KeLoaderBlock.ModsAddr = (ULONG)&KeLoaderModules; - - /* Check for BIOS memory map */ - KeMemoryMapRangeCount = 0; - if (KeLoaderBlock.Flags & MB_FLAGS_MMAP_INFO) - { - /* We have a memory map from the nice BIOS */ - size = *((PULONG)(KeLoaderBlock.MmapAddr - sizeof(ULONG))); - i = 0; - - /* Map it until we run out of size */ - while (i < KeLoaderBlock.MmapLength) - { - /* Copy into the Kernel Memory Map */ - memcpy (&KeMemoryMap[KeMemoryMapRangeCount], - (PVOID)(KeLoaderBlock.MmapAddr + i), - sizeof(ADDRESS_RANGE)); - - /* Increase Memory Map Count */ - KeMemoryMapRangeCount++; - - /* Increase Size */ - i += size; - } - - /* Save data */ - KeLoaderBlock.MmapLength = KeMemoryMapRangeCount * sizeof(ADDRESS_RANGE); - KeLoaderBlock.MmapAddr = (ULONG)KeMemoryMap; - } - else - { - /* Nothing from BIOS */ - KeLoaderBlock.MmapLength = 0; - KeLoaderBlock.MmapAddr = (ULONG)KeMemoryMap; - } - - /* Save the Base Address */ - MmSystemRangeStart = (PVOID)KeLoaderBlock.KernelBase; - - /* Set the Command Line */ - strcpy(KeLoaderCommandLine, (PCHAR)LoaderBlock->CommandLine); - KeLoaderBlock.CommandLine = (ULONG)KeLoaderCommandLine; - - /* Write the first Module (the Kernel) */ - strcpy(KeLoaderModuleStrings[0], "ntoskrnl.exe"); - KeLoaderModules[0].String = (ULONG)KeLoaderModuleStrings[0]; - KeLoaderModules[0].ModStart = KERNEL_BASE; - - /* Read PE Data */ - NtHeader = RtlImageNtHeader((PVOID)KeLoaderModules[0].ModStart); - OptHead = &NtHeader->OptionalHeader; - - /* Set Kernel Ending */ - KeLoaderModules[0].ModEnd = KeLoaderModules[0].ModStart + PAGE_ROUND_UP((ULONG)OptHead->SizeOfImage); - - /* Create a block for each module */ - for (i = 1; i < KeLoaderBlock.ModsCount; i++) - { - /* Check if we have to copy the path or not */ - if ((s = strrchr((PCHAR)KeLoaderModules[i].String, '/')) != 0) - { - strcpy(KeLoaderModuleStrings[i], s + 1); - } - else - { - strcpy(KeLoaderModuleStrings[i], (PCHAR)KeLoaderModules[i].String); - } - - /* Substract the base Address in Physical Memory */ - KeLoaderModules[i].ModStart -= 0x200000; - - /* Add the Kernel Base Address in Virtual Memory */ - KeLoaderModules[i].ModStart += KERNEL_BASE; - - /* Substract the base Address in Physical Memory */ - KeLoaderModules[i].ModEnd -= 0x200000; - - /* Add the Kernel Base Address in Virtual Memory */ - KeLoaderModules[i].ModEnd += KERNEL_BASE; - - /* Select the proper String */ - KeLoaderModules[i].String = (ULONG)KeLoaderModuleStrings[i]; - } - - /* Choose last module address as the final kernel address */ - LastKernelAddress = PAGE_ROUND_UP(KeLoaderModules[KeLoaderBlock.ModsCount - 1].ModEnd); - - /* Select the HAL Base */ - HalBase = KeLoaderModules[1].ModStart; - - /* Choose Driver Base */ - DriverBase = LastKernelAddress; - LdrHalBase = (ULONG_PTR)DriverBase; - - /* Initialize Module Management */ - LdrInitModuleManagement(); - - /* Load HAL.DLL with the PE Loader */ - LdrSafePEProcessModule((PVOID)HalBase, - (PVOID)DriverBase, - (PVOID)KERNEL_BASE, - &DriverSize); - - // - // - // HACK HACK HACK WHEN WILL YOU PEOPLE FIX FREELDR?!?!?! - // FREELDR SENDS US AN ***INVALID*** HAL PE HEADER!!! - // WE READ IT IN LdrInitModuleManagement ABOVE!!! - // WE SET .SizeOfImage TO A *GARBAGE* VALUE!!! - // - // This dirty hack fixes it, and should make symbol lookup work too. - // - HalModuleObject.SizeOfImage = RtlImageNtHeader((PVOID)HalModuleObject.DllBase)->OptionalHeader.SizeOfImage; - - /* Increase the last kernel address with the size of HAL */ - LastKernelAddress += PAGE_ROUND_UP(DriverSize); - - /* Now select the final beginning and ending Kernel Addresses */ - FirstKrnlPhysAddr = KeLoaderModules[0].ModStart - KERNEL_BASE + 0x200000; - LastKrnlPhysAddr = LastKernelAddress - KERNEL_BASE + 0x200000; - - /* Setup the IDT */ - KeInitExceptions(); // ONCE HACK BELOW IS GONE, MOVE TO KISYSTEMSTARTUP! - KeInitInterrupts(); // ROS HACK DEPRECATED SOON BY NEW HAL - - /* Load the Kernel with the PE Loader */ - LdrSafePEProcessModule((PVOID)KERNEL_BASE, - (PVOID)KERNEL_BASE, - (PVOID)DriverBase, - &DriverSize); - - /* Do general System Startup */ - KiSystemStartup(LoaderBlock); -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/ke/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/process.c (original) +++ trunk/reactos/ntoskrnl/ke/process.c Mon Sep 4 01:06:30 2006 @@ -7,13 +7,13 @@ * Gregor Anich */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ********(*********************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> -/* GLOBALS *****************************************************************/ +/* GLOBALS *******************************************************************/ LIST_ENTRY KiProcessListHead; LIST_ENTRY KiProcessInSwapListHead, KiProcessOutSwapListHead; @@ -22,6 +22,11 @@ KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[SSDT_MAX_ENTRIES]; KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES]; + +PVOID KeUserApcDispatcher; +PVOID KeUserCallbackDispatcher; +PVOID KeUserExceptionDispatcher; +PVOID KeRaiseUserExceptionDispatcher; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Mon Sep 4 01:06:30 2006 @@ -70,7 +70,6 @@ extern BOOLEAN Ke386Pae; extern BOOLEAN Ke386NoExecute; -extern BOOLEAN Ke386GlobalPagesEnabled; /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon Sep 4 01:06:30 2006 @@ -26,14 +26,14 @@ <directory name="ke"> <if property="ARCH" value="i386"> <directory name="i386"> - <file first="true">main_asm.S</file> + <file first="true">boot.S</file> <file>abios.c</file> <file>cpu.c</file> <file>ctxswitch.S</file> <file>clock.S</file> <file>exp.c</file>  - <file>kernel.c</file> + <file>kiinit.c</file> <file>ldt.c</file> <file>thread.c</file> <file>trap.s</file> @@ -49,12 +49,13 @@ <file>dpc.c</file> <file>event.c</file> <file>exception.c</file> + <file>freeldr.c</file> <file>gate.c</file> <file>gmutex.c</file> <file>ipi.c</file> <file>kqueue.c</file> + <file>krnlinit.c</file> <file>kthread.c</file> - <file>main.c</file> <file>mutex.c</file> <file>process.c</file> <file>profile.c</file>

1 0

[hpoussin] 23902: Reorder the file Add some more defines/typdefs from Wine sspi.h Fix a few typos
by hpoussin＠svn.reactos.org 03 Sep '06

03 Sep '06

Author: hpoussin Date: Mon Sep 4 01:02:09 2006 New Revision: 23902 URL: http://svn.reactos.org/svn/reactos?rev=23902&view=rev Log: Reorder the file Add some more defines/typdefs from Wine sspi.h Fix a few typos Modified: trunk/reactos/include/psdk/sspi.h Modified: trunk/reactos/include/psdk/sspi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sspi.h?rev=23… ============================================================================== --- trunk/reactos/include/psdk/sspi.h (original) +++ trunk/reactos/include/psdk/sspi.h Mon Sep 4 01:02:09 2006 @@ -1,338 +1,828 @@ -#ifndef _SSPI_H -#define _SSPI_H +/* + * Copyright (C) 2004 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __WINE_SSPI_H__ +#define __WINE_SSPI_H__ + #if __GNUC__ >=3 #pragma GCC system_header #endif +#include <wtypes.h> + #ifdef __cplusplus extern "C" { #endif -#define SECPKG_CRED_INBOUND 1 -#define SECPKG_CRED_OUTBOUND 2 -#define SECPKG_CRED_BOTH (SECPKG_CRED_OUTBOUND|SECPKG_CRED_INBOUND) -#define SECPKG_CRED_ATTR_NAMES 1 - -#define SECPKG_FLAG_INTEGRITY 1 -#define SECPKG_FLAG_PRIVACY 2 -#define SECPKG_FLAG_TOKEN_ONLY 4 -#define SECPKG_FLAG_DATAGRAM 8 -#define SECPKG_FLAG_CONNECTION 16 -#define SECPKG_FLAG_MULTI_REQUIRED 32 -#define SECPKG_FLAG_CLIENT_ONLY 64 -#define SECPKG_FLAG_EXTENDED_ERROR 128 -#define SECPKG_FLAG_IMPERSONATION 256 -#define SECPKG_FLAG_ACCEPT_WIN32_NAME 512 -#define SECPKG_FLAG_STREAM 1024 - -#define SECPKG_ATTR_AUTHORITY 6 -#define SECPKG_ATTR_CONNECTION_INFO 90 -#define SECPKG_ATTR_ISSUER_LIST 80 -#define SECPKG_ATTR_ISSUER_LIST_EX 89 -#define SECPKG_ATTR_KEY_INFO 5 -#define SECPKG_ATTR_LIFESPAN 2 -#define SECPKG_ATTR_LOCAL_CERT_CONTEXT 84 -#define SECPKG_ATTR_LOCAL_CRED 82 -#define SECPKG_ATTR_NAMES 1 -#define SECPKG_ATTR_PROTO_INFO 7 -#define SECPKG_ATTR_REMOTE_CERT_CONTEXT 83 -#define SECPKG_ATTR_REMOTE_CRED 81 -#define SECPKG_ATTR_SIZES 0 -#define SECPKG_ATTR_STREAM_SIZES 4 - -#define SECBUFFER_EMPTY 0 -#define SECBUFFER_DATA 1 -#define SECBUFFER_TOKEN 2 -#define SECBUFFER_PKG_PARAMS 3 -#define SECBUFFER_MISSING 4 -#define SECBUFFER_EXTRA 5 -#define SECBUFFER_STREAM_TRAILER 6 -#define SECBUFFER_STREAM_HEADER 7 -#define SECBUFFER_PADDING 9 -#define SECBUFFER_STREAM 10 -#define SECBUFFER_READONLY 0x80000000 -#define SECBUFFER_ATTRMASK 0xf0000000 +#define SEC_ENTRY WINAPI + +typedef WCHAR SEC_WCHAR; +typedef CHAR SEC_CHAR; + +#ifndef __SECSTATUS_DEFINED__ +#define __SECSTATUS_DEFINED__ +typedef LONG SECURITY_STATUS; +#endif #define UNISP_NAME_A "Microsoft Unified Security Protocol Provider" #define UNISP_NAME_W L"Microsoft Unified Security Protocol Provider" -#define SECBUFFER_VERSION 0 - -typedef struct _SecHandle { - ULONG_PTR dwLower; - ULONG_PTR dwUpper; +#define UNISP_NAME WINELIB_NAME_AW(UNISP_NAME_) + +#ifdef UNICODE +typedef SEC_WCHAR * SECURITY_PSTR; +typedef CONST SEC_WCHAR * SECURITY_PCSTR; +#else +typedef SEC_CHAR * SECURITY_PSTR; +typedef CONST SEC_CHAR * SECURITY_PCSTR; +#endif + +#ifndef __SECHANDLE_DEFINED__ +#define __SECHANDLE_DEFINED__ +typedef struct _SecHandle +{ + ULONG_PTR dwLower; + ULONG_PTR dwUpper; } SecHandle, *PSecHandle; -typedef struct _SecBuffer { - ULONG cbBuffer; - ULONG BufferType; - PVOID pvBuffer; -} SecBuffer, *PSecBuffer; +#endif + +#define SecInvalidateHandle(x) do { \ + ((PSecHandle)(x))->dwLower = ((ULONG_PTR)((INT_PTR)-1)); \ + ((PSecHandle)(x))->dwUpper = ((ULONG_PTR)((INT_PTR)-1)); \ + while (0) + +#define SecIsValidHandle(x) \ + ((((PSecHandle)(x))->dwLower != ((ULONG_PTR)(INT_PTR)-1)) && \ + (((PSecHandle)(x))->dwUpper != ((ULONG_PTR)(INT_PTR)-1))) + typedef SecHandle CredHandle; typedef PSecHandle PCredHandle; + typedef SecHandle CtxtHandle; typedef PSecHandle PCtxtHandle; -typedef struct _SECURITY_INTEGER { - unsigned long LowPart; - long HighPart; -} SECURITY_INTEGER; + +typedef struct _SECURITY_INTEGER +{ + unsigned long LowPart; + long HighPart; +} SECURITY_INTEGER, *PSECURITY_INTEGER; typedef SECURITY_INTEGER TimeStamp, *PTimeStamp; -typedef struct _SecBufferDesc { - ULONG ulVersion; - ULONG cBuffers; - PSecBuffer pBuffers; + +typedef struct _SecPkgInfoA +{ + unsigned long fCapabilities; + unsigned short wVersion; + unsigned short wRPCID; + unsigned long cbMaxToken; + SEC_CHAR *Name; + SEC_CHAR *Comment; +} SecPkgInfoA, *PSecPkgInfoA; + +typedef struct _SecPkgInfoW +{ + unsigned long fCapabilities; + unsigned short wVersion; + unsigned short wRPCID; + unsigned long cbMaxToken; + SEC_WCHAR *Name; + SEC_WCHAR *Comment; +} SecPkgInfoW, *PSecPkgInfoW; + +#define SecPkgInfo WINELIB_NAME_AW(SecPkgInfo) +#define PSecPkgInfo WINELIB_NAME_AW(PSecPkgInfo) + +/* fCapabilities field of SecPkgInfo */ +#define SECPKG_FLAG_INTEGRITY 0x00000001 +#define SECPKG_FLAG_PRIVACY 0x00000002 +#define SECPKG_FLAG_TOKEN_ONLY 0x00000004 +#define SECPKG_FLAG_DATAGRAM 0x00000008 +#define SECPKG_FLAG_CONNECTION 0x00000010 +#define SECPKG_FLAG_MULTI_REQUIRED 0x00000020 +#define SECPKG_FLAG_CLIENT_ONLY 0x00000040 +#define SECPKG_FLAG_EXTENDED_ERROR 0x00000080 +#define SECPKG_FLAG_IMPERSONATION 0x00000100 +#define SECPKG_FLAG_ACCEPT_WIN32_NAME 0x00000200 +#define SECPKG_FLAG_STREAM 0x00000400 +#define SECPKG_FLAG_NEGOTIABLE 0x00000800 +#define SECPKG_FLAG_GSS_COMPATIBLE 0x00001000 +#define SECPKG_FLAG_LOGON 0x00002000 +#define SECPKG_FLAG_ASCII_BUFFERS 0x00004000 +#define SECPKG_FLAG_FRAGMENT 0x00008000 +#define SECPKG_FLAG_MUTUAL_AUTH 0x00010000 +#define SECPKG_FLAG_DELEGATION 0x00020000 +#define SECPKG_FLAG_READONLY_WITH_CHECKSUM 0x00040000 + +typedef struct _SecBuffer +{ + unsigned long cbBuffer; + unsigned long BufferType; + void *pvBuffer; +} SecBuffer, *PSecBuffer; + +/* values for BufferType */ +#define SECBUFFER_EMPTY 0 +#define SECBUFFER_DATA 1 +#define SECBUFFER_TOKEN 2 +#define SECBUFFER_PKG_PARAMS 3 +#define SECBUFFER_MISSING 4 +#define SECBUFFER_EXTRA 5 +#define SECBUFFER_STREAM_TRAILER 6 +#define SECBUFFER_STREAM_HEADER 7 +#define SECBUFFER_NEGOTIATION_INFO 8 +#define SECBUFFER_PADDING 9 +#define SECBUFFER_STREAM 10 +#define SECBUFFER_MECHLIST 11 +#define SECBUFFER_MECHLIST_SIGNATURE 12 +#define SECBUFFER_TARGET 13 +#define SECBUFFER_CHANNEL_BINDINGS 14 + +#define SECBUFFER_ATTRMASK 0xf0000000 +#define SECBUFFER_READONLY 0x80000000 +#define SECBUFFER_READONLY_WITH_CHECKSUM 0x10000000 +#define SECBUFFER_RESERVED 0x60000000 + +typedef struct _SecBufferDesc +{ + unsigned long ulVersion; + unsigned long cBuffers; + PSecBuffer pBuffers; } SecBufferDesc, *PSecBufferDesc; -typedef struct _SecPkgContext_StreamSizes { - ULONG cbHeader; - ULONG cbTrailer; - ULONG cbMaximumMessage; - ULONG cBuffers; - ULONG cbBlockSize; + +/* values for ulVersion */ +#define SECBUFFER_VERSION 0 + +typedef void (SEC_ENTRY *SEC_GET_KEY_FN)(void *Arg, void *Principal, + unsigned long KeyVer, void **Key, SECURITY_STATUS *Status); + +SECURITY_STATUS SEC_ENTRY EnumerateSecurityPackagesA(PULONG pcPackages, + PSecPkgInfoA *ppPackageInfo); +SECURITY_STATUS SEC_ENTRY EnumerateSecurityPackagesW(PULONG pcPackages, + PSecPkgInfoW *ppPackageInfo); +#define EnumerateSecurityPackages WINELIB_NAME_AW(EnumerateSecurityPackages) + +typedef SECURITY_STATUS (SEC_ENTRY *ENUMERATE_SECURITY_PACKAGES_FN_A)(PULONG, + PSecPkgInfoA *); +typedef SECURITY_STATUS (SEC_ENTRY *ENUMERATE_SECURITY_PACKAGES_FN_W)(PULONG, + PSecPkgInfoW *); +#define ENUMERATE_SECURITY_PACKAGES_FN WINELIB_NAME_AW(ENUMERATE_SECURITY_PACKAGES_FN_) + +SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesA( + PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer); +SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesW( + PCredHandle phCredential, unsigned long ulAttribute, void *pBuffer); +#define QueryCredentialsAttributes WINELIB_NAME_AW(QueryCredentialsAttributes) + +typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CREDENTIALS_ATTRIBUTES_FN_A) + (PCredHandle, unsigned long, PVOID); +typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CREDENTIALS_ATTRIBUTES_FN_W) + (PCredHandle, unsigned long, PVOID); +#define QUERY_CREDENTIALS_ATTRIBUTES_FN WINELIB_NAME_AW(QUERY_CREDENTIALS_ATTRIBUTES_FN_) + +/* values for QueryCredentialsAttributes ulAttribute */ +#define SECPKG_CRED_ATTR_NAMES 1 + +/* types for QueryCredentialsAttributes */ +typedef struct _SecPkgCredentials_NamesA +{ + SEC_CHAR *sUserName; +} SecPkgCredentials_NamesA, *PSecPkgCredentials_NamesA; + +typedef struct _SecPkgCredentials_NamesW +{ + SEC_WCHAR *sUserName; +} SecPkgCredentials_NamesW, *PSecPkgCredentials_NamesW; + +#define SecPkgCredentials_Names WINELIB_NAME_AW(SecPkgCredentials_Names) + +SECURITY_STATUS SEC_ENTRY AcquireCredentialsHandleA( + SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialsUse, + PLUID pvLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, + PVOID pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry); +SECURITY_STATUS SEC_ENTRY AcquireCredentialsHandleW( + SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialsUse, + PLUID pvLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, + PVOID pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry); +#define AcquireCredentialsHandle WINELIB_NAME_AW(AcquireCredentialsHandle) + +/* flags for fCredentialsUse */ +#define SECPKG_CRED_INBOUND 0x00000001 +#define SECPKG_CRED_OUTBOUND 0x00000002 +#define SECPKG_CRED_BOTH (SECPKG_CRED_INBOUND | SECPKG_CRED_OUTBOUND) +#define SECPKG_CRED_DEFAULT 0x00000004 +#define SECPKG_CRED_RESERVED 0xf0000000 + +typedef SECURITY_STATUS (SEC_ENTRY *ACQUIRE_CREDENTIALS_HANDLE_FN_A)( + SEC_CHAR *, SEC_CHAR *, ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, + PCredHandle, PTimeStamp); +typedef SECURITY_STATUS (SEC_ENTRY *ACQUIRE_CREDENTIALS_HANDLE_FN_W)( + SEC_WCHAR *, SEC_WCHAR *, ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, + PCredHandle, PTimeStamp); +#define ACQUIRE_CREDENTIALS_HANDLE_FN WINELIB_NAME_AW(ACQUIRE_CREDENTIALS_HANDLE_FN_) + +SECURITY_STATUS SEC_ENTRY FreeContextBuffer(PVOID pv); + +typedef SECURITY_STATUS (SEC_ENTRY *FREE_CONTEXT_BUFFER_FN)(PVOID); + +SECURITY_STATUS SEC_ENTRY FreeCredentialsHandle(PCredHandle + phCredential); +typedef SECURITY_STATUS (SEC_ENTRY *FREE_CREDENTIALS_HANDLE_FN)(PCredHandle); + +SECURITY_STATUS SEC_ENTRY InitializeSecurityContextA( + PCredHandle phCredential, PCtxtHandle phContext, + SEC_CHAR *pszTargetName, unsigned long fContextReq, + unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, + unsigned long Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, + unsigned long *pfContextAttr, PTimeStamp ptsExpiry); +SECURITY_STATUS SEC_ENTRY InitializeSecurityContextW( + PCredHandle phCredential, PCtxtHandle phContext, + SEC_WCHAR *pszTargetName, unsigned long fContextReq, + unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, + unsigned long Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, + unsigned long *pfContextAttr, PTimeStamp ptsExpiry); +#define InitializeSecurityContext WINELIB_NAME_AW(InitializeSecurityContext) + +typedef SECURITY_STATUS (SEC_ENTRY *INITIALIZE_SECURITY_CONTEXT_FN_A) + (PCredHandle, PCtxtHandle, SEC_CHAR *, unsigned long, unsigned long, + unsigned long, PSecBufferDesc, unsigned long, PCtxtHandle, PSecBufferDesc, + unsigned long *, PTimeStamp); +typedef SECURITY_STATUS (SEC_ENTRY *INITIALIZE_SECURITY_CONTEXT_FN_W) + (PCredHandle, PCtxtHandle, SEC_WCHAR *, unsigned long, unsigned long, + unsigned long, PSecBufferDesc, unsigned long, PCtxtHandle, PSecBufferDesc, + unsigned long *, PTimeStamp); +#define INITIALIZE_SECURITY_CONTEXT_FN WINELIB_NAME_AW(INITIALIZE_SECURITY_CONTEXT_FN_) + +/* flags for InitializeSecurityContext fContextReq and pfContextAttr */ +#define ISC_REQ_DELEGATE 0x00000001 +#define ISC_REQ_MUTUAL_AUTH 0x00000002 +#define ISC_REQ_REPLAY_DETECT 0x00000004 +#define ISC_REQ_SEQUENCE_DETECT 0x00000008 +#define ISC_REQ_CONFIDENTIALITY 0x00000010 +#define ISC_REQ_USE_SESSION_KEY 0x00000020 +#define ISC_REQ_PROMPT_FOR_CREDS 0x00000040 +#define ISC_REQ_USE_SUPPLIED_CREDS 0x00000080 +#define ISC_REQ_ALLOCATE_MEMORY 0x00000100 +#define ISC_REQ_USE_DCE_STYLE 0x00000200 +#define ISC_REQ_DATAGRAM 0x00000400 +#define ISC_REQ_CONNECTION 0x00000800 +#define ISC_REQ_CALL_LEVEL 0x00001000 +#define ISC_REQ_FRAGMENT_SUPPLIED 0x00002000 +#define ISC_REQ_EXTENDED_ERROR 0x00004000 +#define ISC_REQ_STREAM 0x00008000 +#define ISC_REQ_INTEGRITY 0x00010000 +#define ISC_REQ_IDENTIFY 0x00020000 +#define ISC_REQ_NULL_SESSION 0x00040000 +#define ISC_REQ_MANUAL_CRED_VALIDATION 0x00080000 +#define ISC_REQ_RESERVED1 0x00100000 +#define ISC_REQ_FRAGMENT_TO_FIT 0x00200000 + +#define ISC_RET_DELEGATE 0x00000001 +#define ISC_RET_MUTUAL_AUTH 0x00000002 +#define ISC_RET_REPLAY_DETECT 0x00000004 +#define ISC_RET_SEQUENCE_DETECT 0x00000008 +#define ISC_RET_CONFIDENTIALITY 0x00000010 +#define ISC_RET_USE_SESSION_KEY 0x00000020 +#define ISC_RET_USED_COLLECTED_CREDS 0x00000040 +#define ISC_RET_USED_SUPPLIED_CREDS 0x00000080 +#define ISC_RET_ALLOCATED_MEMORY 0x00000100 +#define ISC_RET_USED_DCE_STYLE 0x00000200 +#define ISC_RET_DATAGRAM 0x00000400 +#define ISC_RET_CONNECTION 0x00000800 +#define ISC_RET_INTERMEDIATE_RETURN 0x00001000 +#define ISC_RET_CALL_LEVEL 0x00002000 +#define ISC_RET_EXTENDED_ERROR 0x00004000 +#define ISC_RET_STREAM 0x00008000 +#define ISC_RET_INTEGRITY 0x00010000 +#define ISC_RET_IDENTIFY 0x00020000 +#define ISC_RET_NULL_SESSION 0x00040000 +#define ISC_RET_MANUAL_CRED_VALIDATION 0x00080000 +#define ISC_RET_RESERVED1 0x00100000 +#define ISC_RET_FRAGMENT_ONLY 0x00200000 + +SECURITY_STATUS SEC_ENTRY AcceptSecurityContext( + PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput, + unsigned long fContextReq, unsigned long TargetDataRep, + PCtxtHandle phNewContext, PSecBufferDesc pOutput, + unsigned long *pfContextAttr, PTimeStamp ptsExpiry); + +typedef SECURITY_STATUS (SEC_ENTRY *ACCEPT_SECURITY_CONTEXT_FN)(PCredHandle, + PCtxtHandle, PSecBufferDesc, unsigned long, unsigned long, PCtxtHandle, + PSecBufferDesc, unsigned long *, PTimeStamp); + +/* flags for AcceptSecurityContext fContextReq and pfContextAttr */ +#define ASC_REQ_DELEGATE 0x00000001 +#define ASC_REQ_MUTUAL_AUTH 0x00000002 +#define ASC_REQ_REPLAY_DETECT 0x00000004 +#define ASC_REQ_SEQUENCE_DETECT 0x00000008 +#define ASC_REQ_CONFIDENTIALITY 0x00000010 +#define ASC_REQ_USE_SESSION_KEY 0x00000020 +#define ASC_REQ_ALLOCATE_MEMORY 0x00000100 +#define ASC_REQ_USE_DCE_STYLE 0x00000200 +#define ASC_REQ_DATAGRAM 0x00000400 +#define ASC_REQ_CONNECTION 0x00000800 +#define ASC_REQ_CALL_LEVEL 0x00001000 +#define ASC_REQ_FRAGMENT_SUPPLIED 0x00002000 +#define ASC_REQ_EXTENDED_ERROR 0x00008000 +#define ASC_REQ_STREAM 0x00010000 +#define ASC_REQ_INTEGRITY 0x00020000 +#define ASC_REQ_LICENSING 0x00040000 +#define ASC_REQ_IDENTIFY 0x00080000 +#define ASC_REQ_ALLOW_NULL_SESSION 0x00100000 +#define ASC_REQ_ALLOW_NON_USER_LOGONS 0x00200000 +#define ASC_REQ_ALLOW_CONTEXT_REPLAY 0x00400000 +#define ASC_REQ_FRAGMENT_TO_FIT 0x00800000 +#define ASC_REQ_FRAGMENT_NO_TOKEN 0x01000000 + +#define ASC_RET_DELEGATE 0x00000001 +#define ASC_RET_MUTUAL_AUTH 0x00000002 +#define ASC_RET_REPLAY_DETECT 0x00000004 +#define ASC_RET_SEQUENCE_DETECT 0x00000008 +#define ASC_RET_CONFIDENTIALITY 0x00000010 +#define ASC_RET_USE_SESSION_KEY 0x00000020 +#define ASC_RET_ALLOCATED_MEMORY 0x00000100 +#define ASC_RET_USED_DCE_STYLE 0x00000200 +#define ASC_RET_DATAGRAM 0x00000400 +#define ASC_RET_CONNECTION 0x00000800 +#define ASC_RET_CALL_LEVEL 0x00002000 +#define ASC_RET_THIRD_LEG_FAILED 0x00004000 +#define ASC_RET_EXTENDED_ERROR 0x00008000 +#define ASC_RET_STREAM 0x00010000 +#define ASC_RET_INTEGRITY 0x00020000 +#define ASC_RET_LICENSING 0x00040000 +#define ASC_RET_IDENTIFY 0x00080000 +#define ASC_RET_NULL_SESSION 0x00100000 +#define ASC_RET_ALLOW_NON_USER_LOGONS 0x00200000 +#define ASC_RET_ALLOW_CONTEXT_REPLAY 0x00400000 +#define ASC_RET_FRAGMENT_ONLY 0x00800000 +#define ASC_RET_NO_TOKEN 0x01000000 + +/* values for TargetDataRep */ +#define SECURITY_NATIVE_DREP 0x00000010 +#define SECURITY_NETWORK_DREP 0x00000000 + +SECURITY_STATUS SEC_ENTRY CompleteAuthToken(PCtxtHandle phContext, + PSecBufferDesc pToken); + +typedef SECURITY_STATUS (SEC_ENTRY *COMPLETE_AUTH_TOKEN_FN)(PCtxtHandle, + PSecBufferDesc); + +SECURITY_STATUS SEC_ENTRY DeleteSecurityContext(PCtxtHandle phContext); + +typedef SECURITY_STATUS (SEC_ENTRY *DELETE_SECURITY_CONTEXT_FN)(PCtxtHandle); + +SECURITY_STATUS SEC_ENTRY ApplyControlToken(PCtxtHandle phContext, + PSecBufferDesc pInput); + +typedef SECURITY_STATUS (SEC_ENTRY *APPLY_CONTROL_TOKEN_FN)(PCtxtHandle, + PSecBufferDesc); + +SECURITY_STATUS SEC_ENTRY QueryContextAttributesA(PCtxtHandle phContext, + unsigned long ulAttribute, void *pBuffer); +SECURITY_STATUS SEC_ENTRY QueryContextAttributesW(PCtxtHandle phContext, + unsigned long ulAttribute, void *pBuffer); +#define QueryContextAttributes WINELIB_NAME_AW(QueryContextAttributes) + +typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CONTEXT_ATTRIBUTES_FN_A)(PCtxtHandle, + unsigned long, void *); +typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle, + unsigned long, void *); +#define QUERY_CONTEXT_ATTRIBUTES_FN WINELIB_NAME_AW(QUERY_CONTEXT_ATTRIBUTES_FN_) + +/* values for QueryContextAttributes/SetContextAttributes ulAttribute */ +#define SECPKG_ATTR_SIZES 0 +#define SECPKG_ATTR_NAMES 1 +#define SECPKG_ATTR_LIFESPAN 2 +#define SECPKG_ATTR_DCE_INFO 3 +#define SECPKG_ATTR_STREAM_SIZES 4 +#define SECPKG_ATTR_KEY_INFO 5 +#define SECPKG_ATTR_AUTHORITY 6 +#define SECPKG_ATTR_PROTO_INFO 7 +#define SECPKG_ATTR_PASSWORD_EXPIRY 8 +#define SECPKG_ATTR_SESSION_KEY 9 +#define SECPKG_ATTR_PACKAGE_INFO 10 +#define SECPKG_ATTR_USER_FLAGS 11 +#define SECPKG_ATTR_NEGOTIATION_INFO 12 +#define SECPKG_ATTR_NATIVE_NAMES 13 +#define SECPKG_ATTR_FLAGS 14 +#define SECPKG_ATTR_USE_VALIDATED 15 +#define SECPKG_ATTR_CREDENTIAL_NAME 16 +#define SECPKG_ATTR_TARGET_INFORMATION 17 +#define SECPKG_ATTR_ACCESS_TOKEN 18 +#define SECPKG_ATTR_TARGET 19 +#define SECPKG_ATTR_AUTHENTICATION_ID 20 +#define SECPKG_ATTR_ISSUER_LIST 80 +#define SECPKG_ATTR_REMOTE_CRED 81 +#define SECPKG_ATTR_LOCAL_CRED 82 +#define SECPKG_ATTR_REMOTE_CERT_CONTEXT 83 +#define SECPKG_ATTR_LOCAL_CERT_CONTEXT 84 +#define SECPKG_ATTR_ISSUER_LIST_EX 89 +#define SECPKG_ATTR_CONNECTION_INFO 90 + +/* types for QueryContextAttributes/SetContextAttributes */ + +typedef struct _SecPkgContext_Sizes +{ + unsigned long cbMaxToken; + unsigned long cbMaxSignature; + unsigned long cbBlockSize; + unsigned long cbSecurityTrailer; +} SecPkgContext_Sizes, *PSecPkgContext_Sizes; + +typedef struct _SecPkgContext_StreamSizes +{ + unsigned long cbHeader; + unsigned long cbTrailer; + unsigned long cbMaximumMessage; + unsigned long cbBuffers; + unsigned long cbBlockSize; } SecPkgContext_StreamSizes, *PSecPkgContext_StreamSizes; -typedef struct _SecPkgContext_Sizes { - ULONG cbMaxToken; - ULONG cbMaxSIgnature; - ULONG cbBlockSize; - ULONG cbSecurityTrailer; -} SecPkgContext_Sizes, *PSecPkgContext_Sizes; -typedef struct _SecPkgContext_AuthorityW { - SEC_WCHAR* sAuthorityName; + +typedef struct _SecPkgContext_NamesA +{ + SEC_CHAR *sUserName; +} SecPkgContext_NamesA, *PSecPkgContext_NamesA; + +typedef struct _SecPkgContext_NamesW +{ + SEC_WCHAR *sUserName; +} SecPkgContext_NamesW, *PSecPkgContext_NamesW; + +#define SecPkgContext_Names WINELIB_NAME_AW(SecPkgContext_Names) +#define PSecPkgContext_Names WINELIB_NAME_AW(PSecPkgContext_Names) + +typedef struct _SecPkgContext_Lifespan +{ + TimeStamp tsStart; + TimeStamp tsExpiry; +} SecPkgContext_Lifespan, *PSecPkgContext_Lifespan; + +typedef struct _SecPkgContext_DceInfo +{ + unsigned long AuthzSvc; + void *pPac; +} SecPkgContext_DceInfo, *PSecPkgContext_DceInfo; + +typedef struct _SecPkgContext_KeyInfoA +{ + SEC_CHAR *sSignatureAlgorithmName; + SEC_CHAR *sEncryptAlgorithmName; + unsigned long KeySize; + unsigned long SignatureAlgorithm; + unsigned long EncryptAlgorithm; +} SecPkgContext_KeyInfoA, *PSecPkgContext_KeyInfoA; + +typedef struct _SecPkgContext_KeyInfoW +{ + SEC_WCHAR *sSignatureAlgorithmName; + SEC_WCHAR *sEncryptAlgorithmName; + unsigned long KeySize; + unsigned long SignatureAlgorithm; + unsigned long EncryptAlgorithm; +} SecPkgContext_KeyInfoW, *PSecPkgContext_KeyInfoW; + +#define SecPkgContext_KeyInfo WINELIB_NAME_AW(SecPkgContext_KeyInfo) +#define PSecPkgContext_KeyInfo WINELIB_NAME_AW(PSecPkgContext_KeyInfo) + +typedef struct _SecPkgContext_AuthorityA +{ + SEC_CHAR *sAuthorityName; +} SecPkgContext_AuthorityA, *PSecPkgContext_AuthorityA; + +typedef struct _SecPkgContext_AuthorityW +{ + SEC_WCHAR *sAuthorityName; } SecPkgContext_AuthorityW, *PSecPkgContext_AuthorityW; -typedef struct _SecPkgContext_AuthorityA { - SEC_CHAR* sAuthorityName; -} SecPkgContext_AuthorityA, *PSecPkgContext_AuthorityA; -typedef struct _SecPkgContext_KeyInfoW { - SEC_WCHAR* sSignatureAlgorithmName; - SEC_WCHAR* sEncryptAlgorithmName; - ULONG KeySize; - ULONG SignatureAlgorithm; - ULONG EncryptAlgorithm; -} SecPkgContext_KeyInfoW, *PSecPkgContext_KeyInfoW; -typedef struct _SecPkgContext_KeyInfoA { - SEC_CHAR* sSignatureAlgorithmName; - SEC_CHAR* sEncryptAlgorithmName; - ULONG KeySize; - ULONG SignatureAlgorithm; - ULONG EncryptAlgorithm; -} SecPkgContext_KeyInfoA, *PSecPkgContext_KeyInfoA; -typedef struct _SecPkgContext_LifeSpan { - TimeStamp tsStart; - TimeStamp tsExpiry; -} SecPkgContext_LifeSpan, *PSecPkgContext_LifeSpan; -typedef struct _SecPkgContext_NamesW { - SEC_WCHAR* sUserName; -} SecPkgContext_NamesW, *PSecPkgContext_NamesW; -typedef struct _SecPkgContext_NamesA { - SEC_CHAR* sUserName; -} SecPkgContext_NamesA, *PSecPkgContext_NamesA; -typedef struct _SecPkgInfoW { - ULONG fCapabilities; - USHORT wVersion; - USHORT wRPCID; - ULONG cbMaxToken; - SEC_WCHAR* Name; - SEC_WCHAR* Comment; -} SecPkgInfoW, *PSecPkgInfoW; -typedef struct _SecPkgInfoA { - ULONG fCapabilities; - USHORT wVersion; - USHORT wRPCID; - ULONG cbMaxToken; - SEC_CHAR* Name; - SEC_CHAR* Comment; -} SecPkgInfoA, *PSecPkgInfoA; -/* supported only in win2k+, so it should be a PSecPkgInfoW */ -/* PSDK does not say it has ANSI/Unicode versions */ -typedef struct _SecPkgContext_PackageInfo { - PSecPkgInfoW PackageInfo; -} SecPkgContext_PackageInfo, *PSecPkgContext_PackageInfo; -typedef struct _SecPkgCredentials_NamesW { - SEC_WCHAR* sUserName; -} SecPkgCredentialsNamesW, *PSecPkgCredentialsNamesW; -typedef struct _SecPkgCredentials_NamesA { - SEC_CHAR* sUserName; -} SecPkgCredentialsNamesA, *PSecPkgCredentialsNamesA; - -/* TODO: missing type in SDK */ -typedef void (*SEC_GET_KEY_FN)(); - -typedef SECURITY_STATUS (WINAPI *ENUMERATE_SECURITY_PACKAGES_FN_W)(PULONG,PSecPkgInfoW*); -typedef SECURITY_STATUS (WINAPI *ENUMERATE_SECURITY_PACKAGES_FN_A)(PULONG,PSecPkgInfoA*); -typedef SECURITY_STATUS (WINAPI *QUERY_CREDENTIALS_ATTRIBUTES_FN_W)(PCredHandle,ULONG,PVOID); -typedef SECURITY_STATUS (WINAPI *QUERY_CREDENTIALS_ATTRIBUTES_FN_A)(PCredHandle,ULONG,PVOID); -typedef SECURITY_STATUS (WINAPI *ACQUIRE_CREDENTIALS_HANDLE_FN_W)(SEC_WCHAR*,SEC_WCHAR*,ULONG,PLUID,PVOID,SEC_GET_KEY_FN,PVOID,PCredHandle,PTimeStamp); -typedef SECURITY_STATUS (WINAPI *ACQUIRE_CREDENTIALS_HANDLE_FN_A)(SEC_CHAR*,SEC_CHAR*,ULONG,PLUID,PVOID,SEC_GET_KEY_FN,PVOID,PCredHandle,PTimeStamp); -typedef SECURITY_STATUS (WINAPI *FREE_CREDENTIALS_HANDLE_FN)(PCredHandle); -typedef SECURITY_STATUS (WINAPI *INITIALIZE_SECURITY_CONTEXT_FN_W)(PCredHandle,PCtxtHandle,SEC_WCHAR*,ULONG,ULONG,ULONG,PSecBufferDesc,ULONG,PCtxtHandle,PSecBufferDesc,PULONG,PTimeStamp); -typedef SECURITY_STATUS (WINAPI *INITIALIZE_SECURITY_CONTEXT_FN_A)(PCredHandle,PCtxtHandle,SEC_CHAR*,ULONG,ULONG,ULONG,PSecBufferDesc,ULONG,PCtxtHandle,PSecBufferDesc,PULONG,PTimeStamp); -typedef SECURITY_STATUS (WINAPI *ACCEPT_SECURITY_CONTEXT_FN)(PCredHandle,PCtxtHandle,PSecBufferDesc,ULONG,ULONG,PCtxtHandle,PSecBufferDesc,PULONG,PTimeStamp); -typedef SECURITY_STATUS (WINAPI *COMPLETE_AUTH_TOKEN_FN)(PCtxtHandle,PSecBufferDesc); -typedef SECURITY_STATUS (WINAPI *DELETE_SECURITY_CONTEXT_FN)(PCtxtHandle); -typedef SECURITY_STATUS (WINAPI *APPLY_CONTROL_TOKEN_FN_W)(PCtxtHandle,PSecBufferDesc); -typedef SECURITY_STATUS (WINAPI *APPLY_CONTROL_TOKEN_FN_A)(PCtxtHandle,PSecBufferDesc); -typedef SECURITY_STATUS (WINAPI *QUERY_CONTEXT_ATTRIBUTES_FN_A)(PCtxtHandle,ULONG,PVOID); -typedef SECURITY_STATUS (WINAPI *QUERY_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle,ULONG,PVOID); -typedef SECURITY_STATUS (WINAPI *IMPERSONATE_SECURITY_CONTEXT_FN)(PCtxtHandle); -typedef SECURITY_STATUS (WINAPI *REVERT_SECURITY_CONTEXT_FN)(PCtxtHandle); -typedef SECURITY_STATUS (WINAPI *MAKE_SIGNATURE_FN)(PCtxtHandle,ULONG,PSecBufferDesc,ULONG); -typedef SECURITY_STATUS (WINAPI *VERIFY_SIGNATURE_FN)(PCtxtHandle,PSecBufferDesc,ULONG,PULONG); -typedef SECURITY_STATUS (WINAPI *FREE_CONTEXT_BUFFER_FN)(PVOID); -typedef SECURITY_STATUS (WINAPI *QUERY_SECURITY_PACKAGE_INFO_FN_A)(SEC_CHAR*,PSecPkgInfoA*); -typedef SECURITY_STATUS (WINAPI *QUERY_SECURITY_PACKAGE_INFO_FN_W)(SEC_WCHAR*,PSecPkgInfoW*); -typedef SECURITY_STATUS (WINAPI *ENCRYPT_MESSAGE_FN)(PCtxtHandle,ULONG,PSecBufferDesc,ULONG); -typedef SECURITY_STATUS (WINAPI *DECRYPT_MESSAGE_FN)(PCtxtHandle,PSecBufferDesc,ULONG,PULONG); + +#define SecPkgContext_Authority WINELIB_NAME_AW(SecPkgContext_Authority) +#define PSecPkgContext_Authority WINELIB_NAME_AW(PSecPkgContext_Authority) + +typedef struct _SecPkgContext_ProtoInfoA +{ + SEC_CHAR *sProtocolName; + unsigned long majorVersion; + unsigned long minorVersion; +} SecPkgContext_ProtoInfoA, *PSecPkgContext_ProtoInfoA; + +typedef struct _SecPkgContext_ProtoInfoW +{ + SEC_WCHAR *sProtocolName; + unsigned long majorVersion; + unsigned long minorVersion; +} SecPkgContext_ProtoInfoW, *PSecPkgContext_ProtoInfoW; + +#define SecPkgContext_ProtoInfo WINELIB_NAME_AW(SecPkgContext_ProtoInfo) +#define PSecPkgContext_ProtoInfo WINELIB_NAME_AW(PSecPkgContext_ProtoInfo) + +typedef struct _SecPkgContext_PasswordExpiry +{ + TimeStamp tsPasswordExpires; +} SecPkgContext_PasswordExpiry, *PSecPkgContext_PasswordExpiry; + +typedef struct _SecPkgContext_SessionKey +{ + unsigned long SessionKeyLength; + unsigned char *SessionKey; +} SecPkgContext_SessionKey, *PSecPkgContext_SessionKey; + +typedef struct _SecPkgContext_PackageInfoA +{ + PSecPkgInfoA PackageInfo; +} SecPkgContext_PackageInfoA, *PSecPkgContext_PackageInfoA; + +typedef struct _SecPkgContext_PackageInfoW +{ + PSecPkgInfoW PackageInfo; +} SecPkgContext_PackageInfoW, *PSecPkgContext_PackageInfoW; + +#define SecPkgContext_PackageInfo WINELIB_NAME_AW(SecPkgContext_PackageInfo) +#define PSecPkgContext_PackageInfo WINELIB_NAME_AW(PSecPkgContext_PackageInfo) + +typedef struct _SecPkgContext_Flags +{ + unsigned long Flags; +} SecPkgContext_Flags, *PSecPkgContext_Flags; + +typedef struct _SecPkgContext_UserFlags +{ + unsigned long UserFlags; +} SecPkgContext_UserFlags, *PSecPkgContext_UserFlags; + +typedef struct _SecPkgContext_NegotiationInfoA +{ + PSecPkgInfoA PackageInfo; + unsigned long NegotiationState; +} SecPkgContext_NegotiationInfoA, *PSecPkgContext_NegotiationInfoA; + +typedef struct _SecPkgContext_NegotiationInfoW +{ + PSecPkgInfoW PackageInfo; + unsigned long NegotiationState; +} SecPkgContext_NegotiationInfoW, *PSecPkgContext_NegotiationInfoW; + +#define SecPkgContext_NegotiationInfo WINELIB_NAME_AW(SecPkgContext_NegotiationInfo) +#define PSecPkgContext_NegotiationInfo WINELIB_NAME_AW(PSecPkgContext_NegotiationInfo) + +/* values for NegotiationState */ +#define SECPKG_NEGOTIATION_COMPLETE 0 +#define SECPKG_NEGOTIATION_OPTIMISTIC 1 +#define SECPKG_NEGOTIATION_IN_PROGRESS 2 +#define SECPKG_NEGOTIATION_DIRECT 3 +#define SECPKG_NEGOTIATION_TRY_MULTICRED 4 + +typedef struct _SecPkgContext_NativeNamesA +{ + SEC_CHAR *sClientName; + SEC_CHAR *sServerName; +} SecPkgContext_NativeNamesA, *PSecPkgContext_NativeNamesA; + +typedef struct _SecPkgContext_NativeNamesW +{ + SEC_WCHAR *sClientName; + SEC_WCHAR *sServerName; +} SecPkgContext_NativeNamesW, *PSecPkgContext_NativeNamesW; + +#define SecPkgContext_NativeNames WINELIB_NAME_AW(SecPkgContext_NativeNames) +#define PSecPkgContext_NativeNames WINELIB_NAME_AW(PSecPkgContext_NativeNames) + +typedef struct _SecPkgContext_CredentialNameA +{ + unsigned long CredentialType; + SEC_CHAR *sCredentialName; +} SecPkgContext_CredentialNameA, *PSecPkgContext_CredentialNameA; + +typedef struct _SecPkgContext_CredentialNameW +{ + unsigned long CredentialType; + SEC_WCHAR *sCredentialName; +} SecPkgContext_CredentialNameW, *PSecPkgContext_CredentialNameW; + +#define SecPkgContext_CredentialName WINELIB_NAME_AW(SecPkgContext_CredentialName) +#define PSecPkgContext_CredentialName WINELIB_NAME_AW(PSecPkgContext_CredentialName) + +typedef struct _SecPkgContext_AccessToken +{ + void *AccessToken; +} SecPkgContext_AccessToken, *PSecPkgContext_AccessToken; + +typedef struct _SecPkgContext_TargetInformation +{ + unsigned long MarshalledTargetInfoLength; + unsigned char *MarshalledTargetInfo; +} SecPkgContext_TargetInformation, *PSecPkgContext_TargetInformation; + +typedef struct _SecPkgContext_AuthzID +{ + unsigned long AuthzIDLength; + char *AuthzID; +} SecPkgContext_AuthzID, *PSecPkgContext_AuthzID; + +typedef struct _SecPkgContext_Target +{ + unsigned long TargetLength; + char *Target; +} SecPkgContext_Target, *PSecPkgContext_Target; + +SECURITY_STATUS SEC_ENTRY ImpersonateSecurityContext(PCtxtHandle phContext); + +typedef SECURITY_STATUS (SEC_ENTRY *IMPERSONATE_SECURITY_CONTEXT_FN) + (PCtxtHandle); + +SECURITY_STATUS SEC_ENTRY RevertSecurityContext(PCtxtHandle phContext); + +typedef SECURITY_STATUS (SEC_ENTRY *REVERT_SECURITY_CONTEXT_FN)(PCtxtHandle); + +SECURITY_STATUS SEC_ENTRY MakeSignature(PCtxtHandle phContext, + ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo); + +typedef SECURITY_STATUS (SEC_ENTRY *MAKE_SIGNATURE_FN)(PCtxtHandle, + ULONG, PSecBufferDesc, ULONG); + +SECURITY_STATUS SEC_ENTRY VerifySignature(PCtxtHandle phContext, + PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP); + +typedef SECURITY_STATUS (SEC_ENTRY *VERIFY_SIGNATURE_FN)(PCtxtHandle, + PSecBufferDesc, ULONG, PULONG); + +SECURITY_STATUS SEC_ENTRY QuerySecurityPackageInfoA( + SEC_CHAR *pszPackageName, PSecPkgInfoA *ppPackageInfo); +SECURITY_STATUS SEC_ENTRY QuerySecurityPackageInfoW( + SEC_WCHAR *pszPackageName, PSecPkgInfoW *ppPackageInfo); +#define QuerySecurityPackageInfo WINELIB_NAME_AW(QuerySecurityPackageInfo) + +typedef SECURITY_STATUS (SEC_ENTRY *QUERY_SECURITY_PACKAGE_INFO_FN_A) + (SEC_CHAR *, PSecPkgInfoA *); +typedef SECURITY_STATUS (SEC_ENTRY *QUERY_SECURITY_PACKAGE_INFO_FN_W) + (SEC_WCHAR *, PSecPkgInfoW *); +#define QUERY_SECURITY_PACKAGE_INFO_FN WINELIB_NAME_AW(QUERY_SECURITY_PACKAGE_INFO_FN_) + +SECURITY_STATUS SEC_ENTRY ExportSecurityContext(PCtxtHandle phContext, + ULONG fFlags, PSecBuffer pPackedContext, void **pToken); + +typedef SECURITY_STATUS (SEC_ENTRY *EXPORT_SECURITY_CONTEXT_FN)(PCtxtHandle, + ULONG, PSecBuffer, void **); + +/* values for ExportSecurityContext fFlags */ +#define SECPKG_CONTEXT_EXPORT_RESET_NEW 0x00000001 +#define SECPKG_CONTEXT_EXPORT_DELETE_OLD 0x00000002 + +SECURITY_STATUS SEC_ENTRY ImportSecurityContextA(SEC_CHAR *pszPackage, + PSecBuffer pPackedContext, void *Token, PCtxtHandle phContext); +SECURITY_STATUS SEC_ENTRY ImportSecurityContextW(SEC_WCHAR *pszPackage, + PSecBuffer pPackedContext, void *Token, PCtxtHandle phContext); +#define ImportSecurityContext WINELIB_NAME_AW(ImportSecurityContext) + +typedef SECURITY_STATUS (SEC_ENTRY *IMPORT_SECURITY_CONTEXT_FN_A)(SEC_CHAR *, + PSecBuffer, void *, PCtxtHandle); +typedef SECURITY_STATUS (SEC_ENTRY *IMPORT_SECURITY_CONTEXT_FN_W)(SEC_WCHAR *, + PSecBuffer, void *, PCtxtHandle); +#define IMPORT_SECURITY_CONTEXT_FN WINELIB_NAME_AW(IMPORT_SECURITY_CONTEXT_FN_) + +SECURITY_STATUS SEC_ENTRY AddCredentialsA(PCredHandle hCredentials, + SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, unsigned long fCredentialUse, + void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, + PTimeStamp ptsExpiry); +SECURITY_STATUS SEC_ENTRY AddCredentialsW(PCredHandle hCredentials, + SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, unsigned long fCredentialUse, + void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, + PTimeStamp ptsExpiry); +#define AddCredentials WINELIB_NAME_AW(AddCredentials) + +typedef SECURITY_STATUS (SEC_ENTRY *ADD_CREDENTIALS_FN_A)(PCredHandle, + SEC_CHAR *, SEC_CHAR *, unsigned long, void *, SEC_GET_KEY_FN, void *, + PTimeStamp); +typedef SECURITY_STATUS (SEC_ENTRY *ADD_CREDENTIALS_FN_W)(PCredHandle, + SEC_WCHAR *, SEC_WCHAR *, unsigned long, void *, SEC_GET_KEY_FN, void *, + PTimeStamp); + +SECURITY_STATUS SEC_ENTRY QuerySecurityContextToken(PCtxtHandle phContext, + HANDLE *phToken); + +typedef SECURITY_STATUS (SEC_ENTRY *QUERY_SECURITY_CONTEXT_TOKEN_FN) + (PCtxtHandle, HANDLE *); + +SECURITY_STATUS SEC_ENTRY EncryptMessage(PCtxtHandle phContext, ULONG fQOP, + PSecBufferDesc pMessage, ULONG MessageSeqNo); +SECURITY_STATUS SEC_ENTRY DecryptMessage(PCtxtHandle phContext, + PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP); + +/* values for EncryptMessage fQOP */ +#define SECQOP_WRAP_NO_ENCRYPT 0x80000001 + +typedef SECURITY_STATUS (SEC_ENTRY *ENCRYPT_MESSAGE_FN)(PCtxtHandle, ULONG, + PSecBufferDesc, ULONG); +typedef SECURITY_STATUS (SEC_ENTRY *DECRYPT_MESSAGE_FN)(PCtxtHandle, + PSecBufferDesc, ULONG, PULONG); + +SECURITY_STATUS SEC_ENTRY SetContextAttributesA(PCtxtHandle phContext, + unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer); +SECURITY_STATUS SEC_ENTRY SetContextAttributesW(PCtxtHandle phContext, + unsigned long ulAttribute, void *pBuffer, unsigned long cbBuffer); +#define SetContextAttributes WINELIB_NAME_AW(SetContextAttributes) + +typedef SECURITY_STATUS (SEC_ENTRY *SET_CONTEXT_ATTRIBUTES_FN_A)(PCtxtHandle, + unsigned long, void *, unsigned long); +typedef SECURITY_STATUS (SEC_ENTRY *SET_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle, + unsigned long, void *, unsigned long); + +#define SECURITY_ENTRYPOINT_ANSIA "InitSecurityInterfaceA" +#define SECURITY_ENTRYPOINT_ANSIW "InitSecurityInterfaceW" +#define SECURITY_ENTRYPOINT_ANSI WINELIB_NAME_AW(SECURITY_ENTRYPOINT_ANSI) + +typedef struct _SECURITY_FUNCTION_TABLE_A +{ + unsigned long dwVersion; + ENUMERATE_SECURITY_PACKAGES_FN_A EnumerateSecurityPackagesA; + QUERY_CREDENTIALS_ATTRIBUTES_FN_A QueryCredentialsAttributesA; + ACQUIRE_CREDENTIALS_HANDLE_FN_A AcquireCredentialsHandleA; + FREE_CREDENTIALS_HANDLE_FN FreeCredentialsHandle; + void *Reserved2; + INITIALIZE_SECURITY_CONTEXT_FN_A InitializeSecurityContextA; + ACCEPT_SECURITY_CONTEXT_FN AcceptSecurityContext; + COMPLETE_AUTH_TOKEN_FN CompleteAuthToken; + DELETE_SECURITY_CONTEXT_FN DeleteSecurityContext; + APPLY_CONTROL_TOKEN_FN ApplyControlToken; + QUERY_CONTEXT_ATTRIBUTES_FN_A QueryContextAttributesA; + IMPERSONATE_SECURITY_CONTEXT_FN ImpersonateSecurityContext; + REVERT_SECURITY_CONTEXT_FN RevertSecurityContext; + MAKE_SIGNATURE_FN MakeSignature; + VERIFY_SIGNATURE_FN VerifySignature; + FREE_CONTEXT_BUFFER_FN FreeContextBuffer; + QUERY_SECURITY_PACKAGE_INFO_FN_A QuerySecurityPackageInfoA; + void *Reserved3; + void *Reserved4; + EXPORT_SECURITY_CONTEXT_FN ExportSecurityContext; + IMPORT_SECURITY_CONTEXT_FN_A ImportSecurityContextA; + ADD_CREDENTIALS_FN_A AddCredentialsA; + void *Reserved8; + QUERY_SECURITY_CONTEXT_TOKEN_FN QuerySecurityContextToken; + ENCRYPT_MESSAGE_FN EncryptMessage; + DECRYPT_MESSAGE_FN DecryptMessage; + SET_CONTEXT_ATTRIBUTES_FN_A SetContextAttributesA; +} SecurityFunctionTableA, *PSecurityFunctionTableA; /* No, it really is FreeCredentialsHandle, see the thread beginning * http://sourceforge.net/mailarchive/message.php?msg_id=4321080 for a * discovery discussion. */ -typedef struct _SECURITY_FUNCTION_TABLEW { - unsigned long dwVersion; - ENUMERATE_SECURITY_PACKAGES_FN_W EnumerateSecurityPackagesW; - QUERY_CREDENTIALS_ATTRIBUTES_FN_W QueryCredentialsAttributesW; - ACQUIRE_CREDENTIALS_HANDLE_FN_W AcquireCredentialsHandleW; - FREE_CREDENTIALS_HANDLE_FN FreeCredentialsHandle; - void SEC_FAR* Reserved2; - INITIALIZE_SECURITY_CONTEXT_FN_A InitializeSecurityContextA; - ACCEPT_SECURITY_CONTEXT_FN AcceptSecurityContext; - COMPLETE_AUTH_TOKEN_FN CompleteAuthToken; - DELETE_SECURITY_CONTEXT_FN DeleteSecurityContext; - APPLY_CONTROL_TOKEN_FN_W ApplyControlTokenW; - QUERY_CONTEXT_ATTRIBUTES_FN_W QueryContextAttributesW; - IMPERSONATE_SECURITY_CONTEXT_FN ImpersonateSecurityContext; - REVERT_SECURITY_CONTEXT_FN RevertSecurityContext; - MAKE_SIGNATURE_FN MakeSignature; - VERIFY_SIGNATURE_FN VerifySignature; - FREE_CONTEXT_BUFFER_FN FreeContextBuffer; - QUERY_SECURITY_PACKAGE_INFO_FN_A QuerySecurityPackageInfoA; - void SEC_FAR* Reserved3; - void SEC_FAR* Reserved4; - void SEC_FAR* Unknown1; - void SEC_FAR* Unknown2; - void SEC_FAR* Unknown3; - void SEC_FAR* Unknown4; - void SEC_FAR* Unknown5; - ENCRYPT_MESSAGE_FN EncryptMessage; - DECRYPT_MESSAGE_FN DecryptMessage; +typedef struct _SECURITY_FUNCTION_TABLE_W +{ + unsigned long dwVersion; + ENUMERATE_SECURITY_PACKAGES_FN_W EnumerateSecurityPackagesW; + QUERY_CREDENTIALS_ATTRIBUTES_FN_W QueryCredentialsAttributesW; + ACQUIRE_CREDENTIALS_HANDLE_FN_W AcquireCredentialsHandleW; + FREE_CREDENTIALS_HANDLE_FN FreeCredentialsHandle; + void *Reserved2; + INITIALIZE_SECURITY_CONTEXT_FN_W InitializeSecurityContextW; + ACCEPT_SECURITY_CONTEXT_FN AcceptSecurityContext; + COMPLETE_AUTH_TOKEN_FN CompleteAuthToken; + DELETE_SECURITY_CONTEXT_FN DeleteSecurityContext; + APPLY_CONTROL_TOKEN_FN ApplyControlToken; + QUERY_CONTEXT_ATTRIBUTES_FN_W QueryContextAttributesW; + IMPERSONATE_SECURITY_CONTEXT_FN ImpersonateSecurityContext; + REVERT_SECURITY_CONTEXT_FN RevertSecurityContext; + MAKE_SIGNATURE_FN MakeSignature; + VERIFY_SIGNATURE_FN VerifySignature; + FREE_CONTEXT_BUFFER_FN FreeContextBuffer; + QUERY_SECURITY_PACKAGE_INFO_FN_W QuerySecurityPackageInfoW; + void *Reserved3; + void *Reserved4; + EXPORT_SECURITY_CONTEXT_FN ExportSecurityContext; + IMPORT_SECURITY_CONTEXT_FN_W ImportSecurityContextW; + ADD_CREDENTIALS_FN_W AddCredentialsW; + void *Reserved8; + QUERY_SECURITY_CONTEXT_TOKEN_FN QuerySecurityContextToken; + ENCRYPT_MESSAGE_FN EncryptMessage; + DECRYPT_MESSAGE_FN DecryptMessage; + SET_CONTEXT_ATTRIBUTES_FN_W SetContextAttributesW; } SecurityFunctionTableW, *PSecurityFunctionTableW; -typedef struct _SECURITY_FUNCTION_TABLEA { - unsigned long dwVersion; - ENUMERATE_SECURITY_PACKAGES_FN_A EnumerateSecurityPackagesA; - QUERY_CREDENTIALS_ATTRIBUTES_FN_A QueryCredentialsAttributesA; - ACQUIRE_CREDENTIALS_HANDLE_FN_A AcquireCredentialsHandleA; - FREE_CREDENTIALS_HANDLE_FN FreeCredentialsHandle; - void SEC_FAR* Reserved2; - INITIALIZE_SECURITY_CONTEXT_FN_A InitializeSecurityContextA; - ACCEPT_SECURITY_CONTEXT_FN AcceptSecurityContext; - COMPLETE_AUTH_TOKEN_FN CompleteAuthToken; - DELETE_SECURITY_CONTEXT_FN DeleteSecurityContext; - APPLY_CONTROL_TOKEN_FN_A ApplyControlTokenA; - QUERY_CONTEXT_ATTRIBUTES_FN_A QueryContextAttributesA; - IMPERSONATE_SECURITY_CONTEXT_FN ImpersonateSecurityContext; - REVERT_SECURITY_CONTEXT_FN RevertSecurityContext; - MAKE_SIGNATURE_FN MakeSignature; - VERIFY_SIGNATURE_FN VerifySignature; - FREE_CONTEXT_BUFFER_FN FreeContextBuffer; - QUERY_SECURITY_PACKAGE_INFO_FN_A QuerySecurityPackageInfoA; - void SEC_FAR* Reserved3; - void SEC_FAR* Reserved4; - void SEC_FAR* Unknown1; - void SEC_FAR* Unknown2; - void SEC_FAR* Unknown3; - void SEC_FAR* Unknown4; - void SEC_FAR* Unknown5; - ENCRYPT_MESSAGE_FN EncryptMessage; - DECRYPT_MESSAGE_FN DecryptMessage; -} SecurityFunctionTableA, *PSecurityFunctionTableA; -typedef PSecurityFunctionTableA (WINAPI *INIT_SECURITY_INTERFACE_A)(VOID); -typedef PSecurityFunctionTableW (WINAPI *INIT_SECURITY_INTERFACE_W)(VOID); - -SECURITY_STATUS WINAPI FreeCredentialsHandle(PCredHandle); -SECURITY_STATUS WINAPI EnumerateSecurityPackagesA(PULONG,PSecPkgInfoA*); -SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG,PSecPkgInfoW*); -SECURITY_STATUS WINAPI AcquireCredentialsHandleA(SEC_CHAR*,SEC_CHAR*,ULONG,PLUID,PVOID,SEC_GET_KEY_FN,PVOID,PCredHandle,PTimeStamp); -SECURITY_STATUS WINAPI AcquireCredentialsHandleW(SEC_WCHAR*,SEC_WCHAR*,ULONG,PLUID,PVOID,SEC_GET_KEY_FN,PVOID,PCredHandle,PTimeStamp); -SECURITY_STATUS WINAPI AcceptSecurityContext(PCredHandle,PCtxtHandle,PSecBufferDesc,ULONG,ULONG,PCtxtHandle,PSecBufferDesc,PULONG,PTimeStamp); -SECURITY_STATUS WINAPI InitializeSecurityContextA(PCredHandle,PCtxtHandle,SEC_CHAR*,ULONG,ULONG,ULONG,PSecBufferDesc,ULONG,PCtxtHandle,PSecBufferDesc,PULONG,PTimeStamp); -SECURITY_STATUS WINAPI InitializeSecurityContextW(PCredHandle,PCtxtHandle,SEC_WCHAR*,ULONG,ULONG,ULONG,PSecBufferDesc,ULONG,PCtxtHandle,PSecBufferDesc,PULONG,PTimeStamp); -SECURITY_STATUS WINAPI FreeContextBuffer(PVOID); -SECURITY_STATUS WINAPI QueryContextAttributesA(PCtxtHandle,ULONG,PVOID); -SECURITY_STATUS WINAPI QueryContextAttributesW(PCtxtHandle,ULONG,PVOID); -SECURITY_STATUS WINAPI QueryCredentialsAttributesA(PCredHandle,ULONG,PVOID); -SECURITY_STATUS WINAPI QueryCredentialsAttributesW(PCredHandle,ULONG,PVOID); -SECURITY_STATUS WINAPI DecryptMessage(PCtxtHandle,PSecBufferDesc,ULONG,PULONG); -SECURITY_STATUS WINAPI EncryptMessage(PCtxtHandle,ULONG,PSecBufferDesc,ULONG); -SECURITY_STATUS WINAPI DeleteSecurityContext(PCtxtHandle); -SECURITY_STATUS WINAPI CompleteAuthToken(PCtxtHandle,PSecBufferDesc); -SECURITY_STATUS WINAPI ApplyControlTokenA(PCtxtHandle,PSecBufferDesc); -SECURITY_STATUS WINAPI ApplyControlTokenW(PCtxtHandle,PSecBufferDesc); -SECURITY_STATUS WINAPI ImpersonateSecurityContext(PCtxtHandle); -SECURITY_STATUS WINAPI RevertSecurityContext(PCtxtHandle); -SECURITY_STATUS WINAPI MakeSignature(PCtxtHandle,ULONG,PSecBufferDesc,ULONG); -SECURITY_STATUS WINAPI VerifySignature(PCtxtHandle,PSecBufferDesc,ULONG,PULONG); -SECURITY_STATUS WINAPI QuerySecurityPackageInfoA(SEC_CHAR*,PSecPkgInfoA*); -SECURITY_STATUS WINAPI QuerySecurityPackageInfoW(SEC_WCHAR*,PSecPkgInfoW*); -PSecurityFunctionTableA WINAPI InitSecurityInterfaceA(VOID); -PSecurityFunctionTableW WINAPI InitSecurityInterfaceW(VOID); - -#ifdef UNICODE -#define UNISP_NAME UNISP_NAME_W -#define SecPkgInfo SecPkgInfoW -#define PSecPkgInfo PSecPkgInfoW -#define SecPkgCredentialsNames SecPkgCredentialsNamesW -#define PSecPkgCredentialsNames PSecPkgCredentialsNamesW -#define SecPkgContext_Authority SecPkgContext_AuthorityW -#define PSecPkgContext_Authority PSecPkgContext_AuthorityW -#define SecPkgContext_KeyInfo SecPkgContext_KeyInfoW -#define PSecPkgContext_KeyInfo PSecPkgContext_KeyInfoW -#define SecPkgContext_Names SecPkgContext_NamesW -#define PSecPkgContext_Names PSecPkgContext_NamesW -#define SecurityFunctionTable SecurityFunctionTableW -#define PSecurityFunctionTable PSecurityFunctionTableW -#define AcquireCredentialsHandle AcquireCredentialsHandleW -#define EnumerateSecurityPackages EnumerateSecurityPackagesW -#define InitializeSecurityContext InitializeSecurityContextW -#define QueryContextAttributes QueryContextAttributesW -#define QueryCredentialsAttributes QueryCredentialsAttributesW -#define QuerySecurityPackageInfo QuerySecurityPackageInfoW -#define ApplyControlToken ApplyControlTokenW -#define ENUMERATE_SECURITY_PACKAGES_FN ENUMERATE_SECURITY_PACKAGES_FN_W -#define QUERY_CREDENTIALS_ATTRIBUTES_FN QUERY_CREDENTIALS_ATTRIBUTES_FN_W -#define ACQUIRE_CREDENTIALS_HANDLE_FN ACQUIRE_CREDENTIALS_HANDLE_FN_W -#define INITIALIZE_SECURITY_CONTEXT_FN INITIALIZE_SECURITY_CONTEXT_FN_W -#define APPLY_CONTROL_TOKEN_FN APPLY_CONTROL_TOKEN_FN_W -#define QUERY_CONTEXT_ATTRIBUTES_FN QUERY_CONTEXT_ATTRIBUTES_FN_W -#define QUERY_SECURITY_PACKAGE_INFO_FN QUERY_SECURITY_PACKAGE_INFO_FN_W -#define INIT_SECURITY_INTERFACE INIT_SECURITY_INTERFACE_W -#else -#define UNISP_NAME UNISP_NAME_A -#define SecPkgInfo SecPkgInfoA -#define PSecPkgInfo PSecPkgInfoA -#define SecPkgCredentialsNames SecPkgCredentialsNamesA -#define PSecPkgCredentialsNames PSecPkgCredentialsNamesA -#define SecPkgContext_Authority SecPkgContext_AuthorityA -#define PSecPkgContext_Authority PSecPkgContext_AuthorityA -#define SecPkgContext_KeyInfo SecPkgContext_KeyInfoA -#define PSecPkgContext_KeyInfo PSecPkgContext_KeyInfoA -#define SecPkgContext_Names SecPkgContext_NamesA -#define PSecPkgContext_Names PSecPkgContext_NamesA -#define SecurityFunctionTable SecurityFunctionTableA -#define PSecurityFunctionTable PSecurityFunctionTableA -#define AcquireCredentialsHandle AcquireCredentialsHandleA -#define EnumerateSecurityPackages EnumerateSecurityPackagesA -#define InitializeSecurityContext InitializeSecurityContextA -#define QueryContextAttributes QueryContextAttributesA -#define QueryCredentialsAttributes QueryCredentialsAttributesA -#define QuerySecurityPackageInfo QuerySecurityPackageInfoA -#define ApplyControlToken ApplyControlTokenA -#define ENUMERATE_SECURITY_PACKAGES_FN ENUMERATE_SECURITY_PACKAGES_FN_A -#define QUERY_CREDENTIALS_ATTRIBUTES_FN QUERY_CREDENTIALS_ATTRIBUTES_FN_A -#define ACQUIRE_CREDENTIALS_HANDLE_FN ACQUIRE_CREDENTIALS_HANDLE_FN_A -#define INITIALIZE_SECURITY_CONTEXT_FN INITIALIZE_SECURITY_CONTEXT_FN_A -#define APPLY_CONTROL_TOKEN_FN APPLY_CONTROL_TOKEN_FN_A -#define QUERY_CONTEXT_ATTRIBUTES_FN QUERY_CONTEXT_ATTRIBUTES_FN_A -#define QUERY_SECURITY_PACKAGE_INFO_FN QUERY_SECURITY_PACKAGE_INFO_FN_A -#define INIT_SECURITY_INTERFACE INIT_SECURITY_INTERFACE_A -#endif + +#define SecurityFunctionTable WINELIB_NAME_AW(SecurityFunctionTable) +#define PSecurityFunctionTable WINELIB_NAME_AW(PSecurityFunctionTable) + +#define SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION 1 +#define SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION_2 2 + +PSecurityFunctionTableA SEC_ENTRY InitSecurityInterfaceA(void); +PSecurityFunctionTableW SEC_ENTRY InitSecurityInterfaceW(void); +#define InitSecurityInterface WINELIB_NAME_AW(InitSecurityInterface) + +typedef PSecurityFunctionTableA (SEC_ENTRY *INIT_SECURITY_INTERFACE_A)(void); +typedef PSecurityFunctionTableW (SEC_ENTRY *INIT_SECURITY_INTERFACE_W)(void); +#define INIT_SECURITY_INTERFACE WINELIB_NAME_AW(INIT_SECURITY_INTERFACE_) #ifdef __cplusplus } #endif -#endif + +#endif /* ndef __WINE_SSPI_H__ */

1 0

[ion] 23901: - Add Ke386SetInterruptDescriptorTable inlined function to set the IDT. - Rename and fixup initial stacks, instead of using 16 different variables all with confusining meanings and values. Define P0BootStack as the initial kernel stack, and KiDoubleFaultStack as the double-fault trap (and initial DPC) stack. - Fix call to KiInitializePcr which was setting an incorrect DPC stack. - Make space on the initial stack for a KTRAP_FRAME as well, not only for the FPU save area. - Also push
by ion＠svn.reactos.org 03 Sep '06

03 Sep '06

Author: ion Date: Sun Sep 3 23:57:55 2006 New Revision: 23901 URL: http://svn.reactos.org/svn/reactos?rev=23901&view=rev Log: - Add Ke386SetInterruptDescriptorTable inlined function to set the IDT. - Rename and fixup initial stacks, instead of using 16 different variables all with confusining meanings and values. Define P0BootStack as the initial kernel stack, and KiDoubleFaultStack as the double-fault trap (and initial DPC) stack. - Fix call to KiInitializePcr which was setting an incorrect DPC stack. - Make space on the initial stack for a KTRAP_FRAME as well, not only for the FPU save area. - Also push initial CR0 NPX state on the initial stack. - Load the IDT and GDT directly in KiRosPrepareForSystemStartup. - Completely rewrite main_asm.S in Intel syntax and clean it up. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/i386/main_asm.S trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/main.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/ps/idle.c Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2390… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Sun Sep 3 23:57:55 2006 @@ -493,6 +493,11 @@ // Kernel Feature Bits // #define KF_RDTSC 0x00000002 + +// +// Kernel Stack Size +// +#define KERNEL_STACK_SIZE 0x3000 #endif // 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 Sep 3 23:57:55 2006 @@ -145,6 +145,10 @@ __asm__("lldt %0\n\t" \ : /* no outputs */ \ : "m" (X)); +#define Ke386SetInterruptDescriptorTable(X) \ + __asm__("lidt %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); #define Ke386SetGlobalDescriptorTable(X) \ __asm__("lgdt %0\n\t" \ : /* no outputs */ \ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Sun Sep 3 23:57:55 2006 @@ -96,7 +96,11 @@ extern BOOLEAN KeI386VirtualIntExtensions; extern KIDTENTRY KiIdt[]; extern KGDTENTRY KiBootGdt[]; +extern KDESCRIPTOR KiGdtDescriptor; +extern KDESCRIPTOR KiIdtDescriptor; extern KTSS KiBootTss; +extern UCHAR P0BootStack[]; +extern UCHAR KiDoubleFaultStack[]; extern FAST_MUTEX KernelAddressSpaceLock; extern ULONG KiMaximumDpcQueueDepth; extern ULONG KiMinimumDpcRate; @@ -119,7 +123,6 @@ extern PKPRCB KiProcessorBlock[]; extern ULONG KiMask32Array[MAXIMUM_PRIORITY]; extern ULONG IdleProcessorMask; -extern ULONG trap_stack_top; extern VOID KiTrap8(VOID); extern VOID KiTrap2(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 Sep 3 23:57:55 2006 @@ -582,7 +582,7 @@ Tss = (PKTSS)KiDoubleFaultTSS; KiInitializeTSS(Tss); Tss->CR3 = _Ke386GetCr(3); - Tss->Esp0 = trap_stack_top; + Tss->Esp0 = PtrToUlong(KiDoubleFaultStack); Tss->Eip = PtrToUlong(KiTrap8); Tss->Cs = KGDT_R0_CODE; Tss->Fs = KGDT_R0_PCR; @@ -613,7 +613,7 @@ Tss = (PKTSS)KiNMITSS; KiInitializeTSS(Tss); Tss->CR3 = _Ke386GetCr(3); - Tss->Esp0 = trap_stack_top; + Tss->Esp0 = PtrToUlong(KiDoubleFaultStack); Tss->Eip = PtrToUlong(KiTrap2); Tss->Cs = KGDT_R0_CODE; Tss->Fs = KGDT_R0_PCR; Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Sun Sep 3 23:57:55 2006 @@ -26,7 +26,7 @@ EPROCESS KiInitialProcess; extern ULONG Ke386GlobalPagesEnabled; -extern PVOID trap_stack, init_stack; +extern PVOID trap_stack; /* System-defined Spinlocks */ KSPIN_LOCK KiDispatcherLock; @@ -514,7 +514,7 @@ KiBootGdt, &KiBootTss, &KiInitialThread.Tcb, - trap_stack); + KiDoubleFaultStack); /* Set us as the current process */ KiInitialThread.Tcb.ApcState.Process = &KiInitialProcess.Pcb; @@ -554,7 +554,7 @@ /* Call main kernel intialization */ KiInitializeKernel(&KiInitialProcess.Pcb, &KiInitialThread.Tcb, - init_stack, + P0BootStack, Prcb, Cpu, LoaderBlock); Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/main_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/main_asm.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/main_asm.S Sun Sep 3 23:57:55 2006 @@ -1,46 +1,45 @@ -#include <roscfg.h> -#include <ndk/asm.h> +/* + * FILE: ntoskrnl/ke/i386/main_asm.S + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: Kernel Bootstrap Code + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ -#define AP_MAGIC (0x12481020) +/* INCLUDES ******************************************************************/ -.global _kernel_stack -.global _kernel_stack_top -.global _kernel_trap_stack -.global _kernel_trap_stack_top +#include <asm.h> +.intel_syntax noprefix -.globl _NtProcessStartup +/* GLOBALS *******************************************************************/ .bss -.align 4096 +.align 16 +/* Kernel Boot Stack */ +.globl _P0BootStack +.space KERNEL_STACK_SIZE +_P0BootStack: -/* guard page for the kernel stack */ -.fill 4096, 1, 0 +/* Kernel Double-Fault and Temporary DPC Stack */ +.globl _KiDoubleFaultStack +.space KERNEL_STACK_SIZE +_KiDoubleFaultStack: -_kernel_stack: -.fill 3*4096, 1, 0 -_kernel_stack_top: +/* FUNCTIONS *****************************************************************/ -/* guard page for the trap stack */ -.fill 4096, 1, 0 - -_kernel_trap_stack: -.fill 3*4096, 1, 0 -_kernel_trap_stack_top: - .text - +.func NtProcessStartup _NtProcessStartup: - /* FIXME: Application processors should have their own GDT/IDT */ - lgdt _KiGdtDescriptor - lidt _KiIdtDescriptor + /* Load the initial kernel stack */ + lea eax, _P0BootStack + sub eax, (NPX_FRAME_LENGTH + KTRAP_FRAME_LENGTH + KTRAP_FRAME_ALIGN) + mov esp, eax - /* Load the initial kernel stack */ - lea _kernel_stack_top, %eax - sub $(SIZEOF_FX_SAVE_AREA), %eax - movl %eax, %esp + /* Save initial CR0 state */ + push CR0_EM + CR0_TS + CR0_MP /* Call the main kernel initialization */ - pushl %edx + push edx call _KiRosPrepareForSystemStartup@4 +.endfunc 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 Sep 3 23:57:55 2006 @@ -86,9 +86,6 @@ _UnexpectedMsg: .asciz "\n\x7\x7!!! Unexpected Interrupt %02lx !!!\n" -Broken: - .asciz "\n\x7\x7!!! Broken TrapFrame. Magic: %08lx MagicB: %08lx!!!\n" - /* SOFTWARE INTERRUPT SERVICES ***********************************************/ _KiGetTickCount: Modified: trunk/reactos/ntoskrnl/ke/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/main.c?rev=239… ============================================================================== --- trunk/reactos/ntoskrnl/ke/main.c (original) +++ trunk/reactos/ntoskrnl/ke/main.c Sun Sep 3 23:57:55 2006 @@ -48,18 +48,6 @@ ULONG KeLargestCacheLine = 0x40; /* FIXME: Arch-specific */ -/* the initial stacks are declared in main_asm.S */ -extern ULONG kernel_stack; -extern ULONG kernel_stack_top; -extern ULONG kernel_trap_stack; -extern ULONG kernel_trap_stack_top; - -/* These point to the aligned 3 pages */ -ULONG init_stack = (ULONG)&kernel_stack; -ULONG init_stack_top = (ULONG)&kernel_stack_top; -ULONG trap_stack = (ULONG)&kernel_trap_stack; -ULONG trap_stack_top = (ULONG)&kernel_trap_stack_top; - /* Cached modules from the loader block */ PLOADER_MODULE CachedModules[MaximumCachedModuleType]; @@ -97,6 +85,10 @@ PIMAGE_OPTIONAL_HEADER OptHead; CHAR* s; + /* Load the GDT and IDT */ + Ke386SetGlobalDescriptorTable(KiGdtDescriptor); + Ke386SetInterruptDescriptorTable(KiIdtDescriptor); + /* Copy the Loader Block Data locally since Low-Memory will be wiped */ memcpy(&KeLoaderBlock, LoaderBlock, sizeof(ROS_LOADER_PARAMETER_BLOCK)); memcpy(&KeLoaderModules[1], Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Sun Sep 3 23:57:55 2006 @@ -35,10 +35,6 @@ PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; - -extern ULONG init_stack; -extern ULONG init_stack_top; -extern ULONG trap_stack; VOID INIT_FUNCTION NTAPI MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG KernelLength); @@ -394,10 +390,6 @@ AddressRangeCount); kernel_len = LastKrnlPhysAddr - FirstKrnlPhysAddr; - /* Unmap the guard pages from the initial stacks */ - MmDeleteVirtualMapping(NULL, (PVOID)(init_stack - PAGE_SIZE), FALSE, NULL, NULL); - MmDeleteVirtualMapping(NULL, (PVOID)(trap_stack - PAGE_SIZE), FALSE, NULL, NULL); - /* * Unmap low memory */ Modified: trunk/reactos/ntoskrnl/ps/idle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/idle.c?rev=239… ============================================================================== --- trunk/reactos/ntoskrnl/ps/idle.c (original) +++ trunk/reactos/ntoskrnl/ps/idle.c Sun Sep 3 23:57:55 2006 @@ -59,19 +59,19 @@ BOOLEAN First) { PETHREAD Thread; - ULONG_PTR KernelStack; - extern unsigned int init_stack_top; + PVOID KernelStack; Thread = ExAllocatePool(NonPagedPool, sizeof(ETHREAD)); RtlZeroMemory(Thread, sizeof(ETHREAD)); Thread->ThreadsProcess = Process; if (First) { - KernelStack = init_stack_top; + KernelStack = P0BootStack; } else { - KernelStack = (ULONG_PTR)MmCreateKernelStack(FALSE) + KERNEL_STACK_SIZE; + KernelStack = (PVOID)((ULONG_PTR)MmCreateKernelStack(FALSE) + + KERNEL_STACK_SIZE); } KeInitializeThread(&Process->Pcb, &Thread->Tcb, @@ -80,7 +80,7 @@ NULL, NULL, NULL, - (PVOID)KernelStack); + KernelStack); InitializeListHead(&Thread->IrpList); *ThreadPtr = Thread; return STATUS_SUCCESS;

1 0

[fireball] 23900: Add comptypeDIB definition to headers
by fireball＠svn.reactos.org 03 Sep '06

03 Sep '06

Author: fireball Date: Sun Sep 3 23:38:16 2006 New Revision: 23900 URL: http://svn.reactos.org/svn/reactos?rev=23900&view=rev Log: Add comptypeDIB definition to headers Modified: trunk/reactos/include/psdk/vfw.h Modified: trunk/reactos/include/psdk/vfw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/vfw.h?rev=239… ============================================================================== --- trunk/reactos/include/psdk/vfw.h (original) +++ trunk/reactos/include/psdk/vfw.h Sun Sep 3 23:38:16 2006 @@ -368,6 +368,10 @@ #ifndef aviTWOCC #define aviTWOCC(ch0,ch1) ((WORD)(BYTE)(ch0)|((WORD)(BYTE)(ch1)<<8)) #endif +#ifndef comptypeDIB +#define comptypeDIB mmioFOURCC('D','I','B',' ') +#endif + #ifndef RC_INVOKED DECLARE_HANDLE(HIC);

1 0

[greatlrd] 23899: Fixed one more bug, we did create wrong bpp if we got HDC = NULL for CreateDIBitmap, when I read wine code it is always 1Bpp and 1Plans and we are doing same now if HDC is NULL, some wine test deepness on it. Hopply it will take care of some program problem.
by greatlrd＠svn.reactos.org 03 Sep '06

03 Sep '06

Author: greatlrd Date: Sun Sep 3 22:16:08 2006 New Revision: 23899 URL: http://svn.reactos.org/svn/reactos?rev=23899&view=rev Log: Fixed one more bug, we did create wrong bpp if we got HDC = NULL for CreateDIBitmap, when I read wine code it is always 1Bpp and 1Plans and we are doing same now if HDC is NULL, some wine test deepness on it. Hopply it will take care of some program problem. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Sun Sep 3 22:16:08 2006 @@ -795,7 +795,8 @@ if (NULL == hDc) - { + { + BITMAPINFOHEADER *change_Header = (BITMAPINFOHEADER *)Header; hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); if (hDc == NULL) { @@ -810,6 +811,9 @@ return NULL; } + change_Header->biBitCount = 1; + change_Header->biPlanes = 1; + Bmp = IntCreateDIBitmap(Dc, Header, Init, Bits, Data, ColorUse); DC_UnlockDc(Dc); NtGdiDeleteObjectApp(hDc);

1 0

[ion] 23898: - Add Ke386SetFs, Ds, Es (using Ke386SetSeg) and Ke386SetTr new inlined commands. - Also setup an NMI Task gate after the double fault task gate. Will be useful when we hand to handle NMIs later. - Setup FS in KiSystemStartup and initialize the TSS before the PCR. Also add a bit more support for SMP systems (To skip boot-cpu-only initialization). - Also setup DS/ES directly in KiSystemStartup. - Initialize KD at phase 0 in KiSystemStartup, not in KiInitializeKernel, and also check f
by ion＠svn.reactos.org 03 Sep '06

03 Sep '06

Author: ion Date: Sun Sep 3 21:18:08 2006 New Revision: 23898 URL: http://svn.reactos.org/svn/reactos?rev=23898&view=rev Log: - Add Ke386SetFs, Ds, Es (using Ke386SetSeg) and Ke386SetTr new inlined commands. - Also setup an NMI Task gate after the double fault task gate. Will be useful when we hand to handle NMIs later. - Setup FS in KiSystemStartup and initialize the TSS before the PCR. Also add a bit more support for SMP systems (To skip boot-cpu-only initialization). - Also setup DS/ES directly in KiSystemStartup. - Initialize KD at phase 0 in KiSystemStartup, not in KiInitializeKernel, and also check for debug break at this time. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/i386/main_asm.S trunk/reactos/ntoskrnl/ke/i386/trap.s 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 Sep 3 21:18:08 2006 @@ -164,6 +164,9 @@ __d; \ }) #define _Ke386SetCr(N,X) __asm__ __volatile__("movl %0,%%cr" #N : :"r" (X)); +#define Ke386SetTr(X) __asm__ __volatile__("ltr %%ax" : :"a" (X)); + +#define _Ke386SetSeg(N,X) __asm__ __volatile__("movl %0,%%" #N : :"r" (X)); #define Ke386GetCr0() _Ke386GetCr(0) #define Ke386SetCr0(X) _Ke386SetCr(0,X) @@ -172,6 +175,9 @@ #define Ke386GetCr4() _Ke386GetCr(4) #define Ke386SetCr4(X) _Ke386SetCr(4,X) #define Ke386GetSs() _Ke386GetSeg(ss) +#define Ke386SetFs(X) _Ke386SetSeg(fs, X) +#define Ke386SetDs(X) _Ke386SetSeg(ds, X) +#define Ke386SetEs(X) _Ke386SetSeg(es, X) static inline LONG Ke386TestAndClearBit(ULONG BitPos, volatile PULONG Addr) { Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Sun Sep 3 21:18:08 2006 @@ -121,6 +121,7 @@ extern ULONG IdleProcessorMask; extern ULONG trap_stack_top; extern VOID KiTrap8(VOID); +extern VOID KiTrap2(VOID); /* MACROS *************************************************************************/ 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 Sep 3 21:18:08 2006 @@ -25,6 +25,9 @@ /* The TSS to use for Double Fault Traps (INT 0x9) */ UCHAR KiDoubleFaultTSS[KTSS_IO_MAPS]; + +/* The TSS to use for NMI Fault Traps (INT 0x2) */ +UCHAR KiNMITSS[KTSS_IO_MAPS]; /* The Boot GDT (FIXME: should have more entries */ KGDTENTRY KiBootGdt[12] = @@ -563,7 +566,7 @@ TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); /* Load the task register */ - __asm__("ltr %%ax":: "a" (KGDT_TSS)); + Ke386SetTr(KGDT_TSS); /* Setup the Task Gate for Double Fault Traps */ TaskGateEntry = &KiIdt[8]; @@ -589,6 +592,37 @@ /* Setup the Double Trap TSS entry in the GDT */ TssEntry = &KiBootGdt[KGDT_DF_TSS / sizeof(KGDTENTRY)]; + TssEntry->HighWord.Bits.Type = I386_TSS; + TssEntry->HighWord.Bits.Pres = 1; + TssEntry->HighWord.Bits.Dpl = 0; + TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); + TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); + TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); + TssEntry->LimitLow = KTSS_IO_MAPS; + + /* Now setup the NMI Task Gate */ + TaskGateEntry = &KiIdt[2]; + TaskGateAccess = (PKIDT_ACCESS)&TaskGateEntry->Access; +#if 0 + TaskGateAccess->SegmentType = I386_TASK_GATE; + TaskGateAccess->Present = 1; + TaskGateEntry->Selector = KGDT_NMI_TSS; +#endif + + /* Initialize the actual TSS */ + Tss = (PKTSS)KiNMITSS; + KiInitializeTSS(Tss); + Tss->CR3 = _Ke386GetCr(3); + Tss->Esp0 = trap_stack_top; + Tss->Eip = PtrToUlong(KiTrap2); + Tss->Cs = KGDT_R0_CODE; + Tss->Fs = KGDT_R0_PCR; + Tss->Ss = Ke386GetSs(); + Tss->Es = KGDT_R3_DATA | RPL_MASK; + Tss->Ds = KGDT_R3_DATA | RPL_MASK; + + /* And its associated TSS Entry */ + TssEntry = &KiBootGdt[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/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Sun Sep 3 21:18:08 2006 @@ -435,9 +435,6 @@ Prcb->NextThread = NULL; //Prcb->IdleThread = InitThread; - /* Initialize the Debugger */ - KdInitSystem (0, &KeLoaderBlock); - /* Initialize the Kernel Executive */ ExpInitializeExecutive(); @@ -489,10 +486,25 @@ NTAPI KiSystemStartup(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { - /* Currently hacked for CPU 0 only */ - ULONG Cpu = 0; + ULONG Cpu; PKIPCR Pcr = (PKIPCR)KPCR_BASE; PKPRCB Prcb; + + /* Save the loader block and get the current CPU */ + //KeLoaderBlock = LoaderBlock; + Cpu = KeNumberProcessors; + if (!Cpu) + { + /* If this is the boot CPU, set FS and the CPU Number*/ + Ke386SetFs(KGDT_R0_PCR); + KeGetPcr()->Number = Cpu; + } + + /* Skip initial setup if this isn't the Boot CPU */ + if (Cpu) goto AppCpuInit; + + /* Setup the boot (Freeldr should've done), double fault and NMI TSS */ + Ki386InitializeTss(); /* Initialize the PCR */ RtlZeroMemory(Pcr, PAGE_SIZE); @@ -503,7 +515,6 @@ &KiBootTss, &KiInitialThread.Tcb, trap_stack); - Prcb = Pcr->Prcb; /* Set us as the current process */ KiInitialThread.Tcb.ApcState.Process = &KiInitialProcess.Pcb; @@ -512,10 +523,13 @@ Pcr->PrcbData.ProcessorState.SpecialRegisters.KernelDr6 = 0; Pcr->PrcbData.ProcessorState.SpecialRegisters.KernelDr7 = 0; - /* Setup the boot (Freeldr should've done), double fault and NMI TSS */ - Ki386InitializeTss(); + /* Load Ring 3 selectors for DS/ES */ + Ke386SetDs(KGDT_R3_DATA | RPL_MASK); + Ke386SetEs(KGDT_R3_DATA | RPL_MASK); /* Setup CPU-related fields */ +AppCpuInit: + Prcb = Pcr->Prcb; Pcr->Number = Cpu; Pcr->SetMember = 1 << Cpu; Pcr->SetMemberCopy = 1 << Cpu; @@ -527,6 +541,12 @@ /* Set active processors */ KeActiveProcessors |= Pcr->SetMember; KeNumberProcessors++; + + /* Initialize the Debugger for the Boot CPU */ + if (!Cpu) KdInitSystem (0, &KeLoaderBlock); + + /* Check for break-in */ + if (KdPollBreakIn()) DbgBreakPointWithStatus(1); /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/main_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/main_asm.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/main_asm.S Sun Sep 3 21:18:08 2006 @@ -36,19 +36,6 @@ lgdt _KiGdtDescriptor lidt _KiIdtDescriptor - /* Load the PCR selector */ - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - - /* Load DS/ES (with override) */ - .intel_syntax noprefix - mov eax, KGDT_R3_DATA + RPL_MASK - .byte 0x66 - mov ds, ax - .byte 0x66 - mov es, ax - .att_syntax - /* Load the initial kernel stack */ lea _kernel_stack_top, %eax sub $(SIZEOF_FX_SAVE_AREA), %eax 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 Sep 3 21:18:08 2006 @@ -826,6 +826,7 @@ int 3 .endfunc +.globl _KiTrap2 .func KiTrap2 _KiTrap2:

1 0

[winesync] 23897: Delete vendor import of dlls with are now autosynced with Wine (see reactos/media/doc/README.WINE for the complete list)
by winesync＠svn.reactos.org 03 Sep '06

03 Sep '06

Author: winesync Date: Sun Sep 3 17:56:49 2006 New Revision: 23897 URL: http://svn.reactos.org/svn/reactos?rev=23897&view=rev Log: Delete vendor import of dlls with are now autosynced with Wine (see reactos/media/doc/README.WINE for the complete list) Removed: vendor/wine/dlls/avifil32/ vendor/wine/dlls/cabinet/ vendor/wine/dlls/comctl32/ vendor/wine/dlls/crypt32/ vendor/wine/dlls/cryptdll/ vendor/wine/dlls/imm32/ vendor/wine/dlls/mapi32/ vendor/wine/dlls/mpr/ vendor/wine/dlls/msi/ vendor/wine/dlls/msimg32/ vendor/wine/dlls/objsel/ vendor/wine/dlls/oleacc/ vendor/wine/dlls/oledlg/ vendor/wine/dlls/olepro32/ vendor/wine/dlls/richedit/ vendor/wine/dlls/shfolder/ vendor/wine/dlls/uxtheme/ vendor/wine/dlls/wintrust/

1 0

← Newer
1
...
7
8
9
10
11
12
13
14
15
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2006