Win32: compile

[wimlib] / src / win32_apply.c

diff --git a/src/win32_apply.c b/src/win32_apply.c
index b1253956f3587f9e025ca3d74fac31768c47d474..c8f65ef0e2db218c4a1ba203c04900497bcee6af 100644 (file)
--- a/src/win32_apply.c
+++ b/src/win32_apply.c
@@ -33,15 +33,6 @@
 #include "wimlib/error.h"
 #include "wimlib/lookup_table.h"
 
-#ifdef WITH_NTDLL
-#  include <winternl.h>
-#  include <ntstatus.h>
-NTSTATUS WINAPI
-NtSetSecurityObject(HANDLE Handle,
-                   SECURITY_INFORMATION SecurityInformation,
-                   PSECURITY_DESCRIPTOR SecurityDescriptor);
-#endif
-
 static int
 win32_start_extract(const wchar_t *path, struct apply_ctx *ctx)
 {
@@ -204,8 +195,7 @@ win32_extract_stream(const wchar_t *path, const wchar_t *stream_name,
        ret = 0;
        if (!lte)
                goto out_close_handle;
-       ret = extract_wim_resource(lte, wim_resource_size(lte),
-                                  win32_extract_wim_chunk, h);
+       ret = extract_stream(lte, lte->size, win32_extract_wim_chunk, h);
 out_close_handle:
        if (!CloseHandle(h))
                goto error;
@@ -248,9 +238,9 @@ win32_encrypted_import_cb(unsigned char *data, void *_import_ctx,
        unsigned long len = *len_p;
        const struct wim_lookup_table_entry *lte = import_ctx->lte;
 
-       len = min(len, wim_resource_size(lte) - import_ctx->offset);
+       len = min(len, lte->size - import_ctx->offset);
 
-       if (read_partial_wim_resource_into_buf(lte, len, import_ctx->offset, data))
+       if (read_partial_wim_stream_into_buf(lte, len, import_ctx->offset, data))
                return ERROR_READ_FAULT;
 
        import_ctx->offset += len;
@@ -480,13 +470,15 @@ do_win32_set_security_descriptor(HANDLE h, const wchar_t *path,
                                 PSECURITY_DESCRIPTOR desc)
 {
 #ifdef WITH_NTDLL
-       return RtlNtStatusToDosError(NtSetSecurityObject(h, info, desc));
-#else
+       if (func_NtSetSecurityObject) {
+               return (*func_RtlNtStatusToDosError)(
+                               (*func_NtSetSecurityObject)(h, info, desc));
+       }
+#endif
        if (SetFileSecurity(path, info, desc))
                return ERROR_SUCCESS;
        else
                return GetLastError();
-#endif
 }
 
 static int
@@ -503,10 +495,12 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc,
        h = INVALID_HANDLE_VALUE;
 
 #ifdef WITH_NTDLL
-       h = win32_open_existing_file(path, MAXIMUM_ALLOWED);
-       if (h == INVALID_HANDLE_VALUE) {
-               ERROR_WITH_ERRNO("Can't open %ls (%u)", path, GetLastError());
-               goto error;
+       if (func_NtSetSecurityObject) {
+               h = win32_open_existing_file(path, MAXIMUM_ALLOWED);
+               if (h == INVALID_HANDLE_VALUE) {
+                       ERROR_WITH_ERRNO("Can't open %ls (%u)", path, GetLastError());
+                       goto error;
+               }
        }
 #endif
 
@@ -536,12 +530,14 @@ win32_set_security_descriptor(const wchar_t *path, const u8 *desc,
                        ctx->no_security_descriptors++;
                        break;
                }
+               SetLastError(err);
                goto error;
        }
        ret = 0;
 out_close:
 #ifdef WITH_NTDLL
-       CloseHandle(h);
+       if (func_NtSetSecurityObject)
+               CloseHandle(h);
 #endif
        return ret;