Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[sginsberg] 69150: - After reviewing, updating and tweaking the base modules (ntos, hal, ntdll, kernel32, advapi32, gdi32, user32, shell32, win32k) we should now be as (in)compatible with Windows 2...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Sep 9 15:35:49 2015 New Revision: 69150 URL: http://svn.reactos.org/svn/reactos?rev=69150&view=rev Log: - After reviewing, updating and tweaking the base modules (ntos, hal, ntdll, kernel32, advapi32, gdi32, user32, shell32, win32k) we should now be as (in)compatible with Windows 2003 Service Pack 1 as with Service Pack 2, so finally report our version as "NT Build 3790.3959" (SP2). Thanks to Thomas and Hermes for assistance. See CORE-6611 and CORE-7889 Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/include/psdk/ntverp.h Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Sep 9 15:35:49 2015 @@ -1222,7 +1222,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkstation",0x00010001,0x00000000 ; Some installers check for SP1 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDReleaseType",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000200 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x00000012 Modified: trunk/reactos/include/psdk/ntverp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntverp.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/ntverp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntverp.h [iso-8859-1] Wed Sep 9 15:35:49 2015 @@ -14,10 +14,10 @@ */ // -// Windows NT Build 3790.1830 +// Windows NT Build 3790.3959 // #define VER_PRODUCTBUILD 3790 -#define VER_PRODUCTBUILD_QFE 1830 +#define VER_PRODUCTBUILD_QFE 3959 // // Windows NT Version 5.2

9 years, 7 months

[ion] 69149: [BOOTMGFW] - Fix a bunch of bugs

by ion＠svn.reactos.org

Author: ion Date: Wed Sep 9 14:59:29 2015 New Revision: 69149 URL: http://svn.reactos.org/svn/reactos?rev=69149&view=rev Log: [BOOTMGFW] - Fix a bunch of bugs Modified: trunk/reactos/boot/environ/lib/misc/util.c trunk/reactos/boot/environ/lib/mm/descriptor.c trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/lib/misc/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/util… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] Wed Sep 9 14:59:29 2015 @@ -201,17 +201,17 @@ ) { PVOID Entry = NULL; - ULONG Index = 0; + ULONG Index; BOOLEAN Result; /* Check for invalid parameters */ - if (!(Table) || !(EntryIndex) || !(Count)) + if (!(Table) || !(EntryIndex)) { return Entry; } /* Loop each entry in the table */ - while (Index < Count) + for (Index = 0; Index < Count; Index++) { /* Check if this entry is filled out */ if (Table[Index]) Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Wed Sep 9 14:59:29 2015 @@ -751,7 +751,7 @@ /* Bail out if the type doesn't match */ if (Descriptor->Type != MemoryType) { - //EarlyPrint(L"Incorrect descriptor type\r\n"); + //EfiPrintf(L"Incorrect descriptor type: %lx %lx\r\n", Descriptor->Type, MemoryType); return FALSE; } @@ -761,7 +761,7 @@ NewDescriptor->Type = Descriptor->Type; NewDescriptor->VirtualPage = VirtualPage; NewDescriptor->Flags = Descriptor->Flags; - //EarlyPrint(L"Found a matching descriptor: %08I64X with %08I64X pages\r\n", BasePage, Pages); + //EfiPrintf(L"Found a matching descriptor: %08I64X with %08I64X pages\r\n", BasePage, Pages); return TRUE; } @@ -795,8 +795,8 @@ } /* Save the links */ - OldFlink = OldDescriptor->ListEntry.Blink; - OldBlink = OldDescriptor->ListEntry.Flink; + OldBlink = OldDescriptor->ListEntry.Blink; + OldFlink = OldDescriptor->ListEntry.Flink; /* Make the copy */ *Descriptor = *OldDescriptor; Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Wed Sep 9 14:59:29 2015 @@ -84,13 +84,13 @@ ListHead = CurrentList->First; if (Request->Type & BL_MM_REQUEST_TOP_DOWN_TYPE) { + NextEntry = ListHead->Blink; + TopDown = TRUE; + } + else + { NextEntry = ListHead->Flink; TopDown = FALSE; - } - else - { - NextEntry = ListHead->Blink; - TopDown = TRUE; } /* Loop through the list */

9 years, 7 months

[sginsberg] 69148: Some of this sneaked past in my last commit, so commit the rest: - Wrap some KDBG-only stuff into KDBG-define so we don't have KdSystemDebugControl being called needlessly on KD-...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Sep 9 14:00:43 2015 New Revision: 69148 URL: http://svn.reactos.org/svn/reactos?rev=69148&view=rev Log: Some of this sneaked past in my last commit, so commit the rest: - Wrap some KDBG-only stuff into KDBG-define so we don't have KdSystemDebugControl being called needlessly on KD-builds. Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] Wed Sep 9 14:00:43 2015 @@ -862,6 +862,7 @@ /* b - Bugcheck */ KeBugCheck(MANUALLY_INITIATED_CRASH); } +#if defined(KDBG) else { /* Send request to the kernel debugger. @@ -874,6 +875,7 @@ NULL, KernelMode); } +#endif } } Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidebug… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] Wed Sep 9 14:00:43 2015 @@ -2,7 +2,7 @@ #define GDI_DBG_MAX_BTS 10 -#if DBG +#if DBG && defined(KDBG) #define ASSERT_NOGDILOCKS() GdiDbgAssertNoLocks(__FILE__,__LINE__) #define KeRosDumpStackFrames(Frames, Count) \ KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) @@ -36,7 +36,7 @@ #endif -#if KDBG +#if defined(KDBG) BOOLEAN NTAPI

9 years, 7 months

[sginsberg] 69147: [WIN32K] - Reorder some more driver exports to alphabetical order. - Remove NtGdiFlushUserBatch and NtUserQueryUserCounters from syscall list (unused, and not compatible). - Move...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Sep 9 13:49:39 2015 New Revision: 69147 URL: http://svn.reactos.org/svn/reactos?rev=69147&view=rev Log: [WIN32K] - Reorder some more driver exports to alphabetical order. - Remove NtGdiFlushUserBatch and NtUserQueryUserCounters from syscall list (unused, and not compatible). - Move and add some debug-only syscalls to the end of the syscall list. - Fix parameter count of UserValidateTimerCallback, UserValidateHandleSecure, and UserChangeDisplaySettings to match what is compatible, by removing unused or ignored parameters. NtGdiOpenDCW, NtUserEnumDisplayMonitors and NtUserSetCursorIconData still have the wrong numbers. - Add "stray" NtGdiMakeObjectXferable and "NtDxEngGetRedirectionBitmap" syscall stubs. - The syscalls should now be compatible with 2K3 SP2 in their order, but not in their argument count (or, most likely, their actual parameters). This means a Windows 2k3 gdi32 or user32 should crash somewhat later now that half of the syscalls' order is not in disarray. Modified: trunk/reactos/include/psdk/ntgdi.h trunk/reactos/win32ss/gdi/ntgdi/intgdi.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/display.c trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/timer.c trunk/reactos/win32ss/user/user32/misc/display.c trunk/reactos/win32ss/user/user32/windows/message.c trunk/reactos/win32ss/w32ksvc.db trunk/reactos/win32ss/w32ksvc.h trunk/reactos/win32ss/win32k.spec Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -1764,14 +1764,6 @@ NtGdiFlattenPath( _In_ HDC hdc); -/* Not in MS ntgdi.h */ -__kernel_entry -W32KAPI -NTSTATUS -APIENTRY -NtGdiFlushUserBatch( - VOID); - __kernel_entry W32KAPI HRGN Modified: trunk/reactos/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/intgdi.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -94,6 +94,16 @@ /* Other Stuff */ +NTSTATUS +APIENTRY +NtGdiFlushUserBatch( + VOID); + +DWORD +APIENTRY +NtDxEngGetRedirectionBitmap( + DWORD Unknown0); + HBITMAP FASTCALL IntCreateCompatibleBitmap( Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -1218,6 +1218,18 @@ DWORD dwUnknown1, DWORD dwUnknown2, DWORD dwUnknown3); + +DWORD +APIENTRY +NtUserDbgWin32HeapFail( + DWORD Unknown0, + DWORD Unknown1); + +DWORD +APIENTRY +NtUserDbgWin32HeapStat( + DWORD Unknown0, + DWORD Unknown1); BOOL NTAPI @@ -1685,8 +1697,7 @@ PUNICODE_STRING lpszDeviceName, LPDEVMODEW lpDevMode, HWND hwnd, - DWORD dwflags, - LPVOID lParam); + DWORD dwflags); BOOL NTAPI @@ -3026,6 +3037,11 @@ NtUserSetDbgTag( DWORD Unknown0, DWORD Unknown1); + +DWORD +APIENTRY +NtUserSetDbgTagCount( + DWORD Unknown0); HWND NTAPI @@ -3123,8 +3139,7 @@ DWORD NTAPI NtUserSetRipFlags( - DWORD Unknown0, - DWORD Unknown1); + DWORD Unknown0); DWORD NTAPI @@ -3430,8 +3445,7 @@ BOOL NTAPI NtUserValidateHandleSecure( - HANDLE hHdl, - BOOL Restricted); + HANDLE hHdl); BOOL NTAPI @@ -3442,8 +3456,6 @@ BOOL APIENTRY NtUserValidateTimerCallback( - HWND hWnd, - WPARAM wParam, LPARAM lParam); DWORD Modified: trunk/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -816,8 +816,7 @@ PUNICODE_STRING pustrDevice, LPDEVMODEW lpDevMode, HWND hwnd, - DWORD dwflags, - LPVOID lParam) + DWORD dwflags) { WCHAR awcDevice[CCHDEVICENAME]; UNICODE_STRING ustrDevice; @@ -825,7 +824,7 @@ LONG lRet; /* Check arguments */ - if ((dwflags != CDS_VIDEOPARAMETERS && lParam != NULL) || + if ((dwflags != CDS_VIDEOPARAMETERS) || (hwnd != NULL)) { EngSetLastError(ERROR_INVALID_PARAMETER); Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -888,7 +888,7 @@ /* * This definition doesn't work */ -INIT_FUNCTION +INIT_SECTION NTSTATUS APIENTRY DriverEntry( @@ -942,7 +942,7 @@ PsEstablishWin32Callouts(&CalloutData); /* Register service hook callbacks */ -#if DBG +#if DBG && defined(KDBG) KdSystemDebugControl('CsoR', DbgPreServiceHook, ID_Win32PreServiceHook, 0, 0, 0, 0); KdSystemDebugControl('CsoR', DbgPostServiceHook, ID_Win32PostServiceHook, 0, 0, 0, 0); #endif Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -270,16 +270,47 @@ DWORD Unknown0, DWORD Unknown1) { - STUB - - return 0; + STUB; + + return 0; +} + +DWORD +APIENTRY +NtUserSetDbgTagCount( + DWORD Unknown0) +{ + STUB; + + return 0; } DWORD APIENTRY NtUserSetRipFlags( - DWORD Unknown0, - DWORD Unknown1) + DWORD Unknown0) +{ + STUB; + + return 0; +} + +DWORD +APIENTRY +NtUserDbgWin32HeapFail( + DWORD Unknown0, + DWORD Unknown1) +{ + STUB + + return 0; +} + +DWORD +APIENTRY +NtUserDbgWin32HeapStat( + DWORD Unknown0, + DWORD Unknown1) { STUB @@ -1030,4 +1061,25 @@ return FALSE; } +// Yes, I know, these do not belong here, just tell me where to put them +BOOL +APIENTRY +NtGdiMakeObjectXferable( + _In_ HANDLE hHandle, + _In_ DWORD dwProcessId) +{ + STUB; + return 0; +} + +DWORD +APIENTRY +NtDxEngGetRedirectionBitmap( + DWORD Unknown0) +{ + STUB; + return 0; +} + + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -726,7 +726,6 @@ } /* - * NtUserValidateHandleSecure W2k3 has one argument. * * Status * @implemented @@ -735,8 +734,7 @@ BOOL APIENTRY NtUserValidateHandleSecure( - HANDLE handle, - BOOL Restricted) + HANDLE handle) { UINT uType; PPROCESSINFO ppi; Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -696,8 +696,6 @@ BOOL APIENTRY NtUserValidateTimerCallback( - HWND hWnd, - WPARAM wParam, LPARAM lParam) { BOOL Ret = FALSE; Modified: trunk/reactos/win32ss/user/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/display.c [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -457,14 +457,14 @@ pDevModeW = GdiConvertToDevmodeW(lpDevMode); if(pDevModeW) { - rc = NtUserChangeDisplaySettings(pDeviceName, pDevModeW, hwnd, dwflags, lParam); + rc = NtUserChangeDisplaySettings(pDeviceName, pDevModeW, hwnd, dwflags); RtlFreeHeap(GetProcessHeap(), 0, pDevModeW); } else rc = DISP_CHANGE_SUCCESSFUL; } else - rc = NtUserChangeDisplaySettings(pDeviceName, NULL, hwnd, dwflags, lParam); + rc = NtUserChangeDisplaySettings(pDeviceName, NULL, hwnd, dwflags); if (lpszDeviceName != NULL) RtlFreeUnicodeString(&DeviceName); @@ -509,7 +509,7 @@ else pDeviceName = NULL; - rc = NtUserChangeDisplaySettings(pDeviceName, lpDevMode, hwnd, dwflags, lParam); + rc = NtUserChangeDisplaySettings(pDeviceName, lpDevMode, hwnd, dwflags); return rc; } Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -1876,7 +1876,7 @@ if ( lpmsg->message == WM_SYSTIMER ) return NtUserDispatchMessage( (PMSG)lpmsg ); - if (!NtUserValidateTimerCallback(lpmsg->hwnd, lpmsg->wParam, lpmsg->lParam)) + if (!NtUserValidateTimerCallback(lpmsg->lParam)) { WARN("Validating Timer Callback failed!\n"); return 0; @@ -1969,7 +1969,7 @@ if ( lpmsg->message == WM_SYSTIMER ) return NtUserDispatchMessage( (PMSG) lpmsg ); - if (!NtUserValidateTimerCallback(lpmsg->hwnd, lpmsg->wParam, lpmsg->lParam)) + if (!NtUserValidateTimerCallback(lpmsg->lParam)) { WARN("Validating Timer Callback failed!\n"); return 0; Modified: trunk/reactos/win32ss/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.db?rev=691… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.db [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -152,7 +152,6 @@ NtGdiFillPath 1 NtGdiFillRgn 3 NtGdiFlattenPath 1 -NtGdiFlushUserBatch 0 NtGdiFlush 0 NtGdiForceUFIMapping 2 NtGdiFrameRgn 5 @@ -235,7 +234,7 @@ NtGdiMoveTo 4 NtGdiOffsetClipRgn 3 NtGdiOffsetRgn 3 -NtGdiOpenDCW 8 +NtGdiOpenDCW 8 #7 NtGdiPatBlt 6 NtGdiPolyPatBlt 5 NtGdiPathToRegion 1 @@ -328,7 +327,7 @@ NtUserCallOneParam 2 NtUserCallTwoParam 3 NtUserChangeClipboardChain 2 -NtUserChangeDisplaySettings 5 +NtUserChangeDisplaySettings 5 #4 NtUserCheckImeHotKey 2 NtUserCheckMenuItem 3 NtUserChildWindowFromPointEx 4 @@ -374,14 +373,12 @@ NtUserEndMenu 0 NtUserEndPaint 2 NtUserEnumDisplayDevices 4 -# NtUserEnumDisplayMonitors 4 Wrong number of param ? -NtUserEnumDisplayMonitors 5 +NtUserEnumDisplayMonitors 5 #4 NtUserEnumDisplaySettings 4 NtUserEvent 1 NtUserExcludeUpdateRgn 2 NtUserFillWindow 4 -# NtUserFindExistingCursorIcon 3 Wrong number of param ? -NtUserFindExistingCursorIcon 4 +NtUserFindExistingCursorIcon 3 NtUserFindWindowEx 5 NtUserFlashWindowEx 1 NtUserGetAltTabInfo 6 @@ -391,7 +388,7 @@ NtUserGetAtomName 2 NtUserGetCaretBlinkTime 0 NtUserGetCaretPos 1 -NtUserGetClassInfo 5 +NtUserGetClassInfo 5 #Ex? NtUserGetClassName 3 NtUserGetClipboardData 2 NtUserGetClipboardFormatName 3 @@ -486,7 +483,6 @@ NtUserQueryInformationThread 4 NtUserQueryInputContext 2 NtUserQuerySendMessage 1 -NtUserQueryUserCounters 5 NtUserQueryWindow 2 NtUserRealChildWindowFromPoint 3 NtUserRealInternalGetMessage 6 @@ -518,7 +514,6 @@ NtUserSetCursor 1 NtUserSetCursorContents 2 NtUserSetCursorIconData 6 #4 -NtUserSetDbgTag 2 NtUserSetFocus 1 NtUserSetImeHotKey 5 NtUserSetImeInfoEx 1 @@ -536,7 +531,6 @@ NtUserSetParent 2 NtUserSetProcessWindowStation 1 NtUserSetProp 3 -NtUserSetRipFlags 2 NtUserSetScrollInfo 4 NtUserSetShellWindowEx 2 NtUserSetSysColors 4 @@ -588,9 +582,9 @@ NtUserSetLayeredWindowAttributes 4 NtUserUpdatePerUserSystemParameters 2 NtUserUserHandleGrantAccess 3 -NtUserValidateHandleSecure 2 +NtUserValidateHandleSecure 1 NtUserValidateRect 2 -NtUserValidateTimerCallback 3 +NtUserValidateTimerCallback 1 NtUserVkKeyScanEx 3 NtUserWaitForInputIdle 3 NtUserWaitForMsgAndEvent 1 @@ -671,8 +665,18 @@ NtGdiBRUSHOBJ_DeleteRbrush 2 NtGdiUMPDEngFreeUserMem 1 NtGdiDrawStream 3 -# -# + +# Checked build only +NtUserDbgWin32HeapFail 2 +NtUserDbgWin32HeapStat 2 +NtUserSetDbgTag 2 +NtUserSetDbgTagCount 1 +NtUserSetRipFlags 2 + +# Stray Syscalls +NtGdiMakeObjectXferable 2 +DxEngGetRedirectionBitmap 1 + #ReactOS specific syscalls NtGdiSetViewportOrgEx 4 NtGdiSetWindowOrgEx 4 @@ -685,3 +689,4 @@ NtUserMonitorFromRect 2 NtUserMonitorFromWindow 2 NtUserSetScrollBarInfo 3 +# Modified: trunk/reactos/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=6914… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -153,7 +153,6 @@ SVC_(GdiFillPath, 1) SVC_(GdiFillRgn, 3) SVC_(GdiFlattenPath, 1) - SVC_(GdiFlushUserBatch, 0) SVC_(GdiFlush, 0) SVC_(GdiForceUFIMapping, 2) SVC_(GdiFrameRgn, 5) @@ -329,7 +328,7 @@ SVC_(UserCallOneParam, 2) SVC_(UserCallTwoParam, 3) SVC_(UserChangeClipboardChain, 2) - SVC_(UserChangeDisplaySettings, 5) + SVC_(UserChangeDisplaySettings, 4) SVC_(UserCheckImeHotKey, 2) SVC_(UserCheckMenuItem, 3) SVC_(UserChildWindowFromPointEx, 4) @@ -485,7 +484,6 @@ SVC_(UserQueryInformationThread, 4) SVC_(UserQueryInputContext, 2) SVC_(UserQuerySendMessage, 1) - SVC_(UserQueryUserCounters, 5) SVC_(UserQueryWindow, 2) SVC_(UserRealChildWindowFromPoint, 3) SVC_(UserRealInternalGetMessage, 6) @@ -517,7 +515,6 @@ SVC_(UserSetCursor, 1) SVC_(UserSetCursorContents, 2) SVC_(UserSetCursorIconData, 4) - SVC_(UserSetDbgTag, 2) SVC_(UserSetFocus, 1) SVC_(UserSetImeHotKey, 5) SVC_(UserSetImeInfoEx, 1) @@ -535,7 +532,6 @@ SVC_(UserSetParent, 2) SVC_(UserSetProcessWindowStation, 1) SVC_(UserSetProp, 3) - SVC_(UserSetRipFlags, 2) SVC_(UserSetScrollInfo, 4) SVC_(UserSetShellWindowEx, 2) SVC_(UserSetSysColors, 4) @@ -587,9 +583,9 @@ SVC_(UserSetLayeredWindowAttributes, 4) SVC_(UserUpdatePerUserSystemParameters, 2) SVC_(UserUserHandleGrantAccess, 3) - SVC_(UserValidateHandleSecure, 2) + SVC_(UserValidateHandleSecure, 1) SVC_(UserValidateRect, 2) - SVC_(UserValidateTimerCallback, 3) + SVC_(UserValidateTimerCallback, 1) SVC_(UserVkKeyScanEx, 3) SVC_(UserWaitForInputIdle, 3) SVC_(UserWaitForMsgAndEvent, 1) @@ -670,9 +666,19 @@ SVC_(GdiBRUSHOBJ_DeleteRbrush, 2) SVC_(GdiUMPDEngFreeUserMem, 1) SVC_(GdiDrawStream, 3) +#if DBG + // Checked Build only + SVC_(UserDbgWin32HeapFail, 2) + SVC_(UserDbgWin32HeapStat, 2) + SVC_(UserSetDbgTag, 2) + SVC_(UserSetDbgTagCount, 1) + SVC_(UserSetRipFlags, 1) +#endif //DBG + //Stray syscalls + SVC_(GdiMakeObjectXferable, 2) + SVC_(DxEngGetRedirectionBitmap, 1) - - // ReactOS, specific, syscalls) + // ReactOS-specific syscalls) SVC_(GdiSetViewportOrgEx, 4) SVC_(GdiSetWindowOrgEx, 4) SVC_(GdiGetFontFamilyInfo, 4) Modified: trunk/reactos/win32ss/win32k.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/win32k.spec?rev=69… ============================================================================== --- trunk/reactos/win32ss/win32k.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/win32k.spec [iso-8859-1] Wed Sep 9 13:49:39 2015 @@ -1,7 +1,3 @@ -@ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr) FLOATOBJ_Add -@ stdcall -arch=i386 FLOATOBJ_DivFloatObj(ptr ptr) FLOATOBJ_Div -@ stdcall -arch=i386 FLOATOBJ_MulFloatObj(ptr ptr) FLOATOBJ_Mul -@ stdcall -arch=i386 FLOATOBJ_SubFloatObj(ptr ptr) FLOATOBJ_Sub @ stdcall BRUSHOBJ_hGetColorTransform(ptr) @ stdcall BRUSHOBJ_pvAllocRbrush(ptr long) @ stdcall BRUSHOBJ_pvGetRbrush(ptr) @@ -147,9 +143,11 @@ @ stdcall EngWritePrinter(ptr ptr long ptr) @ stdcall -arch=i386 FLOATOBJ_Add(ptr ptr) @ stdcall -arch=i386 FLOATOBJ_AddFloat(ptr long) +@ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr) FLOATOBJ_Add @ stdcall -arch=i386 FLOATOBJ_AddLong(ptr long) @ stdcall -arch=i386 FLOATOBJ_Div(ptr ptr) @ stdcall -arch=i386 FLOATOBJ_DivFloat(ptr long) +@ stdcall -arch=i386 FLOATOBJ_DivFloatObj(ptr ptr) FLOATOBJ_Div @ stdcall -arch=i386 FLOATOBJ_DivLong(ptr long) @ stdcall -arch=i386 FLOATOBJ_Equal(ptr ptr) @ stdcall -arch=i386 FLOATOBJ_EqualLong(ptr long) @@ -161,12 +159,14 @@ @ stdcall -arch=i386 FLOATOBJ_LessThanLong(ptr long) @ stdcall -arch=i386 FLOATOBJ_Mul(ptr ptr) @ stdcall -arch=i386 FLOATOBJ_MulFloat(ptr long) +@ stdcall -arch=i386 FLOATOBJ_MulFloatObj(ptr ptr) FLOATOBJ_Mul @ stdcall -arch=i386 FLOATOBJ_MulLong(ptr long) @ stdcall -arch=i386 FLOATOBJ_Neg(ptr) @ stdcall -arch=i386 FLOATOBJ_SetFloat(ptr long) @ stdcall -arch=i386 FLOATOBJ_SetLong(ptr long) @ stdcall -arch=i386 FLOATOBJ_Sub(ptr ptr) @ stdcall -arch=i386 FLOATOBJ_SubFloat(ptr long) +@ stdcall -arch=i386 FLOATOBJ_SubFloatObj(ptr ptr) FLOATOBJ_Sub @ stdcall -arch=i386 FLOATOBJ_SubLong(ptr long) @ stdcall FONTOBJ_cGetAllGlyphHandles(ptr ptr) @ stdcall FONTOBJ_cGetGlyphs(ptr long long ptr ptr)

9 years, 7 months

[akhaldi] 69146: [APPLICATIONS] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 9 13:13:35 2015 New Revision: 69146 URL: http://svn.reactos.org/svn/reactos?rev=69146&view=rev Log: [APPLICATIONS] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/cmdutils/comp/comp.c trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c trunk/reactos/base/applications/cmdutils/doskey/lang/sv-SE.rc trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/more/lang/sv-SE.rc trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc trunk/reactos/base/applications/dxdiag/help.c trunk/reactos/base/applications/dxdiag/network.c trunk/reactos/base/applications/findstr/lang/lt-LT.rc trunk/reactos/base/applications/findstr/lang/uk-UA.rc trunk/reactos/base/applications/fontview/lang/sv-SE.rc trunk/reactos/base/applications/fontview/lang/uk-UA.rc trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc trunk/reactos/base/applications/games/solitaire/lang/sq-AL.rc trunk/reactos/base/applications/games/spider/lang/de-DE.rc trunk/reactos/base/applications/games/spider/lang/sq-AL.rc trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/logoff/lang/zh-CN.rc trunk/reactos/base/applications/logoff/lang/zh-TW.rc trunk/reactos/base/applications/logoff/logoff.c trunk/reactos/base/applications/magnify/lang/uk-UA.rc trunk/reactos/base/applications/mplay32/lang/sv-SE.rc trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/msconfig/generalpage.c trunk/reactos/base/applications/msconfig/lang/sv-SE.rc trunk/reactos/base/applications/msconfig/msconfig.c trunk/reactos/base/applications/msconfig/srvpage.c trunk/reactos/base/applications/msconfig/startuppage.c trunk/reactos/base/applications/msconfig/toolspage.c trunk/reactos/base/applications/msconfig_new/freeldrpage.c trunk/reactos/base/applications/msconfig_new/generalpage.c trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/srvpage.c trunk/reactos/base/applications/msconfig_new/startuppage.c trunk/reactos/base/applications/msconfig_new/stringutils.c trunk/reactos/base/applications/msconfig_new/stringutils.h trunk/reactos/base/applications/msconfig_new/systempage.c trunk/reactos/base/applications/msconfig_new/toolspage.c trunk/reactos/base/applications/mscutils/devmgmt/about.c trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c trunk/reactos/base/applications/mscutils/devmgmt/misc.c trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c trunk/reactos/base/applications/mscutils/servman/export.c trunk/reactos/base/applications/mscutils/servman/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/servman/misc.c trunk/reactos/base/applications/mscutils/servman/servman.c trunk/reactos/base/applications/mspaint/definitions.h trunk/reactos/base/applications/mspaint/dialogs.cpp trunk/reactos/base/applications/mspaint/dialogs.h trunk/reactos/base/applications/mspaint/dib.cpp trunk/reactos/base/applications/mspaint/dib.h trunk/reactos/base/applications/mspaint/drawing.cpp trunk/reactos/base/applications/mspaint/drawing.h trunk/reactos/base/applications/mspaint/fullscreen.cpp trunk/reactos/base/applications/mspaint/fullscreen.h trunk/reactos/base/applications/mspaint/globalvar.h trunk/reactos/base/applications/mspaint/history.cpp trunk/reactos/base/applications/mspaint/history.h trunk/reactos/base/applications/mspaint/imgarea.cpp trunk/reactos/base/applications/mspaint/imgarea.h trunk/reactos/base/applications/mspaint/main.cpp trunk/reactos/base/applications/mspaint/miniature.cpp trunk/reactos/base/applications/mspaint/miniature.h trunk/reactos/base/applications/mspaint/mouse.cpp trunk/reactos/base/applications/mspaint/mouse.h trunk/reactos/base/applications/mspaint/palette.cpp trunk/reactos/base/applications/mspaint/palette.h trunk/reactos/base/applications/mspaint/palettemodel.cpp trunk/reactos/base/applications/mspaint/palettemodel.h trunk/reactos/base/applications/mspaint/registry.cpp trunk/reactos/base/applications/mspaint/registry.h trunk/reactos/base/applications/mspaint/rsrc.rc trunk/reactos/base/applications/mspaint/scrollbox.cpp trunk/reactos/base/applications/mspaint/scrollbox.h trunk/reactos/base/applications/mspaint/selection.cpp trunk/reactos/base/applications/mspaint/selection.h trunk/reactos/base/applications/mspaint/selectionmodel.cpp trunk/reactos/base/applications/mspaint/selectionmodel.h trunk/reactos/base/applications/mspaint/sizebox.cpp trunk/reactos/base/applications/mspaint/sizebox.h trunk/reactos/base/applications/mspaint/textedit.cpp trunk/reactos/base/applications/mspaint/textedit.h trunk/reactos/base/applications/mspaint/toolbox.cpp trunk/reactos/base/applications/mspaint/toolbox.h trunk/reactos/base/applications/mspaint/toolsettings.cpp trunk/reactos/base/applications/mspaint/toolsettings.h trunk/reactos/base/applications/mspaint/toolsmodel.cpp trunk/reactos/base/applications/mspaint/toolsmodel.h trunk/reactos/base/applications/mspaint/winproc.cpp trunk/reactos/base/applications/mspaint/winproc.h trunk/reactos/base/applications/network/arp/arp.c trunk/reactos/base/applications/network/ipconfig/ipconfig.c trunk/reactos/base/applications/network/net/cmdAccounts.c trunk/reactos/base/applications/network/net/cmdContinue.c trunk/reactos/base/applications/network/net/cmdHelpMsg.c trunk/reactos/base/applications/network/net/cmdLocalGroup.c trunk/reactos/base/applications/network/net/cmdPause.c trunk/reactos/base/applications/network/net/cmdStart.c trunk/reactos/base/applications/network/net/cmdStop.c trunk/reactos/base/applications/network/net/cmdUser.c trunk/reactos/base/applications/network/net/help.c trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/netstat/netstat.c trunk/reactos/base/applications/network/nslookup/nslookup.c trunk/reactos/base/applications/network/nslookup/utility.c trunk/reactos/base/applications/network/tracert/tracert.c trunk/reactos/base/applications/osk/lang/zh-CN.rc trunk/reactos/base/applications/rapps_new/aboutdlg.cpp trunk/reactos/base/applications/rapps_new/available.cpp trunk/reactos/base/applications/rapps_new/installdlg.cpp trunk/reactos/base/applications/rapps_new/installed.cpp trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc trunk/reactos/base/applications/rapps_new/loaddlg.cpp trunk/reactos/base/applications/rapps_new/misc.cpp trunk/reactos/base/applications/rapps_new/settingsdlg.cpp trunk/reactos/base/applications/rapps_new/splitter.cpp trunk/reactos/base/applications/rapps_new/winmain.cpp trunk/reactos/base/applications/regedit/clb/clb.c trunk/reactos/base/applications/sc/control.c trunk/reactos/base/applications/sc/create.c trunk/reactos/base/applications/sc/delete.c trunk/reactos/base/applications/sc/print.c trunk/reactos/base/applications/sc/query.c trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/start.c trunk/reactos/base/applications/sc/usage.c trunk/reactos/base/applications/sndrec32/sndrec32.h trunk/reactos/base/applications/sndvol32/dialog.c trunk/reactos/base/applications/sndvol32/misc.c trunk/reactos/base/applications/sndvol32/mixer.c trunk/reactos/base/applications/sndvol32/sndvol32.c trunk/reactos/base/applications/winver/winver.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/doskey/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/dxdiag/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/h… Modified: trunk/reactos/base/applications/dxdiag/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/n… Modified: trunk/reactos/base/applications/findstr/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/fontview/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/fontview/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/logoff/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/logoff/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/logoff/logoff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/magnify/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mplay32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/msconfig/generalpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/srvpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/toolspage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/freeldrpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/generalpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/srvpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/stringutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/stringutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/systempage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig_new/toolspage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/export.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/servman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/dialogs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/dib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/drawing.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/drawing.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/fullscreen.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/fullscreen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/history.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/history.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/imgarea.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/imgarea.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/miniature.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/miniature.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/mouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/palette.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/palettemodel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/palettemodel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/scrollbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/scrollbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/selection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/selection.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/selectionmodel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/selectionmodel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/sizebox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/sizebox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/textedit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/textedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/toolbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/toolbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/toolsettings.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/toolsettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/toolsmodel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/toolsmodel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/winproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/network/arp/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/cmdAccounts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/cmdContinue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/cmdHelpMsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/cmdLocalGroup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/cmdPause.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/cmdStart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/cmdStop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/cmdUser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/netstat/netstat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/nslookup/nslookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/nslookup/utility.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/osk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… Modified: trunk/reactos/base/applications/rapps_new/aboutdlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/available.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/installdlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/installed.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/settingsdlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/splitter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/winmain.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/regedit/clb/clb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/sc/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/contr… Modified: trunk/reactos/base/applications/sc/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/creat… Modified: trunk/reactos/base/applications/sc/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/delet… Modified: trunk/reactos/base/applications/sc/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/print… Modified: trunk/reactos/base/applications/sc/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/query… Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… Modified: trunk/reactos/base/applications/sc/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/start… Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… Modified: trunk/reactos/base/applications/sndrec32/sndrec32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/winver/winver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winver/w…

9 years, 7 months

[sginsberg] 69145: Fixie fixie

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Sep 9 11:24:34 2015 New Revision: 69145 URL: http://svn.reactos.org/svn/reactos?rev=69145&view=rev Log: Fixie fixie Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Wed Sep 9 11:24:34 2015 @@ -499,7 +499,7 @@ NTSTATUS NTAPI NtSetSystemEnvironmentValueEx(IN PUNICODE_STRING VariableName, - IN LPGUID VendorGuid + IN LPGUID VendorGuid, IN PVOID Value, IN OUT PULONG ReturnLength, IN OUT PULONG Attributes)

9 years, 7 months

[sginsberg] 69144: [NTOS] Fix broken NtSetSystemEnvironmentValueEx stub which had the wrong amount of parameters. [NDK] Add define guard for HalEndSystemInterrupt because it is no longer compatible...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Sep 9 11:21:02 2015 New Revision: 69144 URL: http://svn.reactos.org/svn/reactos?rev=69144&view=rev Log: [NTOS] Fix broken NtSetSystemEnvironmentValueEx stub which had the wrong amount of parameters. [NDK] Add define guard for HalEndSystemInterrupt because it is no longer compatible with Windows, and add back the old definition. Fix NtSetSystemEnvironmentValueEx prototype. [KERNEL32] Export SetFileCompletionNotificationModes (MSDN and headers documents it as Vista-only, but this is not entirely correct). Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/win32/kernel32/client/file/iocompl.c trunk/reactos/dll/win32/kernel32/client/vista.c trunk/reactos/dll/win32/kernel32/kernel32.spec trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/halfuncs.h trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/sysfuncs.h trunk/reactos/ntoskrnl/include/sysfuncs64.h trunk/reactos/ntoskrnl/sysfuncs.lst Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Wed Sep 9 11:21:02 2015 @@ -373,13 +373,13 @@ @ stdcall NtSetInformationToken(long long ptr long) @ stdcall NtSetIntervalProfile(long long) @ stdcall NtSetIoCompletion(ptr long ptr long long) -@ stdcall NtSetLdtEntries(long double long double) ; CHECKME +@ stdcall NtSetLdtEntries(long int64 long int64) @ stdcall NtSetLowEventPair(ptr) @ stdcall NtSetLowWaitHighEventPair(ptr) @ stdcall NtSetQuotaInformationFile(ptr ptr ptr long) @ stdcall NtSetSecurityObject(long long ptr) @ stdcall NtSetSystemEnvironmentValue(ptr ptr) -@ stdcall NtSetSystemEnvironmentValueEx(ptr ptr) +@ stdcall NtSetSystemEnvironmentValueEx(ptr ptr ptr ptr ptr) @ stdcall NtSetSystemInformation(long ptr long) @ stdcall NtSetSystemPowerState(long long long) @ stdcall NtSetSystemTime(ptr ptr) @@ -1218,13 +1218,13 @@ @ stdcall ZwSetInformationToken(long long ptr long) @ stdcall ZwSetIntervalProfile(long long) @ stdcall ZwSetIoCompletion(ptr long ptr long long) -@ stdcall ZwSetLdtEntries(long double long double) ; CHECKME +@ stdcall ZwSetLdtEntries(long int64 long int64) @ stdcall ZwSetLowEventPair(ptr) @ stdcall ZwSetLowWaitHighEventPair(ptr) @ stdcall ZwSetQuotaInformationFile(ptr ptr ptr long) @ stdcall ZwSetSecurityObject(long long ptr) @ stdcall ZwSetSystemEnvironmentValue(ptr ptr) -@ stdcall ZwSetSystemEnvironmentValueEx(ptr ptr) +@ stdcall ZwSetSystemEnvironmentValueEx(ptr ptr ptr ptr ptr) NtSetSystemEnvironmentValueEx @ stdcall ZwSetSystemInformation(long ptr long) @ stdcall ZwSetSystemPowerState(long long long) @ stdcall ZwSetSystemTime(ptr ptr) Modified: trunk/reactos/dll/win32/kernel32/client/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/iocompl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/iocompl.c [iso-8859-1] Wed Sep 9 11:21:02 2015 @@ -11,6 +11,34 @@ #include <k32.h> #define NDEBUG #include <debug.h> + +/* + * SetFileCompletionNotificationModes is not entirely Vista-exclusive, + * it was actually added to Windows 2003 in SP2. Headers restrict it from + * pre-Vista though so define the flags we need for it. + */ +#if (_WIN32_WINNT < 0x0600) +#define FILE_SKIP_COMPLETION_PORT_ON_SUCCESS 0x1 +#define FILE_SKIP_SET_EVENT_ON_HANDLE 0x2 +#endif + +/* + * @unimplemented + */ +BOOL +WINAPI +SetFileCompletionNotificationModes(IN HANDLE FileHandle, + IN UCHAR Flags) +{ + if (Flags & ~(FILE_SKIP_COMPLETION_PORT_ON_SUCCESS | FILE_SKIP_SET_EVENT_ON_HANDLE)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + UNIMPLEMENTED; + return FALSE; +} /* * @implemented Modified: trunk/reactos/dll/win32/kernel32/client/vista.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] Wed Sep 9 11:21:02 2015 @@ -678,25 +678,6 @@ /* * @unimplemented */ -BOOL -WINAPI -SetFileCompletionNotificationModes(IN HANDLE FileHandle, - IN UCHAR Flags) -{ - if (Flags & ~(FILE_SKIP_COMPLETION_PORT_ON_SUCCESS | FILE_SKIP_SET_EVENT_ON_HANDLE)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ HANDLE WINAPI OpenFileById(IN HANDLE hFile, Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Wed Sep 9 11:21:02 2015 @@ -809,7 +809,7 @@ @ stdcall SetFileApisToOEM() @ stdcall SetFileAttributesA(str long) @ stdcall SetFileAttributesW(wstr long) -;@ stdcall -stub SetFileCompletionNotificationModes(ptr long); 2K3 SP2 has it! +@ stdcall SetFileCompletionNotificationModes(ptr long) @ stdcall SetFilePointer(long long ptr long) @ stdcall SetFilePointerEx(long double ptr long) @ stdcall SetFileShortNameA(long str) Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Wed Sep 9 11:21:02 2015 @@ -549,7 +549,10 @@ NTAPI NtSetSystemEnvironmentValueEx( _In_ PUNICODE_STRING VariableName, - _In_ LPGUID VendorGuid + _In_ LPGUID VendorGuid, + _In_ PVOID Value, + _Inout_ PULONG ReturnLength, + _Inout_ PULONG Attributes ); NTSYSCALLAPI Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] Wed Sep 9 11:21:02 2015 @@ -150,13 +150,23 @@ _In_ KINTERRUPT_MODE InterruptMode ); +#ifdef __REACTOS__ NTHALAPI VOID NTAPI HalEndSystemInterrupt( - KIRQL Irql, + _In_ KIRQL Irql, _In_ PKTRAP_FRAME TrapFrame ); +#else +NTHALAPI +VOID +NTAPI +HalEndSystemInterrupt( + _In_ KIRQL Irql, + _In_ UCHAR Vector +); +#endif #ifdef _ARM_ // FIXME: ndk/arm? armddk.h? ULONG Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Wed Sep 9 11:21:02 2015 @@ -499,7 +499,10 @@ NTSTATUS NTAPI NtSetSystemEnvironmentValueEx(IN PUNICODE_STRING VariableName, - IN LPGUID VendorGuid) + IN LPGUID VendorGuid + IN PVOID Value, + IN OUT PULONG ReturnLength, + IN OUT PULONG Attributes) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/ntoskrnl/include/sysfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/sysfuncs.… ============================================================================== --- trunk/reactos/ntoskrnl/include/sysfuncs.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/sysfuncs.h [iso-8859-1] Wed Sep 9 11:21:02 2015 @@ -246,7 +246,7 @@ SVC_(SetQuotaInformationFile, 4) SVC_(SetSecurityObject, 3) SVC_(SetSystemEnvironmentValue, 2) - SVC_(SetSystemEnvironmentValueEx, 2) + SVC_(SetSystemEnvironmentValueEx, 5) SVC_(SetSystemInformation, 3) SVC_(SetSystemPowerState, 3) SVC_(SetSystemTime, 2) Modified: trunk/reactos/ntoskrnl/include/sysfuncs64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/sysfuncs6… ============================================================================== --- trunk/reactos/ntoskrnl/include/sysfuncs64.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/sysfuncs64.h [iso-8859-1] Wed Sep 9 11:21:02 2015 @@ -573,7 +573,7 @@ #endif SVC_(SetSystemEnvironmentValue, 2) #if (NTDDI_VERSION >= NTDDI_VISTA) -SVC_(SetSystemEnvironmentValueEx, 2) +SVC_(SetSystemEnvironmentValueEx, 5) #endif SVC_(SetSystemInformation, 3) SVC_(SetSystemPowerState, 3) Modified: trunk/reactos/ntoskrnl/sysfuncs.lst URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/sysfuncs.lst?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/sysfuncs.lst [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/sysfuncs.lst [iso-8859-1] Wed Sep 9 11:21:02 2015 @@ -246,7 +246,7 @@ NtSetQuotaInformationFile 4 NtSetSecurityObject 3 NtSetSystemEnvironmentValue 2 -NtSetSystemEnvironmentValueEx 2 +NtSetSystemEnvironmentValueEx 5 NtSetSystemInformation 3 NtSetSystemPowerState 3 NtSetSystemTime 2

9 years, 7 months

[pschweitzer] 69143: [FATTEN] CORE-10140

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Sep 9 07:05:17 2015 New Revision: 69143 URL: http://svn.reactos.org/svn/reactos?rev=69143&view=rev Log: [FATTEN] CORE-10140 Modified: trunk/reactos/tools/fatten/fatten.c Modified: trunk/reactos/tools/fatten/fatten.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/fatten/fatten.c?rev=… ============================================================================== --- trunk/reactos/tools/fatten/fatten.c [iso-8859-1] (original) +++ trunk/reactos/tools/fatten/fatten.c [iso-8859-1] Wed Sep 9 07:05:17 2015 @@ -293,9 +293,12 @@ if(!fread(buff, 512, 1, fe)) { printf("Error: unable to read boot sector from file '%s'.", argv[0]); - ret = 1; - goto exit; - } + fclose(fe); + ret = 1; + goto exit; + } + + fclose(fe); NEED_MOUNT(); @@ -326,8 +329,6 @@ ret = 1; goto exit; } - - fclose(fe); } else if (strcmp(parg, "add") == 0) {

9 years, 7 months

[ion] 69142: [BOOTMGFW] - 1.5KLOC code dump of current device block I/O handling. Totally untested and broken, just a checkpoint for now. - Implement most of Hash Table Utility Functions. - Impleme...

by ion＠svn.reactos.org

Author: ion Date: Wed Sep 9 05:48:50 2015 New Revision: 69142 URL: http://svn.reactos.org/svn/reactos?rev=69142&view=rev Log: [BOOTMGFW] - 1.5KLOC code dump of current device block I/O handling. Totally untested and broken, just a checkpoint for now. - Implement most of Hash Table Utility Functions. - Implement parts of Block Allocator. - Finish Implementation of Generic Table Utility Functions. - Fix some EFI device emulation code. - Temporarily disable freeing from heap while I figure out what's corrupting it. Added: trunk/reactos/boot/environ/include/efi/BlockIo.h (with props) Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/app/bootmgr/efiemu.c trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/firmware/efi/firmware.c trunk/reactos/boot/environ/lib/io/device.c trunk/reactos/boot/environ/lib/io/display/display.c trunk/reactos/boot/environ/lib/io/display/emscons.c trunk/reactos/boot/environ/lib/io/io.c trunk/reactos/boot/environ/lib/misc/util.c trunk/reactos/boot/environ/lib/mm/blkalloc.c trunk/reactos/boot/environ/lib/mm/heapalloc.c trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -22,43 +22,42 @@ ULONGLONG ApplicationStartTime; ULONGLONG PostTime; GUID BmApplicationIdentifier; +PWCHAR BootDirectory; /* FUNCTIONS *****************************************************************/ -PGUID -BlGetApplicationIdentifier ( +NTSTATUS +BmFwInitializeBootDirectoryPath ( VOID ) { - return NULL; -} - -PWCHAR BootDirectory; - -NTSTATUS -BmFwInitializeBootDirectoryPath() -{ -#if 0 PWCHAR FinalPath; NTSTATUS Status; PWCHAR BcdDirectory; - UNICODE_STRING BcdPath; - ULONG FinalSize, FileHandle, DeviceHandle; - - BcdPath.MaximumLength = 0; - BcdPath.Buffer = NULL; - + // UNICODE_STRING BcdPath; + //ULONG FinalSize; + ULONG FileHandle, DeviceHandle; + + /* Initialize everything for failure */ + // BcdPath.MaximumLength = 0; + // BcdPath.Buffer = NULL; + BcdDirectory = NULL; FinalPath = NULL; - FileHandle = -1; DeviceHandle = -1; + /* Try to open the boot device */ Status = BlpDeviceOpen(BlpBootDevice, 1u, 0, &DeviceHandle); if (!NT_SUCCESS(Status)) { goto Quickie; } + /* For now, do nothing */ + EfiPrintf(L"Successfully opened boot device: %lx\r\n", DeviceHandle); + EfiStall(2000000); + +#if 0 Status = BmpFwGetApplicationDirectoryPath(&BcdPath); BcdDirectory = BcdPath.Buffer; if (!NT_SUCCESS(Status)) @@ -91,8 +90,10 @@ } BootDirectory = L"\\EFI\\Microsoft\\Boot"; +#endif Quickie: + /* Free all the allocations we made */ if (BcdDirectory) { Status = BlMmFreeHeap(BcdDirectory); @@ -101,18 +102,21 @@ { Status = BlMmFreeHeap(FinalPath); } + + /* Close the BCD file */ if (FileHandle != -1) { - Status = BlFileClose(FileHandle); - } + //Status = BlFileClose(FileHandle); + } + + /* Close the boot device */ if (DeviceHandle != -1) { Status = BlDeviceClose(DeviceHandle); } + + /* Return back to the caller */ return Status; -#else - return STATUS_NOT_IMPLEMENTED; -#endif } @@ -172,6 +176,9 @@ goto Quickie; } + EfiPrintf(L"We are A-OK!\n"); + EfiStall(10000000); + /* Get the application identifier */ AppIdentifier = BlGetApplicationIdentifier(); if (!AppIdentifier) Modified: trunk/reactos/boot/environ/app/bootmgr/efiemu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/e… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/efiemu.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/efiemu.c [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -253,7 +253,10 @@ FilePath->PathName, StringLength, &BytesAppended); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + return Status; + } /* Increase the size of the data, consume buffer space */ DataSize += BytesAppended; @@ -345,7 +348,7 @@ * *--*/ NTSTATUS -EfiInitTranslateDevicePath( +EfiInitTranslateDevicePath ( _In_ EFI_DEVICE_PATH_PROTOCOL *DevicePath, _In_ PBL_DEVICE_DESCRIPTOR DeviceEntry ) @@ -418,7 +421,7 @@ } /* Other types should come in as MEDIA_DEVICE_PATH -- Windows assumes this is a floppy */ - DeviceEntry->DeviceType = LocalDevice; + DeviceEntry->DeviceType = DiskDevice; DeviceEntry->Local.Type = FloppyDevice; DeviceEntry->Local.FloppyDisk.DriveNumber = 0; return STATUS_SUCCESS; @@ -434,7 +437,7 @@ if (DiskPath->SignatureType == SIGNATURE_TYPE_MBR) { /* Set that this is a local partition */ - DeviceEntry->DeviceType = PartitionDevice; + DeviceEntry->DeviceType = LegacyPartitionDevice; DeviceEntry->Partition.Disk.Type = LocalDevice; DeviceEntry->Partition.Disk.HardDisk.PartitionType = MbrPartition; @@ -448,7 +451,7 @@ if (DiskPath->SignatureType == SIGNATURE_TYPE_GUID) { /* Set that this is a local disk */ - DeviceEntry->DeviceType = HardDiskDevice; + DeviceEntry->DeviceType = PartitionDevice; DeviceEntry->Partition.Disk.Type = LocalDevice; /* Set GPT partition ID */ @@ -463,15 +466,16 @@ return STATUS_SUCCESS; } - /* Othertwise, raw boot is not supported */ - DeviceEntry->DeviceType = HardDiskDevice; + /* Otherwise, raw boot is not supported */ + DeviceEntry->DeviceType = PartitionDevice; + DeviceEntry->Partition.Disk.Type = LocalDevice; DeviceEntry->Partition.Disk.HardDisk.PartitionType = RawPartition; DeviceEntry->Partition.Disk.HardDisk.Raw.DiskNumber = 0; } else if (DeviceNode->SubType == MEDIA_CDROM_DP) { /* Set the right type for a CDROM */ - DeviceEntry->DeviceType = LocalDevice; + DeviceEntry->DeviceType = DiskDevice; DeviceEntry->Local.Type = CdRomDevice; /* Set the drive number to zero */ Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -28,6 +28,7 @@ #include <LoadedImage.h> #include <GraphicsOutput.h> #include <UgaDraw.h> +#include <BlockIo.h> /* DEFINES *******************************************************************/ @@ -75,6 +76,8 @@ #define BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG 0x01 #define BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG 0x02 + +#define BL_HT_VALUE_IS_INLINE 0x01 #define BL_FS_REGISTER_AT_HEAD_FLAG 1 @@ -127,10 +130,13 @@ // typedef enum _BL_DEVICE_TYPE { - LocalDevice = 0, - PartitionDevice = 2, + DiskDevice = 0, + LegacyPartitionDevice = 2, + SerialDevice = 3, UdpDevice = 4, - HardDiskDevice = 6 + BootDevice = 5, + PartitionDevice = 6, + LocateDevice = 8, } BL_DEVICE_TYPE; // @@ -138,9 +144,12 @@ // typedef enum _BL_LOCAL_DEVICE_TYPE { + LocalDevice = 0, FloppyDevice = 1, CdRomDevice = 2, RamDiskDevice = 3, + FileDevice = 5, + VirtualDiskDevice = 6 } BL_LOCAL_DEVICE_TYPE; // @@ -180,11 +189,13 @@ // Loader Memory // BlLoaderMemory = 0xD0000002, + BlLoaderDeviceMemory = 0xD0000004, BlLoaderHeap = 0xD0000005, BlLoaderPageDirectory = 0xD0000006, BlLoaderReferencePage = 0xD0000007, BlLoaderRamDisk = 0xD0000008, BlLoaderData = 0xD000000A, + BlLoaderBlockMemory = 0xD000000C, BlLoaderSelfMap = 0xD000000F, // @@ -339,6 +350,50 @@ _In_ struct _BL_TEXT_CONSOLE* Console, _In_ PCHAR Text, _In_ ULONG Attribute + ); + +typedef +BOOLEAN +(*PBL_TBL_LOOKUP_ROUTINE) ( + _In_ PVOID Entry, + _In_ PVOID Argument1, + _In_ PVOID Argument2, + _In_ PVOID Argument3, + _In_ PVOID Argument4 + ); + +typedef +NTSTATUS +(*PBL_TBL_MAP_ROUTINE) ( + _In_ PVOID Entry, + _In_ ULONG EntryIndex + ); + +typedef +NTSTATUS +(*PBL_TBL_SET_ROUTINE) ( + _In_ PVOID Entry + ); + +typedef +NTSTATUS +(*PBL_IO_DESTROY_ROUTINE) ( + VOID + ); + +struct _BL_HASH_ENTRY; +typedef +BOOLEAN +(*PBL_HASH_TABLE_COMPARE_FUNCTION) ( + _In_ struct _BL_HASH_ENTRY* Entry1, + _In_ struct _BL_HASH_ENTRY* Entry2 + ); + +typedef +ULONG +(*PBL_HASH_TABLE_HASH_FUNCTION) ( + _In_ struct _BL_HASH_ENTRY* Entry, + _In_ ULONG TableSize ); /* DATA STRUCTURES ***********************************************************/ @@ -568,11 +623,6 @@ PBL_FILE_DESTROY_CALLBACK DestroyCallback; } BL_FILE_ENTRY, *PBL_FILE_ENTRY; -typedef struct _BL_DEVICE_ENTRY -{ - ULONG ReferenceCount; -} BL_DEVICE_ENTRY, *PBL_DEVICE_ENTRY; - typedef struct _BL_FILE_SYSTEM_ENTRY { LIST_ENTRY ListEntry; @@ -665,6 +715,67 @@ BL_TEXT_CONSOLE TextConsole; } BL_REMOTE_CONSOLE, *PBL_REMOTE_CONSOLE; +typedef struct _BL_HASH_TABLE +{ + PLIST_ENTRY HashLinks; + ULONG Size; + PBL_HASH_TABLE_COMPARE_FUNCTION CompareFunction; + PBL_HASH_TABLE_HASH_FUNCTION HashFunction; +} BL_HASH_TABLE, *PBL_HASH_TABLE; + +typedef struct _BL_HASH_ENTRY +{ + ULONG Size; + ULONG Flags; + PVOID Value; +} BL_HASH_ENTRY, *PBL_HASH_ENTRY; + +typedef struct _BL_HASH_VALUE +{ + ULONG DataSize; + PVOID Data; +} BL_HASH_VALUE, *PBL_HASH_VALUE; + +typedef struct _BL_HASH_NODE +{ + LIST_ENTRY ListEntry; + BL_HASH_ENTRY Entry; + BL_HASH_VALUE Value; +} BL_HASH_NODE, *PBL_HASH_NODE; + +typedef struct _BL_BLOCK_DEVICE +{ + BL_LOCAL_DEVICE_TYPE Type; + ULONG DeviceFlags; + ULONG Unknown; + BL_PARTITION_TYPE PartitionType; + ULONG BlockSize; + ULONG Alignment; + struct + { + union + { + struct + { + ULONG Signature; + } Mbr; + struct + { + GUID Signature; + } Gpt; + }; + } Disk; + ULONGLONG LastBlock; + EFI_BLOCK_IO* Protocol; + EFI_HANDLE Handle; +} BL_BLOCK_DEVICE, *PBL_BLOCK_DEVICE; + +typedef struct _BL_PROTOCOL_HANDLE +{ + EFI_HANDLE Handle; + PVOID Interface; +} BL_PROTOCOL_HANDLE, *PBL_PROTOCOL_HANDLE; + /* INLINE ROUTINES ***********************************************************/ FORCEINLINE @@ -893,6 +1004,17 @@ _In_ EFI_RESET_TYPE ResetType ); +EFI_DEVICE_PATH* +EfiGetLeafNode ( + _In_ EFI_DEVICE_PATH *DevicePath + ); + +EFI_DEVICE_PATH * +EfiIsDevicePathParent ( + _In_ EFI_DEVICE_PATH *DevicePath1, + _In_ EFI_DEVICE_PATH *DevicePath2 + ); + /* PLATFORM TIMER ROUTINES ***************************************************/ NTSTATUS @@ -920,6 +1042,71 @@ VOID BlFwReboot ( VOID + ); + +PGUID +BlGetApplicationIdentifier ( + VOID + ); + +/* TABLE ROUTINES ************************************************************/ + +NTSTATUS +BlTblMap ( + _In_ PVOID *Table, + _In_ ULONG Count, + _In_ PBL_TBL_MAP_ROUTINE MapCallback + ); + +PVOID +BlTblFindEntry ( + _In_ PVOID *Table, + _In_ ULONG Count, + _Out_ PULONG EntryIndex, + _In_ PBL_TBL_LOOKUP_ROUTINE Callback, + _In_ PVOID Argument1, + _In_ PVOID Argument2, + _In_ PVOID Argument3, + _In_ PVOID Argument4 + ); + +NTSTATUS +BlTblSetEntry ( + _Inout_ PVOID** Table, + _Inout_ PULONG Count, + _In_ PVOID Entry, + _Out_ PULONG EntryIndex, + _In_ PBL_TBL_SET_ROUTINE Callback + ); + +NTSTATUS +TblDoNotPurgeEntry ( + _In_ PVOID Entry + ); + +/* HASH TABLE ROUTINES *******************************************************/ + +NTSTATUS +BlHtStore ( + _In_ ULONG TableId, + _In_ PBL_HASH_ENTRY Entry, + _In_ PVOID Data, + _In_ ULONG DataSize + ); + +NTSTATUS +BlHtLookup ( + _In_ ULONG TableId, + _In_ PBL_HASH_ENTRY Entry, + _Out_ PBL_HASH_VALUE *Value + ); + +NTSTATUS +BlHtCreate ( + _In_ ULONG Size, + _In_ PBL_HASH_TABLE_HASH_FUNCTION HashFunction, + _In_ PBL_HASH_TABLE_COMPARE_FUNCTION CompareFunction, + _Out_ PULONG Id ); /* BCD ROUTINES **************************************************************/ @@ -1001,7 +1188,7 @@ NTSTATUS MmPapAllocatePagesInRange ( - _Inout_ PULONG PhysicalAddress, + _Inout_ PVOID* PhysicalAddress, _In_ BL_MEMORY_TYPE MemoryType, _In_ ULONGLONG Pages, _In_ ULONG Attributes, @@ -1026,6 +1213,13 @@ _In_ PHYSICAL_ADDRESS PhysicalAddress ); +/* BLOCK ALLOCATOR ROUTINES **************************************************/ + +NTSTATUS +BlpMmCreateBlockAllocator ( + VOID + ); + /* HEAP ALLOCATOR ROUTINES ***************************************************/ PVOID @@ -1046,7 +1240,27 @@ _Out_ PULONG TextHeight ); -/* TExT CONSOLE ROUTINES *****************************************************/ +/* I/O ROUTINES **************************************************************/ + +NTSTATUS +BlpIoRegisterDestroyRoutine ( + _In_ PBL_IO_DESTROY_ROUTINE DestroyRoutine + ); + +NTSTATUS +BlDeviceClose ( + _In_ ULONG DeviceId + ); + +NTSTATUS +BlpDeviceOpen ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ ULONG Flags, + _In_ ULONG Unknown, + _Out_ PULONG DeviceId + ); + +/* TEXT CONSOLE ROUTINES *****************************************************/ NTSTATUS ConsoleTextLocalDestruct ( @@ -1197,6 +1411,7 @@ extern EFI_GUID EfiUgaDrawProtocol; extern EFI_GUID EfiLoadedImageProtocol; extern EFI_GUID EfiDevicePathProtocol; +extern EFI_GUID EfiBlockIoProtocol; extern EFI_GUID EfiSimpleTextInputExProtocol; extern ULONG ConsoleGraphicalResolutionListFlags; extern BL_DISPLAY_MODE ConsoleGraphicalResolutionList[]; Added: trunk/reactos/boot/environ/include/efi/BlockIo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/efi/B… ============================================================================== --- trunk/reactos/boot/environ/include/efi/BlockIo.h (added) +++ trunk/reactos/boot/environ/include/efi/BlockIo.h [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -0,0 +1,241 @@ +/** @file + Block IO protocol as defined in the UEFI 2.0 specification. + + The Block IO protocol is used to abstract block devices like hard drives, + DVD-ROMs and floppy drives. + + Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR> + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#ifndef __BLOCK_IO_H__ +#define __BLOCK_IO_H__ + +#define EFI_BLOCK_IO_PROTOCOL_GUID \ + { \ + 0x964e5b21, 0x6459, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \ + } + +typedef struct _EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL; + +/// +/// Protocol GUID name defined in EFI1.1. +/// +#define BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL_GUID + +/// +/// Protocol defined in EFI1.1. +/// +typedef EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO; + +/** + Reset the Block Device. + + @param This Indicates a pointer to the calling context. + @param ExtendedVerification Driver may perform diagnostics on reset. + + @retval EFI_SUCCESS The device was reset. + @retval EFI_DEVICE_ERROR The device is not functioning properly and could + not be reset. + +**/ +typedef +EFI_STATUS +(EFIAPI *EFI_BLOCK_RESET)( + IN EFI_BLOCK_IO_PROTOCOL *This, + IN BOOLEAN ExtendedVerification + ); + +/** + Read BufferSize bytes from Lba into Buffer. + + @param This Indicates a pointer to the calling context. + @param MediaId Id of the media, changes every time the media is replaced. + @param Lba The starting Logical Block Address to read from + @param BufferSize Size of Buffer, must be a multiple of device block size. + @param Buffer A pointer to the destination buffer for the data. The caller is + responsible for either having implicit or explicit ownership of the buffer. + + @retval EFI_SUCCESS The data was read correctly from the device. + @retval EFI_DEVICE_ERROR The device reported an error while performing the read. + @retval EFI_NO_MEDIA There is no media in the device. + @retval EFI_MEDIA_CHANGED The MediaId does not matched the current device. + @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. + @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, + or the buffer is not on proper alignment. + +**/ +typedef +EFI_STATUS +(EFIAPI *EFI_BLOCK_READ)( + IN EFI_BLOCK_IO_PROTOCOL *This, + IN UINT32 MediaId, + IN EFI_LBA Lba, + IN UINTN BufferSize, + OUT VOID *Buffer + ); + +/** + Write BufferSize bytes from Lba into Buffer. + + @param This Indicates a pointer to the calling context. + @param MediaId The media ID that the write request is for. + @param Lba The starting logical block address to be written. The caller is + responsible for writing to only legitimate locations. + @param BufferSize Size of Buffer, must be a multiple of device block size. + @param Buffer A pointer to the source buffer for the data. + + @retval EFI_SUCCESS The data was written correctly to the device. + @retval EFI_WRITE_PROTECTED The device can not be written to. + @retval EFI_DEVICE_ERROR The device reported an error while performing the write. + @retval EFI_NO_MEDIA There is no media in the device. + @retval EFI_MEDIA_CHNAGED The MediaId does not matched the current device. + @retval EFI_BAD_BUFFER_SIZE The Buffer was not a multiple of the block size of the device. + @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, + or the buffer is not on proper alignment. + +**/ +typedef +EFI_STATUS +(EFIAPI *EFI_BLOCK_WRITE)( + IN EFI_BLOCK_IO_PROTOCOL *This, + IN UINT32 MediaId, + IN EFI_LBA Lba, + IN UINTN BufferSize, + IN VOID *Buffer + ); + +/** + Flush the Block Device. + + @param This Indicates a pointer to the calling context. + + @retval EFI_SUCCESS All outstanding data was written to the device + @retval EFI_DEVICE_ERROR The device reported an error while writting back the data + @retval EFI_NO_MEDIA There is no media in the device. + +**/ +typedef +EFI_STATUS +(EFIAPI *EFI_BLOCK_FLUSH)( + IN EFI_BLOCK_IO_PROTOCOL *This + ); + +/** + Block IO read only mode data and updated only via members of BlockIO +**/ +typedef struct { + /// + /// The curent media Id. If the media changes, this value is changed. + /// + UINT32 MediaId; + + /// + /// TRUE if the media is removable; otherwise, FALSE. + /// + BOOLEAN RemovableMedia; + + /// + /// TRUE if there is a media currently present in the device; + /// othersise, FALSE. THis field shows the media present status + /// as of the most recent ReadBlocks() or WriteBlocks() call. + /// + BOOLEAN MediaPresent; + + /// + /// TRUE if LBA 0 is the first block of a partition; otherwise + /// FALSE. For media with only one partition this would be TRUE. + /// + BOOLEAN LogicalPartition; + + /// + /// TRUE if the media is marked read-only otherwise, FALSE. + /// This field shows the read-only status as of the most recent WriteBlocks () call. + /// + BOOLEAN ReadOnly; + + /// + /// TRUE if the WriteBlock () function caches write data. + /// + BOOLEAN WriteCaching; + + /// + /// The intrinsic block size of the device. If the media changes, then + /// this field is updated. + /// + UINT32 BlockSize; + + /// + /// Supplies the alignment requirement for any buffer to read or write block(s). + /// + UINT32 IoAlign; + + /// + /// The last logical block address on the device. + /// If the media changes, then this field is updated. + /// + EFI_LBA LastBlock; + + /// + /// Only present if EFI_BLOCK_IO_PROTOCOL.Revision is greater than or equal to + /// EFI_BLOCK_IO_PROTOCOL_REVISION2. Returns the first LBA is aligned to + /// a physical block boundary. + /// + EFI_LBA LowestAlignedLba; + + /// + /// Only present if EFI_BLOCK_IO_PROTOCOL.Revision is greater than or equal to + /// EFI_BLOCK_IO_PROTOCOL_REVISION2. Returns the number of logical blocks + /// per physical block. + /// + UINT32 LogicalBlocksPerPhysicalBlock; + + /// + /// Only present if EFI_BLOCK_IO_PROTOCOL.Revision is greater than or equal to + /// EFI_BLOCK_IO_PROTOCOL_REVISION3. Returns the optimal transfer length + /// granularity as a number of logical blocks. + /// + UINT32 OptimalTransferLengthGranularity; +} EFI_BLOCK_IO_MEDIA; + +#define EFI_BLOCK_IO_PROTOCOL_REVISION 0x00010000 +#define EFI_BLOCK_IO_PROTOCOL_REVISION2 0x00020001 +#define EFI_BLOCK_IO_PROTOCOL_REVISION3 0x00020031 + +/// +/// Revision defined in EFI1.1. +/// +#define EFI_BLOCK_IO_INTERFACE_REVISION EFI_BLOCK_IO_PROTOCOL_REVISION + +/// +/// This protocol provides control over block devices. +/// +struct _EFI_BLOCK_IO_PROTOCOL { + /// + /// The revision to which the block IO interface adheres. All future + /// revisions must be backwards compatible. If a future version is not + /// back wards compatible, it is not the same GUID. + /// + UINT64 Revision; + /// + /// Pointer to the EFI_BLOCK_IO_MEDIA data for this device. + /// + EFI_BLOCK_IO_MEDIA *Media; + + EFI_BLOCK_RESET Reset; + EFI_BLOCK_READ ReadBlocks; + EFI_BLOCK_WRITE WriteBlocks; + EFI_BLOCK_FLUSH FlushBlocks; + +}; + +extern EFI_GUID gEfiBlockIoProtocolGuid; + +#endif Propchange: trunk/reactos/boot/environ/include/efi/BlockIo.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/environ/lib/bootlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/bootlib.c… ============================================================================== --- trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -393,3 +393,13 @@ EfiPrintf(L"Destroy not yet implemented\r\n"); return; } + +PGUID +BlGetApplicationIdentifier ( + VOID + ) +{ + /* Return the GUID, if one was present */ + return (BlpApplicationEntry.Flags & BL_APPLICATION_ENTRY_FLAG_NO_GUID) ? + NULL : &BlpApplicationEntry.Guid; +} Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -29,10 +29,83 @@ EFI_GUID EfiLoadedImageProtocol = EFI_LOADED_IMAGE_PROTOCOL_GUID; EFI_GUID EfiDevicePathProtocol = EFI_DEVICE_PATH_PROTOCOL_GUID; EFI_GUID EfiSimpleTextInputExProtocol = EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID; +EFI_GUID EfiBlockIoProtocol = EFI_BLOCK_IO_PROTOCOL_GUID; WCHAR BlScratchBuffer[8192]; /* FUNCTIONS *****************************************************************/ + +EFI_DEVICE_PATH * +EfiIsDevicePathParent ( + _In_ EFI_DEVICE_PATH *DevicePath1, + _In_ EFI_DEVICE_PATH *DevicePath2 + ) +{ + USHORT Length1, Length2; + + /* Loop each element of the device path */ + while (!IsDevicePathEndType(DevicePath1) && !IsDevicePathEndType(DevicePath2)) + { + /* Check if the element has a different length */ + Length1 = DevicePathNodeLength(DevicePath1); + Length2 = DevicePathNodeLength(DevicePath2); + if (Length1 != Length2) + { + /* Then they're not related */ + return NULL; + } + + /* Check if the rest of the element data matches */ + if (RtlCompareMemory(DevicePath1, DevicePath2, Length1) != Length1) + { + /* Nope, not related */ + return NULL; + } + + /* Move to the next element */ + DevicePath1 = NextDevicePathNode(DevicePath1); + DevicePath2 = NextDevicePathNode(DevicePath2); + } + + /* If the last element in path 1 is empty, then path 2 is the child (deeper) */ + if (!IsDevicePathEndType(DevicePath1)) + { + return DevicePath2; + } + + /* If the last element in path 2 is empty, then path 1 is the child (deeper) */ + if (!IsDevicePathEndType(DevicePath2)) + { + return DevicePath1; + } + + /* They're both the end, so they're identical, so there's no parent */ + return NULL; +} + +EFI_DEVICE_PATH* +EfiGetLeafNode ( + _In_ EFI_DEVICE_PATH *DevicePath + ) +{ + EFI_DEVICE_PATH *NextDevicePath; + + /* Make sure we're not already at the end */ + if (!IsDevicePathEndType(DevicePath)) + { + /* Grab the next node element, and keep going until the end */ + for (NextDevicePath = NextDevicePathNode(DevicePath); + !IsDevicePathEndType(NextDevicePath); + NextDevicePath = NextDevicePathNode(NextDevicePath)) + { + /* Save the current node we're at */ + DevicePath = NextDevicePath; + } + } + + /* This now contains the deepeest (leaf) node */ + return DevicePath; +} VOID EfiPrintf ( Modified: trunk/reactos/boot/environ/lib/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/device… ============================================================================== --- trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -29,6 +29,1520 @@ /* FUNCTIONS *****************************************************************/ +struct _BL_DEVICE_ENTRY; + +typedef +NTSTATUS +(*PBL_DEVICE_ENUMERATE_DEVICE_CLASS) ( + VOID + ); + +typedef +NTSTATUS +(*PBL_DEVICE_OPEN) ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ struct _BL_DEVICE_ENTRY* DeviceEntry + ); + +typedef +NTSTATUS +(*PBL_DEVICE_CLOSE) ( + _In_ struct _BL_DEVICE_ENTRY* DeviceEntry + ); + +typedef +NTSTATUS +(*PBL_DEVICE_READ) ( + VOID + ); + +typedef +NTSTATUS +(*PBL_DEVICE_WRITE) ( + VOID + ); + +typedef +NTSTATUS +(*PBL_DEVICE_GET_INFORMATION) ( + VOID + ); + +typedef +NTSTATUS +(*PBL_DEVICE_SET_INFORMATION) ( + VOID + ); + +typedef +NTSTATUS +(*PBL_DEVICE_RESET) ( + VOID + ); + +typedef +NTSTATUS +(*PBL_DEVICE_FLUSH) ( + VOID + ); + +typedef +NTSTATUS +(*PBL_DEVICE_CREATE) ( + VOID + ); + +typedef struct _BL_DEVICE_CALLBACKS +{ + PBL_DEVICE_ENUMERATE_DEVICE_CLASS EnumerateDeviceClass; + PBL_DEVICE_OPEN Open; + PBL_DEVICE_CLOSE Close; + PBL_DEVICE_READ Read; + PBL_DEVICE_WRITE Write; + PBL_DEVICE_GET_INFORMATION GetInformation; + PBL_DEVICE_SET_INFORMATION SetInformation; + PBL_DEVICE_RESET Reset; + PBL_DEVICE_FLUSH Flush; + PBL_DEVICE_CREATE Create; +} BL_DEVICE_CALLBACKS, *PBL_DEVICE_CALLBACKS; + +typedef struct _BL_DEVICE_ENTRY +{ + ULONG DeviceId; + ULONG Flags; + ULONG Unknown; + ULONG ReferenceCount; + BL_DEVICE_CALLBACKS Callbacks; + PVOID DeviceSpecificData; + PBL_DEVICE_DESCRIPTOR DeviceDescriptor; +} BL_DEVICE_ENTRY, *PBL_DEVICE_ENTRY; + +typedef struct _BL_REGISTERED_DEVICE +{ + LIST_ENTRY ListEntry; + BL_DEVICE_CALLBACKS Callbacks; +} BL_REGISTERED_DEVICE, *PBL_REGISTERED_DEVICE; + +PVOID* BlockIoDeviceTable; +ULONG BlockIoDeviceTableEntries; + +ULONG BlockIoFirmwareRemovableDiskCount; +ULONG BlockIoFirmwareRawDiskCount; +ULONG BlockIoFirmwareCdromCount; + +PVOID BlockIopAlignedBuffer; +ULONG BlockIopAlignedBufferSize; + +PVOID BlockIopPartialBlockBuffer; +ULONG BlockIopPartialBlockBufferSize; + +PVOID BlockIopPrefetchBuffer; + +PVOID BlockIopReadBlockBuffer; +ULONG BlockIopReadBlockBufferSize; + +ULONG HashTableId; + +BOOLEAN BlockIoInitialized; + +NTSTATUS +BlockIoOpen ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ PBL_DEVICE_ENTRY DeviceEntry + ); + +NTSTATUS +PartitionOpen ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ PBL_DEVICE_ENTRY DeviceEntry + ) +{ + EfiPrintf(L"Not implemented!\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +VhdFileDeviceOpen ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ PBL_DEVICE_ENTRY DeviceEntry + ) +{ + EfiPrintf(L"Not implemented!\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +DiskOpen ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ PBL_DEVICE_ENTRY DeviceEntry + ) +{ + EfiPrintf(L"Not implemented!\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +RdDeviceOpen ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ PBL_DEVICE_ENTRY DeviceEntry + ) +{ + EfiPrintf(L"Not implemented!\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +FileDeviceOpen ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ PBL_DEVICE_ENTRY DeviceEntry + ) +{ + EfiPrintf(L"Not implemented!\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +SpOpen ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ PBL_DEVICE_ENTRY DeviceEntry + ) +{ + EfiPrintf(L"Not implemented!\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +UdpOpen ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ PBL_DEVICE_ENTRY DeviceEntry + ) +{ + EfiPrintf(L"Not implemented!\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +BL_DEVICE_CALLBACKS FileDeviceFunctionTable = +{ + NULL, + FileDeviceOpen, + NULL, +}; + +BL_DEVICE_CALLBACKS PartitionDeviceFunctionTable = +{ + NULL, + PartitionOpen, + NULL, +}; + +BL_DEVICE_CALLBACKS RamDiskDeviceFunctionTable = +{ + NULL, + RdDeviceOpen, + NULL, +}; + +BL_DEVICE_CALLBACKS DiskDeviceFunctionTable = +{ + NULL, + DiskOpen, + NULL, +}; + +BL_DEVICE_CALLBACKS VirtualDiskDeviceFunctionTable = +{ + NULL, + VhdFileDeviceOpen, + NULL, +}; + +BL_DEVICE_CALLBACKS BlockIoDeviceFunctionTable = +{ + NULL, + BlockIoOpen, + NULL, +}; + +BL_DEVICE_CALLBACKS UdpFunctionTable = +{ + NULL, + UdpOpen, + NULL, +}; + +BL_DEVICE_CALLBACKS SerialPortFunctionTable = +{ + NULL, + SpOpen, + NULL, +}; + + +ULONG BcpBlockAllocatorHandle; +ULONG BcpHashTableId; + +NTSTATUS +BcpDestroy ( + VOID + ) +{ + //BcpPurgeCacheEntries(); + //return BlpMmDeleteBlockAllocator(BcpBlockAllocatorHandle); + EfiPrintf(L"Destructor for block cache not yet implemented\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +BOOLEAN +BcpCompareKey ( + _In_ PBL_HASH_ENTRY Entry1, + _In_ PBL_HASH_ENTRY Entry2 + ) +{ + PULONG Value1, Value2; + + Value1 = Entry1->Value; + Value2 = Entry2->Value; + return Entry1->Size == Entry2->Size && Entry1->Flags == Entry2->Flags && *Value1 == *Value2 && Value1[1] == Value2[1] && Value1[2] == Value2[2]; +} + +ULONG +BcpHashFunction ( + _In_ PBL_HASH_ENTRY Entry, + _In_ ULONG TableSize + ) +{ + ULONG i, j, ValueHash; + PUCHAR ValueBuffer; + + j = 0; + ValueHash = 0; + i = 0; + + ValueBuffer = Entry->Value; + + do + { + ValueHash += ValueBuffer[i++]; + } + while (i < 8); + + do + { + ValueHash += ValueBuffer[j++ + 8]; + } + while (j < 4); + + return ValueHash % TableSize; +} + +NTSTATUS +BcInitialize ( + VOID + ) +{ + NTSTATUS Status; + + Status = BlHtCreate(50, BcpHashFunction, BcpCompareKey, &BcpHashTableId); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + BcpBlockAllocatorHandle = BlpMmCreateBlockAllocator(); + if (BcpBlockAllocatorHandle == -1) + { + Status = STATUS_UNSUCCESSFUL; + goto Quickie; + } + + Status = BlpIoRegisterDestroyRoutine(BcpDestroy); + if (Status >= 0) + { + return Status; + } + +Quickie: + EfiPrintf(L"Failure path not yet implemented\n"); +#if 0 + if (BcpHashTableId != -1) + { + BlHtDestroy(BcpHashTableId); + } + if (BcpBlockAllocatorHandle != -1) + { + BlpMmDeleteBlockAllocator(BcpBlockAllocatorHandle); + } +#endif + return Status; +} + +BOOLEAN +BlpDeviceCompare ( + _In_ PBL_DEVICE_DESCRIPTOR Device1, + _In_ PBL_DEVICE_DESCRIPTOR Device2 + ) +{ + BOOLEAN DeviceMatch; + ULONG DeviceSize; + + /* Assume failure */ + DeviceMatch = FALSE; + + /* Check if the two devices exist and are identical in typ */ + if ((Device1) && (Device2) && (Device1->DeviceType == Device2->DeviceType)) + { + /* Take the bigger of the two sizes */ + DeviceSize = max(Device1->Size, Device2->Size); + if (DeviceSize >= (ULONG)FIELD_OFFSET(BL_DEVICE_DESCRIPTOR, Local)) + { + /* Compare the two devices up to their size */ + if (RtlEqualMemory(&Device1->Local, + &Device2->Local, + DeviceSize - FIELD_OFFSET(BL_DEVICE_DESCRIPTOR, Local))) + { + /* They match! */ + DeviceMatch = TRUE; + } + } + } + + /* Return matching state */ + return DeviceMatch; +} + +BOOLEAN +DeviceTableCompare ( + _In_ PVOID Entry, + _In_ PVOID Argument1, + _In_ PVOID Argument2, + _Inout_ PVOID Argument3, + _Inout_ PVOID Argument4 + ) +{ + BOOLEAN Found; + PBL_DEVICE_DESCRIPTOR Device = (PBL_DEVICE_DESCRIPTOR)Entry; + PBL_DEVICE_ENTRY DeviceEntry = (PBL_DEVICE_ENTRY)Argument1; + ULONG Flags = *(PULONG)Argument2; + ULONG Unknown = *(PULONG)Argument3; + + /* Assume failure */ + Found = FALSE; + + /* Compare the device descriptor */ + if (BlpDeviceCompare(DeviceEntry->DeviceDescriptor, Device)) + { + /* Compare something */ + if (DeviceEntry->Unknown == Unknown) + { + /* Compare flags */ + if ((!(Flags & 1) || (DeviceEntry->Flags & 2)) && + (!(Flags & 2) || (DeviceEntry->Flags & 4))) + { + /* And more flags */ + if (((Flags & 8) || !(DeviceEntry->Flags & 8)) && + (!(Flags & 8) || (DeviceEntry->Flags & 8))) + { + /* Found a match! */ + Found = TRUE; + } + } + } + } + + /* Return matching state */ + return Found; +} + +NTSTATUS +DeviceTableDestroyEntry ( + _In_ PVOID Entry, + _In_ ULONG DeviceId + ) +{ + PBL_DEVICE_ENTRY DeviceEntry = (PBL_DEVICE_ENTRY)Entry; + NTSTATUS Status; + + /* Call the close routine for this entry */ + Status = DeviceEntry->Callbacks.Close(DmDeviceTable[DeviceId]); + + /* Free the descriptor, and the device itself */ + BlMmFreeHeap(DeviceEntry->DeviceDescriptor); + BlMmFreeHeap(DeviceEntry); + + /* Clear out the netry, and return */ + DmDeviceTable[DeviceId] = NULL; + return Status; +} + +NTSTATUS +DeviceTablePurge ( + _In_ PVOID Entry + ) +{ + PBL_DEVICE_ENTRY DeviceEntry = (PBL_DEVICE_ENTRY)Entry; + NTSTATUS Status; + + /* Check if the device is opened */ + if (DeviceEntry->Flags & 1) + { + /* It is, so can't purge it */ + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* It isn't, so destroy the entry */ + Status = DeviceTableDestroyEntry(DeviceEntry, DeviceEntry->DeviceId); + } + + /* Return back to caller */ + return Status; +} + +NTSTATUS +BlockIoDeviceTableDestroyEntry ( + _In_ PVOID Entry, + _In_ ULONG DeviceId + ) +{ + PBL_DEVICE_ENTRY DeviceEntry = (PBL_DEVICE_ENTRY)Entry; + NTSTATUS Status; + + /* Call the close routine for this entry */ + Status = DeviceEntry->Callbacks.Close(DeviceEntry); + + /* Free the descriptor, and the device itself */ + BlMmFreeHeap(DeviceEntry->DeviceDescriptor); + BlMmFreeHeap(DeviceEntry); + + /* Clear out the netry, and return */ + BlockIoDeviceTable[DeviceId] = NULL; + return Status; +} + +NTSTATUS +BlockIoDeviceTableDestroy ( + VOID + ) +{ + NTSTATUS Status; + + /* Call the entry destructor on each entry in the table */ + Status = BlTblMap(BlockIoDeviceTable, + BlockIoDeviceTableEntries, + BlockIoDeviceTableDestroyEntry); + + /* Free the table and return */ + BlMmFreeHeap(BlockIoDeviceTable); + return Status; +} + +NTSTATUS +BlockIopDestroy ( + VOID + ) +{ + /* Free the prefetch buffer */ + BlMmFreeHeap(BlockIopPrefetchBuffer); + + /* Set state to non initialized */ + BlockIoInitialized = FALSE; + + /* Return back */ + return STATUS_SUCCESS; +} + +ULONG +BlockIoEfiHashFunction ( + _In_ PBL_HASH_ENTRY Entry, + _In_ ULONG TableSize + ) +{ + /* Get rid of the alignment bits to have a more unique number */ + return ((ULONG)Entry->Value >> 3) % TableSize; +} + +NTSTATUS +BlockIopInitialize ( + VOID + ) +{ + NTSTATUS Status; + + /* Allocate the block device table and zero it out */ + BlockIoDeviceTableEntries = 8; + BlockIoDeviceTable = BlMmAllocateHeap(sizeof(PVOID) * + BlockIoDeviceTableEntries); + if (!BlockIoDeviceTableEntries) + { + return STATUS_NO_MEMORY; + } + RtlZeroMemory(BlockIoDeviceTable, sizeof(PVOID) * BlockIoDeviceTableEntries); + + /* Register our destructor */ + Status = BlpIoRegisterDestroyRoutine(BlockIoDeviceTableDestroy); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Initialize all counters */ + BlockIoFirmwareRemovableDiskCount = 0; + BlockIoFirmwareRawDiskCount = 0; + BlockIoFirmwareCdromCount = 0; + + /* Initialize the buffers and their sizes */ + BlockIopAlignedBuffer = NULL; + BlockIopAlignedBufferSize = 0; + BlockIopPartialBlockBuffer = NULL; + BlockIopPartialBlockBufferSize = 0; + BlockIopPrefetchBuffer = NULL; + BlockIopReadBlockBuffer = NULL; + BlockIopReadBlockBufferSize = 0; + + /* Allocate the prefetch buffer */ + Status = MmPapAllocatePagesInRange(&BlockIopPrefetchBuffer, + BlLoaderDeviceMemory, + 0x100, + 0, + 0, + NULL, + 0); + if (NT_SUCCESS(Status)) + { + /* Initialize the block cache */ + Status = BcInitialize(); + if (NT_SUCCESS(Status)) + { + /* Initialize the block device hash table */ + Status = BlHtCreate(29, BlockIoEfiHashFunction, NULL, &HashTableId); + if (NT_SUCCESS(Status)) + { + /* Register our destructor */ + Status = BlpIoRegisterDestroyRoutine(BlockIopDestroy); + if (NT_SUCCESS(Status)) + { + /* We're good */ + BlockIoInitialized = TRUE; + } + } + } + } + + /* Check if this is the failure path */ + if (!NT_SUCCESS(Status)) + { + /* Free the prefetch buffer is one was allocated */ + if (BlockIopPrefetchBuffer) + { + EfiPrintf(L"Failure path not implemented %lx\r\n", Status); + //MmPapFreePages(BlockIopPrefetchBuffer, 1); + } + } + + /* Return back to the caller */ + return Status; +} + +NTSTATUS +BlockIopFreeAllocations ( + _In_ PBL_BLOCK_DEVICE BlockDevice + ) +{ + /* If a block device was passed in, free it */ + if (BlockDevice) + { + BlMmFreeHeap(BlockDevice); + } + + /* Nothing else to do */ + return STATUS_SUCCESS; +} + +NTSTATUS +BlockIoEfiGetBlockIoInformation ( + _In_ PBL_BLOCK_DEVICE BlockDevice + ) +{ + NTSTATUS Status; + EFI_BLOCK_IO_MEDIA *Media; + + /* Open the Block I/O protocol on this device */ + Status = EfiOpenProtocol(BlockDevice->Handle, + &EfiBlockIoProtocol, + (PVOID*)&BlockDevice->Protocol); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Get information on the block media */ + Media = BlockDevice->Protocol->Media; + + /* Set the appropriate device flags */ + BlockDevice->DeviceFlags = 0; + if (Media->RemovableMedia) + { + BlockDevice->DeviceFlags = 1; + } + if (Media->MediaPresent) + { + BlockDevice->DeviceFlags |= 2; + } + + /* No clue */ + BlockDevice->Unknown = 0; + + /* Set the block size */ + BlockDevice->BlockSize = Media->BlockSize; + + /* Make sure there's a last block value */ + if (!Media->LastBlock) + { + return STATUS_INVALID_PARAMETER; + } + + /* Don't let it be too high */ + if (Media->LastBlock > 0xFFFFFFFFFFE) + { + BlockDevice->LastBlock = 0xFFFFFFFFFFE; + } + else + { + BlockDevice->LastBlock = Media->LastBlock; + } + + /* Make the alignment the smaller of the I/O alignment or the block size */ + if (Media->IoAlign >= Media->BlockSize) + { + BlockDevice->Alignment = Media->IoAlign; + } + else + { + BlockDevice->Alignment = Media->BlockSize; + } + + /* All good */ + return STATUS_SUCCESS; +} + +NTSTATUS +BlockIoEfiGetChildHandle ( + _In_ PBL_PROTOCOL_HANDLE ProtocolInterface, + _In_ PBL_PROTOCOL_HANDLE ChildProtocolInterface) +{ + NTSTATUS Status; + ULONG i, DeviceCount; + EFI_DEVICE_PATH *DevicePath, *ParentDevicePath; + EFI_HANDLE *DeviceHandles; + EFI_HANDLE Handle; + + /* Find all the Block I/O device handles on the system */ + DeviceCount = 0; + DeviceHandles = 0; + Status = EfiLocateHandleBuffer(ByProtocol, + &EfiBlockIoProtocol, + &DeviceCount, + &DeviceHandles); + if (!NT_SUCCESS(Status)) + { + /* Failed to enumerate, bail out */ + return Status; + } + + /* Loop all the handles */ + for (i = 0; i < DeviceCount; i++) + { + /* Check if this is the device itself */ + Handle = DeviceHandles[i]; + if (Handle == ProtocolInterface->Handle) + { + /* Skip it */ + continue; + } + + /* Get the device path of this device */ + Status = EfiOpenProtocol(Handle, + &EfiDevicePathProtocol, + (PVOID*)&DevicePath); + if (!NT_SUCCESS(Status)) + { + /* We failed, skip it */ + continue; + } + + /* See if we are its parent */ + ParentDevicePath = EfiIsDevicePathParent(ProtocolInterface->Interface, + DevicePath); + if (ParentDevicePath == ProtocolInterface->Interface) + { + /* Yup, return back to caller */ + ChildProtocolInterface->Handle = Handle; + ChildProtocolInterface->Interface = DevicePath; + break; + } + + /* Close the device path */ + EfiCloseProtocol(Handle, &EfiDevicePathProtocol); + } + + /* If we got here, nothing was found */ + Status = STATUS_NO_SUCH_DEVICE; + + /* Free the handle array buffer */ + BlMmFreeHeap(DeviceHandles); + return Status; +} + +NTSTATUS +BlockIoGetGPTDiskSignature ( + _In_ PBL_DEVICE_ENTRY DeviceEntry, + _Out_ PGUID DiskSignature + ) +{ + EfiPrintf(L"GPT not supported\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlockIoEfiGetDeviceInformation ( + _In_ PBL_DEVICE_ENTRY DeviceEntry + ) +{ + NTSTATUS Status; + PBL_DEVICE_DESCRIPTOR Device; + PBL_BLOCK_DEVICE BlockDevice; + EFI_DEVICE_PATH *LeafNode; + EFI_HANDLE Handle; + BL_PROTOCOL_HANDLE Protocol[2]; + ACPI_HID_DEVICE_PATH *AcpiPath; + HARDDRIVE_DEVICE_PATH *DiskPath; + BOOLEAN Found; + ULONG i; + + Device = DeviceEntry->DeviceDescriptor; + BlockDevice = (PBL_BLOCK_DEVICE)DeviceEntry->DeviceSpecificData; + + Found = FALSE; + + Handle = BlockDevice->Handle; + + Protocol[0].Handle = Handle; + Protocol[1].Handle = 0; + + Status = EfiOpenProtocol(Handle, + &EfiDevicePathProtocol, + &Protocol[0].Interface); + if (Status < 0) + { + return Status; + } + + for (i = 0, Found = FALSE; Found == FALSE && Protocol[i].Handle; i++) + { + LeafNode = EfiGetLeafNode(Protocol[i].Interface); + if (LeafNode->Type == ACPI_DEVICE_PATH) + { + /* We only support floppy drives */ + AcpiPath = (ACPI_HID_DEVICE_PATH*)LeafNode; + if ((AcpiPath->HID == EISA_PNP_ID(0x604)) && + (AcpiPath->HID == EISA_PNP_ID(0x700))) + { + /* Set the boot library specific device types */ + Device->DeviceType = LocalDevice; + Device->Local.Type = FloppyDevice; + + /* The ACPI UID is the drive number */ + Device->Local.FloppyDisk.DriveNumber = AcpiPath->UID; + + /* We found a match */ + Found = TRUE; + } + } + else if ((LeafNode->Type == MEDIA_DEVICE_PATH) && (i == 1)) + { + /* Extract the disk path and check if it's a physical disk */ + DiskPath = (HARDDRIVE_DEVICE_PATH*)LeafNode; + if (LeafNode->SubType == MEDIA_HARDDRIVE_DP) + { + Device->Local.Type = LocalDevice; + + /* Check if this is an MBR partition */ + if (DiskPath->SignatureType == SIGNATURE_TYPE_MBR) + { + /* Set that this is a local partition */ + Device->DeviceType = LegacyPartitionDevice; + Device->Partition.Disk.Type = LocalDevice; + + BlockDevice->PartitionType = MbrPartition; + BlockDevice->Disk.Mbr.Signature = *(PULONG)&DiskPath->Signature[0]; + Found = TRUE; + } + else if (DiskPath->SignatureType == SIGNATURE_TYPE_GUID) + { + BlockDevice->PartitionType = 0; + Device->Local.HardDisk.PartitionType = GptPartition; + + Status = BlockIoGetGPTDiskSignature(DeviceEntry, + &Device->Local.HardDisk.Gpt.PartitionSignature); + if (NT_SUCCESS(Status)) + { + RtlCopyMemory(&BlockDevice->Disk.Gpt.Signature, + &Device->Local.HardDisk.Gpt.PartitionSignature, + sizeof(&BlockDevice->Disk.Gpt.Signature)); + Found = TRUE; + } + } + + /* Otherwise, raw boot is not supported */ + BlockDevice->PartitionType = RawPartition; + Device->Local.HardDisk.PartitionType = RawPartition; + Device->Local.HardDisk.Raw.DiskNumber = BlockIoFirmwareRawDiskCount++;; + } + else if (LeafNode->SubType == MEDIA_CDROM_DP) + { + /* Set block device information */ + BlockDevice->PartitionType = RawPartition; + BlockDevice->Type = CdRomDevice; + + /* Set CDROM data */ + Device->Local.Type = CdRomDevice; + Device->Local.FloppyDisk.DriveNumber = 0; + Found = TRUE; + } + } + else if ((LeafNode->Type != MEDIA_DEVICE_PATH) && + (LeafNode->Type == ACPI_DEVICE_PATH) && + (i == 0)) + { + Status = BlockIoEfiGetChildHandle(Protocol, &Protocol[i]); + if (!NT_SUCCESS(Status)) + { + Device->DeviceType = LocalDevice; + Found = 1; + if (BlockDevice->DeviceFlags & 1) + { + BlockDevice->Type = FloppyDevice; + Device->Local.HardDisk.PartitionType = BlockIoFirmwareRemovableDiskCount++; + Device->Local.Type = FloppyDevice; + } + else + { + BlockDevice->Type = DiskDevice; + Device->Local.Type = DiskDevice; + Device->Local.HardDisk.PartitionType = RawPartition; + BlockDevice->PartitionType = RawPartition; + Device->Local.HardDisk.Mbr.PartitionSignature = BlockIoFirmwareRawDiskCount++; + } + } + } + } + + while (i) + { + EfiCloseProtocol(Protocol[--i].Handle, &EfiDevicePathProtocol); + } + + if (Found) + { + Status = 0; + } + else + { + Status = STATUS_NOT_SUPPORTED; + } + return Status; +} + +NTSTATUS +BlockIoEfiReset ( + VOID + ) +{ + EfiPrintf(L"not implemented\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlockIoEfiFlush ( + VOID + ) +{ + EfiPrintf(L"not implemented\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlockIoEfiCreateDeviceEntry ( + _In_ PBL_DEVICE_ENTRY *DeviceEntry, + _Out_ PVOID Handle + ) +{ + PBL_DEVICE_ENTRY IoDeviceEntry; + PBL_BLOCK_DEVICE BlockDevice; + NTSTATUS Status; + PBL_DEVICE_DESCRIPTOR Device; + + /* Allocate the entry for this device and zero it out */ + IoDeviceEntry = BlMmAllocateHeap(sizeof(*IoDeviceEntry)); + if (!IoDeviceEntry) + { + return STATUS_NO_MEMORY; + } + RtlZeroMemory(IoDeviceEntry, sizeof(*IoDeviceEntry)); + + /* Allocate the device descriptor for this device and zero it out */ + Device = BlMmAllocateHeap(sizeof(*Device)); + if (!Device) + { + return STATUS_NO_MEMORY; + } + RtlZeroMemory(Device, sizeof(*Device)); + + /* Allocate the block device specific data, and zero it out */ + BlockDevice = BlMmAllocateHeap(sizeof(*BlockDevice)); + if (!BlockDevice) + { + return STATUS_NO_MEMORY; + } + RtlZeroMemory(BlockDevice, sizeof(*BlockDevice)); + + /* Save the descriptor and block device specific data */ + IoDeviceEntry->DeviceSpecificData = BlockDevice; + IoDeviceEntry->DeviceDescriptor = Device; + + /* Set the size of the descriptor */ + Device->Size = sizeof(*Device); + + /* Copy the standard I/O callbacks */ + RtlCopyMemory(&IoDeviceEntry->Callbacks, + &BlockIoDeviceFunctionTable, + sizeof(IoDeviceEntry->Callbacks)); + + /* Add the two that are firmware specific */ + IoDeviceEntry->Callbacks.Reset = BlockIoEfiReset; + IoDeviceEntry->Callbacks.Flush = BlockIoEfiFlush; + + /* Save the EFI handle */ + BlockDevice->Handle = Handle; + + /* Get information on this device from EFI, caching it in the device */ + Status = BlockIoEfiGetBlockIoInformation(BlockDevice); + if (NT_SUCCESS(Status)) + { + /* Build the descriptor structure for this device */ + Status = BlockIoEfiGetDeviceInformation(IoDeviceEntry); + if (NT_SUCCESS(Status)) + { + /* We have a fully constructed device, reuturn it */ + *DeviceEntry = IoDeviceEntry; + return STATUS_SUCCESS; + } + } + + /* Failure path, free the descriptor if we allocated one */ + if (IoDeviceEntry->DeviceDescriptor) + { + BlMmFreeHeap(IoDeviceEntry->DeviceDescriptor); + } + + /* Free any other specific allocations */ + BlockIopFreeAllocations(IoDeviceEntry->DeviceSpecificData); + + /* Free the device entry itself and return the failure code */ + BlMmFreeHeap(IoDeviceEntry); + return Status; +} + +NTSTATUS +BlockIoFirmwareOpen ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ PBL_BLOCK_DEVICE BlockIoDevice + ) +{ + NTSTATUS Status; + BOOLEAN DeviceMatch; + BL_HASH_ENTRY HashEntry; + ULONG i, Id, DeviceCount; + PBL_DEVICE_ENTRY DeviceEntry; + EFI_HANDLE* DeviceHandles; + + /* Initialize everything */ + DeviceEntry = NULL; + DeviceCount = 0; + DeviceHandles = 0; + DeviceEntry = NULL; + + /* Ask EFI for handles to all block devices */ + Status = EfiLocateHandleBuffer(ByProtocol, + &EfiBlockIoProtocol, + &DeviceCount, + &DeviceHandles); + if (!NT_SUCCESS(Status)) + { + return STATUS_NO_SUCH_DEVICE; + } + + /* Build a hash entry, with the value inline */ + HashEntry.Flags = 1; + HashEntry.Size = sizeof(EFI_HANDLE); + + /* Loop each device we got */ + DeviceMatch = FALSE; + Status = STATUS_NO_SUCH_DEVICE; + for (i = 0; i < DeviceCount; i++) + { + /* Check if we have a match in the device hash table */ + HashEntry.Value = DeviceHandles[i]; + Status = BlHtLookup(HashTableId, &HashEntry, 0); + if (NT_SUCCESS(Status)) + { + /* We already know about this device */ + continue; + } + + /* New device, store it in the hash table */ + Status = BlHtStore(HashTableId, + &HashEntry, + DeviceHandles[i], + sizeof(DeviceHandles[i])); + if (!NT_SUCCESS(Status)) + { + /* Free the array and fail */ + BlMmFreeHeap(DeviceHandles); + break; + } + + /* Create an entry for this device*/ + Status = BlockIoEfiCreateDeviceEntry(&DeviceEntry, DeviceHandles[i]); + if (!NT_SUCCESS(Status)) + { + break; + } + + /* Add the device entry to the device table */ + Status = BlTblSetEntry(&BlockIoDeviceTable, + &BlockIoDeviceTableEntries, + DeviceEntry, + &Id, + TblDoNotPurgeEntry); + if (!NT_SUCCESS(Status)) + { + EfiPrintf(L"Failure path not implemented: %lx\r\n", Status); +#if 0 + BlHtDelete(HashTableId, &HashKey); +#endif + /* Free the block I/O device data */ + BlockIopFreeAllocations(DeviceEntry->DeviceSpecificData); + + /* Free the descriptor */ + BlMmFreeHeap(DeviceEntry->DeviceDescriptor); + + /* Free the entry */ + BlMmFreeHeap(DeviceEntry); + break; + } + + /* Does this device match what we're looking for? */ + DeviceMatch = BlpDeviceCompare(DeviceEntry->DeviceDescriptor, Device); + if (DeviceMatch) + { + /* Yep, return the data back */ + RtlCopyMemory(BlockIoDevice, + DeviceEntry->DeviceSpecificData, + sizeof(*BlockIoDevice)); + Status = STATUS_SUCCESS; + break; + } + } + + /* Free the device handle buffer array */ + BlMmFreeHeap(DeviceHandles); + + /* Return status */ + return Status; +} + +BOOLEAN +BlockIoDeviceTableCompare ( + _In_ PVOID Entry, + _In_ PVOID Argument1, + _In_ PVOID Argument2, + _In_ PVOID Argument3, + _In_ PVOID Argument4 + ) +{ + PBL_DEVICE_ENTRY DeviceEntry = (PBL_DEVICE_ENTRY)Entry; + PBL_DEVICE_DESCRIPTOR Device = (PBL_DEVICE_DESCRIPTOR)Argument1; + + /* Compare the two devices */ + return BlpDeviceCompare(DeviceEntry->DeviceDescriptor, Device); +} + +NTSTATUS +BlockIoOpen ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ PBL_DEVICE_ENTRY DeviceEntry + ) +{ + NTSTATUS Status; + PBL_BLOCK_DEVICE BlockDevice; + PBL_DEVICE_ENTRY FoundDeviceEntry; + ULONG Dummy; + + /* Check if the block I/O manager is initialized */ + if (!BlockIoInitialized) + { + /* First call, initialize it now */ + Status = BlockIopInitialize(); + if (!NT_SUCCESS(Status)) + { + /* Failed to initialize block I/O */ + return Status; + } + } + + /* Copy a function table for block I/O devices */ + RtlCopyMemory(&DeviceEntry->Callbacks, + &BlockIoDeviceFunctionTable, + sizeof(DeviceEntry->Callbacks)); + + /* Allocate a block I/O device */ + BlockDevice = BlMmAllocateHeap(sizeof(*BlockDevice)); + if (!BlockDevice) + { + return STATUS_NO_MEMORY; + } + + /* Set this as the device-specific data for this device entry */ + Status = STATUS_SUCCESS; + DeviceEntry->DeviceSpecificData = BlockDevice; + + /* Check if we already have this device in our device table */ + FoundDeviceEntry = BlTblFindEntry(BlockIoDeviceTable, + BlockIoDeviceTableEntries, + &Dummy, + BlockIoDeviceTableCompare, + Device, + NULL, + NULL, + NULL); + if (FoundDeviceEntry) + { + /* We already found a device, so copy its device data and callbacks */ + RtlCopyMemory(BlockDevice, FoundDeviceEntry->DeviceSpecificData, sizeof(*BlockDevice)); + RtlCopyMemory(&DeviceEntry->Callbacks, + &FoundDeviceEntry->Callbacks, + sizeof(DeviceEntry->Callbacks)); + return Status; + } + + /* Zero out the device for now */ + RtlZeroMemory(BlockDevice, sizeof(*BlockDevice)); + + /* Is this a disk? */ + if (Device->DeviceType == DiskDevice) + { + /* What type of disk is it? */ + switch (Device->Local.Type) + { + /* Is it a raw physical disk? */ + case LocalDevice: + case FloppyDevice: + case CdRomDevice: + /* Open a disk device */ + Status = DiskDeviceFunctionTable.Open(Device, DeviceEntry); + break; + + /* Is it a RAM disk? */ + case RamDiskDevice: + /* Open a RAM disk */ + Status = RamDiskDeviceFunctionTable.Open(Device, DeviceEntry); + break; + + /* Is it a file? */ + case FileDevice: + /* Open a file */ + Status = FileDeviceFunctionTable.Open(Device, DeviceEntry); + break; + + /* Is it a VHD? */ + case VirtualDiskDevice: + /* Open a virtual disk */ + Status = VirtualDiskDeviceFunctionTable.Open(Device, DeviceEntry); + break; + + /* Is it something else? */ + default: + /* Not supported */ + Status = STATUS_INVALID_PARAMETER; + break; + } + } + else if ((Device->DeviceType == LegacyPartitionDevice) || + (Device->DeviceType == PartitionDevice)) + { + /* This is a partition on a disk, open it as such */ + Status = PartitionDeviceFunctionTable.Open(Device, DeviceEntry); + } + else + { + /* Other devices are not supported */ + Status = STATUS_INVALID_PARAMETER; + } + + /* Check for failure */ + if (!NT_SUCCESS(Status)) + { + /* Free any allocations for this device */ + BlockIopFreeAllocations(BlockDevice); + } + + /* Return back to the caller */ + return Status; +} + +NTSTATUS +BlpDeviceResolveLocate ( + _In_ PBL_DEVICE_DESCRIPTOR InputDevice, + _Out_ PBL_DEVICE_DESCRIPTOR* LocateDevice + ) +{ + EfiPrintf(L"Not implemented!\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlDeviceClose ( + _In_ ULONG DeviceId + ) +{ + PBL_DEVICE_ENTRY DeviceEntry; + + /* Validate the device ID */ + if (DmTableEntries <= DeviceId) + { + return STATUS_INVALID_PARAMETER; + } + + /* Make sure there's a device there */ + DeviceEntry = DmDeviceTable[DeviceId]; + if (DeviceEntry == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + /* Make sure the device is active */ + if (!(DeviceEntry->Flags & 1)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Drop a reference and check if it's the last one */ + DeviceEntry->ReferenceCount--; + if (!DeviceEntry->ReferenceCount) + { + /* Mark the device as inactive */ + DeviceEntry->Flags = ~1; + } + + /* We're good */ + return STATUS_SUCCESS; +} + +NTSTATUS +BlpDeviceOpen ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ ULONG Flags, + _In_ ULONG Unknown, + _Out_ PULONG DeviceId + ) +{ + NTSTATUS Status; + PBL_DEVICE_ENTRY DeviceEntry; + PBL_DEVICE_DESCRIPTOR LocateDeviceDescriptor; + PBL_REGISTERED_DEVICE RegisteredDevice; + PLIST_ENTRY NextEntry, ListHead; + + DeviceEntry = NULL; + + /* Check for missing parameters */ + if (!(Device) || !(DeviceId) || !(Device->Size)) + { + /* Bail out */ + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Check for unsupported flags */ + if (!(Flags & 3)) + { + /* Bail out */ + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Check if the boot device is being opened */ + if (Device->DeviceType == BootDevice) + { + /* Select it */ + Device = BlpBootDevice; + } + + /* Check if the 'locate' device is being opened */ + if (Device->DeviceType == LocateDevice) + { + /* Go find it */ + Status = BlpDeviceResolveLocate(Device, &LocateDeviceDescriptor); + if (!NT_SUCCESS(Status)) + { + /* Not found, bail out */ + goto Quickie; + } + + /* Select it */ + Device = LocateDeviceDescriptor; + } + + /* Check if the device isn't ready yet */ + if (Device->Flags & 1) + { + /* Return a failure */ + Status = STATUS_DEVICE_NOT_READY; + goto Quickie; + } + + /* Check if we already have an entry for the device */ + DeviceEntry = BlTblFindEntry(DmDeviceTable, + DmTableEntries, + DeviceId, + DeviceTableCompare, + Device, + &Flags, + &Unknown, + NULL); + if (DeviceEntry) + { + /* Return it, taking a reference on it */ + *DeviceId = DeviceEntry->DeviceId; + ++DeviceEntry->ReferenceCount; + DeviceEntry->Flags |= 1; + return STATUS_SUCCESS; + } + + /* We don't, allocate one */ + DeviceEntry = BlMmAllocateHeap(sizeof(*DeviceEntry)); + if (!DeviceEntry) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Fill it out */ + RtlZeroMemory(DeviceEntry, sizeof(*DeviceEntry)); + DeviceEntry->ReferenceCount = 1; + DeviceEntry->Flags |= 7; + DeviceEntry->Unknown = Unknown; + + /* Save flag 8 if needed */ + if (Flags & 8) + { + DeviceEntry->Flags |= 8; + } + + /* Allocate a device descriptor for the device */ + DeviceEntry->DeviceDescriptor = BlMmAllocateHeap(Device->Size); + if (!DeviceEntry->DeviceDescriptor) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Copy the descriptor that was passed in */ + RtlCopyMemory(DeviceEntry->DeviceDescriptor, Device, Device->Size); + + /* Now loop the list of dynamically registered devices */ + ListHead = &DmRegisteredDevices; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the device */ + RegisteredDevice = CONTAINING_RECORD(NextEntry, + BL_REGISTERED_DEVICE, + ListEntry); + + /* Open the device */ + Status = RegisteredDevice->Callbacks.Open(Device, DeviceEntry); + if (NT_SUCCESS(Status)) + { + /* The device was opened, so we have the right one */ + goto DeviceOpened; + } + + /* Nope, keep trying */ + NextEntry = NextEntry->Flink; + } + + /* Well, it wasn't a dynamic device. Is it a block device? */ + if ((Device->DeviceType == PartitionDevice) || + (Device->DeviceType == DiskDevice) || + (Device->DeviceType == LegacyPartitionDevice)) + { + /* Call the Block I/O handler */ + Status = BlockIoDeviceFunctionTable.Open(Device, DeviceEntry); + } + else if (Device->DeviceType == SerialDevice) + { + /* It's a serial device, call the serial device handler */ + Status = SerialPortFunctionTable.Open(Device, DeviceEntry); + } + else if (Device->DeviceType == UdpDevice) + { + /* It's a network device, call the UDP device handler */ + Status = UdpFunctionTable.Open(Device, DeviceEntry); + } + else + { + /* Unsupported type of device */ + Status = STATUS_NOT_IMPLEMENTED; + } + + /* Check if the device was opened successfuly */ + if (NT_SUCCESS(Status)) + { +DeviceOpened: + /* Save the entry in the device table */ + Status = BlTblSetEntry(&DmDeviceTable, + &DmTableEntries, + DeviceEntry, + DeviceId, + DeviceTablePurge); + if (NT_SUCCESS(Status)) + { + /* It worked -- return the ID in the table to the caller */ + DeviceEntry->DeviceId = *DeviceId; + return STATUS_SUCCESS; + } + } + +Quickie: + /* Failure path -- did we allocate a device entry? */ + if (DeviceEntry) + { + /* Yep -- did it have a descriptor? */ + if (DeviceEntry->DeviceDescriptor) + { + /* Free it */ + BlMmFreeHeap(DeviceEntry->DeviceDescriptor); + } + + /* Free the entry */ + BlMmFreeHeap(DeviceEntry); + } + + /* Return the failure */ + return Status; +} + NTSTATUS BlpDeviceInitialize ( VOID @@ -52,7 +1566,6 @@ { /* Clear it */ RtlZeroMemory(DmDeviceTable, DmTableEntries * sizeof(PVOID)); - #if 0 /* Initialize BitLocker support */ Status = FvebInitialize(); Modified: trunk/reactos/boot/environ/lib/io/display/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/display.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/display/display.c [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -66,7 +66,7 @@ InitializeListHead(&BfiFontFileListHead); /* Allocate the font rectangle */ - BfiGraphicsRectangle = BlMmAllocateHeap(0x5A); + BfiGraphicsRectangle = BlMmAllocateHeap(90); if (!BfiGraphicsRectangle) { return STATUS_NO_MEMORY; Modified: trunk/reactos/boot/environ/lib/io/display/emscons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/emscons.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/display/emscons.c [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -44,7 +44,7 @@ /* Construct it */ Status = ConsoleRemoteConstruct(RemoteConsole); - if (Status < 0) + if (!NT_SUCCESS(Status)); { /* Failed to construct it, delete it */ BlMmFreeHeap(RemoteConsole); Modified: trunk/reactos/boot/environ/lib/io/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/io.c?r… ============================================================================== --- trunk/reactos/boot/environ/lib/io/io.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/io.c [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -16,6 +16,20 @@ PVOID* IoMgrDestroyRoutineTable; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +BlpIoRegisterDestroyRoutine ( + _In_ PBL_IO_DESTROY_ROUTINE DestroyRoutine + ) +{ + ULONG Id; + + return BlTblSetEntry(&IoMgrDestroyRoutineTable, + &IoMgrRoutineEntries, + DestroyRoutine, + &Id, + TblDoNotPurgeEntry); +} NTSTATUS BlpIoInitialize ( Modified: trunk/reactos/boot/environ/lib/misc/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/util… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -188,6 +188,455 @@ return STATUS_SUCCESS; } +PVOID +BlTblFindEntry ( + _In_ PVOID *Table, + _In_ ULONG Count, + _Out_ PULONG EntryIndex, + _In_ PBL_TBL_LOOKUP_ROUTINE Callback, + _In_ PVOID Argument1, + _In_ PVOID Argument2, + _In_ PVOID Argument3, + _In_ PVOID Argument4 + ) +{ + PVOID Entry = NULL; + ULONG Index = 0; + BOOLEAN Result; + + /* Check for invalid parameters */ + if (!(Table) || !(EntryIndex) || !(Count)) + { + return Entry; + } + + /* Loop each entry in the table */ + while (Index < Count) + { + /* Check if this entry is filled out */ + if (Table[Index]) + { + /* Call the comparison function */ + Result = Callback(Table[Index], + Argument1, + Argument2, + Argument3, + Argument4); + if (Result) + { + /* Entry fouund return it */ + *EntryIndex = Index; + Entry = Table[Index]; + break; + } + } + } + + /* Return the entry that was (or wasn't) found */ + return Entry; +} + +NTSTATUS +BlTblSetEntry ( + _Inout_ PVOID** Table, + _Inout_ PULONG Count, + _In_ PVOID Entry, + _Out_ PULONG EntryIndex, + _In_ PBL_TBL_SET_ROUTINE Callback + ) +{ + ULONG NewCount; + NTSTATUS Status = STATUS_SUCCESS; + ULONG Index = 0; + PVOID* NewTable; + + /* Make sure all the parameters were specified */ + if (!(Table) || !(*Table) || !(Count) || !(Callback)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Read the current table */ + NewTable = *Table; + NewCount = *Count; + + /* Iterate over it */ + while (Index < NewCount) + { + /* Look for a free index */ + if (!NewTable[Index]) + { + goto SetIndex; + } + + /* No free index yet, keep going */ + ++Index; + } + + /* No free index was found, try to purge some entries */ + Index = 0; + while (Index < NewCount) + { + /* Call each purge callback, trying to make space */ + Status = Callback(NewTable[Index]); + if (NT_SUCCESS(Status)) + { + /* We should have this slot available now */ + goto SetIndex; + } + + /* Keep trying to purge more */ + ++Index; + } + + /* Double the table */ + NewTable = BlMmAllocateHeap(2 * sizeof(PVOID) * NewCount); + if (!NewTable) + { + return STATUS_NO_MEMORY; + } + + /* Clear the new table, and copy the old entries */ + RtlZeroMemory(&NewTable[NewCount], sizeof(PVOID) * NewCount); + RtlCopyMemory(NewTable, *Table, sizeof(PVOID) * NewCount); + + /* Free the old table */ + BlMmFreeHeap(*Table); + + /* Return the new table and count */ + *Count = 2 * NewCount; + *Table = NewTable; + +SetIndex: + /* Set the index and return */ + NewTable[Index] = Entry; + *EntryIndex = Index; + return Status; +} + +NTSTATUS +BlTblMap ( + _In_ PVOID *Table, + _In_ ULONG Count, + _In_ PBL_TBL_MAP_ROUTINE MapCallback + ) +{ + NTSTATUS Status, LocalStatus; + PVOID Entry; + ULONG Index; + + /* Bail out if there's no table */ + if (!Table) + { + return STATUS_INVALID_PARAMETER; + } + + /* Assume success and loop each index */ + Status = STATUS_SUCCESS; + for (Index = 0; Index < Count; Index++) + { + /* See if an entry exists at this index */ + Entry = Table[Index]; + if (Entry) + { + /* Call the map routine for this entry */ + LocalStatus = MapCallback(Entry, Index); + if (!NT_SUCCESS(LocalStatus)) + { + /* Propagate failure only */ + Status = LocalStatus; + } + } + } + + /* Return status to caller */ + return Status; +} + +ULONG HtTableSize; +PBL_HASH_TABLE* HtTableArray; +ULONG HtTableEntries; + +ULONG +DefaultHashFunction ( + _In_ PBL_HASH_ENTRY Entry, + _In_ ULONG TableSize + ) +{ + PUCHAR Value; + ULONG KeyHash, i; + + /* Check if the value is a pointer, or embedded inline */ + Value = (Entry->Flags & BL_HT_VALUE_IS_INLINE) ? Entry->Value : (PUCHAR)&Entry->Value; + + /* Iterate over each byte, and sum it */ + for (i = 0, KeyHash = 0; i < Entry->Size; i++) + { + KeyHash += Value[i++]; + } + + /* Modulo the number of buckets */ + return KeyHash % TableSize; +} + +BOOLEAN +HtpCompareKeys ( + _In_ PBL_HASH_ENTRY Entry1, + _In_ PBL_HASH_ENTRY Entry2 + ) +{ + ULONG Flags; + BOOLEAN ValueMatch; + + /* Check if the flags or sizes are not matching */ + Flags = Entry1->Flags; + if ((Entry1->Size != Entry2->Size) || (Flags != Entry2->Flags)) + { + ValueMatch = FALSE; + } + else if (Flags & BL_HT_VALUE_IS_INLINE) + { + /* Check if this is an in-line value, compare it */ + ValueMatch = Entry1->Value == Entry2->Value; + } + else + { + /* This is a pointer value, compare it */ + ValueMatch = (RtlCompareMemory(Entry1->Value, Entry2->Value, Entry1->Size) == + Entry1->Size); + } + + /* Return if it matched */ + return ValueMatch; +} + +NTSTATUS +TblDoNotPurgeEntry ( + _In_ PVOID Entry + ) +{ + /* Never purge this entry */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +BlHtCreate ( + _In_ ULONG Size, + _In_ PBL_HASH_TABLE_HASH_FUNCTION HashFunction, + _In_ PBL_HASH_TABLE_COMPARE_FUNCTION CompareFunction, + _Out_ PULONG Id + ) +{ + NTSTATUS Status; + PBL_HASH_TABLE HashTable; + ULONG i; + + /* Assume failure */ + HashTable = NULL; + + /* Can't create a table with no ID */ + if (!Id) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check if we don't already have a hash table table */ + if (!HtTableSize) + { + /* Allocate it and zero it out */ + HtTableSize = 4; + HtTableArray = BlMmAllocateHeap(HtTableSize * sizeof(PVOID)); + if (!HtTableArray) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + RtlZeroMemory(HtTableArray, HtTableSize * sizeof(PVOID)); + HtTableEntries = 0; + } + + /* Allocate the hash table */ + HashTable = BlMmAllocateHeap(sizeof(*HashTable)); + if (!HashTable) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Fill it out */ + HashTable->HashFunction = HashFunction ? HashFunction : DefaultHashFunction; + HashTable->CompareFunction = CompareFunction ? CompareFunction : HtpCompareKeys; + HashTable->Size = Size ? Size : 13; + + /* Allocate the hash links, one for each bucket */ + HashTable->HashLinks = BlMmAllocateHeap(sizeof(LIST_ENTRY) * HashTable->Size); + if (!HashTable->HashLinks) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Initialize the hash links */ + for (i = 0; i < HashTable->Size; i++) + { + InitializeListHead(&HashTable->HashLinks[i]); + } + + /* Save us in the table of hash tables */ + Status = BlTblSetEntry((PVOID**)&HtTableArray, + &Size, + HashTable, + Id, + TblDoNotPurgeEntry); + if (NT_SUCCESS(Status)) + { + /* One more -- we're done */ + ++HtTableEntries; + return Status; + } + +Quickie: + /* Check if we just allocated the table array now */ + if (!(HtTableEntries) && (HtTableArray)) + { + /* Free it */ + BlMmFreeHeap(HtTableArray); + HtTableArray = NULL; + HtTableSize = 0; + } + + /* Check if we allocated a hash table*/ + if (HashTable) + { + /* With links? */ + if (HashTable->HashLinks) + { + /* Free them */ + BlMmFreeHeap(HashTable->HashLinks); + } + + /* Free the table*/ + BlMmFreeHeap(HashTable); + } + + /* We're done */ + return Status; +} + +NTSTATUS +BlHtLookup ( + _In_ ULONG TableId, + _In_ PBL_HASH_ENTRY Entry, + _Out_opt_ PBL_HASH_VALUE *Value + ) +{ + PBL_HASH_TABLE HashTable; + ULONG HashValue; + NTSTATUS Status; + PLIST_ENTRY HashLinkHead, HashLink; + PBL_HASH_NODE HashNode; + + /* Check if the table ID is invalid, or we have no entry, or it's malformed */ + if ((HtTableSize <= TableId) || + !(Entry) || + ((Entry->Flags & BL_HT_VALUE_IS_INLINE) && (Entry->Size != sizeof(ULONG)))) + { + /* Fail */ + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* Otherwise, get the hash table for this index */ + HashTable = HtTableArray[TableId]; + + /* Get the hash bucket */ + HashValue = HashTable->HashFunction(Entry, HashTable->Size); + + /* Start iterating each entry in the bucket, assuming failure */ + Status = STATUS_NOT_FOUND; + HashLinkHead = &HashTable->HashLinks[HashValue]; + HashLink = HashLinkHead->Flink; + while (HashLink != HashLinkHead) + { + /* Get a node in this bucket, and compare the value */ + HashNode = CONTAINING_RECORD(HashLink, BL_HASH_NODE, ListEntry); + if (HashTable->CompareFunction(&HashNode->Entry, Entry)) + { + /* Does the caller want the value? */ + if (Value) + { + /* Return it */ + *Value = &HashNode->Value; + } + + /* Return success and stop scanning */ + Status = STATUS_SUCCESS; + break; + } + + /* Try the next node */ + HashLink = HashLink->Flink; + } + } + + /* Return back to the caller */ + return Status; +} + +NTSTATUS +BlHtStore ( + _In_ ULONG TableId, + _In_ PBL_HASH_ENTRY Entry, + _In_ PVOID Data, + _In_ ULONG DataSize + ) +{ + PBL_HASH_NODE HashNode; + NTSTATUS Status; + PLIST_ENTRY HashLinkHead; + PBL_HASH_TABLE HashTable; + + /* Check for invalid tablle ID, missing arguments, or malformed entry */ + if ((HtTableSize <= TableId) || + !(Entry) || + !(Data) || + !(Entry->Size) || + !(Entry->Value) || + !(DataSize) || + ((Entry->Flags & BL_HT_VALUE_IS_INLINE) && (Entry->Size != sizeof(ULONG)))) + { + /* Fail the call */ + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Get the hash table for this ID */ + HashTable = HtTableArray[TableId]; + + /* Allocate a hash node */ + HashNode = BlMmAllocateHeap(sizeof(*HashNode)); + if (!HashNode) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Capture all the data*/ + HashNode->Entry.Size = Entry->Size; + HashNode->Entry.Flags = Entry->Flags; + HashNode->Entry.Value = Entry->Value; + HashNode->Value.DataSize = DataSize; + HashNode->Value.Data = Data; + + /* Insert it into the bucket list and return success */ + HashLinkHead = &HashTable->HashLinks[HashTable->HashFunction(Entry, HashTable->Size)]; + InsertTailList(HashLinkHead, &HashNode->ListEntry); + Status = STATUS_SUCCESS; + +Quickie: + return Status; +} + VOID BlFwReboot ( VOID Modified: trunk/reactos/boot/environ/lib/mm/blkalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/blkall… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/blkalloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/blkalloc.c [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -12,17 +12,260 @@ /* DATA VARIABLES ************************************************************/ -PVOID MmBlockAllocatorTable; +PVOID* MmBlockAllocatorTable; ULONG MmBlockAllocatorTableEntries; BOOLEAN MmBlockAllocatorInitialized; typedef struct _BL_BLOCK_DESCRIPTOR { - LIST_ENTRY NextEntry; - UCHAR Unknown[0x50 - sizeof(LIST_ENTRY)]; + LIST_ENTRY ListHead; + ULONG Unknown; + BL_MEMORY_TYPE Type; + ULONG Attributes; + ULONG Unknown2; + ULONG Count; + ULONG Count2; + ULONG Size; + ULONG BlockId; + ULONG ReferenceCount; } BL_BLOCK_DESCRIPTOR, *PBL_BLOCK_DESCRIPTOR; +typedef struct _BL_BLOCK_ENTRY +{ + LIST_ENTRY ListEntry; + ULONG Todo; +} BL_BLOCK_ENTRY, *PBL_BLOCK_ENTRY; + /* FUNCTIONS *****************************************************************/ + +BOOLEAN +MmBapCompareBlockAllocatorTableEntry ( + _In_ PVOID Entry, + _In_ PVOID Argument1, + _In_ PVOID Argument2, + _In_ PVOID Argument3, + _In_ PVOID Argument4 + ) +{ + PBL_BLOCK_DESCRIPTOR BlockInfo = (PBL_BLOCK_DESCRIPTOR)Entry; + ULONG BlockId = (ULONG)Argument1; + + /* Check if the block ID matches */ + return BlockInfo->BlockId == BlockId; +} + +PBL_BLOCK_DESCRIPTOR +MmBapFindBlockInformation ( + ULONG BlockId + ) +{ + ULONG EntryId; + + /* Find the block that matches */ + EntryId = BlockId; + return BlTblFindEntry(MmBlockAllocatorTable, + MmBlockAllocatorTableEntries, + &EntryId, + MmBapCompareBlockAllocatorTableEntry, + (PVOID)EntryId, + NULL, + NULL, + NULL); +} + +NTSTATUS +MmBapFreeBlockAllocatorDescriptor ( + _In_ PBL_BLOCK_DESCRIPTOR BlockInfo, + _In_ PBL_BLOCK_ENTRY BlockEntry + ) +{ + /* @TODO FIXME: Later */ + EfiPrintf(L"Block free not yet implemented\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlpMmDeleteBlockAllocator ( + _In_ ULONG BlockId + ) +{ + NTSTATUS Status, LocalStatus; + PBL_BLOCK_DESCRIPTOR BlockInfo; + PLIST_ENTRY ListHead, NextEntry; + PBL_BLOCK_ENTRY BlockEntry; + + /* Nothing to delete if we're not initialized */ + if (!MmBlockAllocatorInitialized) + { + return STATUS_UNSUCCESSFUL; + } + + /* Find the block descriptor */ + BlockInfo = MmBapFindBlockInformation(BlockId); + if (BlockInfo) + { + /* Assume success for now */ + Status = STATUS_SUCCESS; + + /* Do we have at least one reference? */ + if (BlockInfo->ReferenceCount) + { + /* Iterate over the allocated blocks */ + ListHead = &BlockInfo->ListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Free each one */ + BlockEntry = CONTAINING_RECORD(NextEntry, + BL_BLOCK_ENTRY, + ListEntry); + LocalStatus = MmBapFreeBlockAllocatorDescriptor(BlockInfo, + BlockEntry); + if (!NT_SUCCESS(LocalStatus)) + { + /* Remember status on failure only */ + Status = LocalStatus; + } + } + + /* Drop a reference */ + BlockInfo->ReferenceCount--; + } + else + { + /* There aren't any references, so why are we being called? */ + Status = STATUS_INVALID_PARAMETER; + } + } + else + { + /* No block exists with this ID */ + Status = STATUS_UNSUCCESSFUL; + } + + /* Return back */ + return Status; +} + +NTSTATUS +MmBapFreeBlockAllocatorTableEntry ( + _In_ PVOID Entry, + _In_ ULONG Index + ) +{ + PBL_BLOCK_DESCRIPTOR BlockInfo = (PBL_BLOCK_DESCRIPTOR)Entry; + NTSTATUS Status, LocalStatus; + + /* Assume success */ + Status = STATUS_SUCCESS; + + /* Check if there was at least one reference */ + if (BlockInfo->ReferenceCount > 1) + { + /* Try to delete the allocator */ + LocalStatus = BlpMmDeleteBlockAllocator(BlockInfo->BlockId); + if (!NT_SUCCESS(LocalStatus)) + { + /* Remember status on failure only */ + Status = LocalStatus; + } + } + + /* Now destroy the allocator's descriptor */ + LocalStatus = BlMmFreeHeap(BlockInfo); + if (!NT_SUCCESS(LocalStatus)) + { + /* Remember status on failure only */ + Status = LocalStatus; + } + + /* Free the entry, and return failure, if any */ + MmBlockAllocatorTable[Index] = NULL; + return Status; +} + +NTSTATUS +MmBapPurgeBlockAlloctorTableEntry ( + _In_ PVOID Entry + ) +{ + PBL_BLOCK_DESCRIPTOR BlockInfo = (PBL_BLOCK_DESCRIPTOR)Entry; + NTSTATUS Status; + + /* Check if there's a reference on the block descriptor */ + if (BlockInfo->ReferenceCount) + { + /* Don't allow purging */ + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* Free the entry */ + Status = MmBapFreeBlockAllocatorTableEntry(BlockInfo, + BlockInfo->BlockId); + } + + /* Return purge status */ + return Status; +} + +NTSTATUS +BlpMmCreateBlockAllocator ( + VOID + ) +{ + PBL_BLOCK_DESCRIPTOR BlockInfo; + ULONG BlockId; + NTSTATUS Status; + + /* If the block allocator isn't initialized, bail out */ + BlockId = -1; + if (!MmBlockAllocatorInitialized) + { + goto Quickie; + } + + /* Allocate a block descriptor and zero it out */ + BlockInfo = BlMmAllocateHeap(sizeof(*BlockInfo)); + if (!BlockInfo) + { + goto Quickie; + } + RtlZeroMemory(BlockInfo, sizeof(*BlockInfo)); + + /* Setup the block descriptor */ + BlockInfo->Attributes = 0; + BlockInfo->Type = BlLoaderBlockMemory; + BlockInfo->Unknown = 1; + BlockInfo->Unknown2 = 1; + BlockInfo->Size = PAGE_SIZE; + BlockInfo->Count = 128; + BlockInfo->Count2 = 128; + InitializeListHead(&BlockInfo->ListHead); + + /* Add it to the list of block descriptors */ + Status = BlTblSetEntry(&MmBlockAllocatorTable, + &MmBlockAllocatorTableEntries, + BlockInfo, + &BlockId, + MmBapPurgeBlockAlloctorTableEntry); + if (NT_SUCCESS(Status)) + { + /* Add the initial reference and store the block ID */ + BlockInfo->ReferenceCount = 1; + BlockInfo->BlockId = BlockId; + } + +Quickie: + /* On failure, free the block descriptor */ + if (BlockId == -1) + { + BlMmFreeHeap(BlockInfo); + } + + /* Return the block descriptor ID, or -1 on failure */ + return BlockId; +} NTSTATUS MmBaInitialize ( Modified: trunk/reactos/boot/environ/lib/mm/heapalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/heapal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/heapalloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/heapalloc.c [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -146,7 +146,7 @@ } /* We do not -- allocate one */ - Status = MmPapAllocatePagesInRange((PULONG)&HeapBase, + Status = MmPapAllocatePagesInRange((PVOID*)&HeapBase, BlLoaderHeap, AlignedSize >> PAGE_SHIFT, HapAllocationAttributes, @@ -673,6 +673,13 @@ } /* Get the heap header */ + EfiPrintf(L"Freeing entry at: %p\r\n", Buffer); + if (Buffer) + { + /* Don't free heap until we discover the corruption */ + return STATUS_SUCCESS; + } + BusyEntry = CONTAINING_RECORD(Buffer, BL_BUSY_HEAP_ENTRY, Buffer); /* Loop all the heaps */ Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Wed Sep 9 05:48:50 2015 @@ -391,7 +391,7 @@ NTSTATUS MmPapAllocatePagesInRange ( - _Inout_ PULONG PhysicalAddress, + _Inout_ PVOID* PhysicalAddress, _In_ BL_MEMORY_TYPE MemoryType, _In_ ULONGLONG Pages, _In_ ULONG Attributes, @@ -425,7 +425,7 @@ else { /* Check if this is a fixed allocation */ - BaseAddress.QuadPart = (Attributes & BlMemoryFixed) ? *PhysicalAddress : 0; + BaseAddress.QuadPart = (Attributes & BlMemoryFixed) ? (ULONG_PTR)*PhysicalAddress : 0; /* Allocate the pages */ Status = MmPapAllocatePhysicalPagesInRange(&BaseAddress, @@ -441,7 +441,7 @@ Type); /* Return the allocated address */ - *PhysicalAddress = BaseAddress.LowPart; + *PhysicalAddress = (PVOID)BaseAddress.LowPart; } Exit:

9 years, 7 months

[ion] 69141: [CDMAKE] - Fix Build on VS2015

by ion＠svn.reactos.org

Author: ion Date: Wed Sep 9 04:58:25 2015 New Revision: 69141 URL: http://svn.reactos.org/svn/reactos?rev=69141&view=rev Log: [CDMAKE] - Fix Build on VS2015 Modified: trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Wed Sep 9 04:58:25 2015 @@ -1851,6 +1851,7 @@ Program execution starts here. -----------------------------------------------------------------------------*/ +#if (defined(__GNUC__) || (_MSC_VER < 1900)) char* strtok_s(char *str, const char *delim, char **ctx) { if (delim == NULL || ctx == NULL || (str == NULL && *ctx == NULL)) @@ -1874,6 +1875,7 @@ return str; } +#endif int main(int argc, char **argv) {

9 years, 7 months

← Newer
1
...
25
26
27
28
29
30
31
...
54
Older →

Jump to page:

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 2015