Adjust headers and include ordering for MSVC support.

[libserialport.git] / windows.c

diff --git a/windows.c b/windows.c
index 53c1b02333c5550a19d593d18fe3e1c4f296bafe..0521716549272d558418e3f826cf10870c271672 100644 (file)
--- a/windows.c
+++ b/windows.c
@@ -18,8 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include "libserialport.h"
 #include "libserialport_internal.h"
 
 /* USB path is a string of at most 8 decimal numbers < 128 separated by dots. */
@@ -28,32 +26,42 @@
 static void enumerate_hub(struct sp_port *port, const char *hub_name,
                           const char *parent_path, DEVINST dev_inst);
 
-static char *wc_to_utf8(PWCHAR wc_buffer, ULONG size)
+static char *wc_to_utf8(PWCHAR wc_buffer, ULONG wc_bytes)
 {
-       ULONG wc_length = size / sizeof(WCHAR);
-       WCHAR wc_str[wc_length + 1];
-       char *utf8_str;
+       ULONG wc_length = wc_bytes / sizeof(WCHAR);
+       ULONG utf8_bytes;
+       WCHAR *wc_str = NULL;
+       char *utf8_str = NULL;
+
+       /* Allocate aligned wide char buffer */
+       if (!(wc_str = malloc((wc_length + 1) * sizeof(WCHAR))))
+               goto wc_to_utf8_end;
 
        /* Zero-terminate the wide char string. */
-       memcpy(wc_str, wc_buffer, size);
+       memcpy(wc_str, wc_buffer, wc_bytes);
        wc_str[wc_length] = 0;
 
        /* Compute the size of the UTF-8 converted string. */
-       if (!(size = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1,
+       if (!(utf8_bytes = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1,
                                         NULL, 0, NULL, NULL)))
-               return NULL;
+               goto wc_to_utf8_end;
 
        /* Allocate UTF-8 output buffer. */
-       if (!(utf8_str = malloc(size)))
-               return NULL;
+       if (!(utf8_str = malloc(utf8_bytes)))
+               goto wc_to_utf8_end;
 
        /* Actually converted to UTF-8. */
        if (!WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1,
-                                utf8_str, size, NULL, NULL)) {
+                                utf8_str, utf8_bytes, NULL, NULL)) {
                free(utf8_str);
-               return NULL;
+               utf8_str = NULL;
+               goto wc_to_utf8_end;
        }
 
+wc_to_utf8_end:
+       if (wc_str)
+               free(wc_str);
+
        return utf8_str;
 }