missing propsheet fault

lawson_whitney at juno.com lawson_whitney at juno.com
Tue Dec 18 16:47:03 CST 2001


Good day!

Juno version 2 needs this or something like it.  I've attached a
backtrace of what it does without the patch.  It worked not long ago, so
if you want to be charitable you could call this fixing a regression.

ChangeLog:

	* dlls/comctl32/propsheet.c:
	Lawson Whitney <lawson_whitney at juno.com>
	If there is no psInfo, it doesn't need to be cleaned up.

Lawson
-------------- next part --------------
diff -urN was/dlls/comctl32/propsheet.c is/dlls/comctl32/propsheet.c
--- was/dlls/comctl32/propsheet.c	Fri Aug 24 22:41:47 2001
+++ is/dlls/comctl32/propsheet.c	Tue Dec 18 16:45:59 2001
@@ -1902,11 +1902,13 @@
  */
 static void PROPSHEET_CleanUp(HWND hwndDlg)
 {
-  int i;
-  PropSheetInfo* psInfo = (PropSheetInfo*) RemovePropA(hwndDlg,
+ int i;
+ PropSheetInfo* psInfo = (PropSheetInfo*) RemovePropA(hwndDlg,
                                                        PropSheetInfoStr);
 
-  TRACE("\n");
+ TRACE("\n");
+ if (psInfo)
+ {
   if (HIWORD(psInfo->ppshheader.pszCaption))
       HeapFree(GetProcessHeap(), 0, (LPVOID)psInfo->ppshheader.pszCaption);
 
@@ -1931,6 +1933,7 @@
   ImageList_Destroy(psInfo->hImageList);
 
   GlobalFree((HGLOBAL)psInfo);
+ }
 }
 
 /******************************************************************************
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bt.gz
Type: application/octet-stream
Size: 2042 bytes
Desc: 
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20011218/73219f3d/bt.obj


More information about the wine-patches mailing list