Ros-diffs December 2019

ros-diffs@reactos.org

18 participants
225 discussions

[reactos] 02/08: [APITESTS] Add PROJECT(ApiTests) to get a separate VS solution file
by Timo Kreuzer 21 Dec '19

21 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=261e5a72cc91cfafdbe3d… commit 261e5a72cc91cfafdbe3d0df4ae30a47dcdf4b49 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Dec 26 20:08:24 2017 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Dec 21 12:44:48 2019 +0100 [APITESTS] Add PROJECT(ApiTests) to get a separate VS solution file --- modules/rostests/apitests/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 62ca4c742bc..a0418480c27 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -1,3 +1,6 @@ + +PROJECT(ApiTests) + include_directories(include) add_subdirectory(advapi32)

1 0

[reactos] 01/08: [TESTS] Instead of entirely skipping tests with ros_skip_flaky, only disable counting errors
by Timo Kreuzer 21 Dec '19

21 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88ab888f9478f383d8030… commit 88ab888f9478f383d803040170ef9eede3beff6e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Dec 4 16:20:18 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Dec 21 12:44:48 2019 +0100 [TESTS] Instead of entirely skipping tests with ros_skip_flaky, only disable counting errors --- sdk/include/reactos/wine/test.h | 77 ++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/sdk/include/reactos/wine/test.h b/sdk/include/reactos/wine/test.h index 52bad3a8f84..4da38a4533a 100644 --- a/sdk/include/reactos/wine/test.h +++ b/sdk/include/reactos/wine/test.h @@ -65,15 +65,14 @@ extern void winetest_set_location( const char* file, int line ); extern void winetest_start_todo( int is_todo ); extern int winetest_loop_todo(void); extern void winetest_end_todo(void); +extern void winetest_start_nocount(unsigned int flags); +extern int winetest_loop_nocount(void); +extern void winetest_end_nocount(void); extern int winetest_get_mainargs( char*** pargv ); extern LONG winetest_get_failures(void); extern LONG winetest_get_successes(void); extern void winetest_add_failures( LONG new_failures ); extern void winetest_wait_child_process( HANDLE process ); -extern void winetest_disable_success_count_start(); -extern int winetest_disable_success_count_end(); -extern int winetest_disable_success_count_get(); -extern int winetest_disable_success_count_set(); extern const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n ); extern const char *wine_dbgstr_guid( const GUID *guid ); @@ -164,13 +163,13 @@ extern void __winetest_cdecl winetest_print(const char* msg, ...); #define todo_wine_if(is_todo) todo_if((is_todo) && !strcmp(winetest_platform, "wine")) #endif -#define ros_skip_flaky for (winetest_print("Skipping flaky test\n");0;) +#define ros_skip_flaky for (winetest_start_nocount(3); \ + winetest_loop_nocount(); \ + winetest_end_nocount()) -#define disable_success_count for (winetest_disable_success_count_start(); \ - (winetest_disable_success_count_get() ? \ - winetest_disable_success_count_end() : \ - winetest_disable_success_count_set()); \ - ) +#define disable_success_count for (winetest_start_nocount(1); \ + winetest_loop_nocount(); \ + winetest_end_nocount()) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) @@ -374,6 +373,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) fprintf( stdout, __winetest_file_line_prefix ": Test succeeded inside todo block: ", data->current_file, data->current_line ); vfprintf(stdout, msg, args); + if ((data->nocount_level & 2) == 0) InterlockedIncrement(&todo_failures); return 0; } @@ -386,7 +386,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) data->current_file, data->current_line ); vfprintf(stdout, msg, args); } - if (data->nocount_level == 0) + if ((data->nocount_level & 1) == 0) InterlockedIncrement(&todo_successes); return 1; } @@ -398,15 +398,16 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) fprintf( stdout, __winetest_file_line_prefix ": Test failed: ", data->current_file, data->current_line ); vfprintf(stdout, msg, args); + if ((data->nocount_level & 2) == 0) InterlockedIncrement(&failures); return 0; } else { - if (report_success && data->nocount_level == 0) + if (report_success && (data->nocount_level & 1) == 0) fprintf( stdout, __winetest_file_line_prefix ": Test succeeded\n", data->current_file, data->current_line); - if (data->nocount_level == 0) + if ((data->nocount_level & 1) == 0) InterlockedIncrement(&successes); return 1; } @@ -500,6 +501,34 @@ void winetest_end_todo(void) data->todo_level >>= 1; } +void winetest_start_nocount(unsigned int flags) +{ + tls_data* data = get_tls_data(); + + /* The lowest 2 bits of nocount_level specify whether counting of successes + and/or failures is disabled. For each nested level the bits are shifted + left, the new lowest 2 bits are copied from the previous state and ored + with the new mask. This allows nested handling of both states up tp a + level of 16. */ + flags |= data->nocount_level & 3; + data->nocount_level = (data->nocount_level << 2) | flags; + data->todo_do_loop = 1; +} + +int winetest_loop_nocount(void) +{ + tls_data* data = get_tls_data(); + int do_loop = data->todo_do_loop; + data->todo_do_loop = 0; + return do_loop; +} + +void winetest_end_nocount(void) +{ + tls_data* data = get_tls_data(); + data->nocount_level >>= 2; +} + int winetest_get_mainargs( char*** pargv ) { *pargv = winetest_argv; @@ -548,28 +577,6 @@ void winetest_wait_child_process( HANDLE process ) } } -void winetest_disable_success_count_start() -{ - get_tls_data()->nocount_level <<= 1; -} - -int winetest_disable_success_count_end() -{ - get_tls_data()->nocount_level >>= 1; - return 0; -} - -int winetest_disable_success_count_get() -{ - return get_tls_data()->nocount_level & 1; -} - -int winetest_disable_success_count_set() -{ - get_tls_data()->nocount_level |= 1; - return 1; -} - const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n ) { char *dst, *res;

1 0

[reactos] 01/01: [USER32] Add ICO_ExtractIconExW RetPtr NULL check (#2149)
by Katayama Hirofumi MZ 16 Dec '19

16 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2af9e7dfacc582d385bcf… commit 2af9e7dfacc582d385bcf858865ea11d4845cef8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 16 20:37:23 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 16 20:37:23 2019 +0900 [USER32] Add ICO_ExtractIconExW RetPtr NULL check (#2149) CORE-16557 --- win32ss/user/user32/misc/exticon.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/win32ss/user/user32/misc/exticon.c b/win32ss/user/user32/misc/exticon.c index d3e18b08915..ba2bd6d6b2c 100644 --- a/win32ss/user/user32/misc/exticon.c +++ b/win32ss/user/user32/misc/exticon.c @@ -469,17 +469,20 @@ static UINT ICO_ExtractIconExW( icon = CreateIconFromResourceEx(imageData, entry->icHeader.biSizeImage, sig == 1, 0x00030000, cx[index], cy[index], flags); + HeapFree(GetProcessHeap(), 0, cursorData); + if (icon) { - RetPtr[index] = icon; + if (RetPtr) + RetPtr[index] = icon; + else + DestroyIcon(icon); + iconCount = 1; + break; } - - if(cursorData != NULL) - HeapFree(GetProcessHeap(), 0, cursorData); } } - } ret = iconCount; /* return number of retrieved icons */ }

1 0

[reactos] 01/01: [USBOHCI] Use KeQueryTickCount for timeouts instead of KeQuerySystemTime
by Victor Perevertkin 16 Dec '19

16 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23147330dd3fb90ef8075… commit 23147330dd3fb90ef8075ffd25bdb455c809fe63 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Dec 16 03:21:28 2019 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Dec 16 03:21:28 2019 +0300 [USBOHCI] Use KeQueryTickCount for timeouts instead of KeQuerySystemTime --- drivers/usb/usbohci_new/usbohci.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/usb/usbohci_new/usbohci.c b/drivers/usb/usbohci_new/usbohci.c index e7aa0bcb5d8..4ac235e20b7 100644 --- a/drivers/usb/usbohci_new/usbohci.c +++ b/drivers/usb/usbohci_new/usbohci.c @@ -540,8 +540,8 @@ OHCI_TakeControlHC(IN POHCI_EXTENSION OhciExtension, OHCI_REG_INTERRUPT_ENABLE_DISABLE IntDisable; OHCI_REG_COMMAND_STATUS CommandStatus; OHCI_REG_INTERRUPT_STATUS IntStatus; - LARGE_INTEGER EndTime; - LARGE_INTEGER SystemTime; + LARGE_INTEGER StartTicks, CurrentTicks; + UINT32 TicksDiff; DPRINT("OHCI_TakeControlHC: ...\n"); @@ -596,8 +596,8 @@ OHCI_TakeControlHC(IN POHCI_EXTENSION OhciExtension, /* Monitoring the InterruptRouting bit to determine when the ownership change has taken effect. */ - KeQuerySystemTime(&EndTime); - EndTime.QuadPart += 500 * 10000; // 0.5 sec; + TicksDiff = (500 * 10000) / KeQueryTimeIncrement(); // 500 ms + KeQueryTickCount(&StartTicks); do { @@ -618,9 +618,9 @@ OHCI_TakeControlHC(IN POHCI_EXTENSION OhciExtension, return MP_STATUS_SUCCESS; } - KeQuerySystemTime(&SystemTime); + KeQueryTickCount(&CurrentTicks); } - while (SystemTime.QuadPart < EndTime.QuadPart); + while (CurrentTicks.QuadPart - StartTicks.QuadPart < TicksDiff); return MP_STATUS_HW_ERROR; } @@ -647,8 +647,8 @@ OHCI_StartController(IN PVOID ohciExtension, POHCI_ENDPOINT_DESCRIPTOR IntED; ULONG_PTR IntEdPA; POHCI_HCCA OhciHCCA; - LARGE_INTEGER SystemTime; - LARGE_INTEGER EndTime; + LARGE_INTEGER StartTicks, CurrentTicks; + UINT32 TicksDiff; ULONG ix; ULONG jx; MPSTATUS MPStatus = MP_STATUS_SUCCESS; @@ -791,17 +791,17 @@ OHCI_StartController(IN PVOID ohciExtension, WRITE_REGISTER_ULONG(ControlReg, Control.AsULONG); - KeQuerySystemTime(&EndTime); - EndTime.QuadPart += 500 * 10000; // 0.5 sec + TicksDiff = (500 * 10000) / KeQueryTimeIncrement(); // 500 ms + KeQueryTickCount(&StartTicks); while (TRUE) { WRITE_REGISTER_ULONG(FmIntervalReg, OhciExtension->FrameInterval.AsULONG); FrameInterval.AsULONG = READ_REGISTER_ULONG(FmIntervalReg); - KeQuerySystemTime(&SystemTime); + KeQueryTickCount(&CurrentTicks); - if (SystemTime.QuadPart >= EndTime.QuadPart) + if (CurrentTicks.QuadPart - StartTicks.QuadPart >= TicksDiff) { MPStatus = MP_STATUS_HW_ERROR; break;

1 0

[reactos] 01/01: [KS] Use KeQueryTickCount for timeouts instead of KeQuerySystemTime This avoids overflow when system time is changed between calls (for example, via NTP)
by Victor Perevertkin 15 Dec '19

15 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d9e03b708c53c3a76324… commit 1d9e03b708c53c3a76324cb1aea8f86ccba85b7f Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Dec 16 02:28:41 2019 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Dec 16 02:28:41 2019 +0300 [KS] Use KeQueryTickCount for timeouts instead of KeQuerySystemTime This avoids overflow when system time is changed between calls (for example, via NTP) --- drivers/ksfilter/ks/swenum.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/ksfilter/ks/swenum.c b/drivers/ksfilter/ks/swenum.c index 75f473c918d..04b473d6a02 100644 --- a/drivers/ksfilter/ks/swenum.c +++ b/drivers/ksfilter/ks/swenum.c @@ -77,7 +77,7 @@ KspCreatePDO( DeviceEntry->DeviceState = NotStarted; /* get current time */ - KeQuerySystemTime(&DeviceEntry->TimeCreated); + KeQueryTickCount(&DeviceEntry->TimeCreated); /* setup flags */ DeviceObject->Flags |= DO_POWER_PAGABLE; @@ -807,7 +807,7 @@ KspStartBusDevice( DeviceEntry->DeviceState = Started; /* reference start time */ - KeQuerySystemTime(&DeviceEntry->TimeCreated); + KeQueryTickCount(&DeviceEntry->TimeCreated); DPRINT1("KspStartBusDevice Name %S DeviceName %S Instance %S Started\n", Name, DeviceEntry->DeviceName, DeviceEntry->Instance); @@ -1193,7 +1193,7 @@ KspBusWorkerRoutine( KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); /* get current time */ - KeQuerySystemTime(&Time); + KeQueryTickCount(&Time); /* enumerate all device entries */ Entry = BusDeviceExtension->Common.Entry.Flink; @@ -1211,14 +1211,20 @@ KspBusWorkerRoutine( { if (DeviceEntry->DeviceState == NotStarted) { - Diff.QuadPart = Time.QuadPart - DeviceEntry->TimeCreated.QuadPart; + Diff.QuadPart = (Time.QuadPart - DeviceEntry->TimeCreated.QuadPart) * KeQueryTimeIncrement(); + /* wait for 15 sec */ if (Diff.QuadPart > Int32x32To64(15000, 10000)) { /* release spin lock */ KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); - DPRINT1("DeviceID %S Instance %S TimeCreated %I64u Now %I64u Diff %I64u hung\n", DeviceEntry->DeviceName, DeviceEntry->Instance, DeviceEntry->TimeCreated.QuadPart, Time.QuadPart, Diff.QuadPart); + DPRINT1("DeviceID %S Instance %S TimeCreated %I64u Now %I64u Diff %I64u hung\n", + DeviceEntry->DeviceName, + DeviceEntry->Instance, + DeviceEntry->TimeCreated.QuadPart * KeQueryTimeIncrement(), + Time.QuadPart * KeQueryTimeIncrement(), + Diff.QuadPart); /* deactivate interfaces */ //KspEnableBusDeviceInterface(DeviceEntry, FALSE);

1 0

[reactos] 01/01: [NETAPI32][WKSSVC] Implement NetGetJoinInformation using the workstation service
by Eric Kohl 15 Dec '19

15 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7908e2e41fe0c505ae250… commit 7908e2e41fe0c505ae25097b775aa4612c252599 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 15 19:53:23 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 15 19:53:23 2019 +0100 [NETAPI32][WKSSVC] Implement NetGetJoinInformation using the workstation service --- base/services/wkssvc/domain.c | 59 ++++++++++++++++++++++++++++++++++++++++ base/services/wkssvc/precomp.h | 5 ++++ base/services/wkssvc/rpcserver.c | 10 ++++--- dll/win32/netapi32/wksta.c | 19 ------------- dll/win32/netapi32/wksta_new.c | 4 +-- 5 files changed, 71 insertions(+), 26 deletions(-) diff --git a/base/services/wkssvc/domain.c b/base/services/wkssvc/domain.c index 4d39c978fce..69340adfd54 100644 --- a/base/services/wkssvc/domain.c +++ b/base/services/wkssvc/domain.c @@ -66,4 +66,63 @@ NetpJoinWorkgroup( return NERR_Success; } + +NET_API_STATUS +NetpGetJoinInformation( + LPWSTR *NameBuffer, + PNETSETUP_JOIN_STATUS BufferType) +{ + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + PPOLICY_PRIMARY_DOMAIN_INFO PrimaryDomainInfo = NULL; + LSA_HANDLE PolicyHandle = NULL; + NTSTATUS Status; + + *BufferType = NetSetupUnknownStatus; + *NameBuffer = NULL; + + ZeroMemory(&ObjectAttributes, sizeof(LSA_OBJECT_ATTRIBUTES)); + ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_VIEW_LOCAL_INFORMATION, + &PolicyHandle); + if (!LSA_SUCCESS(Status)) + return LsaNtStatusToWinError(Status); + + Status = LsaQueryInformationPolicy(PolicyHandle, + PolicyPrimaryDomainInformation, + (PVOID*)&PrimaryDomainInfo); + if (LSA_SUCCESS(Status)) + { + TRACE("Sid: %p\n", PrimaryDomainInfo->Sid); + TRACE("Name: %S\n", PrimaryDomainInfo->Name.Buffer); + + if (PrimaryDomainInfo->Name.Length > 0) + { + if (PrimaryDomainInfo->Sid != NULL) + *BufferType = NetSetupDomainName; + else + *BufferType = NetSetupWorkgroupName; + + *NameBuffer = midl_user_allocate(PrimaryDomainInfo->Name.Length + sizeof(WCHAR)); + if (*NameBuffer) + wcscpy(*NameBuffer, PrimaryDomainInfo->Name.Buffer); + } + else + { + *BufferType = NetSetupUnjoined; + } + + if (PrimaryDomainInfo->Sid) + LsaFreeMemory(PrimaryDomainInfo->Sid); + + LsaFreeMemory(PrimaryDomainInfo); + } + + LsaClose(PolicyHandle); + + return LsaNtStatusToWinError(Status); +} + /* EOF */ diff --git a/base/services/wkssvc/precomp.h b/base/services/wkssvc/precomp.h index c6f841e1eb4..be3c7982465 100644 --- a/base/services/wkssvc/precomp.h +++ b/base/services/wkssvc/precomp.h @@ -28,6 +28,11 @@ NET_API_STATUS NetpJoinWorkgroup( _In_ LPCWSTR WorkgroupName); +NET_API_STATUS +NetpGetJoinInformation( + LPWSTR *NameBuffer, + PNETSETUP_JOIN_STATUS BufferType); + /* rpcserver.c */ diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index 47f96f8921a..79a062c8ecc 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -364,12 +364,14 @@ NetrGetJoinInformation( wchar_t **NameBuffer, PNETSETUP_JOIN_STATUS BufferType) { - TRACE("NetrGetJoinInformation()\n"); + TRACE("NetrGetJoinInformation(%p %p %p)\n", + ServerName, NameBuffer, BufferType); - *NameBuffer = NULL; - *BufferType = NetSetupUnjoined; + if (NameBuffer == NULL) + return ERROR_INVALID_PARAMETER; - return NERR_Success; + return NetpGetJoinInformation(NameBuffer, + BufferType); } diff --git a/dll/win32/netapi32/wksta.c b/dll/win32/netapi32/wksta.c index 616833c98c1..9200b17aaa0 100644 --- a/dll/win32/netapi32/wksta.c +++ b/dll/win32/netapi32/wksta.c @@ -552,22 +552,3 @@ NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level, } return ret; } - -/************************************************************ - * NetGetJoinInformation (NETAPI32.@) - */ -NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation( - LPCWSTR Server, - LPWSTR *Name, - PNETSETUP_JOIN_STATUS type) -{ - FIXME("Stub %s %p %p\n", wine_dbgstr_w(Server), Name, type); - - if (Name == NULL || type == NULL) - return ERROR_INVALID_PARAMETER; - - *Name = NULL; - *type = NetSetupUnknownStatus; - - return NERR_Success; -} diff --git a/dll/win32/netapi32/wksta_new.c b/dll/win32/netapi32/wksta_new.c index a8eb1da2c84..1853b2052a7 100644 --- a/dll/win32/netapi32/wksta_new.c +++ b/dll/win32/netapi32/wksta_new.c @@ -312,7 +312,6 @@ NetEnumerateComputerNames( } -#if 0 NET_API_STATUS WINAPI NetGetJoinInformation( @@ -342,7 +341,6 @@ NetGetJoinInformation( return status; } -#endif NET_API_STATUS @@ -594,7 +592,7 @@ NetSetPrimaryComputerName( NET_API_STATUS WINAPI NetUnjoinDomain( - _In_ LPCWSTR lpServer, + _In_opt_ LPCWSTR lpServer, _In_opt_ LPCWSTR lpAccount, _In_opt_ LPCWSTR lpPassword, _In_ DWORD fUnjoinOptions)

1 0

[reactos] 01/01: [WIDL] Fix type offset calculation for toplevel pointers to non-basetypes.
by Eric Kohl 15 Dec '19

15 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2540090d30effc6961bf… commit d2540090d30effc6961bf713625baf521c6123f0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 15 18:21:11 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 15 18:21:11 2019 +0100 [WIDL] Fix type offset calculation for toplevel pointers to non-basetypes. WIDL used the wrong type information when a pointer to a non-basetype is used as a functions parameter. For example, a 'wchar_t**' would be treated as a 'wchar_t*'. This patch will be sent upstream. --- sdk/tools/widl/typegen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/tools/widl/typegen.c b/sdk/tools/widl/typegen.c index 0bca062ab4b..4a791465821 100644 --- a/sdk/tools/widl/typegen.c +++ b/sdk/tools/widl/typegen.c @@ -3639,6 +3639,7 @@ static unsigned int write_type_tfs(FILE *file, int indent, case TGT_POINTER: { enum type_context ref_context; + unsigned int toplevel_offset = *typeformat_offset; type_t *ref = type_pointer_get_ref(type); if (context == TYPE_CONTEXT_TOPLEVELPARAM) @@ -3656,7 +3657,7 @@ static unsigned int write_type_tfs(FILE *file, int indent, offset = write_type_tfs(file, indent, attrs, ref, name, ref_context, typeformat_offset); if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) return 0; - return offset; + return (context == TYPE_CONTEXT_TOPLEVELPARAM) ? toplevel_offset : offset; } offset = write_type_tfs( file, indent, attrs, type_pointer_get_ref(type), name,

1 0

[reactos] 04/04: [BLUE] Improve initialization and interfacing with INBV. CORE-15901
by Hermès Bélusca-Maïto 15 Dec '19

15 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfd8a84865b7571e5e6c9… commit bfd8a84865b7571e5e6c949b654830373651da59 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 15 03:37:52 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 15 03:37:52 2019 +0100 [BLUE] Improve initialization and interfacing with INBV. CORE-15901 This fixes display reset transition when an external module acquired INBV ownership and then released it, similarly to what was done in commit 0ad65796 for VIDEOPRT. For this a backup screenbuffer is used to store the contents of the screen just before an INBV screen acquire transition, and these contents are restored when it is detected that INBV ownership has been released. Also, the active text font associated with the active console code-page is restored, as well as the cursor state and shape. In addition, any user of BLUE.SYS is now required to explicitly issue a new IOCTL_CONSOLE_RESET_SCREEN to either enable or disable the screen. This allows avoiding nasty unwanted screen mode switches when a handle to the \Device\BlueScreen device is opened but no screen mode switch was actually wanted - This "fixes" this annoyance on ReactOS and Windows, when these are running witha VGA-compatible video driver and one wants to look at properties of the \Device\BlueScreen device using Sysinternals' WinObj. Following this, we don't need to check anymore for explicit INBV ownership by issuing calls to InbvCheckDisplayOwnership(), but instead we check whether the screen has beeen manually enabled using the aforementioned IOCTL. This partly supersedes commit 8b553a4b, and allows fixing the second bug, namely that if we start ReactOS without the /NOGUIBOOT option (and thus, INBV is active during boot), USETUP would not show up anything because BLUE.SYS wouldn't display anything on screen. See CORE-15901. [USETUP][CONSRV] Call IOCTL_CONSOLE_RESET_SCREEN to tell BlueScreen device to enable the screen. --- base/setup/usetup/console.c | 24 +- drivers/setup/blue/blue.c | 720 ++++++++++++++++----- sdk/include/reactos/drivers/blue/ntddblue.h | 2 + win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c | 31 +- 4 files changed, 594 insertions(+), 183 deletions(-) diff --git a/base/setup/usetup/console.c b/base/setup/usetup/console.c index ec73f382216..6e647d8bfde 100644 --- a/base/setup/usetup/console.c +++ b/base/setup/usetup/console.c @@ -47,11 +47,12 @@ BOOL WINAPI AllocConsole(VOID) { + NTSTATUS Status; UNICODE_STRING ScreenName = RTL_CONSTANT_STRING(L"\\??\\BlueScreen"); UNICODE_STRING KeyboardName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0"); OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; + ULONG Enable; /* Open the screen */ InitializeObjectAttributes(&ObjectAttributes, @@ -68,6 +69,24 @@ AllocConsole(VOID) if (!NT_SUCCESS(Status)) return FALSE; + /* Enable it */ + Enable = TRUE; + Status = NtDeviceIoControlFile(StdOutput, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_CONSOLE_RESET_SCREEN, + &Enable, + sizeof(Enable), + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + NtClose(StdOutput); + return FALSE; + } + /* Open the keyboard */ InitializeObjectAttributes(&ObjectAttributes, &KeyboardName, @@ -81,7 +100,10 @@ AllocConsole(VOID) FILE_OPEN, 0); if (!NT_SUCCESS(Status)) + { + NtClose(StdOutput); return FALSE; + } /* Reset the queue state */ InputQueueEmpty = TRUE; diff --git a/drivers/setup/blue/blue.c b/drivers/setup/blue/blue.c index 56a115fffd4..e9accab60e8 100644 --- a/drivers/setup/blue/blue.c +++ b/drivers/setup/blue/blue.c @@ -5,6 +5,7 @@ * COPYRIGHT: Copyright 1999 Boudewijn Dekker * Copyright 1999-2019 Eric Kohl * Copyright 2006 Filip Navara + * Copyright 2019 Hermes Belusca-Maito */ /* INCLUDES ******************************************************************/ @@ -25,6 +26,10 @@ typedef struct _DEVICE_EXTENSION { PUCHAR VideoMemory; /* Pointer to video memory */ + SIZE_T VideoMemorySize; + BOOLEAN Enabled; + PUCHAR ScreenBuffer; /* Pointer to screenbuffer */ + SIZE_T ScreenBufferSize; ULONG CursorSize; INT CursorVisible; USHORT CharAttribute; @@ -32,6 +37,8 @@ typedef struct _DEVICE_EXTENSION UCHAR ScanLines; /* Height of a text line */ USHORT Rows; /* Number of rows */ USHORT Columns; /* Number of columns */ + USHORT CursorX, CursorY; /* Cursor position */ + ULONG CodePage; /* Specifies the font associated to this code page */ } DEVICE_EXTENSION, *PDEVICE_EXTENSION; typedef struct _VGA_REGISTERS @@ -79,6 +86,218 @@ static const UCHAR DefaultPalette[] = 0xFF, 0xFF, 0xFF }; +/* INBV MANAGEMENT FUNCTIONS **************************************************/ + +static BOOLEAN +ScrResetScreen( + _In_ PDEVICE_EXTENSION DeviceExtension, + _In_ BOOLEAN FullReset, + _In_ BOOLEAN Enable); + +static PDEVICE_EXTENSION ResetDisplayParametersDeviceExtension = NULL; +static HANDLE InbvThreadHandle = NULL; +static BOOLEAN InbvMonitoring = FALSE; + +/* + * Reinitialize the display to base VGA mode. + * + * Returns TRUE if it completely resets the adapter to the given character mode. + * Returns FALSE otherwise, indicating that the HAL should perform the VGA mode + * reset itself after HwVidResetHw() returns control. + * + * This callback has been registered with InbvNotifyDisplayOwnershipLost() + * and is called by InbvAcquireDisplayOwnership(), typically when the bugcheck + * code regains display access. Therefore this routine can be called at any + * IRQL, and in particular at IRQL = HIGH_LEVEL. This routine must also reside + * completely in non-paged pool, and cannot perform the following actions: + * Allocate memory, access pageable memory, use any synchronization mechanisms + * or call any routine that must execute at IRQL = DISPATCH_LEVEL or below. + */ +static BOOLEAN +NTAPI +ScrResetDisplayParametersEx( + _In_ ULONG Columns, + _In_ ULONG Rows, + _In_ BOOLEAN CalledByInbv) +{ + PDEVICE_EXTENSION DeviceExtension; + + /* Bail out early if we don't have any resettable adapter */ + if (!ResetDisplayParametersDeviceExtension) + return FALSE; // No adapter found: request HAL to perform a full reset. + + /* + * If we have been unexpectedly called via a callback from + * InbvAcquireDisplayOwnership(), start monitoring INBV. + */ + if (CalledByInbv) + InbvMonitoring = TRUE; + + DeviceExtension = ResetDisplayParametersDeviceExtension; + ASSERT(DeviceExtension); + + /* Disable the screen but don't reset all screen settings (OK at high IRQL) */ + return ScrResetScreen(DeviceExtension, FALSE, FALSE); +} + +/* This callback is registered with InbvNotifyDisplayOwnershipLost() */ +static BOOLEAN +NTAPI +ScrResetDisplayParameters( + _In_ ULONG Columns, + _In_ ULONG Rows) +{ + /* Call the extended function, specifying we were called by INBV */ + return ScrResetDisplayParametersEx(Columns, Rows, TRUE); +} + +/* + * (Adapted for ReactOS/Win2k3 from an original comment + * by Gé van Geldorp, June 2003, r4937) + * + * DISPLAY OWNERSHIP + * + * So, who owns the physical display and is allowed to write to it? + * + * In NT 5.x (Win2k/Win2k3), upon boot INBV/BootVid owns the display, unless + * /NOGUIBOOT has been specified in the boot command line. Later in the boot + * sequence, WIN32K.SYS opens the DISPLAY device. This open call ends up in + * VIDEOPRT.SYS. This component takes ownership of the display by calling + * InbvNotifyDisplayOwnershipLost() -- effectively telling INBV to release + * ownership of the display it previously had. From that moment on, the display + * is owned by that component and can be switched to graphics mode. The display + * is not supposed to return to text mode, except in case of a bugcheck. + * The bugcheck code calls InbvAcquireDisplayOwnership() so as to make INBV + * re-take display ownership, and calls back the function previously registered + * by VIDEOPRT.SYS with InbvNotifyDisplayOwnershipLost(). After the bugcheck, + * execution is halted. So, under NT, the only possible sequence of display + * modes is text mode -> graphics mode -> text mode (the latter hopefully + * happening very infrequently). + * + * In ReactOS things are a little bit different. We want to have a functional + * interactive text mode. We should be able to switch back and forth from + * text mode to graphics mode when a GUI app is started and then finished. + * Also, when the system bugchecks in graphics mode we want to switch back to + * text mode and show the bugcheck information. Last but not least, when using + * KDBG in /DEBUGPORT=SCREEN mode, breaking into the debugger would trigger a + * switch to text mode, and the user would expect that by continuing execution + * a switch back to graphics mode is done. + */ +static VOID +NTAPI +InbvMonitorThread( + _In_ PVOID Context) +{ + LARGE_INTEGER Delay; + USHORT i; + + KeSetPriorityThread(KeGetCurrentThread(), LOW_REALTIME_PRIORITY); + + while (TRUE) + { + /* + * During one second, check the INBV status each 100 milliseconds, + * then revert to 1 second delay. + */ + i = 10; + Delay.QuadPart = (LONGLONG)-100*1000*10; // 100 millisecond delay + while (!InbvMonitoring) + { + KeDelayExecutionThread(KernelMode, FALSE, &Delay); + + if ((i > 0) && (--i == 0)) + Delay.QuadPart = (LONGLONG)-1*1000*1000*10; // 1 second delay + } + + /* + * Loop while the display is owned by INBV. We cannot do anything else + * than polling since INBV does not offer a proper notification system. + * + * During one second, check the INBV status each 100 milliseconds, + * then revert to 1 second delay. + */ + i = 10; + Delay.QuadPart = (LONGLONG)-100*1000*10; // 100 millisecond delay + while (InbvCheckDisplayOwnership()) + { + KeDelayExecutionThread(KernelMode, FALSE, &Delay); + + if ((i > 0) && (--i == 0)) + Delay.QuadPart = (LONGLONG)-1*1000*1000*10; // 1 second delay + } + + /* Reset the monitoring */ + InbvMonitoring = FALSE; + + /* + * Somebody released INBV display ownership, usually by invoking + * InbvNotifyDisplayOwnershipLost(). However the caller of this + * function certainly specified a different callback than ours. + * As we are going to be the only owner of the active display, + * we need to re-register our own display reset callback. + */ + InbvNotifyDisplayOwnershipLost(ScrResetDisplayParameters); + + /* Re-enable the screen, keeping the original screen settings */ + if (ResetDisplayParametersDeviceExtension) + ScrResetScreen(ResetDisplayParametersDeviceExtension, FALSE, TRUE); + } + + // FIXME: See ScrInbvCleanup(). + // PsTerminateSystemThread(STATUS_SUCCESS); +} + +static NTSTATUS +ScrInbvInitialize(VOID) +{ + /* Create the INBV monitoring thread if needed */ + if (!InbvThreadHandle) + { + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes = RTL_CONSTANT_OBJECT_ATTRIBUTES(NULL, OBJ_KERNEL_HANDLE); + + Status = PsCreateSystemThread(&InbvThreadHandle, + 0, + &ObjectAttributes, + NULL, + NULL, + InbvMonitorThread, + NULL); + if (!NT_SUCCESS(Status)) + InbvThreadHandle = NULL; + } + + /* Re-register the display reset callback with INBV */ + InbvNotifyDisplayOwnershipLost(ScrResetDisplayParameters); + + return STATUS_SUCCESS; +} + +static NTSTATUS +ScrInbvCleanup(VOID) +{ + // HANDLE ThreadHandle; + + // ResetDisplayParametersDeviceExtension = NULL; + InbvNotifyDisplayOwnershipLost(NULL); + ScrResetDisplayParametersEx(80, 50, FALSE); + // or InbvAcquireDisplayOwnership(); ? + +#if 0 + // TODO: Find the best way to communicate the request. + /* Signal the INBV monitoring thread and wait for it to terminate */ + ThreadHandle = InterlockedExchangePointer((PVOID*)&InbvThreadHandle, NULL); + if (ThreadHandle) + { + KeWaitForSingleObject(&ThreadHandle, Executive, KernelMode, FALSE, NULL); + /* Close its handle */ + ObCloseHandle(ThreadHandle, KernelMode); + } +#endif + + return STATUS_SUCCESS; +} + /* FUNCTIONS **************************************************************/ static VOID @@ -135,15 +354,66 @@ ScrSetRegisters(const VGA_REGISTERS *Registers) WRITE_PORT_UCHAR(PELMASK, 0xff); } +static VOID +FASTCALL +ScrSetCursor( + _In_ PDEVICE_EXTENSION DeviceExtension) +{ + ULONG Offset; + + if (!DeviceExtension->VideoMemory) + return; + + Offset = (DeviceExtension->CursorY * DeviceExtension->Columns) + DeviceExtension->CursorX; + + _disable(); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); + WRITE_PORT_UCHAR(CRTC_DATA, Offset); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); + WRITE_PORT_UCHAR(CRTC_DATA, Offset >> 8); + _enable(); +} + +static VOID +FASTCALL +ScrSetCursorShape( + _In_ PDEVICE_EXTENSION DeviceExtension) +{ + ULONG size, height; + UCHAR data, value; + + if (!DeviceExtension->VideoMemory) + return; + + height = DeviceExtension->ScanLines; + data = (DeviceExtension->CursorVisible) ? 0x00 : 0x20; + + size = (DeviceExtension->CursorSize * height) / 100; + if (size < 1) + size = 1; + + data |= (UCHAR)(height - size); + + _disable(); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORSTART); + WRITE_PORT_UCHAR(CRTC_DATA, data); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSOREND); + value = READ_PORT_UCHAR(CRTC_DATA) & 0xE0; + WRITE_PORT_UCHAR(CRTC_DATA, value | (height - 1)); + _enable(); +} + static VOID FASTCALL ScrAcquireOwnership( _In_ PDEVICE_EXTENSION DeviceExtension) { - ULONG offset; UCHAR data, value; + ULONG offset; ULONG Index; + _disable(); + ScrSetRegisters(&VidpMode3Regs); /* Disable screen and enable palette access */ @@ -162,12 +432,6 @@ ScrAcquireOwnership( READ_PORT_UCHAR(STATUS); WRITE_PORT_UCHAR(ATTRIB, 0x20); - /* Get current output position */ - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); - offset = READ_PORT_UCHAR(CRTC_DATA); - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); - offset += (READ_PORT_UCHAR(CRTC_DATA) << 8); - /* Switch blinking characters off */ READ_PORT_UCHAR(ATTRC_INPST1); value = READ_PORT_UCHAR(ATTRC_WRITEREG); @@ -190,7 +454,14 @@ ScrAcquireOwnership( WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_SCANLINES); DeviceExtension->ScanLines = (READ_PORT_UCHAR(CRTC_DATA) & 0x1F) + 1; + /* Retrieve the current output cursor position */ + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); + offset = READ_PORT_UCHAR(CRTC_DATA); + WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); + offset += (READ_PORT_UCHAR(CRTC_DATA) << 8); + /* Show blinking cursor */ + // FIXME: cursor block? Call ScrSetCursorShape() instead? WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORSTART); WRITE_PORT_UCHAR(CRTC_DATA, (DeviceExtension->ScanLines - 1) & 0x1F); WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSOREND); @@ -198,15 +469,19 @@ ScrAcquireOwnership( WRITE_PORT_UCHAR(CRTC_DATA, data | ((DeviceExtension->ScanLines - 1) & 0x1F)); + _enable(); + /* Calculate number of text rows */ - DeviceExtension->Rows = - DeviceExtension->Rows / DeviceExtension->ScanLines; -#ifdef BOCHS_30ROWS - DeviceExtension->Rows = 30; -#endif + DeviceExtension->Rows = DeviceExtension->Rows / DeviceExtension->ScanLines; - /* Upload a default font for the default codepage 437 */ - ScrLoadFontTable(437); + /* Set the cursor position, clipping it to the screen */ + DeviceExtension->CursorX = (USHORT)(offset % DeviceExtension->Columns); + DeviceExtension->CursorY = (USHORT)(offset / DeviceExtension->Columns); + // DeviceExtension->CursorX = min(max(DeviceExtension->CursorX, 0), DeviceExtension->Columns - 1); + DeviceExtension->CursorY = min(max(DeviceExtension->CursorY, 0), DeviceExtension->Rows - 1); + + /* Upload a default font for the current codepage */ + ScrLoadFontTable(DeviceExtension->CodePage); DPRINT("%d Columns %d Rows %d Scanlines\n", DeviceExtension->Columns, @@ -214,51 +489,183 @@ ScrAcquireOwnership( DeviceExtension->ScanLines); } -static DRIVER_DISPATCH ScrCreate; -static NTSTATUS -NTAPI -ScrCreate( - _In_ PDEVICE_OBJECT DeviceObject, - _In_ PIRP Irp) +static BOOLEAN +ScrResetScreen( + _In_ PDEVICE_EXTENSION DeviceExtension, + _In_ BOOLEAN FullReset, + _In_ BOOLEAN Enable) { #define FOREGROUND_LIGHTGRAY (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED) - PDEVICE_EXTENSION DeviceExtension; PHYSICAL_ADDRESS BaseAddress; - NTSTATUS Status; - DeviceExtension = DeviceObject->DeviceExtension; + /* Allow resets to the same state only for full resets */ + if (!FullReset && (Enable == DeviceExtension->Enabled)) + return FALSE; // STATUS_INVALID_PARAMETER; STATUS_INVALID_DEVICE_REQUEST; + + if (FullReset) + { + DeviceExtension->CursorSize = 5; /* FIXME: value correct?? */ + DeviceExtension->CursorVisible = TRUE; + + /* More initialization */ + DeviceExtension->CharAttribute = BACKGROUND_BLUE | FOREGROUND_LIGHTGRAY; + DeviceExtension->Mode = ENABLE_PROCESSED_OUTPUT | + ENABLE_WRAP_AT_EOL_OUTPUT; + DeviceExtension->CodePage = 437; /* Use default codepage */ + } - if (!InbvCheckDisplayOwnership()) + if (Enable) { ScrAcquireOwnership(DeviceExtension); - /* Get a pointer to the video memory */ - BaseAddress.QuadPart = VIDMEM_BASE; - DeviceExtension->VideoMemory = - (PUCHAR)MmMapIoSpace(BaseAddress, DeviceExtension->Rows * DeviceExtension->Columns * 2, MmNonCached); + if (FullReset) + { + /* + * Fully reset the screen and all its settings. + */ + + /* Unmap any previously mapped video memory */ + if (DeviceExtension->VideoMemory) + { + ASSERT(DeviceExtension->VideoMemorySize != 0); + MmUnmapIoSpace(DeviceExtension->VideoMemory, DeviceExtension->VideoMemorySize); + } + DeviceExtension->VideoMemory = NULL; + DeviceExtension->VideoMemorySize = 0; + + /* Free any previously allocated backup screenbuffer */ + if (DeviceExtension->ScreenBuffer) + { + ASSERT(DeviceExtension->ScreenBufferSize != 0); + ExFreePoolWithTag(DeviceExtension->ScreenBuffer, TAG_BLUE); + } + DeviceExtension->ScreenBuffer = NULL; + DeviceExtension->ScreenBufferSize = 0; + + /* Get a pointer to the video memory */ + DeviceExtension->VideoMemorySize = DeviceExtension->Rows * DeviceExtension->Columns * 2; + if (DeviceExtension->VideoMemorySize == 0) + return FALSE; // STATUS_INVALID_VIEW_SIZE; STATUS_MAPPED_FILE_SIZE_ZERO; + + /* Map the video memory */ + BaseAddress.QuadPart = VIDMEM_BASE; + DeviceExtension->VideoMemory = + (PUCHAR)MmMapIoSpace(BaseAddress, DeviceExtension->VideoMemorySize, MmNonCached); + if (!DeviceExtension->VideoMemory) + { + DeviceExtension->VideoMemorySize = 0; + return FALSE; // STATUS_NONE_MAPPED; STATUS_NOT_MAPPED_VIEW; STATUS_CONFLICTING_ADDRESSES; + } + + /* Initialize the backup screenbuffer in non-paged pool (must be accessible at high IRQL) */ + DeviceExtension->ScreenBufferSize = DeviceExtension->VideoMemorySize; + DeviceExtension->ScreenBuffer = + (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, DeviceExtension->ScreenBufferSize, TAG_BLUE); + if (!DeviceExtension->ScreenBuffer) + { + DPRINT1("Could not allocate screenbuffer, ignore...\n"); + DeviceExtension->ScreenBufferSize = 0; + } + + /* (Re-)initialize INBV */ + ScrInbvInitialize(); + } + else + { + /* + * Restore the previously disabled screen. + */ + + /* Restore the snapshot of the video memory from the backup screenbuffer */ + if (DeviceExtension->ScreenBuffer) + { + ASSERT(DeviceExtension->VideoMemory); + ASSERT(DeviceExtension->ScreenBuffer); + ASSERT(DeviceExtension->ScreenBufferSize != 0); + ASSERT(DeviceExtension->VideoMemorySize == DeviceExtension->ScreenBufferSize); + + RtlCopyMemory(DeviceExtension->VideoMemory, + DeviceExtension->ScreenBuffer, + DeviceExtension->VideoMemorySize); + } + + /* Restore the cursor state */ + ScrSetCursor(DeviceExtension); + ScrSetCursorShape(DeviceExtension); + } + DeviceExtension->Enabled = TRUE; } else { - /* Store dummy values */ - DeviceExtension->Columns = 1; - DeviceExtension->Rows = 1; - DeviceExtension->ScanLines = 1; - } + DeviceExtension->Enabled = FALSE; + if (FullReset) + { + /* + * Fully disable the screen and reset all its settings. + */ - DeviceExtension->CursorSize = 5; /* FIXME: value correct?? */ - DeviceExtension->CursorVisible = TRUE; + /* Clean INBV up */ + ScrInbvCleanup(); - /* More initialization */ - DeviceExtension->CharAttribute = BACKGROUND_BLUE | FOREGROUND_LIGHTGRAY; - DeviceExtension->Mode = ENABLE_PROCESSED_OUTPUT | - ENABLE_WRAP_AT_EOL_OUTPUT; + /* Unmap any previously mapped video memory */ + if (DeviceExtension->VideoMemory) + { + ASSERT(DeviceExtension->VideoMemorySize != 0); + MmUnmapIoSpace(DeviceExtension->VideoMemory, DeviceExtension->VideoMemorySize); + } + DeviceExtension->VideoMemory = NULL; + DeviceExtension->VideoMemorySize = 0; - Status = STATUS_SUCCESS; + /* Free any previously allocated backup screenbuffer */ + if (DeviceExtension->ScreenBuffer) + { + ASSERT(DeviceExtension->ScreenBufferSize != 0); + ExFreePoolWithTag(DeviceExtension->ScreenBuffer, TAG_BLUE); + } + DeviceExtension->ScreenBuffer = NULL; + DeviceExtension->ScreenBufferSize = 0; - Irp->IoStatus.Status = Status; + /* Store dummy values */ + DeviceExtension->Columns = 1; + DeviceExtension->Rows = 1; + DeviceExtension->ScanLines = 1; + } + else + { + /* + * Partially disable the screen such that it can be restored later. + */ + + /* Take a snapshot of the video memory into the backup screenbuffer */ + if (DeviceExtension->ScreenBuffer) + { + ASSERT(DeviceExtension->VideoMemory); + ASSERT(DeviceExtension->ScreenBuffer); + ASSERT(DeviceExtension->ScreenBufferSize != 0); + ASSERT(DeviceExtension->VideoMemorySize == DeviceExtension->ScreenBufferSize); + + RtlCopyMemory(DeviceExtension->ScreenBuffer, + DeviceExtension->VideoMemory, + DeviceExtension->VideoMemorySize); + } + } + } + + return TRUE; // STATUS_SUCCESS; +} + +static DRIVER_DISPATCH ScrCreate; +static NTSTATUS +NTAPI +ScrCreate( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) +{ + // Irp->IoStatus.Information = FILE_OPENED; + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + return STATUS_SUCCESS; } static DRIVER_DISPATCH ScrWrite; @@ -268,9 +675,9 @@ ScrWrite( _In_ PDEVICE_OBJECT DeviceObject, _In_ PIRP Irp) { + NTSTATUS Status; PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation(Irp); PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; - NTSTATUS Status; PCHAR pch = Irp->UserBuffer; PUCHAR vidmem; ULONG i; @@ -279,9 +686,9 @@ ScrWrite( USHORT rows, columns; BOOLEAN processed = !!(DeviceExtension->Mode & ENABLE_PROCESSED_OUTPUT); - if (InbvCheckDisplayOwnership()) + if (!DeviceExtension->Enabled || !DeviceExtension->VideoMemory) { - /* Display is in graphics mode, we're not allowed to touch it */ + /* Display is not enabled, we're not allowed to touch it */ Status = STATUS_SUCCESS; Irp->IoStatus.Status = Status; @@ -293,24 +700,26 @@ ScrWrite( vidmem = DeviceExtension->VideoMemory; rows = DeviceExtension->Rows; columns = DeviceExtension->Columns; + cursorx = DeviceExtension->CursorX; + cursory = DeviceExtension->CursorY; - _disable(); - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); - offset = READ_PORT_UCHAR(CRTC_DATA)<<8; - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); - offset += READ_PORT_UCHAR(CRTC_DATA); - _enable(); - - cursory = (USHORT)(offset / columns); - cursorx = (USHORT)(offset % columns); if (!processed) { /* Raw output mode */ + + /* Calculate the offset from the cursor position */ + offset = cursorx + cursory * columns; + // FIXME: Does the buffer only contains chars? or chars + attributes? // FIXME2: Fix buffer overflow. - RtlCopyMemory(&vidmem[(cursorx * 2) + (cursory * columns * 2)], - pch, stk->Parameters.Write.Length); + RtlCopyMemory(&vidmem[offset * 2], pch, stk->Parameters.Write.Length); offset += (stk->Parameters.Write.Length / 2); + + /* Set the cursor position, clipping it to the screen */ + cursorx = (USHORT)(offset % columns); + cursory = (USHORT)(offset / columns); + // cursorx = min(max(cursorx, 0), columns - 1); + cursory = min(max(cursory, 0), rows - 1); } else { @@ -327,19 +736,18 @@ ScrWrite( } else if (cursory > 0) { - cursorx = columns - 1; cursory--; + cursorx = columns - 1; } - vidmem[(cursorx * 2) + (cursory * columns * 2)] = ' '; - vidmem[(cursorx * 2) + (cursory * columns * 2) + 1] = (char)DeviceExtension->CharAttribute; + offset = cursorx + cursory * columns; + vidmem[offset * 2] = ' '; + vidmem[offset * 2 + 1] = (char)DeviceExtension->CharAttribute; break; } case '\n': cursory++; - cursorx = 0; - break; - + /* Fall back */ case '\r': cursorx = 0; break; @@ -347,15 +755,16 @@ ScrWrite( case '\t': { offset = TAB_WIDTH - (cursorx % TAB_WIDTH); - for (j = 0; j < offset; j++) + while (offset--) { - vidmem[(cursorx * 2) + (cursory * columns * 2)] = ' '; + vidmem[(cursorx + cursory * columns) * 2] = ' '; cursorx++; - if (cursorx >= columns) { - cursory++; cursorx = 0; + cursory++; + /* We jumped to the next line, stop there */ + break; } } break; @@ -363,13 +772,14 @@ ScrWrite( default: { - vidmem[(cursorx * 2) + (cursory * columns * 2)] = *pch; - vidmem[(cursorx * 2) + (cursory * columns * 2) + 1] = (char)DeviceExtension->CharAttribute; + offset = cursorx + cursory * columns; + vidmem[offset * 2] = *pch; + vidmem[offset * 2 + 1] = (char)DeviceExtension->CharAttribute; cursorx++; if (cursorx >= columns) { - cursory++; cursorx = 0; + cursory++; } break; } @@ -393,22 +803,20 @@ ScrWrite( cursory = rows - 1; for (j = 0; j < columns; j++) { - vidmem[(j * 2) + (cursory * columns * 2)] = ' '; - vidmem[(j * 2) + (cursory * columns * 2) + 1] = (char)DeviceExtension->CharAttribute; + offset = j + cursory * columns; + vidmem[offset * 2] = ' '; + vidmem[offset * 2 + 1] = (char)DeviceExtension->CharAttribute; } } } - - /* Set the cursor position */ - offset = (cursory * columns) + cursorx; } - _disable(); - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); - WRITE_PORT_UCHAR(CRTC_DATA, offset); - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); - offset >>= 8; - WRITE_PORT_UCHAR(CRTC_DATA, offset); - _enable(); + + /* Set the cursor position */ + ASSERT((0 <= cursorx) && (cursorx < DeviceExtension->Columns)); + ASSERT((0 <= cursory) && (cursory < DeviceExtension->Rows)); + DeviceExtension->CursorX = cursorx; + DeviceExtension->CursorY = cursory; + ScrSetCursor(DeviceExtension); Status = STATUS_SUCCESS; @@ -432,33 +840,29 @@ ScrIoControl( DeviceExtension = DeviceObject->DeviceExtension; switch (stk->Parameters.DeviceIoControl.IoControlCode) { + case IOCTL_CONSOLE_RESET_SCREEN: + { + BOOLEAN Enable = !!*(PULONG)Irp->AssociatedIrp.SystemBuffer; + + /* Fully enable or disable the screen */ + Status = (ScrResetScreen(DeviceExtension, TRUE, Enable) + ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); + + Irp->IoStatus.Information = 0; + break; + } + case IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO: { PCONSOLE_SCREEN_BUFFER_INFO pcsbi = (PCONSOLE_SCREEN_BUFFER_INFO)Irp->AssociatedIrp.SystemBuffer; USHORT rows = DeviceExtension->Rows; USHORT columns = DeviceExtension->Columns; - ULONG offset; - - if (!InbvCheckDisplayOwnership()) - { - /* read cursor position from crtc */ - _disable(); - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); - offset = READ_PORT_UCHAR(CRTC_DATA); - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); - offset += (READ_PORT_UCHAR(CRTC_DATA) << 8); - _enable(); - } - else - { - offset = 0; - } pcsbi->dwSize.X = columns; pcsbi->dwSize.Y = rows; - pcsbi->dwCursorPosition.X = (SHORT)(offset % columns); - pcsbi->dwCursorPosition.Y = (SHORT)(offset / columns); + pcsbi->dwCursorPosition.X = DeviceExtension->CursorX; + pcsbi->dwCursorPosition.Y = DeviceExtension->CursorY; pcsbi->wAttributes = DeviceExtension->CharAttribute; @@ -478,7 +882,6 @@ ScrIoControl( case IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO: { PCONSOLE_SCREEN_BUFFER_INFO pcsbi = (PCONSOLE_SCREEN_BUFFER_INFO)Irp->AssociatedIrp.SystemBuffer; - ULONG Offset; if ( pcsbi->dwCursorPosition.X < 0 || pcsbi->dwCursorPosition.X >= DeviceExtension->Columns || pcsbi->dwCursorPosition.Y < 0 || pcsbi->dwCursorPosition.Y >= DeviceExtension->Rows ) @@ -490,18 +893,13 @@ ScrIoControl( DeviceExtension->CharAttribute = pcsbi->wAttributes; - Offset = (pcsbi->dwCursorPosition.Y * DeviceExtension->Columns) + - pcsbi->dwCursorPosition.X; - - if (!InbvCheckDisplayOwnership()) - { - _disable(); - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); - WRITE_PORT_UCHAR(CRTC_DATA, Offset); - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); - WRITE_PORT_UCHAR(CRTC_DATA, Offset >> 8); - _enable(); - } + /* Set the cursor position */ + ASSERT((0 <= pcsbi->dwCursorPosition.X) && (pcsbi->dwCursorPosition.X < DeviceExtension->Columns)); + ASSERT((0 <= pcsbi->dwCursorPosition.Y) && (pcsbi->dwCursorPosition.Y < DeviceExtension->Rows)); + DeviceExtension->CursorX = pcsbi->dwCursorPosition.X; + DeviceExtension->CursorY = pcsbi->dwCursorPosition.Y; + if (DeviceExtension->Enabled) + ScrSetCursor(DeviceExtension); Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; @@ -523,31 +921,11 @@ ScrIoControl( case IOCTL_CONSOLE_SET_CURSOR_INFO: { PCONSOLE_CURSOR_INFO pcci = (PCONSOLE_CURSOR_INFO)Irp->AssociatedIrp.SystemBuffer; - UCHAR data, value; - ULONG size, height; DeviceExtension->CursorSize = pcci->dwSize; DeviceExtension->CursorVisible = pcci->bVisible; - - if (!InbvCheckDisplayOwnership()) - { - height = DeviceExtension->ScanLines; - data = (pcci->bVisible) ? 0x00 : 0x20; - - size = (pcci->dwSize * height) / 100; - if (size < 1) - size = 1; - - data |= (UCHAR)(height - size); - - _disable(); - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORSTART); - WRITE_PORT_UCHAR(CRTC_DATA, data); - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSOREND); - value = READ_PORT_UCHAR(CRTC_DATA) & 0xE0; - WRITE_PORT_UCHAR(CRTC_DATA, value | (height - 1)); - _enable(); - } + if (DeviceExtension->Enabled) + ScrSetCursorShape(DeviceExtension); Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; @@ -580,7 +958,7 @@ ScrIoControl( { POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer; PUCHAR vidmem; - int offset; + ULONG offset; ULONG dwCount; ULONG nMaxLength = Buf->nLength; @@ -593,11 +971,10 @@ ScrIoControl( break; } - if (!InbvCheckDisplayOwnership()) + if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) { vidmem = DeviceExtension->VideoMemory; - offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2) + 1; + offset = (Buf->dwCoord.X + Buf->dwCoord.Y * DeviceExtension->Columns) * 2 + 1; nMaxLength = min(nMaxLength, (DeviceExtension->Rows - Buf->dwCoord.Y) @@ -621,7 +998,7 @@ ScrIoControl( POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer; PUSHORT pAttr = (PUSHORT)MmGetSystemAddressForMdl(Irp->MdlAddress); PUCHAR vidmem; - int offset; + ULONG offset; ULONG dwCount; ULONG nMaxLength; @@ -634,11 +1011,10 @@ ScrIoControl( break; } - if (!InbvCheckDisplayOwnership()) + if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) { vidmem = DeviceExtension->VideoMemory; - offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2) + 1; + offset = (Buf->dwCoord.X + Buf->dwCoord.Y * DeviceExtension->Columns) * 2 + 1; nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength, (DeviceExtension->Rows - Buf->dwCoord.Y) @@ -666,7 +1042,7 @@ ScrIoControl( PCOORD pCoord = (PCOORD)MmGetSystemAddressForMdl(Irp->MdlAddress); PCHAR pAttr = (PCHAR)(pCoord + 1); PUCHAR vidmem; - int offset; + ULONG offset; ULONG dwCount; ULONG nMaxLength; @@ -678,11 +1054,10 @@ ScrIoControl( break; } - if (!InbvCheckDisplayOwnership()) + if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) { vidmem = DeviceExtension->VideoMemory; - offset = (pCoord->Y * DeviceExtension->Columns * 2) + - (pCoord->X * 2) + 1; + offset = (pCoord->X + pCoord->Y * DeviceExtension->Columns) * 2 + 1; nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof(COORD), (DeviceExtension->Rows - pCoord->Y) @@ -709,7 +1084,7 @@ ScrIoControl( { POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer; PUCHAR vidmem; - int offset; + ULONG offset; ULONG dwCount; ULONG nMaxLength = Buf->nLength; @@ -722,11 +1097,10 @@ ScrIoControl( break; } - if (!InbvCheckDisplayOwnership()) + if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) { vidmem = DeviceExtension->VideoMemory; - offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2); + offset = (Buf->dwCoord.X + Buf->dwCoord.Y * DeviceExtension->Columns) * 2; nMaxLength = min(nMaxLength, (DeviceExtension->Rows - Buf->dwCoord.Y) @@ -750,7 +1124,7 @@ ScrIoControl( POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer; PCHAR pChar = (PCHAR)MmGetSystemAddressForMdl(Irp->MdlAddress); PUCHAR vidmem; - int offset; + ULONG offset; ULONG dwCount; ULONG nMaxLength; @@ -763,11 +1137,10 @@ ScrIoControl( break; } - if (!InbvCheckDisplayOwnership()) + if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) { vidmem = DeviceExtension->VideoMemory; - offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2); + offset = (Buf->dwCoord.X + Buf->dwCoord.Y * DeviceExtension->Columns) * 2; nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength, (DeviceExtension->Rows - Buf->dwCoord.Y) @@ -795,7 +1168,7 @@ ScrIoControl( PCOORD pCoord = (PCOORD)MmGetSystemAddressForMdl(Irp->MdlAddress); PCHAR pChar = (PCHAR)(pCoord + 1); PUCHAR vidmem; - int offset; + ULONG offset; ULONG dwCount; ULONG nMaxLength; @@ -807,11 +1180,10 @@ ScrIoControl( break; } - if (!InbvCheckDisplayOwnership()) + if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) { vidmem = DeviceExtension->VideoMemory; - offset = (pCoord->Y * DeviceExtension->Columns * 2) + - (pCoord->X * 2); + offset = (pCoord->X + pCoord->Y * DeviceExtension->Columns) * 2; nMaxLength = min(stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof(COORD), (DeviceExtension->Rows - pCoord->Y) @@ -832,15 +1204,15 @@ ScrIoControl( { PCONSOLE_DRAW ConsoleDraw; PUCHAR Src, Dest; - UINT32 SrcDelta, DestDelta, i, Offset; + UINT32 SrcDelta, DestDelta, i; - if (!InbvCheckDisplayOwnership()) + if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) { ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress); Src = (PUCHAR) (ConsoleDraw + 1); SrcDelta = ConsoleDraw->SizeX * 2; Dest = DeviceExtension->VideoMemory + - (ConsoleDraw->Y * DeviceExtension->Columns + ConsoleDraw->X) * 2; + (ConsoleDraw->X + ConsoleDraw->Y * DeviceExtension->Columns) * 2; DestDelta = DeviceExtension->Columns * 2; for (i = 0; i < ConsoleDraw->SizeY; i++) @@ -849,18 +1221,14 @@ ScrIoControl( Src += SrcDelta; Dest += DestDelta; } - - Offset = (ConsoleDraw->CursorY * DeviceExtension->Columns) + - ConsoleDraw->CursorX; - - _disable(); - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSLO); - WRITE_PORT_UCHAR(CRTC_DATA, Offset); - WRITE_PORT_UCHAR(CRTC_COMMAND, CRTC_CURSORPOSHI); - WRITE_PORT_UCHAR(CRTC_DATA, Offset >> 8); - _enable(); } + /* Set the cursor position, clipping it to the screen */ + DeviceExtension->CursorX = min(max(ConsoleDraw->CursorX, 0), DeviceExtension->Columns - 1); + DeviceExtension->CursorY = min(max(ConsoleDraw->CursorY, 0), DeviceExtension->Rows - 1); + if (DeviceExtension->Enabled) + ScrSetCursor(DeviceExtension); + Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; break; @@ -869,8 +1237,9 @@ ScrIoControl( case IOCTL_CONSOLE_LOADFONT: { ULONG CodePage = *(PULONG)Irp->AssociatedIrp.SystemBuffer; + DeviceExtension->CodePage = CodePage; - if (!InbvCheckDisplayOwnership()) + if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) { /* Upload a font for the codepage if needed */ ScrLoadFontTable(CodePage); @@ -953,9 +1322,16 @@ DriverEntry( Status = IoCreateSymbolicLink(&SymlinkName, &DeviceName); if (NT_SUCCESS(Status)) + { + /* By default disable the screen */ + ResetDisplayParametersDeviceExtension = DeviceObject->DeviceExtension; + ScrResetScreen(DeviceObject->DeviceExtension, TRUE, FALSE); DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + } else + { IoDeleteDevice(DeviceObject); + } return Status; } diff --git a/sdk/include/reactos/drivers/blue/ntddblue.h b/sdk/include/reactos/drivers/blue/ntddblue.h index 50ef34d2365..5c6df7bfff7 100644 --- a/sdk/include/reactos/drivers/blue/ntddblue.h +++ b/sdk/include/reactos/drivers/blue/ntddblue.h @@ -1,6 +1,8 @@ #ifndef _NTDDBLUE_H_INCLUDED_ #define _NTDDBLUE_H_INCLUDED_ +#define IOCTL_CONSOLE_RESET_SCREEN CTL_CODE(FILE_DEVICE_SCREEN, 0x800, METHOD_BUFFERED, FILE_WRITE_ACCESS) + #define IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO CTL_CODE(FILE_DEVICE_SCREEN, 0x801, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO CTL_CODE(FILE_DEVICE_SCREEN, 0x802, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONSOLE_GET_CURSOR_INFO CTL_CODE(FILE_DEVICE_SCREEN, 0x803, METHOD_BUFFERED, FILE_READ_ACCESS) diff --git a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c index e66203ad7b8..e4874b10df6 100644 --- a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c @@ -375,7 +375,7 @@ TuiConsoleThread(PVOID Param) static BOOL TuiInit(DWORD OemCP) { - BOOL Ret = FALSE; + BOOL Success; CONSOLE_SCREEN_BUFFER_INFO ScrInfo; DWORD BytesReturned; WNDCLASSEXW wc; @@ -388,6 +388,7 @@ TuiInit(DWORD OemCP) /* * Initialize the TUI front-end: * - load the console driver, + * - open BlueScreen device and enable it, * - set default screen attributes, * - grab the console size. */ @@ -404,6 +405,16 @@ TuiInit(DWORD OemCP) return FALSE; } + Success = TRUE; + if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_RESET_SCREEN, + &Success, sizeof(Success), NULL, 0, + &BytesReturned, NULL)) + { + DPRINT1("Failed to enable the screen.\n"); + CloseHandle(ConsoleDeviceHandle); + return FALSE; + } + if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_LOADFONT, &OemCP, sizeof(OemCP), NULL, 0, &BytesReturned, NULL)) @@ -416,7 +427,7 @@ TuiInit(DWORD OemCP) &TextAttribute, sizeof(TextAttribute), NULL, 0, &BytesReturned, NULL)) { - DPRINT1("Failed to set text attribute\n"); + DPRINT1("Failed to set text attribute.\n"); } ActiveConsole = NULL; @@ -426,8 +437,8 @@ TuiInit(DWORD OemCP) if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO, NULL, 0, &ScrInfo, sizeof(ScrInfo), &BytesReturned, NULL)) { - DPRINT1("Failed to get console info\n"); - Ret = FALSE; + DPRINT1("Failed to get console info.\n"); + Success = FALSE; goto Quit; } PhysicalConsoleSize = ScrInfo.dwSize; @@ -443,23 +454,23 @@ TuiInit(DWORD OemCP) ConsoleClassAtom = RegisterClassExW(&wc); if (ConsoleClassAtom == 0) { - DPRINT1("Failed to register TUI console wndproc\n"); - Ret = FALSE; + DPRINT1("Failed to register TUI console wndproc.\n"); + Success = FALSE; } else { - Ret = TRUE; + Success = TRUE; } Quit: - if (!Ret) + if (!Success) { DeleteCriticalSection(&ActiveVirtConsLock); CloseHandle(ConsoleDeviceHandle); } - ConsInitialized = Ret; - return Ret; + ConsInitialized = Success; + return Success; }

1 0

[reactos] 03/04: [BLUE] Use ExFreePoolWithTag().
by Hermès Bélusca-Maïto 15 Dec '19

15 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67c9e81cb00778307dbc0… commit 67c9e81cb00778307dbc07223f27eace16465a67 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 15 02:41:42 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 15 03:36:24 2019 +0100 [BLUE] Use ExFreePoolWithTag(). --- drivers/setup/blue/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/setup/blue/font.c b/drivers/setup/blue/font.c index 975f2d91de9..11f2438dd73 100644 --- a/drivers/setup/blue/font.c +++ b/drivers/setup/blue/font.c @@ -56,7 +56,7 @@ ScrLoadFontTable( } MmUnmapIoSpace(Bitplane, 0xFFFF); - ExFreePool(FontBitfield); + ExFreePoolWithTag(FontBitfield, TAG_BLUE); /* close bit plane */ CloseBitPlane();

1 0

[reactos] 02/04: [BLUE] Improve includes.
by Hermès Bélusca-Maïto 15 Dec '19

15 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45b655ec3a8dcd1573d73… commit 45b655ec3a8dcd1573d733e15dcc69ac587ef503 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 14 18:22:49 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 15 03:36:21 2019 +0100 [BLUE] Improve includes. --- drivers/setup/blue/blue.c | 1 + drivers/setup/blue/blue.h | 3 +-- drivers/setup/blue/font.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/setup/blue/blue.c b/drivers/setup/blue/blue.c index 23335819b5a..56a115fffd4 100644 --- a/drivers/setup/blue/blue.c +++ b/drivers/setup/blue/blue.c @@ -10,6 +10,7 @@ /* INCLUDES ******************************************************************/ #include "blue.h" +#include <ndk/inbvfuncs.h> #define NDEBUG #include <debug.h> diff --git a/drivers/setup/blue/blue.h b/drivers/setup/blue/blue.h index b18edfc2e04..335313abe15 100644 --- a/drivers/setup/blue/blue.h +++ b/drivers/setup/blue/blue.h @@ -9,7 +9,7 @@ #ifndef _BLUE_PCH_ #define _BLUE_PCH_ -#include <wdm.h> +#include <ntifs.h> #define TAG_BLUE 'EULB' @@ -54,7 +54,6 @@ typedef struct tagCONSOLE_CURSOR_INFO #define ENABLE_WRAP_AT_EOL_OUTPUT 0x0002 #include <blue/ntddblue.h> -#include <ndk/inbvfuncs.h> /* * Color attributes for text and screen background diff --git a/drivers/setup/blue/font.c b/drivers/setup/blue/font.c index ba315f9e594..975f2d91de9 100644 --- a/drivers/setup/blue/font.c +++ b/drivers/setup/blue/font.c @@ -10,8 +10,7 @@ /* INCLUDES ***************************************************************/ #include "blue.h" - -#include <ntddk.h> +#include <ndk/rtlfuncs.h> #define NDEBUG #include <debug.h>

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
23
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2019