OLEPictureImpl_Load: fix for headerless pictures

[Fabian Cenedese]

At 12:58 06.02.2004 -0500, Kirill Smelkov wrote:
>On Fri, 6 Feb 2004, Fabian Cenedese wrote:
>
>[...]
>> >I can't help you until i see how your app is supposed to work.
>> >Please make sure the programm runs without (header[1]==0).
>>
>> That's the point, it doesn't work on wine in the current state. That's why
>> I try to fix wine. Use my patch (even if it's wrong for your progs) then
>> my app should come up and you can test what's going on.
>> This bug in wine prevents many VB apps from running on wine. And as
>> we have some of them I tried to fix it.
>
>Maybe i missed something (is so, i'm sorry), but where do i get your
>patches?

I sent it to wine-devel, but I can't access winehq at the moment (down?)
so here it is again. It's just jumping out if header [1] is 0 (which works
for me but I guess it's wrong for your programs).


Index: dlls/oleaut32/olepicture.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/olepicture.c,v
retrieving revision 1.30
diff -u -r1.30 olepicture.c
--- dlls/oleaut32/olepicture.c  5 Sep 2003 23:08:33 -0000       1.30
+++ dlls/oleaut32/olepicture.c  29 Jan 2004 16:19:25 -0000
@@ -873,6 +873,9 @@
   hr=IStream_Read(pStm,header,8,&xread);
   if (hr || xread!=8) {
       FIXME("Failure while reading picture header (hr is %lx, nread is %ld).\n",hr,xread);
+      return hr;
+  }
+  if (header[1]==0) {
       return hr;
   }
   if (header[1] > statstg.cbSize.QuadPart) {/* Incorrect header, assume none. */

bye  Fabi