wine-devel January 2006

161 participants
302 discussions

winspool: ERROR_INVALID_NAME in GetDefaultPrinter() ?

by Detlef Riekenberg

Hi. >From which configuration does the "ERROR_INVALID_NAME" came from, when calling GetDefaultPrinter(NULL, &size) and no Printer is installed? This Test is Present in the current "dlls/winspool/tests/info.c". MSDN told us, that we receive an "ERROR_FILE_NOT_FOUND", if no Printer is installed: http://msdn.microsoft.com/library/en-us/gdi/prntspol_0hma.asp I get the "ERROR_FILE_NOT_FOUND" on win98se, winme, w2k and win2003 in this Situation. -- By By ... ... Detlef

10 years, 7 months

The status of the wintab dll

by Robert North

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I think after the 10 or more patches to the Wintab dll that I submitted last month, I should say something about it's status... And of course thank Alexandre for applying those patches. P.S. I won't be available from the 15th for about a week or so. So, if you have any questions, I'm afraid you might have to be patient. Hope this is of interest to someone -Rob. ******Applications: Current status*********** ***In Painter 5 *Cursor pressure works. (Therefore is usable by most) *Cursor orientation is a little odd: The orientation maths needs to be re-done. *No eraser. Haven't yet cracked what enables the eraser. *Doesn't work in desktop mode: Need to map to desktop coordinates. *Repeats windows bugs where cursor looses pressure/orientation info almost bug for bug (Is this a feature? ;-) *Cannot detect pressure/orientation int the "Brush Tracking" window: The tablet context is attached to the main window, so no events get to the popup, even if they overlap. This is not how windows wintab functions. ***In Photoshop 6. *Can only get tablet data in desktop mode: This is because the tablet context is attached to the desktop. Which generates/receives no wine events outside desktop mode. * Eraser and pen pressure working. *But* to get them working, you must have 3 XInput devices listed in your XF86Config file, They need to be the last entries in the "ServerLayout" section and the following order: eraser, tablet mouse. This is a far from ideal way of specifying the devices Wintab should use :-/ I'll document this if someone can point me to a good place to put the docs. *******To Do************* 1. Look at X11 errors. There appear to be some errors that deny some users the ability to access Wintab enabled apps. (I think I know how to fix this) 2. Improve orientation data. Orientation comes in as X-Y coords (Implicit Z), and has to leave as spherical coords. This calculation needs to be re-done. 3. When tablet context is on top, let it read XInput events from all the app's top-level windows. (This simulates the fact that the context is usually designed to cover the whole screen) 4. When tablet context is attached to desktop, read XInput events from all the app's top-level windows. 5. Tests ~ --My current philosophy on tests is... ~ Use Photoshop & Painter, any formal tests ~ can be written if anyone else gets involved in patching Wintab, to avoid regressions, and conflict. **********Long term to do (Anyone interested?):********* There's a lot of work that could be done here, but what gets done and who does it probably depends upon whether anyone finds an app that needs these features. I'd love to implement these, but realistically, I don't foresee doing this unless someone hires me to do so ;) 1. Improve configuration of wintab. Wintab could probably do with some information entered into the config file, to avoid the user having to hack their Xfree86cfg file. 2. Handle Z-Order of context properly. This entails *sharing Z-Order between apps. *Working out exactly what role windows have in determining tablet context z-orders. *Allow tablet contexts that don't cover the whole screen/tablet. *Handle inter-application clipping of tablet contexts *Allow all application's windows to receive tablet events when tablet context is on top 3. Implement non-system tablet contexts (Where system cursor not moved by pen or mouse) 4. Unicodify 5. Implement various wintab extensions. 6. Implement wintab manager functions. 7. Tests. *********Unknowns********* 1. How are wintab contexts are raised lowered? Contexts have their own z-order independent of windows, and their own viewport concept, based upon the tablet's coordinate system, not that of the OS. It appears that entering, or clicking on the window the tablet context is attached to will raise/lower the context. But I haven't done much testing on this. In particular, what happens if more than one app request their tablet context is attached to the desktop? 2. How Painter detects the eraser. Have 3 possibilities i. Windows can detect an eraser, and sends specific messages. (I'm sure I've seen this, but can't work out where!) ii. Only works if tablet and cursors are named correctly. (Probably linked to wacom tablets only). iii. I've missed something 3. Requirements of other applications -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2-rc1-SuSE (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCC8zI2vfwxdLxwWYRAsisAJ4q2gAYTgRc6f9wDI+Ruv943eDxOQCfcl3s /ZKMUGwQOuw/SIIbOkIUbd0= =R4M7 -----END PGP SIGNATURE-----

16 years, 4 months

re: What operating systems will Winelib run on non-x86 systems?

by Dan Kegel

Hi Wei Li, last year, you asked in http://www.winehq.org/hypermail/wine-users/2004/06/0086.html > I could not find the info regarding what operating systems > (such as AIX 5L v5.2, HP-UX 11i, Solaris Release Level > 9) will Winelib run on non-x86 machines. I'll really > appreciate it if someone can provide my related link or > info. I can only find the following link regarding the > supporting OS but it does not provide Winelib's supporting > OS info: > http://www.winehq.org/site/docs/wine-faq/index 3.1. > Under what hardware > platform(s) and operating system(s) will Wine(Lib) run? I'm sorry nobody got back to you -- the wine-devel mailing list might have been a better place to ask. I believe winelib runs on the following non-x86 operating systems: Linux, Solaris, Mac OS X, and FreeBSD. There's no reason in principle it couldn't run on AIX or HP/UX. Some work has been done on an HP/UX port, but some assembly would be required to complete it: http://www.winehq.com/site/?issue=241#HP-UX%20Port Cheers, Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

17 years, 5 months

re: Wine-wiki broken by design

by Dan Kegel

Maybe the wine wiki could publish a machine-readable sitemap; see http://www.xml-sitemaps.com/ http://www.google.com/webmasters/sitemaps/docs/en/about.html That would put less load on the server than letting Yahoo and Google crawl the wiki themselves. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

17 years, 5 months

comctl32.dll: Running siap and modules under wine, first steps

by Maximiliano Curia

Hi, I'm trying to use a program called "siap"[1] under wine. It's the required program to pay taxes that the Argentinian government uses. So, it's quite important for the free software community in Argentina to be able to use it in a free software environment. However, I haven't heard of any real success on it, so far. I've been trying to make it run using winetools[2], and differents versions of wine. The furthest I've gone, has been with version 20050310 and all the "plugins" that winetools provides, installed. Only then, could I install the application, run it, switch between the different modules (although it worked only sometimes), but I can't really use it. There are a couple of important widgets that seem to be incompatible with wine. But as I'm not an expert neither in Windows nor in wine, the one I could really track down is a TreeView widget (from comctl32.dll) (from the main window of the program), that is not fully implemented in wine, and by using a native comctl32.dll (I tried using the win98, winme, win2k libraries) the widget would work but some of the other stuff, like switching to one of the modules wouldn't. I made a screenshot to make this clearer, the wine version[3] and the w2k version[4]. So, what should I do next? Is there some documentation of how to implement a certain Windows widget in wine? Is anybody working in this dll, or has worked on this widget? I'd appreciate any comments. Thanks, [1] http://www.afip.gov.ar/programas/siap_main.asp (spanish only) [2] http://www.von-thadden.de/Joachim/WineTools/ [3] http://gnuservers.com.ar/~maxy/wine/siap-wine.png [4] http://gnuservers.com.ar/~maxy/wine/siap-w2k.png -- Saludos, /\/\ /\ >< `/

17 years, 11 months

Grand Theft Auto... requires mscoree?

by Ivan Gyurdiev

Grand Theft Auto... the never ending struggle to get it working. First I thought it was broken because of OLE...subsequently found out the installer was freezing, because of hidden message boxes. Now I've managed to install it in Desktop mode, but it dies when ran, with no output of any kind... Investigating shows: 000b:Call kernel32.SetUnhandledExceptionFilter(2027f1a8) ret=0115fbe9 000b:Ret kernel32.SetUnhandledExceptionFilter() retval=0115fb7c ret=0115fbe9 000b:Call kernel32.GetModuleHandleA(015459f4 "mscoree.dll") ret=0115ae6b 000b:Call ntdll.RtlInitAnsiString(7fcaf528,015459f4 "mscoree.dll") ret=2018d4fc 000b:Ret ntdll.RtlInitAnsiString() retval=00000000 ret=2018d4fc 000b:Call ntdll.RtlAnsiStringToUnicodeString(7fffcbf8,7fcaf528,00000000) ret=2018d55b 000b:Ret ntdll.RtlAnsiStringToUnicodeString() retval=00000000 ret=2018d55b 000b:Call ntdll.RtlInitUnicodeString(7fcaf52c,7fffcc00 L"mscoree.dll") ret=201a554d 000b:Ret ntdll.RtlInitUnicodeString() retval=00000018 ret=201a554d 000b:Call ntdll.LdrGetDllHandle(00000000,00000000,7fcaf52c,7fcaf534) ret=201a555b 000b:Ret ntdll.LdrGetDllHandle() retval=c0000135 ret=201a555b 000b:Call ntdll.RtlNtStatusToDosError(c0000135) ret=201a558a 000b:Ret ntdll.RtlNtStatusToDosError() retval=0000007e ret=201a558a 000b:Ret kernel32.GetModuleHandleA() retval=00000000 ret=0115ae6b 000b:Call kernel32.ExitProcess(00000001) ret=0115ae8f 000b:Call ntdll.LdrShutdownProcess() ret=201b03bd Looks like it doesn't like the missing mscoree.dll. I thought the .NET framework was not a core windows dll? Why would it require it? Also, installing a native dll doesn't seem to help...

18 years, 2 months

PATCH/RFC: imagelist rewrite to use N x M grid

by Marcus Meissner

Hi, This patch is a rewrite of the imagelist handling to not use a Nx1 grid, but a NxM grid with M definable in the source (currently 4). I have tested against winrar, "file open" and "make check". It is not completely regression tested, so I am not wanting to submit it right now. But I welcome comments. :) Ciao, Marcus Index: dlls/comctl32/imagelist.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/imagelist.c,v retrieving revision 1.101 diff -u -r1.101 imagelist.c --- dlls/comctl32/imagelist.c 14 Nov 2005 11:20:10 -0000 1.101 +++ dlls/comctl32/imagelist.c 28 Nov 2005 06:21:43 -0000 @@ -55,6 +55,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagelist); +#define PER_ROW 4 #define MAX_OVERLAYIMAGE 15 @@ -84,6 +85,12 @@ return himl && himl->magic == IMAGELIST_MAGIC; } +static DWORD index2x(INT index, INT cx) { return cx*(index/PER_ROW); } +static DWORD index2y(INT index, INT cy) { return cy*(index%PER_ROW); } + +static DWORD count2x(INT count, INT cx) { + return cx*((count+PER_ROW-1)/PER_ROW); +} /************************************************************************* * IMAGELIST_InternalExpandBitmaps [Internal] @@ -93,6 +100,8 @@ * PARAMS * himl [I] handle to image list * nImageCount [I] number of images to add + * cx [I] width of image + * cy [I] height of image * * RETURNS * nothing @@ -113,21 +122,22 @@ if (cy == 0) cy = himl->cy; nNewCount = himl->cCurImage + nImageCount + himl->cGrow; - nNewWidth = nNewCount * himl->cx; + nNewWidth = count2x(nNewCount,himl->cx); - TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, nNewWidth, cy, nNewCount); + TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, + nNewWidth, cy*PER_ROW, nNewCount); hdcBitmap = CreateCompatibleDC (0); - hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewWidth, cy); + hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewWidth, cy*PER_ROW); if (hbmNewBitmap == 0) - ERR("creating new image bitmap (x=%d y=%d)!\n", nNewWidth, cy); + ERR("creating new image bitmap (x=%d y=%d)!\n", nNewWidth, cy*PER_ROW); if(himl->cCurImage) { hbmNull = SelectObject (hdcBitmap, hbmNewBitmap); - BitBlt (hdcBitmap, 0, 0, himl->cCurImage * himl->cx, cy, - himl->hdcImage, 0, 0, SRCCOPY); + BitBlt (hdcBitmap, 0, 0, count2x(himl->cCurImage,himl->cx), + cy*PER_ROW, himl->hdcImage, 0, 0, SRCCOPY); SelectObject (hdcBitmap, hbmNull); } SelectObject (himl->hdcImage, hbmNewBitmap); @@ -136,7 +146,7 @@ if (himl->flags & ILC_MASK) { - hbmNewBitmap = CreateBitmap (nNewWidth, cy, 1, 1, NULL); + hbmNewBitmap = CreateBitmap (nNewWidth, cy*PER_ROW, 1, 1, NULL); if (hbmNewBitmap == 0) ERR("creating new mask bitmap!\n"); @@ -144,8 +154,8 @@ if(himl->cCurImage) { hbmNull = SelectObject (hdcBitmap, hbmNewBitmap); - BitBlt (hdcBitmap, 0, 0, himl->cCurImage * himl->cx, cy, - himl->hdcMask, 0, 0, SRCCOPY); + BitBlt (hdcBitmap, 0, 0, count2x(himl->cCurImage,himl->cx), + cy*PER_ROW, himl->hdcMask, 0, 0, SRCCOPY); SelectObject (hdcBitmap, hbmNull); } SelectObject (himl->hdcMask, hbmNewBitmap); @@ -179,7 +189,7 @@ { HDC hdcBitmap; INT nFirstIndex, nImageCount; - INT nStartX; + INT i; BITMAP bmp; HBITMAP hOldBitmap; @@ -192,43 +202,42 @@ IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); - nStartX = himl->cCurImage * himl->cx; - hdcBitmap = CreateCompatibleDC(0); - hOldBitmap = SelectObject(hdcBitmap, hbmImage); - /* Copy result to the imagelist - */ - BitBlt (himl->hdcImage, nStartX, 0, bmp.bmWidth, bmp.bmHeight, - hdcBitmap, 0, 0, SRCCOPY); - - if(himl->hbmMask) - { - HDC hdcTemp; - HBITMAP hOldBitmapTemp; - - hdcTemp = CreateCompatibleDC(0); - hOldBitmapTemp = SelectObject(hdcTemp, hbmMask); + for (i=himl->cCurImage;i<himl->cCurImage+nImageCount;i++) { + /* Copy result to the imagelist */ + BitBlt (himl->hdcImage, index2x(i,himl->cx), index2y(i,himl->cy), + himl->cx, himl->cy, hdcBitmap, himl->cx*(i-himl->cCurImage), 0, SRCCOPY); - BitBlt (himl->hdcMask, - nStartX, 0, bmp.bmWidth, bmp.bmHeight, - hdcTemp, - 0, 0, - SRCCOPY); + if(himl->hbmMask) + { + HDC hdcTemp; + HBITMAP hOldBitmapTemp; - SelectObject(hdcTemp, hOldBitmapTemp); - DeleteDC(hdcTemp); + hdcTemp = CreateCompatibleDC(0); + hOldBitmapTemp = SelectObject(hdcTemp, hbmMask); - /* Remove the background from the image - */ - BitBlt (himl->hdcImage, - nStartX, 0, bmp.bmWidth, bmp.bmHeight, - himl->hdcMask, - nStartX, 0, - 0x220326); /* NOTSRCAND */ + BitBlt (himl->hdcMask, + index2x(i,himl->cx), index2y(i,himl->cy), + himl->cx, himl->cy, + hdcTemp, + himl->cx*(i-himl->cCurImage), 0, + SRCCOPY); + + SelectObject(hdcTemp, hOldBitmapTemp); + DeleteDC(hdcTemp); + + /* Remove the background from the image + */ + BitBlt (himl->hdcImage, + index2x(i,himl->cx), index2y(i,himl->cy), + bmp.bmWidth, bmp.bmHeight, + himl->hdcMask, + index2x(i,himl->cx), index2y(i,himl->cy), + 0x220326); /* NOTSRCAND */ + } } - SelectObject(hdcBitmap, hOldBitmap); DeleteDC(hdcBitmap); @@ -278,12 +287,12 @@ INT WINAPI ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) { - HDC hdcMask, hdcBitmap; - INT nIndex, nImageCount, nMaskXOffset=0; + HDC hdcBitmap; + INT nIndex, nImageCount; BITMAP bmp; HBITMAP hOldBitmap; - HBITMAP hMaskBitmap=0; COLORREF bkColor; + int i; TRACE("himl=%p hbitmap=%p clrmask=%lx\n", himl, hBitmap, clrMask); if (!is_valid(himl)) @@ -292,6 +301,8 @@ if (!GetObjectA (hBitmap, sizeof(BITMAP), &bmp)) return -1; + TRACE("bitmap is %d x %d, himl is %d x %d\n", + bmp.bmWidth, bmp.bmHeight, himl->cx, himl->cy); if (himl->cx > 0) nImageCount = bmp.bmWidth / himl->cx; else @@ -304,67 +315,55 @@ hdcBitmap = CreateCompatibleDC(0); - hOldBitmap = SelectObject(hdcBitmap, hBitmap); - if(himl->hbmMask) - { - hdcMask = himl->hdcMask; - nMaskXOffset = nIndex * himl->cx; - } - else - { - /* - Create a temp Mask so we can remove the background of - the Image (Windows does this even if there is no mask) - */ - hdcMask = CreateCompatibleDC(0); - hMaskBitmap = CreateBitmap(bmp.bmWidth, bmp.bmHeight, 1, 1, NULL); - SelectObject(hdcMask, hMaskBitmap); - nMaskXOffset = 0; - } + /* create monochrome image to the mask bitmap */ bkColor = (clrMask != CLR_DEFAULT) ? clrMask : GetPixel (hdcBitmap, 0, 0); - SetBkColor (hdcBitmap, bkColor); - BitBlt (hdcMask, - nMaskXOffset, 0, bmp.bmWidth, bmp.bmHeight, - hdcBitmap, 0, 0, - SRCCOPY); - SetBkColor(hdcBitmap, RGB(255,255,255)); - /*Remove the background from the image - */ - /* - WINDOWS BUG ALERT!!!!!! - The statement below should not be done in common practice - but this is how ImageList_AddMasked works in Windows. - It overwrites the original bitmap passed, this was discovered - by using the same bitmap to iterate the different styles - on windows where it failed (BUT ImageList_Add is OK) - This is here in case some apps rely on this bug - */ - BitBlt(hdcBitmap, - 0, 0, bmp.bmWidth, bmp.bmHeight, - hdcMask, - nMaskXOffset, 0, - 0x220326); /* NOTSRCAND */ - /* Copy result to the imagelist - */ - BitBlt (himl->hdcImage, - nIndex * himl->cx, 0, bmp.bmWidth, bmp.bmHeight, - hdcBitmap, - 0, 0, - SRCCOPY); + for (i=nIndex; i<himl->cCurImage; i++) { + if (himl->hbmMask) { + SetBkColor (hdcBitmap, bkColor); + + BitBlt (himl->hdcMask, + index2x(i,himl->cx), index2y(i,himl->cy), + himl->cx, himl->cy, + hdcBitmap, himl->cx*(i-nIndex), 0, + SRCCOPY); + + SetBkColor(hdcBitmap, RGB(255,255,255)); + /*Remove the background from the image + */ + /* + WINDOWS BUG ALERT!!!!!! + The statement below should not be done in common practice + but this is how ImageList_AddMasked works in Windows. + It overwrites the original bitmap passed, this was discovered + by using the same bitmap to iterate the different styles + on windows where it failed (BUT ImageList_Add is OK) + This is here in case some apps rely on this bug + */ + BitBlt(hdcBitmap, + himl->cx*(i-nIndex), 0, himl->cx, himl->cy, + himl->hdcMask, + index2x(i,himl->cx), index2y(i,himl->cy), + 0x220326); /* NOTSRCAND */ + } + /* Copy result to the imagelist + */ + BitBlt (himl->hdcImage, + index2x(i,himl->cx), index2y(i,himl->cy), + himl->cx, himl->cy, + hdcBitmap, + himl->cx*(i-nIndex), 0, + SRCCOPY); + } + /* Clean up */ + SelectObject(hdcBitmap, hOldBitmap); DeleteDC(hdcBitmap); - if(!himl->hbmMask) - { - DeleteObject(hMaskBitmap); - DeleteDC(hdcMask); - } - return nIndex; } @@ -478,19 +477,20 @@ /* image */ SelectObject (hdcBmp, hbmTempImage); StretchBlt (hdcBmp, 0, 0, himlSrc->cx, himlSrc->cy, - himlDst->hdcImage, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy, - SRCCOPY); + himlDst->hdcImage, index2x(iDst,himlDst->cx), index2y(iDst,himlDst->cy), + himlDst->cx, himlDst->cy, SRCCOPY); /* mask */ SelectObject (hdcBmp, hbmTempMask); StretchBlt (hdcBmp, 0, 0, himlSrc->cx, himlSrc->cy, - himlDst->hdcMask, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy, - SRCCOPY); + himlDst->hdcMask, index2x(iDst,himlDst->cx), index2y(iDst,himlDst->cy), + himlDst->cx, himlDst->cy, SRCCOPY); /* copy (and stretch) source to destination */ /* image */ - StretchBlt (himlDst->hdcImage, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy, - himlSrc->hdcImage, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy, - SRCCOPY); + StretchBlt (himlDst->hdcImage, index2x(iDst,himlDst->cx), index2y(iDst,himlDst->cy), + himlDst->cx, himlDst->cy, + himlSrc->hdcImage, index2x(iSrc,himlSrc->cx), index2y(iSrc,himlSrc->cy), + himlSrc->cx, himlSrc->cy, SRCCOPY); /* mask */ StretchBlt (himlDst->hdcMask, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy, himlSrc->hdcMask, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy, @@ -511,13 +511,17 @@ } else { /* copy image */ - StretchBlt (himlDst->hdcImage, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy, - himlSrc->hdcImage, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy, + StretchBlt (himlDst->hdcImage, + index2x(iDst,himlDst->cx), index2y(iDst,himlDst->cy), himlDst->cx, himlDst->cy, + himlSrc->hdcImage, + index2x(iSrc,himlSrc->cx), index2y(iSrc,himlSrc->cy), himlSrc->cx, himlSrc->cy, SRCCOPY); /* copy mask */ - StretchBlt (himlDst->hdcMask, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy, - himlSrc->hdcMask, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy, + StretchBlt (himlDst->hdcMask, + index2x(iDst,himlDst->cx), index2y(iDst,himlDst->cy), himlDst->cx, himlDst->cy, + himlSrc->hdcMask, + index2x(iSrc,himlSrc->cx), index2y(iSrc,himlSrc->cy), himlSrc->cx, himlSrc->cy, SRCCOPY); } @@ -597,15 +601,15 @@ himl->uBitsPixel = (UINT)GetDeviceCaps (himl->hdcImage, BITSPIXEL); if (himl->cMaxImage > 0) { - himl->hbmImage = ImageList_CreateImage(himl->hdcImage, himl, cx * himl->cMaxImage, cy); + himl->hbmImage = ImageList_CreateImage(himl->hdcImage, himl, + count2x(himl->cMaxImage,cx), cy*PER_ROW); SelectObject(himl->hdcImage, himl->hbmImage); } else himl->hbmImage = 0; if ((himl->cMaxImage > 0) && (himl->flags & ILC_MASK)) { - himl->hbmMask = - CreateBitmap (himl->cx * himl->cMaxImage, himl->cy, - 1, 1, NULL); + himl->hbmMask = CreateBitmap (count2x(himl->cMaxImage,himl->cx), + himl->cy * PER_ROW, 1, 1, NULL); if (himl->hbmMask == 0) { ERR("Error creating mask bitmap!\n"); goto cleanup; @@ -1053,7 +1057,7 @@ */ BOOL WINAPI -ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) +ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) { INT cx, cy, lx, ly, nOvlIdx; DWORD fState, dwRop; @@ -1068,8 +1072,8 @@ if (!is_valid(himl)) return FALSE; if ((pimldp->i < 0) || (pimldp->i >= himl->cCurImage)) return FALSE; - lx = himl->cx * pimldp->i + pimldp->xBitmap; - ly = pimldp->yBitmap; + lx = index2x(pimldp->i,himl->cx) + pimldp->xBitmap; + ly = index2y(pimldp->i,himl->cy) + pimldp->yBitmap; fState = pimldp->cbSize < sizeof(IMAGELISTDRAWPARAMS) ? ILS_NORMAL : pimldp->fState; fStyle = pimldp->fStyle & ~ILD_OVERLAYMASK; @@ -1187,10 +1191,11 @@ if ( (nOvlIdx >= 1) && (nOvlIdx <= MAX_OVERLAYIMAGE)) { nOvlIdx = himl->nOvlIdx[nOvlIdx - 1]; if ((nOvlIdx >= 0) && (nOvlIdx < himl->cCurImage)) { - const INT ox = himl->cx * nOvlIdx + pimldp->xBitmap; + const INT ox = index2x(nOvlIdx,himl->cx) + pimldp->xBitmap; + const INT oy = index2y(nOvlIdx,himl->cy) + pimldp->yBitmap; if (himl->hbmMask && !(fStyle & ILD_IMAGE)) - BitBlt (hImageDC, 0, 0, cx, cy, hMaskListDC, ox, ly, SRCAND); - BitBlt (hImageDC, 0, 0, cx, cy, hImageListDC, ox, ly, SRCPAINT); + BitBlt (hImageDC, 0, 0, cx, cy, hMaskListDC, ox, oy, SRCAND); + BitBlt (hImageDC, 0, 0, cx, cy, hImageListDC, ox, oy, SRCPAINT); } } @@ -1259,11 +1264,13 @@ if (himlDst) { - BitBlt (himlDst->hdcImage, 0, 0, himlSrc->cCurImage * himlSrc->cx, himlSrc->cy, + BitBlt (himlDst->hdcImage, 0, 0, + count2x(himlSrc->cCurImage,himlSrc->cx), himlSrc->cy*PER_ROW, himlSrc->hdcImage, 0, 0, SRCCOPY); if (himlDst->hbmMask) - BitBlt (himlDst->hdcMask, 0, 0, himlSrc->cCurImage * himlSrc->cx, himlSrc->cy, + BitBlt (himlDst->hdcMask, 0, 0, + count2x(himlSrc->cCurImage,himlSrc->cx), himlSrc->cy*PER_ROW, himlSrc->hdcMask, 0, 0, SRCCOPY); himlDst->cCurImage = himlSrc->cCurImage; @@ -1421,7 +1428,9 @@ hOldDstBitmap = SelectObject (hdcDst, ii.hbmMask); if (himl->hbmMask) { BitBlt (hdcDst, 0, 0, himl->cx, himl->cy, - himl->hdcMask, i * himl->cx, 0, SRCCOPY); + himl->hdcMask, + index2x(i,himl->cx), index2y(i,himl->cy), + SRCCOPY); } else PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS); @@ -1429,7 +1438,8 @@ /* draw image*/ SelectObject (hdcDst, ii.hbmColor); BitBlt (hdcDst, 0, 0, himl->cx, himl->cy, - himl->hdcImage, i * himl->cx, 0, SRCCOPY); + himl->hdcImage, + index2x(i,himl->cx), index2y(i,himl->cy), SRCCOPY); /* * CreateIconIndirect requires us to deselect the bitmaps from @@ -1531,11 +1541,10 @@ pImageInfo->hbmImage = himl->hbmImage; pImageInfo->hbmMask = himl->hbmMask; - pImageInfo->rcImage.top = 0; - pImageInfo->rcImage.bottom = himl->cy; - pImageInfo->rcImage.left = i * himl->cx; - pImageInfo->rcImage.right = (i+1) * himl->cx; - + pImageInfo->rcImage.top = index2y(i,himl->cy); + pImageInfo->rcImage.bottom = index2y(i,himl->cy)+himl->cy; + pImageInfo->rcImage.left = index2x(i,himl->cx); + pImageInfo->rcImage.right = index2x(i,himl->cx)+himl->cx; return TRUE; } @@ -1566,11 +1575,10 @@ if ((i < 0) || (i >= himl->cCurImage)) return FALSE; - lpRect->left = i * himl->cx; - lpRect->top = 0; + lpRect->left = index2x(i,himl->cx); lpRect->right = lpRect->left + himl->cx; - lpRect->bottom = himl->cy; - + lpRect->top = index2y(i,himl->cy); + lpRect->bottom = lpRect->top + himl->cy; return TRUE; } @@ -1724,7 +1732,6 @@ HIMAGELIST himlDst = NULL; INT cxDst, cyDst; INT xOff1, yOff1, xOff2, yOff2; - INT nX1, nX2; TRACE("(himl1=%p i1=%d himl2=%p i2=%d dx=%d dy=%d)\n", himl1, i1, himl2, i2, dx, dy); @@ -1768,25 +1775,29 @@ if (himlDst) { - nX1 = i1 * himl1->cx; - nX2 = i2 * himl2->cx; + int x1, x2, y1, y2; + + x1 = index2x(i1,himl1->cx); + y1 = index2y(i1,himl1->cy); + x2 = index2x(i2,himl2->cx); + y2 = index2y(i2,himl2->cy); /* copy image */ BitBlt (himlDst->hdcImage, 0, 0, cxDst, cyDst, himl1->hdcImage, 0, 0, BLACKNESS); if (i1 >= 0 && i1 < himl1->cCurImage) - BitBlt (himlDst->hdcImage, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcImage, nX1, 0, SRCCOPY); + BitBlt (himlDst->hdcImage, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcImage, x1, y1, SRCCOPY); if (i2 >= 0 && i2 < himl2->cCurImage) { - BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , nX2, 0, SRCAND); - BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, nX2, 0, SRCPAINT); + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , x2, y2, SRCAND); + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, x2, y2, SRCPAINT); } /* copy mask */ BitBlt (himlDst->hdcMask, 0, 0, cxDst, cyDst, himl1->hdcMask, 0, 0, WHITENESS); if (i1 >= 0 && i1 < himl1->cCurImage) - BitBlt (himlDst->hdcMask, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcMask, nX1, 0, SRCCOPY); + BitBlt (himlDst->hdcMask, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcMask, x1, y1, SRCCOPY); if (i2 >= 0 && i2 < himl2->cCurImage) - BitBlt (himlDst->hdcMask, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask, nX2, 0, SRCAND); + BitBlt (himlDst->hdcMask, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask, x2, y2, SRCAND); himlDst->cCurImage = 1; } @@ -1862,6 +1873,7 @@ nheight = cy; nRows = (height/cy); + FIXME("nwidth %d, nheight %d, cy %d\n", nwidth, nheight, cy); if (bitsperpixel==1) hbitmap = CreateBitmap(nwidth,nheight,1,1,NULL); else @@ -2048,36 +2060,36 @@ for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; - hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage * himl->cx, himl->cy); + hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, + count2x(himl->cMaxImage,himl->cx), himl->cy*PER_ROW); SelectObject (himl->hdcImage, hbmNewImage); DeleteObject (himl->hbmImage); himl->hbmImage = hbmNewImage; if (himl->hbmMask) { - hbmNewMask = CreateBitmap (himl->cMaxImage * himl->cx, himl->cy, + hbmNewMask = CreateBitmap (count2x(himl->cMaxImage,himl->cx), himl->cy*PER_ROW, 1, 1, NULL); SelectObject (himl->hdcMask, hbmNewMask); DeleteObject (himl->hbmMask); himl->hbmMask = hbmNewMask; } - } - else { + } else { /* delete one image */ TRACE("Remove single image! %d\n", i); /* create new bitmap(s) */ nCount = (himl->cCurImage + himl->cGrow - 1); - cxNew = nCount * himl->cx; + cxNew = count2x(nCount , himl->cx); TRACE(" - Number of images: %d / %d (Old/New)\n", himl->cCurImage, himl->cCurImage - 1); TRACE(" - Max. number of images: %d / %d (Old/New)\n", himl->cMaxImage, himl->cCurImage + himl->cGrow - 1); - hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, cxNew, himl->cy); + hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, cxNew, himl->cy*PER_ROW); if (himl->hbmMask) - hbmNewMask = CreateBitmap (cxNew, himl->cy, 1, 1, NULL); + hbmNewMask = CreateBitmap (cxNew, himl->cy*PER_ROW, 1, 1, NULL); else hbmNewMask = 0; /* Just to keep compiler happy! */ @@ -2085,31 +2097,45 @@ /* copy all images and masks prior to the "removed" image */ if (i > 0) { - TRACE("Pre image copy: Copy %d images\n", i); + int n = count2x(i,1); - SelectObject (hdcBmp, hbmNewImage); - BitBlt (hdcBmp, 0, 0, i * himl->cx, himl->cy, - himl->hdcImage, 0, 0, SRCCOPY); - - if (himl->hbmMask) { - SelectObject (hdcBmp, hbmNewMask); - BitBlt (hdcBmp, 0, 0, i * himl->cx, himl->cy, - himl->hdcMask, 0, 0, SRCCOPY); + TRACE("Pre image copy: Copy %d images\n", i); + if (n) { /* copy started rows */ + SelectObject (hdcBmp, hbmNewImage); + BitBlt (hdcBmp, 0, 0, n * himl->cx, himl->cy * PER_ROW, + himl->hdcImage, 0, 0, SRCCOPY); + + if (himl->hbmMask) { + SelectObject (hdcBmp, hbmNewMask); + BitBlt (hdcBmp, 0, 0, n * himl->cx, himl->cy * PER_ROW, + himl->hdcMask, 0, 0, SRCCOPY); + } } + /* this might copy some images more. But we will + * overwrite them right afterwards */ } /* copy all images and masks behind the removed image */ if (i < himl->cCurImage - 1) { + int j; + TRACE("Post image copy!\n"); - SelectObject (hdcBmp, hbmNewImage); - BitBlt (hdcBmp, i * himl->cx, 0, (himl->cCurImage - i - 1) * himl->cx, - himl->cy, himl->hdcImage, (i + 1) * himl->cx, 0, SRCCOPY); + + /* copy the post-i images one-by-one */ + SelectObject (hdcBmp, hbmNewImage); + for (j=i;j<himl->cCurImage -1;j++) + BitBlt (hdcBmp, index2x(j,himl->cx), index2y(j,himl->cy), himl->cx, himl->cy, + himl->hdcImage, index2x(j+1,himl->cx), index2y(j+1,himl->cy), SRCCOPY); if (himl->hbmMask) { SelectObject (hdcBmp, hbmNewMask); - BitBlt (hdcBmp, i * himl->cx, 0, - (himl->cCurImage - i - 1) * himl->cx, - himl->cy, himl->hdcMask, (i + 1) * himl->cx, 0, SRCCOPY); + for (j=i;j<himl->cCurImage -1;j++) + BitBlt (hdcBmp, + index2x(j,himl->cx), index2y(j,himl->cy), + himl->cx, himl->cy, + himl->hdcMask, + index2x(j+1,himl->cx), index2y(j+1,himl->cy), + SRCCOPY); } } @@ -2290,12 +2316,16 @@ SetBkColor (himl->hdcImage, RGB(255,255,255)); hbmOldSrc = SelectObject (hdcImage, ii.hbmColor); - StretchBlt (himl->hdcImage, nIndex * himl->cx, 0, himl->cx, himl->cy, - hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); + StretchBlt (himl->hdcImage, + index2x(nIndex,himl->cx), index2y(nIndex,himl->cy), + himl->cx, himl->cy, + hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); if (himl->hbmMask) { SelectObject (hdcImage, ii.hbmMask); - StretchBlt (himl->hdcMask, nIndex * himl->cx, 0, himl->cx, himl->cy, + StretchBlt (himl->hdcMask, + index2x(nIndex,himl->cx), index2y(nIndex,himl->cy), + himl->cx, himl->cy, hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); }

18 years, 2 months

re: What would most aid WINE development?

by Daniel Kegel

Susheel Daswani wrote: > For my 'Antitrust & IP' course this semester I am writing a brief > about why I think the remedy in the Microsoft antitrust case was > inadequate. Back in the day, I wrote an essay about this; it's online at http://kegel.com/remedy/ in particular, http://www.usdoj.gov/atr/cases/ms_tuncom/major/mtc-00028571.htm I now think my essay was naive, but hey, I was young :-) It would be interesting to see the complaints sent to the Technical Committee ( http://www.thetc.org/ ) but I doubt they're public. You might also want to read http://www.lessig.org/content/testimony/msft/msft.pdf if you haven't already. > So my question for the WINE developers is "What materials from > Microsoft would most aid the development of WINE"? The Windows API is > of course public, so my guess is that isn't a huge bar to creating > WINE. So what are the bars? Is it simply the scope of the project? > Is there information that MS could divulge that would greatly aid the > WINE effort? Would open sourcing part of Windows help? As others have noted, the Windows API is not completely public nor particularly well-defined. This makes things harder, but it's not really the main obstacle. Here are a few things a judge could order Microsoft to do that would help Wine: * order them to break up into two companies, one for operating systems and .net, one for everything else * donate gobs of cash to Wine * offer a perpetual, transferrable, royalty-free, GPL-compatible license for its protocols and data formats * support ODF in Microsoft Office That last item is kind of indirect. It would make it much easier for everybody to switch to OpenOffice, which would make it much easier for everybody to switch to Linux, which is the whole point of Wine. - Dan -- Wonder why Aunt Tilly still won't use Linux? See http://kegel.com/linux/comfort

18 years, 2 months

Re: WINE 0.9.3 and Photoshop 7 & CS

by Aleksey

The patch has been found that breaks Photoshop, but 0.9.6 still brakes PS. On 1/6/06, Aleksey <anime4christ(a)gmail.com> wrote: > Great! Thanks! > > On 1/1/06, Elvis Pranskevichus <elprans(a)gmail.com> wrote: > > Aleksey wrote: > > > Yesterday I upgraded to WINE 0.9.3, and then tried running Photoshop > > > 7. Photoshop gave me a hardware error. I thought, no problem, I'll > > > just reinstall it, same result. Then I reconfigured WINE using > > > winetools and tried again, same thing. Here is what I got in the > > > Terminal when running Photoshop 7: > > > > > > fixme:actctx:QueryActCtxW stub! > > > fixme:font:WineEngRemoveFontResourceEx :stub > > > fixme:win:EnumDisplayDevicesW ((null),0,0x7fa7de2c,0x00000000), stub! > > > fixme:win:EnumDisplayDevicesW > > > (L"\\\\.\\DISPLAY1",0,0x7fa7de2c,0x00000000), stub! > > > fixme:mscms:EnumColorProfilesA ( (nil), 0x7fa7e694, 0x7fa7e1ac, > > > 0x7fa7e6f4, 0x7fa7e704 ) stub > > > fixme:win:EnumDisplayDevicesW ((null),0,0x7fa7de34,0x00000000), stub! > > > fixme:win:EnumDisplayDevicesW > > > (L"\\\\.\\DISPLAY1",0,0x7fa7de34,0x00000000), stub! > > > fixme:mscms:EnumColorProfilesA ( (nil), 0x7fa7e69c, 0x7fa7e1b4, > > > 0x7fa7e6fc, 0x7fa7e70c ) stub > > > err:shell:HCR_GetFolderAttributes HCR_GetFolderAttributes should be > > > called for simple PIDL's only! > > > fixme:font:WineEngRemoveFontResourceEx :stub > > > fixme:font:WineEngRemoveFontResourceEx :stub > > > > > > Then I tried installing Photoshop CS, knowing that it worked fine with > > > 0.9.2. Photoshop CS told me that certain required files was missing, > > > but I forgot to get down the results from the Terminal. After that I > > > downgraded to WINE 0.9.2 and both versions of Photoshop work great. > > > > > > A little side note: ImageReady 7 works great under 0.9.3, I did not > > > test ImageReady CS. ImageReady 7 works great under 0.9.2 also, but > > > ImageReady CS crashes. > > > > > > God Bless. > > > - Aleksey > > > > > > > > > > Hi, > > > > I've found the patch that breaks the thing. GIT commit-ish is 0b17529332b0ef5ee57873afd4ded6f359e76781. (http://source.winehq.org/git/?p=wine.git;a=commit;h=0b17529332b0ef5ee57873a…). > > > > I haven't looked at it deeply, just done some git bisect's. > > > > -- > > Elvis Pranskevichus - elprans(a)gmail.com > > > > >

18 years, 2 months

Startup time of OOo2, Firefox 1.5. Some surprises.

by Dan Kegel

To see how reasonable it might be to use OOo 2.0.1 and Firefox 1.5 under Wine routinely, I benchmarked their startup time on a Fedora Core 5 test 2 system under four conditions: native vs. with wine from cvs, and with 416MB RAM vs. 96 MB RAM (by booting with mem=96M; this was to simulate running on one of those cheapo 128MB boxes that uses shared video RAM). This was on a zippy Compaq Presario 3000 Athlon 64 3000+. All apps were downloaded from openoffice.org and mozilla.com. Results for first run of app after booting (1st column is startup time): 5 Firefox run1 native 416MB 12 Firefox run1 wine 416MB 11 Firefox run1 native 96MB 15 Firefox run1 wine 96MB 11 ooo run1 native 416MB 15 ooo run1 wine 416MB 60 ooo run1 native 96MB 37 ooo run1 wine 96MB So wine is 1.4 to 2.5 times slower at app startup generally, but when ram is really short, win32 openoffice starts up with wine 1.5 times *faster* than the native linux version! (Maybe because the Microsoft tools are better at avoiding I/O or relocations during loading?) I then measured how long it took to start up the app the second time, when the cache was nice and hot: 3 Firefox run2 native 416MB 4 Firefox run2 wine 416MB 4 ooo run2 native 416MB 6 ooo run2 wine 416MB 4 Firefox run2 native 96MB 6 Firefox run2 wine 96MB 36 ooo run2 native 96MB 28 ooo run2 wine 96MB The times are uniformly faster on the second run, but the patter holds, i.e. wine is 1.4-1.5 times slower than native generally, but win32 openoffice under wine is 1.5 times *faster* than the native version when starved for RAM. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

18 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel January 2006