December 2005 - Wine-Devel - list.winehq.org

Re: gethostbyname(my_name) and IL2-Sturmovik

by Pavel Troller

> @Pavel Troller > I've checkt the /etc/hosts now. You were right, it says > > 127.0.0.1 localhost.localdomain localhost Zwirch > > (With Zwirch the Name of this Computer) > > But I can't just statically rewrite it, because I use DHCP. Also this is a > fresh Ubuntu-Install, so I'm surely not the only > Wine-User with such an /etc/hosts.. > Hi ! Yes, I know that *MANY* well-known distros are wrong with /etc/hosts and similar files.. The trick is that specifying your hostname for localhost interface improves Linux functionality in the case that there isn't other network interface active. Otherwise, a plenty of services would not work locally. However, when a real network interface comes up, it should be changed and moved to the line with a real IP address, which is not so obvious in the real world... I think that it is NOT GOOD to patch wine to fix this case; it behaves absolutely correctly and all the problem should be solved by correctly configuring your Linux networking. Please see any good document about naming principles of network interfaces. With regards, Pavel Troller

Dec. 13, 2005

Re: BUG (3920) + sync between DIBs and X Server optimisation. (please help)

by Marinescu-Ghetau Iulian

Yeah, i also belive putting the modifying rect in Coerce is better, when i first made the changes i just wanted to modify as little as possible and add things without modifying the already existing code too much, keeping it clean. I also belive i am doing something wrong: I noticed that in X11DRV_DIB_CopyDIBSection() function created to optimise bitblt(), the sync is done this way: X11DRV_DIB_DoCopyDIBSection(physBitmap, FALSE, colorMap, nColorMap, physDevDst->drawable, xSrc, ySrc, physDevDst->org.x + xDest, physDevDst->org.y + yDest, width, height); They take in consideration the (org.x,org.y) in the physical device! I don't understand too well what a physical devise exactly is, and i was wondering if i am not mistaking when i sync like this in X11DRV_DIB_DoUpdateDIBSection(): X11DRV_DIB_DoCopyDIBSection(physBitmap, toDIB, physBitmap->colorMap, physBitmap->nColorMap, physBitmap->pixmap, x, y, x, y, width, height); and not taking in consideration the origins of the device? Iulian >From: Robert Shearman <rob(a)codeweavers.com> >To: Marinescu-Ghetau Iulian <giulian2003(a)hotmail.com> >CC: wine-devel(a)winehq.org >Subject: Re: BUG (3920) + sync between DIBs and X Server optimisation. >(please help) >Date: Mon, 12 Dec 2005 11:07:20 -0600 > >Marinescu-Ghetau Iulian wrote: > >>I came to the conclusion that the slowness in "Heroes IV" it has to do >>with >>sync'ing lage bitmaps between application DIBs and X Server(see the log: >>http://bugs.winehq.org/attachment.cgi?id=1470&action=view ). >> >>Also, a complete description of the bug is here: >>http://bugs.winehq.org/show_bug.cgi?id=3902 >> >>So i had this ideea that every GDI function could memorise the rectangle >>that is modifying, so each time a sync between DIB and X Server is needed, >>only a small part from the bitmap will get copied! I also made some >>changes to dib.c, bitblt.c and x11drv.h in "wine-0.9.2\dlls\x11drv" folder >>to implement my ideea, keeping backwards compatibility (if a DIB function >>doesn't set a valid rectangle for the bitmap that its modifying, the >>default values are taken - which is the entire bitmap) >> >> > >>- and finally, a GDI function calls it like this (for example bitblt): >> >> X11DRV_SetBoundRect(physDevDst->bitmap,xDst,yDst,width,height); >> X11DRV_CoerceDIBSection( physDevDst, DIB_Status_GdiMod, FALSE ); >> if (physDevDst != physDevSrc) >> { >> X11DRV_SetBoundRect(physDevSrc->bitmap,xSrc,ySrc,width,height); >> X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod, FALSE ); >> } > > >I think it would be better to make X11DRV_CoerceDIBSection take the >parameters for a bounding rect, otherwise it is possible to forget a call >to SetBoundRect and cause the DIB to not be updated. > >-- >Rob Shearman >

Dec. 13, 2005

Re: http headers reworking

by Aric Stewart

How odd, I just applied only the patch i sent and rebuilt my tree and all the tests pass just fine for me. I will try with a totally clean tree but that will take a while to build. I will ask you offline maybe for wininet logs to see where it is failing. -aric Alexandre Julliard wrote: >Aric Stewart <aric(a)codeweavers.com> writes: > > > >>Redo how headers are handled. >>eliminating the concept of Standard Headers and allow all headers to be >>added multiple times. >>Allow querying of headers with an index to get the multiple headers. >>Respect response vs request headers in HttpQueryInfo. >>Add a number of tests to extensively test header adding and replacing. >>All fixes for Picasa. >> >> > >The tests don't work here: > >http.c:1152: Test failed: Index was not incremented >http.c:1156: Test failed: Second Index Should Not Exist >http.c:1167: Test failed: Index was not incremented >http.c:1168: Test failed: incorrect string was returned(test2) >http.c:1173: Test failed: Index was not incremented >http.c:1177: Test failed: Third Header Should Not Exist >http.c:1187: Test failed: Index was not incremented >http.c:1188: Test failed: incorrect string was returned(test3) >http.c:1193: Test failed: Index was not incremented >http.c:1197: Test failed: Third Header Should Not Exist >http.c:1207: Test failed: Index was not incremented >http.c:1208: Test failed: incorrect string was returned(test3) >http.c:1213: Test failed: Index was not incremented >http.c:1217: Test failed: Third Header Should Not Exist >http.c:1227: Test failed: Index was not incremented >http.c:1228: Test failed: incorrect string was returned(test4) >http.c:1232: Test failed: Index was not incremented >http.c:1233: Test failed: incorrect string was returned(test4) >http.c:1236: Test failed: Third Header Should Not Exist >http.c:1244: Test failed: Index was not incremented >http.c:1245: Test failed: incorrect string was returned(test5) >http.c:1249: Test failed: Index was not incremented >http.c:1250: Test failed: incorrect string was returned(test5) >http.c:1253: Test failed: Third Header Should Not Exist >http.c:1261: Test failed: Index was not incremented >http.c:1262: Test failed: incorrect string was returned(test6) >http.c:1266: Test failed: Index was not incremented >http.c:1267: Test failed: incorrect string was returned(test6) >http.c:1270: Test failed: Third Header Should Not Exist >http.c:1278: Test failed: Index was not incremented >http.c:1279: Test failed: incorrect string was returned(test7) >http.c:1283: Test failed: Index was not incremented >http.c:1287: Test failed: Third Header Should Not Exist > > >

Dec. 13, 2005

Re: Can't install mdac at all now

by Markus Amsler

Dan Kegel wrote: >>Markus is working on a better implementation >> >> > >Any ETA? I guess I'll stop worrying, if he's going to get that area >working, he'll fix this regression anyway. >- Dan > > I'm mainly working on the advpack install functions. I'll have a look at the regression, but don't expect anything too soon (days to weeks, not months). Markus

Dec. 13, 2005

Re: gethostbyname(my_name) and IL2-Sturmovik

by David Nolden

@Pavel Troller I've checkt the /etc/hosts now. You were right, it says 127.0.0.1 localhost.localdomain localhost Zwirch (With Zwirch the Name of this Computer) But I can't just statically rewrite it, because I use DHCP. Also this is a fresh Ubuntu-Install, so I'm surely not the only Wine-User with such an /etc/hosts.. @Juan You're right, I've checked the patch and it indeed was ugly! But when I sent it I hadn't done the check under Windows, so I didn't know if the patch was generally useful, so I mainly ment it as a piece for discussion.(Also I didn't notice how ugly it really was ;) I've cleaned it up a bit, closed the leak, and did a few other small tweaks so now the patch itself might be acceptable. greetings, David Am Dienstag, 13. Dezember 2005 07:04 schrieb Pavel Troller: > > Ok, I've just checked doing the same thing under windows. > > > > The test(ripdaveno is the name of the Computer I tested on): > > > > { > > ... > > hostent* h = gethostbyname("ripdaveno"); > > char* str = inet_ntoa(*((in_addr*)h->h_addr_list[0])); > > ... > > } > > > > The string in str was "192.168.2.75" which is my Network IP-Adress. With > > wine(under Linux), as far as I've tested it, exactly the same code always > > generates "127.0.0.1". > > > > Since Wine tries to simulate Windows as exactly as possible, this is > > wrong. So, in my opinion this Patch is necessary. :-) > > Hi! > It's strange but there is no patch in this mail I can look at... > However, even more strange is that wine returns localhost address to > you... Why ? I just tested Your testing code (just slightly modified to get > it to compile) on both plain linux as well as in wine and in both cases it > returns my real public IP. Isn't your Linux networking setup (/etc/hosts > table) a bit wrong ? My one contains (arcus is my machine name) > > 127.0.0.1 localhost > 195.39.17.7 arcus.sinus.cz arcus > > I have already seen broken setups containing things like > > 127.0.0.1 localhost arcus > > which is of course wrong. > > Regards, Pavel Troller

Dec. 13, 2005

Re: http headers reworking

by Alexandre Julliard

Aric Stewart <aric(a)codeweavers.com> writes: > Redo how headers are handled. > eliminating the concept of Standard Headers and allow all headers to be > added multiple times. > Allow querying of headers with an index to get the multiple headers. > Respect response vs request headers in HttpQueryInfo. > Add a number of tests to extensively test header adding and replacing. > All fixes for Picasa. The tests don't work here: http.c:1152: Test failed: Index was not incremented http.c:1156: Test failed: Second Index Should Not Exist http.c:1167: Test failed: Index was not incremented http.c:1168: Test failed: incorrect string was returned(test2) http.c:1173: Test failed: Index was not incremented http.c:1177: Test failed: Third Header Should Not Exist http.c:1187: Test failed: Index was not incremented http.c:1188: Test failed: incorrect string was returned(test3) http.c:1193: Test failed: Index was not incremented http.c:1197: Test failed: Third Header Should Not Exist http.c:1207: Test failed: Index was not incremented http.c:1208: Test failed: incorrect string was returned(test3) http.c:1213: Test failed: Index was not incremented http.c:1217: Test failed: Third Header Should Not Exist http.c:1227: Test failed: Index was not incremented http.c:1228: Test failed: incorrect string was returned(test4) http.c:1232: Test failed: Index was not incremented http.c:1233: Test failed: incorrect string was returned(test4) http.c:1236: Test failed: Third Header Should Not Exist http.c:1244: Test failed: Index was not incremented http.c:1245: Test failed: incorrect string was returned(test5) http.c:1249: Test failed: Index was not incremented http.c:1250: Test failed: incorrect string was returned(test5) http.c:1253: Test failed: Third Header Should Not Exist http.c:1261: Test failed: Index was not incremented http.c:1262: Test failed: incorrect string was returned(test6) http.c:1266: Test failed: Index was not incremented http.c:1267: Test failed: incorrect string was returned(test6) http.c:1270: Test failed: Third Header Should Not Exist http.c:1278: Test failed: Index was not incremented http.c:1279: Test failed: incorrect string was returned(test7) http.c:1283: Test failed: Index was not incremented http.c:1287: Test failed: Third Header Should Not Exist -- Alexandre Julliard julliard(a)winehq.org

Dec. 13, 2005

Re: PATCH: handle NULL XImage in GetBitmapBits

by Alexandre Julliard

Marcus Meissner <marcus(a)jet.franken.de> writes: > Changelog: > In GetBitmapBits() handle the correct bitmap information > when a DIB is used. I think for a DIB we want to copy the bits directly, like we already do in SetBitmapBits. Does this work for you? diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c index a0c6b25..5c2b6c3 100644 --- a/dlls/gdi/bitmap.c +++ b/dlls/gdi/bitmap.c @@ -307,6 +307,30 @@ LONG WINAPI GetBitmapBits( if (!bmp) return 0; + if (bmp->dib) /* simply copy the bits from the DIB */ + { + DIBSECTION *dib = bmp->dib; + const char *src = dib->dsBm.bmBits; + DWORD max = dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; + if (count > max) count = max; + ret = count; + if (!bits) goto done; + + if (bmp->dib->dsBmih.biHeight >= 0) /* not top-down, need to flip contents vertically */ + { + src += dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; + while (count > 0) + { + src -= dib->dsBm.bmWidthBytes; + memcpy( bits, src, min( count, dib->dsBm.bmWidthBytes ) ); + bits = (char *)bits + dib->dsBm.bmWidthBytes; + count -= dib->dsBm.bmWidthBytes; + } + } + else memcpy( bits, src, count ); + goto done; + } + /* If the bits vector is null, the function should return the read size */ if(bits == NULL) { -- Alexandre Julliard julliard(a)winehq.org

Dec. 13, 2005

Re: Wine: DirectDraw over Direct3D

by Roderick Colenbrander

> > What is slow with ATI cards? Â It seems that you should only need basic > 3D > > acceleration to do what you propose. Â Is fglrx missing something that > would > > be required for 2D rendering? > Texture upload is very slow. glReadPixels, glWritePixels and friends take > ages. That means that blt, Lock, and Unlock is really slow. > There is some hope at least: Xine and Mplayer can play videos over OpenGL > really fast, maybe we can find out how they do it. > > Stefan Indeed glReadPixels and glWritePixels might be slow using the Ati drivers but those calls weren't used for the texture uploading. For that purpose just glTexImage2D / glTexSubImage2D calls were used. If texture uploading was slow on the Ati drivers people would be unable to play games ;) Roderick -- GMX DSL-Flatrate 1 Jahr kostenlos* + WLAN-Router ab 0,- Euro* Bis 31.12.2005 einsteigen! Infos unter: http://www.gmx.net/de/go/dsl

Dec. 13, 2005

freetype and wine

by Curro Amores

Hi: I get everytime i want to display a report on my access97 app this error: fixme:font:load_VDMX Failed to retreive vTable Then the fonts of the report are displayed separated and bigger than on windows. Somebody told me to install freetype new version. I have installed the last version of freetype2 (9.8.3) and it keeps on the same. Do i have to do something for telling wine to use the new version of freetype? Im using windows98 emulation in wine for this app. Has it something to do that i have moved all windows xp ttf files to fonts fake directory?? Thanks all!

Dec. 13, 2005

Re: Wine: DirectDraw over Direct3D

by Stefan Dösinger

Am Dienstag, 13. Dezember 2005 04:25 schrieb Aric Cyr: > What is slow with ATI cards? It seems that you should only need basic 3D > acceleration to do what you propose. Is fglrx missing something that would > be required for 2D rendering? Texture upload is very slow. glReadPixels, glWritePixels and friends take ages. That means that blt, Lock, and Unlock is really slow. There is some hope at least: Xine and Mplayer can play videos over OpenGL really fast, maybe we can find out how they do it. Stefan

Dec. 13, 2005