Fix several C++ type casting quirks

zpl-c · Aug 4, 2019 · 2c4cbe9 · 2c4cbe9
1 parent a146e8b
commit 2c4cbe9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/code/zpl.h b/code/zpl.h
@@ -45,6 +45,7 @@
   https://github.com/zpl-c/zpl
 
 Version History:
+  9.8.1 - Fix several C++ type casting quirks
   9.8.0 - Incorporated OpenGL into ZPL core as an optional module
   9.7.0 - Added co-routine module
   9.6.0 - Added process module for creation and manipulation
@@ -11581,11 +11582,13 @@ zpl_inline const char *zpl_get_env_buf(const char *name) {
     zpl_local_persist wchar_t wbuffer[32767] = {0};
     zpl_local_persist char buffer[32767] = {0};
 
-    if (!GetEnvironmentVariableW(cast(LPCWSTR)zpl_utf8_to_ucs2_buf(name), cast(LPWSTR)wbuffer, 32767)) {
+    if (!GetEnvironmentVariableW(
+            cast(LPCWSTR)zpl_utf8_to_ucs2_buf(cast(const zpl_u8 *)name),
+            cast(LPWSTR)wbuffer, 32767)) {
         return NULL;
     }
 
-    zpl_ucs2_to_utf8(buffer, 32767, cast(wchar_t*)wbuffer);
+    zpl_ucs2_to_utf8(cast(zpl_u8*)buffer, 32767, cast(const zpl_u16*)wbuffer);
 
     return (const char *)buffer;
 #else
@@ -12884,12 +12887,12 @@ zpl_inline zpl_i32 zpl_pr_join(zpl_pr *process) {
 
 #ifdef ZPL_SYSTEM_WINDOWS
     if (process->f_stdin) {
-        fclose(process->f_stdin);
+        fclose(cast(FILE *)process->f_stdin);
     }
 
     WaitForSingleObject(process->win32_handle, INFINITE);
 
-    if (!GetExitCodeProcess(process->win32_handle, &ret_code)) {
+    if (!GetExitCodeProcess(process->win32_handle, cast(LPDWORD)&ret_code)) {
         zpl_pr_destroy(process);
         return -1;
     }
@@ -12908,13 +12911,13 @@ zpl_inline void zpl_pr_destroy(zpl_pr *process) {
 
 #ifdef ZPL_SYSTEM_WINDOWS
     if (process->f_stdin) {
-        fclose(process->f_stdin);
+        fclose(cast(FILE *)process->f_stdin);
     }
 
-    fclose(process->f_stdout);
+    fclose(cast(FILE *)process->f_stdout);
 
     if (process->f_stderr != process->f_stdout) {
-        fclose(process->f_stderr);
+        fclose(cast(FILE *)process->f_stderr);
     }
 
     CloseHandle(process->win32_handle);

diff --git a/code/zpl/__main__.c b/code/zpl/__main__.c
@@ -45,6 +45,7 @@
   https://github.com/zpl-c/zpl
 
 Version History:
+  9.8.1 - Fix several C++ type casting quirks
   9.8.0 - Incorporated OpenGL into ZPL core as an optional module
   9.7.0 - Added co-routine module
   9.6.0 - Added process module for creation and manipulation

diff --git a/code/zpl/misc.c b/code/zpl/misc.c
@@ -225,11 +225,13 @@ zpl_inline const char *zpl_get_env_buf(const char *name) {
     zpl_local_persist wchar_t wbuffer[32767] = {0};
     zpl_local_persist char buffer[32767] = {0};
 
-    if (!GetEnvironmentVariableW(cast(LPCWSTR)zpl_utf8_to_ucs2_buf(name), cast(LPWSTR)wbuffer, 32767)) {
+    if (!GetEnvironmentVariableW(
+            cast(LPCWSTR)zpl_utf8_to_ucs2_buf(cast(const zpl_u8 *)name),
+            cast(LPWSTR)wbuffer, 32767)) {
         return NULL;
     }
 
-    zpl_ucs2_to_utf8(buffer, 32767, cast(wchar_t*)wbuffer);
+    zpl_ucs2_to_utf8(cast(zpl_u8*)buffer, 32767, cast(const zpl_u16*)wbuffer);
 
     return (const char *)buffer;
 #else

diff --git a/code/zpl/process.c b/code/zpl/process.c
@@ -209,12 +209,12 @@ zpl_inline zpl_i32 zpl_pr_join(zpl_pr *process) {
 
 #ifdef ZPL_SYSTEM_WINDOWS
     if (process->f_stdin) {
-        fclose(process->f_stdin);
+        fclose(cast(FILE *)process->f_stdin);
     }
 
     WaitForSingleObject(process->win32_handle, INFINITE);
 
-    if (!GetExitCodeProcess(process->win32_handle, &ret_code)) {
+    if (!GetExitCodeProcess(process->win32_handle, cast(LPDWORD)&ret_code)) {
         zpl_pr_destroy(process);
         return -1;
     }
@@ -233,13 +233,13 @@ zpl_inline void zpl_pr_destroy(zpl_pr *process) {
 
 #ifdef ZPL_SYSTEM_WINDOWS
     if (process->f_stdin) {
-        fclose(process->f_stdin);
+        fclose(cast(FILE *)process->f_stdin);
     }
 
-    fclose(process->f_stdout);
+    fclose(cast(FILE *)process->f_stdout);
 
     if (process->f_stderr != process->f_stdout) {
-        fclose(process->f_stderr);
+        fclose(cast(FILE *)process->f_stderr);
     }
 
     CloseHandle(process->win32_handle);

diff --git a/test/coroutines.c b/test/coroutines.c
@@ -18,7 +18,7 @@ void send_req(zpl_co *co) {
 
     // wait until main thread resumes the execution
     zpl_co_yield(co);
-    
+
     some_data *r = cast(some_data*)co->data;
     printf_safe("step 2: no data, we pass some back\n");
 
@@ -60,7 +60,7 @@ int main (void) {
     zpl_co_resume(&w1, cast(void*)&r);
 
     do {} while (!zpl_co_waiting(&w1));
-    
+
     // step 3 - resume its execution again, pass data
     printf_safe("resume step 3\n");
     zpl_co_resume(&w1, cast(void*)&d2);