X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32.h;h=2a87528f1dd8e48baa6118188aa8e7590aec83f7;hb=cc61921f0ae7ed05d56abbd690cb97eea560d4a9;hp=91baa822c8e223be014c482fddb95184fe9fefc1;hpb=c623ac675720b3145d48cc2ea9474a0f3e0cbbca;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/win32.h b/win32/win32.h index 91baa82..2a87528 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -140,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 @@ -180,14 +182,15 @@ struct utsname { #define DllMain DllEntryPoint #endif -#pragma warn -ccc /* "condition is always true/false" */ -#pragma warn -rch /* "unreachable code" */ -#pragma warn -sig /* "conversion may lose significant digits" */ -#pragma warn -pia /* "possibly incorrect assignment" */ -#pragma warn -par /* "parameter 'foo' is never used" */ -#pragma warn -aus /* "'foo' is assigned a value that is never used" */ -#pragma warn -use /* "'foo' is declared but never used" */ -#pragma warn -csu /* "comparing signed and unsigned values" */ +#pragma warn -8004 /* "'foo' is assigned a value that is never used" */ +#pragma warn -8008 /* "condition is always true/false" */ +#pragma warn -8012 /* "comparing signed and unsigned values" */ +#pragma warn -8027 /* "functions containing %s are not expanded inline" */ +#pragma warn -8057 /* "parameter 'foo' is never used" */ +#pragma warn -8060 /* "possibly incorrect assignment" */ +#pragma warn -8066 /* "unreachable code" */ +#pragma warn -8071 /* "conversion may lose significant digits" */ +#pragma warn -8080 /* "'foo' is declared but never used" */ /* Borland C thinks that a pointer to a member variable is 12 bytes in size. */ #define PERL_MEMBER_PTR_SIZE 12 @@ -198,15 +201,25 @@ struct utsname { #ifdef _MSC_VER /* Microsoft Visual C++ */ +#ifndef UNDER_CE typedef long uid_t; typedef long gid_t; typedef unsigned short mode_t; +#endif + #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 #define isnan _isnan +#define snprintf _snprintf +#define vsnprintf _vsnprintf + +#if _MSC_VER < 1300 +/* VC6 has broken NaN semantics: NaN == NaN returns true instead of false */ +#define NAN_COMPARE_BROKEN 1 +#endif #endif /* _MSC_VER */ @@ -228,6 +241,17 @@ typedef long gid_t; # endif #endif +/* , pulled in by as of mingw-runtime-3.3, typedef's + * (u)intptr_t but doesn't set the _(U)INTPTR_T_DEFINED defines */ +#ifdef _STDINT_H +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# endif +# ifndef _UINTPTR_T_DEFINED +# define _UINTPTR_T_DEFINED +# endif +#endif + #endif /* __MINGW32__ */ /* both GCC/Mingw32 and MSVC++ 4.0 are missing this, so we put it here */ @@ -273,6 +297,7 @@ extern int mkstemp(const char *path); #define init_os_extras Perl_init_os_extras DllExport void Perl_win32_init(int *argcp, char ***argvp); +DllExport void Perl_win32_term(void); DllExport void Perl_init_os_extras(void); DllExport void win32_str_os_error(void *sv, DWORD err); DllExport int RunPerl(int argc, char **argv, char **env); @@ -301,15 +326,13 @@ typedef struct { } child_IO_table; DllExport void win32_get_child_IO(child_IO_table* ptr); +DllExport HWND win32_create_message_window(void); #ifndef USE_SOCKETS_AS_HANDLES extern FILE * my_fdopen(int, char *); #endif extern int my_fclose(FILE *); extern int my_fstat(int fd, Stat_t *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 char * win32_get_privlib(const char *pl); extern char * win32_get_sitelib(const char *pl); extern char * win32_get_vendorlib(const char *pl); @@ -353,6 +376,16 @@ typedef char * caddr_t; /* In malloc.c (core address). */ * Now Win32 specific per-thread data stuff */ +/* Leave the first couple ids after WM_USER unused because they + * might be used by an embedding application, and on Windows + * version before 2000 we might end up eating those messages + * if they were not meant for us. + */ +#define WM_USER_MIN (WM_USER+30) +#define WM_USER_MESSAGE (WM_USER_MIN) +#define WM_USER_KILL (WM_USER_MIN+1) +#define WM_USER_MAX (WM_USER_MIN+1) + struct thread_intern { /* XXX can probably use one buffer instead of several */ char Wstrerror_buffer[512]; @@ -371,12 +404,6 @@ struct thread_intern { 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; @@ -384,6 +411,15 @@ typedef struct { HANDLE handles[MAXIMUM_WAIT_OBJECTS]; } child_tab; +#ifdef USE_ITHREADS +typedef struct { + long num; + DWORD pids[MAXIMUM_WAIT_OBJECTS]; + HANDLE handles[MAXIMUM_WAIT_OBJECTS]; + HWND message_hwnds[MAXIMUM_WAIT_OBJECTS]; +} pseudo_child_tab; +#endif + #ifndef Sighandler_t typedef Signal_t (*Sighandler_t) (int); #define Sighandler_t Sighandler_t @@ -397,12 +433,11 @@ struct interp_intern { child_tab * children; #ifdef USE_ITHREADS DWORD pseudo_id; - child_tab * pseudo_children; + pseudo_child_tab * pseudo_children; #endif void * internal_host; -#ifndef USE_5005THREADS struct thread_intern thr_intern; -#endif + HWND message_hwnd; UINT timerid; unsigned poll_count; Sighandler_t sigtable[SIG_SIZE]; @@ -426,44 +461,20 @@ DllExport int win32_async_check(pTHX); #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_pseudo_child_message_hwnds (w32_pseudo_children->message_hwnds) #define w32_internal_host (PL_sys_intern.internal_host) #define w32_timerid (PL_sys_intern.timerid) +#define w32_message_hwnd (PL_sys_intern.message_hwnd) #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) -#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) -# define w32_use_showwindow (thr->i.Wuse_showwindow) -# define w32_showwindow (thr->i.Wshowwindow) -#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) -# define w32_use_showwindow (PL_sys_intern.thr_intern.Wuse_showwindow) -# define w32_showwindow (PL_sys_intern.thr_intern.Wshowwindow) -#endif /* USE_5005THREADS */ - -/* UNICODE<>ANSI translation helpers */ -/* Use CP_ACP when mode is ANSI */ -/* Use CP_UTF8 when mode is UTF8 */ - -#define A2WHELPER_LEN(lpa, alen, lpw, nBytes)\ - (lpw[0] = 0, MultiByteToWideChar((IN_BYTES) ? CP_ACP : CP_UTF8, 0, \ - lpa, alen, lpw, (nBytes/sizeof(WCHAR)))) -#define A2WHELPER(lpa, lpw, nBytes) A2WHELPER_LEN(lpa, -1, lpw, nBytes) - -#define W2AHELPER_LEN(lpw, wlen, lpa, nChars)\ - (lpa[0] = '\0', WideCharToMultiByte((IN_BYTES) ? CP_ACP : CP_UTF8, 0, \ - lpw, wlen, (LPSTR)lpa, nChars,NULL,NULL)) -#define W2AHELPER(lpw, lpa, nChars) W2AHELPER_LEN(lpw, -1, lpa, nChars) - -#define USING_WIDE() (PL_widesyscalls && PerlEnv_os_id() == VER_PLATFORM_WIN32_NT) +#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) #ifdef USE_ITHREADS # define PERL_WAIT_FOR_CHILDREN \ @@ -483,6 +494,9 @@ DllExport int win32_async_check(pTHX); #ifdef PERL_CORE /* C doesn't like repeat struct definitions */ +#if defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION>=3) +#undef _CRTIMP +#endif #ifndef _CRTIMP #define _CRTIMP __declspec(dllimport) #endif @@ -548,12 +562,28 @@ EXTERN_C _CRTIMP ioinfo* __pioinfo[]; #if !defined(ECONNABORTED) && defined(WSAECONNABORTED) #define ECONNABORTED WSAECONNABORTED #endif +#if !defined(ECONNRESET) && defined(WSAECONNRESET) +#define ECONNRESET WSAECONNRESET +#endif #if !defined(EAFNOSUPPORT) && defined(WSAEAFNOSUPPORT) #define EAFNOSUPPORT WSAEAFNOSUPPORT #endif +/* Why not needed for ECONNREFUSED? --abe */ -DllExport PerlInterpreter *win32_signal_context(void); +DllExport void *win32_signal_context(void); #define PERL_GET_SIG_CONTEXT win32_signal_context() +#ifdef UNDER_CE +#define Win_GetModuleHandle XCEGetModuleHandleA +#define Win_GetProcAddress XCEGetProcAddressA +#define Win_GetModuleFileName XCEGetModuleFileNameA +#define Win_CreateSemaphore CreateSemaphoreW +#else +#define Win_GetModuleHandle GetModuleHandle +#define Win_GetProcAddress GetProcAddress +#define Win_GetModuleFileName GetModuleFileName +#define Win_CreateSemaphore CreateSemaphore +#endif + #endif /* _INC_WIN32_PERL5 */