don't try to free the ansi strings passed by the caller
authorThomas Bluemel <thomas@reactsoft.com>
Sun, 9 Oct 2005 22:35:41 +0000 (22:35 +0000)
committerThomas Bluemel <thomas@reactsoft.com>
Sun, 9 Oct 2005 22:35:41 +0000 (22:35 +0000)
svn path=/trunk/; revision=18390

reactos/lib/advapi32/misc/shutdown.c

index 7b51214..c43c555 100644 (file)
@@ -48,7 +48,6 @@ AbortSystemShutdownA(LPCSTR lpMachineName)
             return FALSE;
     }
     rv = AbortSystemShutdownW(MachineNameW.Buffer);
             return FALSE;
     }
     rv = AbortSystemShutdownW(MachineNameW.Buffer);
-    RtlFreeAnsiString(&MachineNameA);
     RtlFreeUnicodeString(&MachineNameW);
     SetLastError(ERROR_SUCCESS);
     return rv;
     RtlFreeUnicodeString(&MachineNameW);
     SetLastError(ERROR_SUCCESS);
     return rv;
@@ -110,7 +109,6 @@ InitiateSystemShutdownA(
         RtlInitAnsiString(&MachineNameA, lpMachineName);
         Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE);
         if (STATUS_SUCCESS != Status) {
         RtlInitAnsiString(&MachineNameA, lpMachineName);
         Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE);
         if (STATUS_SUCCESS != Status) {
-            RtlFreeAnsiString(&MachineNameA);
             SetLastError(RtlNtStatusToDosError(Status));
             return FALSE;
         }
             SetLastError(RtlNtStatusToDosError(Status));
             return FALSE;
         }
@@ -120,10 +118,8 @@ InitiateSystemShutdownA(
         Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE);
         if (STATUS_SUCCESS != Status) {
             if (MachineNameW.Length) {
         Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE);
         if (STATUS_SUCCESS != Status) {
             if (MachineNameW.Length) {
-                RtlFreeAnsiString(&MachineNameA);
                 RtlFreeUnicodeString(&MachineNameW);
             }
                 RtlFreeUnicodeString(&MachineNameW);
             }
-            RtlFreeAnsiString(&MessageA);
             SetLastError(RtlNtStatusToDosError(Status));
             return FALSE;
         }
             SetLastError(RtlNtStatusToDosError(Status));
             return FALSE;
         }
@@ -136,11 +132,9 @@ InitiateSystemShutdownA(
             bRebootAfterShutdown);
     LastError = GetLastError();
     if (lpMachineName) {
             bRebootAfterShutdown);
     LastError = GetLastError();
     if (lpMachineName) {
-        RtlFreeAnsiString(&MachineNameA);
         RtlFreeUnicodeString(&MachineNameW);
     }
     if (lpMessage) {
         RtlFreeUnicodeString(&MachineNameW);
     }
     if (lpMessage) {
-        RtlFreeAnsiString(&MessageA);
         RtlFreeUnicodeString(&MessageW);
     }
     SetLastError(LastError);
         RtlFreeUnicodeString(&MessageW);
     }
     SetLastError(LastError);