Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 64173: [NTOSKRNL] - Add some DPRINTs on errors - Silence a DPRINT - Only DPRINT on unimplemented affinity support on SMP builds
by tkreuzer＠svn.reactos.org 16 Sep '14

16 Sep '14

Author: tkreuzer Date: Tue Sep 16 21:46:56 2014 New Revision: 64173 URL: http://svn.reactos.org/svn/reactos?rev=64173&view=rev Log: [NTOSKRNL] - Add some DPRINTs on errors - Silence a DPRINT - Only DPRINT on unimplemented affinity support on SMP builds Modified: branches/kernel-fun/reactos/ntoskrnl/io/iomgr/file.c branches/kernel-fun/reactos/ntoskrnl/ke/thrdschd.c branches/kernel-fun/reactos/ntoskrnl/lpc/connect.c branches/kernel-fun/reactos/ntoskrnl/mm/ARM3/expool.c Modified: branches/kernel-fun/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/io/… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Tue Sep 16 21:46:56 2014 @@ -1600,6 +1600,8 @@ if (OpenPacket.ParseCheck != TRUE) { /* Parse failed */ + DPRINT1("IopQueryAttributesFile failed for '%wZ' with 0x%lx\n", + ObjectAttributes->ObjectName, Status); return Status; } else @@ -1822,6 +1824,7 @@ /* Make sure we have extra parameters */ if (!ExtraCreateParameters) { + DPRINT1("Invalid parameter: ExtraCreateParameters == 0!\n"); return STATUS_INVALID_PARAMETER; } @@ -1835,6 +1838,7 @@ (CreateOptions & ~FILE_VALID_PIPE_OPTION_FLAGS)) { /* Invalid named pipe create */ + DPRINT1("Invalid named pipe create\n"); return STATUS_INVALID_PARAMETER; } } @@ -1843,6 +1847,7 @@ /* Make sure we have extra parameters */ if (!ExtraCreateParameters) { + DPRINT1("Invalid parameter: ExtraCreateParameters == 0!\n"); return STATUS_INVALID_PARAMETER; } @@ -1853,6 +1858,7 @@ (CreateOptions & ~FILE_VALID_MAILSLOT_OPTION_FLAGS)) { /* Invalid mailslot create */ + DPRINT1("Invalid mailslot create\n"); return STATUS_INVALID_PARAMETER; } } @@ -1956,6 +1962,7 @@ if (!OpenPacket->EaBuffer) { ExFreePool(OpenPacket); + DPRINT1("Failed to allocate open packet EA buffer\n"); return STATUS_INSUFFICIENT_RESOURCES; } Modified: branches/kernel-fun/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/ke/… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Tue Sep 16 21:46:56 2014 @@ -696,8 +696,10 @@ /* Check if system affinity is disabled */ if (!Thread->SystemAffinityActive) { +#ifdef CONFIG_SMP /* FIXME: TODO */ DPRINT1("Affinity support disabled!\n"); +#endif } /* Return the old affinity */ Modified: branches/kernel-fun/reactos/ntoskrnl/lpc/connect.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/lpc… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/lpc/connect.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/lpc/connect.c [iso-8859-1] Tue Sep 16 21:46:56 2014 @@ -139,7 +139,11 @@ PreviousMode, NULL, (PVOID *)&Port); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference port '%wZ': 0x%lx\n", PortName, Status); + return Status; + } /* This has to be a connection port */ if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CONNECTION_PORT) @@ -352,7 +356,7 @@ ConnectMessage->SectionToMap = SectionToMap; /* Set the data for the connection request message */ - Message->Request.u1.s1.DataLength = (CSHORT)ConnectionInfoLength + + Message->Request.u1.s1.DataLength = (CSHORT)ConnectionInfoLength + sizeof(LPCP_CONNECTION_MESSAGE); Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + Message->Request.u1.s1.DataLength; Modified: branches/kernel-fun/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/mm/… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Tue Sep 16 21:46:56 2014 @@ -1336,7 +1336,7 @@ InterlockedIncrementUL(&ExpPoolBigEntriesInUse); if ((i >= 16) && (ExpPoolBigEntriesInUse > (TableSize / 4))) { - DPRINT1("Should attempt expansion since we now have %lu entries\n", + DPRINT("Should attempt expansion since we now have %lu entries\n", ExpPoolBigEntriesInUse); }

1 0

[tkreuzer] 64172: [NTDLL] - Add Etw trace api stubs (moved from avdapi32) - Add exports for Etw* functions [ADVAPI32] - Add forwarders of trace api functions to ntdll Etw* functions
by tkreuzer＠svn.reactos.org 16 Sep '14

16 Sep '14

Author: tkreuzer Date: Tue Sep 16 20:40:33 2014 New Revision: 64172 URL: http://svn.reactos.org/svn/reactos?rev=64172&view=rev Log: [NTDLL] - Add Etw trace api stubs (moved from avdapi32) - Add exports for Etw* functions [ADVAPI32] - Add forwarders of trace api functions to ntdll Etw* functions Added: trunk/reactos/dll/ntdll/etw/ (with props) trunk/reactos/dll/ntdll/etw/trace.c - copied, changed from r64162, trunk/reactos/dll/win32/advapi32/misc/trace.c Removed: trunk/reactos/dll/win32/advapi32/misc/trace.c Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/advapi32/advapi32.spec Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Tue Sep 16 20:40:33 2014 @@ -22,6 +22,7 @@ ldr/ldrutils.c rtl/libsupp.c rtl/version.c + etw/trace.c include/ntdll.h) if(ARCH STREQUAL "i386") Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Tue Sep 16 20:40:33 2014 @@ -43,37 +43,37 @@ @ stdcall DbgUiStopDebugging(ptr) @ stdcall DbgUiWaitStateChange(ptr ptr) @ stdcall DbgUserBreakPoint() -# EtwControlTraceA -# EtwControlTraceW -# EtwCreateTraceInstanceId -# EtwEnableTrace -# EtwEnumerateTraceGuids -# EtwFlushTraceA -# EtwFlushTraceW -# EtwGetTraceEnableFlags -# EtwGetTraceEnableLevel -# EtwGetTraceLoggerHandle -# EtwNotificationRegistrationA -# EtwNotificationRegistrationW -# EtwQueryAllTracesA -# EtwQueryAllTracesW -# EtwQueryTraceA -# EtwQueryTraceW -# EtwReceiveNotificationsA -# EtwReceiveNotificationsW -# EtwRegisterTraceGuidsA -# EtwRegisterTraceGuidsW -# EtwStartTraceA -# EtwStartTraceW -# EtwStopTraceA -# EtwStopTraceW -# EtwTraceEvent -# EtwTraceEventInstance -# EtwTraceMessage -# EtwTraceMessageVa -# EtwUnregisterTraceGuids -# EtwUpdateTraceA -# EtwUpdateTraceW +@ stdcall EtwControlTraceA(double str ptr long) +@ stdcall EtwControlTraceW(double wstr ptr long) +@ stdcall -stub EtwCreateTraceInstanceId(ptr ptr) +@ stdcall EtwEnableTrace(long long long ptr double) +@ stdcall -stub EtwEnumerateTraceGuids(ptr long ptr) +@ stdcall -stub EtwFlushTraceA(double str ptr) +@ stdcall -stub EtwFlushTraceW(double wstr ptr) +@ stdcall EtwGetTraceEnableFlags(double) +@ stdcall EtwGetTraceEnableLevel(double) +@ stdcall EtwGetTraceLoggerHandle(ptr) +@ stdcall -stub EtwNotificationRegistrationA(ptr long ptr long long) +@ stdcall -stub EtwNotificationRegistrationW(ptr long ptr long long) +@ stdcall EtwQueryAllTracesA(ptr long ptr) +@ stdcall EtwQueryAllTracesW(ptr long ptr) +@ stdcall -stub EtwQueryTraceA(double str ptr) +@ stdcall -stub EtwQueryTraceW(double wstr ptr) +@ stdcall -stub EtwReceiveNotificationsA() # FIXME prototype +@ stdcall -stub EtwReceiveNotificationsW() # FIXME prototype +@ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) +@ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) +@ stdcall EtwStartTraceA(ptr str ptr) +@ stdcall EtwStartTraceW(ptr wstr ptr) +@ stdcall -stub EtwStopTraceA(double str ptr) +@ stdcall -stub EtwStopTraceW(double wstr ptr) +@ stdcall EtwTraceEvent(double ptr) +@ stdcall -stub EtwTraceEventInstance(double ptr ptr ptr) +@ varargs EtwTraceMessage(ptr long ptr long) +@ stdcall -stub EtwTraceMessageVa(double long ptr long ptr) +@ stdcall EtwUnregisterTraceGuids(double) +@ stdcall -stub EtwUpdateTraceA(double str ptr) +@ stdcall -stub EtwUpdateTraceW(double wstr ptr) # EtwpGetTraceBuffer # EtwpSetHWConfigFunction @ stdcall -arch=i386 KiFastSystemCall() Propchange: trunk/reactos/dll/ntdll/etw/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Sep 16 20:40:33 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/ntdll/etw/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/ntdll/etw/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/ntdll/etw/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: trunk/reactos/dll/ntdll/etw/trace.c (from r64162, trunk/reactos/dll/win32/advapi32/misc/trace.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/etw/trace.c?p2=t… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/etw/trace.c [iso-8859-1] Tue Sep 16 20:40:33 2014 @@ -1,18 +1,22 @@ /* - * Advapi32.dll Event Tracing Functions - */ - -#include <advapi32.h> + * ntdll.dll Event Tracing Functions + */ + +#include <ntdll.h> #include <wmistr.h> #include <evntrace.h> -WINE_DEFAULT_DEBUG_CHANNEL(advapi); +#define NDEBUG +#include <debug.h> + +#define FIXME DPRINT1 + /* * @unimplemented */ ULONG CDECL -TraceMessage( +EtwTraceMessage( TRACEHANDLE SessionHandle, ULONG MessageFlags, LPCGUID MessageGuid, @@ -24,24 +28,24 @@ } TRACEHANDLE -WMIAPI -GetTraceLoggerHandle( +NTAPI +EtwGetTraceLoggerHandle( PVOID Buffer ) { - FIXME("GetTraceLoggerHandle stub()\n"); + FIXME("EtwGetTraceLoggerHandle stub()\n"); return (TRACEHANDLE)-1; } ULONG -WMIAPI -TraceEvent( +NTAPI +EtwTraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER EventTrace ) { - FIXME("TraceEvent stub()\n"); + FIXME("EtwTraceEvent stub()\n"); if (!SessionHandle || !EventTrace) { @@ -59,38 +63,38 @@ } ULONG -WMIAPI -GetTraceEnableFlags( +NTAPI +EtwGetTraceEnableFlags( TRACEHANDLE TraceHandle ) { - FIXME("GetTraceEnableFlags stub()\n"); + FIXME("EtwGetTraceEnableFlags stub()\n"); return 0xFF; } UCHAR -WMIAPI -GetTraceEnableLevel( +NTAPI +EtwGetTraceEnableLevel( TRACEHANDLE TraceHandle ) { - FIXME("GetTraceEnableLevel stub()\n"); + FIXME("EtwGetTraceEnableLevel stub()\n"); return 0xFF; } ULONG -WMIAPI -UnregisterTraceGuids( +NTAPI +EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) { - FIXME("UnregisterTraceGuids stub()\n"); - return ERROR_SUCCESS; -} - -ULONG -WMIAPI -RegisterTraceGuidsA( + FIXME("EtwUnregisterTraceGuids stub()\n"); + return ERROR_SUCCESS; +} + +ULONG +NTAPI +EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, PVOID RequestContext, LPCGUID ControlGuid, @@ -101,13 +105,13 @@ PTRACEHANDLE RegistrationHandle ) { - FIXME("RegisterTraceGuidsA stub()\n"); - return ERROR_SUCCESS; -} - -ULONG -WMIAPI -RegisterTraceGuidsW( + FIXME("EtwRegisterTraceGuidsA stub()\n"); + return ERROR_SUCCESS; +} + +ULONG +NTAPI +EtwRegisterTraceGuidsW( WMIDPREQUEST RequestAddress, PVOID RequestContext, LPCGUID ControlGuid, @@ -118,66 +122,66 @@ PTRACEHANDLE RegistrationHandle ) { - FIXME("RegisterTraceGuidsW stub()\n"); - return ERROR_SUCCESS; -} - -ULONG WINAPI StartTraceW( PTRACEHANDLE pSessionHandle, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) -{ - FIXME("(%p, %s, %p) stub\n", pSessionHandle, debugstr_w(SessionName), Properties); + FIXME("EtwRegisterTraceGuidsW stub()\n"); + return ERROR_SUCCESS; +} + +ULONG WINAPI EtwStartTraceW( PTRACEHANDLE pSessionHandle, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) +{ + FIXME("(%p, %s, %p) stub\n", pSessionHandle, SessionName, Properties); if (pSessionHandle) *pSessionHandle = 0xcafe4242; return ERROR_SUCCESS; } -ULONG WINAPI StartTraceA( PTRACEHANDLE pSessionHandle, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) -{ - FIXME("(%p, %s, %p) stub\n", pSessionHandle, debugstr_a(SessionName), Properties); +ULONG WINAPI EtwStartTraceA( PTRACEHANDLE pSessionHandle, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) +{ + FIXME("(%p, %s, %p) stub\n", pSessionHandle, SessionName, Properties); if (pSessionHandle) *pSessionHandle = 0xcafe4242; return ERROR_SUCCESS; } /****************************************************************************** - * ControlTraceW [ADVAPI32.@] + * EtwControlTraceW [NTDLL.@] * * Control a givel event trace session * */ -ULONG WINAPI ControlTraceW( TRACEHANDLE hSession, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) -{ - FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_w(SessionName), Properties, control); - return ERROR_SUCCESS; -} - -/****************************************************************************** - * ControlTraceA [ADVAPI32.@] +ULONG WINAPI EtwControlTraceW( TRACEHANDLE hSession, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) +{ + FIXME("(%I64x, %s, %p, %d) stub\n", hSession, SessionName, Properties, control); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * EtwControlTraceA [NTDLL.@] * * See ControlTraceW. * */ -ULONG WINAPI ControlTraceA( TRACEHANDLE hSession, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) -{ - FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_a(SessionName), Properties, control); - return ERROR_SUCCESS; -} - -/****************************************************************************** - * EnableTrace [ADVAPI32.@] - */ -ULONG WINAPI EnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession ) -{ - FIXME("(%d, 0x%x, %d, %s, %s): stub\n", enable, flag, level, - debugstr_guid(guid), wine_dbgstr_longlong(hSession)); - - return ERROR_SUCCESS; -} - -/****************************************************************************** - * QueryAllTracesW [ADVAPI32.@] +ULONG WINAPI EtwControlTraceA( TRACEHANDLE hSession, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) +{ + FIXME("(%I64x, %s, %p, %d) stub\n", hSession, SessionName, Properties, control); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * EtwEnableTrace [NTDLL.@] + */ +ULONG WINAPI EtwEnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession ) +{ + FIXME("(%d, 0x%x, %d, %p, %I64x): stub\n", enable, flag, level, + guid, hSession); + + return ERROR_SUCCESS; +} + +/****************************************************************************** + * EtwQueryAllTracesW [NTDLL.@] * * Query information for started event trace sessions * */ -ULONG WINAPI QueryAllTracesW( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) +ULONG WINAPI EtwQueryAllTracesW( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) { FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); @@ -186,11 +190,11 @@ } /****************************************************************************** - * QueryAllTracesA [ADVAPI32.@] - * - * See QueryAllTracesW. - */ -ULONG WINAPI QueryAllTracesA( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) + * QueryAllTracesA [NTDLL.@] + * + * See EtwQueryAllTracesA. + */ +ULONG WINAPI EtwQueryAllTracesA( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) { FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Tue Sep 16 20:40:33 2014 @@ -28,7 +28,6 @@ misc/msi.c misc/shutdown.c misc/sysfunc.c - misc/trace.c reg/reg.c sec/ac.c sec/audit.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Tue Sep 16 20:40:33 2014 @@ -66,8 +66,8 @@ @ stdcall CommandLineFromMsiDescriptor(wstr ptr ptr) @ stub ComputeAccessTokenFromCodeAuthzLevel @ stdcall ControlService(long long ptr) -@ stdcall ControlTraceA(double str ptr long) -@ stdcall ControlTraceW(double wstr ptr long) +@ stdcall ControlTraceA(double str ptr long) ntdll.EtwControlTraceA +@ stdcall ControlTraceW(double wstr ptr long) ntdll.EtwControlTraceW @ stub ConvertAccessToSecurityDescriptorA @ stub ConvertAccessToSecurityDescriptorW @ stub ConvertSDToStringSDRootDomainA @@ -101,7 +101,7 @@ @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) @ stdcall CreateServiceA(long str str long long long long str str ptr str str str) @ stdcall CreateServiceW(long wstr wstr long long long long wstr wstr ptr wstr wstr wstr) -@ stub CreateTraceInstanceId +@ stdcall CreateTraceInstanceId(ptr ptr) ntdll.EtwCreateTraceInstanceId @ stdcall CreateWellKnownSid(long ptr ptr ptr) @ stdcall CredDeleteA(str long long) @ stdcall CredDeleteW(wstr long long) @@ -199,9 +199,9 @@ @ stub ElfRegisterEventSourceA @ stub ElfRegisterEventSourceW @ stub ElfReportEventA -# ElfReportEventAndSourceW +@ stub ElfReportEventAndSourceW @ stub ElfReportEventW -@ stdcall EnableTrace(long long long ptr double) +@ stdcall EnableTrace(long long long ptr double) ntdll.EtwEnableTrace @ stdcall EncryptFileA(str) @ stdcall EncryptFileW(wstr) @ stub EncryptedFileKeyInfo @@ -213,15 +213,15 @@ @ stdcall EnumServicesStatusExA(long long long long ptr long ptr ptr ptr str) @ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) @ stdcall EnumServicesStatusW(long long long ptr long ptr ptr ptr) -@ stub EnumerateTraceGuids +@ stdcall EnumerateTraceGuids(ptr long ptr) ntdll.EtwEnumerateTraceGuids @ stdcall EqualDomainSid(ptr ptr ptr) @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) @ stdcall FileEncryptionStatusA(str ptr) @ stdcall FileEncryptionStatusW(wstr ptr) @ stdcall FindFirstFreeAce(ptr ptr) -@ stub FlushTraceA -@ stub FlushTraceW +@ stdcall FlushTraceA(double str ptr) ntdll.EtwFlushTraceA +@ stdcall FlushTraceW(double wstr ptr) ntdll.EtwFlushTraceW @ stub FreeEncryptedFileKeyInfo @ stdcall FreeEncryptionCertificateHashList(ptr) @ stdcall FreeInheritedFromArray(ptr long ptr) @@ -282,9 +282,9 @@ @ stdcall GetSidSubAuthority(ptr long) @ stdcall GetSidSubAuthorityCount(ptr) @ stdcall GetTokenInformation(long long ptr long ptr) -@ stdcall GetTraceEnableFlags(double) -@ stdcall GetTraceEnableLevel(double) -@ stdcall GetTraceLoggerHandle(ptr) +@ stdcall GetTraceEnableFlags(double) ntdll.EtwGetTraceEnableFlags +@ stdcall GetTraceEnableLevel(double) ntdll.EtwGetTraceEnableLevel +@ stdcall GetTraceLoggerHandle(ptr) ntdll.EtwGetTraceLoggerHandle @ stdcall GetTrusteeFormA(ptr) @ stdcall GetTrusteeFormW(ptr) @ stdcall GetTrusteeNameA(ptr) @@ -294,7 +294,7 @@ @ stdcall GetUserNameA(ptr ptr) @ stdcall GetUserNameW(ptr ptr) @ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) -# I_QueryTagInformation +@ stub I_QueryTagInformation @ stub I_ScIsSecurityProcess @ stub I_ScPnPGetServiceName @ stub I_ScSendTSMessage @@ -439,8 +439,8 @@ @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) @ stub ProcessIdleTasks @ stub ProcessTrace -@ stdcall QueryAllTracesA(ptr long ptr) -@ stdcall QueryAllTracesW(ptr long ptr) +@ stdcall QueryAllTracesA(ptr long ptr) ntdll.EtwQueryAllTracesA +@ stdcall QueryAllTracesW(ptr long ptr) ntdll.EtwQueryAllTracesW @ stdcall QueryRecoveryAgentsOnEncryptedFile(wstr ptr) @ stdcall QueryServiceConfig2A(long long ptr long ptr) @ stdcall QueryServiceConfig2W(long long ptr long ptr) @@ -451,16 +451,16 @@ @ stdcall QueryServiceObjectSecurity(long long ptr long ptr) @ stdcall QueryServiceStatus(long ptr) @ stdcall QueryServiceStatusEx(long long ptr long ptr) -@ stub QueryTraceA -@ stub QueryTraceW +@ stdcall QueryTraceA(double str ptr) ntdll.EtwQueryTraceA +@ stdcall QueryTraceW(double str ptr) ntdll.EtwQueryTraceA @ stdcall QueryUsersOnEncryptedFile(wstr ptr) @ stub ReadEncryptedFileRaw @ stdcall ReadEventLogA(long long long ptr long ptr ptr) @ stdcall ReadEventLogW(long long long ptr long ptr ptr) @ stdcall RegCloseKey(long) @ stdcall RegConnectRegistryA(str long ptr) -# RegConnectRegistryExA -# RegConnectRegistryExW +@ stub RegConnectRegistryExA +@ stub RegConnectRegistryExW @ stdcall RegConnectRegistryW(wstr long ptr) @ stdcall RegCreateKeyA(long str ptr) @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) @@ -526,8 +526,8 @@ @ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) @ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) @ stdcall RegisterServiceCtrlHandlerW(wstr ptr) -@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) -@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) ntdll.EtwRegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) ntdll.EtwRegisterTraceGuidsW @ stub RemoveTraceCallback @ stdcall RemoveUsersFromEncryptedFile(wstr ptr) @ stdcall ReportEventA(long long long long ptr long long str ptr) @@ -587,10 +587,10 @@ @ stdcall StartServiceCtrlDispatcherA(ptr) @ stdcall StartServiceCtrlDispatcherW(ptr) @ stdcall StartServiceW(long long ptr) -@ stdcall StartTraceA(ptr str ptr) -@ stdcall StartTraceW(ptr wstr ptr) -@ stub StopTraceA -@ stub StopTraceW +@ stdcall StartTraceA(ptr str ptr) ntdll.EtwStartTraceA +@ stdcall StartTraceW(ptr wstr ptr) ntdll.EtwStartTraceW +@ stdcall StopTraceA(double str ptr) ntdll.EtwStopTraceA +@ stdcall StopTraceW(double wstr ptr) ntdll.EtwStopTraceA @ stdcall SystemFunction001(ptr ptr ptr) @ stdcall SystemFunction002(ptr ptr ptr) @ stdcall SystemFunction003(ptr ptr) @@ -629,10 +629,10 @@ @ stdcall SystemFunction036(ptr long) # RtlGenRandom @ stdcall SystemFunction040(ptr long long) # RtlEncryptMemory @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory -@ stdcall TraceEvent(double ptr) -@ stub TraceEventInstance -@ varargs TraceMessage(ptr long ptr long) -@ stub TraceMessageVa +@ stdcall TraceEvent(double ptr) ntdll.EtwTraceEvent +@ stdcall TraceEventInstance(double ptr ptr ptr) ntdll.EtwTraceEventInstance +@ varargs TraceMessage(ptr long ptr long) ntdll.EtwTraceMessage +@ stdcall TraceMessageVa(double long ptr long ptr) ntdll.EtwTraceMessageVa @ stdcall TreeResetNamedSecurityInfoA(str ptr ptr ptr ptr ptr ptr long ptr ptr ptr) @ stdcall TreeResetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr) @ stub TrusteeAccessToObjectA @@ -640,9 +640,9 @@ @ stub UninstallApplication @ stdcall UnlockServiceDatabase(ptr) @ stub UnregisterIdleTask -@ stdcall UnregisterTraceGuids(double) -@ stub UpdateTraceA -@ stub UpdateTraceW +@ stdcall UnregisterTraceGuids(double) ntdll.EtwUnregisterTraceGuids +@ stdcall UpdateTraceA(double str ptr) ntdll.EtwUpdateTraceA +@ stdcall UpdateTraceW(double wstr ptr) ntdll.EtwUpdateTraceW @ stub WdmWmiServiceMain @ stub WmiCloseBlock @ stub WmiCloseTraceWithCursor @@ -660,8 +660,8 @@ @ stub WmiGetTraceHeader @ stub WmiMofEnumerateResourcesA @ stub WmiMofEnumerateResourcesW -@ stub WmiNotificationRegistrationA -@ stub WmiNotificationRegistrationW +@ stdcall WmiNotificationRegistrationA(ptr long ptr long long) ntdll.EtwNotificationRegistrationA +@ stdcall WmiNotificationRegistrationW(ptr long ptr long long) ntdll.EtwNotificationRegistrationW @ stub WmiOpenBlock @ stub WmiOpenTraceWithCursor @ stub WmiParseTraceEvent @@ -674,8 +674,8 @@ @ stub WmiQuerySingleInstanceMultipleA @ stub WmiQuerySingleInstanceMultipleW @ stub WmiQuerySingleInstanceW -@ stub WmiReceiveNotificationsA -@ stub WmiReceiveNotificationsW +@ stdcall WmiReceiveNotificationsA() ntdll.EtwReceiveNotificationsA # FIXME prototype +@ stdcall WmiReceiveNotificationsW() ntdll.EtwReceiveNotificationsW # FIXME prototype @ stub WmiSetSingleInstanceA @ stub WmiSetSingleInstanceW @ stub WmiSetSingleItemA Removed: trunk/reactos/dll/win32/advapi32/misc/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/trace.c (removed) @@ -1,201 +0,0 @@ -/* - * Advapi32.dll Event Tracing Functions - */ - -#include <advapi32.h> - -#include <wmistr.h> -#include <evntrace.h> - -WINE_DEFAULT_DEBUG_CHANNEL(advapi); -/* - * @unimplemented - */ -ULONG CDECL -TraceMessage( - TRACEHANDLE SessionHandle, - ULONG MessageFlags, - LPCGUID MessageGuid, - USHORT MessageNumber, - ...) -{ - FIXME("TraceMessage()\n"); - return ERROR_SUCCESS; -} - -TRACEHANDLE -WMIAPI -GetTraceLoggerHandle( - PVOID Buffer -) -{ - FIXME("GetTraceLoggerHandle stub()\n"); - return (TRACEHANDLE)-1; -} - - -ULONG -WMIAPI -TraceEvent( - TRACEHANDLE SessionHandle, - PEVENT_TRACE_HEADER EventTrace -) -{ - FIXME("TraceEvent stub()\n"); - - if (!SessionHandle || !EventTrace) - { - /* invalid parameters */ - return ERROR_INVALID_PARAMETER; - } - - if (EventTrace->Size != sizeof(EVENT_TRACE_HEADER)) - { - /* invalid parameter */ - return ERROR_INVALID_PARAMETER; - } - - return ERROR_SUCCESS; -} - -ULONG -WMIAPI -GetTraceEnableFlags( - TRACEHANDLE TraceHandle -) -{ - FIXME("GetTraceEnableFlags stub()\n"); - return 0xFF; -} - -UCHAR -WMIAPI -GetTraceEnableLevel( - TRACEHANDLE TraceHandle -) -{ - FIXME("GetTraceEnableLevel stub()\n"); - return 0xFF; -} - -ULONG -WMIAPI -UnregisterTraceGuids( - TRACEHANDLE RegistrationHandle -) -{ - FIXME("UnregisterTraceGuids stub()\n"); - return ERROR_SUCCESS; -} - -ULONG -WMIAPI -RegisterTraceGuidsA( - WMIDPREQUEST RequestAddress, - PVOID RequestContext, - LPCGUID ControlGuid, - ULONG GuidCount, - PTRACE_GUID_REGISTRATION TraceGuidReg, - LPCSTR MofImagePath, - LPCSTR MofResourceName, - PTRACEHANDLE RegistrationHandle -) -{ - FIXME("RegisterTraceGuidsA stub()\n"); - return ERROR_SUCCESS; -} - -ULONG -WMIAPI -RegisterTraceGuidsW( - WMIDPREQUEST RequestAddress, - PVOID RequestContext, - LPCGUID ControlGuid, - ULONG GuidCount, - PTRACE_GUID_REGISTRATION TraceGuidReg, - LPCWSTR MofImagePath, - LPCWSTR MofResourceName, - PTRACEHANDLE RegistrationHandle -) -{ - FIXME("RegisterTraceGuidsW stub()\n"); - return ERROR_SUCCESS; -} - -ULONG WINAPI StartTraceW( PTRACEHANDLE pSessionHandle, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) -{ - FIXME("(%p, %s, %p) stub\n", pSessionHandle, debugstr_w(SessionName), Properties); - if (pSessionHandle) *pSessionHandle = 0xcafe4242; - return ERROR_SUCCESS; -} - -ULONG WINAPI StartTraceA( PTRACEHANDLE pSessionHandle, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) -{ - FIXME("(%p, %s, %p) stub\n", pSessionHandle, debugstr_a(SessionName), Properties); - if (pSessionHandle) *pSessionHandle = 0xcafe4242; - return ERROR_SUCCESS; -} - -/****************************************************************************** - * ControlTraceW [ADVAPI32.@] - * - * Control a givel event trace session - * - */ -ULONG WINAPI ControlTraceW( TRACEHANDLE hSession, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) -{ - FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_w(SessionName), Properties, control); - return ERROR_SUCCESS; -} - -/****************************************************************************** - * ControlTraceA [ADVAPI32.@] - * - * See ControlTraceW. - * - */ -ULONG WINAPI ControlTraceA( TRACEHANDLE hSession, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) -{ - FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_a(SessionName), Properties, control); - return ERROR_SUCCESS; -} - -/****************************************************************************** - * EnableTrace [ADVAPI32.@] - */ -ULONG WINAPI EnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession ) -{ - FIXME("(%d, 0x%x, %d, %s, %s): stub\n", enable, flag, level, - debugstr_guid(guid), wine_dbgstr_longlong(hSession)); - - return ERROR_SUCCESS; -} - -/****************************************************************************** - * QueryAllTracesW [ADVAPI32.@] - * - * Query information for started event trace sessions - * - */ -ULONG WINAPI QueryAllTracesW( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) -{ - FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); - - if (psessioncount) *psessioncount = 0; - return ERROR_SUCCESS; -} - -/****************************************************************************** - * QueryAllTracesA [ADVAPI32.@] - * - * See QueryAllTracesW. - */ -ULONG WINAPI QueryAllTracesA( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) -{ - FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); - - if (psessioncount) *psessioncount = 0; - return ERROR_SUCCESS; -} - -/* EOF */

1 0

[hbelusca] 64171: [NTVDM]: We can specify device "command" procedures for each PS/2 port so that when one writes to port 0x60, one can write to the correct device "plugged" into it (keyboard, mouse...
by hbelusca＠svn.reactos.org 16 Sep '14

16 Sep '14

Author: hbelusca Date: Tue Sep 16 18:54:50 2014 New Revision: 64171 URL: http://svn.reactos.org/svn/reactos?rev=64171&view=rev Log: [NTVDM]: We can specify device "command" procedures for each PS/2 port so that when one writes to port 0x60, one can write to the correct device "plugged" into it (keyboard, mouse). modularity++; Modified: trunk/reactos/subsystems/ntvdm/hardware/keyboard.c trunk/reactos/subsystems/ntvdm/hardware/keyboard.h trunk/reactos/subsystems/ntvdm/hardware/mouse.c trunk/reactos/subsystems/ntvdm/hardware/mouse.h trunk/reactos/subsystems/ntvdm/hardware/ps2.c trunk/reactos/subsystems/ntvdm/hardware/ps2.h Modified: trunk/reactos/subsystems/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/keyboard.c [iso-8859-1] Tue Sep 16 18:54:50 2014 @@ -13,7 +13,16 @@ #include "keyboard.h" #include "ps2.h" +/* PRIVATE VARIABLES **********************************************************/ + static BYTE PS2Port = 0; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static VOID WINAPI KeyboardCommand(LPVOID Param, BYTE Command) +{ + UNIMPLEMENTED; +} /* PUBLIC FUNCTIONS ***********************************************************/ @@ -34,13 +43,11 @@ // PicInterruptRequest(1); } -VOID KeyboardCommand(BYTE Command) -{ - UNIMPLEMENTED; -} - BOOLEAN KeyboardInit(BYTE PS2Connector) { + /* Finish to plug the mouse to the specified PS/2 port */ PS2Port = PS2Connector; + PS2SetDeviceCmdProc(PS2Port, NULL, KeyboardCommand); + return TRUE; } Modified: trunk/reactos/subsystems/ntvdm/hardware/keyboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/keyboard.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/keyboard.h [iso-8859-1] Tue Sep 16 18:54:50 2014 @@ -22,7 +22,6 @@ /* FUNCTIONS ******************************************************************/ VOID KeyboardEventHandler(PKEY_EVENT_RECORD KeyEvent); -VOID KeyboardCommand(BYTE Command); BOOLEAN KeyboardInit(BYTE PS2Connector); #endif // _KEYBOARD_H_ Modified: trunk/reactos/subsystems/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/mouse.c [iso-8859-1] Tue Sep 16 18:54:50 2014 @@ -136,31 +136,17 @@ ButtonState = NewButtonState; } -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent) -{ - // FIXME: Sync our private data - - // HACK: Bypass PS/2 and instead, notify the MOUSE.COM driver directly - MouseBiosUpdatePosition(&MouseEvent->dwMousePosition); - MouseBiosUpdateButtons(LOWORD(MouseEvent->dwButtonState)); - - // PS2QueuePush(PS2Port, Data); - // PicInterruptRequest(12); -} - -VOID MouseScroll(LONG Direction) +/*static*/ VOID MouseScroll(LONG Direction) { ScrollCounter += Direction; } -COORD MouseGetPosition(VOID) +/*static*/ COORD MouseGetPosition(VOID) { return Position; } -VOID MouseCommand(BYTE Command) +static VOID WINAPI MouseCommand(LPVOID Param, BYTE Command) { switch (Command) { @@ -319,6 +305,20 @@ } } +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent) +{ + // FIXME: Sync our private data + + // HACK: Bypass PS/2 and instead, notify the MOUSE.COM driver directly + MouseBiosUpdatePosition(&MouseEvent->dwMousePosition); + MouseBiosUpdateButtons(LOWORD(MouseEvent->dwButtonState)); + + // PS2QueuePush(PS2Port, Data); + // PicInterruptRequest(12); +} + BOOLEAN MouseInit(BYTE PS2Connector) { HWND hWnd; @@ -341,7 +341,9 @@ /* Release the device context */ ReleaseDC(hWnd, hDC); + /* Finish to plug the mouse to the specified PS/2 port */ PS2Port = PS2Connector; + PS2SetDeviceCmdProc(PS2Port, NULL, MouseCommand); MouseReset(); return TRUE; Modified: trunk/reactos/subsystems/ntvdm/hardware/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/mouse.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/mouse.h [iso-8859-1] Tue Sep 16 18:54:50 2014 @@ -69,11 +69,6 @@ /* FUNCTIONS ******************************************************************/ VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent); - -VOID MouseScroll(LONG Direction); -COORD MouseGetPosition(VOID); - -VOID MouseCommand(BYTE Command); BOOLEAN MouseInit(BYTE PS2Connector); #endif // _MOUSE_H_ Modified: trunk/reactos/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] Tue Sep 16 18:54:50 2014 @@ -16,9 +16,6 @@ #include "ps2.h" #include "pic.h" -#include "keyboard.h" -#include "mouse.h" - /* PRIVATE VARIABLES **********************************************************/ #define BUFFER_SIZE 32 @@ -32,6 +29,9 @@ UINT QueueStart; UINT QueueEnd; HANDLE QueueMutex; + + LPVOID Param; + PS2_DEVICE_CMDPROC DeviceCommand; } PS2_PORT, *PPS2_PORT; /* @@ -50,6 +50,14 @@ static BYTE OutputBuffer = 0x00; // PS/2 Output Buffer /* PRIVATE FUNCTIONS **********************************************************/ + +static VOID PS2SendCommand(PPS2_PORT Port, BYTE Command) +{ + if (!Port->IsEnabled) return; + + /* Call the device command */ + if (Port->DeviceCommand) Port->DeviceCommand(Port->Param, Command); +} static BYTE WINAPI PS2ReadPort(ULONG Port) { @@ -238,10 +246,7 @@ */ case 0xD4: { - if (Ports[1].IsEnabled) - // Ports[1].Function - MouseCommand(Data); - + PS2SendCommand(&Ports[1], Data); break; } } @@ -249,10 +254,8 @@ return; } - // TODO: Implement PS/2 device commands - if (Ports[0].IsEnabled) - // Ports[0].Function - KeyboardCommand(Data); + /* By default, send a command to the first PS/2 port */ + PS2SendCommand(&Ports[0], Data); } } @@ -300,6 +303,14 @@ } /* PUBLIC FUNCTIONS ***********************************************************/ + +VOID PS2SetDeviceCmdProc(BYTE PS2Port, LPVOID Param, PS2_DEVICE_CMDPROC DeviceCommand) +{ + if (PS2Port >= PS2_PORTS) return; + + Ports[PS2Port].Param = Param; + Ports[PS2Port].DeviceCommand = DeviceCommand; +} // PS2SendToPort BOOLEAN PS2QueuePush(BYTE PS2Port, BYTE Data) Modified: trunk/reactos/subsystems/ntvdm/hardware/ps2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/ps2.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/ps2.h [iso-8859-1] Tue Sep 16 18:54:50 2014 @@ -19,7 +19,11 @@ #define PS2_DATA_PORT 0x60 #define PS2_CONTROL_PORT 0x64 +typedef VOID (WINAPI *PS2_DEVICE_CMDPROC)(LPVOID Param, BYTE Command); + /* FUNCTIONS ******************************************************************/ + +VOID PS2SetDeviceCmdProc(BYTE PS2Port, LPVOID Param, PS2_DEVICE_CMDPROC DeviceCommand); BOOLEAN PS2QueuePush(BYTE PS2Port, BYTE Data);

1 0

[hbelusca] 64170: [NTOS]: Do not break into kdbg because PopFlushVolumes is not fully implemented. Fixes apparent BSOD when trying the "Hibernate" and "Stand By" options in the Task Manager. CORE-8...
by hbelusca＠svn.reactos.org 16 Sep '14

16 Sep '14

Author: hbelusca Date: Tue Sep 16 18:43:16 2014 New Revision: 64170 URL: http://svn.reactos.org/svn/reactos?rev=64170&view=rev Log: [NTOS]: Do not break into kdbg because PopFlushVolumes is not fully implemented. Fixes apparent BSOD when trying the "Hibernate" and "Stand By" options in the Task Manager. CORE-8537 #resolve #comment Demote UNIMPLEMENTED_DBGBREAK for UNIMPLEMENTED in the non-implemented case of PopFlushVolumes. Fixes the apparent BSOD. Modified: trunk/reactos/ntoskrnl/po/povolume.c Modified: trunk/reactos/ntoskrnl/po/povolume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/povolume.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/povolume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/povolume.c [iso-8859-1] Tue Sep 16 18:43:16 2014 @@ -299,7 +299,7 @@ if (!(FlushPolicy & 2)) { /* ReactOS only implements this routine for shutdown, which requires it */ - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; } /* Check if there were no volumes at all */

1 0

[ekohl] 64169: [SAMSRV] SampRemoveUserFromAllGroups: - Do not treat a STATUS_MEMBER_NOT_IN_GROUP, returned by SampRemoveMemberFromGroup, as error but as success. - Clear the Groups attribute at the...
by ekohl＠svn.reactos.org 16 Sep '14

16 Sep '14

Author: ekohl Date: Tue Sep 16 10:32:04 2014 New Revision: 64169 URL: http://svn.reactos.org/svn/reactos?rev=64169&view=rev Log: [SAMSRV] SampRemoveUserFromAllGroups: - Do not treat a STATUS_MEMBER_NOT_IN_GROUP, returned by SampRemoveMemberFromGroup, as error but as success. - Clear the Groups attribute at the end. Modified: trunk/reactos/dll/win32/samsrv/user.c Modified: trunk/reactos/dll/win32/samsrv/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/user.c?re… ============================================================================== --- trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] Tue Sep 16 10:32:04 2014 @@ -361,6 +361,8 @@ Status = SampRemoveMemberFromGroup(GroupObject, UserObject->RelativeId); + if (Status == STATUS_MEMBER_NOT_IN_GROUP) + Status = STATUS_SUCCESS; SampCloseDbObject(GroupObject); @@ -369,6 +371,13 @@ goto done; } } + + /* Remove all groups from the Groups attribute */ + Status = SampSetObjectAttribute(UserObject, + L"Groups", + REG_BINARY, + NULL, + 0); done: if (GroupsBuffer != NULL)

1 0

[hbelusca] 64168: [NTVDM] - Move the mouse driver to DOS since it's our 32bit version of mouse.com, in some sense, - Temporarily disable the mouse user callbacks because currently they went called ...
by hbelusca＠svn.reactos.org 16 Sep '14

16 Sep '14

Author: hbelusca Date: Tue Sep 16 00:51:15 2014 New Revision: 64168 URL: http://svn.reactos.org/svn/reactos?rev=64168&view=rev Log: [NTVDM] - Move the mouse driver to DOS since it's our 32bit version of mouse.com, in some sense, - Temporarily disable the mouse user callbacks because currently they went called in a parallel thread than the CPU one, that caused CPU corruption, - In the same way we currently trigger IRQ1 interrupts, we do the same for IRQ12, - Make the console input pump more modular (and mouse presence detection code is WIP), - Put keyboard code into a dedicated file (as done for the mouse), - Adapt the existing PS/2 emulation code to support two PS/2 ports controlled by 1 controller. Please note that some documentations precise that the response byte (answer to a PS/2 controller command) is written directly to the PS/2 output port. Added: trunk/reactos/subsystems/ntvdm/dos/mouse32.c - copied, changed from r64138, trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/ntvdm/dos/mouse32.h - copied, changed from r64138, trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h trunk/reactos/subsystems/ntvdm/hardware/keyboard.c (with props) trunk/reactos/subsystems/ntvdm/hardware/keyboard.h (with props) Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/ntvdm/clock.c trunk/reactos/subsystems/ntvdm/dos/dem.c trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/hardware/mouse.c trunk/reactos/subsystems/ntvdm/hardware/mouse.h trunk/reactos/subsystems/ntvdm/hardware/ps2.c trunk/reactos/subsystems/ntvdm/hardware/ps2.h trunk/reactos/subsystems/ntvdm/hardware/vga.c trunk/reactos/subsystems/ntvdm/hardware/vga.h trunk/reactos/subsystems/ntvdm/ntvdm.c trunk/reactos/subsystems/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/CMakeList… ============================================================================== --- trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -15,15 +15,17 @@ bios/rom.c bios/vidbios.c hardware/cmos.c + hardware/keyboard.c + hardware/mouse.c hardware/pic.c hardware/ps2.c hardware/speaker.c hardware/timer.c hardware/vga.c - hardware/mouse.c dos/dos32krnl/bios.c dos/dos32krnl/dos.c dos/dos32krnl/dosfiles.c + dos/mouse32.c dos/dem.c bop.c callback.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -21,618 +21,24 @@ /* PRIVATE VARIABLES **********************************************************/ -static BOOLEAN DriverEnabled = TRUE; -static MOUSE_DRIVER_STATE DriverState; - /* PRIVATE FUNCTIONS **********************************************************/ -static VOID PaintMouseCursor(VOID) +// Mouse IRQ 12 +static VOID WINAPI BiosMouseIrq(LPWORD Stack) { - if (Bda->VideoMode <= 3) - { - WORD Character; - DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize); - - EmulatorReadMemory(&EmulatorContext, - VideoAddress - + (DriverState.Position.Y * Bda->ScreenColumns - + DriverState.Position.X) * sizeof(WORD), - (LPVOID)&Character, - sizeof(WORD)); - - DriverState.Character = Character; - Character &= DriverState.TextCursor.ScreenMask; - Character ^= DriverState.TextCursor.CursorMask; - - EmulatorWriteMemory(&EmulatorContext, - VideoAddress - + (DriverState.Position.Y * Bda->ScreenColumns - + DriverState.Position.X) * sizeof(WORD), - (LPVOID)&Character, - sizeof(WORD)); - } - else - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - } -} - -static VOID EraseMouseCursor(VOID) -{ - if (Bda->VideoMode <= 3) - { - DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize); - - EmulatorWriteMemory(&EmulatorContext, - VideoAddress - + (DriverState.Position.Y * Bda->ScreenColumns - + DriverState.Position.X) * sizeof(WORD), - (LPVOID)&DriverState.Character, - sizeof(WORD)); - } - else - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - } -} - -static VOID CallMouseUserHandlers(USHORT CallMask) -{ - USHORT i; - - /* Call handler 0 */ - if ((DriverState.Handler0.CallMask & CallMask) != 0 && - DriverState.Handler0.Callback != (ULONG)NULL) - { - /* - * Set the parameters for the callback. - * NOTE: In text modes, the row and column will be reported - * as a multiple of the cell size, typically 8x8 pixels. - */ - setAX(CallMask); - setBX(DriverState.ButtonState); - setCX(DriverState.Position.X); - setDX(DriverState.Position.Y); - setSI(DriverState.MickeysPerCellHoriz); - setDI(DriverState.MickeysPerCellVert); - - DPRINT1("Calling Handler0 0x%08x with CallMask 0x%04x\n", - DriverState.Handler0.Callback, CallMask); - - /* Call the callback */ - RunCallback16(&BiosContext, DriverState.Handler0.Callback); - } - - for (i = 0; i < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]); ++i) - { - /* Call the suitable handlers */ - if ((DriverState.Handlers[i].CallMask & CallMask) != 0 && - DriverState.Handlers[i].Callback != (ULONG)NULL) - { - /* - * Set the parameters for the callback. - * NOTE: In text modes, the row and column will be reported - * as a multiple of the cell size, typically 8x8 pixels. - */ - setAX(CallMask); - setBX(DriverState.ButtonState); - setCX(DriverState.Position.X); - setDX(DriverState.Position.Y); - setSI(DriverState.MickeysPerCellHoriz); - setDI(DriverState.MickeysPerCellVert); - - DPRINT1("Calling Handler[%d] 0x%08x with CallMask 0x%04x\n", - i, DriverState.Handlers[i].Callback, CallMask); - - /* Call the callback */ - RunCallback16(&BiosContext, DriverState.Handlers[i].Callback); - } - } -} - -static VOID WINAPI BiosMouseService(LPWORD Stack) -{ - switch (getAX()) - { - /* Reset Driver */ - case 0x00: - { - SHORT i; - - DriverEnabled = TRUE; - DriverState.ShowCount = 0; - DriverState.ButtonState = 0; - - /* Set the default text cursor */ - DriverState.TextCursor.ScreenMask = 0xFFFF; /* Display everything */ - DriverState.TextCursor.CursorMask = 0xFF00; /* ... but with inverted attributes */ - - /* Set the default graphics cursor */ - DriverState.GraphicsCursor.HotSpot.X = 3; - DriverState.GraphicsCursor.HotSpot.Y = 1; - - DriverState.GraphicsCursor.ScreenMask[0] = 0xC3FF; // 1100001111111111 - DriverState.GraphicsCursor.ScreenMask[1] = 0xC0FF; // 1100000011111111 - DriverState.GraphicsCursor.ScreenMask[2] = 0xC07F; // 1100000001111111 - DriverState.GraphicsCursor.ScreenMask[3] = 0xC01F; // 1100000000011111 - DriverState.GraphicsCursor.ScreenMask[4] = 0xC00F; // 1100000000001111 - DriverState.GraphicsCursor.ScreenMask[5] = 0xC007; // 1100000000000111 - DriverState.GraphicsCursor.ScreenMask[6] = 0xC003; // 1100000000000011 - DriverState.GraphicsCursor.ScreenMask[7] = 0xC007; // 1100000000000111 - DriverState.GraphicsCursor.ScreenMask[8] = 0xC01F; // 1100000000011111 - DriverState.GraphicsCursor.ScreenMask[9] = 0xC01F; // 1100000000011111 - DriverState.GraphicsCursor.ScreenMask[10] = 0xC00F; // 1100000000001111 - DriverState.GraphicsCursor.ScreenMask[11] = 0xC60F; // 1100011000001111 - DriverState.GraphicsCursor.ScreenMask[12] = 0xFF07; // 1111111100000111 - DriverState.GraphicsCursor.ScreenMask[13] = 0xFF07; // 1111111100000111 - DriverState.GraphicsCursor.ScreenMask[14] = 0xFF87; // 1111111110000111 - DriverState.GraphicsCursor.ScreenMask[15] = 0xFFCF; // 1111111111001111 - - DriverState.GraphicsCursor.CursorMask[0] = 0x0000; // 0000000000000000 - DriverState.GraphicsCursor.CursorMask[1] = 0x1C00; // 0001110000000000 - DriverState.GraphicsCursor.CursorMask[2] = 0x1F00; // 0001111100000000 - DriverState.GraphicsCursor.CursorMask[3] = 0x1F80; // 0001111110000000 - DriverState.GraphicsCursor.CursorMask[4] = 0x1FE0; // 0001111111100000 - DriverState.GraphicsCursor.CursorMask[5] = 0x1FF0; // 0001111111110000 - DriverState.GraphicsCursor.CursorMask[6] = 0x1FF8; // 0001111111111000 - DriverState.GraphicsCursor.CursorMask[7] = 0x1FE0; // 0001111111100000 - DriverState.GraphicsCursor.CursorMask[8] = 0x1FC0; // 0001111111000000 - DriverState.GraphicsCursor.CursorMask[9] = 0x1FC0; // 0001111111000000 - DriverState.GraphicsCursor.CursorMask[10] = 0x19E0; // 0001100111100000 - DriverState.GraphicsCursor.CursorMask[11] = 0x00E0; // 0000000011100000 - DriverState.GraphicsCursor.CursorMask[12] = 0x0070; // 0000000001110000 - DriverState.GraphicsCursor.CursorMask[13] = 0x0070; // 0000000001110000 - DriverState.GraphicsCursor.CursorMask[14] = 0x0030; // 0000000000110000 - DriverState.GraphicsCursor.CursorMask[15] = 0x0000; // 0000000000000000 - - /* Initialize the counters */ - DriverState.HorizCount = DriverState.VertCount = 0; - - for (i = 0; i < NUM_MOUSE_BUTTONS; i++) - { - DriverState.PressCount[i] = DriverState.ReleaseCount[i] = 0; - } - - /* Initialize the resolution */ - DriverState.MickeysPerCellHoriz = 8; - DriverState.MickeysPerCellVert = 16; - - /* Return mouse information */ - setAX(0xFFFF); // Hardware & driver installed - setBX(NUM_MOUSE_BUTTONS); - - break; - } - - /* Show Mouse Cursor */ - case 0x01: - { - DriverState.ShowCount++; - if (DriverState.ShowCount > 0) PaintMouseCursor(); - - break; - } - - /* Hide Mouse Cursor */ - case 0x02: - { - DriverState.ShowCount--; - if (DriverState.ShowCount <= 0) EraseMouseCursor(); - - break; - } - - /* Return Position And Button Status */ - case 0x03: - { - setBX(DriverState.ButtonState); - setCX(DriverState.Position.X); - setDX(DriverState.Position.Y); - break; - } - - /* Position Mouse Cursor */ - case 0x04: - { - POINT Point; - - Point.x = getCX(); - Point.y = getDX(); - - ClientToScreen(GetConsoleWindow(), &Point); - SetCursorPos(Point.x, Point.y); - - break; - } - - /* Return Button Press Data */ - case 0x05: - { - WORD Button = getBX(); - - setAX(DriverState.ButtonState); - setBX(DriverState.PressCount[Button]); - setCX(DriverState.LastPress[Button].X); - setDX(DriverState.LastPress[Button].Y); - - /* Reset the counter */ - DriverState.PressCount[Button] = 0; - - break; - } - - /* Return Button Release Data */ - case 0x06: - { - WORD Button = getBX(); - - setAX(DriverState.ButtonState); - setBX(DriverState.ReleaseCount[Button]); - setCX(DriverState.LastRelease[Button].X); - setDX(DriverState.LastRelease[Button].Y); - - /* Reset the counter */ - DriverState.ReleaseCount[Button] = 0; - - break; - - } - - /* Define Graphics Cursor */ - case 0x09: - { - PWORD MaskBitmap = (PWORD)SEG_OFF_TO_PTR(getES(), getDX()); - - DriverState.GraphicsCursor.HotSpot.X = getBX(); - DriverState.GraphicsCursor.HotSpot.Y = getCX(); - - RtlMoveMemory(DriverState.GraphicsCursor.ScreenMask, - MaskBitmap, - sizeof(DriverState.GraphicsCursor.ScreenMask)); - - RtlMoveMemory(DriverState.GraphicsCursor.CursorMask, - &MaskBitmap[16], - sizeof(DriverState.GraphicsCursor.CursorMask)); - - break; - } - - /* Define Text Cursor */ - case 0x0A: - { - USHORT BX = getBX(); - - if (BX == 0x0000) - { - /* Define software cursor */ - DriverState.TextCursor.ScreenMask = getCX(); - DriverState.TextCursor.CursorMask = getDX(); - } - else if (BX == 0x0001) - { - /* Define hardware cursor */ - DPRINT1("Defining hardware cursor is unimplemented\n"); - UNIMPLEMENTED; - // CX == start scan line - // DX == end scan line - } - else - { - DPRINT1("Invalid BX value 0x%04x\n", BX); - } - - break; - } - - /* Read Motion Counters */ - case 0x0B: - { - setCX(DriverState.HorizCount); - setDX(DriverState.VertCount); - - /* Reset the counters */ - DriverState.HorizCount = DriverState.VertCount = 0; - - break; - } - - /* Define Interrupt Subroutine Parameters, compatible MS MOUSE v1.0+ */ - case 0x0C: - { - DriverState.Handler0.CallMask = getCX(); - DriverState.Handler0.Callback = MAKELONG(getDX(), getES()); // Far pointer to the callback - DPRINT1("Define callback 0x%04x, 0x%08x\n", - DriverState.Handler0.CallMask, DriverState.Handler0.Callback); - break; - } - - /* Define Mickey/Pixel Ratio */ - case 0x0F: - { - DriverState.MickeysPerCellHoriz = getCX(); - DriverState.MickeysPerCellVert = getDX(); - break; - } - - /* Exchange Interrupt Subroutines, compatible MS MOUSE v3.0+ (see function 0x0C) */ - case 0x14: - { - USHORT OldCallMask = DriverState.Handler0.CallMask; - ULONG OldCallback = DriverState.Handler0.Callback; - - DriverState.Handler0.CallMask = getCX(); - DriverState.Handler0.Callback = MAKELONG(getDX(), getES()); // Far pointer to the callback - - /* Return old callmask in CX and callback vector in ES:DX */ - setCX(OldCallMask); - setES(HIWORD(OldCallback)); - setDX(LOWORD(OldCallback)); - - break; - } - - /* Return Driver Storage Requirements */ - case 0x15: - { - setBX(sizeof(MOUSE_DRIVER_STATE)); - break; - } - - /* Save Driver State */ - case 0x16: - { - *((PMOUSE_DRIVER_STATE)SEG_OFF_TO_PTR(getES(), getDX())) = DriverState; - break; - } - - /* Restore Driver State */ - case 0x17: - { - DriverState = *((PMOUSE_DRIVER_STATE)SEG_OFF_TO_PTR(getES(), getDX())); - break; - } - - /* Set Alternate Mouse User Handler, compatible MS MOUSE v6.0+ */ - case 0x18: - { - /* - * Up to three handlers can be defined by separate calls to this - * function, each with a different combination of shift states in - * the call mask; calling this function again with a call mask of - * 0000h undefines the specified handler (official documentation); - * specifying the same call mask and an address of 0000h:0000h - * undefines the handler (real life). - * See Ralf Brown: http://www.ctyme.com/intr/rb-5981.htm - * for more information. - */ - - USHORT i; - USHORT CallMask = getCX(); - ULONG Callback = MAKELONG(getDX(), getES()); // Far pointer to the callback - BOOLEAN Success = FALSE; - - DPRINT1("Define v6.0+ callback 0x%04x, 0x%08x\n", - CallMask, Callback); - - if (CallMask == 0x0000) - { - /* - * Find the handler entry corresponding to the given - * callback and undefine it. - */ - for (i = 0; i < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]); ++i) - { - if (DriverState.Handlers[i].Callback == Callback) - { - /* Found it, undefine the handler */ - DriverState.Handlers[i].CallMask = 0x0000; - DriverState.Handlers[i].Callback = (ULONG)NULL; - Success = TRUE; - break; - } - } - } - else if (Callback == (ULONG)NULL) - { - /* - * Find the handler entry corresponding to the given - * callmask and undefine it. - */ - for (i = 0; i < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]); ++i) - { - if (DriverState.Handlers[i].CallMask == CallMask) - { - /* Found it, undefine the handler */ - DriverState.Handlers[i].CallMask = 0x0000; - DriverState.Handlers[i].Callback = (ULONG)NULL; - Success = TRUE; - break; - } - } - } - else - { - /* - * Try to find a handler entry corresponding to the given - * callmask to redefine it, otherwise find an empty handler - * entry and set the new handler in there. - */ - - USHORT EmptyHandler = 0xFFFF; // Invalid handler - - for (i = 0; i < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]); ++i) - { - /* Find the first empty handler */ - if (EmptyHandler == 0xFFFF && - DriverState.Handlers[i].CallMask == 0x0000 && - DriverState.Handlers[i].Callback == (ULONG)NULL) - { - EmptyHandler = i; - } - - if (DriverState.Handlers[i].CallMask == CallMask) - { - /* Found it, redefine the handler */ - DriverState.Handlers[i].CallMask = CallMask; - DriverState.Handlers[i].Callback = Callback; - Success = TRUE; - break; - } - } - - /* - * If we haven't found anything and we found - * an empty handler, set it. - */ - if (!Success && EmptyHandler != 0xFFFF - /* && EmptyHandler < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]) */) - { - DriverState.Handlers[EmptyHandler].CallMask = CallMask; - DriverState.Handlers[EmptyHandler].Callback = Callback; - Success = TRUE; - } - } - - /* If we failed, set error code */ - if (!Success) setAX(0xFFFF); - - break; - } - - /* Return User Alternate Interrupt Vector, compatible MS MOUSE v6.0+ */ - case 0x19: - { - USHORT i; - USHORT CallMask = getCX(); - ULONG Callback; - BOOLEAN Success = FALSE; - - /* - * Find the handler entry corresponding to the given callmask. - */ - for (i = 0; i < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]); ++i) - { - if (DriverState.Handlers[i].CallMask == CallMask) - { - /* Found it */ - Callback = DriverState.Handlers[i].Callback; - Success = TRUE; - break; - } - } - - if (Success) - { - /* Return the callback vector in BX:DX */ - setBX(HIWORD(Callback)); - setDX(LOWORD(Callback)); - } - else - { - /* We failed, set error code */ - setCX(0x0000); - } - - break; - } - - /* Disable Mouse Driver */ - case 0x1F: - { - setES(0x0000); - setBX(0x0000); - - DriverEnabled = FALSE; - break; - } - - /* Enable Mouse Driver */ - case 0x20: - { - DriverEnabled = TRUE; - break; - } - - default: - { - DPRINT1("BIOS Function INT 33h, AX = 0x%04X NOT IMPLEMENTED\n", getAX()); - } - } + PicIRQComplete(Stack); } /* PUBLIC FUNCTIONS ***********************************************************/ -VOID MouseBiosUpdatePosition(PCOORD NewPosition) -{ - SHORT DeltaX = NewPosition->X - DriverState.Position.X; - SHORT DeltaY = NewPosition->Y - DriverState.Position.Y; - - if (!DriverEnabled) return; - - DriverState.HorizCount += (DeltaX * (SHORT)DriverState.MickeysPerCellHoriz) / 8; - DriverState.VertCount += (DeltaY * (SHORT)DriverState.MickeysPerCellVert ) / 8; - - if (DriverState.ShowCount > 0) - { - EraseMouseCursor(); - DriverState.Position = *NewPosition; - PaintMouseCursor(); - } - - /* Call the mouse handlers */ - CallMouseUserHandlers(0x0001); // We use MS MOUSE v1.0+ format -} - -VOID MouseBiosUpdateButtons(WORD ButtonState) -{ - USHORT i; - USHORT CallMask = 0x0000; // We use MS MOUSE v1.0+ format - - if (!DriverEnabled) return; - - for (i = 0; i < NUM_MOUSE_BUTTONS; i++) - { - BOOLEAN OldState = (DriverState.ButtonState >> i) & 1; - BOOLEAN NewState = (ButtonState >> i) & 1; - - if (NewState > OldState) - { - /* Mouse press */ - DriverState.PressCount[i]++; - DriverState.LastPress[i] = DriverState.Position; - - CallMask |= (1 << (2 * i + 1)); - } - else if (NewState < OldState) - { - /* Mouse release */ - DriverState.ReleaseCount[i]++; - DriverState.LastRelease[i] = DriverState.Position; - - CallMask |= (1 << (2 * i + 2)); - } - } - - DriverState.ButtonState = ButtonState; - - /* Call the mouse handlers */ - CallMouseUserHandlers(CallMask); -} - BOOLEAN MouseBios32Initialize(VOID) { - /* Clear the state */ - ZeroMemory(&DriverState, sizeof(DriverState)); - - /* Initialize the interrupt handler */ - RegisterBiosInt32(BIOS_MOUSE_INTERRUPT, BiosMouseService); + /* Set up the HW vector interrupts */ + EnableHwIRQ(12, BiosMouseIrq); return TRUE; } VOID MouseBios32Cleanup(VOID) { - if (DriverState.ShowCount > 0) EraseMouseCursor(); } Modified: trunk/reactos/subsystems/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/clock.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/clock.c [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -37,7 +37,8 @@ /* Processor speed */ #define STEPS_PER_CYCLE 256 -#define KBD_INT_CYCLES 16 +#define IRQ1_CYCLES 16 +#define IRQ12_CYCLES 16 /* VARIABLES ******************************************************************/ @@ -48,7 +49,9 @@ DWORD StartTickCount, CurrentTickCount; DWORD LastClockUpdate; DWORD LastVerticalRefresh; -INT KeyboardIntCounter = 0; + +UINT Irq1Counter = 0; +UINT Irq12Counter = 0; #ifdef IPS_DISPLAY DWORD LastCyclePrintout; @@ -118,10 +121,16 @@ LastVerticalRefresh = CurrentTickCount; } - if (++KeyboardIntCounter == KBD_INT_CYCLES) + if (++Irq1Counter == IRQ1_CYCLES) { - GenerateKeyboardInterrupts(); - KeyboardIntCounter = 0; + GenerateIrq1(); + Irq1Counter = 0; + } + + if (++Irq12Counter == IRQ12_CYCLES) + { + GenerateIrq12(); + Irq12Counter = 0; } /* Horizontal retrace occurs as fast as possible */ Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dem.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -21,6 +21,7 @@ #include "bop.h" #include "bios/bios.h" +#include "mouse32.h" /* Extra PSDK/NDK Headers */ #include <ndk/obtypes.h> @@ -234,6 +235,7 @@ BOOLEAN Result; Result = DosBIOSInitialize(); + DosMouseInitialize(); // FIXME: Should be done by the DOS BIOS // Result &= DosKRNLInitialize(); return Result; Copied: trunk/reactos/subsystems/ntvdm/dos/mouse32.c (from r64138, trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/mouse… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/mouse32.c [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -1,8 +1,8 @@ /* * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine - * FILE: moubios32.c - * PURPOSE: VDM Mouse 32-bit BIOS + * FILE: mouse32.c + * PURPOSE: VDM 32-bit compatible MOUSE.COM driver * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ @@ -13,11 +13,11 @@ #include "emulator.h" #include "callback.h" -#include "moubios32.h" -#include "bios32p.h" +#include "mouse32.h" +#include "bios/bios.h" #include "io.h" -#include "hardware/mouse.h" +#include "dos32krnl/dos.h" /* PRIVATE VARIABLES **********************************************************/ @@ -80,7 +80,9 @@ static VOID CallMouseUserHandlers(USHORT CallMask) { +#if 0 USHORT i; + USHORT AX, BX, CX, DX, SI, DI; /* Call handler 0 */ if ((DriverState.Handler0.CallMask & CallMask) != 0 && @@ -91,6 +93,14 @@ * NOTE: In text modes, the row and column will be reported * as a multiple of the cell size, typically 8x8 pixels. */ + + AX = getAX(); + BX = getBX(); + CX = getCX(); + DX = getDX(); + SI = getSI(); + DI = getDI(); + setAX(CallMask); setBX(DriverState.ButtonState); setCX(DriverState.Position.X); @@ -102,7 +112,14 @@ DriverState.Handler0.Callback, CallMask); /* Call the callback */ - RunCallback16(&BiosContext, DriverState.Handler0.Callback); + RunCallback16(&DosContext, DriverState.Handler0.Callback); + + setAX(AX); + setBX(BX); + setCX(CX); + setDX(DX); + setSI(SI); + setDI(DI); } for (i = 0; i < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]); ++i) @@ -116,6 +133,14 @@ * NOTE: In text modes, the row and column will be reported * as a multiple of the cell size, typically 8x8 pixels. */ + + AX = getAX(); + BX = getBX(); + CX = getCX(); + DX = getDX(); + SI = getSI(); + DI = getDI(); + setAX(CallMask); setBX(DriverState.ButtonState); setCX(DriverState.Position.X); @@ -127,9 +152,17 @@ i, DriverState.Handlers[i].Callback, CallMask); /* Call the callback */ - RunCallback16(&BiosContext, DriverState.Handlers[i].Callback); - } - } + RunCallback16(&DosContext, DriverState.Handlers[i].Callback); + + setAX(AX); + setBX(BX); + setCX(CX); + setDX(DX); + setSI(SI); + setDI(DI); + } + } +#endif } static VOID WINAPI BiosMouseService(LPWORD Stack) @@ -621,18 +654,18 @@ CallMouseUserHandlers(CallMask); } -BOOLEAN MouseBios32Initialize(VOID) +BOOLEAN DosMouseInitialize(VOID) { /* Clear the state */ ZeroMemory(&DriverState, sizeof(DriverState)); /* Initialize the interrupt handler */ - RegisterBiosInt32(BIOS_MOUSE_INTERRUPT, BiosMouseService); + RegisterDosInt32(BIOS_MOUSE_INTERRUPT, BiosMouseService); return TRUE; } -VOID MouseBios32Cleanup(VOID) +VOID DosMouseCleanup(VOID) { if (DriverState.ShowCount > 0) EraseMouseCursor(); } Copied: trunk/reactos/subsystems/ntvdm/dos/mouse32.h (from r64138, trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/mouse… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/mouse32.h [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -1,13 +1,13 @@ /* * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine - * FILE: moubios32.h - * PURPOSE: VDM Mouse 32-bit BIOS + * FILE: mouse32.h + * PURPOSE: VDM 32-bit compatible MOUSE.COM driver * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -#ifndef _MOUBIOS32_H_ -#define _MOUBIOS32_H_ +#ifndef _MOUSE32_H_ +#define _MOUSE32_H_ /* INCLUDES *******************************************************************/ @@ -74,9 +74,10 @@ VOID MouseBiosUpdatePosition(PCOORD NewPosition); VOID MouseBiosUpdateButtons(WORD ButtonStatus); -BOOLEAN MouseBios32Initialize(VOID); -VOID MouseBios32Cleanup(VOID); -#endif // _MOUBIOS32_H_ +BOOLEAN DosMouseInitialize(VOID); +VOID DosMouseCleanup(VOID); + +#endif // _MOUSE32_H_ /* EOF */ Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -16,6 +16,8 @@ #include "clock.h" #include "bios/rom.h" #include "hardware/cmos.h" +#include "hardware/keyboard.h" +#include "hardware/mouse.h" #include "hardware/pic.h" #include "hardware/ps2.h" #include "hardware/speaker.h" @@ -335,6 +337,95 @@ // SpeakerChange(); } + +static DWORD +WINAPI +PumpConsoleInput(LPVOID Parameter) +{ + HANDLE ConsoleInput = (HANDLE)Parameter; + INPUT_RECORD InputRecord; + DWORD Count; + + while (VdmRunning) + { + /* Make sure the task event is signaled */ + WaitForSingleObject(VdmTaskEvent, INFINITE); + + /* Wait for an input record */ + if (!ReadConsoleInput(ConsoleInput, &InputRecord, 1, &Count)) + { + DWORD LastError = GetLastError(); + DPRINT1("Error reading console input (0x%p, %lu) - Error %lu\n", ConsoleInput, Count, LastError); + return LastError; + } + + ASSERT(Count != 0); + + /* Check the event type */ + switch (InputRecord.EventType) + { + /* + * Hardware events + */ + case KEY_EVENT: + KeyboardEventHandler(&InputRecord.Event.KeyEvent); + break; + + case MOUSE_EVENT: + MouseEventHandler(&InputRecord.Event.MouseEvent); + break; + + case WINDOW_BUFFER_SIZE_EVENT: + ScreenEventHandler(&InputRecord.Event.WindowBufferSizeEvent); + break; + + /* + * Interface events + */ + case MENU_EVENT: + MenuEventHandler(&InputRecord.Event.MenuEvent); + break; + + case FOCUS_EVENT: + FocusEventHandler(&InputRecord.Event.FocusEvent); + break; + + default: + break; + } + } + + return 0; +} + +static VOID EnableExtraHardware(HANDLE ConsoleInput) +{ + DWORD ConInMode; + + if (GetConsoleMode(ConsoleInput, &ConInMode)) + { +#if 0 + // GetNumberOfConsoleMouseButtons(); + // GetSystemMetrics(SM_CMOUSEBUTTONS); + // GetSystemMetrics(SM_MOUSEPRESENT); + if (MousePresent) + { +#endif + /* Support mouse input events if there is a mouse on the system */ + ConInMode |= ENABLE_MOUSE_INPUT; +#if 0 + } + else + { + /* Do not support mouse input events if there is no mouse on the system */ + ConInMode &= ~ENABLE_MOUSE_INPUT; + } +#endif + + SetConsoleMode(ConsoleInput, ConInMode); + } +} + /* PUBLIC FUNCTIONS ***********************************************************/ VOID DumpMemory(VOID) @@ -420,8 +511,6 @@ DPRINT1("Memory dump done\n"); } - -DWORD WINAPI PumpConsoleInput(LPVOID Parameter); BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput) { @@ -476,8 +565,14 @@ SetConsoleMode(ConsoleInput, ENABLE_PROCESSED_INPUT /* | ENABLE_WINDOW_INPUT */); // SetConsoleMode(ConsoleOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); - /* Initialize the PS2 port */ - PS2Initialize(ConsoleInput); + /**/EnableExtraHardware(ConsoleInput);/**/ + + /* Initialize the PS/2 port */ + PS2Initialize(); + + /* Initialize the keyboard and mouse and connect them to their PS/2 ports */ + KeyboardInit(0); + MouseInit(1); /**************** ATTACH INPUT WITH CONSOLE *****************/ /* Start the input thread */ Added: trunk/reactos/subsystems/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/keyboard.c (added) +++ trunk/reactos/subsystems/ntvdm/hardware/keyboard.c [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -0,0 +1,46 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: keyboard.c + * PURPOSE: Keyboard emulation + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "keyboard.h" +#include "ps2.h" + +static BYTE PS2Port = 0; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID KeyboardEventHandler(PKEY_EVENT_RECORD KeyEvent) +{ + WORD i; + BYTE ScanCode = (BYTE)KeyEvent->wVirtualScanCode; + + /* If this is a key release, set the highest bit in the scan code */ + if (!KeyEvent->bKeyDown) ScanCode |= 0x80; + + /* Push the scan code into the PS/2 queue */ + for (i = 0; i < KeyEvent->wRepeatCount; i++) + { + PS2QueuePush(PS2Port, ScanCode); + } + + // PicInterruptRequest(1); +} + +VOID KeyboardCommand(BYTE Command) +{ + UNIMPLEMENTED; +} + +BOOLEAN KeyboardInit(BYTE PS2Connector) +{ + PS2Port = PS2Connector; + return TRUE; +} Propchange: trunk/reactos/subsystems/ntvdm/hardware/keyboard.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/ntvdm/hardware/keyboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/keyboard.h (added) +++ trunk/reactos/subsystems/ntvdm/hardware/keyboard.h [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -0,0 +1,28 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: keyboard.h + * PURPOSE: Keyboard emulation + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _KEYBOARD_H_ +#define _KEYBOARD_H_ + +/* INCLUDES *******************************************************************/ + +#include "ntvdm.h" + +/* DEFINES ********************************************************************/ + +/* Command responses */ +#define KEYBOARD_ACK 0xFA +#define KEYBOARD_RESEND 0xFE + +/* FUNCTIONS ******************************************************************/ + +VOID KeyboardEventHandler(PKEY_EVENT_RECORD KeyEvent); +VOID KeyboardCommand(BYTE Command); +BOOLEAN KeyboardInit(BYTE PS2Connector); + +#endif // _KEYBOARD_H_ Propchange: trunk/reactos/subsystems/ntvdm/hardware/keyboard.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/mouse.c [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -12,6 +12,9 @@ #include "mouse.h" #include "ps2.h" + +// HACK: For the PS/2 bypass and MOUSE.COM driver direct call +#include "dos/mouse32.h" /* PRIVATE VARIABLES **********************************************************/ @@ -28,6 +31,8 @@ static SHORT VertCounter; static CHAR ScrollCounter; +static BYTE PS2Port = 1; + /* PRIVATE FUNCTIONS **********************************************************/ static VOID MouseResetConfig(VOID) @@ -56,8 +61,8 @@ MouseId = 0; /* Send the Basic Assurance Test success code and the device ID */ - KeyboardQueuePush(MOUSE_BAT_SUCCESS); - KeyboardQueuePush(MouseId); + PS2QueuePush(PS2Port, MOUSE_BAT_SUCCESS); + PS2QueuePush(PS2Port, MouseId); } #if 0 @@ -116,9 +121,7 @@ } #endif -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID MouseUpdatePosition(PCOORD NewPosition) +/*static*/ VOID MouseUpdatePosition(PCOORD NewPosition) { /* Update the counters */ HorzCounter += ((NewPosition->X - Position.X) * WidthMm * Resolution) / WidthPixels; @@ -128,9 +131,23 @@ Position = *NewPosition; } -VOID MouseUpdateButtons(ULONG NewButtonState) +/*static*/ VOID MouseUpdateButtons(ULONG NewButtonState) { ButtonState = NewButtonState; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent) +{ + // FIXME: Sync our private data + + // HACK: Bypass PS/2 and instead, notify the MOUSE.COM driver directly + MouseBiosUpdatePosition(&MouseEvent->dwMousePosition); + MouseBiosUpdateButtons(LOWORD(MouseEvent->dwButtonState)); + + // PS2QueuePush(PS2Port, Data); + // PicInterruptRequest(12); } VOID MouseScroll(LONG Direction) @@ -151,7 +168,7 @@ case 0xE6: { Scaling = FALSE; - KeyboardQueuePush(MOUSE_ACK); + PS2QueuePush(PS2Port, MOUSE_ACK); break; } @@ -159,7 +176,7 @@ case 0xE7: { Scaling = TRUE; - KeyboardQueuePush(MOUSE_ACK); + PS2QueuePush(PS2Port, MOUSE_ACK); break; } @@ -185,7 +202,7 @@ MouseResetCounters(); Mode = MOUSE_STREAMING_MODE; - KeyboardQueuePush(MOUSE_ACK); + PS2QueuePush(PS2Port, MOUSE_ACK); break; } @@ -205,9 +222,9 @@ /* Restore the previous mode */ MouseResetCounters(); Mode = PreviousMode; - KeyboardQueuePush(MOUSE_ACK); + PS2QueuePush(PS2Port, MOUSE_ACK); } - else KeyboardQueuePush(MOUSE_ERROR); + else PS2QueuePush(PS2Port, MOUSE_ERROR); break; } @@ -224,7 +241,7 @@ MouseResetCounters(); Mode = MOUSE_WRAP_MODE; - KeyboardQueuePush(MOUSE_ACK); + PS2QueuePush(PS2Port, MOUSE_ACK); break; } @@ -234,15 +251,15 @@ MouseResetCounters(); Mode = MOUSE_REMOTE_MODE; - KeyboardQueuePush(MOUSE_ACK); + PS2QueuePush(PS2Port, MOUSE_ACK); break; } /* Get Mouse ID */ case 0xF2: { - KeyboardQueuePush(MOUSE_ACK); - KeyboardQueuePush(MouseId); + PS2QueuePush(PS2Port, MOUSE_ACK); + PS2QueuePush(PS2Port, MouseId); break; } @@ -258,7 +275,7 @@ case 0xF4: { Reporting = TRUE; - KeyboardQueuePush(MOUSE_ACK); + PS2QueuePush(PS2Port, MOUSE_ACK); break; } @@ -266,7 +283,7 @@ case 0xF5: { Reporting = FALSE; - KeyboardQueuePush(MOUSE_ACK); + PS2QueuePush(PS2Port, MOUSE_ACK); break; } @@ -297,12 +314,12 @@ /* Unknown command */ default: { - KeyboardQueuePush(MOUSE_ERROR); - } - } -} - -BOOLEAN MouseInit(VOID) + PS2QueuePush(PS2Port, MOUSE_ERROR); + } + } +} + +BOOLEAN MouseInit(BYTE PS2Connector) { HWND hWnd; HDC hDC; @@ -324,6 +341,8 @@ /* Release the device context */ ReleaseDC(hWnd, hDC); + PS2Port = PS2Connector; + MouseReset(); return TRUE; } Modified: trunk/reactos/subsystems/ntvdm/hardware/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/mouse.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/mouse.h [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -68,11 +68,12 @@ /* FUNCTIONS ******************************************************************/ -VOID MouseUpdatePosition(PCOORD NewPosition); -VOID MouseUpdateButtons(ULONG NewButtonState); +VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent); + VOID MouseScroll(LONG Direction); COORD MouseGetPosition(VOID); + VOID MouseCommand(BYTE Command); -BOOLEAN MouseInit(VOID); +BOOLEAN MouseInit(BYTE PS2Connector); #endif // _MOUSE_H_ Modified: trunk/reactos/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -4,6 +4,7 @@ * FILE: ps2.c * PURPOSE: PS/2 controller emulation * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ @@ -14,19 +15,39 @@ #include "io.h" #include "ps2.h" #include "pic.h" + +#include "keyboard.h" #include "mouse.h" -#include "../bios/bios32/moubios32.h" /* PRIVATE VARIABLES **********************************************************/ -static BYTE KeyboardQueue[KEYBOARD_BUFFER_SIZE]; -static BOOLEAN KeyboardQueueEmpty = TRUE; -static UINT KeyboardQueueStart = 0; -static UINT KeyboardQueueEnd = 0; -static BYTE KeyboardData = 0, KeyboardResponse = 0; -static BOOLEAN KeyboardReadResponse = FALSE, KeyboardWriteResponse = FALSE; -static BYTE KeyboardConfig = PS2_DEFAULT_CONFIG; -static HANDLE QueueMutex = NULL; +#define BUFFER_SIZE 32 + +typedef struct _PS2_PORT +{ + BOOLEAN IsEnabled; + + BOOLEAN QueueEmpty; + BYTE Queue[BUFFER_SIZE]; + UINT QueueStart; + UINT QueueEnd; + HANDLE QueueMutex; +} PS2_PORT, *PPS2_PORT; + +/* + * Port 1: Keyboard + * Port 2: Mouse + */ +#define PS2_PORTS 2 +static PS2_PORT Ports[PS2_PORTS]; + +#define PS2_DEFAULT_CONFIG 0x47 +static BYTE ControllerConfig = PS2_DEFAULT_CONFIG; +static BYTE ControllerCommand = 0x00; + +static BYTE StatusRegister = 0x00; +// static BYTE InputBuffer = 0x00; // PS/2 Input Buffer +static BYTE OutputBuffer = 0x00; // PS/2 Output Buffer /* PRIVATE FUNCTIONS **********************************************************/ @@ -34,31 +55,28 @@ { if (Port == PS2_CONTROL_PORT) { - BYTE Status = 0; - - /* Set the first bit if the data can be read */ - if (KeyboardReadResponse || !KeyboardQueueEmpty) Status |= 1 << 0; - - /* Always set bit 2 */ - Status |= 1 << 2; - - /* Set bit 3 if the next byte goes to the controller */ - if (KeyboardWriteResponse) Status |= 1 << 3; - - return Status; + /* Be sure bit 2 is always set */ + StatusRegister |= 1 << 2; + + // FIXME: Should clear bits 6 and 7 because there are + // no timeouts and no parity errors. + + return StatusRegister; } else if (Port == PS2_DATA_PORT) { - /* If there was a response byte from the controller, return it */ - if (KeyboardReadResponse) - { - KeyboardReadResponse = FALSE; - KeyboardData = KeyboardResponse; - } - - return KeyboardData; - } - else return 0; + /* + * If there is something to read (response byte from the + * controller or data from a PS/2 device), read it. + */ + if (StatusRegister & (1 << 0)) // || StatusRegister & (1 << 5) for second PS/2 port + StatusRegister &= ~(1 << 0); // StatusRegister &= ~(1 << 5); + + /* Always return the available byte stored in the output buffer */ + return OutputBuffer; + } + + return 0; } static VOID WINAPI PS2WritePort(ULONG Port, BYTE Data) @@ -70,8 +88,8 @@ /* Read configuration byte */ case 0x20: { - KeyboardResponse = KeyboardConfig; - KeyboardReadResponse = TRUE; + OutputBuffer = ControllerConfig; + StatusRegister |= (1 << 0); // There is something to read break; } @@ -79,60 +97,68 @@ case 0x60: /* Write controller output port */ case 0xD1: - /* Write keyboard output buffer */ + /* Write to the first PS/2 port output buffer */ case 0xD2: - /* Write mouse output buffer */ + /* Write to the second PS/2 port output buffer */ case 0xD3: - /* Write mouse input buffer */ + /* Write to the second PS/2 port input buffer */ case 0xD4: { /* These commands require a response */ - KeyboardResponse = Data; - KeyboardWriteResponse = TRUE; - break; - } - - /* Disable mouse */ + ControllerCommand = Data; + StatusRegister |= (1 << 3); // This is a controller command + break; + } + + /* Disable second PS/2 port */ case 0xA7: { - // TODO: Not implemented - break; - } - - /* Enable mouse */ + Ports[1].IsEnabled = FALSE; + break; + } + + /* Enable second PS/2 port */ case 0xA8: { - // TODO: Not implemented - break; - } - - /* Test mouse port */ + Ports[1].IsEnabled = TRUE; + break; + } + + /* Test second PS/2 port */ case 0xA9: { - KeyboardResponse = 0; - KeyboardReadResponse = TRUE; + OutputBuffer = 0x00; // Success code + StatusRegister |= (1 << 0); // There is something to read break; } /* Test PS/2 controller */ case 0xAA: { - KeyboardResponse = 0x55; - KeyboardReadResponse = TRUE; - break; - } - - /* Disable keyboard */ + OutputBuffer = 0x55; // Success code + StatusRegister |= (1 << 0); // There is something to read + break; + } + + /* Test first PS/2 port */ + case 0xAB: + { + OutputBuffer = 0x00; // Success code + StatusRegister |= (1 << 0); // There is something to read + break; + } + + /* Disable first PS/2 port */ case 0xAD: { - // TODO: Not implemented - break; - } - - /* Enable keyboard */ + Ports[0].IsEnabled = FALSE; + break; + } + + /* Enable first PS/2 port */ case 0xAE: { - // TODO: Not implemented + Ports[0].IsEnabled = TRUE; break; } @@ -162,17 +188,17 @@ else if (Port == PS2_DATA_PORT) { /* Check if the controller is waiting for a response */ - if (KeyboardWriteResponse) + if (StatusRegister & (1 << 3)) // If we have data for the controller { - KeyboardWriteResponse = FALSE; + StatusRegister &= ~(1 << 3); /* Check which command it was */ - switch (KeyboardResponse) + switch (ControllerCommand) { /* Write configuration byte */ case 0x60: { - KeyboardConfig = Data; + ControllerConfig = Data; break; } @@ -191,23 +217,31 @@ break; } - + + /* Push the data byte into the first PS/2 port queue */ case 0xD2: { - /* Push the data byte to the keyboard queue */ - KeyboardQueuePush(Data); - break; - } - + PS2QueuePush(0, Data); + break; + } + + /* Push the data byte into the second PS/2 port queue */ case 0xD3: { - // TODO: Mouse support - break; - } - + PS2QueuePush(1, Data); + break; + } + + /* + * Send a command to the second PS/2 port (by default + * it is a command for the first PS/2 port) + */ case 0xD4: { - MouseCommand(Data); + if (Ports[1].IsEnabled) + // Ports[1].Function + MouseCommand(Data); + break; } } @@ -216,156 +250,148 @@ } // TODO: Implement PS/2 device commands - } -} - -/* PUBLIC FUNCTIONS ***********************************************************/ - -BOOLEAN KeyboardQueuePush(BYTE ScanCode) + if (Ports[0].IsEnabled) + // Ports[0].Function + KeyboardCommand(Data); + } +} + +static BOOLEAN PS2PortQueueRead(BYTE PS2Port) { BOOLEAN Result = TRUE; - - WaitForSingleObject(QueueMutex, INFINITE); - - /* Check if the keyboard queue is full */ - if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) + PPS2_PORT Port; + + if (PS2Port >= PS2_PORTS) return FALSE; + Port = &Ports[PS2Port]; + + if (!Port->IsEnabled) return FALSE; + + /* Make sure the queue is not empty (fast check) */ + if (Port->QueueEmpty) return FALSE; + + WaitForSingleObject(Port->QueueMutex, INFINITE); + + /* + * Recheck whether the queue is not empty (it may + * have changed after having grabbed the mutex). + */ + if (Port->QueueEmpty) { Result = FALSE; goto Done; } - /* Insert the value in the queue */ - KeyboardQueue[KeyboardQueueEnd] = ScanCode; - KeyboardQueueEnd++; - KeyboardQueueEnd %= KEYBOARD_BUFFER_SIZE; - - /* Since we inserted a value, it's not empty anymore */ - KeyboardQueueEmpty = FALSE; + /* Get the data */ + OutputBuffer = Port->Queue[Port->QueueStart]; + StatusRegister |= (1 << 0); // There is something to read + // Sometimes StatusRegister |= (1 << 5); for the second PS/2 port + + /* Remove the value from the queue */ + Port->QueueStart++; + Port->QueueStart %= BUFFER_SIZE; + + /* Check if the queue is now empty */ + if (Port->QueueStart == Port->QueueEnd) + Port->QueueEmpty = TRUE; Done: - ReleaseMutex(QueueMutex); + ReleaseMutex(Port->QueueMutex); return Result; } -BOOLEAN KeyboardQueuePop(BYTE *ScanCode) +/* PUBLIC FUNCTIONS ***********************************************************/ + +// PS2SendToPort +BOOLEAN PS2QueuePush(BYTE PS2Port, BYTE Data) { BOOLEAN Result = TRUE; - - /* Make sure the keyboard queue is not empty (fast check) */ - if (KeyboardQueueEmpty) return FALSE; - - WaitForSingleObject(QueueMutex, INFINITE); - - /* - * Recheck whether keyboard queue is not empty (it - * may have changed after having grabbed the mutex). - */ - if (KeyboardQueueEmpty) + PPS2_PORT Port; + + if (PS2Port >= PS2_PORTS) return FALSE; + Port = &Ports[PS2Port]; + + if (!Port->IsEnabled) return FALSE; + + WaitForSingleObject(Port->QueueMutex, INFINITE); + + /* Check if the queue is full */ + if (!Port->QueueEmpty && (Port->QueueStart == Port->QueueEnd)) { Result = FALSE; goto Done; } - /* Get the scan code */ - *ScanCode = KeyboardQueue[KeyboardQueueStart]; - - /* Remove the value from the queue */ - KeyboardQueueStart++; - KeyboardQueueStart %= KEYBOARD_BUFFER_SIZE; - - /* Check if the queue is now empty */ - if (KeyboardQueueStart == KeyboardQueueEnd) - { - KeyboardQueueEmpty = TRUE; - } + /* Insert the value in the queue */ + Port->Queue[Port->QueueEnd] = Data; + Port->QueueEnd++; + Port->QueueEnd %= BUFFER_SIZE; + + /* Since we inserted a value, it's not empty anymore */ + Port->QueueEmpty = FALSE; + +/* + // Get the data + OutputBuffer = Port->Queue[Port->QueueStart]; + StatusRegister |= (1 << 0); // There is something to read + // FIXME: Sometimes StatusRegister |= (1 << 5); for the second PS/2 port + + if (PS2Port == 0) + PicInterruptRequest(1); + else if (PS2Port == 1) + PicInterruptRequest(12); +*/ Done: - ReleaseMutex(QueueMutex); + ReleaseMutex(Port->QueueMutex); return Result; } -VOID PS2Dispatch(PINPUT_RECORD InputRecord) -{ - /* Check the event type */ - switch (InputRecord->EventType) - { - case KEY_EVENT: - { - WORD i; - BYTE ScanCode = (BYTE)InputRecord->Event.KeyEvent.wVirtualScanCode; - - /* If this is a key release, set the highest bit in the scan code */ - if (!InputRecord->Event.KeyEvent.bKeyDown) ScanCode |= 0x80; - - /* Push the scan code onto the keyboard queue */ - for (i = 0; i < InputRecord->Event.KeyEvent.wRepeatCount; i++) - { - KeyboardQueuePush(ScanCode); - } - - break; - } - - case MOUSE_EVENT: - { - /* Notify the BIOS driver */ - MouseBiosUpdatePosition(&InputRecord->Event.MouseEvent.dwMousePosition); - MouseBiosUpdateButtons(LOWORD(InputRecord->Event.MouseEvent.dwButtonState)); - - // TODO: PS/2, other stuff - - break; - } - - /* We ignore all the rest */ - default: - break; - } -} - -VOID GenerateKeyboardInterrupts(VOID) -{ - /* Generate an IRQ 1 if there is a key ready in the queue */ - if (KeyboardQueuePop(&KeyboardData)) PicInterruptRequest(1); -} - -BOOLEAN PS2Initialize(HANDLE ConsoleInput) -{ - DWORD ConInMode; - - /* Create the mutex */ - QueueMutex = CreateMutex(NULL, FALSE, NULL); +VOID GenerateIrq1(VOID) +{ + /* Generate an interrupt if interrupts for the first PS/2 port are enabled */ + if (ControllerConfig & 0x01) + { + /* Generate an IRQ 1 if there is data ready in the output queue */ + if (PS2PortQueueRead(0)) PicInterruptRequest(1); + } +} + +VOID GenerateIrq12(VOID) +{ + /* Generate an interrupt if interrupts for the second PS/2 port are enabled */ + if (ControllerConfig & 0x02) + { + /* Generate an IRQ 12 if there is data ready in the output queue */ + if (PS2PortQueueRead(1)) PicInterruptRequest(12); + } +} + +BOOLEAN PS2Initialize(VOID) +{ + /* Initialize the PS/2 ports */ + Ports[0].IsEnabled = TRUE; + Ports[0].QueueEmpty = TRUE; + Ports[0].QueueStart = 0; + Ports[0].QueueEnd = 0; + Ports[0].QueueMutex = CreateMutex(NULL, FALSE, NULL); + + Ports[1].IsEnabled = TRUE; + Ports[1].QueueEmpty = TRUE; + Ports[1].QueueStart = 0; + Ports[1].QueueEnd = 0; + Ports[1].QueueMutex = CreateMutex(NULL, FALSE, NULL); /* Register the I/O Ports */ RegisterIoPort(PS2_CONTROL_PORT, PS2ReadPort, PS2WritePort); RegisterIoPort(PS2_DATA_PORT , PS2ReadPort, PS2WritePort); - if (GetConsoleMode(ConsoleInput, &ConInMode)) - { -#if 0 - if (MousePresent) - { -#endif - /* Support mouse input events if there is a mouse on the system */ - ConInMode |= ENABLE_MOUSE_INPUT; -#if 0 - } - else - { - /* Do not support mouse input events if there is no mouse on the system */ - ConInMode &= ~ENABLE_MOUSE_INPUT; - } -#endif - - SetConsoleMode(ConsoleInput, ConInMode); - } - return TRUE; } VOID PS2Cleanup(VOID) { - CloseHandle(QueueMutex); + CloseHandle(Ports[1].QueueMutex); + CloseHandle(Ports[0].QueueMutex); } /* EOF */ Modified: trunk/reactos/subsystems/ntvdm/hardware/ps2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/ps2.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/ps2.h [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -4,6 +4,7 @@ * FILE: ps2.h * PURPOSE: PS/2 controller emulation * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #ifndef _PS2_H_ @@ -15,21 +16,17 @@ /* DEFINES ********************************************************************/ -#define KEYBOARD_BUFFER_SIZE 32 -#define PS2_DATA_PORT 0x60 -#define PS2_CONTROL_PORT 0x64 -#define PS2_DEFAULT_CONFIG 0x05 -#define KEYBOARD_ACK 0xFA -#define KEYBOARD_RESEND 0xFE +#define PS2_DATA_PORT 0x60 +#define PS2_CONTROL_PORT 0x64 /* FUNCTIONS ******************************************************************/ -BOOLEAN KeyboardQueuePush(BYTE ScanCode); -BOOLEAN KeyboardQueuePop(BYTE *ScanCode); -VOID PS2Dispatch(PINPUT_RECORD InputRecord); -VOID GenerateKeyboardInterrupts(VOID); +BOOLEAN PS2QueuePush(BYTE PS2Port, BYTE Data); -BOOLEAN PS2Initialize(HANDLE ConsoleInput); +VOID GenerateIrq1(VOID); +VOID GenerateIrq12(VOID); + +BOOLEAN PS2Initialize(VOID); VOID PS2Cleanup(VOID); #endif // _PS2_H_ Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -1917,6 +1917,11 @@ +VOID ScreenEventHandler(PWINDOW_BUFFER_SIZE_RECORD ScreenEvent) +{ + DPRINT1("Screen events not handled\n"); +} + BOOL VgaAttachToConsole(VOID) { // Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.h [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -250,6 +250,7 @@ /* FUNCTIONS ******************************************************************/ +VOID ScreenEventHandler(PWINDOW_BUFFER_SIZE_RECORD ScreenEvent); BOOL VgaAttachToConsole(VOID); VOID VgaDetachFromConsole(BOOL ChangeMode); Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -328,69 +328,32 @@ if (ConsoleInput != INVALID_HANDLE_VALUE) CloseHandle(ConsoleInput); } -DWORD -WINAPI -PumpConsoleInput(LPVOID Parameter) -{ - HANDLE ConsoleInput = (HANDLE)Parameter; - INPUT_RECORD InputRecord; - DWORD Count; - - while (VdmRunning) - { - /* Make sure the task event is signaled */ - WaitForSingleObject(VdmTaskEvent, INFINITE); - - /* Wait for an input record */ - if (!ReadConsoleInput(ConsoleInput, &InputRecord, 1, &Count)) - { - DWORD LastError = GetLastError(); - DPRINT1("Error reading console input (0x%p, %lu) - Error %lu\n", ConsoleInput, Count, LastError); - return LastError; - } - - ASSERT(Count != 0); - - /* Check the event type */ - switch (InputRecord.EventType) - { - case KEY_EVENT: - case MOUSE_EVENT: - /* Send it to the PS/2 controller */ - PS2Dispatch(&InputRecord); - break; - - case MENU_EVENT: - { - switch (InputRecord.Event.MenuEvent.dwCommandId) - { - case ID_SHOWHIDE_MOUSE: - ShowHideMousePointer(ConsoleOutput, ShowPointer); - ShowPointer = !ShowPointer; - break; - - case ID_VDM_DUMPMEM: - DumpMemory(); - break; - - case ID_VDM_QUIT: - /* Stop the VDM */ - EmulatorTerminate(); - break; - - default: - break; - } - - break; - } - - default: - break; - } - } - - return 0; +VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent) +{ + switch (MenuEvent->dwCommandId) + { + case ID_SHOWHIDE_MOUSE: + ShowHideMousePointer(ConsoleOutput, ShowPointer); + ShowPointer = !ShowPointer; + break; + + case ID_VDM_DUMPMEM: + DumpMemory(); + break; + + case ID_VDM_QUIT: + /* Stop the VDM */ + EmulatorTerminate(); + break; + + default: + break; + } +} + +VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent) +{ + DPRINT1("Focus events not handled\n"); } #ifndef STANDALONE Modified: trunk/reactos/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.h?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.h [iso-8859-1] Tue Sep 16 00:51:15 2014 @@ -46,6 +46,9 @@ extern HANDLE VdmTaskEvent; +/* + * Interface functions + */ VOID DisplayMessage(LPCWSTR Format, ...); /*static*/ VOID @@ -53,6 +56,9 @@ /*static*/ VOID DestroyVdmMenu(VOID); +VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent); +VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent); + #endif // _NTVDM_H_ /* EOF */

1 0

[hbelusca] 64167: [NTVDM] - Code formatting and precise an info in a comment, - Remove an unneeded commented call, and - Mention that INT 15h functions C1h and C2h need to be implemented for PS/2 s...
by hbelusca＠svn.reactos.org 16 Sep '14

16 Sep '14

Author: hbelusca Date: Tue Sep 16 00:25:40 2014 New Revision: 64167 URL: http://svn.reactos.org/svn/reactos?rev=64167&view=rev Log: [NTVDM] - Code formatting and precise an info in a comment, - Remove an unneeded commented call, and - Mention that INT 15h functions C1h and C2h need to be implemented for PS/2 support. Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] Tue Sep 16 00:25:40 2014 @@ -20,7 +20,8 @@ #define BDA_SEGMENT 0x40 #define BIOS_SEGMENT 0xF000 -#define BIOS_EQUIPMENT_LIST 0x2C // HACK: Disable FPU for now +// HACK: Disable FPU for now +#define BIOS_EQUIPMENT_LIST 0x2C // Bit 2 set: Mouse present #pragma pack(push, 1) Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Tue Sep 16 00:25:40 2014 @@ -125,6 +125,13 @@ setAH(0x00); Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + break; + } + + case 0xC1: + case 0xC2: + { + DPRINT1("INT 15h, AH = 0x%02X must be implemented in order to support vendor mouse drivers\n"); break; } @@ -412,8 +419,9 @@ /* Initialize platform hardware (PIC/PIT chips, ...) */ BiosHwSetup(); - /* Initialize the Keyboard and Video BIOS */ - if (!KbdBios32Initialize() || !VidBios32Initialize() || !MouseBios32Initialize()) return FALSE; + /* Initialize the Keyboard, Video and Mouse BIOS */ + if (!KbdBios32Initialize() || !VidBios32Initialize() || !MouseBios32Initialize()) + return FALSE; ///////////// MUST BE DONE AFTER IVT INITIALIZATION !! ///////////////////// Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Tue Sep 16 00:25:40 2014 @@ -198,7 +198,7 @@ WORD Character; /* Get the scan code and virtual key code */ - ScanCode = IOReadB(PS2_DATA_PORT); + ScanCode = IOReadB(PS2_DATA_PORT); VirtualKey = MapVirtualKey(ScanCode & 0x7F, MAPVK_VSC_TO_VK); /* Check if this is a key press or release */ @@ -280,7 +280,6 @@ /* Set up the HW vector interrupts */ EnableHwIRQ(1, BiosKeyboardIrq); - // EnableHwIRQ(12, BiosMouseIrq); return TRUE; }

1 0

[jgardou] 64166: [KDGDB] - As pid and tid 0 have a special meaning in GDB, use off-by-one thread and process ID when communicating with it - Properly read registers and memory from foreign thread a...
by jgardou＠svn.reactos.org 15 Sep '14

15 Sep '14

Author: jgardou Date: Mon Sep 15 22:05:21 2014 New Revision: 64166 URL: http://svn.reactos.org/svn/reactos?rev=64166&view=rev Log: [KDGDB] - As pid and tid 0 have a special meaning in GDB, use off-by-one thread and process ID when communicating with it - Properly read registers and memory from foreign thread and processes. (This time it was tested and proved to work reliably. __writecr3 ftw!) - Loop the list of processes and threads when trying to find them from ID, as PsLookupProessByThreadId and friends can't be used since we can be at any IRQL. - Add a few more debug prints to help diagnosing problems. CORE-8531 Added: trunk/reactos/drivers/base/kdgdb/utils.c (with props) Modified: trunk/reactos/drivers/base/kdgdb/CMakeLists.txt trunk/reactos/drivers/base/kdgdb/gdb_input.c trunk/reactos/drivers/base/kdgdb/gdb_send.c trunk/reactos/drivers/base/kdgdb/i386_sup.c trunk/reactos/drivers/base/kdgdb/kdgdb.h trunk/reactos/drivers/base/kdgdb/kdpacket.c Modified: trunk/reactos/drivers/base/kdgdb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/CMakeLi… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/CMakeLists.txt [iso-8859-1] Mon Sep 15 22:05:21 2014 @@ -7,6 +7,7 @@ gdb_send.c kdcom.c kdpacket.c + utils.c kdgdb.h) # TODO: AMD64, ARM... Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_inp… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] Mon Sep 15 22:05:21 2014 @@ -7,43 +7,22 @@ #include "kdgdb.h" -#include <pstypes.h> - /* LOCALS *********************************************************************/ -static HANDLE gdb_run_thread; -/* We might have to attach to a process to read its memory */ -static PEPROCESS AttachedProcess = NULL; +static ULONG_PTR gdb_run_tid; /* Keep track of where we are for qfThreadInfo/qsThreadInfo */ static LIST_ENTRY* CurrentProcessEntry; static LIST_ENTRY* CurrentThreadEntry; /* GLOBALS ********************************************************************/ -HANDLE gdb_dbg_process; -HANDLE gdb_dbg_thread; +UINT_PTR gdb_dbg_pid; +UINT_PTR gdb_dbg_tid; /* PRIVATE FUNCTIONS **********************************************************/ static -HANDLE -hex_to_thread(char* buffer) +UINT_PTR +hex_to_tid(char* buffer) { ULONG_PTR ret = 0; - char hex; - while (*buffer) - { - hex = hex_value(*buffer++); - if (hex < 0) - return (HANDLE)ret; - ret <<= 4; - ret += hex; - } - return (HANDLE)ret; -} - -static -ULONG64 -hex_to_address(char* buffer) -{ - ULONG64 ret = 0; char hex; while (*buffer) { @@ -55,6 +34,24 @@ } return ret; } +#define hex_to_pid hex_to_tid + +static +ULONG64 +hex_to_address(char* buffer) +{ + ULONG64 ret = 0; + char hex; + while (*buffer) + { + hex = hex_value(*buffer++); + if (hex < 0) + return ret; + ret <<= 4; + ret += hex; + } + return ret; +} /* H* packets */ static @@ -65,26 +62,26 @@ { case 'c': if (strcmp(&gdb_input[2], "-1") == 0) - gdb_run_thread = (HANDLE)-1; + gdb_run_tid = (ULONG_PTR)-1; else - gdb_run_thread = hex_to_thread(&gdb_input[2]); + gdb_run_tid = hex_to_tid(&gdb_input[2]); send_gdb_packet("OK"); break; case 'g': KDDBGPRINT("Setting debug thread: %s.\n", gdb_input); if (strncmp(&gdb_input[2], "p-1", 3) == 0) { - gdb_dbg_process = (HANDLE)-1; - gdb_dbg_thread = (HANDLE)-1; + gdb_dbg_pid = (UINT_PTR)-1; + gdb_dbg_tid = (UINT_PTR)-1; } else { char* ptr = strstr(gdb_input, ".") + 1; - gdb_dbg_process = hex_to_thread(&gdb_input[3]); + gdb_dbg_pid = hex_to_pid(&gdb_input[3]); if (strncmp(ptr, "-1", 2) == 0) - gdb_dbg_thread = (HANDLE)-1; + gdb_dbg_tid = (UINT_PTR)-1; else - gdb_dbg_thread = hex_to_thread(ptr); + gdb_dbg_tid = hex_to_tid(ptr); } send_gdb_packet("OK"); break; @@ -112,26 +109,22 @@ void handle_gdb_thread_alive(void) { - char* ptr = strstr(gdb_input, ".") + 1; - CLIENT_ID ClientId; + ULONG_PTR Pid, Tid; PETHREAD Thread; - NTSTATUS Status; - - ClientId.UniqueProcess = hex_to_thread(&gdb_input[2]); - ClientId.UniqueThread = hex_to_thread(ptr); - - Status = PsLookupProcessThreadByCid(&ClientId, NULL, &Thread); - - if (!NT_SUCCESS(Status)) - { - /* Thread doesn't exist */ + + Pid = hex_to_pid(&gdb_input[2]); + Tid = hex_to_tid(strstr(gdb_input, ".") + 1); + + /* We cannot use PsLookupProcessThreadByCid as we could be running at any IRQL. + * So loop. */ + KDDBGPRINT("Checking if p%p.%p is alive.\n", Pid, Tid); + + Thread = find_thread(Pid, Tid); + + if (Thread != NULL) + send_gdb_packet("OK"); + else send_gdb_packet("E03"); - return; - } - - /* It's OK */ - ObDereferenceObject(Thread); - send_gdb_packet("OK"); } /* q* packets */ @@ -165,9 +158,9 @@ if (strcmp(gdb_input, "qC") == 0) { char gdb_out[64]; - sprintf(gdb_out, "QC:p%p.%p;", - PsGetThreadProcessId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread), - PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)); + sprintf(gdb_out, "QC:p%"PRIxPTR".%"PRIxPTR";", + handle_to_gdb_pid(PsGetThreadProcessId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)), + handle_to_gdb_tid(PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread))); send_gdb_packet(gdb_out); return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } @@ -175,44 +168,35 @@ if ((strncmp(gdb_input, "qfThreadInfo", 12) == 0) || (strncmp(gdb_input, "qsThreadInfo", 12) == 0)) { - LIST_ENTRY* ProcessListHead = (LIST_ENTRY*)KdDebuggerDataBlock->PsActiveProcessHead.Pointer; BOOLEAN FirstThread = TRUE; PEPROCESS Process; PETHREAD Thread; char gdb_out[1024]; - char* ptr; + char* ptr = gdb_out; BOOLEAN Resuming = strncmp(gdb_input, "qsThreadInfo", 12) == 0; - /* Maybe this was not initialized yet */ - if (!ProcessListHead->Flink) - { - char gdb_out[64]; - - if (Resuming) + if (Resuming) + { + if (CurrentProcessEntry == (LIST_ENTRY*)1) { - /* there is only one thread to tell about */ + /* We're done */ send_gdb_packet("l"); + CurrentProcessEntry = NULL; return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } - /* Just tell GDB about the current thread */ - sprintf(gdb_out, "mp%p.%p", PsGetCurrentProcessId(), PsGetCurrentThreadId()); - send_gdb_packet(gdb_out); - /* GDB can ask anything at this point, it isn't necessarily a qsThreadInfo packet */ - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); - } - - if (Resuming) - { + if (CurrentThreadEntry == NULL) CurrentProcessEntry = CurrentProcessEntry->Flink; } else CurrentProcessEntry = ProcessListHead->Flink; - if (CurrentProcessEntry == ProcessListHead) - { - /* We're done */ - send_gdb_packet("l"); + if ((CurrentProcessEntry == ProcessListHead) || + (CurrentProcessEntry == NULL)) /* Ps is not initialized */ + { + /* We're almost done. Tell GDB about the idle thread */ + send_gdb_packet("mp1.1"); + CurrentProcessEntry = (LIST_ENTRY*)1; return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } @@ -244,7 +228,9 @@ } ptr += _snprintf(ptr, 1024 - (ptr - gdb_out), - "p%p.%p", PsGetProcessId(Process), PsGetThreadId(Thread)); + "p%p.%p", + handle_to_gdb_pid(Process->UniqueProcessId), + handle_to_gdb_tid(Thread->Cid.UniqueThread)); if (ptr > (gdb_out + 1024)) { /* send what we got */ @@ -319,11 +305,10 @@ KdpSendPacketHandler = NULL; KdpManipulateStateHandler = NULL; - /* Detach if we have to */ - if (AttachedProcess != NULL) - { - KeDetachProcess(); - AttachedProcess = NULL; + /* Reset the TLB */ + if ((gdb_dbg_pid != 0) && gdb_pid_to_handle(gdb_dbg_pid) != PsGetCurrentProcessId()) + { + __writecr3(PsGetCurrentProcess()->Pcb.DirectoryTableBase[0]); } } @@ -343,17 +328,17 @@ MessageData->Length = 0; *MessageLength = 0; - /* Attach to the debug process to read its memory */ - if (gdb_dbg_process != PsGetCurrentProcessId()) - { - NTSTATUS Status = PsLookupProcessByProcessId(gdb_dbg_process, &AttachedProcess); - if (!NT_SUCCESS(Status)) + /* Set the TLB according to the process being read. Pid 0 means any process. */ + if ((gdb_dbg_pid != 0) && gdb_pid_to_handle(gdb_dbg_pid) != PsGetCurrentProcessId()) + { + PEPROCESS AttachedProcess = find_process(gdb_dbg_pid); + if (AttachedProcess == NULL) { KDDBGPRINT("The current GDB debug thread is invalid!"); send_gdb_packet("E03"); return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } - KeAttachProcess(&AttachedProcess->Pcb); + __writecr3(AttachedProcess->Pcb.DirectoryTableBase[0]); } State->u.ReadMemory.TargetBaseAddress = hex_to_address(&gdb_input[1]); Modified: trunk/reactos/drivers/base/kdgdb/gdb_send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_sen… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_send.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_send.c [iso-8859-1] Mon Sep 15 22:05:21 2014 @@ -168,15 +168,22 @@ { char gdb_out[1024]; char* ptr = gdb_out; - DBGKM_EXCEPTION64* Exception = &CurrentStateChange.u.Exception; + PETHREAD Thread = (PETHREAD)(ULONG_PTR)CurrentStateChange.Thread; /* Report to GDB */ *ptr++ = 'T'; - ptr = exception_code_to_gdb(Exception->ExceptionRecord.ExceptionCode, ptr); - ptr += sprintf(ptr, "thread:p%p.%p;", - PsGetThreadProcessId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread), - PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)); + if (CurrentStateChange.NewState == DbgKdExceptionStateChange) + { + EXCEPTION_RECORD64* ExceptionRecord = &CurrentStateChange.u.Exception.ExceptionRecord; + ptr = exception_code_to_gdb(ExceptionRecord->ExceptionCode, ptr); + } + else + ptr += sprintf(ptr, "05"); + + ptr += sprintf(ptr, "thread:p%" PRIxPTR ".%" PRIxPTR ";", + handle_to_gdb_pid(PsGetThreadProcessId(Thread)), + handle_to_gdb_tid(PsGetThreadId(Thread))); ptr += sprintf(ptr, "core:%x;", CurrentStateChange.Processor); send_gdb_packet(gdb_out); } Modified: trunk/reactos/drivers/base/kdgdb/i386_sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/i386_su… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/i386_sup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/i386_sup.c [iso-8859-1] Mon Sep 15 22:05:21 2014 @@ -6,8 +6,6 @@ */ #include "kdgdb.h" - -#include <pstypes.h> enum reg_name { @@ -85,36 +83,62 @@ void* thread_to_reg(PETHREAD Thread, enum reg_name reg_name, unsigned short* size) { - PKTRAP_FRAME TrapFrame = Thread->Tcb.TrapFrame; - - /* See if the thread was actually scheduled */ - if (TrapFrame == NULL) - { - return NULL; - } - - *size = 4; - switch (reg_name) - { - case EAX: return &TrapFrame->Eax; - case ECX: return &TrapFrame->Ecx; - case EDX: return &TrapFrame->Edx; - case EBX: return &TrapFrame->Ebx; - case ESP: return (TrapFrame->PreviousPreviousMode == KernelMode) ? - &TrapFrame->TempEsp : &TrapFrame->HardwareEsp; - case EBP: return &TrapFrame->Ebp; - case ESI: return &TrapFrame->Esi; - case EDI: return &TrapFrame->Edi; - case EIP: return &TrapFrame->Eip; - case EFLAGS: return &TrapFrame->EFlags; - case CS: return &TrapFrame->SegCs; - case SS: return &TrapFrame->HardwareSegSs; - case DS: return &TrapFrame->SegDs; - case ES: return &TrapFrame->SegEs; - case FS: return &TrapFrame->SegFs; - case GS: return &TrapFrame->SegGs; - default: - KDDBGPRINT("Unhandled regname: %d.\n", reg_name); + /* See if the guy got a stack */ + if (Thread->Tcb.InitialStack == NULL) + { + static const void* NullValue = NULL; + /* Terminated thread ? */ + switch (reg_name) + { + case ESP: + case EBP: + case EIP: + *size = 4; + return &NullValue; + default: + return NULL; + } + } + else if (Thread->Tcb.TrapFrame) + { + PKTRAP_FRAME TrapFrame = Thread->Tcb.TrapFrame; + + *size = 4; + switch (reg_name) + { + case EAX: return &TrapFrame->Eax; + case ECX: return &TrapFrame->Ecx; + case EDX: return &TrapFrame->Edx; + case EBX: return &TrapFrame->Ebx; + case ESP: return (TrapFrame->PreviousPreviousMode == KernelMode) ? + &TrapFrame->TempEsp : &TrapFrame->HardwareEsp; + case EBP: return &TrapFrame->Ebp; + case ESI: return &TrapFrame->Esi; + case EDI: return &TrapFrame->Edi; + case EIP: return &TrapFrame->Eip; + case EFLAGS: return &TrapFrame->EFlags; + case CS: return &TrapFrame->SegCs; + case SS: return &TrapFrame->HardwareSegSs; + case DS: return &TrapFrame->SegDs; + case ES: return &TrapFrame->SegEs; + case FS: return &TrapFrame->SegFs; + case GS: return &TrapFrame->SegGs; + default: + KDDBGPRINT("Unhandled regname: %d.\n", reg_name); + } + } + else + { + /* The thread was not yet scheduled */ + *size = 4; + switch(reg_name) + { + case ESP: return &Thread->Tcb.KernelStack; + case EBP: return &((ULONG*)Thread->Tcb.KernelStack)[4]; + case EIP: return &Thread->StartAddress; + default: + return NULL; + } } return NULL; } @@ -132,7 +156,10 @@ unsigned short size; CHAR* ptr = Registers; - if (gdb_dbg_thread == PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)) + KDDBGPRINT("Sending registers of thread %" PRIxPTR ".\n", gdb_dbg_tid); + KDDBGPRINT("Current thread_id: %p.\n", PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)); + if (((gdb_dbg_pid == 0) && (gdb_dbg_tid == 0)) || + gdb_tid_to_handle(gdb_dbg_tid) == PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)) { for(i=0; i < 16; i++) { @@ -150,10 +177,10 @@ else { PETHREAD DbgThread; - NTSTATUS Status; - - Status = PsLookupThreadByThreadId(gdb_dbg_thread, &DbgThread); - if (!NT_SUCCESS(Status)) + + DbgThread = find_thread(gdb_dbg_pid, gdb_dbg_tid); + + if (DbgThread == NULL) { /* Thread is dead */ send_gdb_packet("E03"); @@ -199,7 +226,8 @@ /* Get the GDB register name (gdb_input = "pXX") */ reg_name = (hex_value(gdb_input[1]) << 4) | hex_value(gdb_input[2]); - if (gdb_dbg_thread == PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)) + if (((gdb_dbg_pid == 0) && (gdb_dbg_tid == 0)) || + gdb_tid_to_handle(gdb_dbg_tid) == PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)) { /* We can get it from the context of the current exception */ ptr = ctx_to_reg(&CurrentContext, reg_name, &size); @@ -207,10 +235,10 @@ else { PETHREAD DbgThread; - NTSTATUS Status; - - Status = PsLookupThreadByThreadId(gdb_dbg_thread, &DbgThread); - if (!NT_SUCCESS(Status)) + + DbgThread = find_thread(gdb_dbg_pid, gdb_dbg_tid); + + if (DbgThread == NULL) { /* Thread is dead */ send_gdb_packet("E03"); Modified: trunk/reactos/drivers/base/kdgdb/kdgdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdgdb.h… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdgdb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdgdb.h [iso-8859-1] Mon Sep 15 22:05:21 2014 @@ -13,8 +13,11 @@ #include <halfuncs.h> #include <stdio.h> #include <arc/arc.h> +#include <inttypes.h> #include <windbgkd.h> #include <kddll.h> + +#include <pstypes.h> #define KDDEBUG /* uncomment to enable debugging this dll */ @@ -24,6 +27,18 @@ extern ULONG KdpDbgPrint(const char* Format, ...); #define KDDBGPRINT KdpDbgPrint #endif + +/* GDB doesn't like pid - tid 0, so +1 them */ +FORCEINLINE HANDLE gdb_tid_to_handle(UINT_PTR Tid) +{ + return (HANDLE)(Tid - 1); +} +#define gdb_pid_to_handle gdb_tid_to_handle +FORCEINLINE UINT_PTR handle_to_gdb_tid(HANDLE Handle) +{ + return (UINT_PTR)Handle + 1; +} +#define handle_to_gdb_pid handle_to_gdb_tid FORCEINLINE VOID @@ -51,8 +66,8 @@ ); /* gdb_input.c */ -extern HANDLE gdb_dbg_thread; -extern HANDLE gdb_dbg_process; +extern UINT_PTR gdb_dbg_tid; +extern UINT_PTR gdb_dbg_pid; extern KDSTATUS gdb_interpret_input(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); extern KDSTATUS gdb_receive_and_interpret_packet(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); @@ -79,11 +94,18 @@ extern CONTEXT CurrentContext; extern DBGKD_GET_VERSION64 KdVersion; extern KDDEBUGGER_DATA64* KdDebuggerDataBlock; +extern LIST_ENTRY* ProcessListHead; extern KDP_SEND_HANDLER KdpSendPacketHandler; extern KDP_MANIPULATESTATE_HANDLER KdpManipulateStateHandler; /* Commone ManipulateState handlers */ extern KDSTATUS ContinueManipulateStateHandler(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); extern KDSTATUS SetContextManipulateHandler(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); +extern PEPROCESS TheIdleProcess; +extern PETHREAD TheIdleThread; + +/* utils.c */ +extern PEPROCESS find_process( _In_ UINT_PTR Pid); +extern PETHREAD find_thread(_In_ UINT_PTR Pid, _In_ UINT_PTR Tid); /* arch_sup.c */ extern KDSTATUS gdb_send_register(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); Modified: trunk/reactos/drivers/base/kdgdb/kdpacket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdpacke… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdpacket.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdpacket.c [iso-8859-1] Mon Sep 15 22:05:21 2014 @@ -14,18 +14,20 @@ _In_ ULONG PacketType, _In_ PSTRING MessageHeader, _In_ PSTRING MessageData); -static BOOLEAN CanSendData = FALSE; +static BOOLEAN InException = FALSE; /* GLOBALS ********************************************************************/ DBGKD_GET_VERSION64 KdVersion; KDDEBUGGER_DATA64* KdDebuggerDataBlock; -BOOLEAN InException = FALSE; +LIST_ENTRY* ProcessListHead; /* Callbacks used to communicate with KD aside from GDB */ KDP_SEND_HANDLER KdpSendPacketHandler = FirstSendHandler; KDP_MANIPULATESTATE_HANDLER KdpManipulateStateHandler = NULL; /* Data describing the current exception */ DBGKD_ANY_WAIT_STATE_CHANGE CurrentStateChange; CONTEXT CurrentContext; +PEPROCESS TheIdleProcess; +PETHREAD TheIdleThread; /* PRIVATE FUNCTIONS **********************************************************/ @@ -130,6 +132,8 @@ void send_kd_state_change(DBGKD_ANY_WAIT_STATE_CHANGE* StateChange) { + InException = TRUE; + switch (StateChange->NewState) { case DbgKdLoadSymbolsStateChange: @@ -139,17 +143,22 @@ break; } case DbgKdExceptionStateChange: + { + PETHREAD Thread = (PETHREAD)(ULONG_PTR)StateChange->Thread; /* Save current state for later GDB queries */ CurrentStateChange = *StateChange; - /* Unless GDB tells us otherwise, those are what we should have */ - gdb_dbg_thread = PsGetThreadId((PETHREAD)(ULONG_PTR)StateChange->Thread); - gdb_dbg_process = PsGetThreadProcessId((PETHREAD)(ULONG_PTR)StateChange->Thread); + KDDBGPRINT("Exception 0x%08x in thread p%p.%p.\n", + StateChange->u.Exception.ExceptionRecord.ExceptionCode, + PsGetThreadProcessId(Thread), + PsGetThreadId(Thread)); + /* Set the current debugged process/thread accordingly */ + gdb_dbg_tid = handle_to_gdb_tid(PsGetThreadId(Thread)); + gdb_dbg_pid = handle_to_gdb_pid(PsGetThreadProcessId(Thread)); gdb_send_exception(); /* Next receive call will ask for the context */ KdpManipulateStateHandler = GetContextManipulateHandler; - /* We can now send data, since after this we will be connected to GDB */ - CanSendData = TRUE; break; + } default: /* FIXME */ while (1); @@ -162,7 +171,7 @@ _In_ DBGKD_DEBUG_IO* DebugIO, _In_ PSTRING String) { - if (!CanSendData) + if (InException) return; switch (DebugIO->ApiNumber) @@ -217,6 +226,9 @@ /* We definitely are at the end of the send <-> receive loop, if any */ KdpSendPacketHandler = NULL; KdpManipulateStateHandler = NULL; + /* We're not handling an exception anymore */ + InException = FALSE; + return KdPacketReceived; } @@ -244,10 +256,11 @@ RtlCopyMemory(&KdVersion, &State->u.GetVersion64, sizeof(KdVersion)); DebuggerDataList = (LIST_ENTRY*)(ULONG_PTR)KdVersion.DebuggerDataList; KdDebuggerDataBlock = CONTAINING_RECORD(DebuggerDataList->Flink, KDDEBUGGER_DATA64, Header.List); - - /* We can tell KD to continue */ + ProcessListHead = (LIST_ENTRY*)KdDebuggerDataBlock->PsActiveProcessHead.Pointer; + + /* Now we can get the context for the current state */ KdpSendPacketHandler = NULL; - KdpManipulateStateHandler = ContinueManipulateStateHandler; + KdpManipulateStateHandler = GetContextManipulateHandler; } static @@ -267,9 +280,6 @@ KdpSendPacketHandler = GetVersionSendHandler; KdpManipulateStateHandler = NULL; - /* This will make KD breakin and we will be able to properly attach to GDB */ - KdContext->KdpControlCPending = TRUE; - return KdPacketReceived; } @@ -281,6 +291,7 @@ _In_ PSTRING MessageData) { DBGKD_ANY_WAIT_STATE_CHANGE* StateChange = (DBGKD_ANY_WAIT_STATE_CHANGE*)MessageHeader->Buffer; + PETHREAD Thread; if (PacketType == PACKET_TYPE_KD_DEBUG_IO) { @@ -296,7 +307,19 @@ while(1); } + KDDBGPRINT("KDGDB: START!\n"); + + Thread = (PETHREAD)(ULONG_PTR)StateChange->Thread; + + /* Set up the current state */ CurrentStateChange = *StateChange; + gdb_dbg_tid = handle_to_gdb_tid(PsGetThreadId(Thread)); + gdb_dbg_pid = handle_to_gdb_pid(PsGetThreadProcessId(Thread)); + /* This is the idle process. Save it! */ + TheIdleThread = Thread; + TheIdleProcess = (PEPROCESS)Thread->Tcb.ApcState.Process; + + KDDBGPRINT("Pid Tid of the first message: %" PRIxPTR", %" PRIxPTR ".\n", gdb_dbg_pid, gdb_dbg_tid); /* The next receive call will be asking for the version data */ KdpSendPacketHandler = NULL; Added: trunk/reactos/drivers/base/kdgdb/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/utils.c… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/utils.c (added) +++ trunk/reactos/drivers/base/kdgdb/utils.c [iso-8859-1] Mon Sep 15 22:05:21 2014 @@ -0,0 +1,71 @@ +/* + * COPYRIGHT: GPL, see COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/base/kddll/utils.c + * PURPOSE: Misc helper functions. + */ + +#include "kdgdb.h" + +/* + * We cannot use PsLookupProcessThreadByCid or alike as we could be running at any IRQL. + * So we have to loop over the process list. + */ + +PEPROCESS +find_process( + _In_ UINT_PTR Pid) +{ + HANDLE ProcessId = gdb_pid_to_handle(Pid); + LIST_ENTRY* ProcessEntry; + PEPROCESS Process; + + /* Special case for idle process */ + if (Pid == 1) + return TheIdleProcess; + + for (ProcessEntry = ProcessListHead->Flink; + ProcessEntry != ProcessListHead; + ProcessEntry = ProcessEntry->Flink) + { + Process = CONTAINING_RECORD(ProcessEntry, EPROCESS, ActiveProcessLinks); + + if (Process->UniqueProcessId == ProcessId) + return Process; + } + + return NULL; +} + +PETHREAD +find_thread( + _In_ UINT_PTR Pid, + _In_ UINT_PTR Tid) +{ + HANDLE ThreadId = gdb_tid_to_handle(Tid); + PETHREAD Thread; + PEPROCESS Process; + LIST_ENTRY* ThreadEntry; + + /* Special case for the idle thread */ + if ((Pid == 1) && (Tid == 1)) + return TheIdleThread; + + Process = find_process(Pid); + if (!Process) + return NULL; + + for (ThreadEntry = Process->ThreadListHead.Flink; + ThreadEntry != &Process->ThreadListHead; + ThreadEntry = ThreadEntry->Flink) + { + Thread = CONTAINING_RECORD(ThreadEntry, ETHREAD, ThreadListEntry); + /* For GDB, Tid == 0 means any thread */ + if ((Thread->Cid.UniqueThread == ThreadId) || (Tid == 0)) + { + return Thread; + } + } + + return NULL; +} Propchange: trunk/reactos/drivers/base/kdgdb/utils.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/reactos/drivers/base/kdgdb/utils.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/base/kdgdb/utils.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[tkreuzer] 64165: [hivesys.inf] Fix a typo.
by tkreuzer＠svn.reactos.org 15 Sep '14

15 Sep '14

Author: tkreuzer Date: Mon Sep 15 21:42:47 2014 New Revision: 64165 URL: http://svn.reactos.org/svn/reactos?rev=64165&view=rev Log: [hivesys.inf] Fix a typo. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Mon Sep 15 21:42:47 2014 @@ -1479,11 +1479,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"kbdclass" ; Kernel Security Support Provider Interface Driver -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ImagePath",0x00020000,"system32\drivers\ksecdd.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ErrorControl",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Group",0x00000000,"Base" +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ImagePath",0x00020000,"system32\drivers\ksecdd.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Type",0x00010001,0x00000001 ; MPU-401 MIDI driver HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Group",0x00000000,"Base"

1 0

[tkreuzer] 64164: [ADVAPI32_APITEST] - Fix linux build
by tkreuzer＠svn.reactos.org 15 Sep '14

15 Sep '14

Author: tkreuzer Date: Mon Sep 15 21:08:00 2014 New Revision: 64164 URL: http://svn.reactos.org/svn/reactos?rev=64164&view=rev Log: [ADVAPI32_APITEST] - Fix linux build Modified: trunk/rostests/apitests/advapi32/RtlEncryptMemory.c Modified: trunk/rostests/apitests/advapi32/RtlEncryptMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/RtlEncr… ============================================================================== --- trunk/rostests/apitests/advapi32/RtlEncryptMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/RtlEncryptMemory.c [iso-8859-1] Mon Sep 15 21:08:00 2014 @@ -11,7 +11,7 @@ #include <windows.h> #include <ndk/ntndk.h> #include <winsafer.h> -#include <Ntsecapi.h> +#include <ntsecapi.h> START_TEST(RtlEncryptMemory) {

1 0

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