May 2007 - Wine-devel - list.winehq.org

Re: shell32: check result of HeapAlloc(), revised
by James Hawkins 13 May '07

13 May '07

On 5/13/07, hto(a)mail.cnt.ru <hto(a)mail.cnt.ru> wrote: > Add an ERR() messages, save an indentation level. > > --- wine-0.9.37-orig/dlls/shell32/dataobject.c 2007-05-13 10:16:18.000000000 +0000 > +++ wine-0.9.37/dlls/shell32/dataobject.c 2007-05-13 10:51:50.000000000 +0000 > @@ -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

2 1

Re: shell32: check result of HeapAlloc()
by James Hawkins 13 May '07

13 May '07

On 5/12/07, hto(a)mail.cnt.ru <hto(a)mail.cnt.ru> wrote: > > --- wine-0.9.37-orig/dlls/shell32/folders.c 2007-05-12 22:53:06.000000000 +0000 > +++ wine-0.9.37/dlls/shell32/folders.c 2007-05-13 00:17:00.000000000 +0000 > @@ -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. -- James Hawkins

2 2

Re: check for This->clipper before unreferencing in dlls/ddraw/surface.c
by Andrew Riedi 12 May '07

12 May '07

Perhaps give an example? "Please include a one-liner in your email stating what you did. Example: changelog: I fixed function X that was causing bug Y. Note: There is no need to edit the ChangeLog file itself." How is the above? -- Andrew Riedi

2 1

Re: check for This->clipper before unreferencing in dlls/ddraw/surface.c
by Tony Lambregts 12 May '07

12 May '07

Vincent Fourmond wrote: > Stefan Dösinger wrote: >> also you do not have to >> modify the ChangeLog file, git does that automatically when AJ commits the >> patch. > > I just followed the instructions on > http://winehq.org/site/sending_patches. If they are not correct, please > update this page. > >From that page ----8<--- When submitting patches, please: * Include a ChangeLog entry with your real name, email address and a description of what your patch does. ---->8---- Thats says nothings about a diff of the ChangeLog. I do not know how I would change the wording of that. -- Tony Lambregts

1 0

msi: undo RegisterProduct/PublishProduct
by Misha Koshelev 12 May '07

12 May '07

Hi, I am starting to write some automation conformance tests for things that I could check only after a package has been installed (and before it was removed) like ProductInfo and RelatedProducts. I've added the install functionality into the conformance test, and it works beautifully on Windows, cleaning up after itself every time both by deleting all the installed files and also doing an MsiInstallPackage/Installer::InstallPackage call with REMOVE=ALL options which gets rid of all the information published by RegisterProduct/PublishProduct, thus allowing the ProductState to go back to being INSTALLSTATE_UNKNOWN afterwards. However, in wine the tests run fine the first time, but then the REMOVE=ALL call does not seem to remove the registry data (in fact I'm not sure this functionality is present under Wine msi yet). Is there any way to properly remove the registry data about the application under Wine MSI in my conformance test without just manually clearing out the appropriate registry values, and would this be considered to be kosher? Thanks Misha

2 2

Internet explorer not detected
by Louis Lenders 12 May '07

12 May '07

Hi, i tried help this dude on IRC channel getting an application to run called MegaSpoof. Even after creating fake registry key it kept complaining about missing Internet Explorer. After looking through the +relay log i found this: 000d:Call KERNEL32.CreateProcessW(00000000,0034f428 L"c:\\Program Files\\Internet Explorer\\iexplore.exe -Embedding",0000000 0,00000000,00000000,00000000,00000000,00000000,0034f7d8,0034f828) ret=77f1d75f 000d:Ret KERNEL32.CreateProcessW() retval=00000000 ret=77f1d75f In current wine a simple "wine "c:\Program Files\Internet Explorer\iexplore.exe"" just fails , because we don't have that directory. After manually creating it , and copy iexplore.exe.so to /Program Files/Internet Explorer/iexplore.exe, the application didn't complain anymore, and got further. Question: do we need to mimic windows behaviour, and create that directory + put wine's iexplore in it, or is the policy that in this case we just have to download MS ie6, and install that (as the application suggested)

5 5

Re: check for This->clipper before unreferencing in dlls/ddraw/surface.c
by Stefan Dösinger 12 May '07

12 May '07

Am Samstag 12 Mai 2007 15:00 schrieb Vincent Fourmond: > (IDirectDrawSurfaceImpl_SetClipper): fixes segfault at HMMIV startup. > --- > ChangeLog | 6 ++++++ > dlls/ddraw/surface.c | 5 +++-- > 2 files changed, 9 insertions(+), 2 deletions(-) Now that wined3d stores the clipper, the surface->clipper member should be removed and GetClipper and SetClipper should use wined3dsurface::getclipper and Setclipper(like setpalette and getpalette does). also you do not have to modify the ChangeLog file, git does that automatically when AJ commits the patch. Also please stick to the formating of the rest of the file / function. Here you used tabs instead of spaces for indention.

2 1

Re: PATCH - implement LockWorkStation using xdg-screensaver
by Steven Edwards 12 May '07

12 May '07

Hi Hans, On 5/12/07, Hans Leidekker <hans(a)it.vu.nl> wrote: > How about the following patch? I added an option --lock to wineboot > which does an execvp using the Unix search path. LockWorkStation > then calls CreateProcess on "wineboot --lock", analogous to what > ExitWindowsEx does. Thanks a lot. I just checked and LockWorkStation now properly handles the call from ProcessExplorer. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Re: PATCH - implement LockWorkStation using xdg-screensaver
by Steven Edwards 12 May '07

12 May '07

Hi Hans, On 5/12/07, Hans Leidekker <hans(a)it.vu.nl> wrote: > How about the following patch? I added an option --lock to wineboot > which does an execvp using the Unix search path. LockWorkStation > then calls CreateProcess on "wineboot --lock", analogous to what > ExitWindowsEx does. > > When running in a virtual desktop we should probably give precedence > to a Windows screensaver. > > Changelog > Implement LockWorkStation using xdg-screensaver. Your patch seems like a much better method to me. I'll merge in to my tree and test with Process Explorer tonight. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Re: [PATCH] no wined3ddevice - no surface
by Stefan Dösinger 12 May '07

12 May '07

Am Samstag 12 Mai 2007 16:20 schrieb Marcus Meissner: > Hi, > > If wineD3DDevice is not set, than do return > failure (and do not reference NULL ifaces). Actually the ddraw object shouldn't be createable in the first place without a wined3d device object. Or do you want to modify ddraw to do something without wined3d?

2 1