diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 3 | ||||
| -rw-r--r-- | win/makefile.bc | 1 | ||||
| -rw-r--r-- | win/makefile.vc | 3 | ||||
| -rw-r--r-- | win/tclWinFile.c | 80 |
4 files changed, 3 insertions, 84 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index ddcc921..d2ed35f 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.115 2007/03/23 18:45:40 kennykb Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.116 2007/06/28 21:24:58 dgp Exp $ VERSION = @TCL_VERSION@ @@ -244,7 +244,6 @@ GENERIC_OBJS = \ tclListObj.$(OBJEXT) \ tclLoad.$(OBJEXT) \ tclMain.$(OBJEXT) \ - tclMathOp.$(OBJEXT) \ tclNamesp.$(OBJEXT) \ tclNotify.$(OBJEXT) \ tclObj.$(OBJEXT) \ diff --git a/win/makefile.bc b/win/makefile.bc index 81bba54..97846d6 100644 --- a/win/makefile.bc +++ b/win/makefile.bc @@ -231,7 +231,6 @@ TCLOBJS = \ $(TMPDIR)\tclListObj.obj \ $(TMPDIR)\tclLoad.obj \ $(TMPDIR)\tclMain.obj \ - $(TMPDIR)\tclMathOp.obj \ $(TMPDIR)\tclNamesp.obj \ $(TMPDIR)\tclNotify.obj \ $(TMPDIR)\tclObj.obj \ diff --git a/win/makefile.vc b/win/makefile.vc index 9f6830e..4ea7135 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.160 2007/02/09 06:43:00 mistachkin Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.161 2007/06/28 21:24:58 dgp Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -291,7 +291,6 @@ TCLOBJS = \ $(TMP_DIR)\tclLiteral.obj \ $(TMP_DIR)\tclLoad.obj \ $(TMP_DIR)\tclMain.obj \ - $(TMP_DIR)\tclMathOp.obj \ $(TMP_DIR)\tclNamesp.obj \ $(TMP_DIR)\tclNotify.obj \ $(TMP_DIR)\tclObj.obj \ diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 7a276d4..2220062 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinFile.c,v 1.93 2007/05/05 07:23:18 dkf Exp $ + * RCS: @(#) $Id: tclWinFile.c,v 1.94 2007/06/28 21:24:58 dgp Exp $ */ /* #define _WIN32_WINNT 0x0500 */ @@ -2322,84 +2322,6 @@ FromCTime( fileTime->dwHighDateTime = convertedTime.HighPart; } -#if 0 -/* - *------------------------------------------------------------------------- - * - * TclWinResolveShortcut -- - * - * Resolve a potential Windows shortcut to get the actual file or - * directory in question. - * - * Results: - * Returns 1 if the shortcut could be resolved, or 0 if there was an - * error or if the filename was not a shortcut. If bufferPtr did hold the - * name of a shortcut, it is modified to hold the resolved target of the - * shortcut instead. - * - * Side effects: - * Loads and unloads OLE package to determine if filename refers to a - * shortcut. - * - *------------------------------------------------------------------------- - */ - -int -TclWinResolveShortcut( - Tcl_DString *bufferPtr) /* Holds name of file to resolve. On return, - * holds resolved file name. */ -{ - HRESULT hres; - IShellLink *psl; - IPersistFile *ppf; - WIN32_FIND_DATA wfd; - WCHAR wpath[MAX_PATH]; - char *path, *ext; - char realFileName[MAX_PATH]; - - /* - * Windows system calls do not automatically resolve shortcuts like UNIX - * automatically will with symbolic links. - */ - - path = Tcl_DStringValue(bufferPtr); - ext = strrchr(path, '.'); - if ((ext == NULL) || (stricmp(ext, ".lnk") != 0)) { - return 0; - } - - CoInitialize(NULL); - path = Tcl_DStringValue(bufferPtr); - realFileName[0] = '\0'; - hres = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, - &IID_IShellLink, &psl); - if (SUCCEEDED(hres)) { - hres = psl->lpVtbl->QueryInterface(psl, &IID_IPersistFile, &ppf); - if (SUCCEEDED(hres)) { - MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, sizeof(wpath)); - hres = ppf->lpVtbl->Load(ppf, wpath, STGM_READ); - if (SUCCEEDED(hres)) { - hres = psl->lpVtbl->Resolve(psl,NULL,SLR_ANY_MATCH|SLR_NO_UI); - if (SUCCEEDED(hres)) { - hres = psl->lpVtbl->GetPath(psl, realFileName, MAX_PATH, - &wfd, 0); - } - } - ppf->lpVtbl->Release(ppf); - } - psl->lpVtbl->Release(psl); - } - CoUninitialize(); - - if (realFileName[0] != '\0') { - Tcl_DStringSetLength(bufferPtr, 0); - Tcl_DStringAppend(bufferPtr, realFileName, -1); - return 1; - } - return 0; -} -#endif - /* *--------------------------------------------------------------------------- * |