Merge pull request #34 from nojb/master

Add Unicode support to flexdll (was: Add wide-character version of flexdll_dlopen)

README.md

@@ -435,6 +435,9 @@ Here is the content of the **`flexdll.h`** file:
     #define FLEXDLL_RTLD_NOEXEC 0x0002
 
     void *flexdll_dlopen(const char *, int);
+#ifndef CYGWIN
+    void *flexdll_wdlopen(const wchar_t *, int);
+#endif
     void *flexdll_dlsym(void *, const char *);
     void flexdll_dlclose(void *);
     char *flexdll_dlerror(void);
@@ -472,6 +475,11 @@ error occurs during the call to **`flexdll_dlopen`**, the functions
 returns **`NULL`** and the error message can be retrieved using
 **`flexdll_dlerror`**.
 
+The function **`flexdll_wdlopen`** is a wide-character version of
+**`flexdll_dlopen`**.  The filename argument to **`flexdll_wdlopen`** is a
+wide-character string. **`flexdll_wdlopen`** and **`flexdll_dlopen`** behave
+identically otherwise.
+
 The second most important function is **`flexdll_dlsym`** which looks
 for a symbol whose name is the second argument. The first argument can
 be either a regular handle returned by **`flexdll_dlopen`** (the symbol

flexdll.c

@@ -71,16 +71,16 @@ static char * ll_dlerror(void)
 
 #else
 
-static void *ll_dlopen(const char *libname, int for_execution) {
+static void *ll_dlopen(const wchar_t *libname, int for_execution) {
   HMODULE m;
-  m = LoadLibraryEx(libname, NULL,
-		    for_execution ? 0 : DONT_RESOLVE_DLL_REFERENCES);
+  m = LoadLibraryExW(libname, NULL,
+                     for_execution ? 0 : DONT_RESOLVE_DLL_REFERENCES);
   /* See https://blogs.msdn.microsoft.com/oldnewthing/20050214-00/?p=36463
      Should use LOAD_LIBRARY_AS_DATAFILE instead of DONT_RESOLVE_DLL_REFERENCES? */
 
   /* Under Win 95/98/ME, LoadLibraryEx can fail in cases where LoadLibrary
      would succeed.  Just try again with LoadLibrary for good measure. */
-  if (m == NULL) m = LoadLibrary(libname);
+  if (m == NULL) m = LoadLibraryW(libname);
   return (void *) m;
 }
 
@@ -349,7 +349,11 @@ int flexdll_relocate(void *tbl) {
   return 1;
 }
 
+#ifdef CYGWIN
 void *flexdll_dlopen(const char *file, int mode) {
+#else
+void *flexdll_wdlopen(const wchar_t *file, int mode) {
+#endif
   void *handle;
   dlunit *unit;
   char flexdll_relocate_env[256];
@@ -403,6 +407,26 @@ void *flexdll_dlopen(const char *file, int mode) {
   return unit;
 }
 
+#ifndef CYGWIN
+
+void *flexdll_dlopen(const char *file, int mode)
+{
+  wchar_t * p;
+  int nbr;
+  void * handle;
+
+  nbr = MultiByteToWideChar(CP_THREAD_ACP, 0, file, -1, NULL, 0);
+  if (nbr == 0) { if (!error) error = 1; return NULL; }
+  p = malloc(nbr*sizeof(*p));
+  MultiByteToWideChar(CP_THREAD_ACP, 0, file, -1, p, nbr);
+  handle = flexdll_wdlopen(p, mode);
+  free(p);
+
+  return handle;
+}
+
+#endif
+
 void flexdll_dlclose(void *u) {
   dlunit *unit = u;
 

flexdll.h

@@ -12,6 +12,8 @@
 #ifndef FLEXDLL_H
 #define FLEXDLL_H
 
+#include <wchar.h>
+
 #define FLEXDLL_RTLD_GLOBAL 0x0001
 #define FLEXDLL_RTLD_LOCAL  0x0000
 #define FLEXDLL_RTLD_NOEXEC 0x0002
@@ -22,6 +24,10 @@ extern "C"
 #endif
 
 void *flexdll_dlopen(const char *, int);
+#ifndef CYGWIN
+void *flexdll_wdlopen(const wchar_t *, int);
+#endif
+
 void *flexdll_dlsym(void *, const char *);
 void flexdll_dlclose(void *);
 char *flexdll_dlerror(void);

reloc.ml

@@ -94,21 +94,90 @@ let get_output1 ?use_bash cmd =
 
 let mk_dirs_opt pr = String.concat " " (List.map (fun s -> pr ^ (Filename.quote s)) !dirs)
 
+exception Not_utf8
+
+let utf8_next s i =
+  let fail () = raise Not_utf8 in
+  let check i =
+    if i >= String.length s then fail ();
+    let n = Char.code s.[i] in
+    if n lsr 6 <> 0b10 then fail () else n
+  in
+  if !i >= String.length s then fail ();
+  match s.[!i] with
+  | '\000'..'\127' as c ->
+      let n = Char.code c in
+      i := !i + 1;
+      n
+  | '\192'..'\223' as c ->
+      let n1 = Char.code c in
+      let n2 = check (!i+1) in
+      let n =
+        ((n1 land 0b11111) lsl 6) lor
+        ((n2 land 0b111111))
+      in
+      i := !i + 2;
+      n
+  | '\224'..'\239' as c ->
+      let n1 = Char.code c in
+      let n2 = check (!i+1) in
+      let n3 = check (!i+2) in
+      let n =
+        ((n1 land 0b1111) lsl 12) lor
+        ((n2 land 0b111111) lsl 6) lor
+        ((n3 land 0b111111))
+      in
+      i := !i + 3;
+      n
+  | '\240'..'\247' as c ->
+      let n1 = Char.code c in
+      let n2 = check (!i+1) in
+      let n3 = check (!i+2) in
+      let n4 = check (!i+3) in
+      let n =
+        ((n1 land 0b111) lsl 18) lor
+        ((n2 land 0b111111) lsl 12) lor
+        ((n3 land 0b111111) lsl 6) lor
+        ((n4 land 0b111111))
+      in
+      i := !i + 4;
+      n
+  | _ ->
+      fail ()
+
+let toutf16 s =
+  let i = ref 0 in
+  let b = Buffer.create (String.length s) in
+  let cp n = Buffer.add_char b (Char.chr (n land 0xFF)); Buffer.add_char b (Char.chr ((n lsr 8) land 0xFF)) in
+  while !i < String.length s do
+    let n = utf8_next s i in
+    if n <= 0xFFFF then cp n else (cp (0xD7C0 + (n lsl 10)); cp (0xDC00 + (n land 0x3FF)))
+  done;
+  Buffer.contents b
 
 (* Build @responsefile to work around Windows limitations on
    command-line length *)
 let build_diversion lst =
-  let (responsefile, oc) = open_temp_file "camlresp" "" in
-  List.iter
-    (fun f ->
-      if f <> "" then begin
+  let responsefile = temp_file "camlresp" "" in
+  let oc = open_out_bin responsefile in
+  let lst =
+    List.map (fun f ->
         let s = Bytes.of_string (Filename.quote f) in
         for i = 0 to Bytes.length s - 1 do
           if Bytes.get s i = '\\' then Bytes.set s i '/'
         done;
-        output_bytes oc s; output_char oc '\n'
-      end)
-    lst;
+        Bytes.to_string s ^ "\r\n"
+      ) (List.filter (fun f -> f <> "") lst)
+  in
+  let utf16, lst =
+    match List.map toutf16 lst with
+    | lst ->
+        true, lst
+    | exception Not_utf8 ->
+        false, lst
+  in
+  if utf16 then output_string oc "\xFF\xFE"; (* LE BOM *)
+  List.iter (fun s -> output_string oc s) lst;
   close_out oc;
   "@" ^ responsefile