summaryrefslogtreecommitdiffstats
path: root/win/tclWin32Dll.c
diff options
context:
space:
mode:
authorhobbs <hobbs@noemail.net>1999-12-09 14:44:09 (GMT)
committerhobbs <hobbs@noemail.net>1999-12-09 14:44:09 (GMT)
commit15145e7864c6b32c532f94f61d9a36b0016bc43d (patch)
treed04f841fb433c9c7df6658ec08903cf37d61291a /win/tclWin32Dll.c
parent216c3d901c60c691718ff224308c398d0b696e2b (diff)
downloadtcl-15145e7864c6b32c532f94f61d9a36b0016bc43d.zip
tcl-15145e7864c6b32c532f94f61d9a36b0016bc43d.tar.gz
tcl-15145e7864c6b32c532f94f61d9a36b0016bc43d.tar.bz2
* win/tclWin32Dll.c:
* win/tclWinChan.c: * win/tclWinFCmd.c: * win/tclWinInit.c: * win/tclWinPipe.c: * win/tclWinSock.c: removed all code that supported Win32s. It was no longer officially supported, and likely didn't work anyway. * win/makefile.vc: removed 16 bit stuff, cleaned up. * win/tcl16.rc: * win/tclWin16.c: * win/winDumpExts.c: these files have been removed from the source tree (no longer necessary to build) * win/aclocal.m4: made it just include tcl.m4 FossilOrigin-Name: 28cb1be105858fd6a29f6bed329d046c9819b0aa
Diffstat (limited to 'win/tclWin32Dll.c')
-rw-r--r--win/tclWin32Dll.c29
1 files changed, 5 insertions, 24 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 349e770..eb43771 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -1,5 +1,4 @@
/*
-
* tclWin32Dll.c --
*
* This file contains the DLL entry point which sets up the 32-to-16-bit
@@ -10,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWin32Dll.c,v 1.7 1999/04/23 01:57:23 stanton Exp $
+ * RCS: @(#) $Id: tclWin32Dll.c,v 1.8 1999/12/09 14:44:10 hobbs Exp $
*/
#include "tclWinInt.h"
@@ -185,18 +184,6 @@ DllMain(hInst, reason, reserved)
{
switch (reason) {
case DLL_PROCESS_ATTACH:
- if (hInstance != NULL) {
- /*
- * Prevents DLL from being loaded multiple times under Win32s,
- * since all copies of the DLL share the same data segment and
- * Tcl isn't set up to handle that. Under NT or 95, each time
- * the DLL is loaded, it gets its own private copy of the data
- * segment.
- */
-
- return FALSE;
- }
-
TclWinInit(hInst);
return TRUE;
@@ -344,18 +331,12 @@ TclWinInit(hInst)
platformId = os.dwPlatformId;
/*
- * The following code stops Windows 3.x from automatically putting
- * up Sharing Violation dialogs, e.g, when someone tries to
- * access a file that is locked or a drive with no disk in it.
- * Tcl already returns the appropriate error to the caller, and they
- * can decide to put up their own dialog in response to that failure.
- *
- * Under 95 and NT, the system doesn't automatically put up dialogs
- * when the above operations fail.
+ * We no longer support Win32s, so just in case someone manages to
+ * get a runtime there, make sure they know that.
*/
if (platformId == VER_PLATFORM_WIN32s) {
- SetErrorMode(SetErrorMode(0) | SEM_FAILCRITICALERRORS);
+ panic("Win32s is not a supported platform");
}
tclWinProcs = &asciiProcs;
@@ -371,7 +352,7 @@ TclWinInit(hInst)
*
* Results:
* The return value is one of:
- * VER_PLATFORM_WIN32s Win32s on Windows 3.1.
+ * VER_PLATFORM_WIN32s Win32s on Windows 3.1. (not supported)
* VER_PLATFORM_WIN32_WINDOWS Win32 on Windows 95.
* VER_PLATFORM_WIN32_NT Win32 on Windows NT
*