Need to add some more conditions to deal with the case

[p5sagit/p5-mst-13.2.git] / win32 / win32.h

diff --git a/win32/win32.h b/win32/win32.h
index c688ee9..79926ac 100644 (file)
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -9,12 +9,13 @@
 #ifndef  _INC_WIN32_PERL5
 #define  _INC_WIN32_PERL5
 
-#ifdef PERL_OBJECT
+#if defined(PERL_OBJECT) || defined(PERL_CAPI)
 #  define DYNAMIC_ENV_FETCH
 #  define ENV_HV_NAME "___ENV_HV_NAME___"
 #  define HAS_GETENV_LEN
 #  define prime_env_iter()
 #  define WIN32IO_IS_STDIO             /* don't pull in custom stdio layer */
+#  define WIN32SCK_IS_STDSCK           /* don't pull in custom wsock layer */
 #  ifdef PERL_GLOBAL_STRUCT
 #    error PERL_GLOBAL_STRUCT cannot be defined with PERL_OBJECT
 #  endif
@@ -22,8 +23,13 @@
 #  define win32_get_sitelib PerlEnv_sitelib_path
 #endif
 
+#if defined(PERL_IMPLICIT_CONTEXT)
+#  define PERL_GET_INTERP      ((PerlInterpreter*)GetPerlInterpreter())
+#  define PERL_SET_INTERP(i)   (SetPerlInterpreter(i))
+#endif
+
 #ifdef __GNUC__
-// typedef long long __int64;
+typedef long long __int64;
 #  define Win32_Winsock
 /* GCC does not do __declspec() - render it a nop 
  * and turn on options to avoid importing data 
@@ -176,7 +182,7 @@ struct utsname {
 
 /* Borland is picky about a bare member function name used as its ptr */
 #ifdef PERL_OBJECT
-#define FUNC_NAME_TO_PTR(name) &(name)
+#  define MEMBER_TO_FPTR(name) &(name)
 #endif
 
 #endif
@@ -226,15 +232,6 @@ struct mgvtbl {                                                            \
     U8         op_flags;               \
     U8         op_private;
 
-#define UNION_ANY_DEFINITION union any {               \
-    void*      any_ptr;                                \
-    I32                any_i32;                                \
-    IV         any_iv;                                 \
-    long       any_long;                               \
-    void       (CPERLscope(*any_dptr)) (pTHX_ void*);  \
-    char       handle_VC_problem[16];                  \
-}
-
 #endif /* PERL_OBJECT */
 
 #endif /* _MSC_VER */
@@ -250,7 +247,7 @@ typedef long                gid_t;
 #define fcloseall      _fcloseall
 
 #ifdef PERL_OBJECT
-#define FUNC_NAME_TO_PTR(name) &(name)
+#  define MEMBER_TO_FPTR(name) &(name)
 #endif
 
 #ifndef _O_NOINHERIT
@@ -294,18 +291,21 @@ extern    int     chown(const char *p, uid_t o, gid_t g);
 #define  init_os_extras Perl_init_os_extras
 
 DllExport void         Perl_win32_init(int *argcp, char ***argvp);
-DllExport void         Perl_init_os_extras(pTHX);
-DllExport void         win32_str_os_error(pTHX_ void *sv, DWORD err);
+DllExport void         Perl_init_os_extras();
+DllExport void         win32_str_os_error(void *sv, DWORD err);
+DllExport int          RunPerl(int argc, char **argv, char **env);
+DllExport bool         SetPerlInterpreter(void* interp);
+DllExport void*                GetPerlInterpreter(void);
 
 #ifndef USE_SOCKETS_AS_HANDLES
 extern FILE *          my_fdopen(int, char *);
 #endif
 extern int             my_fclose(FILE *);
-extern int             do_aspawn(pTHX_ void *really, void **mark, void **sp);
-extern int             do_spawn(pTHX_ char *cmd);
-extern int             do_spawn_nowait(pTHX_ char *cmd);
-extern char *          win32_get_privlib(pTHX_ char *pl);
-extern char *          win32_get_sitelib(pTHX_ char *pl);
+extern int             do_aspawn(void *really, void **mark, void **sp);
+extern int             do_spawn(char *cmd);
+extern int             do_spawn_nowait(char *cmd);
+extern char *          win32_get_privlib(char *pl);
+extern char *          win32_get_sitelib(char *pl);
 extern int             IsWin95(void);
 extern int             IsWinNT(void);
 
@@ -345,6 +345,12 @@ typedef struct {
     DWORD      pids[MAXIMUM_WAIT_OBJECTS];
 } child_tab;
 
+struct host_link {
+    char *     nameId;
+    void *     host_data;
+    struct host_link * next;
+};
+
 struct interp_intern {
     char *     perlshell_tokens;
     char **    perlshell_vec;
@@ -352,6 +358,7 @@ struct interp_intern {
     struct av *        fdpid;
     child_tab *        children;
     HANDLE     child_handles[MAXIMUM_WAIT_OBJECTS];
+    struct host_link * hostlist;
 };
 
 
@@ -363,6 +370,7 @@ struct interp_intern {
 #define w32_num_children       (w32_children->num)
 #define w32_child_pids         (w32_children->pids)
 #define w32_child_handles      (PL_sys_intern.child_handles)
+#define w32_host_link          (PL_sys_intern.hostlist)
 
 /* 
  * Now Win32 specific per-thread data stuff 
@@ -395,15 +403,13 @@ struct thread_intern {
 /* Use CP_ACP when mode is ANSI */
 /* Use CP_UTF8 when mode is UTF8 */
 
-#define A2WHELPER(lpa, lpw, nChars, acp)\
-    lpw[0] = 0, MultiByteToWideChar(acp, 0, lpa, -1, lpw, nChars)
+#define A2WHELPER(lpa, lpw, nBytes)\
+    lpw[0] = 0, MultiByteToWideChar((IN_UTF8) ? CP_UTF8 : CP_ACP, 0, lpa, -1, lpw, (nBytes/sizeof(WCHAR)))
 
-#define W2AHELPER(lpw, lpa, nChars, acp)\
-    lpa[0] = '\0', WideCharToMultiByte(acp, 0, lpw, -1, lpa, nChars, NULL, NULL)
+#define W2AHELPER(lpw, lpa, nChars)\
+    lpa[0] = '\0', WideCharToMultiByte((IN_UTF8) ? CP_UTF8 : CP_ACP, 0, lpw, -1, (LPSTR)lpa, nChars, NULL, NULL)
 
-/* place holders for now */
-#define USING_WIDE()   (IsWinNT())
-#define GETINTERPMODE() (IN_UTF8)
+#define USING_WIDE()   (PerlEnv_os_id() == VER_PLATFORM_WIN32_NT)
 
 /*
  * This provides a layer of functions and macros to ensure extensions will