Re: user32:PrivateExtractIcons{AW} take 2

[Uwe Bonnes]

> > > > > "Rolf" == Rolf Kalbermatter <rolf.kalbermatter(a)citeng.com> writes:

Rolf> I'm sorry for having sent earlier patches which seemed to be
    Rolf> garbled with line breaks. I'll try again and hope they come
    Rolf> through ok this time, otherwise I probably have to find a new
    Rolf> email client ;-)

Hallo Rolf,

this patch make a treeview in Xilinx Webpack miss it's icons.

If I change back the return value in ICO_ExtractIconExW around line 360 to S_OK
( you changed it to (icon - nIconIndex)) the icons reappear.

The sequence with the missing icons is (with a little more debugging instrumentation):
trace:icon:PrivateExtractIconsA
"G:\\DOSC\\XILINX~1\\DATA\\PROJNAV\\IMAGE\\MEMFILE.ICO" 0 32x32 0x41aac1a0 (nil) 1 0x00000000
trace:icon:PrivateExtractIconsW
L"G:\\DOSC\\XILINX~1\\DATA\\PROJNAV\\IMAGE\\MEMFILE.ICO" 0 32x32 0x41aac1a0 (nil) 1 0x00000000
trace:icon:ICO_ExtractIconExW
L"G:\\DOSC\\XILINX~1\\DATA\\PROJNAV\\IMAGE\\MEMFILE.ICO", 0, 1 (nil) 0x00000000
trace:icon:USER32_GetResourceTable 0x41c80000 0x406c27ec
trace:icon:ICO_ExtractIconExW -- OS2/icon Signature (0x00000001)
trace:icon:ICO_GetIconDirectory 0x41c80000 0x406c27e4
trace:icon:ICO_ExtractIconExW -- icon found 0x41ada380 0x00000014 0x00000001 0x00000001
trace:icon:ICO_LoadIcon 0x41c80000 0x41c80006 size 0x00000128 ret 0x41c80016
trace:icon:PrivateExtractIconsW ret 0x00000001 pIconId 0x00000000
trace:icon:PrivateExtractIconsA ret 0x00000001

and here after changing back the return value to S_OK
trace:icon:PrivateExtractIconsA
"G:\\DOSC\\XILINX~1\\DATA\\PROJNAV\\IMAGE\\MEMFILE.ICO" 0 32x32 0x41ac3d50 (nil) 1 0x00000000
trace:icon:PrivateExtractIconsW
L"G:\\DOSC\\XILINX~1\\DATA\\PROJNAV\\IMAGE\\MEMFILE.ICO" 0 32x32 0x41ac3d50 (nil) 1 0x00000000
trace:icon:ICO_ExtractIconExW
L"G:\\DOSC\\XILINX~1\\DATA\\PROJNAV\\IMAGE\\MEMFILE.ICO", 0, 1 (nil) 0x00000000
trace:icon:USER32_GetResourceTable 0x41c80000 0x406c27ec
trace:icon:ICO_ExtractIconExW -- OS2/icon Signature (0x00000001)
trace:icon:ICO_GetIconDirectory 0x41c80000 0x406c27e4
trace:icon:ICO_ExtractIconExW -- icon found 0x41ad89e8 0x00000014 0x00000001 0x00000001
trace:icon:ICO_LoadIcon 0x41c80000 0x41c80006 size 0x00000128 ret 0x41c80016
trace:icon:PrivateExtractIconsW ret 0x00000000 pIconId 0x00000000
trace:icon:PrivateExtractIconsA ret 0x00000000
trace:icon:CURSORICON_ExtCopy hIcon 0x606, nType 1, iDesiredCX 16,
iDesiredCY 16, nFlags 16384
trace:icon:CURSORICON_ExtCopy LR_COPYFROMRESOURCE: Failed to load from cache
trace:icon:DestroyIcon32 (04ee, 0004)

Bye

-- 
Uwe Bonnes                bon(a)elektron.ikp.physik.tu-darmstadt.de

Institut fuer Kernphysik  Schlossgartenstrasse 9  64289 Darmstadt
--------- Tel. [phone] -------- Fax. [phone] ----------

user32:PrivateExtractIcons{AW} take 2

[Uwe Bonnes]

> > > > > "Uwe" == Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes:
> > > > > "Rolf" == Rolf Kalbermatter <rolf.kalbermatter(a)citeng.com> writes:
> > > > >     Rolf> I'm sorry for having sent earlier patches which seemed to be
> > > > >     Rolf> garbled with line breaks. I'll try again and hope they come
> > > > >     Rolf> through ok this time, otherwise I probably have to find a new
> > > > >     Rolf> email client ;-)

Uwe> Hallo Rolf,

    Uwe> this patch make a treeview in Xilinx Webpack miss it's icons.

The problem is still there after the round of updates this evening. To get
icons in the treeview no I must change the return value in line378 in
exticon to S_OK.

Bye
-- 
Uwe Bonnes                bon(a)elektron.ikp.physik.tu-darmstadt.de

Institut fuer Kernphysik  Schlossgartenstrasse 9  64289 Darmstadt
--------- Tel. [phone] -------- Fax. [phone] ----------