23 Nov
2003
23 Nov
'03
10:02 p.m.
Hallo,
Peter Heckert ph_newsalias@arcor.de posted on c.e.m.w a problem with Sigma Photo Pro 2. Sigma Photo Pro 2 can be downloaded at http://www.sigma-photo.co.jp/english/downloads/downloads.html
It seems that IS_STRING_ITEM( lpitem->fType ) is set while there is no lpitem->text.
Appended hack lets Sigma Photo Pro 2 run until exit, where it crashes again.
Can anybody look at that problem?
--
Uwe Bonnes bon@elektron.ikp.physik.tu-darmstadt.de
Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
Index: wine/controls/menu.c
===================================================================
RCS file: /home/wine/wine/controls/menu.c,v
retrieving revision 1.169
diff -u -r1.169 menu.c
--- wine/controls/menu.c 18 Nov 2003 19:42:31 -0000 1.169
+++ wine/controls/menu.c 23 Nov 2003 21:52:38 -0000
@@ -936,7 +936,7 @@
/* it must be a text item - unless it's the system menu */
- if (!(lpitem->fType & MF_SYSMENU) && IS_STRING_ITEM( lpitem->fType ))
+ if (!(lpitem->fType & MF_SYSMENU) && IS_STRING_ITEM( lpitem->fType )&& lpitem->text)
{ SIZE size;
GetTextExtentPoint32W(hdc, lpitem->text, strlenW(lpitem->text), &size);
@@ -1361,7 +1361,7 @@
}
/* No bitmap - process text if present */
- else if (IS_STRING_ITEM(lpitem->fType))
+ else if (IS_STRING_ITEM(lpitem->fType) && lpitem->text)
{
register int i;
HFONT hfontOld = 0;