dlls/shell32/cpanelfolder.c

[Ge van Geldorp]

Changelog:
  Fix quoting of .cpl filename

Index: dlls/shell32/cpanelfolder.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/cpanelfolder.c,v
retrieving revision 1.12
diff -u -r1.12 cpanelfolder.c
--- dlls/shell32/cpanelfolder.c	14 Jan 2005 16:02:20 -0000	1.12
+++ dlls/shell32/cpanelfolder.c	8 Feb 2005 16:27:56 -0000
@@ -983,11 +983,13 @@
 	return E_INVALIDARG;
 
     path[0] = '\"';
-    l = 1 + MultiByteToWideChar(CP_ACP, 0, pcpanel->szName, -1, path+1, MAX_PATH);
+    /* Return value from MultiByteToWideChar includes terminating NUL, which
+     * compensates for the starting double quote we just put in */
+    l = MultiByteToWideChar(CP_ACP, 0, pcpanel->szName, -1, path+1, MAX_PATH);
 
     /* pass applet name to Control_RunDLL to distinguish between applets in one .cpl file */
-    path[++l] = '"';
-    path[++l] = ' ';
+    path[l++] = '"';
+    path[l++] = ' ';
 
     MultiByteToWideChar(CP_ACP, 0, pcpanel->szName+pcpanel->offsDispName, -1, path+l, MAX_PATH);