diff win/dw.c @ 2018:663d79f28e46

Win: Fix dw_html_javascript_run() when using embedded IE browser widget. Switched both the Edge and IE modules to use the main UTF8 conversion utils.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 08 Nov 2019 09:49:16 +0000
parents 686b2d049056
children 0cce5fed4594
line wrap: on
line diff
--- a/win/dw.c	Fri Nov 08 07:20:17 2019 +0000
+++ b/win/dw.c	Fri Nov 08 09:49:16 2019 +0000
@@ -5717,9 +5717,9 @@
 int _dw_html_javascript_run(HWND hwnd, char *script, void *scriptdata);
 #ifdef BUILD_EDGE
 void _dw_edge_action(HWND hwnd, int action);
-int _dw_edge_raw(HWND hwnd, LPCWSTR string);
-int _dw_edge_url(HWND hwnd, LPCWSTR url);
-int _dw_edge_javascript_run(HWND hwnd, LPCWSTR script, void *scriptdata);
+int _dw_edge_raw(HWND hwnd, char *string);
+int _dw_edge_url(HWND hwnd, char *url);
+int _dw_edge_javascript_run(HWND hwnd, char *script, void *scriptdata);
 #endif
 #endif
 
@@ -5755,7 +5755,7 @@
 #if (defined(BUILD_DLL) || defined(BUILD_HTML))
 #ifdef BUILD_EDGE
    if (_DW_EDGE_DETECTED)
-      return _dw_edge_raw(handle, UTF8toWide(string));
+      return _dw_edge_raw(handle, string);
 #endif
    return _dw_html_raw(handle, string);
 #else
@@ -5777,7 +5777,7 @@
 #if (defined(BUILD_DLL) || defined(BUILD_HTML))
 #if BUILD_EDGE
    if (_DW_EDGE_DETECTED)
-      return _dw_edge_url(handle, UTF8toWide(url));
+      return _dw_edge_url(handle, url);
 #endif
    return _dw_html_url(handle, url);
 #else
@@ -5800,7 +5800,7 @@
 #if (defined(BUILD_DLL) || defined(BUILD_HTML))
 #if BUILD_EDGE
    if (_DW_EDGE_DETECTED)
-      return _dw_edge_javascript_run(handle, UTF8toWide(script), scriptdata);
+      return _dw_edge_javascript_run(handle, script, scriptdata);
 #endif
    return _dw_html_javascript_run(handle, script, scriptdata);
 #else