From a463bf5525ce6e43141d98abc3b996e0226b8fe0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 8 Apr 2021 08:45:12 +0000
Subject: Backport dde 1.4.4 from Tcl 8.7. Doesn't conflict with installed Tcl
 9.0 version of dde any more. (don't bother doing this for the "registry"
 extension, because the Tcl 8.7+ version installs in a different directory)

---
 changes                  |  4 ++--
 library/dde/pkgIndex.tcl | 13 +++++++++----
 tests/winDde.test        |  4 ++--
 win/Makefile.in          |  2 +-
 win/makefile.vc          |  2 +-
 win/tclWinDde.c          |  2 +-
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/changes b/changes
index f662037..f41dd58 100644
--- a/changes
+++ b/changes
@@ -8972,8 +8972,8 @@ improvements to regexp engine from Postgres (lane,porter,fellows,seltenreich)
 2020-02-25 (bug) release refs when setting class's superclasses fails (dkf)
 
 2020-02-26 (bug) C++ compiler compatibility for registry and dde (nijtmans)
-=> registry 1.4.3
-=> dde 1.3.5
+=> registry 1.3.5
+=> dde 1.4.3
 
 2020-03-05 (new) Update to Unicode-13 (nijtmans)
 
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl
index 1ca9c5a..18ac517 100644
--- a/library/dde/pkgIndex.tcl
+++ b/library/dde/pkgIndex.tcl
@@ -1,7 +1,12 @@
-if {![package vsatisfies [package provide Tcl] 8.5]} return
 if {[info sharedlibextension] != ".dll"} return
-if {[::tcl::pkgconfig get debug]} {
-    package ifneeded dde 1.4.3 [list load [file join $dir tcldde14g.dll] Dde]
+if {[package vsatisfies [package provide Tcl] 9.0-]} {
+    package ifneeded dde 1.4.4 \
+	    [list load [file join $dir tcl9dde14.dll] Dde]
+} elseif {![package vsatisfies [package provide Tcl] 8.7]
+	&& [::tcl::pkgconfig get debug]} {
+    package ifneeded dde 1.4.4 \
+	    [list load [file join $dir tcldde14g.dll] Dde]
 } else {
-    package ifneeded dde 1.4.3 [list load [file join $dir tcldde14.dll] Dde]
+    package ifneeded dde 1.4.4 \
+	    [list load [file join $dir tcldde14.dll] Dde]
 }
diff --git a/tests/winDde.test b/tests/winDde.test
index 9b5fd9e..d97ff84 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -20,7 +20,7 @@ testConstraint dde 0
 if {[testConstraint win]} {
     if {![catch {
 	    ::tcltest::loadTestedCommands
-	    set ::ddever [package require dde 1.4.3]
+	    set ::ddever [package require dde 1.4.4]
 	    set ::ddelib [info loaded "" Dde]}]} {
 	testConstraint dde 1
     }
@@ -104,7 +104,7 @@ proc createChildProcess {ddeServerName args} {
 # -------------------------------------------------------------------------
 test winDde-1.0 {check if we are testing the right dll} {win dde} {
     set ::ddever
-} {1.4.3}
+} {1.4.4}
 
 test winDde-1.1 {Settings the server's topic name} -constraints dde -body {
     list [dde servername foobar] [dde servername] [dde servername self]
diff --git a/win/Makefile.in b/win/Makefile.in
index 7af6901..688135f 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -155,7 +155,7 @@ REG_LIB_FILE		= @LIBPREFIX@tclreg$(REGVER)${DLLSUFFIX}${LIBSUFFIX}
 TEST_DLL_FILE		= tcltest$(VER)${DLLSUFFIX}
 TEST_EXE_FILE		= tcltest${EXESUFFIX}
 TEST_LIB_FILE		= @LIBPREFIX@tcltest$(VER)${DLLSUFFIX}${LIBSUFFIX}
-TEST_LOAD_PRMS		= package ifneeded dde 1.4.3 [list load [file normalize ${DDE_DLL_FILE}] Dde];\
+TEST_LOAD_PRMS		= package ifneeded dde 1.4.4 [list load [file normalize ${DDE_DLL_FILE}] Dde];\
 			  package ifneeded registry 1.3.5 [list load [file normalize ${REG_DLL_FILE}] Registry]
 TEST_LOAD_FACILITIES	= package ifneeded Tcltest ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}]];\
 			  $(TEST_LOAD_PRMS)
diff --git a/win/makefile.vc b/win/makefile.vc
index 60b6bf0..ad20fd1 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -451,7 +451,7 @@ test: test-core test-pkgs
 test-core: setup $(TCLTEST) dlls $(CAT32)
 	set TCL_LIBRARY=$(ROOT:\=/)/library
 	$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
-		package ifneeded dde 1.4.3 [list load "$(TCLDDELIB:\=/)" Dde]
+		package ifneeded dde 1.4.4 [list load "$(TCLDDELIB:\=/)" Dde]
 		package ifneeded registry 1.3.5 [list load "$(TCLREGLIB:\=/)" Registry]
 <<
 
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 2fc4990..2570954 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -79,7 +79,7 @@ static DWORD ddeInstance;	/* The application instance handle given to us
 				 * by DdeInitialize. */
 static int ddeIsServer = 0;
 
-#define TCL_DDE_VERSION		"1.4.3"
+#define TCL_DDE_VERSION		"1.4.4"
 #define TCL_DDE_PACKAGE_NAME	"dde"
 #define TCL_DDE_SERVICE_NAME	L"TclEval"
 #define TCL_DDE_EXECUTE_RESULT	L"$TCLEVAL$EXECUTE$RESULT"
-- 
cgit v0.12