[YAROTOWS] Reintegrate the branch. For a brighter future.

[reactos.git] / reactos / subsystems / win32 / win32k / misc / copy.c

diff --git a/reactos/subsystems/win32/win32k/misc/copy.c b/reactos/subsystems/win32/win32k/misc/copy.c
index 30dc192..6a50d55 100644 (file)
--- a/reactos/subsystems/win32/win32k/misc/copy.c
+++ b/reactos/subsystems/win32/win32k/misc/copy.c
@@ -1,14 +1,18 @@
-#include "w32k.h"
+#include "win32k.h"
 
 NTSTATUS _MmCopyFromCaller( PVOID Target, PVOID Source, UINT Bytes ) {
     NTSTATUS Status = STATUS_SUCCESS;
 
-    _SEH_TRY {
-        //ProbeForRead(Source,Bytes,1);
+    _SEH2_TRY
+    {
+        ProbeForRead(Source,Bytes,1);
         RtlCopyMemory(Target,Source,Bytes);
-    } _SEH_HANDLE {
-       Status = _SEH_GetExceptionCode();
-    } _SEH_END;
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        Status = _SEH2_GetExceptionCode();
+    }
+    _SEH2_END;
 
     return Status;
 }
@@ -16,12 +20,16 @@ NTSTATUS _MmCopyFromCaller( PVOID Target, PVOID Source, UINT Bytes ) {
 NTSTATUS _MmCopyToCaller( PVOID Target, PVOID Source, UINT Bytes ) {
     NTSTATUS Status = STATUS_SUCCESS;
 
-    _SEH_TRY {
-        //ProbeForWrite(Target,Bytes,1);
+    _SEH2_TRY
+    {
+        /* ProbeForWrite(Target,Bytes,1); */
         RtlCopyMemory(Target,Source,Bytes);
-    } _SEH_HANDLE {
-       Status = _SEH_GetExceptionCode();
-    } _SEH_END;
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        Status = _SEH2_GetExceptionCode();
+    }
+    _SEH2_END;
 
     return Status;
 }