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

Re: WINE-NB.BLOCK
by Rüdiger Koerschulte 13 Dec '05

13 Dec '05

> Hello, > > I`m sorry, but my English is not so good, but I`m trying to get an answer > about: > > I have installed SUSE 10.0, then WINE and then WINETOOLS. and the IE6. Now, > when I press the key comma, on the numeric-block, I get the remove > function. When I press die remove function an the cursor-block, I get a > comma. > > The function is always the same. It is the same when I put the > numeric-block on or off. > > How I can get a comma on the right key? > > Thank you for your understanding for my schoolenglish! > > Rüdiger

1 0

cross-compile error
by Steven Edwards 13 Dec '05

13 Dec '05

Hi, When doing Cross-Compiles I am seeing this error ../../include/wine/exception.h:142: error: parse error before "sigjmp_buf" ../../include/wine/exception.h:142: warning: no semicolon at end of struct or union ../../include/wine/exception.h:146: error: parse error before '}' token ../../include/wine/exception.h:146: warning: type defaults to `int' in declaration of `__WINE_FRAME' ../../include/wine/exception.h:146: warning: data definition has no type or storage class It seems the detection of sigjmp longjmp is busted for cross-compiling. I am using this patch locally but don't know how to properly fix it. Index: include/wine/exception.h =================================================================== RCS file: /home/wine/wine/include/wine/exception.h,v retrieving revision 1.26 diff -u -r1.26 exception.h --- include/wine/exception.h 1 Sep 2004 17:36:04 -0000 1.26 +++ include/wine/exception.h 13 Dec 2005 18:03:58 -0000 @@ -139,7 +139,7 @@ /* finally data */ __WINE_FINALLY finally_func; } u; - sigjmp_buf jmp; + jmp_buf jmp; /* hack to make GetExceptionCode() work in handler */ DWORD ExceptionCode; const struct __tagWINE_FRAME *ExceptionRecord; -- Steven Edwards - ReactOS and Wine developer "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: gethostbyname(my_name) and IL2-Sturmovik
by David Nolden 13 Dec '05

13 Dec '05

@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

4 6

Latest winetest (20051212) issue on WinXP
by Paul Vriens 13 Dec '05

13 Dec '05

Hi, I've just noticed that during the running of winetest.exe windows creates a nice desktop stating that 'Active Desktop' is stopped because an unexpected error occurred. Anyone? Paul.

2 1

Re: WINED3D / D3D9: SetVertexShader & SetPixelShader should not change the shader's refcount
by Oliver Stieber 13 Dec '05

13 Dec '05

--- "H. Verbeet" <hverbeet(a)gmail.com> wrote: > SetVertexShader & SetPixelShader should not change the shader's > refcount. Verified on win2k, DirectX 9.0c. > > Changelog: > - Don't change the shader's refcount in SetVertexShader & SetPixelShader > > 26c6ae144caaaa6f7e40f7a7c6e3059851819ecf > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index c3a7f9c..a9c253f 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -3761,7 +3761,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetVer > > HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShader(IWineD3DDevice *iface, IWineD3DVertexShader* > pShader) { > IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; > - IWineD3DVertexShader *oldShader = This->updateStateBlock->vertexShader; > > This->updateStateBlock->vertexShader = pShader; > This->updateStateBlock->changed.vertexShader = TRUE; > @@ -3772,20 +3771,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer > return D3D_OK; > } > > - if (pShader != NULL) { > - IUnknown *newVertexShaderParent; > - /* GetParent will add a ref, so leave it hanging until the vertex buffer is cleared */ > - TRACE("(%p) : setting pShader(%p)\n", This, pShader); > - IWineD3DVertexShader_GetParent(pShader, &newVertexShaderParent); > - } else { > - TRACE("Clear down the shader\n"); > - } > - if (oldShader != NULL) { > - IUnknown *oldVertexShaderParent; > - IWineD3DVertexShader_GetParent(oldShader, &oldVertexShaderParent); > - IUnknown_Release(oldVertexShaderParent); > - IUnknown_Release(oldVertexShaderParent); > - } > + TRACE("(%p) : setting pShader(%p)\n", This, pShader); The best thing to do is add an internal reference instead of referencing the parent. e.g. if (pShader != NULL) { IWineD3DVertexShader_AddRef(pShader); } if (oldShader != NULL) { IWineD3DVertexShader_Release(oldShader); } ___________________________________________________________ NEW Yahoo! Cars - sell your car and browse thousands of new and used cars online! http://uk.cars.yahoo.com/

2 1

Re: WINED3D / D3D9: SetVertexShader & SetPixelShader should not change the shader's refcount
by Oliver Stieber 13 Dec '05

13 Dec '05

--- "H. Verbeet" <hverbeet(a)gmail.com> wrote: > SetVertexShader & SetPixelShader should not change the shader's > refcount. Verified on win2k, DirectX 9.0c. > > Changelog: > - Don't change the shader's refcount in SetVertexShader & SetPixelShader > > 26c6ae144caaaa6f7e40f7a7c6e3059851819ecf > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index c3a7f9c..a9c253f 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -3761,7 +3761,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetVer > > HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShader(IWineD3DDevice *iface, IWineD3DVertexShader* > pShader) { > IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; > - IWineD3DVertexShader *oldShader = This->updateStateBlock->vertexShader; > > This->updateStateBlock->vertexShader = pShader; > This->updateStateBlock->changed.vertexShader = TRUE; > @@ -3772,20 +3771,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer > return D3D_OK; > } > > - if (pShader != NULL) { > - IUnknown *newVertexShaderParent; > - /* GetParent will add a ref, so leave it hanging until the vertex buffer is cleared */ > - TRACE("(%p) : setting pShader(%p)\n", This, pShader); > - IWineD3DVertexShader_GetParent(pShader, &newVertexShaderParent); > - } else { > - TRACE("Clear down the shader\n"); > - } > - if (oldShader != NULL) { > - IUnknown *oldVertexShaderParent; > - IWineD3DVertexShader_GetParent(oldShader, &oldVertexShaderParent); > - IUnknown_Release(oldVertexShaderParent); > - IUnknown_Release(oldVertexShaderParent); > - } > + TRACE("(%p) : setting pShader(%p)\n", This, pShader); The best thing to do is add an internal reference e.g. if (pShader != NULL) { IWineD3DVertexShader_AddRef(pShader) IWineD3DVertexShader_Release(oldShader) ___________________________________________________________ NEW Yahoo! Cars - sell your car and browse thousands of new and used cars online! http://uk.cars.yahoo.com/

1 0

BUG (3920) + sync between DIBs and X Server optimisation. (please help)
by Marinescu-Ghetau Iulian 13 Dec '05

13 Dec '05

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) The changes i was talking about are listed below! My free time is very limited and i would strongly appreciate some help, moustly because something is not working ;( and i didn't manage to figure out what... -added member to X_PHYSBITMAP: XRectangle modified_rect; -added 2 functions: /*********************************************************************** * X11DRV_SetBoundRect */ void X11DRV_SetBoundRect(X_PHYSBITMAP *physBitmap, INT x, INT y, INT width, INT height) { XRectangle *t; INT xMin,yMin,xMax,yMax; if (!physBitmap) return; t = &(physBitmap->modified_rect); if ( t->width && t->height && /*already a valid rect inside*/ width && height ) /*not trying to invalidate rect*/ { //calculate the union of the two rectangles xMin = ((t->x < x)?t->x:x); yMin = ((t->y < y)?t->y:y); xMax = ((t->x + t->width > x + width)?(t->x + t->width):(x + width)); yMax = ((t->y + t->height > y + height)?(t->y + t->height):(y + height)); t->x = xMin; t->y = yMin; t->width = xMax - xMin; t->height = yMax - yMin; } else { t->x = x; t->y = y; t->width = width; t->height = height; } TRACE("(%p,%d,%d,%d,%d)\n", physBitmap->hbitmap, t->x, t->y, t->width, t->height); } /*********************************************************************** * X11DRV_GetBoundRect */ UINT X11DRV_GetBoundRect(X_PHYSBITMAP *physBitmap, INT *x, INT *y, INT *width, INT *height) { DIBSECTION dib; XRectangle *t; if (!physBitmap || GetObjectW( physBitmap->hbitmap, sizeof(dib), &dib ) != sizeof(dib)) { ERR("called for non-DIBSection!?\n"); return 1; } t = &(physBitmap->modified_rect); /* we should check for oversize values */ if ( (t->width > 0) && (t->height > 0) && (t->x < dib.dsBm.bmWidth) && (t->y < dib.dsBm.bmHeight) ) { *x = t->x; *y = t->y; if (t->x + t->width > dib.dsBm.bmWidth) *width = dib.dsBm.bmWidth - t->x; else *width = t->width; if (t->y + t->height > dib.dsBm.bmHeight) *height = dib.dsBm.bmHeight - t->y; else *height = t->height; } else { *x = 0; *y = 0; *width = dib.dsBm.bmWidth; *height = dib.dsBm.bmHeight; } TRACE("(%p,%d,%d,%d,%d)\n", physBitmap->hbitmap, *x, *y, *width, *height); return 0; } -changed X11DRV_DIB_DoUpdateDIBSection like this: static void X11DRV_DIB_DoUpdateDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB) { INT x,y,width,height; if ( X11DRV_GetBoundRect(physBitmap,&x,&y,&width,&height) ) return; /*invalidate bound rect*/ X11DRV_SetBoundRect(physBitmap,0,0,0,0); X11DRV_DIB_DoCopyDIBSection(physBitmap, toDIB, physBitmap->colorMap, physBitmap->nColorMap, physBitmap->pixmap, x, y, x, y, // i think something is wrong here (help?) width, height); } - 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 ); } result = BITBLT_InternalStretchBlt( physDevDst, xDst, yDst, width, height, physDevSrc, xSrc, ySrc, width, height, rop ); END: if (physDevDst != physDevSrc) X11DRV_UnlockDIBSection( physDevSrc, FALSE ); X11DRV_UnlockDIBSection( physDevDst, TRUE );

2 2

Re: http headers reworking
by Alexandre Julliard 13 Dec '05

13 Dec '05

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

2 1

Can't install mdac at all now
by Dan Kegel 13 Dec '05

13 Dec '05

Bug 3636 is worse now. http://bugs.winehq.org/show_bug.cgi?id=3636 A few weeks ago, after mdac installer finished, I could go and unpack the installed cabs by hand. Now the installer aborts before it even copies the cabs. Bleah. -- Wine for Windows ISVs: http://kegel.com/wine/isv

3 3

freetype and wine
by Curro Amores 13 Dec '05

13 Dec '05

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!

1 0