X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/8fb3fcfbf81183f2debffe46095567d72edd85ad..f3fd7796410b671022d50f0c339d72cecaf4eef7:/win32/win32.h diff --git a/win32/win32.h b/win32/win32.h index a1f7ea0..849f13b 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -1,6 +1,6 @@ /* WIN32.H * - * (c) 1995 Microsoft Corporation. All rights reserved. + * (c) 1995 Microsoft Corporation. All rights reserved. * Developed by hip communications inc., http://info.hip.com/info/ * * You may distribute under the terms of either the GNU General Public @@ -34,15 +34,15 @@ # define Win32_Winsock #ifdef __cplusplus /* Mingw32 gcc -xc++ objects to __attribute((unused)) at least */ -#undef PERL_UNUSED_DECL -#define PERL_UNUSED_DECL +#undef PERL_UNUSED_DECL +#define PERL_UNUSED_DECL #endif #endif -/* Define DllExport akin to perl's EXT, +/* Define DllExport akin to perl's EXT, * If we are in the DLL or mimicing the DLL for Win95 work round - * then Export the symbol, + * then Export the symbol, * otherwise import it. */ @@ -51,7 +51,7 @@ #if defined(PERLDLL) || defined(WIN95FIX) #define DllExport /*#define DllExport __declspec(dllexport)*/ /* noises with VC5+sp3 */ -#else +#else #define DllExport __declspec(dllimport) #endif @@ -72,6 +72,7 @@ #include #include #include +#include #include #ifndef EXT #include "EXTERN.h" @@ -103,8 +104,8 @@ struct utsname { # define END_EXTERN_C } # define EXTERN_C extern "C" #else -# define START_EXTERN_C -# define END_EXTERN_C +# define START_EXTERN_C +# define END_EXTERN_C # define EXTERN_C #endif #endif @@ -139,6 +140,8 @@ struct utsname { #endif #define ENV_IS_CASELESS +#define PIPESOCK_MODE "b" /* pipes, sockets default to binmode */ + #ifndef VER_PLATFORM_WIN32_WINDOWS /* VC-2.0 headers don't have this */ #define VER_PLATFORM_WIN32_WINDOWS 1 #endif @@ -200,7 +203,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) +#pragma warning(disable: 4102) /* "unreferenced label" */ /* Visual C thinks that a pointer to a member variable is 16 bytes in size. */ #define PERL_MEMBER_PTR_SIZE 16 @@ -236,6 +239,16 @@ typedef long gid_t; /* compatibility stuff for other compilers goes here */ +#ifndef _INTPTR_T_DEFINED +typedef int intptr_t; +# define _INTPTR_T_DEFINED +#endif + +#ifndef _UINTPTR_T_DEFINED +typedef unsigned int uintptr_t; +# define _UINTPTR_T_DEFINED +#endif + START_EXTERN_C /* For UNIX compatibility. */ @@ -247,7 +260,10 @@ extern gid_t getegid(void); extern int setuid(uid_t uid); extern int setgid(gid_t gid); extern int kill(int pid, int sig); -extern void *sbrk(int need); +#ifndef USE_PERL_SBRK +extern void *sbrk(ptrdiff_t need); +# define HAS_SBRK_PROTO +#endif extern char * getlogin(void); extern int chown(const char *p, uid_t o, gid_t g); extern int mkstemp(const char *path); @@ -276,14 +292,14 @@ typedef struct { * wShowWindow = SW_HIDE; */ DWORD dwFlags; - DWORD dwX; - DWORD dwY; - DWORD dwXSize; - DWORD dwYSize; - DWORD dwXCountChars; - DWORD dwYCountChars; + DWORD dwX; + DWORD dwY; + DWORD dwXSize; + DWORD dwYSize; + DWORD dwXCountChars; + DWORD dwYCountChars; DWORD dwFillAttribute; - WORD wShowWindow; + WORD wShowWindow; } child_IO_table; DllExport void win32_get_child_IO(child_IO_table* ptr); @@ -292,10 +308,7 @@ DllExport void win32_get_child_IO(child_IO_table* ptr); extern FILE * my_fdopen(int, char *); #endif extern int my_fclose(FILE *); -extern int my_fstat(int fd, struct stat *sbufptr); -extern int do_aspawn(void *really, void **mark, void **sp); -extern int do_spawn(char *cmd); -extern int do_spawn_nowait(char *cmd); +extern int my_fstat(int fd, Stat_t *sbufptr); extern char * win32_get_privlib(const char *pl); extern char * win32_get_sitelib(const char *pl); extern char * win32_get_vendorlib(const char *pl); @@ -335,8 +348,8 @@ typedef char * caddr_t; /* In malloc.c (core address). */ # define PERL_SCRIPT_MODE "rb" #endif -/* - * Now Win32 specific per-thread data stuff +/* + * Now Win32 specific per-thread data stuff */ struct thread_intern { @@ -353,14 +366,10 @@ struct thread_intern { # ifdef USE_RTL_THREAD_API void * retv; /* slot for thread return value */ # endif + BOOL Wuse_showwindow; + WORD Wshowwindow; }; -#ifdef USE_5005THREADS -# ifndef USE_DECLSPEC_THREAD -# define HAVE_THREAD_INTERN -# endif /* !USE_DECLSPEC_THREAD */ -#endif /* USE_5005THREADS */ - #define HAVE_INTERP_INTERN typedef struct { long num; @@ -368,6 +377,11 @@ typedef struct { HANDLE handles[MAXIMUM_WAIT_OBJECTS]; } child_tab; +#ifndef Sighandler_t +typedef Signal_t (*Sighandler_t) (int); +#define Sighandler_t Sighandler_t +#endif + struct interp_intern { char * perlshell_tokens; char ** perlshell_vec; @@ -379,15 +393,15 @@ struct interp_intern { child_tab * pseudo_children; #endif void * internal_host; -#ifndef USE_5005THREADS struct thread_intern thr_intern; -#endif UINT timerid; - HANDLE msg_event; + unsigned poll_count; + Sighandler_t sigtable[SIG_SIZE]; }; DllExport int win32_async_check(pTHX); +#define WIN32_POLL_INTERVAL 32768 #define PERL_ASYNC_CHECK() if (w32_do_async || PL_sig_pending) win32_async_check(aTHX) #define w32_perlshell_tokens (PL_sys_intern.perlshell_tokens) @@ -405,20 +419,16 @@ DllExport int win32_async_check(pTHX); #define w32_pseudo_child_handles (w32_pseudo_children->handles) #define w32_internal_host (PL_sys_intern.internal_host) #define w32_timerid (PL_sys_intern.timerid) -#define w32_do_async (w32_timerid != 0) -#ifdef USE_5005THREADS -# 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_5005THREADS */ +#define w32_sighandler (PL_sys_intern.sigtable) +#define w32_poll_count (PL_sys_intern.poll_count) +#define w32_do_async (w32_poll_count++ > WIN32_POLL_INTERVAL) +#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) +#define w32_use_showwindow (PL_sys_intern.thr_intern.Wuse_showwindow) +#define w32_showwindow (PL_sys_intern.thr_intern.Wshowwindow) /* UNICODE<>ANSI translation helpers */ /* Use CP_ACP when mode is ANSI */ @@ -462,7 +472,7 @@ DllExport int win32_async_check(pTHX); * Control structure for lowio file handles */ typedef struct { - long osfhnd; /* underlying OS file HANDLE */ + intptr_t osfhnd;/* underlying OS file HANDLE */ char osfile; /* attributes of file (e.g., open in text mode?) */ char pipech; /* one char buffer for handles opened on pipes */ int lockinitflag; @@ -496,11 +506,11 @@ EXTERN_C _CRTIMP ioinfo* __pioinfo[]; #define _pipech(i) (_pioinfo(i)->pipech) /* since we are not doing a dup2(), this works fine */ -#define _set_osfhnd(fh, osfh) (void)(_osfhnd(fh) = (long)osfh) +#define _set_osfhnd(fh, osfh) (void)(_osfhnd(fh) = (intptr_t)osfh) #endif #endif -/* IO.xs and POSIX.xs define PERLIO_NOT_STDIO to 1 */ +/* IO.xs and POSIX.xs define PERLIO_NOT_STDIO to 1 */ #if defined(PERL_EXT_IO) || defined(PERL_EXT_POSIX) #undef PERLIO_NOT_STDIO #endif @@ -523,6 +533,8 @@ EXTERN_C _CRTIMP ioinfo* __pioinfo[]; #define EAFNOSUPPORT WSAEAFNOSUPPORT #endif -#endif /* _INC_WIN32_PERL5 */ +DllExport void *win32_signal_context(void); +#define PERL_GET_SIG_CONTEXT win32_signal_context() +#endif /* _INC_WIN32_PERL5 */