Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[hbelusca] 69160: [EFISYS]: Add 'bcd_hive' as a dependency. [FATTEN]: Fix help message. Functions with no parameters are void. Remove an hardcoded array size.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Sep 9 19:48:15 2015 New Revision: 69160 URL: http://svn.reactos.org/svn/reactos?rev=69160&view=rev Log: [EFISYS]: Add 'bcd_hive' as a dependency. [FATTEN]: Fix help message. Functions with no parameters are void. Remove an hardcoded array size. Modified: trunk/reactos/boot/CMakeLists.txt trunk/reactos/tools/fatten/fatten.c Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=69… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Wed Sep 9 19:48:15 2015 @@ -17,7 +17,7 @@ add_custom_target(efisys COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:bootmgfw> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi -add ${CMAKE_BINARY_DIR}/boot/bootdata/BCD EFI/BOOT/BCD - DEPENDS native-fatten bootmgfw fat + DEPENDS native-fatten fat bootmgfw bcd_hive VERBATIM) ##bootcd 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 19:48:15 2015 @@ -17,7 +17,7 @@ static char buff[32768]; // tool needed by fatfs -DWORD get_fattime() +DWORD get_fattime(void) { /* 31-25: Year(0-127 org.1980), 24-21: Month(1-12), 20-16: Day(1-31) */ /* 15-11: Hour(0-23), 10-5: Minute(0-59), 4-0: Second(0-29 *2) */ @@ -63,13 +63,13 @@ #endif } -#define NEED_PARAMS(_min_,_max_) \ +#define NEED_PARAMS(_min_, _max_) \ do {\ - if(nargs<_min_) { printf("Too few args for command %s.\n",argv[-1]); PRINT_HELP_AND_QUIT(); } \ - if(nargs>_max_) { printf("Too many args for command %s.\n",argv[-1]); PRINT_HELP_AND_QUIT(); } \ + if (nargs < _min_) { printf("Too few args for command %s.\n" , argv[-1]); PRINT_HELP_AND_QUIT(); } \ + if (nargs > _max_) { printf("Too many args for command %s.\n", argv[-1]); PRINT_HELP_AND_QUIT(); } \ } while(0) -int need_mount() +int need_mount(void) { int r; @@ -87,7 +87,7 @@ #define NEED_MOUNT() \ do { ret = need_mount(); if(ret) \ {\ - printf("Error: could not mount disk (%d). \n", ret); \ + printf("Error: could not mount disk (%d).\n", ret); \ PRINT_HELP_AND_QUIT(); \ } } while(0) @@ -99,9 +99,9 @@ #else printf("Commands:\n"); #endif - printf(" -format <sectors> [<filesystem>]\n" + printf(" -format <sectors> [<filesystem>] [<custom header label>]\n" " Formats the disk image.\n"); - printf(" -boot <sector file> [<custom header label>]\n" + printf(" -boot <sector file>\n" " Writes a new boot sector.\n"); printf(" -add <src path> <dst path>\n" " Copies an external file or directory into the image.\n"); @@ -207,7 +207,7 @@ { char label[8]; - int i, invalid=0; + int i, invalid = 0; int len = strlen(argv[1]); if (len <= 8) @@ -220,7 +220,7 @@ if (!isupper(ch) && !isspace(ch)) { - invalid =1; + invalid = 1; break; } } @@ -269,7 +269,6 @@ ret = 1; goto exit; } - } } else if (strcmp(parg, "boot") == 0) @@ -282,7 +281,6 @@ // Arg 1: boot file fe = fopen(argv[0], "rb"); - if (!fe) { printf("Error: unable to open external file '%s' for reading.", argv[0]); @@ -290,7 +288,7 @@ goto exit; } - if(!fread(buff, 512, 1, fe)) + if (!fread(buff, 512, 1, fe)) { printf("Error: unable to read boot sector from file '%s'.", argv[0]); fclose(fe); @@ -302,7 +300,7 @@ NEED_MOUNT(); - if(disk_read(0, temp, 0, 1)) + if (disk_read(0, temp, 0, 1)) { printf("Error: unable to read existing boot sector from image."); ret = 1; @@ -345,7 +343,6 @@ // Arg 2: virtual filename fe = fopen(argv[0], "rb"); - if (!fe) { printf("Error: unable to open external file '%s' for reading.", argv[0]); @@ -391,7 +388,6 @@ } fv = fopen(argv[1], "wb"); - if (!fv) { printf("Error: unable to open external file '%s' for writing.", argv[1]); @@ -498,7 +494,7 @@ printf("Listing directory contents of: %s\n", root); info.lfname = lfname; - info.lfsize = 256; + info.lfsize = sizeof(lfname)-1; while ((!f_readdir(&dir, &info)) && (strlen(info.fname) > 0)) { if (strlen(info.lfname) > 0) @@ -524,4 +520,3 @@ return ret; } -

9 years, 3 months

[sginsberg] 69159: [WIN32SS] Fix NtUserChangeDisplaySettings, I accidently removed one (unused) param too much (parameter count should be 4 after all), and it seems code relied on this check.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Sep 9 19:38:36 2015 New Revision: 69159 URL: http://svn.reactos.org/svn/reactos?rev=69159&view=rev Log: [WIN32SS] Fix NtUserChangeDisplaySettings, I accidently removed one (unused) param too much (parameter count should be 4 after all), and it seems code relied on this check. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/display.c trunk/reactos/win32ss/user/user32/misc/display.c trunk/reactos/win32ss/w32ksvc.h 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 19:38:36 2015 @@ -1696,6 +1696,7 @@ NtUserChangeDisplaySettings( PUNICODE_STRING lpszDeviceName, LPDEVMODEW lpDevMode, + HWND hwnd, DWORD dwflags); BOOL 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 19:38:36 2015 @@ -814,6 +814,7 @@ NtUserChangeDisplaySettings( PUNICODE_STRING pustrDevice, LPDEVMODEW lpDevMode, + HWND hWnd, DWORD dwflags) { WCHAR awcDevice[CCHDEVICENAME]; @@ -822,7 +823,8 @@ LONG lRet; /* Check arguments */ - if (dwflags != CDS_VIDEOPARAMETERS) + if ((dwflags != CDS_VIDEOPARAMETERS) || + (hWnd != NULL)) { EngSetLastError(ERROR_INVALID_PARAMETER); return DISP_CHANGE_BADPARAM; 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 19:38:36 2015 @@ -457,14 +457,14 @@ pDevModeW = GdiConvertToDevmodeW(lpDevMode); if(pDevModeW) { - rc = NtUserChangeDisplaySettings(pDeviceName, pDevModeW, dwflags); + rc = NtUserChangeDisplaySettings(pDeviceName, pDevModeW, hwnd, dwflags); RtlFreeHeap(GetProcessHeap(), 0, pDevModeW); } else rc = DISP_CHANGE_SUCCESSFUL; } else - rc = NtUserChangeDisplaySettings(pDeviceName, NULL, dwflags); + rc = NtUserChangeDisplaySettings(pDeviceName, NULL, hwnd, dwflags); if (lpszDeviceName != NULL) RtlFreeUnicodeString(&DeviceName); @@ -509,7 +509,7 @@ else pDeviceName = NULL; - rc = NtUserChangeDisplaySettings(pDeviceName, lpDevMode, dwflags); + rc = NtUserChangeDisplaySettings(pDeviceName, lpDevMode, hwnd, dwflags); return rc; } Modified: trunk/reactos/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=6915… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] Wed Sep 9 19:38:36 2015 @@ -328,7 +328,7 @@ SVC_(UserCallOneParam, 2) SVC_(UserCallTwoParam, 3) SVC_(UserChangeClipboardChain, 2) - SVC_(UserChangeDisplaySettings, 3) + SVC_(UserChangeDisplaySettings, 4) SVC_(UserCheckImeHotKey, 2) SVC_(UserCheckMenuItem, 3) SVC_(UserChildWindowFromPointEx, 4)

9 years, 3 months

[sginsberg] 69158: [WIN32SS] Fix NtGdiOpenDCW and NtUserChangeDisplaySettings to have the correct amount of parameters by removing two more unused/deprecated/ignored parameters. NtUserEnumDisplayMo...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Sep 9 19:12:48 2015 New Revision: 69158 URL: http://svn.reactos.org/svn/reactos?rev=69158&view=rev Log: [WIN32SS] Fix NtGdiOpenDCW and NtUserChangeDisplaySettings to have the correct amount of parameters by removing two more unused/deprecated/ignored parameters. NtUserEnumDisplayMonitors is the only remaining one now, which needs to do a usermode callback to get rid of its extra parameter. Modified: trunk/reactos/include/psdk/ntgdi.h trunk/reactos/win32ss/gdi/gdi32/objects/dc.c trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/display.c trunk/reactos/win32ss/user/user32/misc/display.c trunk/reactos/win32ss/w32ksvc.db trunk/reactos/win32ss/w32ksvc.h 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 19:12:48 2015 @@ -2162,7 +2162,6 @@ _In_ ULONG iType, _In_ BOOL bDisplay, _In_opt_ HANDLE hspool, - _In_opt_ DRIVER_INFO_2W *pDriverInfo2, _At_((PUMDHPDEV*)pUMdhpdev, _Out_) PVOID pUMdhpdev); __kernel_entry Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Wed Sep 9 19:12:48 2015 @@ -65,7 +65,6 @@ iType, // DCW 0 and ICW 1. Display, hspool, - (PVOID) NULL, // NULL for now. (PVOID) &UMdhpdev ); #if 0 // Handle something other than a normal dc object. Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Wed Sep 9 19:12:48 2015 @@ -680,7 +680,6 @@ _In_ ULONG iType, _In_ BOOL bDisplay, _In_opt_ HANDLE hspool, - _In_opt_ DRIVER_INFO_2W *pDriverInfo2, _At_((PUMDHPDEV*)pUMdhpdev, _Out_) PVOID pUMdhpdev) { UNICODE_STRING ustrDevice; 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 19:12:48 2015 @@ -1696,7 +1696,6 @@ NtUserChangeDisplaySettings( PUNICODE_STRING lpszDeviceName, LPDEVMODEW lpDevMode, - HWND hwnd, DWORD dwflags); BOOL 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 19:12:48 2015 @@ -655,7 +655,6 @@ UserChangeDisplaySettings( PUNICODE_STRING pustrDevice, LPDEVMODEW pdm, - HWND hwnd, DWORD flags, LPVOID lParam) { @@ -815,7 +814,6 @@ NtUserChangeDisplaySettings( PUNICODE_STRING pustrDevice, LPDEVMODEW lpDevMode, - HWND hwnd, DWORD dwflags) { WCHAR awcDevice[CCHDEVICENAME]; @@ -824,8 +822,7 @@ LONG lRet; /* Check arguments */ - if ((dwflags != CDS_VIDEOPARAMETERS) || - (hwnd != NULL)) + if (dwflags != CDS_VIDEOPARAMETERS) { EngSetLastError(ERROR_INVALID_PARAMETER); return DISP_CHANGE_BADPARAM; @@ -904,7 +901,7 @@ UserEnterExclusive(); /* Call internal function */ - lRet = UserChangeDisplaySettings(pustrDevice, lpDevMode, hwnd, dwflags, NULL); + lRet = UserChangeDisplaySettings(pustrDevice, lpDevMode, dwflags, NULL); /* Release lock */ UserLeave(); 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 19:12:48 2015 @@ -457,14 +457,14 @@ pDevModeW = GdiConvertToDevmodeW(lpDevMode); if(pDevModeW) { - rc = NtUserChangeDisplaySettings(pDeviceName, pDevModeW, hwnd, dwflags); + rc = NtUserChangeDisplaySettings(pDeviceName, pDevModeW, dwflags); RtlFreeHeap(GetProcessHeap(), 0, pDevModeW); } else rc = DISP_CHANGE_SUCCESSFUL; } else - rc = NtUserChangeDisplaySettings(pDeviceName, NULL, hwnd, dwflags); + rc = NtUserChangeDisplaySettings(pDeviceName, NULL, dwflags); if (lpszDeviceName != NULL) RtlFreeUnicodeString(&DeviceName); @@ -509,7 +509,7 @@ else pDeviceName = NULL; - rc = NtUserChangeDisplaySettings(pDeviceName, lpDevMode, hwnd, dwflags); + rc = NtUserChangeDisplaySettings(pDeviceName, lpDevMode, dwflags); return rc; } 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 19:12:48 2015 @@ -1,6 +1,6 @@ # NAME ARG_COUNT # -# Funcs order should match Windows XP 5.1.2600 SP2 +# Funcs order should match Windows 2003 Service Pack 2 # NtGdiAbortDoc 1 NtGdiAbortPath 1 @@ -234,7 +234,7 @@ NtGdiMoveTo 4 NtGdiOffsetClipRgn 3 NtGdiOffsetRgn 3 -NtGdiOpenDCW 8 #7 +NtGdiOpenDCW 7 NtGdiPatBlt 6 NtGdiPolyPatBlt 5 NtGdiPathToRegion 1 @@ -327,7 +327,7 @@ NtUserCallOneParam 2 NtUserCallTwoParam 3 NtUserChangeClipboardChain 2 -NtUserChangeDisplaySettings 5 #4 +NtUserChangeDisplaySettings 4 NtUserCheckImeHotKey 2 NtUserCheckMenuItem 3 NtUserChildWindowFromPointEx 4 @@ -388,7 +388,7 @@ NtUserGetAtomName 2 NtUserGetCaretBlinkTime 0 NtUserGetCaretPos 1 -NtUserGetClassInfo 5 #Ex? +NtUserGetClassInfo 5 NtUserGetClassName 3 NtUserGetClipboardData 2 NtUserGetClipboardFormatName 3 @@ -513,7 +513,7 @@ NtUserSetConsoleReserveKeys 2 NtUserSetCursor 1 NtUserSetCursorContents 2 -NtUserSetCursorIconData 6 #4 +NtUserSetCursorIconData 4 NtUserSetFocus 1 NtUserSetImeHotKey 5 NtUserSetImeInfoEx 1 Modified: trunk/reactos/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=6915… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] Wed Sep 9 19:12:48 2015 @@ -1,6 +1,6 @@ // SVC_(<NAME>, <ARG_COUNT>) // - // Funcs order should match Windows XP 5.1.2600 SP2 + // Funcs order should match Windows 2003 Service Pack 2 // Note: these MUST be indented for the ARM assembler! // SVC_(GdiAbortDoc, 1) @@ -235,7 +235,7 @@ SVC_(GdiMoveTo, 4) SVC_(GdiOffsetClipRgn, 3) SVC_(GdiOffsetRgn, 3) - SVC_(GdiOpenDCW, 8) /* FIXME: 7 params on XP/2k3 */ + SVC_(GdiOpenDCW, 7) SVC_(GdiPatBlt, 6) SVC_(GdiPolyPatBlt, 5) SVC_(GdiPathToRegion, 1) @@ -328,7 +328,7 @@ SVC_(UserCallOneParam, 2) SVC_(UserCallTwoParam, 3) SVC_(UserChangeClipboardChain, 2) - SVC_(UserChangeDisplaySettings, 4) + SVC_(UserChangeDisplaySettings, 3) SVC_(UserCheckImeHotKey, 2) SVC_(UserCheckMenuItem, 3) SVC_(UserChildWindowFromPointEx, 4) @@ -490,7 +490,7 @@ SVC_(UserRealWaitMessageEx, 2) SVC_(UserRedrawWindow, 4) SVC_(UserRegisterClassExWOW, 7) - SVC_(UserRegisterUserApiHook, 4) /* Note: 2 params on XP, 4 on 2k3 */ + SVC_(UserRegisterUserApiHook, 4) SVC_(UserRegisterHotKey, 4) SVC_(UserRegisterRawInputDevices, 3) SVC_(UserRegisterTasklist, 1) @@ -578,7 +578,7 @@ SVC_(UserUnregisterHotKey, 2) SVC_(UserUpdateInputContext, 3) SVC_(UserUpdateInstance, 3) - SVC_(UserUpdateLayeredWindow, 10) /* Note: 9 params on XP, 10 on 2k3 */ + SVC_(UserUpdateLayeredWindow, 10) SVC_(UserGetLayeredWindowAttributes, 4) SVC_(UserSetLayeredWindowAttributes, 4) SVC_(UserUpdatePerUserSystemParameters, 2) @@ -674,17 +674,15 @@ SVC_(UserSetDbgTagCount, 1) SVC_(UserSetRipFlags, 1) #endif //DBG - //Stray syscalls + //Stray syscalls (must be placed here to be correct for both checked/free builds) SVC_(GdiMakeObjectXferable, 2) SVC_(DxEngGetRedirectionBitmap, 1) - - // ReactOS-specific syscalls) + // ReactOS-specific syscalls (must be at the end to not interfere!) SVC_(GdiSetViewportOrgEx, 4) SVC_(GdiSetWindowOrgEx, 4) SVC_(GdiGetFontFamilyInfo, 4) SVC_(GdiOffsetViewportOrgEx, 4) SVC_(GdiOffsetWindowOrgEx, 4) - SVC_(UserGetMonitorInfo, 2) SVC_(UserMonitorFromPoint, 3) SVC_(UserMonitorFromRect, 2)

9 years, 3 months

[ion] 69157: [EFI] - Case sensitivity?

by ion＠svn.reactos.org

Author: ion Date: Wed Sep 9 18:45:51 2015 New Revision: 69157 URL: http://svn.reactos.org/svn/reactos?rev=69157&view=rev Log: [EFI] - Case sensitivity? Modified: trunk/reactos/tools/mkhive/mkhive.c Modified: trunk/reactos/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.c [iso-8859-1] Wed Sep 9 18:45:51 2015 @@ -145,7 +145,7 @@ convert_path (FileName, argv[1]); strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "bcd"); + strcat (FileName, "BCD"); if (!ExportBinaryHive (FileName, &SystemHive)) { return 1;

9 years, 3 months

[ion] 69156: [EFI] - Add BCD creation. - Add BCD to bootcd, and also to EFISYS.BIN. Verified the BCD is now present on the EFI partition.

by ion＠svn.reactos.org

Author: ion Date: Wed Sep 9 18:43:09 2015 New Revision: 69156 URL: http://svn.reactos.org/svn/reactos?rev=69156&view=rev Log: [EFI] - Add BCD creation. - Add BCD to bootcd, and also to EFISYS.BIN. Verified the BCD is now present on the EFI partition. Added: trunk/reactos/boot/bootdata/hivebcd.inf (with props) Modified: trunk/reactos/boot/CMakeLists.txt trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/tools/mkhive/mkhive.c Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=69… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Wed Sep 9 18:43:09 2015 @@ -16,7 +16,7 @@ endif() add_custom_target(efisys - COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:bootmgfw> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi + COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:bootmgfw> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi -add ${CMAKE_BINARY_DIR}/boot/bootdata/BCD EFI/BOOT/BCD DEPENDS native-fatten bootmgfw fat VERBATIM) Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Wed Sep 9 18:43:09 2015 @@ -10,7 +10,8 @@ hivecls.inf hivedef.inf hivesft.inf - hivesys.inf) + hivesys.inf + hivebcd.inf) #regtest Added: trunk/reactos/boot/bootdata/hivebcd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivebcd.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivebcd.inf (added) +++ trunk/reactos/boot/bootdata/hivebcd.inf [iso-8859-1] Wed Sep 9 18:43:09 2015 @@ -0,0 +1,11 @@ +[Version] +Signature = "$ReactOS$" + +[AddReg] + +HKLM,"BCD00000000\Description\Control","System",0x00010003,1 +HKLM,"BCD00000000\Description\Control","TreatAtSystem",0x00010003,1 +HKLM,"BCD00000000\Description\Control","KeyName",2,"BCD00000000" +HKLM,"BCD00000000\Description\Objects",,0x00000012 + +; EOF Propchange: trunk/reactos/boot/bootdata/hivebcd.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Wed Sep 9 18:43:09 2015 @@ -793,6 +793,22 @@ DESTINATION reactos/system32/config FOR livecd) + # BCD Hive + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/BCD + COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/ ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf + DEPENDS native-mkhive ${CMAKE_SOURCE_DIR}/boot/bootdata/hivebcd.inf) + + add_custom_target(bcd_hive + DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/BCD) + + add_cd_file( + FILE ${CMAKE_BINARY_DIR}/boot/bootdata/BCD + TARGET bcd_hive + DESTINATION efi/boot + NO_CAB + FOR bootcd regtest livecd) + endfunction() if(KDBG) Modified: trunk/reactos/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.c [iso-8859-1] Wed Sep 9 18:43:09 2015 @@ -143,6 +143,14 @@ return 1; } + convert_path (FileName, argv[1]); + strcat (FileName, DIR_SEPARATOR_STRING); + strcat (FileName, "bcd"); + if (!ExportBinaryHive (FileName, &SystemHive)) + { + return 1; + } + RegShutdownRegistry (); printf (" Done.\n");

9 years, 3 months

[ion] 69155: - Implement BmpFwGetApplicationDirectoryPath and most of BmFwInitializeBootDirectoryPath. - Implement boolean, integer, and string BCD reading. - Fix a more bugs. - We are now ready to...

by ion＠svn.reactos.org

Author: ion Date: Wed Sep 9 18:09:04 2015 New Revision: 69155 URL: http://svn.reactos.org/svn/reactos?rev=69155&view=rev Log: - Implement BmpFwGetApplicationDirectoryPath and most of BmFwInitializeBootDirectoryPath. - Implement boolean, integer, and string BCD reading. - Fix a more bugs. - We are now ready to open the BCD hive! Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/app/bootmgr/bootmgr.h trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/misc/bcd.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 18:09:04 2015 @@ -12,7 +12,6 @@ /* DATA VARIABLES ************************************************************/ -#include <initguid.h> DEFINE_GUID(GUID_WINDOWS_BOOTMGR, 0x9DEA862C, 0x5CDD, @@ -26,6 +25,103 @@ /* FUNCTIONS *****************************************************************/ +NTSTATUS +BmpFwGetApplicationDirectoryPath ( + _In_ PUNICODE_STRING ApplicationDirectoryPath + ) +{ + NTSTATUS Status; + ULONG i, AppPathLength; + PWCHAR ApplicationPath, PathCopy; + + /* Clear the incoming string */ + ApplicationDirectoryPath->Length = 0; + ApplicationDirectoryPath->MaximumLength = 0; + ApplicationDirectoryPath->Buffer = 0; + + /* Get the boot application path */ + ApplicationPath = NULL; + Status = BlGetBootOptionString(BlpApplicationEntry.BcdData, + BcdLibraryString_ApplicationPath, + &ApplicationPath); + if (NT_SUCCESS(Status)) + { + /* Calculate the length of the application path */ + for (i = wcslen(ApplicationPath) - 1; i > 0; i--) + { + /* Keep going until the path separator */ + if (ApplicationPath[i] == OBJ_NAME_PATH_SEPARATOR) + { + break; + } + } + + /* Check if we have space for one more character */ + AppPathLength = i + 1; + if (AppPathLength < i) + { + /* Nope, we'll overflow */ + AppPathLength = -1; + Status = STATUS_INTEGER_OVERFLOW; + } + else + { + /* Go ahead */ + Status = STATUS_SUCCESS; + } + + /* No overflow? */ + if (NT_SUCCESS(Status)) + { + /* Check if it's safe to multiply by two */ + if ((AppPathLength * sizeof(WCHAR)) > 0xFFFFFFFF) + { + /* Nope */ + AppPathLength = -1; + Status = STATUS_INTEGER_OVERFLOW; + } + else + { + /* We're good, do the multiplication */ + Status = STATUS_SUCCESS; + AppPathLength *= sizeof(WCHAR); + } + + /* Allocate a copy for the string */ + if (NT_SUCCESS(Status)) + { + PathCopy = BlMmAllocateHeap(AppPathLength); + if (PathCopy) + { + /* NULL-terminate it */ + RtlCopyMemory(PathCopy, + ApplicationPath, + AppPathLength - sizeof(UNICODE_NULL)); + PathCopy[AppPathLength] = UNICODE_NULL; + + /* Finally, initialize the outoing string */ + RtlInitUnicodeString(ApplicationDirectoryPath, PathCopy); + } + else + { + /* No memory, fail */ + Status = STATUS_NO_MEMORY; + } + } + } + } + + /* Check if we had an application path */ + if (ApplicationPath) + { + /* No longer need this, free it */ + BlMmFreeHeap(ApplicationPath); + } + + /* All done! */ + return Status; + +} NTSTATUS BmFwInitializeBootDirectoryPath ( VOID @@ -34,13 +130,13 @@ PWCHAR FinalPath; NTSTATUS Status; PWCHAR BcdDirectory; - // UNICODE_STRING BcdPath; - //ULONG FinalSize; + UNICODE_STRING BcdPath; + ULONG FinalSize; ULONG FileHandle, DeviceHandle; /* Initialize everything for failure */ - // BcdPath.MaximumLength = 0; - // BcdPath.Buffer = NULL; + BcdPath.MaximumLength = 0; + BcdPath.Buffer = NULL; BcdDirectory = NULL; FinalPath = NULL; FileHandle = -1; @@ -51,39 +147,40 @@ if (!NT_SUCCESS(Status)) { EfiPrintf(L"Device open failed: %lx\r\n", Status); - EfiStall(2000000); - goto Quickie; - } - - /* For now, do nothing */ - EfiPrintf(L"Successfully opened boot device: %lx\r\n", DeviceHandle); - EfiStall(2000000); - -#if 0 + goto Quickie; + } + + /* Get the directory path */ Status = BmpFwGetApplicationDirectoryPath(&BcdPath); BcdDirectory = BcdPath.Buffer; if (!NT_SUCCESS(Status)) { - goto Quickie; - } - + EfiPrintf(L"path failed: %lx\n", Status); + goto Quickie; + } + + /* Add the BCD file name to it */ FinalSize = BcdPath.MaximumLength + sizeof(L"\\BCD") - sizeof(UNICODE_NULL); if (FinalSize < BcdPath.MaximumLength) { goto Quickie; } + /* Allocate space for the final path */ FinalPath = BlMmAllocateHeap(FinalSize); if (!FinalPath) { goto Quickie; } + /* Build it */ RtlZeroMemory(FinalPath, FinalSize); RtlCopyMemory(FinalPath, BcdDirectory, BcdPath.MaximumLength); wcsncat(FinalPath, L"\\BCD", FinalSize / sizeof(WCHAR)); + /* Try to open the file */ EfiPrintf(L"Opening: %s\r\n", FinalPath); +#if 0 Status = BlFileOpen(DeviceHandle, FinalPath, 1u, &FileHandle); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.h [iso-8859-1] Wed Sep 9 18:09:04 2015 @@ -17,6 +17,7 @@ #include <wchar.h> /* NT Base Headers */ +#include <initguid.h> #include <ntifs.h> /* UEFI Headers */ @@ -24,6 +25,9 @@ /* Boot Library Headers */ #include <bl.h> + +/* BCD Headers */ +#include <bcd.h> /* FUNCTIONS *****************************************************************/ 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 18:09:04 2015 @@ -505,6 +505,13 @@ ULONG Unknown[4]; BL_BCD_OPTION BcdData; } BL_APPLICATION_ENTRY, *PBL_APPLICATION_ENTRY; + +typedef struct _BL_LOADED_APPLICATION_ENTRY +{ + ULONG Flags; + GUID Guid; + PBL_BCD_OPTION BcdData; +} BL_LOADED_APPLICATION_ENTRY, *PBL_LOADED_APPLICATION_ENTRY; typedef struct _BL_HARDDISK_DEVICE { @@ -1123,6 +1130,27 @@ _In_ PBL_BCD_OPTION BcdOption ); +NTSTATUS +BlGetBootOptionString ( + _In_ PBL_BCD_OPTION List, + _In_ ULONG Type, + _Out_ PWCHAR* Value + ); + +NTSTATUS +BlGetBootOptionInteger ( + _In_ PBL_BCD_OPTION List, + _In_ ULONG Type, + _Out_ PULONGLONG Value + ); + +NTSTATUS +BlGetBootOptionBoolean ( + _In_ PBL_BCD_OPTION List, + _In_ ULONG Type, + _Out_ PBOOLEAN Value + ); + /* CONTEXT ROUTINES **********************************************************/ VOID @@ -1412,7 +1440,7 @@ extern BL_TRANSLATION_TYPE MmTranslationType; extern PBL_ARCH_CONTEXT CurrentExecutionContext; extern PBL_DEVICE_DESCRIPTOR BlpBootDevice; -extern BL_APPLICATION_ENTRY BlpApplicationEntry; +extern BL_LOADED_APPLICATION_ENTRY BlpApplicationEntry; extern SIMPLE_TEXT_OUTPUT_INTERFACE *EfiConOut; extern EFI_GUID EfiGraphicsOutputProtocol; extern EFI_GUID EfiUgaDrawProtocol; 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 18:09:04 2015 @@ -16,7 +16,7 @@ PBL_DEVICE_DESCRIPTOR BlpBootDevice; PWCHAR BlpApplicationBaseDirectory; PBOOT_APPLICATION_PARAMETER_BLOCK BlpApplicationParameters; -BL_APPLICATION_ENTRY BlpApplicationEntry; +BL_LOADED_APPLICATION_ENTRY BlpApplicationEntry; BOOLEAN BlpLibraryParametersInitialized; ULONG PdPersistAllocations; @@ -86,12 +86,16 @@ BlpApplicationParameters = BootAppParameters; BlpLibraryParameters = *LibraryParameters; - /* Save the application entry */ + /* Save the application entry flags */ if (AppEntry->Flags & 2) { AppEntry->Flags = (AppEntry->Flags & ~0x2) | 0x80; } - BlpApplicationEntry = *AppEntry; + BlpApplicationEntry.Flags = AppEntry->Flags; + + /* Copy the GUID and point to the options */ + BlpApplicationEntry.Guid = AppEntry->Guid; + BlpApplicationEntry.BcdData = &AppEntry->BcdData; /* Everything has been captured */ BlpLibraryParametersInitialized = TRUE; Modified: trunk/reactos/boot/environ/lib/misc/bcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] Wed Sep 9 18:09:04 2015 @@ -12,6 +12,225 @@ /* FUNCTIONS *****************************************************************/ +PBL_BCD_OPTION +MiscGetBootOption ( + _In_ PBL_BCD_OPTION List, + _In_ ULONG Type + ) +{ + ULONG_PTR NextOption = 0, ListOption; + PBL_BCD_OPTION Option; + + /* No options, bail out */ + if (!List) + { + return NULL; + } + + /* Loop while we find an option */ + while (TRUE) + { + /* Get the next option and see if it matches the type */ + Option = (PBL_BCD_OPTION)((ULONG_PTR)List + NextOption); + if ((Option->Type == Type) && !(Option->Empty)) + { + break; + } + + /* Store the offset of the next option */ + NextOption = Option->NextEntryOffset; + + /* Failed to match. Check for list options */ + ListOption = Option->ListOffset; + if (ListOption) + { + /* Try to get a match in the associated option */ + Option = MiscGetBootOption((PBL_BCD_OPTION)((ULONG_PTR)Option + + ListOption), + Type); + + /* Found one, return it */ + if (Option) + { + return Option; + } + } + } + + /* We found the option, return it */ + return Option; +} + +NTSTATUS +BlGetBootOptionString ( + _In_ PBL_BCD_OPTION List, + _In_ ULONG Type, + _Out_ PWCHAR* Value + ) +{ + NTSTATUS Status; + PBL_BCD_OPTION Option; + PWCHAR String, StringCopy; + ULONG StringLength, CopyLength; + //PGUID AppIdentifier; + + /* Make sure this is a BCD_STRING */ + if ((Type & 0xF000000) != 0x2000000) + { + return STATUS_INVALID_PARAMETER; + } + + /* Return the data */ + Option = MiscGetBootOption(List, Type); + if (Option) + { + /* Extract the string */ + String = (PWCHAR)((ULONG_PTR)Option + Option->DataOffset); + } + else + { + /* No string is present */ + String = NULL; + } + + /* Compute the data size */ + StringLength = Option->DataSize / sizeof(WCHAR); + +#ifdef _SECURE_BOOT_ + /* Filter out SecureBoot Options */ + AppIdentifier = BlGetApplicationIdentifier(); + Status = BlpBootOptionCallbackString(AppIdentifier, Type, String, StringLength, &String, &StringLength); +#else + Status = STATUS_SUCCESS; +#endif + + /* Check if we have space for one more character */ + CopyLength = StringLength + 1; + if (CopyLength < StringLength) + { + /* Nope, we'll overflow */ + CopyLength = -1; + Status = STATUS_INTEGER_OVERFLOW; + } + else + { + /* Go ahead */ + Status = STATUS_SUCCESS; + } + + /* No overflow? */ + if (NT_SUCCESS(Status)) + { + /* Check if it's safe to multiply by two */ + if ((CopyLength * sizeof(WCHAR)) > 0xFFFFFFFF) + { + /* Nope */ + CopyLength = -1; + Status = STATUS_INTEGER_OVERFLOW; + } + else + { + /* We're good, do the multiplication */ + Status = STATUS_SUCCESS; + CopyLength *= sizeof(WCHAR); + } + + /* Allocate a copy for the string */ + if (NT_SUCCESS(Status)) + { + StringCopy = BlMmAllocateHeap(CopyLength); + if (StringCopy) + { + /* NULL-terminate it */ + RtlCopyMemory(StringCopy, + String, + CopyLength - sizeof(UNICODE_NULL)); + StringCopy[CopyLength] = UNICODE_NULL; + *Value = StringCopy; + Status = STATUS_SUCCESS; + } + else + { + /* No memory, fail */ + Status = STATUS_NO_MEMORY; + } + } + } + + /* All done */ + return Status; +} + +NTSTATUS +BlGetBootOptionInteger ( + _In_ PBL_BCD_OPTION List, + _In_ ULONG Type, + _Out_ PULONGLONG Value + ) +{ + NTSTATUS Status; + PBL_BCD_OPTION Option; + //PGUID AppIdentifier; + + /* Make sure this is a BCD_INTEGER */ + if ((Type & 0xF000000) != 0x5000000) + { + return STATUS_INVALID_PARAMETER; + } + + /* Return the data */ + Option = MiscGetBootOption(List, Type); + if (Option) + { + *Value = *(PULONGLONG)((ULONG_PTR)Option + Option->DataOffset); + } + +#ifdef _SECURE_BOOT_ + /* Filter out SecureBoot Options */ + AppIdentifier = BlGetApplicationIdentifier(); + Status = BlpBootOptionCallbackULongLong(AppIdentifier, Type, Value); +#else + /* Option found */ + Status = Option ? STATUS_SUCCESS : STATUS_NOT_FOUND; +#endif + return Status; +} + +NTSTATUS +BlGetBootOptionBoolean ( + _In_ PBL_BCD_OPTION List, + _In_ ULONG Type, + _Out_ PBOOLEAN Value + ) +{ + NTSTATUS Status; + PBL_BCD_OPTION Option; + //PGUID AppIdentifier; + + /* Make sure this is a BCD_BOOLEAN */ + if ((Type & 0xF000000) != 0x6000000) + { + return STATUS_INVALID_PARAMETER; + } + + /* Return the data */ + Option = MiscGetBootOption(List, Type); + if (Option) + { + *Value = *(PBOOLEAN)((ULONG_PTR)Option + Option->DataOffset); + } + +#ifdef _SECURE_BOOT_ + /* Filter out SecureBoot Options */ + AppIdentifier = BlGetApplicationIdentifier(); + Status = BlpBootOptionCallbackBoolean(AppIdentifier, Type, Value); +#else + /* Option found */ + Status = Option ? STATUS_SUCCESS : STATUS_NOT_FOUND; +#endif + return Status; +} + /*++ * @name BlGetBootOptionListSize *

9 years, 3 months

[akhaldi] 69154: [PEFILE_APITEST] Introduce tests that load ntoskrnl.exe and validate various section flags. Created by Mark Jansen in light of r68930. CORE-10106

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 9 17:27:36 2015 New Revision: 69154 URL: http://svn.reactos.org/svn/reactos?rev=69154&view=rev Log: [PEFILE_APITEST] Introduce tests that load ntoskrnl.exe and validate various section flags. Created by Mark Jansen in light of r68930. CORE-10106 Added: trunk/rostests/apitests/pefile/ trunk/rostests/apitests/pefile/CMakeLists.txt (with props) trunk/rostests/apitests/pefile/ntoskrnl.c (with props) trunk/rostests/apitests/pefile/testlist.c (with props) Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Wed Sep 9 17:27:36 2015 @@ -15,6 +15,7 @@ add_subdirectory(msvcrt) add_subdirectory(ntdll) add_subdirectory(ole32) +add_subdirectory(pefile) add_subdirectory(powrprof) add_subdirectory(setupapi) add_subdirectory(shell32) Added: trunk/rostests/apitests/pefile/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/pefile/CMakeList… ============================================================================== --- trunk/rostests/apitests/pefile/CMakeLists.txt (added) +++ trunk/rostests/apitests/pefile/CMakeLists.txt [iso-8859-1] Wed Sep 9 17:27:36 2015 @@ -0,0 +1,5 @@ + +add_executable(pefile_apitest ntoskrnl.c testlist.c) +set_module_type(pefile_apitest win32cui) +add_importlibs(pefile_apitest msvcrt kernel32) +add_cd_file(TARGET pefile_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/pefile/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/pefile/ntoskrnl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/pefile/ntoskrnl.… ============================================================================== --- trunk/rostests/apitests/pefile/ntoskrnl.c (added) +++ trunk/rostests/apitests/pefile/ntoskrnl.c [iso-8859-1] Wed Sep 9 17:27:36 2015 @@ -0,0 +1,171 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test to validate section flags in ntoskrnl + * PROGRAMMER: Mark Jansen + */ + +#include <apitest.h> +#include <strsafe.h> + +typedef struct KnownSections +{ + const char* Name; + DWORD Required; + DWORD Disallowed; +} KnownSections; + +static struct KnownSections g_Sections[] = { + { + ".text", + IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ, + IMAGE_SCN_MEM_DISCARDABLE + // optional: IMAGE_SCN_MEM_NOT_PAGED + }, + { + ".data", + IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, + IMAGE_SCN_MEM_DISCARDABLE + // optional: IMAGE_SCN_MEM_NOT_PAGED + }, + { + ".rsrc", + IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, + IMAGE_SCN_MEM_DISCARDABLE + }, + { + ".reloc", + IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_DISCARDABLE | IMAGE_SCN_MEM_READ, + 0 + }, + { + "INIT", + IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_DISCARDABLE | IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ, + 0 + // optional?? : IMAGE_SCN_MEM_WRITE + }, + { NULL, 0 }, +}; + +static char* Chr2Str(DWORD value) +{ + static char buf[512]; + buf[0] = '\0'; +#define IFX(x) if( value & IMAGE_SCN_##x )\ + {\ + if(buf[0]) { StringCchCatA(buf, _countof(buf), "|" ); }\ + StringCchCatA(buf, _countof(buf), #x );\ + value &= ~(IMAGE_SCN_##x);\ + } + IFX(TYPE_NO_PAD); + IFX(CNT_CODE); + IFX(CNT_INITIALIZED_DATA); + IFX(CNT_UNINITIALIZED_DATA); + IFX(LNK_OTHER); + IFX(LNK_INFO); + IFX(LNK_REMOVE); + IFX(LNK_COMDAT); + //IFX(NO_DEFER_SPEC_EXC); + //IFX(GPREL); + IFX(MEM_FARDATA); + IFX(MEM_PURGEABLE); + IFX(MEM_16BIT); + IFX(MEM_LOCKED); + IFX(MEM_PRELOAD); + IFX(ALIGN_1BYTES); + IFX(ALIGN_2BYTES); + IFX(ALIGN_4BYTES); + IFX(ALIGN_8BYTES); + IFX(ALIGN_16BYTES); + IFX(ALIGN_32BYTES); + IFX(ALIGN_64BYTES); + //IFX(ALIGN_128BYTES); + //IFX(ALIGN_256BYTES); + //IFX(ALIGN_512BYTES); + //IFX(ALIGN_1024BYTES); + //IFX(ALIGN_2048BYTES); + //IFX(ALIGN_4096BYTES); + //IFX(ALIGN_8192BYTES); + IFX(LNK_NRELOC_OVFL); + IFX(MEM_DISCARDABLE); + IFX(MEM_NOT_CACHED); + IFX(MEM_NOT_PAGED); + IFX(MEM_SHARED); + IFX(MEM_EXECUTE); + IFX(MEM_READ); + IFX(MEM_WRITE); + if( value ) + { + StringCchPrintfA(buf + strlen(buf), _countof(buf) - strlen(buf), "|0x%x", value); + } + return buf; +} + + +START_TEST(ntoskrnl_SectionFlags) +{ + char buf[MAX_PATH]; + HMODULE mod; + GetSystemDirectoryA(buf, _countof(buf)); + StringCchCatA(buf, _countof(buf), "\\ntoskrnl.exe"); + + mod = LoadLibraryExA( buf, NULL, LOAD_LIBRARY_AS_DATAFILE ); + if( mod != NULL ) + { + // we have to take into account that a datafile is not returned at the exact address it's loaded at. + PIMAGE_DOS_HEADER dos = (PIMAGE_DOS_HEADER)(((size_t)mod) & (~0xf)); + PIMAGE_NT_HEADERS nt; + PIMAGE_SECTION_HEADER firstSection; + WORD numSections, n; + + if( dos->e_magic != IMAGE_DOS_SIGNATURE ) + { + skip("Couldn't find ntoskrnl.exe dos header\n"); + FreeLibrary(mod); + return; + } + nt = (PIMAGE_NT_HEADERS)( ((PBYTE)dos) + dos->e_lfanew ); + if( nt->Signature != IMAGE_NT_SIGNATURE ) + { + skip("Couldn't find ntoskrnl.exe nt header\n"); + FreeLibrary(mod); + return; + } + firstSection = IMAGE_FIRST_SECTION(nt); + numSections = nt->FileHeader.NumberOfSections; + for( n = 0; n < numSections; ++n ) + { + PIMAGE_SECTION_HEADER section = firstSection + n; + char name[9] = {0}; + size_t i; + StringCchCopyNA(name, _countof(name), (PCSTR)section->Name, 8); + + for( i = 0; g_Sections[i].Name; ++i ) + { + if( !_strnicmp(name, g_Sections[i].Name, 8) ) + { + if( g_Sections[i].Required ) + { + DWORD Flags = g_Sections[i].Required & section->Characteristics; + ok(Flags == g_Sections[i].Required, + "Missing required Characteristics on %s: %s\n", + name, Chr2Str(Flags ^ g_Sections[i].Required)); + } + if( g_Sections[i].Disallowed ) + { + DWORD Flags = g_Sections[i].Disallowed & section->Characteristics; + ok(!Flags, "Disallowed section Characteristics on %s: %s\n", + name, Chr2Str(section->Characteristics)); + } + break; + } + } + } + FreeLibrary(mod); + } + else + { + skip("Couldn't load ntoskrnl.exe as datafile\n"); + } +} + Propchange: trunk/rostests/apitests/pefile/ntoskrnl.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/pefile/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/pefile/testlist.… ============================================================================== --- trunk/rostests/apitests/pefile/testlist.c (added) +++ trunk/rostests/apitests/pefile/testlist.c [iso-8859-1] Wed Sep 9 17:27:36 2015 @@ -0,0 +1,14 @@ +#define __ROS_LONG64__ + +#define STANDALONE +#include <wine/test.h> + +extern void func_ntoskrnl_SectionFlags(void); + +const struct test winetest_testlist[] = +{ + { "ntoskrnl_SectionFlags", func_ntoskrnl_SectionFlags }, + + { 0, 0 } +}; + Propchange: trunk/rostests/apitests/pefile/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 3 months

[ion] 69153: [BOOTMGFW] - Fix more device I/O bugs. - Silence some dbgprints. - Implement DiskOpen and DiskClose. - Refactor block cache in its own file. - We successfully open our boot device (whi...

by ion＠svn.reactos.org

Author: ion Date: Wed Sep 9 16:50:05 2015 New Revision: 69153 URL: http://svn.reactos.org/svn/reactos?rev=69153&view=rev Log: [BOOTMGFW] - Fix more device I/O bugs. - Silence some dbgprints. - Implement DiskOpen and DiskClose. - Refactor block cache in its own file. - We successfully open our boot device (which appears as a floppy, as expected with the new UEFI boot)! Added: trunk/reactos/boot/environ/lib/io/blkcache.c (with props) Modified: trunk/reactos/boot/environ/CMakeLists.txt trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/io/device.c trunk/reactos/boot/environ/lib/mm/heapalloc.c Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Wed Sep 9 16:50:05 2015 @@ -19,6 +19,7 @@ lib/mm/blkalloc.c lib/mm/descriptor.c lib/platform/time.c + lib/io/blkcache.c lib/io/io.c lib/io/device.c lib/io/file.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 16:50:05 2015 @@ -50,6 +50,8 @@ Status = BlpDeviceOpen(BlpBootDevice, 1u, 0, &DeviceHandle); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"Device open failed: %lx\r\n", Status); + EfiStall(2000000); goto Quickie; } @@ -176,9 +178,6 @@ goto Quickie; } - EfiPrintf(L"We are A-OK!\n"); - EfiStall(10000000); - /* Get the application identifier */ AppIdentifier = BlGetApplicationIdentifier(); if (!AppIdentifier) @@ -195,7 +194,7 @@ //Status = BmOpenDataStore(&BcdHandle); - EfiPrintf(L"We are A-OK!\n"); + EfiPrintf(L"We are A-OK!\r\n"); EfiStall(10000000); Quickie: 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 16:50:05 2015 @@ -80,6 +80,8 @@ #define BL_HT_VALUE_IS_INLINE 0x01 #define BL_FS_REGISTER_AT_HEAD_FLAG 1 + +#define BL_BLOCK_DEVICE_REMOVABLE_FLAG 0x01 #define BL_MEMORY_CLASS_SHIFT 28 @@ -899,6 +901,11 @@ VOID ); +NTSTATUS +BcInitialize ( + VOID + ); + /* FIRMWARE ROUTINES *********************************************************/ VOID Added: trunk/reactos/boot/environ/lib/io/blkcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/blkcac… ============================================================================== --- trunk/reactos/boot/environ/lib/io/blkcache.c (added) +++ trunk/reactos/boot/environ/lib/io/blkcache.c [iso-8859-1] Wed Sep 9 16:50:05 2015 @@ -0,0 +1,111 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/blkcache.c + * PURPOSE: Boot Library Block Cache Management Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +ULONG BcpBlockAllocatorHandle; +ULONG BcpHashTableId; + +/* FUNCTIONS *****************************************************************/ + +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; +} Propchange: trunk/reactos/boot/environ/lib/io/blkcache.c ------------------------------------------------------------------------------ svn:eol-style = native 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 16:50:05 2015 @@ -151,6 +151,587 @@ _In_ PBL_DEVICE_ENTRY DeviceEntry ); +BL_DEVICE_CALLBACKS BlockIoDeviceFunctionTable = +{ + NULL, + BlockIoOpen, + NULL, +}; + +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; +} + +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; + + EfiPrintf(L"Block I/O Info for Device 0x%p, 0x%lX\r\n", BlockDevice, BlockDevice->Handle); + EfiPrintf(L"Removable: %d Present: %d Last Block: %I64d BlockSize: %d IoAlign: %d MediaId: %d ReadOnly: %d\r\n", + Media->RemovableMedia, Media->MediaPresent, Media->LastBlock, Media->BlockSize, Media->IoAlign, + Media->MediaId, Media->ReadOnly); + + /* Set the appropriate device flags */ + BlockDevice->DeviceFlags = 0; + if (Media->RemovableMedia) + { + BlockDevice->DeviceFlags = BL_BLOCK_DEVICE_REMOVABLE_FLAG; + } + 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; + BL_PROTOCOL_HANDLE Protocol[2]; + ACPI_HID_DEVICE_PATH *AcpiPath; + HARDDRIVE_DEVICE_PATH *DiskPath; + BOOLEAN Found; + ULONG i; + + /* Extract the identifier, and the block device object */ + Device = DeviceEntry->DeviceDescriptor; + BlockDevice = (PBL_BLOCK_DEVICE)DeviceEntry->DeviceSpecificData; + + /* Initialize protocol handles */ + Protocol[0].Handle = BlockDevice->Handle; + Protocol[1].Handle = 0; + + /* Open this device */ + Status = EfiOpenProtocol(Protocol[0].Handle, + &EfiDevicePathProtocol, + &Protocol[0].Interface); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + return Status; + } + + /* Iteratate twice -- once for the top level, once for the bottom */ + for (i = 0, Found = FALSE; Found == FALSE && Protocol[i].Handle; i++) + { + LeafNode = EfiGetLeafNode(Protocol[i].Interface); + EfiPrintf(L"Pass %d, Leaf node: %p Type: %d\r\n", i, LeafNode, LeafNode->Type); + 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; + EfiPrintf(L"Disk path: %p Type: %lx\r\n", DiskPath, LeafNode->SubType); + if (LeafNode->SubType == MEDIA_HARDDRIVE_DP) + { + /* Set this as a local device */ + 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; + + /* Write the MBR partition signature */ + BlockDevice->PartitionType = MbrPartition; + BlockDevice->Disk.Mbr.Signature = *(PULONG)&DiskPath->Signature[0]; + Found = TRUE; + } + else if (DiskPath->SignatureType == SIGNATURE_TYPE_GUID) + { + /* Set this as a GPT partition */ + BlockDevice->PartitionType = GptPartition; + Device->Local.HardDisk.PartitionType = GptPartition; + + /* Get the GPT signature */ + Status = BlockIoGetGPTDiskSignature(DeviceEntry, + &Device->Local.HardDisk.Gpt.PartitionSignature); + if (NT_SUCCESS(Status)) + { + /* Copy it */ + RtlCopyMemory(&BlockDevice->Disk.Gpt.Signature, + &Device->Local.HardDisk.Gpt.PartitionSignature, + sizeof(&BlockDevice->Disk.Gpt.Signature)); + Found = TRUE; + } + } + + /* Otherwise, this is a raw disk */ + 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 */ + EfiPrintf(L"Found CD-ROM\r\n"); + 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)) + { + /* This is probably a messaging device node. Are we under it? */ + Status = BlockIoEfiGetChildHandle(Protocol, &Protocol[1]); + EfiPrintf(L"Pass 0, non DP/ACPI path. Child handle obtained: %lx\r\n", Protocol[1].Handle); + if (!NT_SUCCESS(Status)) + { + /* We're not. So this must be a raw device */ + Device->DeviceType = LocalDevice; + Found = TRUE; + + /* Is it a removable raw device? */ + if (BlockDevice->DeviceFlags & BL_BLOCK_DEVICE_REMOVABLE_FLAG) + { + /* This is a removable (CD or Floppy or USB) device */ + BlockDevice->Type = FloppyDevice; + Device->Local.Type = FloppyDevice; + Device->Local.FloppyDisk.DriveNumber = BlockIoFirmwareRemovableDiskCount++; + EfiPrintf(L"Found Floppy\r\n"); + } + else + { + /* It's a fixed device */ + BlockDevice->Type = DiskDevice; + Device->Local.Type = DiskDevice; + + /* Set it as a raw partition */ + Device->Local.HardDisk.PartitionType = RawPartition; + Device->Local.HardDisk.Mbr.PartitionSignature = BlockIoFirmwareRawDiskCount++; + EfiPrintf(L"Found raw disk\r\n"); + } + } + } + } + + /* Close any protocols that we opened for each handle */ + while (i) + { + EfiCloseProtocol(Protocol[--i].Handle, &EfiDevicePathProtocol); + } + + /* Return appropriate status */ + return Found ? STATUS_SUCCESS : STATUS_NOT_SUPPORTED; +} + +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); + EfiPrintf(L"Failed: %lx\r\n", Status); + 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 */ + EfiPrintf(L"Device is known\r\n"); + 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)) + { + EfiPrintf(L"EFI create failed: %lx\n", 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); + EfiPrintf(L"Device match: %d\r\n", DeviceMatch); + 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; +} + NTSTATUS PartitionOpen ( _In_ PBL_DEVICE_DESCRIPTOR Device, @@ -172,13 +753,55 @@ } NTSTATUS +DiskClose ( + _In_ PBL_DEVICE_ENTRY DeviceEntry + ) +{ + NTSTATUS Status, LocalStatus; + PBL_BLOCK_DEVICE BlockDevice; + + /* Assume success */ + Status = STATUS_SUCCESS; + BlockDevice = DeviceEntry->DeviceSpecificData; + + /* Close the protocol */ + LocalStatus = EfiCloseProtocol(BlockDevice->Handle, &EfiBlockIoProtocol); + if (!NT_SUCCESS(LocalStatus)) + { + /* Only inherit failures */ + Status = LocalStatus; + } + + /* Free the block device allocations */ + LocalStatus = BlockIopFreeAllocations(BlockDevice); + if (!NT_SUCCESS(LocalStatus)) + { + /* Only inherit failures */ + Status = LocalStatus; + } + + /* Return back to caller */ + return Status; +} + +NTSTATUS DiskOpen ( _In_ PBL_DEVICE_DESCRIPTOR Device, _In_ PBL_DEVICE_ENTRY DeviceEntry ) { - EfiPrintf(L"Not implemented!\r\n"); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + /* Use firmware-specific functions to open the disk */ + Status = BlockIoFirmwareOpen(Device, DeviceEntry->DeviceSpecificData); + if (NT_SUCCESS(Status)) + { + /* Overwrite with our own close routine */ + DeviceEntry->Callbacks.Close = DiskClose; + } + + /* Return back to caller */ + return Status; } NTSTATUS @@ -256,12 +879,7 @@ NULL, }; -BL_DEVICE_CALLBACKS BlockIoDeviceFunctionTable = -{ - NULL, - BlockIoOpen, - NULL, -}; + BL_DEVICE_CALLBACKS UdpFunctionTable = { @@ -278,137 +896,7 @@ }; -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 ( @@ -643,524 +1131,6 @@ 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 ( @@ -1197,6 +1167,7 @@ if (!NT_SUCCESS(Status)) { /* Failed to initialize block I/O */ + EfiPrintf(L"Block I/O Init failed\r\n"); return Status; } } @@ -1229,6 +1200,7 @@ if (FoundDeviceEntry) { /* We already found a device, so copy its device data and callbacks */ + EfiPrintf(L"Device entry found: %p\r\n", FoundDeviceEntry); RtlCopyMemory(BlockDevice, FoundDeviceEntry->DeviceSpecificData, sizeof(*BlockDevice)); RtlCopyMemory(&DeviceEntry->Callbacks, &FoundDeviceEntry->Callbacks, @@ -1423,6 +1395,7 @@ if (DeviceEntry) { /* Return it, taking a reference on it */ + EfiPrintf(L"Device found: %p\r\n", DeviceEntry); *DeviceId = DeviceEntry->DeviceId; ++DeviceEntry->ReferenceCount; DeviceEntry->Flags |= 1; @@ -1519,6 +1492,7 @@ if (NT_SUCCESS(Status)) { /* It worked -- return the ID in the table to the caller */ + EfiPrintf(L"Device ID: %lx\r\n", *DeviceId); DeviceEntry->DeviceId = *DeviceId; return STATUS_SUCCESS; } @@ -1526,6 +1500,7 @@ Quickie: /* Failure path -- did we allocate a device entry? */ + EfiPrintf(L"Block failure: %lx\r\n", Status); if (DeviceEntry) { /* Yep -- did it have a descriptor? */ 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 16:50:05 2015 @@ -653,7 +653,7 @@ BusyEntry->BufferNext.P = MmHapDecodeLink(BusyEntry->BufferNext); /* Return the entry's data buffer */ - EfiPrintf(L"Returning buffer at 0x%p\r\n", &BusyEntry->Buffer); + //EfiPrintf(L"Returning buffer at 0x%p\r\n", &BusyEntry->Buffer); return &BusyEntry->Buffer; } @@ -673,7 +673,7 @@ } /* Get the heap header */ - EfiPrintf(L"Freeing entry at: %p\r\n", Buffer); + //EfiPrintf(L"Freeing entry at: %p\r\n", Buffer); if (Buffer) { /* Don't free heap until we discover the corruption */

9 years, 3 months

[sginsberg] 69152: - Consistently check for KDBG via if-def, not if (like we do for _WINKD_), everywhere.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Sep 9 16:06:38 2015 New Revision: 69152 URL: http://svn.reactos.org/svn/reactos?rev=69152&view=rev Log: - Consistently check for KDBG via if-def, not if (like we do for _WINKD_), everywhere. Modified: trunk/reactos/include/reactos/kdros.h trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/include/reactos/kdros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/kdros.h?re… ============================================================================== --- trunk/reactos/include/reactos/kdros.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/kdros.h [iso-8859-1] Wed Sep 9 16:06:38 2015 @@ -45,7 +45,7 @@ KdSystemDebugControl('DsoR', Backtrace, Count, 0, 0, 0, 0); } -#if KDBG +#if defined(KDBG) FORCEINLINE VOID KdRosRegisterCliCallback( Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Wed Sep 9 16:06:38 2015 @@ -36,7 +36,7 @@ #if defined(KDBG) || DBG -#if KDBG +#if defined(KDBG) typedef BOOLEAN (NTAPI *PKDBG_CLI_ROUTINE)( Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Wed Sep 9 16:06:38 2015 @@ -100,7 +100,7 @@ break; } -#if KDBG +#if defined(KDBG) /* Register KDBG CLI callback */ case 'RbdK': { Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Wed Sep 9 16:06:38 2015 @@ -464,7 +464,7 @@ VOID NTAPI -INIT_FUNCTION +INIT_SECTION ExpSeedHotTags(VOID) { ULONG i, Key, Hash, Index; @@ -794,7 +794,7 @@ VOID NTAPI -INIT_FUNCTION +INIT_SECTION ExInitializePoolDescriptor(IN PPOOL_DESCRIPTOR PoolDescriptor, IN POOL_TYPE PoolType, IN ULONG PoolIndex, @@ -845,7 +845,7 @@ VOID NTAPI -INIT_FUNCTION +INIT_SECTION InitializePool(IN POOL_TYPE PoolType, IN ULONG Threshold) { @@ -2669,7 +2669,7 @@ return Buffer; } -#if DBG && KDBG +#if DBG && defined(KDBG) BOOLEAN ExpKdbgExtPool( 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 16:06:38 2015 @@ -255,7 +255,7 @@ #if DBG DbgInitDebugChannels(); -#if KDBG +#if defined(KDBG) KdRosRegisterCliCallback(DbgGdiKdbgCliCallback); #endif #endif

9 years, 3 months

[sginsberg] 69151: Sigh missed this one.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Sep 9 15:40:38 2015 New Revision: 69151 URL: http://svn.reactos.org/svn/reactos?rev=69151&view=rev Log: Sigh missed this one. Modified: trunk/reactos/boot/bootdata/hivesys.inf 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:40:38 2015 @@ -1220,7 +1220,7 @@ ; ReactOS specific - by default we report ourselves as Server for the user, ; but we can also report as Workstation if some application needs it. HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkstation",0x00010001,0x00000000 -; Some installers check for SP1 +; Some installers check for SP2 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDReleaseType",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000200

9 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2015