[project @ 2004-05-06 17:26:14 by ross]

switch spawnProc to TSTR

Author: ross

System/Win32/Process.hsc

@@ -40,7 +40,7 @@ foreign import stdcall unsafe "windows.h Sleep"
 
 #ifdef __GLASGOW_HASKELL__
 foreign import ccall unsafe "spawnProc.h"
-  spawnProc :: CString -> Ptr CInt -> Ptr CInt -> Ptr CInt -> IO CInt
+  spawnProc :: LPCTSTR -> Ptr CInt -> Ptr CInt -> Ptr CInt -> IO CInt
 
 -- | Spawn a Win32 sub-process, to run the command given
 -- by the String, returning handles for the child's
@@ -51,7 +51,7 @@ spawn :: String
 	      , Handle  -- read handle to child's stderr
 	      )
 spawn cmd = 
-  withCString cmd $ \ p_cmd ->
+  withTString cmd $ \ p_cmd ->
    with 0 $ \ p_wIn  ->
     with 0 $ \ p_rOut ->
      with 0 $ \ p_rErr -> do

cbits/spawnProc.c

@@ -9,6 +9,7 @@
 #include <windows.h>
 #include <io.h>
 #include <fcntl.h>
+#include "spawnProc.h"
 
 /*
  * Function: mkAnonPipe
@@ -76,7 +77,7 @@ mkAnonPipe( HANDLE* pHandleIn,  BOOL isInheritableIn,
 }
 
 int
-spawnProc ( char* cmd
+spawnProc ( LPTSTR cmd
 	  , int* pFdInWrite
 	  , int* pFdOutRead
 	  , int* pFdErrRead

include/spawnProc.h

@@ -1 +1,8 @@
-extern int spawnProc(char* cmd, int* pFdInWrite, int* pFdOutRead, int* pFdErrRead);
+#ifndef __SPAWNPROC_H
+#define __SPAWNPROC_H
+
+#include <windows.h>
+
+extern int spawnProc(LPTSTR cmd, int* pFdInWrite, int* pFdOutRead, int* pFdErrRead);
+
+#endif /* __SPAWNPROC_H */