commit 7293f00d9dccf1411ed84817755c6378377bbc33
author Alexandre Julliard <julliard@winehq.org> Thu Dec 13 13:48:00 2007 +0100
committer Alexandre Julliard <julliard@winehq.org> Thu Dec 13 14:30:40 2007 +0100
tree 94329955a0c4d7a4078b96b0f7263e684367e5ca
parent 9642714d0647481d72f1d0fb1bb36e79d8ad4a6d

hhctrl.ocx: Store a copy of the string pointers to enable freeing them without casting away const.

dlls/hhctrl.ocx/help.c

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index 85c076d..c49d3cf 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -922,16 +922,16 @@
         return;
 
     /* Free allocated strings */
-    heap_free((LPWSTR)info->WinType.pszType);
-    heap_free((LPWSTR)info->WinType.pszCaption);
-    heap_free((LPWSTR)info->WinType.pszToc);
-    heap_free((LPWSTR)info->WinType.pszIndex);
-    heap_free((LPWSTR)info->WinType.pszFile);
-    heap_free((LPWSTR)info->WinType.pszHome);
-    heap_free((LPWSTR)info->WinType.pszJump1);
-    heap_free((LPWSTR)info->WinType.pszJump2);
-    heap_free((LPWSTR)info->WinType.pszUrlJump1);
-    heap_free((LPWSTR)info->WinType.pszUrlJump2);
+    heap_free(info->pszType);
+    heap_free(info->pszCaption);
+    heap_free(info->pszToc);
+    heap_free(info->pszIndex);
+    heap_free(info->pszFile);
+    heap_free(info->pszHome);
+    heap_free(info->pszJump1);
+    heap_free(info->pszJump2);
+    heap_free(info->pszUrlJump1);
+    heap_free(info->pszUrlJump2);
 
     if (info->pCHMInfo)
         CloseCHM(info->pCHMInfo);
@@ -958,7 +958,7 @@
         return NULL;
     }
 
-    if (!LoadWinTypeFromCHM(info->pCHMInfo, &info->WinType)) {
+    if (!LoadWinTypeFromCHM(info)) {
         ReleaseHelpViewer(info);
         return NULL;
     }