Win32: minor code cleanups

diff --git a/src/extract_image.c b/src/extract_image.c
index b66949e6fdbbeaa71be4e5f5c701e8ddc3db8e09..6fb944272d65634e7d1c8e2c9eda6132901300d0 100644 (file)
--- a/src/extract_image.c
+++ b/src/extract_image.c
@@ -245,7 +245,7 @@ static int win32_extract_stream(const struct wim_inode *inode,
                        goto fail_close_handle;
        } else {
                if (lte) {
                        goto fail_close_handle;
        } else {
                if (lte) {

-                       DEBUG("Extracting \"%ls\" (len = %zu)",
+                       DEBUG("Extracting \"%ls\" (len = %"PRIu64")",

                              stream_path, wim_resource_size(lte));
                        ret = do_win32_extract_stream(h, lte);
                        if (ret)
                              stream_path, wim_resource_size(lte));
                        ret = do_win32_extract_stream(h, lte);
                        if (ret)


@@ -781,7 +781,7 @@ static int apply_dentry_timestamps_normal(struct wim_dentry *dentry, void *arg)
        if (ret)
                return ret;
 
        if (ret)
                return ret;
 

-       DEBUG("Opening \"%ls\" to set timestamps", utf16_path);
+       DEBUG("Opening \"%s\" to set timestamps", output_path);

        h = CreateFileW((const wchar_t*)utf16_path,
                        GENERIC_WRITE | WRITE_OWNER | WRITE_DAC | ACCESS_SYSTEM_SECURITY,
                        FILE_SHARE_READ,
        h = CreateFileW((const wchar_t*)utf16_path,
                        GENERIC_WRITE | WRITE_OWNER | WRITE_DAC | ACCESS_SYSTEM_SECURITY,
                        FILE_SHARE_READ,


@@ -796,12 +796,12 @@ static int apply_dentry_timestamps_normal(struct wim_dentry *dentry, void *arg)
        if (h == INVALID_HANDLE_VALUE)
                goto fail;
 
        if (h == INVALID_HANDLE_VALUE)
                goto fail;
 

-       FILETIME creationTime = {.dwLowDateTime = dentry->d_inode->i_creation_time & 0xffffffff,
-                                .dwHighDateTime = dentry->d_inode->i_creation_time >> 32};
-       FILETIME lastAccessTime = {.dwLowDateTime = dentry->d_inode->i_last_access_time & 0xffffffff,
-                                 .dwHighDateTime = dentry->d_inode->i_last_access_time >> 32};
-       FILETIME lastWriteTime = {.dwLowDateTime = dentry->d_inode->i_last_write_time & 0xffffffff,
-                                 .dwHighDateTime = dentry->d_inode->i_last_write_time >> 32};
+       FILETIME creationTime = {.dwLowDateTime = inode->i_creation_time & 0xffffffff,
+                                .dwHighDateTime = inode->i_creation_time >> 32};
+       FILETIME lastAccessTime = {.dwLowDateTime = inode->i_last_access_time & 0xffffffff,
+                                 .dwHighDateTime = inode->i_last_access_time >> 32};
+       FILETIME lastWriteTime = {.dwLowDateTime = inode->i_last_write_time & 0xffffffff,
+                                 .dwHighDateTime = inode->i_last_write_time >> 32};

 
        DEBUG("Calling SetFileTime() on \"%s\"", output_path);
        if (!SetFileTime(h, &creationTime, &lastAccessTime, &lastWriteTime)) {
 
        DEBUG("Calling SetFileTime() on \"%s\"", output_path);
        if (!SetFileTime(h, &creationTime, &lastAccessTime, &lastWriteTime)) {

diff --git a/src/win32.c b/src/win32.c
index 294e9ab683299c59d5753314ff6017ee0c2c9264..7868b5fad4793fc91a5c89920df71fe685f17f13 100644 (file)
--- a/src/win32.c
+++ b/src/win32.c
@@ -32,12 +32,15 @@ void win32_error(u32 err_code)
 void *win32_open_file_readonly(const void *path)
 {
        return CreateFileW((const wchar_t*)path,
 void *win32_open_file_readonly(const void *path)
 {
        return CreateFileW((const wchar_t*)path,

-                          GENERIC_READ | READ_CONTROL,
+                          FILE_READ_DATA |
+                              FILE_READ_ATTRIBUTES |
+                              READ_CONTROL |
+                              ACCESS_SYSTEM_SECURITY,

                           FILE_SHARE_READ,
                           NULL, /* lpSecurityAttributes */
                           OPEN_EXISTING,
                           FILE_FLAG_BACKUP_SEMANTICS |
                           FILE_SHARE_READ,
                           NULL, /* lpSecurityAttributes */
                           OPEN_EXISTING,
                           FILE_FLAG_BACKUP_SEMANTICS |

-                                  FILE_FLAG_OPEN_REPARSE_POINT,
+                              FILE_FLAG_OPEN_REPARSE_POINT,

                           NULL /* hTemplateFile */);
 }
 
                           NULL /* hTemplateFile */);
 }