Ros-diffs January 2016

ros-diffs@reactos.org

13 participants
192 discussions

[akhaldi] 70519: [0.4.0] * Thank you for everything Colin! aka merge r70501.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 7 11:57:13 2016 New Revision: 70519 URL: http://svn.reactos.org/svn/reactos?rev=70519&view=rev Log: [0.4.0] * Thank you for everything Colin! aka merge r70501. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/CREDITS Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 7 11:57:13 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480,70497,70499-70500,70510 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480,70497,70499-70501,70510 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 7 11:57:13 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480,70497,70510 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480,70497,70501,70510 Modified: branches/ros-branch-0_4_0/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/CREDIT… ============================================================================== --- branches/ros-branch-0_4_0/reactos/CREDITS [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/CREDITS [iso-8859-1] Thu Jan 7 11:57:13 2016 @@ -13,6 +13,7 @@ Cameron M. Gutman <cgutman(a)reactos.org> Casper S. Hornstrup <chorns(a)users.sourceforge.net> Christoph von Wittich <christoph_vw(a)reactos.org> +Colin Finck <colin(a)reactos.org> Daniel Reimer <reimer.daniel(a)freenet.de> David Welch <welch(a)cwcom.net> Dmitry Chapyshev <dmitry(a)reactos.org>

8 years, 11 months

[akhaldi] 70518: [0.4.0] * Merge the recent rosvboxmgmt work by Pierre in revisions 70499, 70500 and 70510. CORE-10032 ROSAPPS-303

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 7 11:55:44 2016 New Revision: 70518 URL: http://svn.reactos.org/svn/reactos?rev=70518&view=rev Log: [0.4.0] * Merge the recent rosvboxmgmt work by Pierre in revisions 70499, 70500 and 70510. CORE-10032 ROSAPPS-303 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/boot/bootdata/hivesft.inf branches/ros-branch-0_4_0/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt branches/ros-branch-0_4_0/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 7 11:55:44 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480,70497 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480,70497,70499-70500,70510 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 7 11:55:44 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480,70497 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480,70497,70510 Modified: branches/ros-branch-0_4_0/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_4_0/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Thu Jan 7 11:55:44 2016 @@ -140,6 +140,9 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd /c md ""%programfiles%\Internet Explorer\"" && move %windir%\iexplore.exe ""%programfiles%\Internet Explorer\"" && ""%programfiles%\Internet Explorer\iexplore.exe"" /RegServer" ; Create .NET Framework InstallRoot key, reg_sz & full path HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd /c reg add HKLM\SOFTWARE\Microsoft\.NETFramework /v InstallRoot /t REG_SZ /d %SystemRoot%\Microsoft.NET\Framework\" + +; HACK - Start rosvboxmgmt - ROSAPPS-303 +;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","Handle VBox SF",0x00000000,"%windir%\bin\rosvboxmgmt auto" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu",,0x00000012 Modified: branches/ros-branch-0_4_0/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rosapps/applic… ============================================================================== --- branches/ros-branch-0_4_0/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt [iso-8859-1] Thu Jan 7 11:55:44 2016 @@ -1,4 +1,6 @@ add_executable(rosvboxmgmt rosvboxmgmt.c rosvboxmgmt.rc) set_module_type(rosvboxmgmt win32cui UNICODE) -add_importlibs(rosvboxmgmt msvcrt kernel32) +target_link_libraries(rosvboxmgmt uuid) +add_delay_importlibs(rosvboxmgmt shell32) +add_importlibs(rosvboxmgmt msvcrt kernel32 user32 ole32) add_cd_file(TARGET rosvboxmgmt DESTINATION reactos/bin FOR all) Modified: branches/ros-branch-0_4_0/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/rosapps/applic… ============================================================================== --- branches/ros-branch-0_4_0/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] Thu Jan 7 11:55:44 2016 @@ -9,9 +9,14 @@ #include <stdio.h> #include <wchar.h> #include <windows.h> +#include <shlobj.h> +#include <shobjidl.h> +#include <shlwapi.h> /* DON'T CHANGE ORDER!!!! */ PCWSTR devices[3] = { L"\\\\.\\VBoxMiniRdrDN", L"\\??\\VBoxMiniRdrDN", L"\\Device\\VBoxMiniRdr" }; + +#define MAX_LEN 255 /* Taken from VBox header */ #define _MRX_MAX_DRIVE_LETTERS 26 @@ -21,6 +26,7 @@ #define IOCTL_MRX_VBOX_ADDCONN _MRX_VBOX_CONTROL_CODE(100, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_MRX_VBOX_GETLIST _MRX_VBOX_CONTROL_CODE(103, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_MRX_VBOX_GETGLOBALLIST _MRX_VBOX_CONTROL_CODE(104, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MRX_VBOX_GETGLOBALCONN _MRX_VBOX_CONTROL_CODE(105, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_MRX_VBOX_START _MRX_VBOX_CONTROL_CODE(106, METHOD_BUFFERED, FILE_ANY_ACCESS) BOOL performDevIoCtl(DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize) @@ -120,6 +126,21 @@ return 0; } +PCWSTR getGlobalConn(CHAR id) +{ + BOOL ret; + static WCHAR name[MAX_LEN]; + + ret = performDevIoCtl(IOCTL_MRX_VBOX_GETGLOBALCONN, &id, sizeof(id), name, sizeof(name)); + if (ret == FALSE) + { + return NULL; + } + + name[MAX_LEN - 1] = 0; + return name; +} + int getGlobalList(void) { short i; @@ -135,10 +156,106 @@ return 1; } - for (i = 0; i < _MRX_MAX_DRIVE_LETTERS; i += 2) - { - wprintf(L"%c: %s\t%c: %s\n", 'A' + i, (outputBuffer[i] & 0x80 ? L"Active" : L"Inactive"), - 'A' + (i + 1), (outputBuffer[i + 1] & 0x80 ? L"Active" : L"Inactive")); + for (i = 0; i < _MRX_MAX_DRIVE_LETTERS; ++i) + { + CHAR id = outputBuffer[i]; + BOOL active = ((id & 0x80) == 0x80); + PCWSTR name = NULL; + + if (active) + { + name = getGlobalConn(id); + } + if (name == NULL) + { + name = L"None"; + } + + wprintf(L"%c: %s (%s)%c", 'A' + i, (active ? L"Active" : L"Inactive"), name, (i & 1 ? '\n' : '\t')); + } + + return 0; +} + +BOOL CreateUNCShortcut(PCWSTR share) +{ + HRESULT res; + IShellLink *link; + IPersistFile *persist; + WCHAR path[MAX_PATH]; + WCHAR linkPath[MAX_PATH]; + + res = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLink, (void**)&link); + if (FAILED(res)) + { + return FALSE; + } + + res = link->lpVtbl->QueryInterface(link, &IID_IPersistFile, (void **)&persist); + if (FAILED(res)) + { + link->lpVtbl->Release(link); + return FALSE; + } + + wcscpy(path, L"\\\\vboxsvr\\"); + wcscat(path, share); + link->lpVtbl->SetPath(link, path); + + res = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY, NULL, 0, path); + if (FAILED(res)) + { + persist->lpVtbl->Release(persist); + link->lpVtbl->Release(link); + return FALSE; + } + + wsprintf(linkPath, L"%s\\Browse %s (VBox).lnk", path, share); + res = persist->lpVtbl->Save(persist, linkPath, TRUE); + + persist->lpVtbl->Release(persist); + link->lpVtbl->Release(link); + + return SUCCEEDED(res); +} + +int autoStart(void) +{ + short i; + BOOL ret; + DWORD outputBufferSize; + char outputBuffer[_MRX_MAX_DRIVE_LETTERS]; + + if (startVBoxSrv() != 0) + { + return 1; + } + + outputBufferSize = sizeof(outputBuffer); + memset(outputBuffer, 0, outputBufferSize); + ret = performDevIoCtl(IOCTL_MRX_VBOX_GETGLOBALLIST, NULL, 0, &outputBuffer, outputBufferSize); + if (ret == FALSE) + { + return 1; + } + + CoInitialize(NULL); + for (i = 0; i < _MRX_MAX_DRIVE_LETTERS; ++i) + { + CHAR id = outputBuffer[i]; + BOOL active = ((id & 0x80) == 0x80); + PCWSTR name = NULL; + + if (active) + { + name = getGlobalConn(id); + } + if (name == NULL) + { + continue; + } + + CreateUNCShortcut(name); } return 0; @@ -151,6 +268,7 @@ wprintf(L"\taddconn <letter> <share name>: add a connection\n"); wprintf(L"\tgetlist: list connections\n"); wprintf(L"\tgetgloballist: list available shares\n"); + wprintf(L"\tauto: automagically configure the VBox Shared folders and creates desktop folders\n"); } int wmain(int argc, wchar_t *argv[]) @@ -187,6 +305,10 @@ { return getGlobalList(); } + else if (_wcsicmp(cmd, L"auto") == 0) + { + return autoStart(); + } else { printUsage();

8 years, 11 months

[akhaldi] 70517: [0.4.0] * Merge the README files update by Hermès in r70497.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 7 11:50:57 2016 New Revision: 70517 URL: http://svn.reactos.org/svn/reactos?rev=70517&view=rev Log: [0.4.0] * Merge the README files update by Hermès in r70497. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/INSTALL branches/ros-branch-0_4_0/reactos/README branches/ros-branch-0_4_0/reactos/boot/bootdata/readme.txt Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 7 11:50:57 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480,70497 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 7 11:50:57 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480,70497 Modified: branches/ros-branch-0_4_0/reactos/INSTALL URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/INSTAL… ============================================================================== --- branches/ros-branch-0_4_0/reactos/INSTALL [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/INSTALL [iso-8859-1] Thu Jan 7 11:50:57 2016 @@ -1,28 +1,41 @@ 1. Build environment +-------------------- -To build the system you need either mingw32 installed on Windows or a mingw32 -cross compiler running on unix. You may obtain MinGW binaries that build -ReactOS from http://www.reactos.org/. +To build the system it is strongly advised to use the ReactOS Build Environment +(RosBE). Up-to-date versions for Windows and for Unix/GNU-Linux are available +from our download page at: http://www.reactos.org/wiki/Build_Environment/ + +Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+, together +with separate installations of CMake and the Ninja build utility. 2. Building ReactOS +------------------- + +A throughout guide for how to build ReactOS can be found at: + http://www.reactos.org/wiki/Building_ReactOS + +In the following we only make a quick overview. + 2.1 Building the binaries -To build ReactOS run 'make' (without the quotes) if you are building on Linux -or 'mingw32-make' if you are building on Windows (or ReactOS) from the top -directory. If you are using RosBE, follow on-screen instructions. +To build ReactOS run 'ninja' (without the quotes), or alternatively run +'make' if you are using the Make utility, from the top directory. +NOTE: In the other examples listed in the following, similar modification +holds if you are using the Make utility instead of Ninja. +If you are using RosBE, follow on-screen instructions. 2.2 Building a bootable CD image -To build a bootable CD image run 'make bootcd' (without the quotes) if you are -building on Linux or 'mingw32-make bootcd' if you are building on Windows (or -ReactOS) from the top directory. This will create a CD image with a filename, -ReactOS.iso, in the top directory. +To build a bootable CD image run 'ninja bootcd' (without the quotes) from the +top directory. This will create a CD image with a filename, ReactOS.iso, in +the top directory. 3. Installation +--------------- ReactOS can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition. The partition on which ReactOS is to be @@ -41,13 +54,13 @@ follow the instructions to install ReactOS. If you have an existing ReactOS installation you want to upgrade, then to -install ReactOS after building it, type 'make install' or -'mingw32-make install'. This will create the directory 'reactos' in the top -directory. Copy the contents of this directory over the existing installation. +install ReactOS after building it, type 'ninja install'. This will create +the directory 'reactos' in the top directory. Copy the contents of this +directory over the existing installation. If you don't want to copy the files manually every time you run a -'make install' or 'mingw32-make install', then you can specify the directory -where the files are to be copied to during installation. +'ninja install', then you can specify the directory where the files are +to be copied to during installation. Set the ROS_INSTALL environment variable. If you are on Windows this could be done by: @@ -58,8 +71,7 @@ export ROS_INSTALL=/mnt/windows/reactos -Now run 'make install' or 'mingw32-make install' to install the files to the -new location. +Now run 'ninja install' to install the files to the new location. 3.2 Installation from bootable CD distribution @@ -68,12 +80,13 @@ contents. Then burn the CD image, boot from it, and follow instructions. -5. Help +4. Help +------- If you run into problems or have suggestions for making ReactOS better, please visit the address below. Mailing lists are available for a variety of topics, bugs should be submitted to JIRA and general chat takes place in the forums, -or #reactos on freenode +or #reactos on freenode. http://www.reactos.org/ Modified: branches/ros-branch-0_4_0/reactos/README URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/README… ============================================================================== --- branches/ros-branch-0_4_0/reactos/README [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/README [iso-8859-1] Thu Jan 7 11:50:57 2016 @@ -1,29 +1,32 @@ ======================== -ReactOS Version 0.3.x -Updated Dec 16, 2006 +ReactOS Version 0.4.x +Updated January 5, 2016 ======================== 1. What is ReactOS? +------------------- - ReactOS is an Open Source effort to develop a quality operating system -that is compatible with Windows NT applications and drivers. +ReactOS is an Open Source effort to develop a quality operating system that is +compatible with applications and drivers written for the Microsoft® Windows NT +family of operating systems (NT4, 2000, XP, 2003, Vista, Seven). - The ReactOS project, although currently focused on Windows XP/2003 -drivers compatibility, is always keeping an eye toward compatibility with -older version of Windows NT family ( NT 4.0, 2000 (NT 5.0)) and new -Windows NT releases (Vista, etc). Applications (Win32 API) compatibility -focus is Windows XP. +The ReactOS project, although currently focused on Windows Server 2003 +compatibility, is always keeping an eye toward compatibility with +Windows Vista and future Windows NT releases. -More information is available at http://www.reactos.org/. +More information is available at: http://www.reactos.org 2. Building ReactOS +------------------- See the INSTALL file for more details. 3. More information +------------------- See the media\doc subdirectory for some sparse notes. 4. Who is responsible +--------------------- See the CREDITS file. Modified: branches/ros-branch-0_4_0/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_4_0/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/boot/bootdata/readme.txt [iso-8859-1] Thu Jan 7 11:50:57 2016 @@ -1,6 +1,6 @@ ======================== ReactOS Version 0.4.x -Updated December 12, 2015 +Updated January 5, 2016 ======================== 1. What is ReactOS? @@ -10,7 +10,7 @@ compatible with applications and drivers written for the Microsoft® Windows NT family of operating systems (NT4, 2000, XP, 2003, Vista, Seven). -Website: http://www.reactos.org +More information is available at: http://www.reactos.org 2. Relationship with the WINE project

8 years, 11 months

[ion] 70516: [BOOTLIB]: More debug print cleanups [BOOTLIB]: Fix incorrect use of flag introduced a few revisions ago. This fixes <1MB RAM descriptors. [BOOTLIB]: Enable BmFwMemoryInitialize, since...

by ion＠svn.reactos.org

Author: ion Date: Thu Jan 7 05:30:18 2016 New Revision: 70516 URL: http://svn.reactos.org/svn/reactos?rev=70516&view=rev Log: [BOOTLIB]: More debug print cleanups [BOOTLIB]: Fix incorrect use of flag introduced a few revisions ago. This fixes <1MB RAM descriptors. [BOOTLIB]: Enable BmFwMemoryInitialize, since it works now. All (known) bugs are fixed, bootmgr is back on track. Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/firmware/efi/firmware.c trunk/reactos/boot/environ/lib/io/device.c trunk/reactos/boot/environ/lib/io/etfs.c trunk/reactos/boot/environ/lib/io/file.c trunk/reactos/boot/environ/lib/mm/descriptor.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] Thu Jan 7 05:30:18 2016 @@ -1151,7 +1151,7 @@ } /* Initialize firmware-specific memory regions */ - //BmFwMemoryInitialize(); + BmFwMemoryInitialize(); /* Initialize the boot status data log (BSD) */ BmpInitializeBootStatusDataLog(); @@ -1168,7 +1168,7 @@ /* do more stuff!! */ EfiPrintf(BlResourceFindMessage(BM_MSG_TEST)); - EfiPrintf(Stylesheet); + //EfiPrintf(Stylesheet); EfiStall(10000000); //Failure: 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] Thu Jan 7 05:30:18 2016 @@ -287,10 +287,11 @@ // // Memory Allocation Attributes // + BlMemoryUnknown = 0x00010000, BlMemoryNonFixed = 0x00020000, BlMemoryFixed = 0x00040000, BlMemoryReserved = 0x00080000, - BlMemoryValidAllocationAttributes = BlMemoryNonFixed | BlMemoryFixed | BlMemoryReserved, + BlMemoryValidAllocationAttributes = BlMemoryNonFixed | BlMemoryFixed | BlMemoryReserved | BlMemoryUnknown, BlMemoryValidAllocationAttributeMask = 0x00FF0000, // Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] Thu Jan 7 05:30:18 2016 @@ -1269,7 +1269,8 @@ if (Descriptor->Type == BlConventionalMemory) { /* Set the reserved flag on the descriptor */ - Descriptor->Flags |= BlReservedMemory; + EfiPrintf(L"Adding magic flag\r\n"); + Descriptor->Flags |= BlMemoryReserved; } /* Add this descriptor into the list */ @@ -1313,7 +1314,8 @@ if ((Descriptor->Type == BlConventionalMemory) && (EndPage <= 0x100)) { /* Set the reserved flag on the descriptor */ - Descriptor->Flags |= BlReservedMemory; + EfiPrintf(L"Adding magic flag\r\n"); + Descriptor->Flags |= BlMemoryReserved; } /* Add the descriptor to the list, requesting coalescing as asked */ 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] Thu Jan 7 05:30:18 2016 @@ -301,7 +301,7 @@ } Alignment = BlockDevice->Alignment; - if (!Alignment || !((Alignment - 1) & (ULONG_PTR)Buffer)) + if (!(Alignment) || !((Alignment - 1) & (ULONG_PTR)Buffer)) { Status = BlockIopFirmwareOperation(DeviceEntry, Buffer, @@ -317,7 +317,6 @@ return STATUS_SUCCESS; } - EfiPrintf(L"Firmware alignment fixup required\r\n"); Status = BlockIopAllocateAlignedBuffer(&BlockIopAlignedBuffer, &BlockIopAlignedBufferSize, BufferSize, @@ -820,11 +819,6 @@ /* 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; Modified: trunk/reactos/boot/environ/lib/io/etfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/etfs.c… ============================================================================== --- trunk/reactos/boot/environ/lib/io/etfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/etfs.c [iso-8859-1] Thu Jan 7 05:30:18 2016 @@ -550,8 +550,6 @@ ULONG DeviceId, FileSize, DirOffset, FileOffset, Size; PRAW_DIR_REC DirEntry; BOOLEAN IsDirectory; - - EfiPrintf(L"Attempting to open file %s in directory %s\r\n", FileName, Directory->FilePath); EtfsFile = Directory->FsSpecificData; DeviceId = EtfsFile->DeviceId; Modified: trunk/reactos/boot/environ/lib/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/file.c… ============================================================================== --- trunk/reactos/boot/environ/lib/io/file.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/file.c [iso-8859-1] Thu Jan 7 05:30:18 2016 @@ -426,8 +426,6 @@ Status = STATUS_SUCCESS; FileEntry->FileId = FileId; - EfiPrintf(L"File %s opened with ID: %lx\r\n", FileEntry->FilePath, FileId); - FileOpened: /* Add a reference to the file entry, and see if this is the first one */ if (++FileEntry->ReferenceCount == 1) @@ -524,7 +522,6 @@ if (NT_SUCCESS(Status)) { /* Return the file ID back to the caller */ - EfiPrintf(L"File %s opened: %lx\r\n", FileName, FileEntry->FileId); *FileId = FileEntry->FileId; } Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Thu Jan 7 05:30:18 2016 @@ -742,9 +742,9 @@ } /* Bail out if the allocation flags don't match */ - if (((Flags ^ Descriptor->Flags) & 0x190000)) - { - EfiPrintf(L"Incorrect memory allocation flags\r\n"); + if (((Flags ^ Descriptor->Flags) & (BlMemoryRuntime | BlMemoryReserved | BlMemoryUnknown))) + { + //EfiPrintf(L"Incorrect memory allocation flags\r\n"); return FALSE; }

8 years, 11 months

[ion] 70515: [BOOTLIB]: Cleanup some debug prints. [BOOTLIB]: Fix two big device I/O bugs (it's a miracle it worked) [BOOTLIB]: Use defined constants and comment some more device I/O code.

by ion＠svn.reactos.org

Author: ion Date: Thu Jan 7 05:14:26 2016 New Revision: 70515 URL: http://svn.reactos.org/svn/reactos?rev=70515&view=rev Log: [BOOTLIB]: Cleanup some debug prints. [BOOTLIB]: Fix two big device I/O bugs (it's a miracle it worked) [BOOTLIB]: Use defined constants and comment some more device I/O code. Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/lib/io/device.c trunk/reactos/boot/environ/lib/io/etfs.c trunk/reactos/boot/environ/lib/io/fat.c trunk/reactos/boot/environ/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] Thu Jan 7 05:14:26 2016 @@ -315,7 +315,10 @@ DeviceHandle = -1; /* Try to open the boot device */ - Status = BlpDeviceOpen(BlpBootDevice, 1u, 0, &DeviceHandle); + Status = BlpDeviceOpen(BlpBootDevice, + BL_DEVICE_READ_ACCESS, + 0, + &DeviceHandle); if (!NT_SUCCESS(Status)) { EfiPrintf(L"Device open failed: %lx\r\n", Status); @@ -327,7 +330,6 @@ BcdDirectory = BcdPath.Buffer; if (!NT_SUCCESS(Status)) { - EfiPrintf(L"path failed: %lx\n", Status); goto Quickie; } @@ -351,8 +353,10 @@ wcsncat(FinalPath, L"\\BCD", FinalSize / sizeof(WCHAR)); /* Try to open the file */ - EfiPrintf(L"Opening: %s\r\n", FinalPath); - Status = BlFileOpen(DeviceHandle, FinalPath, 1, &FileHandle); + Status = BlFileOpen(DeviceHandle, + FinalPath, + BL_FILE_READ_ACCESS, + &FileHandle); if (!NT_SUCCESS(Status)) { BootDirectory = BcdDirectory; 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] Thu Jan 7 05:14:26 2016 @@ -603,28 +603,32 @@ { PBL_DEVICE_ENTRY DeviceEntry; - if (!(DeviceInformation)) + /* This parameter is not optional */ + if (!DeviceInformation) { return STATUS_INVALID_PARAMETER; } + /* Make sure the device ID is valid */ if (DmTableEntries <= DeviceId) { return STATUS_INVALID_PARAMETER; } + /* Get the device entry */ DeviceEntry = DmDeviceTable[DeviceId]; if (!DeviceEntry) { return STATUS_INVALID_PARAMETER; } - if (!(DeviceEntry->Flags & 1)) + /* Make sure the device is open */ + if (!(DeviceEntry->Flags & BL_DEVICE_ENTRY_OPENED)) { return STATUS_INVALID_PARAMETER; } - DeviceInformation->DeviceType = DeviceEntry->DeviceDescriptor->DeviceType; + /* Set the device information */ return DeviceEntry->Callbacks.SetInformation(DeviceEntry, DeviceInformation); } @@ -636,27 +640,32 @@ { PBL_DEVICE_ENTRY DeviceEntry; - if (!(DeviceInformation)) + /* This parameter is not optional */ + if (!DeviceInformation) { return STATUS_INVALID_PARAMETER; } + /* Make sure the device ID is valid */ if (DmTableEntries <= DeviceId) { return STATUS_INVALID_PARAMETER; } + /* Get the device entry */ DeviceEntry = DmDeviceTable[DeviceId]; if (!DeviceEntry) { return STATUS_INVALID_PARAMETER; } - if (!(DeviceEntry->Flags & 1)) + /* Make sure the device is open */ + if (!(DeviceEntry->Flags & BL_DEVICE_ENTRY_OPENED)) { return STATUS_INVALID_PARAMETER; } + /* Return the device information */ DeviceInformation->DeviceType = DeviceEntry->DeviceDescriptor->DeviceType; return DeviceEntry->Callbacks.GetInformation(DeviceEntry, DeviceInformation); } @@ -666,40 +675,51 @@ _In_ ULONG DeviceId, _In_ PVOID Buffer, _In_ ULONG Size, - _Out_ PULONG BytesRead + _Out_opt_ PULONG BytesRead ) { PBL_DEVICE_ENTRY DeviceEntry; NTSTATUS Status; ULONG BytesTransferred; + /* Make sure we have a buffer, and the device ID is valid */ if (!(Buffer) || (DmTableEntries <= DeviceId)) { return STATUS_INVALID_PARAMETER; } + /* Get the device entry for it */ DeviceEntry = DmDeviceTable[DeviceId]; if (!DeviceEntry) { return STATUS_INVALID_PARAMETER; } - if (!(DeviceEntry->Flags & 1) || !(DeviceEntry->Flags & 2)) + /* Make sure this is a device opened for read access */ + if (!(DeviceEntry->Flags & BL_DEVICE_ENTRY_OPENED) || + !(DeviceEntry->Flags & BL_DEVICE_ENTRY_READ_ACCESS)) { return STATUS_INVALID_PARAMETER; } - Status = DeviceEntry->Callbacks.Read(DeviceEntry, Buffer, Size, &BytesTransferred); + /* Issue the read */ + Status = DeviceEntry->Callbacks.Read(DeviceEntry, + Buffer, + Size, + &BytesTransferred); if (!DeviceEntry->Unknown) { + /* Update performance counters */ DmDeviceIoInformation.ReadCount += BytesTransferred; } + /* Return back how many bytes were read, if caller wants to know */ if (BytesRead) { *BytesRead = BytesTransferred; } + /* Return read result */ return Status; } @@ -744,7 +764,7 @@ /* Assume failure */ DeviceMatch = FALSE; - /* Check if the two devices exist and are identical in typ */ + /* Check if the two devices exist and are identical in type */ if ((Device1) && (Device2) && (Device1->DeviceType == Device2->DeviceType)) { /* Take the bigger of the two sizes */ @@ -753,8 +773,8 @@ { /* Compare the two devices up to their size */ if (RtlEqualMemory(&Device1->Local, - &Device2->Local, - DeviceSize - FIELD_OFFSET(BL_DEVICE_DESCRIPTOR, Local))) + &Device2->Local, + DeviceSize - FIELD_OFFSET(BL_DEVICE_DESCRIPTOR, Local))) { /* They match! */ DeviceMatch = TRUE; @@ -1173,7 +1193,7 @@ Status = BlockIoEfiGetDeviceInformation(IoDeviceEntry); if (NT_SUCCESS(Status)) { - /* We have a fully constructed device, reuturn it */ + /* We have a fully constructed device, return it */ *DeviceEntry = IoDeviceEntry; return STATUS_SUCCESS; } @@ -1287,7 +1307,6 @@ /* 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 */ @@ -1477,8 +1496,8 @@ ) { BOOLEAN Found; - PBL_DEVICE_DESCRIPTOR Device = (PBL_DEVICE_DESCRIPTOR)Entry; - PBL_DEVICE_ENTRY DeviceEntry = (PBL_DEVICE_ENTRY)Argument1; + PBL_DEVICE_DESCRIPTOR Device = (PBL_DEVICE_DESCRIPTOR)Argument1; + PBL_DEVICE_ENTRY DeviceEntry = (PBL_DEVICE_ENTRY)Entry; ULONG Flags = *(PULONG)Argument2; ULONG Unknown = *(PULONG)Argument3; @@ -1492,8 +1511,8 @@ if (DeviceEntry->Unknown == Unknown) { /* Compare flags */ - if ((!(Flags & 1) || (DeviceEntry->Flags & 2)) && - (!(Flags & 2) || (DeviceEntry->Flags & 4))) + if ((!(Flags & BL_DEVICE_READ_ACCESS) || (DeviceEntry->Flags & BL_DEVICE_ENTRY_READ_ACCESS)) && + (!(Flags & BL_DEVICE_WRITE_ACCESS) || (DeviceEntry->Flags & BL_DEVICE_ENTRY_WRITE_ACCESS))) { /* And more flags */ if (((Flags & 8) || !(DeviceEntry->Flags & 8)) && @@ -1540,7 +1559,7 @@ NTSTATUS Status; /* Check if the device is opened */ - if (DeviceEntry->Flags & 1) + if (DeviceEntry->Flags & BL_DEVICE_ENTRY_OPENED) { /* It is, so can't purge it */ Status = STATUS_UNSUCCESSFUL; @@ -1700,7 +1719,6 @@ return Status; } - BOOLEAN BlockIoDeviceTableCompare ( _In_ PVOID Entry, @@ -1736,7 +1754,6 @@ if (!NT_SUCCESS(Status)) { /* Failed to initialize block I/O */ - EfiPrintf(L"Block I/O Init failed\r\n"); return Status; } } @@ -1769,7 +1786,7 @@ if (FoundDeviceEntry) { /* We already found a device, so copy its device data and callbacks */ - EfiPrintf(L"Device entry found: %p\r\n", FoundDeviceEntry); + //EfiPrintf(L"Block I/O Device entry found: %p\r\n", FoundDeviceEntry); RtlCopyMemory(BlockDevice, FoundDeviceEntry->DeviceSpecificData, sizeof(*BlockDevice)); RtlCopyMemory(&DeviceEntry->Callbacks, &FoundDeviceEntry->Callbacks, @@ -1873,7 +1890,7 @@ } /* Make sure the device is active */ - if (!(DeviceEntry->Flags & 1)) + if (!(DeviceEntry->Flags & BL_DEVICE_ENTRY_OPENED)) { return STATUS_INVALID_PARAMETER; } @@ -1883,7 +1900,7 @@ if (!DeviceEntry->ReferenceCount) { /* Mark the device as inactive */ - DeviceEntry->Flags = ~1; + DeviceEntry->Flags = ~BL_DEVICE_ENTRY_OPENED; } /* We're good */ @@ -1964,10 +1981,9 @@ 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; + DeviceEntry->Flags |= BL_DEVICE_ENTRY_OPENED; return STATUS_SUCCESS; } Modified: trunk/reactos/boot/environ/lib/io/etfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/etfs.c… ============================================================================== --- trunk/reactos/boot/environ/lib/io/etfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/etfs.c [iso-8859-1] Thu Jan 7 05:14:26 2016 @@ -565,7 +565,6 @@ FALSE); if (!NT_SUCCESS(Status)) { - EfiPrintf(L"no dirent found: %lx\r\n", Status); return Status; } @@ -761,7 +760,6 @@ /* Return back to the caller */ *VolumeDescriptor = IsoVd; *VolumeIsIso = IsIso; - EfiPrintf(L"Recognized!!!\r\n"); return STATUS_SUCCESS; } Modified: trunk/reactos/boot/environ/lib/io/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/fat.c?… ============================================================================== --- trunk/reactos/boot/environ/lib/io/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/fat.c [iso-8859-1] Thu Jan 7 05:14:26 2016 @@ -32,8 +32,6 @@ PACKED_BOOT_SECTOR FatBootSector; BIOS_PARAMETER_BLOCK BiosBlock; - EfiPrintf(L"FAT Mount on Device %d\r\n", DeviceId); - /* Capture thing */ BlDeviceGetInformation(DeviceId, &DeviceInformation); UnknownFlag = DeviceInformation.BlockDeviceInfo.Unknown; @@ -67,16 +65,15 @@ } EfiPrintf(L"Jump: %lx Bytes Per Sector: %d Sectors Per Cluster: %d Reserved: %d Fats: %d Sectors: %d Large Sectors: %d Media: %lx RootEntries: %d\r\n", - FatBootSector.Jump[0], - BiosBlock.BytesPerSector, - BiosBlock.SectorsPerCluster, - BiosBlock.ReservedSectors, - BiosBlock.Fats, - BiosBlock.Sectors, - BiosBlock.LargeSectors, - BiosBlock.Media, - BiosBlock.RootEntries); - + FatBootSector.Jump[0], + BiosBlock.BytesPerSector, + BiosBlock.SectorsPerCluster, + BiosBlock.ReservedSectors, + BiosBlock.Fats, + BiosBlock.Sectors, + BiosBlock.LargeSectors, + BiosBlock.Media, + BiosBlock.RootEntries); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/boot/environ/lib/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/file.c… ============================================================================== --- trunk/reactos/boot/environ/lib/io/file.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/file.c [iso-8859-1] Thu Jan 7 05:14:26 2016 @@ -323,7 +323,6 @@ &Unknown); if (FileEntry) { - EfiPrintf(L"Entry exists: %p\n", FileEntry); goto FileOpened; } @@ -525,7 +524,7 @@ if (NT_SUCCESS(Status)) { /* Return the file ID back to the caller */ - EfiPrintf(L"File opened: %lx\r\n", FileEntry->FileId); + EfiPrintf(L"File %s opened: %lx\r\n", FileName, FileEntry->FileId); *FileId = FileEntry->FileId; }

8 years, 11 months

[ion] 70514: [BOOTLIB]: Add support for initializing the input console object. [BOOTLIB]: Add a bunch more graphical console support functions. [BOOTLIB]: Cleanup some older graphics-related code. ...

by ion＠svn.reactos.org

Author: ion Date: Thu Jan 7 04:28:13 2016 New Revision: 70514 URL: http://svn.reactos.org/svn/reactos?rev=70514&view=rev Log: [BOOTLIB]: Add support for initializing the input console object. [BOOTLIB]: Add a bunch more graphical console support functions. [BOOTLIB]: Cleanup some older graphics-related code. [BOOTLIB]: Support graphics re-initialization. We now correctly fallback to text mode since font loading is not implemented. Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/firmware/efi/firmware.c trunk/reactos/boot/environ/lib/io/display/display.c trunk/reactos/boot/environ/lib/io/display/efi/guicons.c trunk/reactos/boot/environ/lib/io/display/efi/textcons.c trunk/reactos/boot/environ/lib/io/display/guicons.c trunk/reactos/boot/environ/lib/io/display/textcons.c trunk/reactos/boot/environ/lib/misc/font.c trunk/reactos/boot/environ/lib/misc/resource.c trunk/reactos/boot/environ/lib/mm/descriptor.c 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] Thu Jan 7 04:28:13 2016 @@ -394,8 +394,12 @@ struct _BL_TEXT_CONSOLE; struct _BL_DISPLAY_STATE; -typedef -NTSTATUS +struct _BL_DISPLAY_MODE; +struct _BL_INPUT_CONSOLE; +struct _BL_REMOTE_CONSOLE; +struct _BL_GRAPHICS_CONSOLE; +typedef +VOID (*PCONSOLE_DESTRUCT) ( _In_ struct _BL_TEXT_CONSOLE* Console ); @@ -442,6 +446,33 @@ _In_ struct _BL_TEXT_CONSOLE* Console, _In_ ULONG Attribute ); + +typedef +BOOLEAN +(*PCONSOLE_IS_ENABLED) ( + _In_ struct _BL_GRAPHICS_CONSOLE* Console + ); + +typedef +NTSTATUS +(*PCONSOLE_GET_GRAPHICAL_RESOLUTION) ( + _In_ struct _BL_GRAPHICS_CONSOLE* Console, + _Out_ struct _BL_DISPLAY_MODE* DisplayMode + ); + +typedef +NTSTATUS +(*PCONSOLE_SET_GRAPHICAL_RESOLUTION) ( + _In_ struct _BL_GRAPHICS_CONSOLE* Console, + _In_ struct _BL_DISPLAY_MODE DisplayMode + ); + +typedef +NTSTATUS +(*PCONSOLE_ENABLE) ( + _In_ struct _BL_GRAPHICS_CONSOLE* Console, + _In_ BOOLEAN Enable +); typedef NTSTATUS @@ -875,6 +906,12 @@ typedef struct _BL_GRAPHICS_CONSOLE_VTABLE { BL_TEXT_CONSOLE_VTABLE Text; + PCONSOLE_IS_ENABLED IsEnabled; + PCONSOLE_ENABLE Enable; + PVOID GetConsoleResolution; + PCONSOLE_GET_GRAPHICAL_RESOLUTION GetGraphicalResolution; + PCONSOLE_GET_GRAPHICAL_RESOLUTION GetOriginalResolution; + PCONSOLE_SET_GRAPHICAL_RESOLUTION SetOriginalResolution; /// more for graphics /// } BL_GRAPHICS_CONSOLE_VTABLE, *PBL_GRAPHICS_CONSOLE_VTABLE; @@ -888,6 +925,25 @@ ULONG Mode; EFI_SIMPLE_TEXT_OUTPUT_MODE OldMode; } BL_TEXT_CONSOLE, *PBL_TEXT_CONSOLE; + +typedef struct _BL_INPUT_CONSOLE_VTABLE +{ + PCONSOLE_DESTRUCT Destruct; + PCONSOLE_REINITIALIZE Reinitialize; + //PCONSOLE_IS_KEY_PENDING IsKeyPending; + //PCONSOLE_READ_INPUT ReadInput; + //PCONSOLE_ERASE_BUFFER EraseBuffer; + //PCONSOLE_FILL_BUFFER FillBuffer; +} BL_INPUT_CONSOLE_VTABLE, *PBL_INPUT_CONSOLE_VTABLE; + +typedef struct _BL_INPUT_CONSOLE +{ + PBL_INPUT_CONSOLE_VTABLE Callbacks; + PULONG Buffer; + PULONG DataStart; + PULONG DataEnd; + PULONG EndBuffer; +} BL_INPUT_CONSOLE, *PBL_INPUT_CONSOLE; typedef enum _BL_GRAPHICS_CONSOLE_TYPE { @@ -1186,6 +1242,16 @@ ); NTSTATUS +EfiConInExReset ( + VOID + ); + +NTSTATUS +EfiConInReset ( + VOID + ); + +NTSTATUS EfiConOutQueryMode ( _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, _In_ ULONG Mode, @@ -1871,9 +1937,59 @@ _Out_ PULONG FileId ); +/* INPUT CONSOLE ROUTINES ****************************************************/ + +VOID +ConsoleInputLocalDestruct ( + _In_ struct _BL_INPUT_CONSOLE* Console + ); + +NTSTATUS +ConsoleInputBaseReinitialize ( + _In_ struct _BL_INPUT_CONSOLE* Console + ); + +NTSTATUS +ConsoleCreateLocalInputCnsole ( + VOID + ); + /* TEXT CONSOLE ROUTINES *****************************************************/ -NTSTATUS +VOID +ConsoleGraphicalDestruct ( + _In_ struct _BL_GRAPHICS_CONSOLE* Console + ); + +NTSTATUS +ConsoleGraphicalReinitialize ( + _In_ struct _BL_GRAPHICS_CONSOLE* Console + ); + +BOOLEAN +ConsoleGraphicalIsEnabled ( + _In_ struct _BL_GRAPHICS_CONSOLE* Console + ); + +NTSTATUS +ConsoleGraphicalGetGraphicalResolution ( + _In_ struct _BL_GRAPHICS_CONSOLE* Console, + _In_ PBL_DISPLAY_MODE DisplayMode + ); + +NTSTATUS +ConsoleGraphicalGetOriginalResolution ( + _In_ struct _BL_GRAPHICS_CONSOLE* Console, + _In_ PBL_DISPLAY_MODE DisplayMode + ); + +NTSTATUS +ConsoleGraphicalEnable ( + _In_ struct _BL_GRAPHICS_CONSOLE* Console, + _In_ BOOLEAN Enable + ); + +VOID ConsoleTextLocalDestruct ( _In_ struct _BL_TEXT_CONSOLE* Console ); @@ -1973,6 +2089,11 @@ _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole ); +VOID +ConsoleFirmwareGraphicalDisable ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ); + NTSTATUS ConsoleFirmwareGraphicalEnable ( _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole @@ -2008,6 +2129,17 @@ _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole, _In_ PBL_DISPLAY_MODE DisplayMode, _In_ ULONG DisplayModeCount + ); + +NTSTATUS +ConsoleCreateLocalInputConsole ( + VOID + ); + +NTSTATUS +ConsoleInputLocalEraseBuffer ( + _In_ PBL_INPUT_CONSOLE Console, + _In_opt_ PULONG ValueToFill ); extern ULONG MmDescriptorCallTreeCount; @@ -2017,7 +2149,8 @@ extern PBL_ARCH_CONTEXT CurrentExecutionContext; extern PBL_DEVICE_DESCRIPTOR BlpBootDevice; extern BL_LOADED_APPLICATION_ENTRY BlpApplicationEntry; -extern SIMPLE_TEXT_OUTPUT_INTERFACE *EfiConOut; +extern EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *EfiConOut; +extern EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *EfiConInEx; extern EFI_GUID EfiGraphicsOutputProtocol; extern EFI_GUID EfiUgaDrawProtocol; extern EFI_GUID EfiLoadedImageProtocol; @@ -2029,6 +2162,7 @@ extern BL_DISPLAY_MODE ConsoleTextResolutionList[]; extern ULONG ConsoleGraphicalResolutionListSize; extern PVOID DspRemoteInputConsole; +extern PVOID DspLocalInputConsole; extern WCHAR BlScratchBuffer[8192]; extern BL_MEMORY_DESCRIPTOR_LIST MmMdlUnmappedAllocated; #endif Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] Thu Jan 7 04:28:13 2016 @@ -256,6 +256,64 @@ /* All done */ return Status; +} + +NTSTATUS +EfiConInReset ( + VOID + ) +{ + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Make the EFI call */ + EfiStatus = EfiConIn->Reset(EfiConIn, FALSE); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + + /* Convert the error to an NTSTATUS */ + return EfiGetNtStatusCode(EfiStatus); +} + +NTSTATUS +EfiConInExReset ( + VOID + ) +{ + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Make the EFI call */ + EfiStatus = EfiConInEx->Reset(EfiConInEx, FALSE); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + + /* Convert the error to an NTSTATUS */ + return EfiGetNtStatusCode(EfiStatus); } NTSTATUS Modified: trunk/reactos/boot/environ/lib/io/display/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/display.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/display/display.c [iso-8859-1] Thu Jan 7 04:28:13 2016 @@ -35,6 +35,7 @@ PVOID DspRemoteInputConsole; PVOID DspTextConsole; PVOID DspGraphicalConsole; +PVOID DspLocalInputConsole; /* FUNCTIONS *****************************************************************/ @@ -43,8 +44,14 @@ VOID ) { - EfiPrintf(L"Disabling graphics\r\n"); - return FALSE; + BOOLEAN Disabled; + NTSTATUS Status; + + /* Get the boot option, and if present, return the result */ + Status = BlGetBootOptionBoolean(BlpApplicationEntry.BcdData, + BcdLibraryBoolean_GraphicsModeDisabled, + &Disabled); + return (NT_SUCCESS(Status) && (Disabled)); } NTSTATUS @@ -409,6 +416,167 @@ } NTSTATUS +DsppReinitialize ( + _In_ ULONG Flags + ) +{ + PBL_TEXT_CONSOLE TextConsole; + PBL_GRAPHICS_CONSOLE GraphicsConsole; + NTSTATUS Status; + ULONGLONG GraphicsResolution; + BOOLEAN HighestMode; + BL_DISPLAY_MODE CurrentResolution; + + /* Do we have local input yet? */ + if (!DspLocalInputConsole) + { + /* Create it now */ + ConsoleCreateLocalInputConsole(); + } + + /* If a graphics console is present without a remote console... */ + TextConsole = NULL; + if (!(DspRemoteInputConsole) && (DspGraphicalConsole)) + { + /* Try to create a remote console */ + ConsoleCreateRemoteConsole(&TextConsole); + } + + /* All good for now */ + Status = STATUS_SUCCESS; + + /* Now check if we were able to create the remote console */ + if (TextConsole) + { + EfiPrintf(L"EMS not supported\r\n"); + return STATUS_NOT_IMPLEMENTED; + } + + /* Set a local for the right cast */ + GraphicsConsole = DspGraphicalConsole; + + /* Nothing to do without a graphics console being reinitialized */ + if (!(Flags & BL_LIBRARY_FLAG_REINITIALIZE_ALL) || + !(GraphicsConsole) || + !(((PBL_GRAPHICS_CONSOLE_VTABLE)GraphicsConsole->TextConsole.Callbacks)->IsEnabled(GraphicsConsole))) + { + EfiPrintf(L"Nothing to do for re-init\r\n"); + return Status; + } + + /* Check if graphics are disabled in the BCD */ + if (DsppGraphicsDisabledByBcd()) + { + /* Turn off the graphics console, switching back to text mode */ + Status = ((PBL_GRAPHICS_CONSOLE_VTABLE)GraphicsConsole->TextConsole.Callbacks)->Enable(GraphicsConsole, FALSE); + } + + /* Check if a custom graphics resolution is set */ + if (MiscGetBootOption(BlpApplicationEntry.BcdData, + BcdLibraryInteger_GraphicsResolution)) + { + /* Check what it's set to */ + Status = BlGetBootOptionInteger(BlpApplicationEntry.BcdData, + BcdLibraryInteger_GraphicsResolution, + &GraphicsResolution); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Now check our current graphical resolution */ + Status = ((PBL_GRAPHICS_CONSOLE_VTABLE)GraphicsConsole->TextConsole.Callbacks)->GetGraphicalResolution(GraphicsConsole, + &CurrentResolution); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Remember that we're forcing a video mode */ + ConsoleGraphicalResolutionListFlags |= BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG; + + /* Check which resolution to set */ + if (!GraphicsResolution) + { + /* 1024x768 */ + EfiPrintf(L"Display selection not yet handled\r\n"); + return STATUS_NOT_IMPLEMENTED; + } + else if (GraphicsResolution == 1) + { + /* 800x600 */ + EfiPrintf(L"Display selection not yet handled\r\n"); + return STATUS_NOT_IMPLEMENTED; + } + else if (GraphicsResolution == 2) + { + /* 1024x600 */ + EfiPrintf(L"Display selection not yet handled\r\n"); + return STATUS_NOT_IMPLEMENTED; + } + } + + /* Check if the force highest mode setting is present */ + if (MiscGetBootOption(BlpApplicationEntry.BcdData, + BcdLibraryBoolean_GraphicsForceHighestMode)) + { + /* Check what it's set to */ + Status = BlGetBootOptionBoolean(BlpApplicationEntry.BcdData, + BcdLibraryBoolean_GraphicsForceHighestMode, + &HighestMode); + if ((NT_SUCCESS(Status)) && (HighestMode)) + { + /* Remember that high rest mode is being forced */ + ConsoleGraphicalResolutionListFlags |= BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG; + + /* Turn it on */ + //((PBL_GRAPHICS_CONSOLE_VTABLE)GraphicsConsole->TextConsole.Callbacks)->SetGraphicalResolution(GraphicsConsole, 0, 0); + + /* All done now */ + ConsoleGraphicalResolutionListFlags |= ~BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG; + EfiPrintf(L"High res mode not yet handled\r\n"); + Status = STATUS_NOT_IMPLEMENTED; + } + } + + /* Return back to the caller */ + return Status; +} + +NTSTATUS +BlpDisplayReinitialize ( + VOID + ) +{ + NTSTATUS Status; + PBL_TEXT_CONSOLE TextConsole; + PBL_INPUT_CONSOLE InputConsole; + + /* Do we have a local console? */ + InputConsole = DspLocalInputConsole; + if (InputConsole) + { + /* Reinitialize it */ + Status = InputConsole->Callbacks->Reinitialize((PBL_TEXT_CONSOLE)InputConsole); + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + + /* Do we have a text console? */ + TextConsole = DspTextConsole; + if (TextConsole) + { + /* Reinitialize it */ + Status = TextConsole->Callbacks->Reinitialize(TextConsole); + } + + /* Return status */ + return Status; +} + +NTSTATUS BlpDisplayInitialize ( _In_ ULONG Flags ) @@ -419,15 +587,12 @@ if (Flags & BL_LIBRARY_FLAG_REINITIALIZE) { /* This is a reset */ - Status = STATUS_NOT_IMPLEMENTED; - EfiPrintf(L"Display reset not yet implemented\r\n"); -#if 0 Status = DsppReinitialize(Flags); if (NT_SUCCESS(Status)) { + /* Re-initialize the class as well */ Status = BlpDisplayReinitialize(); } -#endif } else { @@ -446,6 +611,7 @@ ) { NTSTATUS Status; + PBL_GRAPHICS_CONSOLE GraphicsConsole; /* If the caller doesn't want anything, bail out */ if (!(TextWidth) || !(TextHeight)) @@ -458,11 +624,17 @@ if (DspTextConsole) { /* Do we have a graphics console? */ - if (DspGraphicalConsole) - { - /* Yep -- query it */ - EfiPrintf(L"Not supported\r\n"); - Status = STATUS_NOT_IMPLEMENTED; + GraphicsConsole = DspGraphicalConsole; + if (GraphicsConsole) + { + /* Is it currently active? */ + if (((PBL_GRAPHICS_CONSOLE_VTABLE)GraphicsConsole->TextConsole.Callbacks)->IsEnabled(GraphicsConsole)) + { + /* Yep -- query it */ + EfiPrintf(L"GFX active, not supported query\r\n"); + Status = STATUS_NOT_IMPLEMENTED; + //Status = ((PBL_GRAPHICS_CONSOLE_VTABLE)GraphicsConsole->TextConsole.Callbacks)->GetTextCellResolution(GraphicsConsole); + } } } @@ -490,20 +662,15 @@ Console = DspGraphicalConsole; if (Console) { -#if 0 - /* Is it active? If not, activate it */ - if (((PBL_GRAPHICS_CONSOLE_VTABLE)Console->TextConsole.Callbacks)->IsActive()) - { - return ((PBL_GRAPHICS_CONSOLE_VTABLE)Console->TextConsole.Callbacks)->Activate(Console, FALSE); - } -#else - /* Not yet supported */ - EfiPrintf(L"Graphics not yet supported\r\n"); - //Status = STATUS_NOT_IMPLEMENTED; -#endif - } - - /* Do we have a text console? */ + /* Is it currently active? */ + if (((PBL_GRAPHICS_CONSOLE_VTABLE)Console->TextConsole.Callbacks)->IsEnabled(Console)) + { + /* If so, disable it */ + return ((PBL_GRAPHICS_CONSOLE_VTABLE)Console->TextConsole.Callbacks)->Enable(Console, FALSE); + } + } + + /* We should've now fallen back to text mode */ if (!DspTextConsole) { /* Then fail, as no display appears active */ @@ -517,11 +684,12 @@ NTSTATUS BlDisplayGetScreenResolution ( _Out_ PULONG HRes, - _Out_ PULONG Vres - ) -{ - NTSTATUS Status; -// PULONG Resolution; + _Out_ PULONG VRes + ) +{ + NTSTATUS Status; + BL_DISPLAY_MODE Resolution; + PBL_GRAPHICS_CONSOLE GraphicsConsole; /* Assume failure if no consoles are active */ Status = STATUS_UNSUCCESSFUL; @@ -530,33 +698,24 @@ if (DspTextConsole) { /* Do we have an active graphics console? */ - if ((DspGraphicalConsole) -#if 0 - && (((PBL_GRAPHICS_CONSOLE_VTABLE)DspGraphicalConsole->TextConsole.Callbacks)->IsActive()) -#endif - ) - { -#if 0 + GraphicsConsole = DspGraphicalConsole; + if ((GraphicsConsole) && + (((PBL_GRAPHICS_CONSOLE_VTABLE)GraphicsConsole->TextConsole.Callbacks)->IsEnabled(GraphicsConsole))) + { /* Get the resolution */ - Status = ((PBL_GRAPHICS_CONSOLE_VTABLE)DspGraphicalConsole->TextConsole.Callbacks)->GetResolution(DspGraphicalConsole, &Resolution); + Status = ((PBL_GRAPHICS_CONSOLE_VTABLE)GraphicsConsole->TextConsole.Callbacks)->GetGraphicalResolution(GraphicsConsole, &Resolution); if (NT_SUCCESS(Status)) { /* Return it back to the caller */ - *HRes = Resolution[0]; - *Vres = Resolution[1]; + *HRes = Resolution.HRes; + *VRes = Resolution.VRes; } -#else - /* Not yet supported */ - EfiPrintf(L"Graphics not yet supported\r\n"); - Status = STATUS_NOT_IMPLEMENTED; - } else { -#endif /* Return defaults */ *HRes = 640; - *Vres = 200; + *VRes = 200; Status = STATUS_SUCCESS; } } Modified: trunk/reactos/boot/environ/lib/io/display/efi/guicons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/efi/guicons.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/display/efi/guicons.c [iso-8859-1] Thu Jan 7 04:28:13 2016 @@ -111,3 +111,20 @@ return Status; } +VOID +ConsoleFirmwareGraphicalDisable ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + /* Is this a GOP console? */ + if (GraphicsConsole->Type == BlGopConsole) + { + /* Did we map a framebuffer? */ + if (GraphicsConsole->FrameBuffer) + { + /* Unmap it */ + BlMmUnmapVirtualAddressEx(GraphicsConsole->FrameBuffer, + GraphicsConsole->FrameBufferSize); + } + } +} Modified: trunk/reactos/boot/environ/lib/io/display/efi/textcons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/efi/textcons.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/display/efi/textcons.c [iso-8859-1] Thu Jan 7 04:28:13 2016 @@ -489,3 +489,66 @@ return STATUS_SUCCESS; } +NTSTATUS +ConsoleInputBaseEraseBuffer ( + _In_ PBL_INPUT_CONSOLE Console, + _In_opt_ PULONG FillValue + ) +{ + ULONG ValueToFill; + PULONG i; + + /* Check if we should fill with a particular value */ + if (FillValue) + { + /* Use it */ + ValueToFill = *FillValue; + } + else + { + /* Otherwise, use default */ + ValueToFill = 0x10020; + } + + /* Set the input buffer to its last location */ + Console->DataStart = Console->DataEnd; + + /* Fill the buffer with the value */ + for (i = Console->Buffer; i < Console->EndBuffer; i++) + { + *i = ValueToFill; + } + + /* All done */ + return STATUS_SUCCESS; +} + +NTSTATUS +ConsoleInputLocalEraseBuffer ( + _In_ PBL_INPUT_CONSOLE Console, + _In_opt_ PULONG FillValue + ) +{ + NTSTATUS Status, EfiStatus; + + /* Erase the software buffer */ + Status = ConsoleInputBaseEraseBuffer(Console, FillValue); + + /* Reset the hardware console */ + EfiStatus = EfiConInEx ? EfiConInExReset() : EfiConInReset(); + if (!NT_SUCCESS(EfiStatus)) + { + /* Normalize the failure code */ + EfiStatus = STATUS_UNSUCCESSFUL; + } + + /* Check if software reset worked */ + if (NT_SUCCESS(Status)) + { + /* Then return the firmware code */ + Status = EfiStatus; + } + + /* All done */ + return Status; +} Modified: trunk/reactos/boot/environ/lib/io/display/guicons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/guicons.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/display/guicons.c [iso-8859-1] Thu Jan 7 04:28:13 2016 @@ -14,7 +14,16 @@ BL_GRAPHICS_CONSOLE_VTABLE ConsoleGraphicalVtbl = { - { NULL }, + { + (PCONSOLE_DESTRUCT)ConsoleGraphicalDestruct, + (PCONSOLE_REINITIALIZE)ConsoleGraphicalReinitialize + }, + ConsoleGraphicalIsEnabled, + ConsoleGraphicalEnable, + NULL, + ConsoleGraphicalGetGraphicalResolution, + ConsoleGraphicalGetOriginalResolution, + NULL, }; /* FUNCTIONS *****************************************************************/ @@ -69,3 +78,146 @@ GraphicsConsole->BgColor = GraphicsConsole->TextConsole.State.BgColor; return STATUS_SUCCESS; } + +BOOLEAN +ConsoleGraphicalIsEnabled ( + _In_ PBL_GRAPHICS_CONSOLE Console + ) +{ + /* Is the text console active? If so, the graphics console isn't */ + return !Console->TextConsole.Active; +} + +VOID +ConsoleGraphicalDestruct ( + _In_ PBL_GRAPHICS_CONSOLE Console + ) +{ + /* Is the text console active? */ + if (Console->TextConsole.Active) + { + /* Disable it */ + ConsoleFirmwareGraphicalDisable(Console); + } + + /* Close the firmware protocols */ + ConsoleFirmwareGraphicalClose(Console); + + /* Destroy the console object */ + ConsoleTextLocalDestruct(&Console->TextConsole); +} + +NTSTATUS +ConsoleGraphicalReinitialize ( + _In_ PBL_GRAPHICS_CONSOLE Console + ) +{ + /* Is the text console active? */ + if (Console->TextConsole.Active) + { + /* Reinitialize it */ + ConsoleTextLocalReinitialize(&Console->TextConsole); + } + + /* Disable the graphics console */ + ConsoleFirmwareGraphicalDisable(Console); + + /* Then bring it back again */ + return ConsoleFirmwareGraphicalEnable(Console); +} + +NTSTATUS +ConsoleGraphicalEnable ( + _In_ PBL_GRAPHICS_CONSOLE Console, + _In_ BOOLEAN Enable + ) +{ + BOOLEAN Active; + NTSTATUS Status; + + /* The text mode console state should be the opposite of what we want to do */ + Active = Console->TextConsole.Active; + if (Active == Enable) + { + /* Are we trying to enable graphics? */ + if (Enable) + { + /* Enable the console */ + Status = ConsoleFirmwareGraphicalEnable(Console); + if (NT_SUCCESS(Status)) + { + return Status; + } + + /* Is the text console active? */ + if (Console->TextConsole.Active) + { + /* Turn it off */ + ConsoleFirmwareTextClose(&Console->TextConsole); + Console->TextConsole.Active = FALSE; + } + + /* Preserve the text colors */ + Console->FgColor = Console->TextConsole.State.FgColor; + Console->BgColor = Console->TextConsole.State.BgColor; + } + else + { + /* We are turning off graphics -- is the text console active? */ + if (Active != TRUE) + { + /* It isn't, so let's turn it on */ + Status = ConsoleFirmwareTextOpen(&Console->TextConsole); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Remember that it's on */ + Console->TextConsole.Active = TRUE; + } + + /* Disable the graphics console */ + ConsoleFirmwareGraphicalDisable(Console); + } + } + + /* All good */ + return STATUS_SUCCESS; +} + +NTSTATUS +ConsoleGraphicalGetGraphicalResolution ( + _In_ PBL_GRAPHICS_CONSOLE Console, + _In_ PBL_DISPLAY_MODE DisplayMode + ) +{ + /* Is the text console active? */ + if (Console->TextConsole.Active) + { + /* There's no graphics resolution then */ + return STATUS_UNSUCCESSFUL; + } + + /* Return the current display mode */ + *DisplayMode = Console->DisplayMode; + return STATUS_SUCCESS; +} + +NTSTATUS +ConsoleGraphicalGetOriginalResolution ( + _In_ PBL_GRAPHICS_CONSOLE Console, + _In_ PBL_DISPLAY_MODE DisplayMode + ) +{ + /* Is the text console active? */ + if (Console->TextConsole.Active) + { + /* There's no graphics resolution then */ + return STATUS_UNSUCCESSFUL; + } + + /* Return the current display mode */ + *DisplayMode = Console->OldDisplayMode; + return STATUS_SUCCESS; +} Modified: trunk/reactos/boot/environ/lib/io/display/textcons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/textcons.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/display/textcons.c [iso-8859-1] Thu Jan 7 04:28:13 2016 @@ -26,12 +26,12 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS +VOID ConsoleTextLocalDestruct ( _In_ struct _BL_TEXT_CONSOLE* Console ) { - return STATUS_NOT_IMPLEMENTED; + } NTSTATUS @@ -39,6 +39,7 @@ _In_ struct _BL_TEXT_CONSOLE* Console ) { + EfiPrintf(L"Not active yet!\r\n"); return STATUS_NOT_IMPLEMENTED; } @@ -182,3 +183,88 @@ /* No matches were found */ return FALSE; } + +BL_INPUT_CONSOLE_VTABLE ConsoleInputLocalVtbl = +{ + (PCONSOLE_DESTRUCT)ConsoleInputLocalDestruct, + (PCONSOLE_REINITIALIZE)ConsoleInputBaseReinitialize, +}; + +VOID +ConsoleInputLocalDestruct ( + _In_ PBL_INPUT_CONSOLE Console + ) +{ + /* Erase the current input buffer, and tear down the console */ + ConsoleInputLocalEraseBuffer(Console, NULL); + BlMmFreeHeap(Console->Buffer); +} + +NTSTATUS +ConsoleInputBaseConstruct ( + _In_ PBL_INPUT_CONSOLE Console + ) +{ + PULONG Buffer; + + /* Allocate a new 512 byte buffer */ + Buffer = BlMmAllocateHeap(512); + Console->Buffer = Buffer; + if (!Buffer) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Set the current buffer pointers to it */ + Console->DataStart = Buffer; + Console->DataEnd = Buffer; + + /* Set the end 128 data entries into the buffer */ + Console->EndBuffer = Buffer + 128; + return STATUS_SUCCESS; +} + +NTSTATUS +ConsoleInputBaseReinitialize ( + _In_ PBL_INPUT_CONSOLE Console + ) +{ + PULONG Buffer; + + /* Reset all the buffer pointers to the current buffer */ + Buffer = Console->Buffer; + Console->DataStart = Buffer; + Console->DataEnd = Buffer; + Console->EndBuffer = Buffer + 128; + return STATUS_SUCCESS; +} + +NTSTATUS +ConsoleCreateLocalInputConsole ( + VOID + ) +{ + PBL_INPUT_CONSOLE InputConsole; + NTSTATUS Status; + + /* Allocate the input console */ + InputConsole = BlMmAllocateHeap(sizeof(*InputConsole)); + if (!InputConsole) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Construct it */ + Status = ConsoleInputBaseConstruct(InputConsole); + if (!NT_SUCCESS(Status)); + { + /* Tear down on failure */ + BlMmFreeHeap(InputConsole); + return Status; + } + + /* Set the callback table, and set us as the local input console */ + InputConsole->Callbacks = &ConsoleInputLocalVtbl; + DspLocalInputConsole = InputConsole; + return STATUS_SUCCESS; +} Modified: trunk/reactos/boot/environ/lib/misc/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/font… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/font.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/font.c [iso-8859-1] Thu Jan 7 04:28:13 2016 @@ -22,7 +22,7 @@ _In_ PWCHAR FontPath ) { - EfiPrintf(L"rotfl font loading\r\n"); + EfiPrintf(L"Cannot load fond %s, no font loader exists\r\n", FontPath); return STATUS_NOT_IMPLEMENTED; } @@ -55,7 +55,6 @@ { PBL_DEFERRED_FONT_FILE DeferredFont; ULONG FontPathSize; - EfiPrintf(L"Adding deferred font: %s\r\n", FontPath); /* Allocate the deferred font structure */ DeferredFont = (PBL_DEFERRED_FONT_FILE)BlMmAllocateHeap(sizeof(*DeferredFont)); @@ -120,7 +119,6 @@ RemoveEntryList(&DeferredFont->ListEntry); /* Load the font */ - EfiPrintf(L"Found deferred font: %s\r\n", DeferredFont->FontPath); LoadStatus = BfiLoadFontFile(DeferredFont->Device, DeferredFont->FontPath); if (!NT_SUCCESS(LoadStatus)) Modified: trunk/reactos/boot/environ/lib/misc/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/reso… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/resource.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/resource.c [iso-8859-1] Thu Jan 7 04:28:13 2016 @@ -68,6 +68,7 @@ if (!NT_SUCCESS(Status)) { /* Fallback to text mode (yes, this is the API...) */ + EfiPrintf(L"Locale failed, falling back to text mode\r\n"); return BlDisplaySetScreenResolution(); } } @@ -383,6 +384,7 @@ if (!NT_SUCCESS(Status)) { /* Still didn't work -- fallback to text mode */ + EfiPrintf(L"Font loading failed, falling back to text mode\r\n"); Status = BlDisplaySetScreenResolution(); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Thu Jan 7 04:28:13 2016 @@ -149,7 +149,7 @@ _In_ ULONG Count ) { - EfiPrintf(L"NOT SUPPORTED!!!\r\n"); + EfiPrintf(L"dynamic switch NOT SUPPORTED!!!\r\n"); while (1); }

8 years, 11 months

[hbelusca] 70513: [BOOTVID_FONGEN] - Fix a comment; - Less hardcoded values.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jan 7 01:23:51 2016 New Revision: 70513 URL: http://svn.reactos.org/svn/reactos?rev=70513&view=rev Log: [BOOTVID_FONGEN] - Fix a comment; - Less hardcoded values. Modified: trunk/rosapps/applications/devutils/bootvid_font_generator/bootvid_font_generator.c Modified: trunk/rosapps/applications/devutils/bootvid_font_generator/bootvid_font_generator.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/boot… ============================================================================== --- trunk/rosapps/applications/devutils/bootvid_font_generator/bootvid_font_generator.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/bootvid_font_generator/bootvid_font_generator.c [iso-8859-1] Thu Jan 7 01:23:51 2016 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS BootVid Font Generator Utility * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - * PURPOSE: Generates the FontData array for the bootdata.c file of bootvid.sys + * PURPOSE: Generates the FontData array for the bootdata.c file of bootvid.dll * COPYRIGHT: Copyright 2016 Colin Finck <colin(a)reactos.org> */ @@ -139,8 +139,8 @@ iHeight = -MulDiv(FontSize, GetDeviceCaps(hDC, LOGPIXELSY), 72); hFont = CreateFontA(iHeight, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, 0, 0, NONANTIALIASED_QUALITY, - FIXED_PITCH, FontName); + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + NONANTIALIASED_QUALITY, FIXED_PITCH, FontName); if (!hFont) { fprintf(stderr, "CreateFont failed with error %lu!\n", GetLastError());

8 years, 11 months

[hbelusca] 70512: [BOOTVID_FONT_GEN] Improve the bootvid font generator of Colin (see r70507) in many ways: - Allow the user to specify the font name (optional), and optionally a font size and x- a...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jan 7 00:29:41 2016 New Revision: 70512 URL: http://svn.reactos.org/svn/reactos?rev=70512&view=rev Log: [BOOTVID_FONT_GEN] Improve the bootvid font generator of Colin (see r70507) in many ways: - Allow the user to specify the font name (optional), and optionally a font size and x- and y-offset so that (s)he doesn't have to recompile the generator each time (s)he wants to test a new font. - The default settings (in case the user doesn't specify all or part of the font definition) are those of Windows' bootvid font (i.e. "Lucida Console", font size 10, x_offset = y_offset = 0). - Create only once the DC and the font handle (to be used for all the generated characters) instead of each time a character is being generated. I still keep the recreation of the HBITMAP for each character (I don't know if we can also improve there by creating it once and zeroing it out before generating each character). Modified: trunk/rosapps/applications/devutils/bootvid_font_generator/bootvid_font_generator.c Modified: trunk/rosapps/applications/devutils/bootvid_font_generator/bootvid_font_generator.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/boot… ============================================================================== --- trunk/rosapps/applications/devutils/bootvid_font_generator/bootvid_font_generator.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/bootvid_font_generator/bootvid_font_generator.c [iso-8859-1] Thu Jan 7 00:29:41 2016 @@ -1,29 +1,36 @@ /* - * PROJECT: ReactOS bootvid Font Generator Utility + * PROJECT: ReactOS BootVid Font Generator Utility * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - * PURPOSE: Generates the FontData array for the bootdata.c file of bootvid + * PURPOSE: Generates the FontData array for the bootdata.c file of bootvid.sys * COPYRIGHT: Copyright 2016 Colin Finck <colin(a)reactos.org> */ +#include <stdio.h> +#include <conio.h> #include <windows.h> -#include <stdio.h> + +/* + * Enable this #define if you want to dump the generated character on screen + */ +// #define DUMP_CHAR_ON_SCREEN // Windows original Blue Screen font is "Lucida Console" at FONT_SIZE 10 with no offsets. -#define FONT_NAME L"Anonymous Pro" -#define FONT_SIZE 10 -#define X_OFFSET 1 -#define Y_OFFSET 0 -#define HEIGHT 13 -#define WIDTH 8 +#define FONT_NAME_DEF "Lucida Console" // "DejaVu Sans Mono" // "Anonymous Pro" +#define FONT_SIZE_DEF 10 +#define X_OFFSET_DEF 0 // 0 // 1 +#define Y_OFFSET_DEF 0 +#define HEIGHT 13 // Must be == BOOTCHAR_HEIGHT (see reactos/drivers/base/bootvid/precomp.h) +#define WIDTH 8 // 8 bits == 1 byte + +#ifdef DUMP_CHAR_ON_SCREEN /** * Sketch the character on the console screen using ASCII characters. * Allows you to easily check if the font fits properly into the 8x13 box. */ -void DumpCharacterOnScreen(DWORD BmpBits[]) +static void DumpCharacterOnScreen(DWORD BmpBits[]) { - int i; - int j; + int i, j; for (i = 0; i < HEIGHT; i++) { @@ -39,111 +46,149 @@ } } +#else + /** * Dump the FontData for the bootvid/i386/bootdata.c array. */ -void DumpCharacterFontData(DWORD BmpBits[]) +static void DumpCharacterFontData(DWORD BmpBits[]) { static int iBegin = 0; int i; - printf(" "); + fprintf(stdout, " "); for (i = 0; i < HEIGHT; i++) - printf("0x%02lX, ", BmpBits[i]); + fprintf(stdout, "0x%02lX, ", BmpBits[i]); - printf(" // %d\n", iBegin); + fprintf(stdout, " // %d\n", iBegin); iBegin += HEIGHT; } +#endif /** * Use GDI APIs to load a monospace font and plot a single character into a bitmap. */ -BOOL PlotCharacter(WCHAR Character, DWORD BmpBits[]) +static BOOL PlotCharacter(HDC hDC, HFONT hFont, INT XOffset, INT YOffset, CHAR Character, DWORD BmpBits[]) { BOOL bReturnValue = FALSE; - int iHeight; + HBITMAP hOldBmp; + HFONT hOldFont; HBITMAP hBmp = NULL; - HDC hDC = NULL; - HFONT hFont = NULL; - PBITMAPINFO pBmpInfo; - - hDC = CreateCompatibleDC(NULL); - if (!hDC) - { - printf("CreateCompatibleDC failed with error %lu!\n", GetLastError()); - goto Cleanup; - } + BYTE BmpInfo[sizeof(BITMAPINFO) + sizeof(RGBQUAD)]; + PBITMAPINFO pBmpInfo = (PBITMAPINFO)&BmpInfo; hBmp = CreateCompatibleBitmap(hDC, WIDTH, HEIGHT); if (!hBmp) { - printf("CreateCompatibleBitmap failed with error %lu!\n", GetLastError()); + fprintf(stderr, "CreateCompatibleBitmap failed with error %lu!\n", GetLastError()); goto Cleanup; } - iHeight = -MulDiv(FONT_SIZE, GetDeviceCaps(hDC, LOGPIXELSY), 72); - hFont = CreateFontW(iHeight, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, NONANTIALIASED_QUALITY, FIXED_PITCH, FONT_NAME); - if (!hFont) - { - printf("CreateFontW failed with error %lu!\n", GetLastError()); - goto Cleanup; - } - - SelectObject(hDC, hBmp); - SelectObject(hDC, hFont); + hOldBmp = SelectObject(hDC, hBmp); + hOldFont = SelectObject(hDC, hFont); SetBkColor(hDC, RGB(0, 0, 0)); SetTextColor(hDC, RGB(255, 255, 255)); - TextOutW(hDC, X_OFFSET, Y_OFFSET, &Character, 1); + TextOutA(hDC, XOffset, YOffset, &Character, 1); - // Allocate enough memory for BITMAPINFO and one additional color in the color table. - // BITMAPINFO already contains a color table entry for a single color and GetDIBits needs space for two colors (black and white). - pBmpInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFO) + sizeof(RGBQUAD)); - ZeroMemory(pBmpInfo, sizeof(BITMAPINFO) + sizeof(RGBQUAD)); + /* + * Use enough memory for BITMAPINFO and one additional color in the color table. + * BITMAPINFO already contains a color table entry for a single color and + * GetDIBits needs space for two colors (black and white). + */ + ZeroMemory(&BmpInfo, sizeof(BmpInfo)); pBmpInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); pBmpInfo->bmiHeader.biHeight = -HEIGHT; pBmpInfo->bmiHeader.biWidth = WIDTH; pBmpInfo->bmiHeader.biBitCount = 1; pBmpInfo->bmiHeader.biPlanes = 1; + bReturnValue = TRUE; + if (!GetDIBits(hDC, hBmp, 0, HEIGHT, BmpBits, pBmpInfo, 0)) { - printf("GetDIBits failed with error %lu!\n", GetLastError()); - goto Cleanup; + fprintf(stderr, "GetDIBits failed with error %lu!\n", GetLastError()); + bReturnValue = FALSE; } - bReturnValue = TRUE; + SelectObject(hDC, hOldBmp); + SelectObject(hDC, hOldFont); Cleanup: - if (hFont) - DeleteObject(hFont); - if (hBmp) DeleteObject(hBmp); - - if (hDC) - DeleteDC(hDC); return bReturnValue; } -int main() +static void DumpFont(LPSTR FontName, INT FontSize, INT XOffset, INT YOffset) { + int iHeight; + HDC hDC = NULL; + HFONT hFont = NULL; + DWORD BmpBits[HEIGHT]; - WCHAR c; + USHORT c; + + hDC = CreateCompatibleDC(NULL); + if (!hDC) + { + fprintf(stderr, "CreateCompatibleDC failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + iHeight = -MulDiv(FontSize, GetDeviceCaps(hDC, LOGPIXELSY), 72); + hFont = CreateFontA(iHeight, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, 0, 0, NONANTIALIASED_QUALITY, + FIXED_PITCH, FontName); + if (!hFont) + { + fprintf(stderr, "CreateFont failed with error %lu!\n", GetLastError()); + goto Cleanup; + } for (c = 0; c < 256; c++) { - PlotCharacter(c, BmpBits); + PlotCharacter(hDC, hFont, XOffset, YOffset, (CHAR)c, BmpBits); -#if 0 +#ifdef DUMP_CHAR_ON_SCREEN DumpCharacterOnScreen(BmpBits); - system("pause"); + fprintf(stdout, "\nPress any key to continue...\n"); + _getch(); system("cls"); #else DumpCharacterFontData(BmpBits); #endif } +Cleanup: + if (hFont) + DeleteObject(hFont); + + if (hDC) + DeleteDC(hDC); +} + +int main(int argc, char** argv) +{ + /* Validate the arguments */ + if (argc > 5 || (argc >= 2 && strncmp(argv[1], "/?", 2) == 0)) + { + fprintf(stdout, + "Usage: %s \"font name\" [font size] [X-offset] [Y-offset]\n" + "Default font name is: \"%s\"\n" + "Default font size is: %i\n" + "Default X-offset is: %i\n" + "Default Y-offset is: %i\n", + argv[0], + FONT_NAME_DEF, FONT_SIZE_DEF, X_OFFSET_DEF, Y_OFFSET_DEF); + + return -1; + } + + DumpFont((argc <= 1) ? FONT_NAME_DEF : argv[1], + (argc <= 2) ? FONT_SIZE_DEF : atoi(argv[2]), + (argc <= 3) ? X_OFFSET_DEF : atoi(argv[3]), + (argc <= 4) ? Y_OFFSET_DEF : atoi(argv[4])); return 0; }

8 years, 11 months

[hbelusca] 70511: [USB(E|O|U)HCI]: Handle failure cases of BuildTransferDescriptorChain. By contributor 'vgal'. This is needed for gracefully handling failure cases hit during diagnosing CORE-8046....

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 6 23:43:38 2016 New Revision: 70511 URL: http://svn.reactos.org/svn/reactos?rev=70511&view=rev Log: [USB(E|O|U)HCI]: Handle failure cases of BuildTransferDescriptorChain. By contributor 'vgal'. This is needed for gracefully handling failure cases hit during diagnosing CORE-8046. CORE-10776 Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp trunk/reactos/drivers/usb/usbohci/usb_request.cpp trunk/reactos/drivers/usb/usbuhci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Wed Jan 6 23:43:38 2016 @@ -836,13 +836,14 @@ // // first allocate the queue head // - Status = CreateQueueHead(&QueueHead); + Status = CreateQueueHead(&QueueHead); if (!NT_SUCCESS(Status)) { // // failed to allocate queue head // - return STATUS_INSUFFICIENT_RESOURCES; + DPRINT1("[EHCI] Failed to create queue head\n"); + return Status; } // @@ -856,11 +857,12 @@ Status = BuildSetupPacket(); if (!NT_SUCCESS(Status)) { - // - // failed to allocate setup packet - // - ASSERT(FALSE); - return STATUS_INSUFFICIENT_RESOURCES; + // failed to create setup packet + DPRINT1("[EHCI] Failed to create setup packet\n"); + + // release queue head + m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); + return Status; } // @@ -869,10 +871,17 @@ Status = CreateDescriptor(&SetupDescriptor); if (!NT_SUCCESS(Status)) { - // - // failed to allocate transfer descriptor - // - ASSERT(FALSE); + // failed to create setup transfer descriptor + DPRINT1("[EHCI] Failed to create setup descriptor\n"); + + if (m_DescriptorPacket) + { + // release packet descriptor + m_DmaManager->Release(m_DescriptorPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + } + + // release queue head + m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); return Status; } @@ -882,10 +891,20 @@ Status = CreateDescriptor(&StatusDescriptor); if (!NT_SUCCESS(Status)) { - // - // failed to allocate transfer descriptor - // - ASSERT(FALSE); + // failed to create status transfer descriptor + DPRINT1("[EHCI] Failed to create status descriptor\n"); + + // release setup transfer descriptor + m_DmaManager->Release(SetupDescriptor, sizeof(QUEUE_TRANSFER_DESCRIPTOR)); + + if (m_DescriptorPacket) + { + // release packet descriptor + m_DmaManager->Release(m_DescriptorPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + } + + // release queue head + m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); return Status; } @@ -928,11 +947,28 @@ &LastDescriptor, NULL, &DescriptorChainLength); - - // - // FIXME handle errors - // - ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + // failed to create descriptor chain + DPRINT1("[EHCI] Failed to create status descriptor\n"); + + // release status transfer descriptor + m_DmaManager->Release(StatusDescriptor, sizeof(QUEUE_TRANSFER_DESCRIPTOR)); + + // release setup transfer descriptor + m_DmaManager->Release(SetupDescriptor, sizeof(QUEUE_TRANSFER_DESCRIPTOR)); + + if (m_DescriptorPacket) + { + // release packet descriptor + m_DmaManager->Release(m_DescriptorPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + } + + // release queue head + m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); + return Status; + } + if (m_TransferBufferLength != DescriptorChainLength) { DPRINT1("DescriptorChainLength %x\n", DescriptorChainLength); @@ -1075,13 +1111,13 @@ // Allocate the queue head // Status = CreateQueueHead(&QueueHead); - if (!NT_SUCCESS(Status)) { // - // failed to allocate queue heads - // - return STATUS_INSUFFICIENT_RESOURCES; + // failed to allocate queue head + // + DPRINT1("[EHCI] Failed to create queue head\n"); + return Status; } // @@ -1128,13 +1164,20 @@ &LastDescriptor, &m_EndpointDescriptor->DataToggle, &ChainDescriptorLength); + if (!NT_SUCCESS(Status)) + { + // + // failed to build transfer descriptor chain + // + DPRINT1("[EHCI] Failed to create descriptor chain\n"); + m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); + return Status; + } // // move to next offset // m_TransferBufferLengthCompleted += ChainDescriptorLength; - - ASSERT(Status == STATUS_SUCCESS); // // init queue head @@ -1228,7 +1271,6 @@ // allocate queue head // Status = m_DmaManager->Allocate(sizeof(QUEUE_HEAD), (PVOID*)&QueueHead, &QueueHeadPhysicalAddress); - if (!NT_SUCCESS(Status)) { // Modified: trunk/reactos/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Wed Jan 6 23:43:38 2016 @@ -1288,6 +1288,14 @@ &FirstDescriptor, &LastDescriptor, &ChainDescriptorLength); + if (!NT_SUCCESS(Status)) + { + // + // failed to build transfer descriptor chain + // + m_DmaManager->Release(EndpointDescriptor, sizeof(OHCI_ENDPOINT_DESCRIPTOR)); + return Status; + } // // move to next offset Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Wed Jan 6 23:43:38 2016 @@ -1008,7 +1008,7 @@ Status = BuildQueueHead(&QueueHead); if (!NT_SUCCESS(Status)) { - // failed to allocate descriptor + // failed to allocate queue head DPRINT1("[UHCI] Failed to create queue head\n"); return Status; } @@ -1040,6 +1040,15 @@ &LastDescriptor, &ChainDescriptorLength, NULL); + if (!NT_SUCCESS(Status)) + { + // + // failed to allocate descriptor + // + DPRINT1("[UHCI] Failed to create descriptor chain\n"); + m_DmaManager->Release(QueueHead, sizeof(UHCI_QUEUE_HEAD)); + return Status; + } // adjust buffer offset m_TransferBufferLengthCompleted += ChainDescriptorLength; @@ -1076,7 +1085,7 @@ if (!NT_SUCCESS(Status)) { // - // failed to allocate descriptor + // failed to allocate queue head // DPRINT1("[UHCI] Failed to create queue head\n"); return Status;

8 years, 11 months

[pschweitzer] 70510: [ROSVBOXMGMT] Add a commented out way to automatically start `rosvboxmgmt auto' on start so that shortcuts for VBox shared folders are properly created. This is to be enabled o...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Jan 6 19:47:03 2016 New Revision: 70510 URL: http://svn.reactos.org/svn/reactos?rev=70510&view=rev Log: [ROSVBOXMGMT] Add a commented out way to automatically start `rosvboxmgmt auto' on start so that shortcuts for VBox shared folders are properly created. This is to be enabled on 0.4.0. CORE-10032 ROSAPPS-303 Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Wed Jan 6 19:47:03 2016 @@ -140,6 +140,9 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd /c md ""%programfiles%\Internet Explorer\"" && move %windir%\iexplore.exe ""%programfiles%\Internet Explorer\"" && ""%programfiles%\Internet Explorer\iexplore.exe"" /RegServer" ; Create .NET Framework InstallRoot key, reg_sz & full path HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd /c reg add HKLM\SOFTWARE\Microsoft\.NETFramework /v InstallRoot /t REG_SZ /d %SystemRoot%\Microsoft.NET\Framework\" + +; HACK - Start rosvboxmgmt - ROSAPPS-303 +;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","Handle VBox SF",0x00000000,"%windir%\bin\rosvboxmgmt auto" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu",,0x00000012

8 years, 11 months

← Newer
1
...
13
14
15
16
17
18
19
20
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 January 2016