Oops - off by one error in CF_UNICODETEXT

petasis · Dec 26, 2024 · 37ef1fb · 37ef1fb
1 parent d6e2851
commit 37ef1fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/demos/dndSpy.tcl b/demos/dndSpy.tcl
@@ -6,7 +6,7 @@
 ## This file implements a drop target that is able to accept any type dropped.
 ##
 ## Check Tk version:
-package require Tk 8.3
+package require Tk 8.3-
 
 if {$::tcl_version == "8.3" && ![package vsatisfies $::tcl_patchLevel 8.3.3]} {
     tk_messageBox -type ok -icon error \

diff --git a/win/OleDND.h b/win/OleDND.h
@@ -225,7 +225,7 @@ inline Tcl_Size ObjToWinStringDS(Tcl_Obj *pObj, Tcl_DString *pDS) {
   const char *type_str = Tcl_GetStringFromObj(pObj, &type_len);
   WCHAR *wtype_str;
   Tcl_UtfToWCharDString(type_str, type_len, pDS);
-  return (Tcl_DStringLength(pDS)/sizeof(WCHAR)) - 1;
+  return (Tcl_DStringLength(pDS)/sizeof(WCHAR)); // Not including terminator
 };
 
 // Copy a Tcl_Obj to a WCHAR buffer. Always terminates the buffer.
@@ -245,7 +245,7 @@ inline Tcl_Size ObjToWinStringBuffer(Tcl_Obj *pObj, WCHAR *pBuf, Tcl_Size max_le
 // Always returns non-NULL. HGLOBAL must be GlobalFree'd.
 inline HGLOBAL ObjToWinStringHGLOBAL(Tcl_Obj *pObj) {
   Tcl_DString ds;
-  Tcl_Size len = ObjToWinStringDS(pObj, &ds);
+  Tcl_Size len = ObjToWinStringDS(pObj, &ds); // Does not include terminator
   WCHAR *to;
   HGLOBAL hGlobal = GlobalAlloc(GHND, (len+1) * sizeof(WCHAR));
   if (hGlobal == NULL) {