X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Fwinjump.c;h=eca5041a8dfa949da3e91321d494ffcf354c95c6;hb=9f9d72ec58642e91b4f93ee4405a8086ee2fb2f0;hp=abefe445dcfcbce2f4207f2e4136a79181e79e3f;hpb=b99bec3b02d79c6902f50cfa616eebaee43536f6;p=PuTTY.git

diff --git a/windows/winjump.c b/windows/winjump.c
index abefe445..eca5041a 100644
--- a/windows/winjump.c
+++ b/windows/winjump.c
@@ -353,12 +353,12 @@ static const PROPERTYKEY PKEY_Title = {
     0x00000002
 };
 
-/* Type-checking macro to provide arguments for CoCreateInstance() etc.
- * The pointer arithmetic is a compile-time pointer type check that 'obj'
- * really is a 'type **', but is intended to have no effect at runtime. */
+/* Type-checking macro to provide arguments for CoCreateInstance()
+ * etc, ensuring that 'obj' really is a 'type **'. */
+#define typecheck(checkexpr, result) \
+    (sizeof(checkexpr) ? (result) : (result))
 #define COMPTR(type, obj) &IID_##type, \
-    (void **)(void *)((obj) + (sizeof((obj)-(type **)(obj))) \
-		            - (sizeof((obj)-(type **)(obj))))
+    typecheck((obj)-(type **)(obj), (void **)(void *)(obj))
 
 static char putty_path[2048];
 
@@ -429,7 +429,11 @@ static IShellLink *make_shell_link(const char *appname,
     ret->lpVtbl->SetPath(ret, app_path);
 
     if (sessionname) {
-        param_string = dupcat("@", sessionname, NULL);
+        /* The leading space is reported to work around a Windows 10
+         * behaviour change in which an argument string starting with
+         * '@' causes the SetArguments method to silently do the wrong
+         * thing. */
+        param_string = dupcat(" @", sessionname, NULL);
     } else {
         param_string = dupstr("");
     }