@@ -772,7 +772,6 @@ int encoding_normalize_toascii(const m_area_t* in_m_area, const char* initial_en

 }

 cl_error_t cli_codepage_to_utf8(char* in, size_t in_size, uint16_t codepage, char** out, size_t* out_size)

-

 {

     cl_error_t status = CL_BREAK;

@@ -907,7 +906,7 @@ cl_error_t cli_codepage_to_utf8(char* in, size_t in_size, uint16_t codepage, cha

             }

             out_utf8 = cli_malloc(out_utf8_size + 1);

-            if (NULL == lpWideCharStr) {

+            if (NULL == out_utf8) {

                 cli_dbgmsg("cli_codepage_to_utf8: failed to allocate memory for wide char to utf-8 string.\n");

                 status = CL_EMEM;

                 goto done;

@@ -928,6 +927,9 @@ cl_error_t cli_codepage_to_utf8(char* in, size_t in_size, uint16_t codepage, cha

                 goto done;

             }

+            /* Set a null byte, since null-terminator is not provided when in_size is provided */

+            out_utf8[out_utf8_size] = '\0';

+

 #elif defined(HAVE_ICONV)

             uint32_t attempt, i;

@@ -970,7 +970,7 @@ static cl_error_t hfsplus_walk_catalog(cli_ctx *ctx, hfsPlusVolumeHeader *volHea

                     /*

                      * The name is contained in nodeBuf[recordStart + 2 + 4 + 2 : recordStart + 2 + 4 + 2 + name_length * 2] encoded as UTF-16BE.

                      */

-                    if (CL_SUCCESS != cli_codepage_to_utf8((char *)index, name_length * 2, 1201, &name_utf8, &name_utf8_size)) {

+                    if (CL_SUCCESS != cli_codepage_to_utf8((char *)index, name_length * 2, CODEPAGE_UTF16_BE, &name_utf8, &name_utf8_size)) {

                         cli_errmsg("hfsplus_walk_catalog: failed to convert UTF-16BE to UTF-8\n");

                         name_utf8 = NULL;

                     }

@@ -60,6 +60,7 @@

 #include "regex/regex.h"

 #include "matcher-ac.h"

 #include "str.h"

+#include "entconv.h"

 #define MSGBUFSIZ 8192

@@ -1245,47 +1246,64 @@ cl_error_t cli_get_filepath_from_filedesc(int desc, char **filepath)

     }

 #elif _WIN32

-    DWORD dwRet                   = 0;

-    intptr_t hFile                = _get_osfhandle(desc);

-    char *long_evaluated_filepath = NULL;

+    DWORD dwRet                     = 0;

+    intptr_t hFile                  = _get_osfhandle(desc);

+    WCHAR *long_evaluated_filepathW = NULL;

+    char *long_evaluated_filepathA  = NULL;

+    size_t evaluated_filepath_len   = 0;

+    cl_error_t conv_result;

     if (NULL == filepath) {

         cli_errmsg("cli_get_filepath_from_filedesc: Invalid args.\n");

         goto done;

     }

-    dwRet = GetFinalPathNameByHandleA((HANDLE)hFile, NULL, 0, VOLUME_NAME_DOS);

+    dwRet = GetFinalPathNameByHandleW((HANDLE)hFile, NULL, 0, VOLUME_NAME_DOS);

     if (dwRet == 0) {

         cli_errmsg("cli_get_filepath_from_filedesc: Failed to resolve filename for descriptor %d\n", desc);

         status = CL_EOPEN;

         goto done;

     }

-    long_evaluated_filepath = calloc(dwRet + 1, 1);

-    if (NULL == long_evaluated_filepath) {

+    long_evaluated_filepathW = calloc(dwRet + 1, sizeof(WCHAR));

+    if (NULL == long_evaluated_filepathW) {

         cli_errmsg("cli_get_filepath_from_filedesc: Failed to allocate %u bytes to store filename\n", dwRet + 1);

         status = CL_EMEM;

         goto done;

     }

-    dwRet = GetFinalPathNameByHandleA((HANDLE)hFile, long_evaluated_filepath, dwRet + 1, VOLUME_NAME_DOS);

+    dwRet = GetFinalPathNameByHandleW((HANDLE)hFile, long_evaluated_filepathW, dwRet + 1, VOLUME_NAME_DOS);

     if (dwRet == 0) {

         cli_errmsg("cli_get_filepath_from_filedesc: Failed to resolve filename for descriptor %d\n", desc);

-        free(long_evaluated_filepath);

-        long_evaluated_filepath = NULL;

-        status                  = CL_EOPEN;

+        status = CL_EOPEN;

         goto done;

     }

-    evaluated_filepath = calloc(strlen(long_evaluated_filepath) - strlen("\\\\?\\") + 1, 1);

-    if (NULL == evaluated_filepath) {

-        cli_errmsg("cli_get_filepath_from_filedesc: Failed to allocate %u bytes to store filename\n", dwRet + 1);

-        status = CL_EMEM;

-        goto done;

+    if (0 == wcsncmp(L"\\\\?\\UNC", long_evaluated_filepathW, wcslen(L"\\\\?\\UNC"))) {

+        conv_result = cli_codepage_to_utf8(

+            long_evaluated_filepathW,

+            (wcslen(long_evaluated_filepathW)) * sizeof(WCHAR),

+            CODEPAGE_UTF16_LE,

+            &evaluated_filepath,

+            &evaluated_filepath_len);

+        if (CL_SUCCESS != conv_result) {

+            cli_errmsg("cli_get_filepath_from_filedesc: Failed to convert UTF16_LE filename to UTF8\n", dwRet + 1);

+            status = CL_EOPEN;

+            goto done;

+        }

+    } else {

+        conv_result = cli_codepage_to_utf8(

+            long_evaluated_filepathW + wcslen(L"\\\\?\\"),

+            (wcslen(long_evaluated_filepathW) - wcslen(L"\\\\?\\")) * sizeof(WCHAR),

+            CODEPAGE_UTF16_LE,

+            &evaluated_filepath,

+            &evaluated_filepath_len);

+        if (CL_SUCCESS != conv_result) {

+            cli_errmsg("cli_get_filepath_from_filedesc: Failed to convert UTF16_LE filename to UTF8\n", dwRet + 1);

+            status = CL_EOPEN;

+            goto done;

+        }

     }

-    memcpy(evaluated_filepath,

-           long_evaluated_filepath + strlen("\\\\?\\"),

-           strlen(long_evaluated_filepath) - strlen("\\\\?\\"));

 #else

@@ -1295,15 +1313,15 @@ cl_error_t cli_get_filepath_from_filedesc(int desc, char **filepath)

 #endif

-    cli_dbgmsg("cli_get_filepath_from_filedesc: File path for fd [%d] is: %s\n", desc, *filepath);

+    cli_dbgmsg("cli_get_filepath_from_filedesc: File path for fd [%d] is: %s\n", desc, evaluated_filepath);

     status    = CL_SUCCESS;

     *filepath = evaluated_filepath;

 done:

 #ifdef _WIN32

-    if (NULL != long_evaluated_filepath) {

-        free(long_evaluated_filepath);

+    if (NULL != long_evaluated_filepathW) {

+        free(long_evaluated_filepathW);

     }

 #endif

     return status;

@@ -3773,7 +3773,7 @@ static cl_error_t parse_formula(FILE *out_file, char data[], unsigned data_size)

                     if (str_len > data_size - data_pos) {

                         str_len = data_size - data_pos;

                     }

-                    if (CL_SUCCESS == cli_codepage_to_utf8(&data[data_pos + 3], str_len, 1200, &utf8, &utf8_size)) {

+                    if (CL_SUCCESS == cli_codepage_to_utf8(&data[data_pos + 3], str_len, CODEPAGE_UTF16_LE, &utf8, &utf8_size)) {

                         if (0 < utf8_size) {

                             size_written = fwrite(utf8, 1, utf8_size, out_file);

                             free(utf8);

@@ -4326,7 +4326,7 @@ cl_error_t cli_xlm_extract_macros(const char *dir, cli_ctx *ctx, struct uniq *U,

                             string_length = biff_header.length - 3;

                         }

-                        if (CL_SUCCESS == cli_codepage_to_utf8(&data[3], string_length, 1200, &utf8, &utf8_size)) {

+                        if (CL_SUCCESS == cli_codepage_to_utf8(&data[3], string_length, CODEPAGE_UTF16_LE, &utf8, &utf8_size)) {

                             if (0 < utf8_size) {

                                 size_written = fwrite(utf8, 1, utf8_size, out_file);

                                 free(utf8);