Fix errors in IExtractIcon detected by valgrind

Mike McCormack mike at codeweavers.com
Mon Sep 22 13:59:51 CDT 2003


ChangeLog:
* Fix errors in IExtractIcon detected by valgrind
-------------- next part --------------
Index: dlls/shell32/folders.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/folders.c,v
retrieving revision 1.39
diff -u -r1.39 folders.c
--- dlls/shell32/folders.c	5 Sep 2003 23:08:31 -0000	1.39
+++ dlls/shell32/folders.c	21 Sep 2003 15:26:34 -0000
@@ -192,7 +192,7 @@
 
 	  if (HCR_GetDefaultIconA(xriid, sTemp, MAX_PATH, &dwNr))
 	  {
-	    MultiByteToWideChar(CP_ACP, 0, sTemp, MAX_PATH, szIconFile, cchMax);
+	    MultiByteToWideChar(CP_ACP, 0, sTemp, -1, szIconFile, cchMax);
 	    *piIndex = dwNr;
 	  }
 	  else
@@ -206,7 +206,7 @@
 	{
 	  if (HCR_GetDefaultIconA("Drive", sTemp, MAX_PATH, &dwNr))
 	  {
-	    MultiByteToWideChar(CP_ACP, 0, sTemp, MAX_PATH, szIconFile, cchMax);
+	    MultiByteToWideChar(CP_ACP, 0, sTemp, -1, szIconFile, cchMax);
 	    *piIndex = dwNr;
 	  }
 	  else
@@ -219,7 +219,7 @@
 	{
 	  if (HCR_GetDefaultIconA("Folder", sTemp, MAX_PATH, &dwNr))
 	  {
-	    MultiByteToWideChar(CP_ACP, 0, sTemp, MAX_PATH, szIconFile, cchMax);
+	    MultiByteToWideChar(CP_ACP, 0, sTemp, -1, szIconFile, cchMax);
 	  }
 	  else
 	  {
@@ -241,7 +241,7 @@
 	    }
 	    else
 	    {
-	      MultiByteToWideChar(CP_ACP, 0, sTemp, MAX_PATH, szIconFile, cchMax);
+	      MultiByteToWideChar(CP_ACP, 0, sTemp, -1, szIconFile, cchMax);
 	      *piIndex = dwNr;
 	    }
 	  }


More information about the wine-patches mailing list