Author: tfaber
Date: Mon Oct 20 08:30:55 2014
New Revision: 64840

URL: http://svn.reactos.org/svn/reactos?rev=64840&view=rev
Log:
[KERNEL32]
- Fix MSVC build

Modified:
    trunk/reactos/dll/win32/kernel32/client/file/move.c

Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/file/move.c?rev=64840&r1=64839&r2=64840&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] Mon Oct 20 
08:30:55 2014
@@ -268,13 +268,13 @@
     NewPathU.Buffer = NULL;
     ExistingPathU.Buffer = NULL;
 
-    _SEH3_TRY
+    _SEH2_TRY
     {
         /* Don't allow renaming to a disk */
         if (lpNewFileName && RtlIsDosDeviceName_U(lpNewFileName))
         {
             BaseSetLastNTError(STATUS_OBJECT_NAME_COLLISION);
-            _SEH3_LEAVE;
+            _SEH2_LEAVE;
         }
 
         ReplaceIfExists = !!(dwFlags & MOVEFILE_REPLACE_EXISTING);
@@ -283,7 +283,7 @@
         if (!RtlDosPathNameToNtPathName_U(lpExistingFileName, &ExistingPathU, 
NULL, NULL))
         {
             BaseSetLastNTError(STATUS_OBJECT_PATH_NOT_FOUND);
-            _SEH3_LEAVE;
+            _SEH2_LEAVE;
         }
 
         /* Sanitize input */
@@ -291,7 +291,7 @@
         if (DelayUntilReboot && (dwFlags & MOVEFILE_CREATE_HARDLINK))
         {
             BaseSetLastNTError(STATUS_INVALID_PARAMETER);
-            _SEH3_LEAVE;
+            _SEH2_LEAVE;
         }
 
         /* Unless we manage a proper opening, we'll attempt to reopen without 
reparse support */
@@ -324,7 +324,7 @@
             else if (Status != STATUS_INVALID_PARAMETER)
             {
                 BaseSetLastNTError(Status);
-                _SEH3_LEAVE;
+                _SEH2_LEAVE;
             }
         }
         else
@@ -341,7 +341,7 @@
                 if (Status != STATUS_NOT_IMPLEMENTED && Status != 
STATUS_INVALID_PARAMETER)
                 {
                     BaseSetLastNTError(Status);
-                    _SEH3_LEAVE;
+                    _SEH2_LEAVE;
                 }
 
                 /* Not a reparse point, no need to reopen, it's fine */
@@ -368,7 +368,7 @@
             if (!NT_SUCCESS(Status))
             {
                 BaseSetLastNTError(Status);
-                _SEH3_LEAVE;
+                _SEH2_LEAVE;
             }
         }
 
@@ -381,7 +381,7 @@
         else if (!RtlDosPathNameToNtPathName_U(lpNewFileName, &NewPathU, 0, 0))
         {
             BaseSetLastNTError(STATUS_OBJECT_PATH_NOT_FOUND);
-            _SEH3_LEAVE;
+            _SEH2_LEAVE;
         }
 
         /* Handle postponed renaming */
@@ -394,7 +394,7 @@
                 if (NewBuffer == NULL)
                 {
                     BaseSetLastNTError(STATUS_NO_MEMORY);
-                    _SEH3_LEAVE;
+                    _SEH2_LEAVE;
                 }
 
                 NewBuffer[0] = L'!';
@@ -431,11 +431,11 @@
             if (!NT_SUCCESS(Status))
             {
                 BaseSetLastNTError(Status);
-                _SEH3_LEAVE;
+                _SEH2_LEAVE;
             }
 
             Ret = TRUE;
-            _SEH3_LEAVE;
+            _SEH2_LEAVE;
         }
 
         /* At that point, we MUST have a source handle */
@@ -446,7 +446,7 @@
         if (RenameInfo == NULL)
         {
             BaseSetLastNTError(STATUS_NO_MEMORY);
-            _SEH3_LEAVE;
+            _SEH2_LEAVE;
         }
 
         RtlCopyMemory(&RenameInfo->FileName, NewPathU.Buffer, NewPathU.Length);
@@ -465,7 +465,7 @@
         {
             /* If it succeed, all fine, quit */
             Ret = TRUE;
-            _SEH3_LEAVE;
+            _SEH2_LEAVE;
         }
         /* If we failed for any other reason than not the same device, fail
          * If we failed because of different devices, only allow renaming if 
user allowed copy
@@ -482,7 +482,7 @@
             else
             {
                 BaseSetLastNTError(Status);
-                _SEH3_LEAVE;
+                _SEH2_LEAVE;
             }
         }
 
@@ -558,7 +558,7 @@
             }
         }
     }
-    _SEH3_FINALLY
+    _SEH2_FINALLY
     {
         if (SourceHandle != INVALID_HANDLE_VALUE)
             NtClose(SourceHandle);
@@ -566,7 +566,7 @@
         RtlFreeHeap(RtlGetProcessHeap(), 0, ExistingPathU.Buffer);
         RtlFreeHeap(RtlGetProcessHeap(), 0, NewPathU.Buffer);
     }
-    _SEH3_END;
+    _SEH2_END;
 
     return Ret;
 }


Reply via email to