Use correct variable types for ASCII Windows functions.

There are both an ASCII and an Unicode variant for most of the Win32 API.
Fix some inconsistent uses.

diff --git a/libarchive/archive_match.c b/libarchive/archive_match.c
index 6b6be9cb20b568afb99ef457a4199e467a17a8d8..6fb86445cd295825b0668455f38d62d0029e0660 100644 (file)
--- a/libarchive/archive_match.c
+++ b/libarchive/archive_match.c
@@ -1152,7 +1152,7 @@ set_timefilter_pathname_mbs(struct archive_match *a, int timetype,
 {
        /* NOTE: stat() on Windows cannot handle nano seconds. */
        HANDLE h;
-       WIN32_FIND_DATA d;
+       WIN32_FIND_DATAA d;
 
        if (path == NULL || *path == '\0') {
                archive_set_error(&(a->archive), EINVAL, "pathname is empty");

diff --git a/libarchive/archive_write_disk_windows.c b/libarchive/archive_write_disk_windows.c
index 0f0780a8e47e1bc4e009df4d87b65494d9b71b24..ed6200914fb8683a17653ff689bdb8bb26d78024 100644 (file)
--- a/libarchive/archive_write_disk_windows.c
+++ b/libarchive/archive_write_disk_windows.c
@@ -525,7 +525,7 @@ la_GetFunctionKernel32(const char *name)
        static int set;
        if (!set) {
                set = 1;
-               lib = LoadLibrary("kernel32.dll");
+               lib = LoadLibrary(TEXT("kernel32.dll"));
        }
        if (lib == NULL) {
                fprintf(stderr, "Can't load kernel32.dll?!\n");

diff --git a/libarchive/filter_fork_windows.c b/libarchive/filter_fork_windows.c
index fa59cc9e90ce22d12611ff99168c96941c97579e..ad271fe68a1536a5f97ff743ea7b753f117f9972 100644 (file)
--- a/libarchive/filter_fork_windows.c
+++ b/libarchive/filter_fork_windows.c
@@ -36,7 +36,7 @@ __archive_create_child(const char *cmd, int *child_stdin, int *child_stdout)
 {
        HANDLE childStdout[2], childStdin[2],childStderr;
        SECURITY_ATTRIBUTES secAtts;
-       STARTUPINFO staInfo;
+       STARTUPINFOA staInfo;
        PROCESS_INFORMATION childInfo;
        struct archive_string cmdline;
        struct archive_string fullpath;