Fixed naming of FILEDESCRIPTORW

(cherry picked from commit a3bf25e9239b1fb970e65901356a970531bf067a)

diff --git a/channels/cliprdr/client/cliprdr_format.c b/channels/cliprdr/client/cliprdr_format.c
index 8359ca9..4c31a1b 100644 (file)
--- a/channels/cliprdr/client/cliprdr_format.c
+++ b/channels/cliprdr/client/cliprdr_format.c
@@ -206,7 +206,7 @@ static FILETIME uint64_to_filetime(UINT64 value)
  * @returns 0 on success, otherwise a Win32 error code.
  */
 UINT cliprdr_parse_file_list(const BYTE* format_data, UINT32 format_data_length,
-                             FILEDESCRIPTOR** file_descriptor_array, UINT32* file_descriptor_count)
+                             FILEDESCRIPTORW** file_descriptor_array, UINT32* file_descriptor_count)
 {
        UINT result = NO_ERROR;
        UINT32 i;
@@ -240,7 +240,7 @@ UINT cliprdr_parse_file_list(const BYTE* format_data, UINT32 format_data_length,
        }
 
        *file_descriptor_count = count;
-       *file_descriptor_array = calloc(count, sizeof(FILEDESCRIPTOR));
+       *file_descriptor_array = calloc(count, sizeof(FILEDESCRIPTORW));
        if (!*file_descriptor_array)
        {
                result = ERROR_NOT_ENOUGH_MEMORY;
@@ -251,7 +251,7 @@ UINT cliprdr_parse_file_list(const BYTE* format_data, UINT32 format_data_length,
        {
                int c;
                UINT64 lastWriteTime;
-               FILEDESCRIPTOR* file = &((*file_descriptor_array)[i]);
+               FILEDESCRIPTORW* file = &((*file_descriptor_array)[i]);
 
                Stream_Read_UINT32(s, file->dwFlags);          /* flags (4 bytes) */
                Stream_Seek(s, 32);                            /* reserved1 (32 bytes) */
@@ -288,7 +288,7 @@ out:
  *
  * @returns 0 on success, otherwise a Win32 error code.
  */
-UINT cliprdr_serialize_file_list(const FILEDESCRIPTOR* file_descriptor_array,
+UINT cliprdr_serialize_file_list(const FILEDESCRIPTORW* file_descriptor_array,
                                  UINT32 file_descriptor_count, BYTE** format_data,
                                  UINT32* format_data_length)
 {
@@ -323,7 +323,7 @@ UINT cliprdr_serialize_file_list_ex(UINT32 flags, const FILEDESCRIPTORW* file_de
        {
                int c;
                UINT64 lastWriteTime;
-               const FILEDESCRIPTOR* file = &file_descriptor_array[i];
+               const FILEDESCRIPTORW* file = &file_descriptor_array[i];
 
                /*
                 * There is a known issue with Windows server getting stuck in

diff --git a/include/freerdp/channels/cliprdr.h b/include/freerdp/channels/cliprdr.h
index a016be1..86fc658 100644 (file)
--- a/include/freerdp/channels/cliprdr.h
+++ b/include/freerdp/channels/cliprdr.h
@@ -94,9 +94,9 @@ extern "C"
 #endif
 
        FREERDP_API UINT cliprdr_parse_file_list(const BYTE* format_data, UINT32 format_data_length,
-                                                FILEDESCRIPTOR** file_descriptor_array,
+                                                FILEDESCRIPTORW** file_descriptor_array,
                                                 UINT32* file_descriptor_count);
-       FREERDP_API UINT cliprdr_serialize_file_list(const FILEDESCRIPTOR* file_descriptor_array,
+       FREERDP_API UINT cliprdr_serialize_file_list(const FILEDESCRIPTORW* file_descriptor_array,
                                                     UINT32 file_descriptor_count, BYTE** format_data,
                                                     UINT32* format_data_length);
        FREERDP_API UINT cliprdr_serialize_file_list_ex(UINT32 flags,