diff options
| author | Tye McQueen <tye@metronet.com> | 1998-01-03 18:30:57 -0600 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-01-04 17:55:19 +0000 |
| commit | 22fae026e9f4859841088a1c5609be12b0b1d4f3 (patch) | |
| tree | 886f66b343fc6b88a3dfb291906a4993faa9db03 /win32 | |
| parent | 2d7a92375815264badaef23c612657cbd4799f31 (diff) | |
| download | perl-22fae026e9f4859841088a1c5609be12b0b1d4f3.tar.gz | |
[win32] Add a tweaked version of:
Message-Id: <199801040630.AA29298@metronet.com>
Subject: New patch for $^E==GetLastError() under Win32
p4raw-id: //depot/win32/perl@392
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makedef.pl | 2 | ||||
| -rw-r--r-- | win32/win32.c | 27 | ||||
| -rw-r--r-- | win32/win32.h | 1 |
3 files changed, 30 insertions, 0 deletions
diff --git a/win32/makedef.pl b/win32/makedef.pl index 27bcf95295..ddf01fdab8 100644 --- a/win32/makedef.pl +++ b/win32/makedef.pl @@ -508,6 +508,8 @@ win32_alarm win32_open_osfhandle win32_get_osfhandle win32_ioctl +win32_wait +win32_str_os_error Perl_win32_init Perl_init_os_extras Perl_getTHR diff --git a/win32/win32.c b/win32/win32.c index b965629383..cd67fff2bf 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1068,6 +1068,33 @@ win32_strerror(int e) return strerror(e); } +DllExport void +win32_str_os_error(SV *sv, unsigned long dwErr) +{ + DWORD dwLen; + char *sMsg; + dwLen = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER + |FORMAT_MESSAGE_IGNORE_INSERTS + |FORMAT_MESSAGE_FROM_SYSTEM, NULL, + dwErr, 0, (char *)&sMsg, 1, NULL); + if (0 < dwLen) { + while (0 < dwLen && isspace(sMsg[--dwLen])) + ; + if ('.' != sMsg[dwLen]) + dwLen++; + sMsg[dwLen]= '\0'; + } + if (0 == dwLen) { + sMsg = LocalAlloc(0, 64/**sizeof(TCHAR)*/); + dwLen = sprintf(sMsg, + "Unknown error #0x%lX (lookup 0x%lX)", + dwErr, GetLastError()); + } + sv_setpvn(sv, sMsg, dwLen); + LocalFree(sMsg); +} + + DllExport int win32_fprintf(FILE *fp, const char *format, ...) { diff --git a/win32/win32.h b/win32/win32.h index 8075ee7389..0edaad9d52 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -159,6 +159,7 @@ extern char * getlogin(void); DllExport void Perl_win32_init(int *argcp, char ***argvp); DllExport void Perl_init_os_extras(void); +DllExport void win32_str_os_error(struct sv *s, DWORD err); #ifndef USE_SOCKETS_AS_HANDLES extern FILE * my_fdopen(int, char *); |