v1.14.4

[wimlib] / programs / imagex-win32.c

diff --git a/programs/imagex-win32.c b/programs/imagex-win32.c
index c5c40d5f6f65bf34b0bc6023dcd472dcc5b57ee4..01507f0ea82099fb2555927459b38aa89f3fb1d8 100644 (file)
--- a/programs/imagex-win32.c
+++ b/programs/imagex-win32.c
@@ -1,6 +1,6 @@
 /* Windows-specific code for wimlib-imagex.  */
 
-#ifndef __WIN32__
+#ifndef _WIN32
 #  error "This file contains Windows code"
 #endif
 
@@ -10,52 +10,6 @@
 #include <stdio.h>
 #include <windows.h>
 
-/* Convert a string from the "current Windows codepage" to UTF-16LE.  */
-wchar_t *
-win32_mbs_to_wcs(const char *mbs, size_t mbs_nbytes, size_t *num_wchars_ret)
-{
-       if (mbs_nbytes > INT_MAX) {
-               fwprintf(stderr, L"ERROR: too much data (%zu bytes)!\n",
-                        mbs_nbytes);
-               return NULL;
-       }
-       if (mbs_nbytes == 0) {
-               *num_wchars_ret = 0;
-               return (wchar_t*)mbs;
-       }
-       int len = MultiByteToWideChar(CP_ACP,
-                                     MB_ERR_INVALID_CHARS,
-                                     mbs,
-                                     mbs_nbytes,
-                                     NULL,
-                                     0);
-       if (len <= 0)
-               goto out_invalid;
-       wchar_t *wcs = malloc(len * sizeof(wchar_t));
-       if (!wcs) {
-               fwprintf(stderr, L"ERROR: out of memory!\n");
-               return NULL;
-       }
-       int len2 = MultiByteToWideChar(CP_ACP,
-                                      MB_ERR_INVALID_CHARS,
-                                      mbs,
-                                      mbs_nbytes,
-                                      wcs,
-                                      len);
-       if (len2 != len) {
-               free(wcs);
-               goto out_invalid;
-       }
-       *num_wchars_ret = len;
-       return wcs;
-out_invalid:
-       fwprintf(stderr,
-L"ERROR: Invalid multi-byte string in the text file you provided as input!\n"
-L"       Maybe try converting your text file to UTF-16LE?\n"
-       );
-       return NULL;
-}
-
 /* Set a file descriptor to binary mode.  */
 void set_fd_to_binary_mode(int fd)
 {
@@ -68,7 +22,7 @@ static wchar_t *
 get_security_descriptor_string(PSECURITY_DESCRIPTOR desc)
 {
        wchar_t *str = NULL;
-       /* 53 characters!!!  */
+       /* 52 characters!!!  */
        ConvertSecurityDescriptorToStringSecurityDescriptorW(
                        desc,
                        SDDL_REVISION_1,