diff options
author | stanton <stanton> | 1998-09-24 23:58:14 (GMT) |
---|---|---|
committer | stanton <stanton> | 1998-09-24 23:58:14 (GMT) |
commit | 9995355714bc90faf7c2e345b3d6a1d041447097 (patch) | |
tree | 2ad97c5b1994495118cef4df947cf16b55e326f2 /win/tclWin32Dll.c | |
parent | e13392595faf8e8d0d1c3c514ce160cfadc3d372 (diff) | |
download | tcl-9995355714bc90faf7c2e345b3d6a1d041447097.zip tcl-9995355714bc90faf7c2e345b3d6a1d041447097.tar.gz tcl-9995355714bc90faf7c2e345b3d6a1d041447097.tar.bz2 |
merging changes from 8.0.3 into 8.1a2
Diffstat (limited to 'win/tclWin32Dll.c')
-rw-r--r-- | win/tclWin32Dll.c | 103 |
1 files changed, 93 insertions, 10 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index acb431f..2584b71 100644 --- a/win/tclWin32Dll.c +++ b/win/tclWin32Dll.c @@ -1,4 +1,5 @@ /* + * tclWin32Dll.c -- * * This file contains the DLL entry point which sets up the 32-to-16-bit @@ -9,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tclWin32Dll.c 1.37 98/02/02 22:07:20 + * RCS: @(#) $Id: tclWin32Dll.c,v 1.1.2.2 1998/09/24 23:59:50 stanton Exp $ */ #include "tclWinInt.h" @@ -121,12 +122,16 @@ TclWinProcs *tclWinProcs; static Tcl_Encoding tclWinTCharEncoding; /* - * Declarations for functions that are only used in this file. + * The following declaration is for the VC++ DLL entry point. */ BOOL APIENTRY DllMain(HINSTANCE hInst, DWORD reason, LPVOID reserved); + +#ifdef __WIN32__ +#ifndef STATIC_BUILD + /* *---------------------------------------------------------------------- @@ -178,8 +183,6 @@ DllMain(hInst, reason, reserved) DWORD reason; /* Reason this function is being called. */ LPVOID reserved; /* Not used. */ { - OSVERSIONINFO os; - switch (reason) { case DLL_PROCESS_ATTACH: if (hInstance != NULL) { @@ -194,12 +197,7 @@ DllMain(hInst, reason, reserved) return FALSE; } - hInstance = hInst; - os.dwOSVersionInfoSize = sizeof(os); - GetVersionEx(&os); - platformId = os.dwPlatformId; - - tclWinProcs = &asciiProcs; + TclWinInit(hInst); return TRUE; case DLL_PROCESS_DETACH: @@ -211,6 +209,9 @@ DllMain(hInst, reason, reserved) return TRUE; } + +#endif /* !STATIC_BUILD */ +#endif /* __WIN32__ */ /* *---------------------------------------------------------------------- @@ -311,6 +312,88 @@ TclWinGetTclInstance() /* *---------------------------------------------------------------------- * + * TclWinInit -- + * + * This function initializes the internal state of the tcl library. + * + * Results: + * None. + * + * Side effects: + * Initializes the 16-bit thunking library, and the tclPlatformId + * variable. + * + *---------------------------------------------------------------------- + */ + +void +TclWinInit(hInst) + HINSTANCE hInst; /* Library instance handle. */ +{ + OSVERSIONINFO os; + + tclInstance = hInst; + os.dwOSVersionInfoSize = sizeof(os); + GetVersionEx(&os); + tclPlatformId = 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. + */ + + if (tclPlatformId == VER_PLATFORM_WIN32s) { + SetErrorMode(SetErrorMode(0) | SEM_FAILCRITICALERRORS); + } + + tclWinProcs = &asciiProcs; +} + +/* + *---------------------------------------------------------------------- + * + * TclpFinalize -- + * + * Clean up the Windows specific library state. + * + * Results: + * None. + * + * Side effects: + * Unloads any DLLs and cleans up the thunking library, if + * necessary. + * + *---------------------------------------------------------------------- + */ + +void +TclpFinalize() +{ + /* + * Unregister the Tcl thunk. + */ + + if (UTUnRegister != NULL) { + UTUnRegister(tclInstance); + UTUnRegister = NULL; + } + + /* + * Cleanup any dynamically loaded libraries. + */ + + UnloadLibraries(); +} + +/* + *---------------------------------------------------------------------- + * * TclWinGetPlatformId -- * * Determines whether running under NT, 95, or Win32s, to allow |