Re: shell32: check result of HeapAlloc()
On 5/13/07, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:
James Hawkins wrote:
On 5/12/07, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:
--- wine-0.9.37-orig/dlls/shell32/folders.c 2007-05-12
22:53:06.0 +
+++ wine-0.9.37/dlls/shell32/folders.c 2007-05-13 00:17:00.0
+
@@ -81,11 +81,15 @@ IExtractIconW* IExtractIconW_Constructor
TRACE(%p\n, pidl);
ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl));
- ei-ref=1;
- ei-lpVtbl = eivt;
- ei-lpvtblPersistFile = pfvt;
- ei-lpvtblExtractIconA = eiavt;
- ei-pidl=ILClone(pidl);
+
+ if (ei)
+ {
+ ei-ref=1;
+ ei-lpVtbl = eivt;
+ ei-lpvtblPersistFile = pfvt;
+ ei-lpvtblExtractIconA = eiavt;
+ ei-pidl=ILClone(pidl);
+ }
If a HeapAlloc call fails, you need to return with the appropriate error.
It is already done in ISF_ControlPanel_fnGetUIObjectOf(),
IShellFolder_fnGetUIObjectOf(), ISF_Desktop_fnGetUIObjectOf(),
ISF_MyComputer_fnGetUIObjectOf().
...
pObj = (LPUNKNOWN) IExtractIconW_Constructor(pidl);
...
if (SUCCEEDED(hr) !pObj)
hr = E_OUTOFMEMORY;
...
return hr;
Then you need to add an ERR message that the alloc failed, and return
immediately. It'll save an indentation level.
ei = HeapAlloc();
if (!ei)
{
ERR(HeapAlloc failed blah blah\n);
return NULL;
}
--
James Hawkins
problems regression testing/compiling wine
I'm having problems regression testing between 0.9.15 and 0.9.37. On 3+ bisects I keep getting the following error and wine won't compile. /home/eric/wine/dlls/winex11.drv/palette.c:866: undefined reference to `GDI_ReleaseObj' palette.o:/home/eric/wine/dlls/winex11.drv/palette.c:881: more undefined references to `GDI_ReleaseObj' follow palette.o: In function `X11DRV_RealizePalette': /home/eric/wine/dlls/winex11.drv/palette.c:1251: undefined reference to `GDI_GetObjPtr' /home/eric/wine/dlls/winex11.drv/palette.c:1253: undefined reference to `GDI_ReleaseObj' collect2: ld returned 1 exit status winegcc: gcc failed. make[2]: *** [winex11.drv.so] Error 2 make[2]: Leaving directory `/home/eric/wine/dlls/winex11.drv' make[1]: *** [winex11.drv] Error 2 make[1]: Leaving directory `/home/eric/wine/dlls' make: *** [dlls] Error 2 _ More photos, more messages, more storageget 2GB with Windows Live Hotmail. http://imagine-windowslive.com/hotmail/?locale=en-usocid=TXT_TAGHM_migration_HM_mini_2G_0507
Re: shell32: check result of HeapAlloc(), revised
On 5/13/07, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:
Add an ERR() messages, save an indentation level.
--- wine-0.9.37-orig/dlls/shell32/dataobject.c 2007-05-13 10:16:18.0
+
+++ wine-0.9.37/dlls/shell32/dataobject.c 2007-05-13 10:51:50.0
+
@@ -169,27 +169,29 @@ static const IEnumFORMATETCVtbl efvt =
LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[])
{
-IEnumFORMATETCImpl* ef;
-DWORD size=cfmt * sizeof(FORMATETC);
+ IEnumFORMATETCImpl* ef;
+ DWORD size=cfmt * sizeof(FORMATETC);
Please don't change the indentation. You have to stick with whatever
indentation exists for the file you're editing.
--
James Hawkins
Re: problems regression testing/compiling wine
EA Durbin schreef: I'm having problems regression testing between 0.9.15 and 0.9.37. On 3+ bisects I keep getting the following error and wine won't compile. Most of the time when this happens you forget to do a make distclean first. It is recommended to use ccache and do a 'make distclean' every time time. Maarten
Re: problems regression testing/compiling wine
E winegcc: gcc failed. make[2]: *** [winex11.drv.so] Error 2 make[2]: Leaving directory `/home/eric/wine/dlls/winex11.drv' make[1]: *** [winex11.drv] Error 2 make[1]: Leaving directory `/home/eric/wine/dlls' make: *** [dlls] Error 2 _ More photos, more messages, more storageget 2GB with Windows Live Hotmail. http://imagine-windowslive.com/hotmail/?locale=en-usocid=TXT_TAGHM_migration_HM_mini_2G_0507 I think git clean -x should work too
Re: shell32: check result of HeapAlloc(), revised
James Hawkins wrote: Please don't change the indentation. You have to stick with whatever indentation exists for the file you're editing. I have changed the indentation of IEnumFORMATETC_Constructor() and IDataObject_Constructor() to be more consistent with the rest of dataobject.c, which uses different indentation style.
Re: problems regression testing/compiling wine
No, that doesn't help, i've tried distclean, git clean -x, the usual make clean, and nothing works. Regression testing seems borked passed two bisects. From: Louis Lenders [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: Re: problems regression testing/compiling wine Date: Sun, 13 May 2007 14:05:42 + (UTC) E winegcc: gcc failed. make[2]: *** [winex11.drv.so] Error 2 make[2]: Leaving directory `/home/eric/wine/dlls/winex11.drv' make[1]: *** [winex11.drv] Error 2 make[1]: Leaving directory `/home/eric/wine/dlls' make: *** [dlls] Error 2 _ More photos, more messages, more storageÂget 2GB with Windows Live Hotmail. http://imagine-windowslive.com/hotmail/?locale=en-usocid=TXT_TAGHM_migration_HM_mini_2G_0507 I think git clean -x should work too _ Like the way Microsoft Office Outlook works? Youll love Windows Live Hotmail. http://imagine-windowslive.com/hotmail/?locale=en-usocid=TXT_TAGHM_migration_HM_mini_outlook_0507
Re: problems regression testing/compiling wine
EA Durbin ead1234 at hotmail.com writes: No, that doesn't help, i've tried distclean, git clean -x, the usual make clean, and nothing works. Regression testing seems borked passed two bisects. From: Louis Lenders xerox_xerox2000 at yahoo.co.uk To: wine-devel at winehq.com Subject: Re: problems regression testing/compiling wine Date: Sun, 13 May 2007 14:05:42 + (UTC) I know I had the same problem, and somehow i got around it, but i forgot how ;( maybe rm -rf */*/*.def from wine's source tree.
Re: [PATCH] some alsa midi fixes
On 5/13/07, Ralf Beck [EMAIL PROTECTED] wrote: Hello, this patch fixes: - Bug 8096 - incorrect handling of pitchbender on midi-in - add midi-in midiclock/start/stop/continue/spp/song sel - make midi-out midiclock/start/stop/continue/spp/song sel handling same style as on midi-in One fix per patch please. -- James Hawkins
LinuxConf Europe
Hi folks, I'm considering to send in a paper proposal for LinuxConf Europe 2007 (http://www.linuxconf.eu/2007/cfp/) talking about (my plans for) Wine / Samba integration. Is there anybody else planning to go there? How about a small meeting there, to practice for WineConf? ;) As far as my plans go, the wiki already lists some of the things, I'm planning to flesh this out a little more. Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developerhttp://wiki.winehq.org/KaiBlin Samba team member http://us1.samba.org/samba/team/ -- Will code for cotton. pgpeWwjEkOtPD.pgp Description: PGP signature
