summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-20 15:07:11 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-20 15:07:11 (GMT)
commit1e8a4963fc83ef2d17c80687752f64b435fc7d17 (patch)
tree8fa2019af9e5f3bf3e05723801791bad7cf5bd90
parentce1a26acf5a612948b42c39b61fdc255e6cc5f4d (diff)
parent2912ca25d8d1d4d98eb91eb015e1f623d46c5e64 (diff)
downloadtcl-1e8a4963fc83ef2d17c80687752f64b435fc7d17.zip
tcl-1e8a4963fc83ef2d17c80687752f64b435fc7d17.tar.gz
tcl-1e8a4963fc83ef2d17c80687752f64b435fc7d17.tar.bz2
Merge trunk
-rw-r--r--win/tclWinDde.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 0d76088..6fa9cc2 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -1109,7 +1109,7 @@ DdeClientWindowProc(
#ifdef _WIN64
SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR) es);
#else
- SetWindowLong(hwnd, GWL_USERDATA, (LONG) es);
+ SetWindowLongW(hwnd, GWL_USERDATA, (LONG) es);
#endif
return (LRESULT) 0L;
}
@@ -1136,7 +1136,7 @@ DdeServicesOnAck(
#ifdef _WIN64
es = (DdeEnumServices *) GetWindowLongPtrW(hwnd, GWLP_USERDATA);
#else
- es = (DdeEnumServices *) GetWindowLong(hwnd, GWL_USERDATA);
+ es = (DdeEnumServices *) GetWindowLongW(hwnd, GWL_USERDATA);
#endif
if (((es->service == (ATOM)0) || (es->service == service))