Ros-diffs October 2019

ros-diffs@reactos.org

23 participants
180 discussions

[reactos] 01/01: [UMPNPMGR] Implement PNP_QueryRemove()

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d9a702d2b4d37889edaa… commit 3d9a702d2b4d37889edaa5c6305123360f7684fe Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Oct 13 15:49:13 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Oct 13 15:49:13 2019 +0200 [UMPNPMGR] Implement PNP_QueryRemove() --- base/services/umpnpmgr/rpcserver.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 32ff58d5865..bef58c8895a 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -2950,8 +2950,36 @@ PNP_QueryRemove( DWORD ulNameLength, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + PLUGPLAY_CONTROL_QUERY_REMOVE_DATA PlugPlayData; + NTSTATUS Status; + DWORD ret = CR_SUCCESS; + + DPRINT1("PNP_QueryRemove(%p %S %p %p %lu 0x%lx)\n", + hBinding, pszDeviceID, pVetoType, pszVetoName, + ulNameLength, ulFlags); + + if (ulFlags & ~CM_REMOVE_BITS) + return CR_INVALID_FLAG; + + if (pVetoType != NULL) + *pVetoType = PNP_VetoTypeUnknown; + + if (pszVetoName != NULL && ulNameLength > 0) + *pszVetoName = UNICODE_NULL; + + RtlZeroMemory(&PlugPlayData, sizeof(PlugPlayData)); + RtlInitUnicodeString(&PlugPlayData.DeviceInstance, + pszDeviceID); + PlugPlayData.VetoName = pszVetoName; + PlugPlayData.NameLength = ulNameLength; + + Status = NtPlugPlayControl(PlugPlayControlQueryAndRemoveDevice, + &PlugPlayData, + sizeof(PlugPlayData)); + if (!NT_SUCCESS(Status)) + ret = NtStatusToCrError(Status); + + return ret; }

4 years, 11 months

[reactos] 01/01: [NDK] Add PLUGPLAY_CONTROL_QUERY_REMOVE_DATA type

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7633ebcfde6f48860406f… commit 7633ebcfde6f48860406fbad9d28011d43ccd916 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Oct 13 15:24:29 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Oct 13 15:25:47 2019 +0200 [NDK] Add PLUGPLAY_CONTROL_QUERY_REMOVE_DATA type --- sdk/include/ndk/cmtypes.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/include/ndk/cmtypes.h b/sdk/include/ndk/cmtypes.h index 7eed8145d14..335c83ec56a 100644 --- a/sdk/include/ndk/cmtypes.h +++ b/sdk/include/ndk/cmtypes.h @@ -452,6 +452,16 @@ typedef struct _PLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA ULONG Flags; } PLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA, *PPLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA; +// Class 0x06 +typedef struct _PLUGPLAY_CONTROL_QUERY_REMOVE_DATA +{ + UNICODE_STRING DeviceInstance; + ULONG Unknown2; + PNP_VETO_TYPE VetoType; + LPWSTR VetoName; + ULONG NameLength; +} PLUGPLAY_CONTROL_QUERY_REMOVE_DATA, *PPLUGPLAY_CONTROL_QUERY_REMOVE_DATA; + // Class 0x07 typedef struct _PLUGPLAY_CONTROL_USER_RESPONSE_DATA {

4 years, 11 months

[reactos] 01/01: [SDK][INCLUDE] Update msgdump.h

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31d7680a53c79b3a2c68b… commit 31d7680a53c79b3a2c68b27dc881b7de3971dca5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Oct 13 10:45:17 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Oct 13 10:45:17 2019 +0900 [SDK][INCLUDE] Update msgdump.h --- sdk/include/reactos/msgdump.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index fde8758f66d..a2ae64c4156 100644 --- a/sdk/include/reactos/msgdump.h +++ b/sdk/include/reactos/msgdump.h @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2018-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef _INC_MSGDUMP -#define _INC_MSGDUMP 15 /* Version 15 */ +#define _INC_MSGDUMP 16 /* Version 16 */ /* * NOTE: MD_msgdump function in this file provides Win32API message dump feature. @@ -3547,6 +3547,10 @@ MD_ListView_OnSetSelectedColumn(HWND hwnd, INT iCol) MSGDUMP_PREFIX, (void *)hwnd, iCol); } +#ifndef LVM_SETTILEWIDTH + #define LVM_SETTILEWIDTH (LVM_FIRST+141) +#endif + static __inline LRESULT MSGDUMP_API MD_ListView_OnSetTileWidth(HWND hwnd, WPARAM wParam, LPARAM lParam) {

4 years, 11 months

[reactos] 01/01: [WIN32K:menu] Use signed types for negative values... CORE-16306

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1984d03b4bafa72e89ea… commit e1984d03b4bafa72e89ea9948af8d9f28b79b2ac Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Sep 30 23:15:20 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Oct 12 16:19:58 2019 +0200 [WIN32K:menu] Use signed types for negative values... CORE-16306 --- win32ss/user/ntuser/menu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 17e31d6d13d..71a52b94b40 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -1480,7 +1480,8 @@ MENU_AdjustMenuItemRect(PMENU menu, PRECTL rect) static ITEM *MENU_FindItemByCoords( MENU *menu, POINT pt, UINT *pos ) { ITEM *item; - UINT i, cx, cy; + UINT i; + INT cx, cy; RECT rect; PWND pWnd = ValidateHwndNoErr(menu->hWnd); @@ -2938,7 +2939,7 @@ static BOOL MENU_MoveRect(UINT flags, INT* x, INT* y, INT width, INT height, con static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT flags, INT x, INT y, const RECT* pExclude) { - UINT width, height; + INT width, height; POINT ptx; PMONITOR monitor; PWND pWnd; @@ -3410,7 +3411,7 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi RECT rc; rc.left = Item->xItem; rc.top = Item->yItem; - rc.right = Item->cxItem; // Do this for now...... + rc.right = Item->cxItem; rc.bottom = Item->cyItem; MENU_AdjustMenuItemRect(Menu, &rc);

4 years, 11 months

[reactos] 01/01: [BROWSEUI][SHELLFIND] Allow to 'Open Containing Folder'

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd2a274ef7fcf42f24b63… commit cd2a274ef7fcf42f24b634ffa5b4de3ce299e1e4 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Oct 12 15:44:58 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Oct 12 15:44:58 2019 +0200 [BROWSEUI][SHELLFIND] Allow to 'Open Containing Folder' of a search result again. The feature regressed by 0.4.13-dev-1133-g a3ee648d8b641604a87fcc3733d0946ced056074 I chose the shorter solution of Brock Mammen instead of the patch of Doug Lyons from PR1960. Still many thanks to Doug Lyons for his encouragement in creating a fix as well and performing regression-testing. I intend to merge that back into 0.4.13RCs as well. --- dll/win32/browseui/shellfind/CFindFolder.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index 4db35f633b3..dcac0c0c60c 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -556,8 +556,10 @@ class CFindFolderContextMenu : CComHeapPtr<ITEMIDLIST> folderPidl(ILCreateFromPathW(_ILGetPath(apidl[i]))); if (!folderPidl) return E_OUTOFMEMORY; - LPCITEMIDLIST pidl = _ILGetFSPidl(apidl[i]); - SHOpenFolderAndSelectItems(folderPidl, 1, &pidl, 0); + CComHeapPtr<ITEMIDLIST> filePidl(ILCombine(folderPidl, _ILGetFSPidl(apidl[i]))); + if (!filePidl) + return E_OUTOFMEMORY; + SHOpenFolderAndSelectItems(folderPidl, 1, &filePidl, 0); } return S_OK; }

4 years, 11 months

[reactos] 01/01: [WIN32SS] Fix regression CORE-16393

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96ef605f4b91d15713bc3… commit 96ef605f4b91d15713bc358094603521745ffde8 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Oct 11 23:21:39 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Oct 11 23:21:39 2019 +0200 [WIN32SS] Fix regression CORE-16393 Symptom "cmd did not hide the taskbar anymore when switching to fullscreen" It regressed by SVN r75407 == git 09ab5ea7ed2ab0e709ed2e8f8f9f6c3711b2ac7f VBox LGTM https://reactos.org/testman/compare.php?ids=69295,69297 KVM LGTM https://reactos.org/testman/compare.php?ids=69296,69298 Many thanks to the patches author James Tabor. --- win32ss/user/ntuser/display.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index 20bbdfceacb..3f2b99cc229 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -783,6 +783,13 @@ UserChangeDisplaySettings( } } + /* Check if DEVMODE matches the current mode */ + if (pdm == ppdev->pdmwDev && !(flags & CDS_RESET)) + { + ERR("DEVMODE matches, nothing to do\n"); + goto leave; + } + /* Shall we apply the settings? */ if (!(flags & CDS_NORESET)) { @@ -926,6 +933,11 @@ NtUserChangeDisplaySettings( return DISP_CHANGE_BADFLAGS; } + if ((dwflags & CDS_RESET) && (dwflags & CDS_NORESET)) + { + return DISP_CHANGE_BADFLAGS; + } + /* Copy the device name */ if (pustrDevice) {

4 years, 11 months

[reactos] 01/01: [FREELDR][XBOXVMP] Retrieve screen resolution directly from NV2A GPU (#1962)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=297abde716495c13cfcaf… commit 297abde716495c13cfcafac5c0dee867cfb4c7a3 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Oct 10 00:27:22 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 9 23:27:22 2019 +0200 [FREELDR][XBOXVMP] Retrieve screen resolution directly from NV2A GPU (#1962) CORE-16216 --- boot/freeldr/freeldr/arch/i386/xboxvideo.c | 57 +++++----- boot/freeldr/freeldr/include/arch/i386/machxbox.h | 9 ++ win32ss/drivers/miniport/CMakeLists.txt | 5 +- win32ss/drivers/miniport/xboxvmp/CMakeLists.txt | 1 - win32ss/drivers/miniport/xboxvmp/xboxi2c.c | 123 ---------------------- win32ss/drivers/miniport/xboxvmp/xboxvmp.c | 98 +++++++++++------ win32ss/drivers/miniport/xboxvmp/xboxvmp.h | 13 ++- 7 files changed, 110 insertions(+), 196 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/xboxvideo.c b/boot/freeldr/freeldr/arch/i386/xboxvideo.c index c664eef5d3c..d5839024d43 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxvideo.c +++ b/boot/freeldr/freeldr/arch/i386/xboxvideo.c @@ -40,8 +40,6 @@ static ULONG Delta; #define MAKE_COLOR(Red, Green, Blue) (0xff000000 | (((Red) & 0xff) << 16) | (((Green) & 0xff) << 8) | ((Blue) & 0xff)) -BOOLEAN I2CTransmitByteGetReturn(UCHAR bPicAddressI2cFormat, UCHAR bDataToWrite, ULONG *Return); - static VOID XboxVideoOutputChar(UCHAR Char, unsigned X, unsigned Y, ULONG FgColor, ULONG BgColor) { @@ -122,48 +120,45 @@ XboxVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y) XboxVideoOutputChar(Ch, X, Y, FgColor, BgColor); } +UCHAR +NvGetCrtc(UCHAR Index) +{ + *((PUCHAR) NV2A_CRTC_REGISTER_INDEX) = Index; + return *((PUCHAR) NV2A_CRTC_REGISTER_VALUE); +} + VOID XboxVideoInit(VOID) { - ULONG AvMode; - /* Reuse framebuffer that was set up by firmware */ - FrameBuffer = (PVOID)*((PULONG) 0xfd600800); + FrameBuffer = (PVOID)*((PULONG) NV2A_CRTC_FRAMEBUFFER_START); /* Verify that framebuffer address is page-aligned */ ASSERT((ULONG_PTR)FrameBuffer % PAGE_SIZE == 0); /* FIXME: obtain fb size from firmware somehow (Cromwell reserves high 4 MB of RAM) */ FrameBufferSize = 4 * 1024 * 1024; - /* FIXME: don't use SMBus, obtain current video resolution directly from NV2A */ - if (I2CTransmitByteGetReturn(0x10, 0x04, &AvMode)) - { - if (1 == AvMode) /* HDTV */ - { - ScreenWidth = 720; - } - else - { - /* FIXME Other possible values of AvMode: - * 0 - AV_SCART_RGB - * 2 - AV_VGA_SOG - * 4 - AV_SVIDEO - * 6 - AV_COMPOSITE - * 7 - AV_VGA - * other AV_COMPOSITE - */ - ScreenWidth = 640; - } - } + ScreenWidth = *((PULONG) NV2A_RAMDAC_FP_HVALID_END) + 1; + ScreenHeight = *((PULONG) NV2A_RAMDAC_FP_VVALID_END) + 1; + /* Get BPP directly from NV2A CRTC (magic constants are from Cromwell) */ + BytesPerPixel = 8 * (((NvGetCrtc(0x19) & 0xE0) << 3) | (NvGetCrtc(0x13) & 0xFF)) / ScreenWidth; + if (BytesPerPixel == 4) + { + ASSERT((NvGetCrtc(0x28) & 0xF) == BytesPerPixel - 1); + } else - { - ScreenWidth = 640; - } - - ScreenHeight = 480; - BytesPerPixel = 4; + { + ASSERT((NvGetCrtc(0x28) & 0xF) == BytesPerPixel); + } Delta = (ScreenWidth * BytesPerPixel + 3) & ~ 0x3; + /* Verify screen resolution */ + ASSERT(ScreenWidth > 1); + ASSERT(ScreenHeight > 1); + ASSERT(BytesPerPixel >= 1 && BytesPerPixel <= 4); + /* Verify that screen fits framebuffer size */ + ASSERT(ScreenWidth * ScreenHeight * BytesPerPixel <= FrameBufferSize); + XboxVideoClearScreenColor(MAKE_COLOR(0, 0, 0), TRUE); } diff --git a/boot/freeldr/freeldr/include/arch/i386/machxbox.h b/boot/freeldr/freeldr/include/arch/i386/machxbox.h index 393f3a900e2..31f8f7e996d 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machxbox.h +++ b/boot/freeldr/freeldr/include/arch/i386/machxbox.h @@ -37,6 +37,15 @@ #define LPC_CONFIG_DEVICE_BASE_ADDRESS_LOW 0x61 #define LPC_CONFIG_DEVICE_INTERRUPT 0x70 +#define NV2A_CONTROL_OFFSET 0xFD000000 +#define NV2A_CRTC_OFFSET (0x600000 + NV2A_CONTROL_OFFSET) +#define NV2A_CRTC_FRAMEBUFFER_START (0x800 + NV2A_CRTC_OFFSET) +#define NV2A_CRTC_REGISTER_INDEX (0x13D4 + NV2A_CRTC_OFFSET) +#define NV2A_CRTC_REGISTER_VALUE (0x13D5 + NV2A_CRTC_OFFSET) +#define NV2A_RAMDAC_OFFSET (0x680000 + NV2A_CONTROL_OFFSET) +#define NV2A_RAMDAC_FP_HVALID_END (0x838 + NV2A_RAMDAC_OFFSET) +#define NV2A_RAMDAC_FP_VVALID_END (0x818 + NV2A_RAMDAC_OFFSET) + extern UCHAR XboxFont8x16[256 * 16]; VOID XboxMachInit(const char *CmdLine); diff --git a/win32ss/drivers/miniport/CMakeLists.txt b/win32ss/drivers/miniport/CMakeLists.txt index 52898276311..79b52e628bb 100644 --- a/win32ss/drivers/miniport/CMakeLists.txt +++ b/win32ss/drivers/miniport/CMakeLists.txt @@ -3,4 +3,7 @@ add_subdirectory(vbe) add_subdirectory(vga) add_subdirectory(vga_new) add_subdirectory(vmx_svga) -add_subdirectory(xboxvmp) + +if(ARCH STREQUAL "i386") + add_subdirectory(xboxvmp) +endif() diff --git a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt index 59941c74349..e9d37f0edee 100644 --- a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt +++ b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt @@ -1,6 +1,5 @@ list(APPEND SOURCE - xboxi2c.c xboxvmp.c xboxvmp.h) diff --git a/win32ss/drivers/miniport/xboxvmp/xboxi2c.c b/win32ss/drivers/miniport/xboxvmp/xboxi2c.c deleted file mode 100644 index fc283af7e98..00000000000 --- a/win32ss/drivers/miniport/xboxvmp/xboxi2c.c +++ /dev/null @@ -1,123 +0,0 @@ -/* - * PROJECT: ReactOS Xbox miniport video driver - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: I2C SMBus routines - * COPYRIGHT: Copyright 2004 Gé van Geldorp - * Copyright 2004 Filip Navara - * Copyright 2019 Stanislav Motylkov (x86corez(a)gmail.com) - */ - -/* INCLUDES *******************************************************************/ - -#include "xboxvmp.h" - -#include <debug.h> -#include <dpfilter.h> - -/* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ - -static -BOOLEAN -ReadfromSMBus( - UCHAR Address, - UCHAR bRegister, - UCHAR Size, - ULONG *Data_to_smbus) -{ - int nRetriesToLive = 50; - - while ((VideoPortReadPortUshort((PUSHORT) (I2C_IO_BASE + 0)) & 0x0800) != 0) - { - ; /* Franz's spin while bus busy with any master traffic */ - } - - while (nRetriesToLive-- != 0) - { - UCHAR b; - int temp; - - VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 4), (Address << 1) | 1); - VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 8), bRegister); - - temp = VideoPortReadPortUshort((PUSHORT) (I2C_IO_BASE + 0)); - VideoPortWritePortUshort((PUSHORT) (I2C_IO_BASE + 0), temp); /* clear down all preexisting errors */ - - switch (Size) - { - case 4: - { - VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 2), 0x0d); /* DWORD modus ? */ - break; - } - - case 2: - { - VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 2), 0x0b); /* WORD modus */ - break; - } - - default: - { - VideoPortWritePortUchar((PUCHAR) (I2C_IO_BASE + 2), 0x0a); /* BYTE */ - } - } - - b = 0; - - while ((b & 0x36) == 0) - { - b = VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 0)); - } - - if ((b & 0x24) != 0) - { - ERR_(IHVVIDEO, "I2CTransmitByteGetReturn error %x\n", b); - } - - if ((b & 0x10) == 0) - { - ERR_(IHVVIDEO, "I2CTransmitByteGetReturn no complete, retry\n"); - } - else - { - switch (Size) - { - case 4: - { - VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 6)); - VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); - VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); - VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); - VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 9)); - break; - } - - case 2: - { - *Data_to_smbus = VideoPortReadPortUshort((PUSHORT) (I2C_IO_BASE + 6)); - break; - } - - default: - { - *Data_to_smbus = VideoPortReadPortUchar((PUCHAR) (I2C_IO_BASE + 6)); - } - } - - return TRUE; - } - } - - return FALSE; -} - -BOOLEAN -I2CTransmitByteGetReturn( - UCHAR bPicAddressI2cFormat, - UCHAR bDataToWrite, - ULONG *Return) -{ - return ReadfromSMBus(bPicAddressI2cFormat, bDataToWrite, 1, Return); -} - -/* EOF */ diff --git a/win32ss/drivers/miniport/xboxvmp/xboxvmp.c b/win32ss/drivers/miniport/xboxvmp/xboxvmp.c index 5d6fc275dac..98f584ec086 100644 --- a/win32ss/drivers/miniport/xboxvmp/xboxvmp.c +++ b/win32ss/drivers/miniport/xboxvmp/xboxvmp.c @@ -405,7 +405,7 @@ XboxVmpMapVideoMemory( FrameBuffer.QuadPart += DeviceExtension->PhysFrameBufferStart.QuadPart; MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress; /* FIXME: obtain fb size from firmware somehow (Cromwell reserves high 4 MB of RAM) */ - MapInformation->VideoRamLength = 4 * 1024 * 1024; + MapInformation->VideoRamLength = NV2A_VIDEO_MEMORY_SIZE; VideoPortMapMemory( DeviceExtension, @@ -485,6 +485,37 @@ XboxVmpQueryAvailModes( return XboxVmpQueryCurrentMode(DeviceExtension, VideoMode, StatusBlock); } +UCHAR +NvGetCrtc( + PXBOXVMP_DEVICE_EXTENSION DeviceExtension, + UCHAR Index) +{ + *((PUCHAR)((ULONG_PTR)DeviceExtension->VirtControlStart + NV2A_CRTC_REGISTER_INDEX)) = Index; + return *((PUCHAR)((ULONG_PTR)DeviceExtension->VirtControlStart + NV2A_CRTC_REGISTER_VALUE)); +} + +UCHAR +NvGetBytesPerPixel( + PXBOXVMP_DEVICE_EXTENSION DeviceExtension, + ULONG ScreenWidth) +{ + UCHAR BytesPerPixel; + + /* Get BPP directly from NV2A CRTC (magic constants are from Cromwell) */ + BytesPerPixel = 8 * (((NvGetCrtc(DeviceExtension, 0x19) & 0xE0) << 3) | (NvGetCrtc(DeviceExtension, 0x13) & 0xFF)) / ScreenWidth; + + if (BytesPerPixel == 4) + { + ASSERT((NvGetCrtc(DeviceExtension, 0x28) & 0xF) == BytesPerPixel - 1); + } + else + { + ASSERT((NvGetCrtc(DeviceExtension, 0x28) & 0xF) == BytesPerPixel); + } + + return BytesPerPixel; +} + /* * VBEQueryCurrentMode * @@ -498,49 +529,43 @@ XboxVmpQueryCurrentMode( PVIDEO_MODE_INFORMATION VideoMode, PSTATUS_BLOCK StatusBlock) { - ULONG AvMode = 0; + UCHAR BytesPerPixel; VideoMode->Length = sizeof(VIDEO_MODE_INFORMATION); VideoMode->ModeIndex = 0; - /* FIXME: don't use SMBus, obtain current video resolution directly from NV2A */ - if (I2CTransmitByteGetReturn(0x10, 0x04, &AvMode)) - { - if (AvMode == 1) /* HDTV */ - { - VideoMode->VisScreenWidth = 720; - } - else - { - /* FIXME Other possible values of AvMode: - * 0 - AV_SCART_RGB - * 2 - AV_VGA_SOG - * 4 - AV_SVIDEO - * 6 - AV_COMPOSITE - * 7 - AV_VGA - * other AV_COMPOSITE - */ - VideoMode->VisScreenWidth = 640; - } - } - else + VideoMode->VisScreenWidth = *((PULONG)((ULONG_PTR)DeviceExtension->VirtControlStart + NV2A_RAMDAC_FP_HVALID_END)) + 1; + VideoMode->VisScreenHeight = *((PULONG)((ULONG_PTR)DeviceExtension->VirtControlStart + NV2A_RAMDAC_FP_VVALID_END)) + 1; + + if (VideoMode->VisScreenWidth <= 1 || VideoMode->VisScreenHeight <= 1) { - VideoMode->VisScreenWidth = 640; + ERR_(IHVVIDEO, "Cannot obtain current screen resolution!\n"); + return FALSE; } - VideoMode->VisScreenHeight = 480; - VideoMode->ScreenStride = VideoMode->VisScreenWidth * 4; + BytesPerPixel = NvGetBytesPerPixel(DeviceExtension, VideoMode->VisScreenWidth); + ASSERT(BytesPerPixel >= 1 && BytesPerPixel <= 4); + + VideoMode->ScreenStride = VideoMode->VisScreenWidth * BytesPerPixel; VideoMode->NumberOfPlanes = 1; - VideoMode->BitsPerPlane = 32; + VideoMode->BitsPerPlane = BytesPerPixel * 8; VideoMode->Frequency = 1; VideoMode->XMillimeter = 0; /* FIXME */ VideoMode->YMillimeter = 0; /* FIXME */ - VideoMode->NumberRedBits = 8; - VideoMode->NumberGreenBits = 8; - VideoMode->NumberBlueBits = 8; - VideoMode->RedMask = 0xFF0000; - VideoMode->GreenMask = 0x00FF00; - VideoMode->BlueMask = 0x0000FF; + if (BytesPerPixel >= 3) + { + VideoMode->NumberRedBits = 8; + VideoMode->NumberGreenBits = 8; + VideoMode->NumberBlueBits = 8; + VideoMode->RedMask = 0xFF0000; + VideoMode->GreenMask = 0x00FF00; + VideoMode->BlueMask = 0x0000FF; + } + else + { + /* FIXME: not implemented */ + WARN_(IHVVIDEO, "BytesPerPixel %d - not implemented\n", BytesPerPixel); + } VideoMode->VideoMemoryBitmapWidth = VideoMode->VisScreenWidth; VideoMode->VideoMemoryBitmapHeight = VideoMode->VisScreenHeight; VideoMode->AttributeFlags = VIDEO_MODE_GRAPHICS | VIDEO_MODE_COLOR | @@ -549,6 +574,13 @@ XboxVmpQueryCurrentMode( StatusBlock->Information = sizeof(VIDEO_MODE_INFORMATION); + /* Verify that screen fits framebuffer size */ + if (VideoMode->VisScreenWidth * VideoMode->VisScreenHeight * (VideoMode->BitsPerPlane / 8) > NV2A_VIDEO_MEMORY_SIZE) + { + ERR_(IHVVIDEO, "Current screen resolution exceeds video memory bounds!\n"); + return FALSE; + } + return TRUE; } diff --git a/win32ss/drivers/miniport/xboxvmp/xboxvmp.h b/win32ss/drivers/miniport/xboxvmp/xboxvmp.h index 5742cef3e29..6365c5c1092 100644 --- a/win32ss/drivers/miniport/xboxvmp/xboxvmp.h +++ b/win32ss/drivers/miniport/xboxvmp/xboxvmp.h @@ -22,14 +22,13 @@ #include "miniport.h" #include "video.h" -#define I2C_IO_BASE 0xC000 -#define NV2A_CONTROL_FRAMEBUFFER_ADDRESS_OFFSET 0x600800 +#define NV2A_VIDEO_MEMORY_SIZE (4 * 1024 * 1024) -BOOLEAN -I2CTransmitByteGetReturn( - UCHAR bPicAddressI2cFormat, - UCHAR bDataToWrite, - ULONG *Return); +#define NV2A_CONTROL_FRAMEBUFFER_ADDRESS_OFFSET 0x600800 +#define NV2A_CRTC_REGISTER_INDEX 0x6013D4 +#define NV2A_CRTC_REGISTER_VALUE 0x6013D5 +#define NV2A_RAMDAC_FP_HVALID_END 0x680838 +#define NV2A_RAMDAC_FP_VVALID_END 0x680818 typedef struct {

4 years, 11 months

[reactos] 02/02: [FREELDR] Advance the file pointers every time a read operation is performed, in accordance with the ARC specification.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7909284220c291465de9e… commit 7909284220c291465de9ef02a9bbddf903fafe7f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Oct 9 02:26:29 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 9 03:26:48 2019 +0200 [FREELDR] Advance the file pointers every time a read operation is performed, in accordance with the ARC specification. --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 5 ++-- boot/freeldr/freeldr/disk/scsiport.c | 5 +++- boot/freeldr/freeldr/lib/fs/btrfs.c | 1 + boot/freeldr/freeldr/lib/fs/ext2.c | 10 +++---- boot/freeldr/freeldr/lib/fs/fat.c | 11 ++++---- boot/freeldr/freeldr/lib/fs/iso.c | 47 +++++++++++++++------------------ boot/freeldr/freeldr/lib/fs/ntfs.c | 1 + 7 files changed, 41 insertions(+), 39 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index 1717bdbd2dd..7aec1c3db99 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -157,8 +157,8 @@ DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); UCHAR* Ptr = (UCHAR*)Buffer; ULONG Length, TotalSectors, MaxSectors, ReadSectors; - BOOLEAN ret; ULONGLONG SectorOffset; + BOOLEAN ret; ASSERT(DiskReadBufferSize > 0); @@ -197,7 +197,8 @@ DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) TotalSectors -= ReadSectors; } - *Count = (ULONG)(Ptr - (UCHAR*)Buffer); + *Count = (ULONG)((ULONG_PTR)Ptr - (ULONG_PTR)Buffer); + Context->SectorNumber = SectorOffset - Context->SectorOffset; return (!ret) ? EIO : ESUCCESS; } diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index a42cadc6164..c9cff4bfd60 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -318,6 +318,7 @@ static ARC_STATUS DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) Buffer = (PUCHAR)Buffer + FullSectors * Context->SectorSize; N -= FullSectors * Context->SectorSize; *Count += FullSectors * Context->SectorSize; + Context->SectorNumber += FullSectors; Lba += FullSectors; } @@ -364,6 +365,7 @@ static ARC_STATUS DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) } RtlCopyMemory(Buffer, Sector, N); *Count += N; + /* Context->SectorNumber remains untouched (incomplete sector read) */ ExFreePool(Sector); } @@ -399,7 +401,8 @@ static ARC_STATUS DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekM return ESUCCESS; } -static const DEVVTBL DiskVtbl = { +static const DEVVTBL DiskVtbl = +{ DiskClose, DiskGetFileInformation, DiskOpen, diff --git a/boot/freeldr/freeldr/lib/fs/btrfs.c b/boot/freeldr/freeldr/lib/fs/btrfs.c index 16a861427c4..2f763f061f9 100644 --- a/boot/freeldr/freeldr/lib/fs/btrfs.c +++ b/boot/freeldr/freeldr/lib/fs/btrfs.c @@ -1201,6 +1201,7 @@ ARC_STATUS BtrFsRead(ULONG FileId, VOID *Buffer, ULONG Size, ULONG *BytesRead) return ENOENT; } + phandle->position += rd; *BytesRead = rd; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/ext2.c b/boot/freeldr/freeldr/lib/fs/ext2.c index 9d183488d68..6ab00f3d1ab 100644 --- a/boot/freeldr/freeldr/lib/fs/ext2.c +++ b/boot/freeldr/freeldr/lib/fs/ext2.c @@ -386,9 +386,8 @@ BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULO } // - // If they are trying to read past the - // end of the file then return success - // with BytesRead == 0 + // If the user is trying to read past the end of + // the file then return success with BytesRead == 0. // if (Ext2FileInfo->FilePointer >= Ext2FileInfo->FileSize) { @@ -396,8 +395,8 @@ BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULO } // - // If they are trying to read more than there is to read - // then adjust the amount to read + // If the user is trying to read more than there is to read + // then adjust the amount to read. // if ((Ext2FileInfo->FilePointer + BytesToRead) > Ext2FileInfo->FileSize) { @@ -418,6 +417,7 @@ BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULO { *BytesRead = BytesToRead; } + // Ext2FileInfo->FilePointer += BytesToRead; return TRUE; } diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index 35233c414b5..4c3358b9f2b 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -1206,9 +1206,8 @@ BOOLEAN FatReadFile(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesR } // - // If they are trying to read past the - // end of the file then return success - // with BytesRead == 0 + // If the user is trying to read past the end of + // the file then return success with BytesRead == 0. // if (FatFileInfo->FilePointer >= FatFileInfo->FileSize) { @@ -1216,8 +1215,8 @@ BOOLEAN FatReadFile(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesR } // - // If they are trying to read more than there is to read - // then adjust the amount to read + // If the user is trying to read more than there is to read + // then adjust the amount to read. // if ((FatFileInfo->FilePointer + BytesToRead) > FatFileInfo->FileSize) { @@ -1489,7 +1488,7 @@ ARC_STATUS FatSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) case SeekAbsolute: break; case SeekRelative: - NewPosition.QuadPart += (UINT64)FileHandle->FilePointer; + NewPosition.QuadPart += (ULONGLONG)FileHandle->FilePointer; break; default: ASSERT(FALSE); diff --git a/boot/freeldr/freeldr/lib/fs/iso.c b/boot/freeldr/freeldr/lib/fs/iso.c index 6c08d32a0e9..ba7c57f38d4 100644 --- a/boot/freeldr/freeldr/lib/fs/iso.c +++ b/boot/freeldr/freeldr/lib/fs/iso.c @@ -75,7 +75,7 @@ static BOOLEAN IsoSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG Dire IsoFileInfoPointer->FileStart = Record->ExtentLocationL; IsoFileInfoPointer->FileSize = Record->DataLengthL; IsoFileInfoPointer->FilePointer = 0; - IsoFileInfoPointer->Directory = (Record->FileFlags & 0x02)?TRUE:FALSE; + IsoFileInfoPointer->Directory = !!(Record->FileFlags & 0x02); return TRUE; } @@ -292,17 +292,16 @@ ARC_STATUS IsoOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) ARC_STATUS IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { + ARC_STATUS Status; PISO_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); UCHAR SectorBuffer[SECTORSIZE]; LARGE_INTEGER Position; ULONG DeviceId; - ULONG FilePointer; - ULONG SectorNumber; - ULONG OffsetInSector; - ULONG LengthInSector; - ULONG NumberOfSectors; + ULONG SectorNumber; + ULONG OffsetInSector; + ULONG LengthInSector; + ULONG NumberOfSectors; ULONG BytesRead; - ARC_STATUS Status; TRACE("IsoRead() Buffer = %p, N = %lu\n", Buffer, N); @@ -310,23 +309,21 @@ ARC_STATUS IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) *Count = 0; // - // If they are trying to read past the - // end of the file then return success - // with Count == 0 + // If the user is trying to read past the end of + // the file then return success with Count == 0. // - FilePointer = FileHandle->FilePointer; - if (FilePointer >= FileHandle->FileSize) + if (FileHandle->FilePointer >= FileHandle->FileSize) { return ESUCCESS; } // - // If they are trying to read more than there is to read - // then adjust the amount to read + // If the user is trying to read more than there is to read + // then adjust the amount to read. // - if (FilePointer + N > FileHandle->FileSize) + if (FileHandle->FilePointer + N > FileHandle->FileSize) { - N = FileHandle->FileSize - FilePointer; + N = FileHandle->FileSize - FileHandle->FilePointer; } // @@ -362,14 +359,14 @@ ARC_STATUS IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) // Only do the first read if we // aren't aligned on a cluster boundary // - if (FilePointer % SECTORSIZE) + if (FileHandle->FilePointer % SECTORSIZE) { // // Do the math for our first read // - SectorNumber = FileHandle->FileStart + (FilePointer / SECTORSIZE); - OffsetInSector = FilePointer % SECTORSIZE; - LengthInSector = (N > (SECTORSIZE - OffsetInSector)) ? (SECTORSIZE - OffsetInSector) : N; + SectorNumber = FileHandle->FileStart + (FileHandle->FilePointer / SECTORSIZE); + OffsetInSector = FileHandle->FilePointer % SECTORSIZE; + LengthInSector = min(N, SECTORSIZE - OffsetInSector); // // Now do the read and update Count, N, FilePointer, & Buffer @@ -389,7 +386,7 @@ ARC_STATUS IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) RtlCopyMemory(Buffer, SectorBuffer + OffsetInSector, LengthInSector); *Count += LengthInSector; N -= LengthInSector; - FilePointer += LengthInSector; + FileHandle->FilePointer += LengthInSector; Buffer = (PVOID)((ULONG_PTR)Buffer + LengthInSector); } @@ -403,7 +400,7 @@ ARC_STATUS IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) // NumberOfSectors = (N / SECTORSIZE); - SectorNumber = FileHandle->FileStart + (FilePointer / SECTORSIZE); + SectorNumber = FileHandle->FileStart + (FileHandle->FilePointer / SECTORSIZE); // // Now do the read and update Count, N, FilePointer, & Buffer @@ -423,7 +420,7 @@ ARC_STATUS IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) *Count += NumberOfSectors * SECTORSIZE; N -= NumberOfSectors * SECTORSIZE; - FilePointer += NumberOfSectors * SECTORSIZE; + FileHandle->FilePointer += NumberOfSectors * SECTORSIZE; Buffer = (PVOID)((ULONG_PTR)Buffer + NumberOfSectors * SECTORSIZE); } @@ -432,7 +429,7 @@ ARC_STATUS IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) // if (N > 0) { - SectorNumber = FileHandle->FileStart + (FilePointer / SECTORSIZE); + SectorNumber = FileHandle->FileStart + (FileHandle->FilePointer / SECTORSIZE); // // Now do the read and update Count, N, FilePointer, & Buffer @@ -451,7 +448,7 @@ ARC_STATUS IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) } RtlCopyMemory(Buffer, SectorBuffer, N); *Count += N; - FilePointer += N; + FileHandle->FilePointer += N; } TRACE("IsoRead() done\n"); diff --git a/boot/freeldr/freeldr/lib/fs/ntfs.c b/boot/freeldr/freeldr/lib/fs/ntfs.c index bc2e6bfee86..233a2e5ac23 100644 --- a/boot/freeldr/freeldr/lib/fs/ntfs.c +++ b/boot/freeldr/freeldr/lib/fs/ntfs.c @@ -832,6 +832,7 @@ ARC_STATUS NtfsRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) // Read file // BytesRead64 = NtfsReadAttribute(FileHandle->Volume, FileHandle->DataContext, FileHandle->Offset, Buffer, N); + FileHandle->Offset += BytesRead64; *Count = (ULONG)BytesRead64; //

4 years, 11 months

[reactos] 01/02: [FREELDR] Improvements for the RamDisk support.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db15c921e8f92b7bad319… commit db15c921e8f92b7bad319df4962e255087a8ca94 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 13 19:04:06 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 9 03:26:41 2019 +0200 [FREELDR] Improvements for the RamDisk support. - Implement support for the "RDIMAGELENGTH" and "RDIMAGEOFFSET" boot options. Fixes CORE-15432. - Separate the initialization of the global gInitRamDiskBase / gInitRamDiskSize variables from the FreeLdr command-line, and the actual initialization of the internal variables of the RamDisk. The latter are initialized via calls to RamDiskInitialize(). - Implement 'SeekRelative' mode in RamDiskSeek(). - Make RamDiskLoadVirtualFile() internal function that gets called by RamDiskInitialize(), and we use the latter in the NT loader instead. --- boot/freeldr/freeldr/arch/arm/macharm.c | 4 +- boot/freeldr/freeldr/cmdline.c | 10 +- boot/freeldr/freeldr/disk/ramdisk.c | 230 +++++++++++++++++++++----------- boot/freeldr/freeldr/include/ramdisk.h | 26 ++-- boot/freeldr/freeldr/ntldr/setupldr.c | 14 +- boot/freeldr/freeldr/ntldr/winldr.c | 18 +-- 6 files changed, 182 insertions(+), 120 deletions(-) diff --git a/boot/freeldr/freeldr/arch/arm/macharm.c b/boot/freeldr/freeldr/arch/arm/macharm.c index d38a38924f7..cfca3b17169 100644 --- a/boot/freeldr/freeldr/arch/arm/macharm.c +++ b/boot/freeldr/freeldr/arch/arm/macharm.c @@ -120,8 +120,8 @@ ArmHwDetect(VOID) SecondLevelIcacheSize = SecondLevelIcacheFillSize = 0; - /* Register RAMDISK Device */ - RamDiskInitialize(); + /* Initialize the RAMDISK Device */ + RamDiskInitialize(TRUE, NULL, NULL); /* Fill out the ARC disk block */ AddReactOSArcDiskInfo("ramdisk(0)", 0xBADAB00F, 0xDEADBABE, TRUE); diff --git a/boot/freeldr/freeldr/cmdline.c b/boot/freeldr/freeldr/cmdline.c index b7ac90dd274..c41466e6163 100644 --- a/boot/freeldr/freeldr/cmdline.c +++ b/boot/freeldr/freeldr/cmdline.c @@ -91,7 +91,7 @@ CmdLineParse(IN PCSTR CmdLine) Setting = strstr(CmdLine, "rdbase="); if (Setting) { - gRamDiskBase = + gInitRamDiskBase = (PVOID)(ULONG_PTR)strtoull(Setting + sizeof("rdbase=") - sizeof(ANSI_NULL), NULL, 0); @@ -101,9 +101,9 @@ CmdLineParse(IN PCSTR CmdLine) Setting = strstr(CmdLine, "rdsize="); if (Setting) { - gRamDiskSize = strtoul(Setting + - sizeof("rdsize=") - sizeof(ANSI_NULL), - NULL, 0); + gInitRamDiskSize = strtoul(Setting + + sizeof("rdsize=") - sizeof(ANSI_NULL), + NULL, 0); } /* Get ramdisk offset */ @@ -116,7 +116,7 @@ CmdLineParse(IN PCSTR CmdLine) } /* Fix it up */ - gRamDiskBase = (PVOID)((ULONG_PTR)gRamDiskBase + Offset); + gInitRamDiskBase = (PVOID)((ULONG_PTR)gInitRamDiskBase + Offset); } PCSTR diff --git a/boot/freeldr/freeldr/disk/ramdisk.c b/boot/freeldr/freeldr/disk/ramdisk.c index 905c40941fa..78503649a49 100644 --- a/boot/freeldr/freeldr/disk/ramdisk.c +++ b/boot/freeldr/freeldr/disk/ramdisk.c @@ -1,51 +1,48 @@ /* - * PROJECT: ReactOS Boot Loader - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/freeldr/freeldr/disk/ramdisk.c - * PURPOSE: Implements routines to support booting from a RAM Disk - * PROGRAMMERS: ReactOS Portable Systems Group - * Herv� Poussineau + * PROJECT: FreeLoader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * PURPOSE: Implements routines to support booting from a RAM Disk. + * COPYRIGHT: Copyright 2008 ReactOS Portable Systems Group + * Copyright 2009 Hervé Poussineau + * Copyright 2019 Hermes Belusca-Maito */ /* INCLUDES *******************************************************************/ #include <freeldr.h> -#include <debug.h> - /* GLOBALS ********************************************************************/ -PVOID gRamDiskBase; -ULONG gRamDiskSize; -ULONG gRamDiskOffset; +PVOID gInitRamDiskBase = NULL; +ULONG gInitRamDiskSize = 0; + +static BOOLEAN RamDiskDeviceRegistered = FALSE; +static PVOID RamDiskBase; +static ULONGLONG RamDiskFileSize; // FIXME: RAM disks currently limited to 4GB. +static ULONGLONG RamDiskImageLength; // Size of valid data in the Ramdisk (usually == RamDiskFileSize - RamDiskImageOffset) +static ULONG RamDiskImageOffset; // Starting offset from the Ramdisk base. +static ULONGLONG RamDiskOffset; // Current position in the Ramdisk. /* FUNCTIONS ******************************************************************/ static ARC_STATUS RamDiskClose(ULONG FileId) { - // - // Nothing to do - // + /* Nothing to do */ return ESUCCESS; } static ARC_STATUS RamDiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { - // - // Give current seek offset and ram disk size to caller - // RtlZeroMemory(Information, sizeof(*Information)); - Information->EndingAddress.LowPart = gRamDiskSize; - Information->CurrentAddress.LowPart = gRamDiskOffset; + Information->EndingAddress.QuadPart = RamDiskImageLength; + Information->CurrentAddress.QuadPart = RamDiskOffset; return ESUCCESS; } static ARC_STATUS RamDiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { - // - // Always return success, as contents are already in memory - // + /* Always return success, as contents are already in memory */ return ESUCCESS; } @@ -53,24 +50,20 @@ static ARC_STATUS RamDiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { PVOID StartAddress; - // - // Get actual pointer - // - StartAddress = (PVOID)((ULONG_PTR)gRamDiskBase + gRamDiskOffset); - - // - // Don't allow reads past our image - // - if (gRamDiskOffset + N > gRamDiskSize) + /* Don't allow reads past our image */ + if (RamDiskOffset >= RamDiskImageLength || RamDiskOffset + N > RamDiskImageLength) { *Count = 0; return EIO; } + // N = min(N, RamdiskImageLength - RamDiskOffset); - // - // Do the read - // + /* Get actual pointer */ + StartAddress = (PVOID)((ULONG_PTR)RamDiskBase + RamDiskImageOffset + (ULONG_PTR)RamDiskOffset); + + /* Do the read */ RtlCopyMemory(Buffer, StartAddress, N); + RamDiskOffset += N; *Count = N; return ESUCCESS; @@ -78,29 +71,29 @@ static ARC_STATUS RamDiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) static ARC_STATUS RamDiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { - // - // Only accept absolute mode now - // - if (SeekMode != SeekAbsolute) - return EINVAL; + LARGE_INTEGER NewPosition = *Position; - // - // Check if we're in the ramdisk - // - if (Position->HighPart != 0) - return EINVAL; - if (Position->LowPart >= gRamDiskSize) - return EINVAL; + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += RamDiskOffset; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - // - // OK, remember seek position - // - gRamDiskOffset = Position->LowPart; + if (NewPosition.QuadPart >= RamDiskImageLength) + return EINVAL; + RamDiskOffset = NewPosition.QuadPart; return ESUCCESS; } -static const DEVVTBL RamDiskVtbl = { +static const DEVVTBL RamDiskVtbl = +{ RamDiskClose, RamDiskGetFileInformation, RamDiskOpen, @@ -108,21 +101,15 @@ static const DEVVTBL RamDiskVtbl = { RamDiskSeek, }; -VOID -RamDiskInitialize(VOID) -{ - /* Register the RAMDISK device */ - FsRegisterDevice("ramdisk(0)", &RamDiskVtbl); -} - -ARC_STATUS +static ARC_STATUS RamDiskLoadVirtualFile( IN PCSTR FileName, IN PCSTR DefaultPath OPTIONAL) { ARC_STATUS Status; ULONG RamFileId; - ULONG TotalRead, ChunkSize, Count; + ULONG ChunkSize, Count; + ULONGLONG TotalRead; PCHAR MsgBuffer = "Loading RamDisk..."; ULONG PercentPerChunk, Percent; FILEINFORMATION Information; @@ -132,7 +119,7 @@ RamDiskLoadVirtualFile( UiDrawBackdrop(); UiDrawProgressBarCenter(1, 100, MsgBuffer); - /* Try opening the ramdisk file */ + /* Try opening the Ramdisk file */ Status = FsOpenFile(FileName, DefaultPath, OpenReadOnly, &RamFileId); if (Status != ESUCCESS) return Status; @@ -145,23 +132,24 @@ RamDiskLoadVirtualFile( return Status; } - /* For now, limit RAM disks to 4GB */ + /* FIXME: For now, limit RAM disks to 4GB */ if (Information.EndingAddress.HighPart != 0) { UiMessageBox("RAM disk too big."); ArcClose(RamFileId); return ENOMEM; } - gRamDiskSize = Information.EndingAddress.LowPart; + RamDiskFileSize = Information.EndingAddress.QuadPart; + ASSERT(RamDiskFileSize < 0x100000000); // See FIXME above. /* Allocate memory for it */ ChunkSize = 8 * 1024 * 1024; - if (gRamDiskSize < ChunkSize) + if (RamDiskFileSize < ChunkSize) Percent = PercentPerChunk = 0; else - Percent = PercentPerChunk = 100 / (gRamDiskSize / ChunkSize); - gRamDiskBase = MmAllocateMemoryWithType(gRamDiskSize, LoaderXIPRom); - if (!gRamDiskBase) + Percent = PercentPerChunk = 100 / (RamDiskFileSize / ChunkSize); + RamDiskBase = MmAllocateMemoryWithType(RamDiskFileSize, LoaderXIPRom); + if (!RamDiskBase) { UiMessageBox("Failed to allocate memory for RAM disk."); ArcClose(RamFileId); @@ -171,13 +159,13 @@ RamDiskLoadVirtualFile( /* * Read it in chunks */ - for (TotalRead = 0; TotalRead < gRamDiskSize; TotalRead += ChunkSize) + for (TotalRead = 0; TotalRead < RamDiskFileSize; TotalRead += ChunkSize) { /* Check if we're at the last chunk */ - if ((gRamDiskSize - TotalRead) < ChunkSize) + if ((RamDiskFileSize - TotalRead) < ChunkSize) { /* Only need the actual data required */ - ChunkSize = gRamDiskSize - TotalRead; + ChunkSize = (ULONG)(RamDiskFileSize - TotalRead); } /* Draw progress */ @@ -185,13 +173,12 @@ RamDiskLoadVirtualFile( Percent += PercentPerChunk; /* Copy the contents */ - Position.HighPart = 0; - Position.LowPart = TotalRead; + Position.QuadPart = TotalRead; Status = ArcSeek(RamFileId, &Position, SeekAbsolute); if (Status == ESUCCESS) { Status = ArcRead(RamFileId, - (PVOID)((ULONG_PTR)gRamDiskBase + TotalRead), + (PVOID)((ULONG_PTR)RamDiskBase + (ULONG_PTR)TotalRead), ChunkSize, &Count); } @@ -199,9 +186,9 @@ RamDiskLoadVirtualFile( /* Check for success */ if ((Status != ESUCCESS) || (Count != ChunkSize)) { - MmFreeMemory(gRamDiskBase); - gRamDiskBase = NULL; - gRamDiskSize = 0; + MmFreeMemory(RamDiskBase); + RamDiskBase = NULL; + RamDiskFileSize = 0; ArcClose(RamFileId); UiMessageBox("Failed to read RAM disk."); return ((Status != ESUCCESS) ? Status : EIO); @@ -210,8 +197,95 @@ RamDiskLoadVirtualFile( ArcClose(RamFileId); - /* Setup the RAMDISK device */ - RamDiskInitialize(); + return ESUCCESS; +} + +ARC_STATUS +RamDiskInitialize( + IN BOOLEAN InitRamDisk, + IN PCSTR LoadOptions OPTIONAL, + IN PCSTR DefaultPath OPTIONAL) +{ + /* Reset the RAMDISK device */ + if ((RamDiskBase != gInitRamDiskBase) && + (RamDiskFileSize != gInitRamDiskSize) && + (gInitRamDiskSize != 0)) + { + /* This is not the initial Ramdisk, so we can free the allocated memory */ + MmFreeMemory(RamDiskBase); + } + RamDiskBase = NULL; + RamDiskFileSize = 0; + RamDiskImageLength = 0; + RamDiskImageOffset = 0; + RamDiskOffset = 0; + + if (InitRamDisk) + { + /* We initialize the initial Ramdisk: it should be present in memory */ + if (!gInitRamDiskBase || gInitRamDiskSize == 0) + return ENODEV; + + // TODO: Handle SDI image. + + RamDiskBase = gInitRamDiskBase; + RamDiskFileSize = gInitRamDiskSize; + ASSERT(RamDiskFileSize < 0x100000000); // See FIXME about 4GB support in RamDiskLoadVirtualFile(). + } + else + { + /* We initialize the Ramdisk from the load options */ + ARC_STATUS Status; + CHAR FileName[MAX_PATH] = ""; + + /* If we don't have any load options, initialize an empty Ramdisk */ + if (LoadOptions) + { + PCHAR Option; + + /* Ramdisk image file name */ + Option = strstr(LoadOptions, "/RDPATH="); + if (Option) + { + /* Copy the file name - everything until the next separator */ + Option += 8; + RtlStringCbCopyNA(FileName, sizeof(FileName), + Option, strcspn(Option, " \t") * sizeof(CHAR)); + } + + /* Ramdisk image length */ + Option = strstr(LoadOptions, "/RDIMAGELENGTH="); + if (Option) + { + RamDiskImageLength = _atoi64(Option + 15); + } + + /* Ramdisk image offset */ + Option = strstr(LoadOptions, "/RDIMAGEOFFSET="); + if (Option) + { + RamDiskImageOffset = atol(Option + 15); + } + } + + if (*FileName) + { + Status = RamDiskLoadVirtualFile(FileName, DefaultPath); + if (Status != ESUCCESS) + return Status; + } + } + + /* Adjust the Ramdisk image length if needed */ + if (!RamDiskImageLength || (RamDiskImageLength > RamDiskFileSize - RamDiskImageOffset)) + RamDiskImageLength = RamDiskFileSize - RamDiskImageOffset; + + /* Register the RAMDISK device */ + if (!RamDiskDeviceRegistered) + { + FsRegisterDevice("ramdisk(0)", &RamDiskVtbl); + RamDiskDeviceRegistered = TRUE; + } return ESUCCESS; } diff --git a/boot/freeldr/freeldr/include/ramdisk.h b/boot/freeldr/freeldr/include/ramdisk.h index a9dd199feb2..c3d9740aa7f 100644 --- a/boot/freeldr/freeldr/include/ramdisk.h +++ b/boot/freeldr/freeldr/include/ramdisk.h @@ -1,23 +1,19 @@ /* - * PROJECT: ReactOS Boot Loader - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/freeldr/freeldr/include/ramdisk.h - * PURPOSE: Header file for ramdisk support - * PROGRAMMERS: ReactOS Portable Systems Group + * PROJECT: FreeLoader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * PURPOSE: Header file for ramdisk support. + * COPYRIGHT: Copyright 2008 ReactOS Portable Systems Group + * Copyright 2009 Hervé Poussineau + * Copyright 2019 Hermes Belusca-Maito */ #pragma once -// -// Ramdisk Routines -// ARC_STATUS -RamDiskLoadVirtualFile( - IN PCSTR FileName, +RamDiskInitialize( + IN BOOLEAN InitRamDisk, + IN PCSTR LoadOptions OPTIONAL, IN PCSTR DefaultPath OPTIONAL); -VOID -RamDiskInitialize(VOID); - -extern PVOID gRamDiskBase; -extern ULONG gRamDiskSize; +extern PVOID gInitRamDiskBase; +extern ULONG gInitRamDiskSize; diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 1d87f082b57..2010a2718db 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -284,17 +284,13 @@ LoadReactOSSetup( File = strstr(BootOptions2, "/RDPATH="); if (File) { - /* Copy the file name and everything else after it */ - RtlStringCbCopyA(FileName, sizeof(FileName), File + 8); - - /* Null-terminate */ - *strstr(FileName, " ") = ANSI_NULL; - /* Load the ramdisk */ - Status = RamDiskLoadVirtualFile(FileName, SystemPartition); + Status = RamDiskInitialize(FALSE, BootOptions2, SystemPartition); if (Status != ESUCCESS) { - UiMessageBox("Failed to load RAM disk file %s", FileName); + File += 8; + UiMessageBox("Failed to load RAM disk file '%.*s'", + strcspn(File, " \t"), File); return Status; } } @@ -323,7 +319,7 @@ LoadReactOSSetup( TRACE("BootPath: '%s', SystemPath: '%s'\n", BootPath, SystemPath); - /* Get Load options - debug and non-debug */ + /* Get load options - debug and non-debug */ if (!InfFindFirstLine(InfHandle, "SetupData", "OsLoadOptions", &InfContext)) { ERR("Failed to find 'SetupData/OsLoadOptions'\n"); diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 5eeff108e55..bf1d0658f45 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -731,9 +731,9 @@ LoadAndBootWindows( BOOLEAN Success; USHORT OperatingSystemVersion; PLOADER_PARAMETER_BLOCK LoaderBlock; - CHAR BootPath[MAX_PATH]; - CHAR FileName[MAX_PATH]; - CHAR BootOptions[256]; + CHAR BootPath[MAX_PATH]; + CHAR FileName[MAX_PATH]; + CHAR BootOptions[256]; /* Retrieve the (mandatory) boot type */ ArgValue = GetArgumentValue(Argc, Argv, "BootType"); @@ -852,17 +852,13 @@ LoadAndBootWindows( File = strstr(BootOptions, "/RDPATH="); if (File) { - /* Copy the file name and everything else after it */ - RtlStringCbCopyA(FileName, sizeof(FileName), File + 8); - - /* Null-terminate */ - *strstr(FileName, " ") = ANSI_NULL; - /* Load the ramdisk */ - Status = RamDiskLoadVirtualFile(FileName, SystemPartition); + Status = RamDiskInitialize(FALSE, BootOptions, SystemPartition); if (Status != ESUCCESS) { - UiMessageBox("Failed to load RAM disk file %s", FileName); + File += 8; + UiMessageBox("Failed to load RAM disk file '%.*s'", + strcspn(File, " \t"), File); return Status; } }

4 years, 11 months

[reactos] 01/01: [FREELDR] Xbox memory management improvements (#1961)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=034820ca552437db68079… commit 034820ca552437db68079f5d23b078262183bece Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Oct 9 03:35:07 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 9 02:35:07 2019 +0200 [FREELDR] Xbox memory management improvements (#1961) - Reuse the framebuffer address that was set up by the firmware. - Get rid of XboxMemReserveMemory() and use ReserveMemory() instead. CORE-16216 --- boot/freeldr/freeldr/arch/i386/xboxmem.c | 48 +++++++++-------------- boot/freeldr/freeldr/arch/i386/xboxvideo.c | 15 ++++--- boot/freeldr/freeldr/include/arch/i386/machxbox.h | 1 - 3 files changed, 29 insertions(+), 35 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/xboxmem.c b/boot/freeldr/freeldr/arch/i386/xboxmem.c index 2d6890ea78e..bf7721dc32c 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxmem.c +++ b/boot/freeldr/freeldr/arch/i386/xboxmem.c @@ -26,6 +26,8 @@ DBG_DEFAULT_CHANNEL(MEMORY); static ULONG InstalledMemoryMb = 0; static ULONG AvailableMemoryMb = 0; +extern PVOID FrameBuffer; +extern ULONG FrameBufferSize; #define TEST_SIZE 0x200 #define TEST_PATTERN1 0xAA @@ -38,6 +40,14 @@ SetMemory( SIZE_T Size, TYPE_OF_MEMORY MemoryType); +extern VOID +ReserveMemory( + PFREELDR_MEMORY_DESCRIPTOR MemoryMap, + ULONG_PTR BaseAddress, + SIZE_T Size, + TYPE_OF_MEMORY MemoryType, + PCHAR Usage); + extern ULONG PcMemFinalizeMemoryMap( PFREELDR_MEMORY_DESCRIPTOR MemoryMap); @@ -85,7 +95,6 @@ XboxMemInit(VOID) WRITE_PORT_ULONG((ULONG*) 0xcf8, CONFIG_CMD(0, 0, 0x84)); WRITE_PORT_ULONG((ULONG*) 0xcfc, InstalledMemoryMb * 1024 * 1024 - 1); - /* 4 MB video framebuffer is reserved later using XboxMemReserveMemory() */ AvailableMemoryMb = InstalledMemoryMb; } @@ -105,37 +114,18 @@ XboxMemGetMemoryMap(ULONG *MemoryMapSize) AvailableMemoryMb * 1024 * 1024, LoaderFree); - /* Video memory */ - SetMemory(XboxMemoryMap, - AvailableMemoryMb * 1024 * 1024, - (InstalledMemoryMb - AvailableMemoryMb) * 1024 * 1024, - LoaderFirmwarePermanent); - - *MemoryMapSize = PcMemFinalizeMemoryMap(XboxMemoryMap); - return XboxMemoryMap; -} - -PVOID -XboxMemReserveMemory(ULONG MbToReserve) -{ - /* This function is used to reserve video framebuffer in XboxVideoInit() */ - - if (InstalledMemoryMb == 0) - { - /* Hmm, seems we're not initialized yet */ - XboxMemInit(); - } - - if (MbToReserve > AvailableMemoryMb) + if (FrameBufferSize != 0) { - /* Can't satisfy the request */ - return NULL; + /* Video memory */ + ReserveMemory(XboxMemoryMap, + (ULONG_PTR)FrameBuffer, + FrameBufferSize, + LoaderFirmwarePermanent, + "Video memory"); } - AvailableMemoryMb -= MbToReserve; - - /* Top of available memory points to the space just reserved */ - return (PVOID)(AvailableMemoryMb * 1024 * 1024); + *MemoryMapSize = PcMemFinalizeMemoryMap(XboxMemoryMap); + return XboxMemoryMap; } /* EOF */ diff --git a/boot/freeldr/freeldr/arch/i386/xboxvideo.c b/boot/freeldr/freeldr/arch/i386/xboxvideo.c index bcb70d0ce10..c664eef5d3c 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxvideo.c +++ b/boot/freeldr/freeldr/arch/i386/xboxvideo.c @@ -24,7 +24,8 @@ DBG_DEFAULT_CHANNEL(UI); -static PVOID FrameBuffer; +PVOID FrameBuffer; +ULONG FrameBufferSize; static ULONG ScreenWidth; static ULONG ScreenHeight; static ULONG BytesPerPixel; @@ -126,8 +127,15 @@ XboxVideoInit(VOID) { ULONG AvMode; - FrameBuffer = (PVOID)((ULONG) XboxMemReserveMemory(FB_SIZE_MB) | 0xf0000000); + /* Reuse framebuffer that was set up by firmware */ + FrameBuffer = (PVOID)*((PULONG) 0xfd600800); + /* Verify that framebuffer address is page-aligned */ + ASSERT((ULONG_PTR)FrameBuffer % PAGE_SIZE == 0); + /* FIXME: obtain fb size from firmware somehow (Cromwell reserves high 4 MB of RAM) */ + FrameBufferSize = 4 * 1024 * 1024; + + /* FIXME: don't use SMBus, obtain current video resolution directly from NV2A */ if (I2CTransmitByteGetReturn(0x10, 0x04, &AvMode)) { if (1 == AvMode) /* HDTV */ @@ -157,9 +165,6 @@ XboxVideoInit(VOID) Delta = (ScreenWidth * BytesPerPixel + 3) & ~ 0x3; XboxVideoClearScreenColor(MAKE_COLOR(0, 0, 0), TRUE); - - /* Tell the nVidia controller about the framebuffer */ - *((PULONG) 0xfd600800) = (ULONG) FrameBuffer; } VIDEODISPLAYMODE diff --git a/boot/freeldr/freeldr/include/arch/i386/machxbox.h b/boot/freeldr/freeldr/include/arch/i386/machxbox.h index f481bbde8f9..393f3a900e2 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machxbox.h +++ b/boot/freeldr/freeldr/include/arch/i386/machxbox.h @@ -63,7 +63,6 @@ VOID XboxVideoPrepareForReactOS(VOID); VOID XboxPrepareForReactOS(VOID); VOID XboxMemInit(VOID); -PVOID XboxMemReserveMemory(ULONG MbToReserve); PFREELDR_MEMORY_DESCRIPTOR XboxMemGetMemoryMap(ULONG *MemoryMapSize); BOOLEAN XboxDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer);

4 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2019