]> wimlib.net Git - wimlib/blobdiff - src/win32_apply.c
Windows: Use ntdll unconditionally
[wimlib] / src / win32_apply.c
index 9135a7db690839f714d27c7de8db635bde0af7e7..ac0bed0163a882542b38ba6890795ba8d77adb6a 100644 (file)
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2013 Eric Biggers
+ * Copyright (C) 2013, 2014 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -402,23 +402,48 @@ win32_extract_stream(const wchar_t *path, const wchar_t *stream_name,
                       creationDisposition, FILE_FLAG_BACKUP_SEMANTICS |
                                            FILE_FLAG_OPEN_REPARSE_POINT,
                       NULL);
-       if (h == INVALID_HANDLE_VALUE)
-               goto error;
+       if (h == INVALID_HANDLE_VALUE) {
+               set_errno_from_GetLastError();
+               ret = WIMLIB_ERR_OPEN;
+               goto out;
+       }
 
-       ret = 0;
-       if (!lte)
+       if (!lte) {
+               ret = 0;
                goto out_close_handle;
+       }
+
+       if (!SetFilePointerEx(h,
+                             (LARGE_INTEGER) { .QuadPart = lte->size},
+                             NULL,
+                             FILE_BEGIN))
+               goto write_error;
+
+       if (!SetEndOfFile(h))
+               goto write_error;
+
+       if (!SetFilePointerEx(h,
+                             (LARGE_INTEGER) { .QuadPart = 0},
+                             NULL,
+                             FILE_BEGIN))
+               goto write_error;
+
        ret = extract_stream(lte, lte->size, win32_extract_wim_chunk, h);
-out_close_handle:
-       if (!CloseHandle(h))
-               goto error;
-       if (ret && !errno)
-               errno = -1;
-       return ret;
+       goto out_close_handle;
 
-error:
+write_error:
        set_errno_from_GetLastError();
-       return WIMLIB_ERR_WRITE;
+       ret = WIMLIB_ERR_WRITE;
+
+out_close_handle:
+       if (!CloseHandle(h)) {
+               if (!ret) {
+                       set_errno_from_GetLastError();
+                       ret = WIMLIB_ERR_WRITE;
+               }
+       }
+out:
+       return ret;
 }
 
 static int
@@ -705,23 +730,6 @@ error:
        return WIMLIB_ERR_WRITE; /* XXX: need better error code */
 }
 
-static DWORD
-do_win32_set_security_descriptor(HANDLE h, const wchar_t *path,
-                                SECURITY_INFORMATION info,
-                                PSECURITY_DESCRIPTOR desc)
-{
-#ifdef WITH_NTDLL
-       if (func_NtSetSecurityObject) {
-               return (*func_RtlNtStatusToDosError)(
-                               (*func_NtSetSecurityObject)(h, info, desc));
-       }
-#endif
-       if (SetFileSecurity(path, info, desc))
-               return ERROR_SUCCESS;
-       else
-               return GetLastError();
-}
-
 /*
  * Set an arbitrary security descriptor on an arbitrary file (or directory),
  * working around bugs and design flaws in the Windows operating system.
@@ -736,7 +744,9 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc,
                              size_t desc_size, struct apply_ctx *ctx)
 {
        SECURITY_INFORMATION info;
+       DWORD dwDesiredAccess;
        HANDLE h;
+       DWORD status;
        int ret;
 
        /* We really just want to set entire the security descriptor as-is, but
@@ -748,8 +758,6 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc,
        info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
               DACL_SECURITY_INFORMATION  | SACL_SECURITY_INFORMATION;
 
-       h = INVALID_HANDLE_VALUE;
-
        /* Prefer NtSetSecurityObject() to SetFileSecurity().  SetFileSecurity()
         * itself necessarily uses NtSetSecurityObject() as the latter is the
         * underlying system call for setting security information, but
@@ -759,83 +767,69 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc,
         * Administrator can have access denied.  (Of course, this not mentioned
         * in the MS "documentation".)  */
 
-#ifdef WITH_NTDLL
-       if (func_NtSetSecurityObject) {
-               DWORD dwDesiredAccess;
-
-               /* Open a handle for NtSetSecurityObject() with as many relevant
-                * access rights as possible.
-                *
-                * We don't know which rights will be actually granted.  It
-                * could be less than what is needed to actually assign the full
-                * security descriptor, especially if the process is running as
-                * a non-Administrator.  However, by default we just do the best
-                * we can, unless WIMLIB_EXTRACT_FLAG_STRICT_ACLS has been
-                * enabled.  The MAXIMUM_ALLOWED access right is seemingly
-                * designed for this use case; however, it does not work
-                * properly in all cases: it can cause CreateFile() to fail with
-                * ERROR_ACCESS_DENIED, even though by definition
-                * MAXIMUM_ALLOWED access only requests access rights that are
-                * *not* denied.  (Needless to say, MS does not document this
-                * bug.)  */
-
-               dwDesiredAccess = WRITE_DAC |
-                                 WRITE_OWNER |
-                                 ACCESS_SYSTEM_SECURITY;
-               for (;;) {
-                       DWORD err;
-
-                       h = win32_open_existing_file(path, dwDesiredAccess);
-                       if (h != INVALID_HANDLE_VALUE)
-                               break;
-                       err = GetLastError();
-                       if (err == ERROR_ACCESS_DENIED ||
-                           err == ERROR_PRIVILEGE_NOT_HELD)
-                       {
-                               /* Don't increment partial_security_descriptors
-                                * here or check WIMLIB_EXTRACT_FLAG_STRICT_ACLS
-                                * here.  It will be done later if needed; here
-                                * we are just trying to get as many relevant
-                                * access rights as possible.  */
-                               if (dwDesiredAccess & ACCESS_SYSTEM_SECURITY) {
-                                       dwDesiredAccess &= ~ACCESS_SYSTEM_SECURITY;
-                                       continue;
-                               }
-                               if (dwDesiredAccess & WRITE_DAC) {
-                                       dwDesiredAccess &= ~WRITE_DAC;
-                                       continue;
-                               }
-                               if (dwDesiredAccess & WRITE_OWNER) {
-                                       dwDesiredAccess &= ~WRITE_OWNER;
-                                       continue;
-                               }
+       /* Open a handle for NtSetSecurityObject() with as many relevant
+        * access rights as possible.
+        *
+        * We don't know which rights will be actually granted.  It
+        * could be less than what is needed to actually assign the full
+        * security descriptor, especially if the process is running as
+        * a non-Administrator.  However, by default we just do the best
+        * we can, unless WIMLIB_EXTRACT_FLAG_STRICT_ACLS has been
+        * enabled.  The MAXIMUM_ALLOWED access right is seemingly
+        * designed for this use case; however, it does not work
+        * properly in all cases: it can cause CreateFile() to fail with
+        * ERROR_ACCESS_DENIED, even though by definition
+        * MAXIMUM_ALLOWED access only requests access rights that are
+        * *not* denied.  (Needless to say, MS does not document this
+        * bug.)  */
+
+       dwDesiredAccess = WRITE_DAC | WRITE_OWNER | ACCESS_SYSTEM_SECURITY;
+       while ((h = win32_open_existing_file(path,
+                                            dwDesiredAccess)) == INVALID_HANDLE_VALUE)
+       {
+               DWORD err;
+
+               err = GetLastError();
+               if (err == ERROR_ACCESS_DENIED ||
+                   err == ERROR_PRIVILEGE_NOT_HELD)
+               {
+                       /* Don't increment partial_security_descriptors
+                        * here or check WIMLIB_EXTRACT_FLAG_STRICT_ACLS
+                        * here.  It will be done later if needed; here
+                        * we are just trying to get as many relevant
+                        * access rights as possible.  */
+                       if (dwDesiredAccess & ACCESS_SYSTEM_SECURITY) {
+                               dwDesiredAccess &= ~ACCESS_SYSTEM_SECURITY;
+                               continue;
+                       }
+                       if (dwDesiredAccess & WRITE_DAC) {
+                               dwDesiredAccess &= ~WRITE_DAC;
+                               continue;
+                       }
+                       if (dwDesiredAccess & WRITE_OWNER) {
+                               dwDesiredAccess &= ~WRITE_OWNER;
+                               continue;
                        }
-                       /* Other error, or couldn't open the file even with no
-                        * access rights specified.  Something else must be
-                        * wrong.  */
-                       set_errno_from_win32_error(err);
-                       return WIMLIB_ERR_SET_SECURITY;
                }
+               /* Other error, or couldn't open the file even with no
+                * access rights specified.  Something else must be
+                * wrong.  */
+               set_errno_from_win32_error(err);
+               return WIMLIB_ERR_SET_SECURITY;
        }
-#endif
 
        /* Try setting the security descriptor.  */
-       for (;;) {
-               DWORD err;
-
-               err = do_win32_set_security_descriptor(h, path, info,
-                                                      (PSECURITY_DESCRIPTOR)desc);
-               if (err == ERROR_SUCCESS) {
-                       ret = 0;
-                       break;
-               }
-
+       ret = 0;
+       while (!(NT_SUCCESS(status = (*func_NtSetSecurityObject)(h,
+                                                                info,
+                                                                (PSECURITY_DESCRIPTOR)desc))))
+       {
                /* Failed to set the requested parts of the security descriptor.
                 * If the error was permissions-related, try to set fewer parts
                 * of the security descriptor, unless
                 * WIMLIB_EXTRACT_FLAG_STRICT_ACLS is enabled.  */
-               if ((err == ERROR_PRIVILEGE_NOT_HELD ||
-                    err == ERROR_ACCESS_DENIED) &&
+               if ((status == STATUS_PRIVILEGE_NOT_HELD ||
+                    status == STATUS_ACCESS_DENIED) &&
                    !(ctx->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS))
                {
                        if (info & SACL_SECURITY_INFORMATION) {
@@ -859,16 +853,13 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc,
                 * security descriptor could not be set.  */
                if (!(info & SACL_SECURITY_INFORMATION))
                        ctx->partial_security_descriptors--;
-               set_errno_from_win32_error(err);
+               set_errno_from_nt_status(status);
                ret = WIMLIB_ERR_SET_SECURITY;
                break;
        }
 
        /* Close handle opened for NtSetSecurityObject().  */
-#ifdef WITH_NTDLL
-       if (func_NtSetSecurityObject)
-               CloseHandle(h);
-#endif
+       CloseHandle(h);
        return ret;
 }