Author: sginsberg
Date: Wed Jan 21 11:10:16 2009
New Revision: 39001
URL: http://svn.reactos.org/svn/reactos?rev=39001&view=rev
Log:
- Partially revert 29656. NTOS calls HalQuerySystemInformation with HalFrameBufferCachingInformation, and disables PAT and MTRR if it returns success + TRUE. There is no reason this would be needed in ReactOS at the moment, so revert to old behaviour.
Modified:
trunk/reactos/hal/halx86/generic/sysinfo.c
Modified: trunk/reactos/hal/halx86/generic/sysinfo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/sysinfo…
==============================================================================
--- trunk/reactos/hal/halx86/generic/sysinfo.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/sysinfo.c [iso-8859-1] Wed Jan 21 11:10:16 2009
@@ -35,20 +35,10 @@
REPORT_THIS_CASE(HalMapRegisterInformation);
REPORT_THIS_CASE(HalMcaLogInformation);
case HalFrameBufferCachingInformation:
- if (BufferSize >= 1)
{
- // The only caller that has been seen calling this function told
- // us it expected a single byte back. We therefore guess it expects
- // a BOOLEAN, and we dream up the value TRUE to (we think) tell it
- // "Sure, the framebuffer is cached".
- BOOLEAN ToReturn = TRUE;
- DPRINT("%s: caller expects %u bytes (should be 1)\n", "HalFrameBufferCachingInformation", BufferSize);
- ASSERT(sizeof(BOOLEAN) == 1);
- *ReturnedLength = sizeof(BOOLEAN);
- RtlCopyMemory(Buffer, &ToReturn, sizeof(BOOLEAN));
- return STATUS_SUCCESS;
+ /* FIXME: TODO */
+ return STATUS_NOT_IMPLEMENTED;
}
- break;
REPORT_THIS_CASE(HalDisplayBiosInformation);
REPORT_THIS_CASE(HalProcessorFeatureInformation);
REPORT_THIS_CASE(HalNumaTopologyInterface);
Author: cwittich
Date: Wed Jan 21 07:27:18 2009
New Revision: 38994
URL: http://svn.reactos.org/svn/reactos?rev=38994&view=rev
Log:
error msg on bad call
Modified:
trunk/reactos/dll/win32/kernel32/file/deviceio.c
Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] Wed Jan 21 07:27:18 2009
@@ -132,6 +132,10 @@
/* lpBytesReturned must not be NULL here, in fact Win doesn't
check that case either and crashes (only after the operation
completed) */
+ if (!lpBytesReturned)
+ {
+ ERR("Bad caller: lpBytesReturned must not be NULL");
+ }
*lpBytesReturned = Iosb.Information;
}
else
@@ -184,6 +188,10 @@
}
}
+ if (!lpNumberOfBytesTransferred)
+ {
+ ERR("Bad caller: lpNumberOfBytesTransferred must not be NULL");
+ }
*lpNumberOfBytesTransferred = lpOverlapped->InternalHigh;
if (!NT_SUCCESS(lpOverlapped->Internal))