[NTOS:KD64] Only use the UNIMPLEMENTED macro in the debugger's KdpSys* helpers.

HBelusca · HBelusca · commit edb6d19aa88b · 2024-11-21T22:34:37.000+01:00
This basically avoids re-entering the debugger (via the embedded breakpoint) while we are already running within its context. In addition, this allows the tests for Kd/NtSystemDebugControl (see PRs reactos#7424 and reactos#7426) to run without having ReactOS to crash.
diff --git a/ntoskrnl/kd64/amd64/kdx64.c b/ntoskrnl/kd64/amd64/kdx64.c
@@ -139,7 +139,7 @@ KdpSysReadBusData(IN ULONG BusDataType,
                   IN ULONG Length,
                   OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -153,7 +153,7 @@ KdpSysWriteBusData(IN ULONG BusDataType,
                    IN ULONG Length,
                    OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -284,7 +284,7 @@ KdpSysReadIoSpace(IN ULONG InterfaceType,
 
         default:
             /* Invalid data size */
-             *ActualDataSize = 0;
+            *ActualDataSize = 0;
             return STATUS_INVALID_PARAMETER;
     }
 
@@ -340,7 +340,7 @@ KdpSysWriteIoSpace(IN ULONG InterfaceType,
 
         default:
             /* Invalid data size */
-             *ActualDataSize = 0;
+            *ActualDataSize = 0;
             return STATUS_INVALID_PARAMETER;
     }
 
@@ -355,15 +355,15 @@ NTSTATUS
 NTAPI
 KdpSysCheckLowMemory(IN ULONG Flags)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
 NTSTATUS
 NTAPI
 KdpAllowDisable(VOID)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_ACCESS_DENIED;
 }
 
diff --git a/ntoskrnl/kd64/arm/kdarm.c b/ntoskrnl/kd64/arm/kdarm.c
@@ -22,23 +22,23 @@ NTAPI
 KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State,
                   IN PCONTEXT Context)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
 }
 
 VOID
 NTAPI
 KdpSetContextState(IN PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange,
                    IN PCONTEXT Context)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
 }
 
 NTSTATUS
 NTAPI
 KdpSysReadMsr(IN ULONG Msr,
               OUT PLARGE_INTEGER MsrValue)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -47,7 +47,7 @@ NTAPI
 KdpSysWriteMsr(IN ULONG Msr,
                IN PLARGE_INTEGER MsrValue)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -61,7 +61,7 @@ KdpSysReadBusData(IN ULONG BusDataType,
                   IN ULONG Length,
                   OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -75,7 +75,7 @@ KdpSysWriteBusData(IN ULONG BusDataType,
                    IN ULONG Length,
                    OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -87,7 +87,7 @@ KdpSysReadControlSpace(IN ULONG Processor,
                        IN ULONG Length,
                        OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -99,7 +99,7 @@ KdpSysWriteControlSpace(IN ULONG Processor,
                         IN ULONG Length,
                         OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -113,7 +113,7 @@ KdpSysReadIoSpace(IN ULONG InterfaceType,
                   IN ULONG DataSize,
                   OUT PULONG ActualDataSize)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -127,22 +127,22 @@ KdpSysWriteIoSpace(IN ULONG InterfaceType,
                    IN ULONG DataSize,
                    OUT PULONG ActualDataSize)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
 NTSTATUS
 NTAPI
 KdpSysCheckLowMemory(IN ULONG Flags)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
 NTSTATUS
 NTAPI
 KdpAllowDisable(VOID)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_ACCESS_DENIED;
 }

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ KdpSysReadBusData(IN ULONG BusDataType,`
`139`	`139`	`IN ULONG Length,`
`140`	`140`	`OUT PULONG ActualLength)`
`141`	`141`	`{`
`142`		`- UNIMPLEMENTED_DBGBREAK();`
	`142`	`+ UNIMPLEMENTED;`
`143`	`143`	`return STATUS_UNSUCCESSFUL;`
`144`	`144`	`}`
`145`	`145`
`@@ -153,7 +153,7 @@ KdpSysWriteBusData(IN ULONG BusDataType,`
`153`	`153`	`IN ULONG Length,`
`154`	`154`	`OUT PULONG ActualLength)`
`155`	`155`	`{`
`156`		`- UNIMPLEMENTED_DBGBREAK();`
	`156`	`+ UNIMPLEMENTED;`
`157`	`157`	`return STATUS_UNSUCCESSFUL;`
`158`	`158`	`}`
`159`	`159`
`@@ -284,7 +284,7 @@ KdpSysReadIoSpace(IN ULONG InterfaceType,`
`284`	`284`
`285`	`285`	`default:`
`286`	`286`	`/* Invalid data size */`
`287`		`- *ActualDataSize = 0;`
	`287`	`+ *ActualDataSize = 0;`
`288`	`288`	`return STATUS_INVALID_PARAMETER;`
`289`	`289`	`}`
`290`	`290`
`@@ -340,7 +340,7 @@ KdpSysWriteIoSpace(IN ULONG InterfaceType,`
`340`	`340`
`341`	`341`	`default:`
`342`	`342`	`/* Invalid data size */`
`343`		`- *ActualDataSize = 0;`
	`343`	`+ *ActualDataSize = 0;`
`344`	`344`	`return STATUS_INVALID_PARAMETER;`
`345`	`345`	`}`
`346`	`346`
`@@ -355,15 +355,15 @@ NTSTATUS`
`355`	`355`	`NTAPI`
`356`	`356`	`KdpSysCheckLowMemory(IN ULONG Flags)`
`357`	`357`	`{`
`358`		`- UNIMPLEMENTED_DBGBREAK();`
	`358`	`+ UNIMPLEMENTED;`
`359`	`359`	`return STATUS_UNSUCCESSFUL;`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`NTSTATUS`
`363`	`363`	`NTAPI`
`364`	`364`	`KdpAllowDisable(VOID)`
`365`	`365`	`{`
`366`		`- UNIMPLEMENTED_DBGBREAK();`
	`366`	`+ UNIMPLEMENTED;`
`367`	`367`	`return STATUS_ACCESS_DENIED;`
`368`	`368`	`}`
`369`	`369`
Original file line number	Diff line number	Diff line change
`@@ -22,23 +22,23 @@ NTAPI`
`22`	`22`	`KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State,`
`23`	`23`	`IN PCONTEXT Context)`
`24`	`24`	`{`
`25`		`- UNIMPLEMENTED_DBGBREAK();`
	`25`	`+ UNIMPLEMENTED;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`VOID`
`29`	`29`	`NTAPI`
`30`	`30`	`KdpSetContextState(IN PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange,`
`31`	`31`	`IN PCONTEXT Context)`
`32`	`32`	`{`
`33`		`- UNIMPLEMENTED_DBGBREAK();`
	`33`	`+ UNIMPLEMENTED;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`NTSTATUS`
`37`	`37`	`NTAPI`
`38`	`38`	`KdpSysReadMsr(IN ULONG Msr,`
`39`	`39`	`OUT PLARGE_INTEGER MsrValue)`
`40`	`40`	`{`
`41`		`- UNIMPLEMENTED_DBGBREAK();`
	`41`	`+ UNIMPLEMENTED;`
`42`	`42`	`return STATUS_UNSUCCESSFUL;`
`43`	`43`	`}`
`44`	`44`
`@@ -47,7 +47,7 @@ NTAPI`
`47`	`47`	`KdpSysWriteMsr(IN ULONG Msr,`
`48`	`48`	`IN PLARGE_INTEGER MsrValue)`
`49`	`49`	`{`
`50`		`- UNIMPLEMENTED_DBGBREAK();`
	`50`	`+ UNIMPLEMENTED;`
`51`	`51`	`return STATUS_UNSUCCESSFUL;`
`52`	`52`	`}`
`53`	`53`
`@@ -61,7 +61,7 @@ KdpSysReadBusData(IN ULONG BusDataType,`
`61`	`61`	`IN ULONG Length,`
`62`	`62`	`OUT PULONG ActualLength)`
`63`	`63`	`{`
`64`		`- UNIMPLEMENTED_DBGBREAK();`
	`64`	`+ UNIMPLEMENTED;`
`65`	`65`	`return STATUS_UNSUCCESSFUL;`
`66`	`66`	`}`
`67`	`67`
`@@ -75,7 +75,7 @@ KdpSysWriteBusData(IN ULONG BusDataType,`
`75`	`75`	`IN ULONG Length,`
`76`	`76`	`OUT PULONG ActualLength)`
`77`	`77`	`{`
`78`		`- UNIMPLEMENTED_DBGBREAK();`
	`78`	`+ UNIMPLEMENTED;`
`79`	`79`	`return STATUS_UNSUCCESSFUL;`
`80`	`80`	`}`
`81`	`81`
`@@ -87,7 +87,7 @@ KdpSysReadControlSpace(IN ULONG Processor,`
`87`	`87`	`IN ULONG Length,`
`88`	`88`	`OUT PULONG ActualLength)`
`89`	`89`	`{`
`90`		`- UNIMPLEMENTED_DBGBREAK();`
	`90`	`+ UNIMPLEMENTED;`
`91`	`91`	`return STATUS_UNSUCCESSFUL;`
`92`	`92`	`}`
`93`	`93`
`@@ -99,7 +99,7 @@ KdpSysWriteControlSpace(IN ULONG Processor,`
`99`	`99`	`IN ULONG Length,`
`100`	`100`	`OUT PULONG ActualLength)`
`101`	`101`	`{`
`102`		`- UNIMPLEMENTED_DBGBREAK();`
	`102`	`+ UNIMPLEMENTED;`
`103`	`103`	`return STATUS_UNSUCCESSFUL;`
`104`	`104`	`}`
`105`	`105`
`@@ -113,7 +113,7 @@ KdpSysReadIoSpace(IN ULONG InterfaceType,`
`113`	`113`	`IN ULONG DataSize,`
`114`	`114`	`OUT PULONG ActualDataSize)`
`115`	`115`	`{`
`116`		`- UNIMPLEMENTED_DBGBREAK();`
	`116`	`+ UNIMPLEMENTED;`
`117`	`117`	`return STATUS_UNSUCCESSFUL;`
`118`	`118`	`}`
`119`	`119`
`@@ -127,22 +127,22 @@ KdpSysWriteIoSpace(IN ULONG InterfaceType,`
`127`	`127`	`IN ULONG DataSize,`
`128`	`128`	`OUT PULONG ActualDataSize)`
`129`	`129`	`{`
`130`		`- UNIMPLEMENTED_DBGBREAK();`
	`130`	`+ UNIMPLEMENTED;`
`131`	`131`	`return STATUS_UNSUCCESSFUL;`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`NTSTATUS`
`135`	`135`	`NTAPI`
`136`	`136`	`KdpSysCheckLowMemory(IN ULONG Flags)`
`137`	`137`	`{`
`138`		`- UNIMPLEMENTED_DBGBREAK();`
	`138`	`+ UNIMPLEMENTED;`
`139`	`139`	`return STATUS_UNSUCCESSFUL;`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`NTSTATUS`
`143`	`143`	`NTAPI`
`144`	`144`	`KdpAllowDisable(VOID)`
`145`	`145`	`{`
`146`		`- UNIMPLEMENTED_DBGBREAK();`
	`146`	`+ UNIMPLEMENTED;`
`147`	`147`	`return STATUS_ACCESS_DENIED;`
`148`	`148`	`}`