X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32.h;h=856232ae84058ba6228cde25444f1520878b48e2;hb=7766f1371a6d2b58d0f46fbe6a60785860a39c1e;hp=a072b875c9ddd92c8c56e7d13a3855460230a075;hpb=b2af26b13be5ac143d7c7e58ef2458b8b3103485;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/win32.h b/win32/win32.h index a072b87..856232a 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -9,20 +9,29 @@ #ifndef _INC_WIN32_PERL5 #define _INC_WIN32_PERL5 -#ifdef PERL_OBJECT +#if defined(PERL_OBJECT) || defined(PERL_IMPLICIT_SYS) || 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 +# error PERL_GLOBAL_STRUCT cannot be defined with PERL_IMPLICIT_SYS # endif # define win32_get_privlib PerlEnv_lib_path # 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; +# ifndef __int64 /* some versions seem to #define it already */ +# define __int64 long long +# endif # define Win32_Winsock /* GCC does not do __declspec() - render it a nop * and turn on options to avoid importing data @@ -175,7 +184,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 @@ -184,6 +193,7 @@ struct utsname { typedef long uid_t; typedef long gid_t; +typedef unsigned short mode_t; #pragma warning(disable: 4018 4035 4101 4102 4244 4245 4761) #ifndef PERL_OBJECT @@ -192,23 +202,23 @@ typedef long gid_t; #define STRUCT_MGVTBL_DEFINITION \ struct mgvtbl { \ union { \ - int (CPERLscope(*svt_get)) _((SV *sv, MAGIC* mg)); \ + int (CPERLscope(*svt_get))(pTHX_ SV *sv, MAGIC* mg); \ char handle_VC_problem1[16]; \ }; \ union { \ - int (CPERLscope(*svt_set)) _((SV *sv, MAGIC* mg)); \ + int (CPERLscope(*svt_set))(pTHX_ SV *sv, MAGIC* mg); \ char handle_VC_problem2[16]; \ }; \ union { \ - U32 (CPERLscope(*svt_len)) _((SV *sv, MAGIC* mg)); \ + U32 (CPERLscope(*svt_len))(pTHX_ SV *sv, MAGIC* mg); \ char handle_VC_problem3[16]; \ }; \ union { \ - int (CPERLscope(*svt_clear)) _((SV *sv, MAGIC* mg)); \ + int (CPERLscope(*svt_clear))(pTHX_ SV *sv, MAGIC* mg); \ char handle_VC_problem4[16]; \ }; \ union { \ - int (CPERLscope(*svt_free)) _((SV *sv, MAGIC* mg)); \ + int (CPERLscope(*svt_free))(pTHX_ SV *sv, MAGIC* mg); \ char handle_VC_problem5[16]; \ }; \ } @@ -216,7 +226,7 @@ struct mgvtbl { \ #define BASEOP_DEFINITION \ OP* op_next; \ OP* op_sibling; \ - OP* (CPERLscope(*op_ppaddr))_((ARGSproto)); \ + OP* (CPERLscope(*op_ppaddr))(pTHX); \ char handle_VC_problem[12]; \ PADOFFSET op_targ; \ OPCODE op_type; \ @@ -224,15 +234,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)) _((void*)); \ - char handle_VC_problem[16]; \ -} - #endif /* PERL_OBJECT */ #endif /* _MSC_VER */ @@ -247,8 +248,15 @@ typedef long gid_t; #define flushall _flushall #define fcloseall _fcloseall +#undef __attribute__ +#define __attribute__(x) + +#ifndef CP_UTF8 +# define CP_UTF8 65001 +#endif + #ifdef PERL_OBJECT -#define FUNC_NAME_TO_PTR(name) &(name) +# define MEMBER_TO_FPTR(name) &(name) #endif #ifndef _O_NOINHERIT @@ -292,8 +300,11 @@ 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(void); +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 *); @@ -302,7 +313,6 @@ extern int my_fclose(FILE *); 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 do_exec(char *cmd); extern char * win32_get_privlib(char *pl); extern char * win32_get_sitelib(char *pl); extern int IsWin95(void); @@ -338,10 +348,37 @@ EXT void win32_strip_return(struct sv *sv); #define win32_strip_return(sv) NOOP #endif +/* + * Now Win32 specific per-thread data stuff + */ + +struct thread_intern { + /* XXX can probably use one buffer instead of several */ + char Wstrerror_buffer[512]; + struct servent Wservent; + char Wgetlogin_buffer[128]; +# ifdef USE_SOCKETS_AS_HANDLES + int Winit_socktype; +# endif +# ifdef HAVE_DES_FCRYPT + char Wcrypt_buffer[30]; +# endif +# ifdef USE_RTL_THREAD_API + void * retv; /* slot for thread return value */ +# endif +}; + +#ifdef USE_THREADS +# ifndef USE_DECLSPEC_THREAD +# define HAVE_THREAD_INTERN +# endif /* !USE_DECLSPEC_THREAD */ +#endif /* USE_THREADS */ + #define HAVE_INTERP_INTERN typedef struct { long num; DWORD pids[MAXIMUM_WAIT_OBJECTS]; + HANDLE handles[MAXIMUM_WAIT_OBJECTS]; } child_tab; struct interp_intern { @@ -350,7 +387,14 @@ struct interp_intern { long perlshell_items; struct av * fdpid; child_tab * children; - HANDLE child_handles[MAXIMUM_WAIT_OBJECTS]; +#ifdef USE_ITHREADS + DWORD pseudo_id; + child_tab * pseudo_children; +#endif + void * internal_host; +#ifndef USE_THREADS + struct thread_intern thr_intern; +#endif }; @@ -361,33 +405,58 @@ struct interp_intern { #define w32_children (PL_sys_intern.children) #define w32_num_children (w32_children->num) #define w32_child_pids (w32_children->pids) -#define w32_child_handles (PL_sys_intern.child_handles) - -/* - * Now Win32 specific per-thread data stuff - */ - +#define w32_child_handles (w32_children->handles) +#define w32_pseudo_id (PL_sys_intern.pseudo_id) +#define w32_pseudo_children (PL_sys_intern.pseudo_children) +#define w32_num_pseudo_children (w32_pseudo_children->num) +#define w32_pseudo_child_pids (w32_pseudo_children->pids) +#define w32_pseudo_child_handles (w32_pseudo_children->handles) +#define w32_internal_host (PL_sys_intern.internal_host) #ifdef USE_THREADS -# ifndef USE_DECLSPEC_THREAD -# define HAVE_THREAD_INTERN - -struct thread_intern { - /* XXX can probably use one buffer instead of several */ - char Wstrerror_buffer[512]; - struct servent Wservent; - char Wgetlogin_buffer[128]; - char Ww32_perllib_root[MAX_PATH+1]; -# ifdef USE_SOCKETS_AS_HANDLES - int Winit_socktype; -# endif -# ifdef HAVE_DES_FCRYPT - char Wcrypt_buffer[30]; -# endif -# ifdef USE_RTL_THREAD_API - void * retv; /* slot for thread return value */ -# endif -}; -# endif /* !USE_DECLSPEC_THREAD */ +# define w32_strerror_buffer (thr->i.Wstrerror_buffer) +# define w32_getlogin_buffer (thr->i.Wgetlogin_buffer) +# define w32_crypt_buffer (thr->i.Wcrypt_buffer) +# define w32_servent (thr->i.Wservent) +# define w32_init_socktype (thr->i.Winit_socktype) +#else +# define w32_strerror_buffer (PL_sys_intern.thr_intern.Wstrerror_buffer) +# define w32_getlogin_buffer (PL_sys_intern.thr_intern.Wgetlogin_buffer) +# define w32_crypt_buffer (PL_sys_intern.thr_intern.Wcrypt_buffer) +# define w32_servent (PL_sys_intern.thr_intern.Wservent) +# define w32_init_socktype (PL_sys_intern.thr_intern.Winit_socktype) #endif /* USE_THREADS */ +/* UNICODE<>ANSI translation helpers */ +/* Use CP_ACP when mode is ANSI */ +/* Use CP_UTF8 when mode is UTF8 */ + +#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)\ + lpa[0] = '\0', WideCharToMultiByte((IN_UTF8) ? CP_UTF8 : CP_ACP, 0, lpw, -1, (LPSTR)lpa, nChars, NULL, NULL) + +#define USING_WIDE() (PerlEnv_os_id() == VER_PLATFORM_WIN32_NT) + +#ifdef USE_ITHREADS +# define PERL_WAIT_FOR_CHILDREN \ + STMT_START { \ + if (w32_pseudo_children && w32_num_pseudo_children) { \ + long children = w32_num_pseudo_children; \ + WaitForMultipleObjects(children, \ + w32_pseudo_child_handles, \ + TRUE, INFINITE); \ + while (children) \ + CloseHandle(w32_pseudo_child_handles[--children]); \ + } \ + } STMT_END +#endif + +/* + * This provides a layer of functions and macros to ensure extensions will + * get to use the same RTL functions as the core. + */ +#include "win32iop.h" + #endif /* _INC_WIN32_PERL5 */ +