- Wine-Devel - list.winehq.org

Re: Fix oleaut32/olepicture (2)
by Alexandre Julliard May 5, 2003

May 5, 2003

Maxime Bellengé <maxime.bellenge(a)laposte.net> writes: > + i = jd.output_width*jd.output_components; > + if ((i%sizeof(DWORD))>0) { > + padding = i%sizeof(DWORD); > + i += i%sizeof(DWORD); > + } else { > + padding = 0; > + } This is still wrong I'm afraid. -- Alexandre Julliard julliard(a)winehq.com

1 0

Windows API db script
by Dave Miller May 5, 2003

May 5, 2003

I have posted an update to the script. Francois Gouget sent a patch to fix a problem handling uppercase filenames. The patched script is now available. Thanks to those who have submitted .ref files. I have five versions so far. Now it is time to think about what kind of queries we want to be able to do...

7 8

Possible optimization with X11DRV_PALETTE_ToPhysical
by Uwe Bonnes May 5, 2003

May 5, 2003

Hallo, there are several loops in wine/graphics/x11drv/dib.c that call X11DRV_PALETTE_ToPhysical inside the loop. X11DRV_PALETTE_ToPhysical always does a GDI_GetObjPtr at entry and a Release at exit. E.g. with MS pinball.exe I sees a look querying 256 entries in a row. If we do the GDI_GetObjPtr/Release outside the loop and have a ..._ToPhysical call that takes palPtr we would save a loot those Get/ReleasePtr calls. Is this worth doing? I the approach below right? Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ---------- Index: wine/dlls/x11drv/x11drv.h =================================================================== RCS file: /home/wine/wine/dlls/x11drv/x11drv.h,v retrieving revision 1.1 diff -u -r1.1 x11drv.h --- wine/dlls/x11drv/x11drv.h 22 Apr 2003 04:05:08 -0000 1.1 +++ wine/dlls/x11drv/x11drv.h 5 May 2003 17:43:44 -0000 @@ -43,6 +43,8 @@ #include "user.h" #include "win.h" #include "thread.h" +#include "palette.h" +#include "windef.h" #define MAX_PIXELFORMATS 8 @@ -314,6 +316,7 @@ extern COLORREF X11DRV_PALETTE_ToLogical(int pixel); extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color); +extern int X11DRV_PALETTEOBJ_ToPhysical( DC *dc, HPALETTE hPal, PALETTEOBJ *palPtr, COLORREF color); /* GDI escapes */ Index: wine/graphics/x11drv/dib.c =================================================================== RCS file: /home/wine/wine/graphics/x11drv/dib.c,v retrieving revision 1.108 diff -u -r1.108 dib.c --- wine/graphics/x11drv/dib.c 31 Mar 2003 01:32:47 -0000 1.108 +++ wine/graphics/x11drv/dib.c 5 May 2003 17:43:58 -0000 @@ -174,6 +174,9 @@ const void *colorPtr, int start, int end ) { int i; + DC *dc = physDev ? physDev->dc : NULL; + HPALETTE hPal = (dc)? dc->hPalette: GetStockObject(DEFAULT_PALETTE); + PALETTEOBJ* palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hPal, PALETTE_MAGIC ); if (coloruse == DIB_RGB_COLORS) { @@ -191,7 +194,7 @@ rgb->rgbBlue > 255*3/2); else for (i = start; i < end; i++, rgb++) - colorMapping[i] = X11DRV_PALETTE_ToPhysical( physDev, RGB(rgb->rgbRed, + colorMapping[i] = X11DRV_PALETTEOBJ_ToPhysical( dc, hPal, palPtr, RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue)); } @@ -205,7 +208,7 @@ rgb->rgbtBlue > 255*3/2); else for (i = start; i < end; i++, rgb++) - colorMapping[i] = X11DRV_PALETTE_ToPhysical( physDev, RGB(rgb->rgbtRed, + colorMapping[i] = X11DRV_PALETTEOBJ_ToPhysical( dc, hPal, palPtr, RGB(rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue)); } @@ -216,13 +219,15 @@ WORD * index = (WORD *)colorPtr; for (i = start; i < end; i++, index++) - colorMapping[i] = X11DRV_PALETTE_ToPhysical( physDev, PALETTEINDEX(*index) ); + colorMapping[i] = X11DRV_PALETTEOBJ_ToPhysical( dc, hPal, palPtr, PALETTEINDEX(*index) ); } else { for (i = start; i < end; i++) - colorMapping[i] = X11DRV_PALETTE_ToPhysical( physDev, PALETTEINDEX(i) ); + colorMapping[i] = X11DRV_PALETTEOBJ_ToPhysical( dc, hPal, palPtr, PALETTEINDEX(i) ); } } + if (palPtr) + GDI_ReleaseObj( palPtr ); return colorMapping; } @@ -3176,6 +3181,9 @@ int rShift1,gShift1,bShift1; int rShift2,gShift2,bShift2; BYTE gMask1,gMask2; + DC *dc = physDev ? physDev->dc : NULL; + HPALETTE hPal = (dc)? dc->hPalette: GetStockObject(DEFAULT_PALETTE); + PALETTEOBJ* palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hPal, PALETTE_MAGIC ); /* Set color scaling values */ rShift1=16+X11DRV_DIB_MaskToShift(rSrc)-3; @@ -3214,11 +3222,13 @@ blue= ((srcval >> bShift1) & 0xf8) | ((srcval >> bShift2) & 0x07); XPutPixel(bmpImage, x, h, - X11DRV_PALETTE_ToPhysical - (physDev, RGB(red,green,blue))); + X11DRV_PALETTEOBJ_ToPhysical + (dc, hPal, palPtr, RGB(red,green,blue))); } srcbits += linebytes; } + if(palPtr) + GDI_ReleaseObj( palPtr ); } break; } @@ -3697,6 +3707,9 @@ { /* ==== rgb 888 dib -> any bmp bormat ==== */ const BYTE* srcbyte; + DC *dc = physDev ? physDev->dc : NULL; + HPALETTE hPal = (dc)? dc->hPalette: GetStockObject(DEFAULT_PALETTE); + PALETTEOBJ* palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hPal, PALETTE_MAGIC ); /* Windows only supports one 24bpp DIB format: RGB888 */ srcbits+=left*3; @@ -3704,12 +3717,14 @@ srcbyte=(const BYTE*)srcbits; for (x = left; x < dstwidth+left; x++) { XPutPixel(bmpImage, x, h, - X11DRV_PALETTE_ToPhysical - (physDev, RGB(srcbyte[2], srcbyte[1], srcbyte[0]))); + X11DRV_PALETTEOBJ_ToPhysical + (dc, hPal, palPtr, RGB(srcbyte[2], srcbyte[1], srcbyte[0]))); srcbyte+=3; } srcbits += linebytes; } + if(palPtr) + GDI_ReleaseObj( palPtr ); } break; } @@ -4171,6 +4186,9 @@ /* ==== any 0888 dib -> pal 1, 4 or 8 bmp ==== */ const DWORD* srcpixel; int rShift,gShift,bShift; + DC *dc = physDev ? physDev->dc : NULL; + HPALETTE hPal = (dc)? dc->hPalette: GetStockObject(DEFAULT_PALETTE); + PALETTEOBJ* palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hPal, PALETTE_MAGIC ); rShift=X11DRV_DIB_MaskToShift(rSrc); gShift=X11DRV_DIB_MaskToShift(gSrc); @@ -4185,12 +4203,14 @@ red= (srcvalue >> rShift) & 0xff; green=(srcvalue >> gShift) & 0xff; blue= (srcvalue >> bShift) & 0xff; - XPutPixel(bmpImage, x, h, X11DRV_PALETTE_ToPhysical - (physDev, RGB(red,green,blue))); + XPutPixel(bmpImage, x, h, X11DRV_PALETTEOBJ_ToPhysical + (dc, hPal, palPtr, RGB(red,green,blue))); } srcbits += linebytes; - } - } + } + if (palPtr) + GDI_ReleaseObj( palPtr ); + } break; } Index: wine/graphics/x11drv/palette.c =================================================================== RCS file: /home/wine/wine/graphics/x11drv/palette.c,v retrieving revision 1.36 diff -u -r1.36 palette.c --- wine/graphics/x11drv/palette.c 31 Oct 2002 02:38:20 -0000 1.36 +++ wine/graphics/x11drv/palette.c 5 May 2003 17:44:00 -0000 @@ -819,23 +819,32 @@ return best; } - -/*********************************************************************** - * X11DRV_PALETTE_ToPhysical - * - * Return the physical color closest to 'color'. - */ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) { DC *dc = physDev ? physDev->dc : NULL; - WORD index = 0; HPALETTE hPal = (dc)? dc->hPalette: GetStockObject(DEFAULT_PALETTE); - unsigned char spec_type = color >> 24; PALETTEOBJ* palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hPal, PALETTE_MAGIC ); + int ret; /* palPtr can be NULL when DC is being destroyed */ if( !palPtr ) return 0; + ret = X11DRV_PALETTEOBJ_ToPhysical(dc, hPal, palPtr, color); + GDI_ReleaseObj( hPal ); + return ret; +} + +/*********************************************************************** + * X11DRV_PALETTEOBJ_ToPhysical + * + * Return the physical color closest to 'color'. + */ +int X11DRV_PALETTEOBJ_ToPhysical( DC *dc, HPALETTE hPal, PALETTEOBJ* palPtr, COLORREF color ) +{ + WORD index = 0; + unsigned char spec_type = color >> 24; + + if (!palPtr) return 0; if ( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_FIXED ) { /* there is no colormap limitation; we are going to have to compute @@ -852,14 +861,12 @@ if( (idx = color & 0xffff) >= palPtr->logpalette.palNumEntries) { WARN("RGB(%lx) : idx %d is out of bounds, assuming black\n", color, idx); - GDI_ReleaseObj( hPal ); return 0; } if( palPtr->mapping ) { int ret = palPtr->mapping[idx]; - GDI_ReleaseObj( hPal ); return ret; } color = *(COLORREF*)(palPtr->logpalette.palPalEntry + idx); @@ -872,7 +879,6 @@ case 0: /* RGB */ if( dc && (dc->bitsPerPixel == 1) ) { - GDI_ReleaseObj( hPal ); return (((color >> 16) & 0xff) + ((color >> 8) & 0xff) + (color & 0xff) > 255*3/2) ? 1 : 0; } @@ -884,7 +890,6 @@ if (X11DRV_PALETTE_Graymax) { /* grayscale only; return scaled value */ - GDI_ReleaseObj( hPal ); return ( (red * 30 + green * 59 + blue * 11) * X11DRV_PALETTE_Graymax) / 25500; } else @@ -906,7 +911,6 @@ blue = blue << (X11DRV_PALETTE_PBlue.scale-8) | blue >> (16-X11DRV_PALETTE_PBlue.scale); - GDI_ReleaseObj( hPal ); return (red << X11DRV_PALETTE_PRed.shift) | (green << X11DRV_PALETTE_PGreen.shift) | (blue << X11DRV_PALETTE_PBlue.shift); } } @@ -925,7 +929,6 @@ case 0: /* RGB */ if( dc && (dc->bitsPerPixel == 1) ) { - GDI_ReleaseObj( hPal ); return (((color >> 16) & 0xff) + ((color >> 8) & 0xff) + (color & 0xff) > 255*3/2) ? 1 : 0; } @@ -955,7 +958,6 @@ } } - GDI_ReleaseObj( hPal ); return index; }

1 0

Idea: Combine libSDL with the Wine project
by erwin wolff May 5, 2003

May 5, 2003

I have an idea: Combine the SDL project with the Wine DirectX code. It is a great way to catch up with the winex project and SDL has also network code to begin working with the RASAPI32 DLL (used by various instant messengers). Since SDL is ported to every platform out there it is also good for the portability of Wine. I only hope that the license of SDL doesn't give any problems. Have a nice day ECF Wolff erwinwolffnl(a)microformatica.com

3 2

Problem using winemaker/winelib
by Neven.Luetic＠t-online.de May 5, 2003

May 5, 2003

Hello, I am currently trying to continue development of an originally Windows based project on Linux. To create a functioning Linux-executable, I have tried to use winemaker. When I specify the additional headers and libraries correctly, everything seems to be fine. At least configure and make do not show up with errors. The result of the make is a shared library, named like the executable I expected to build ("drobot.so") and a shell script "drobot". When I start this script I get: err:module:get_registry_value Invalid load order module-type L"so", ignored wine: cannot find 'drobot.exe' This seems to indicate some kind of error in the build process, because what was built is exactly a linux .so.If I change my wine config concerning DLLs from "*" = "builtin, native, so" into "*" = "builtin, native" the first message disappears. However wine is still looking for a drobot.exe (according to the generated script). The generated Makefile contains "drobot" as the executable, i.e. the shell script. What did I do wrong? Greetings -- Neven Luetic <Neven.Luetic(a)t-online.de>

2 1

x11drv
by Oliver Sampson May 5, 2003

May 5, 2003

Howdy, I was trying to do a new wine update to the latest CVS, and when cvs update gets to windows/x11drv, it just hangs. I tried deleting the windows directory and I'm using "-Pd." Is there a simple solution to this? Thanks, -- Oliver Sampson olsam(a)quickaudio.com http://www.oliversampson.com

8 8

Problem in ole32.CoCreateInstance ?
by Sylvain Petreolle May 5, 2003

May 5, 2003

Trying to run dxdiag for testing DirectPlay , get a read at 0x0 in CoCreateInstance at line 1355 (dlls/ole32/compobj.c): 1355 hres = IClassFactory_CreateInstance(lpclf, pUnkOuter, iid, ppv); This cant work since lpcf is always 0 and this function is defined as a macro in include/unknwn.h : ./include/unknwn.h:160:#define IClassFactory_CreateInstance(p,a,b,c) (p)->lpVtbl->CreateInstance(p,a,b,c) Should we rewrite this as a function or is lpclf assumed to be non NULL ? ===== Sylvain Petreolle (spetreolle at users dot sourceforge dot net) ICQ #170597259 No more War ! "What if tomorrow the War could be over ?" Morpheus, in "Reloaded". For the Law of Oil and Fire, Im an European that lives in France. For all my Brothers and friends, Im a human living on Earth. ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

3 4

Ole32 16/32 questions
by Steven Edwards May 5, 2003

May 5, 2003

Hello, I need to break some of the Win16/32 and non winapi calls apart in ole32 for our work on ReactOS and I dont know what the best method will be. Without ole32 we cant make much use of anything else so I'm going to start working on this soon. Ole16 and ole2 look like good starting points for moving code around but I would like the help of someone that has worked on this code. I will start by making a list of all of the non-win32 functions I can compile out while still leaving ole32 in a usable state, maybe this help give you a idea as to where we can move code around. Thanks Steven

1 0

MSVCRT calling convention issue
by us＠the-edmeades.demon.co.uk May 5, 2003

May 5, 2003

While debugging a game which only installs if we use the windows msvcrt, I have identified the problem but dont know how to fix it! The problem revolves around the function MSVCRT_type_info_raw_name. This is defined as stdcall, but disassembling the windows version, it clearly shows use of a calling convention I had never heard of, 'thiscall'. According to the MSDN, thiscall is stdcall BUT the 'this' pointer on x86 machines is stored in the ECX register. How can we fix this? My thought: Change the definition to not take a ptr arg, and define a local, this as being in the ECX register, but (a) I dont know how to do this, and (b) is not a solution for winelib applications. For now I can continue having put the msvcrt.dll from another machine in, but it would be nice to solve this issue. I'd also guess it affects more than just that one function. Regards, Jason

2 4

-pthread ??
by Davide Giannotti May 5, 2003

May 5, 2003

I noticed this bug (well.. not sure if it's a bug but it looks like) when compiling from current csv: the make depend command exits with an error like "-pthread unknown option" when processing the directory {wineroot}/dlls/winmm/winearts. I removed the -pthread flag from the Makefile and everything went fine. I'm using a strong customized redhat 8.0 with glibc 2.3.1. Do i miss something or is it an error? Another question: if i compile with nptl i can't get it to work fine. I have to use the LD_ASSUME_KERNEL=2.2.5 before configure and at runtime. bye -- Davide Giannotti ITS Planet s.n.c davide.giannotti(a)itsplanet.com www.itsplanet.com

1 0