merge core-8-6-branch. Undo changes to coffbase.txt (they cause overlap with Tk)winFixes

6 files changed, 10 insertions, 10 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 28ffe0a..066e6b1 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -81,7 +81,7 @@ CFLAGS_OPTIMIZE	= @CFLAGS_OPTIMIZE@
 #CFLAGS = 		$(CFLAGS_DEBUG)
 #CFLAGS = 		$(CFLAGS_OPTIMIZE)
 #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE
+CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE -D_ATL_XP_TARGETING
 
 # To compile without backward compatibility and deprecated code uncomment the
 # following
diff --git a/win/coffbase.txt b/win/coffbase.txt
index 0142bb3..3314f26 100644
--- a/win/coffbase.txt
+++ b/win/coffbase.txt
@@ -13,8 +13,8 @@
 ; linker with the `-base:@$(TCLDIR)\win\coffbase.txt,<key>` option.

 

 tcl		0x10000000	0x00200000

-tcldde		0x10200000	0x00020000

-tclreg		0x10210000	0x00020000

+tcldde		0x10200000	0x00010000

+tclreg		0x10210000	0x00010000

 tk		0x10220000	0x00200000

 expect		0x10480000	0x00080000

 itcl		0x10500000	0x00080000

diff --git a/win/rules.vc b/win/rules.vc
index cd06e96..e12854d 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -159,7 +159,7 @@ DEBUGFLAGS     = $(DEBUGFLAGS) -RTC1
 DEBUGFLAGS     = $(DEBUGFLAGS) -GZ

 !endif

 

-COMPILERFLAGS  =-W3 -DUNICODE -D_UNICODE -D_USING_V110_SDK71_=1

+COMPILERFLAGS  =-W3 /DUNICODE /D_UNICODE /D_ATL_XP_TARGETING

 

 # In v13 -GL and -YX are incompatible.

 !if [nmakehlp -c -YX]

diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 4d7500b..6662327 100755
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -3166,8 +3166,8 @@ TclWinFileOwned(
            case we are in all likelihood not the owner */
         return 0;
     }
-        
-    /* 
+
+    /*
      * Getting the current process SID is a multi-step process.
      * We make the assumption that if a call fails, this process is
      * so underprivileged it could not possibly own anything. Normally
@@ -3191,10 +3191,10 @@ TclWinFileOwned(
         LocalFree(secd);            /* Also frees ownerSid */
     if (buf)
         ckfree(buf);
-    
+
     return (owned != 0);        /* Convert non-0 to 1 */
 }
-    
+
 /*
  * Local Variables:
  * mode: c
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 382addd..4666deb 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -1337,7 +1337,7 @@ ApplicationType(
 	Tcl_DStringFree(&ds);
 
 	ext = strrchr(fullName, '.');
-	if ((ext != NULL) && 
+	if ((ext != NULL) &&
             (strcasecmp(ext, ".cmd") == 0 || strcasecmp(ext, ".bat") == 0)) {
 	    applType = APPL_DOS;
 	    break;
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index b486466..159a708 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -360,7 +360,7 @@ typedef DWORD_PTR * PDWORD_PTR;
 #   define S_IFLNK        0120000  /* Symbolic Link */
 #endif
 
-/* 
+/*
  * Windows compilers do not define S_IFBLK. However, Tcl uses it in
  * GetTypeFromMode to identify blockSpecial devices based on the
  * value in the statsbuf st_mode field. We have no other way to pass this