FreeSource - WINE/��/��

2005-12-10 02:16:44

�� /WINE / �� / �� 2005-12-10 02:16:44 � 2006-02-13 23:32:56

��:

CyrilMargorin /13.02.2006 23:32/
��
�� , �� , �� Get DI Bits?
�� «��» ��.
�� , �� wine � �� Shared Memory
�� .
��
�� :
dlls/x11drv/dib.c �� X11DRV_DIB_GetImageBits

XImage *bmpImage;
wine_tsx11_lock();
if (descr->image)

bmpImage = descr->image;

else {

bmpImage = XCreateImage( gdi_display, visual, descr->depth, ZPixmap, 0, NULL,

descr->infoWidth, lines, 32, 0 );

bmpImage->data = calloc( lines, bmpImage->bytes_per_line );
if(bmpImage->data == NULL) {

ERR(«Out of memory!\n»);
XDestroyImage( bmpImage );
wine_tsx11_unlock();
return lines;

}

#ifdef HAVE_LIBXXSHM

if (descr->image && descr->useShm)
{

int saveRed, saveGreen, saveBlue;
TRACE(«XShmGetImage(%p, %ld, %p, %d, %d, %ld)\n»,

gdi_display, descr->drawable, bmpImage,
descr->xSrc, descr->ySrc, All Planes?);

saveRed = bmpImage->red_mask;
saveBlue= bmpImage->blue_mask;
saveGreen = bmpImage->green_mask;
XShmGetImage( gdi_display, descr->drawable, bmpImage,

descr->xSrc, descr->ySrc, All Planes?);

bmpImage->red_mask = saveRed;
bmpImage->blue_mask = saveBlue;
bmpImage->green_mask = saveGreen;

}
else

#endif /* HAVE_LIBXXSHM */

{

TRACE(«XGetSubImage(%p,%ld,%d,%d,%d,%d,%ld,%d,%p,%d,%d)\n»,

gdi_display, descr->drawable, descr->xSrc, descr->ySrc, descr->width,
lines, All Planes?, ZPixmap, bmpImage, descr->xDest, descr->yDest);

XGetSubImage( gdi_display, descr->drawable, descr->xSrc, descr->ySrc,

descr->width, lines, All Planes?, ZPixmap,
bmpImage, descr->xDest, descr->yDest );

}

� ��, �� descr->image �� , �� XImage, �� Shared Memory, �� useShm, �� XImage �� Pixmap �� Shared Memory, �� . (�� X11DRV_DIB_SetImageBits).
�� , �� , �� XImage ��, �� ?
RCS file: /home/wine/wine/dlls/x11drv/dib.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50

wine/dlls/x11drv/dib.c 2006/02/13 13:09:31 1.49
+++ wine/dlls/x11drv/dib.c 2006/02/13 13:09:49 1.50
@@ -3626,7 +3626,7 @@ static int X11DRV_DIB_SetImageBits( cons

descr->xSrc, descr->ySrc, descr->xDest, descr->yDest,
descr->width, descr->height);

#ifdef HAVE_LIBXXSHM
– if (descr->useShm)
+ if (descr->image && descr->useShm)

XShmPutImage( gdi_display, descr->drawable, descr->gc, bmpImage,

descr->xSrc, descr->ySrc, descr->xDest, descr->yDest,

@@ -3670,7 +3670,7 @@ static int X11DRV_DIB_GetImageBits( cons

#ifdef HAVE_LIBXXSHM
– if (descr->useShm)
+ if (descr->image && descr->useShm)

int saveRed, saveGreen, saveBlue;

�� : � �� Shared Memory XImage? �� ?
�� :
� �� X11DRV_GetDIBits �� X11DRV_DIB_IMAGEBITS_DESCR descr � �� image �� NULL. �� XImage �� physBitmap.
RCS file: /home/wine/wine/dlls/x11drv/dib.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49

wine/dlls/x11drv/dib.c 2005/12/13 18:25:52 1.48
+++ wine/dlls/x11drv/dib.c 2006/02/13 13:09:31 1.49
@@ -4080,7 +4080,7 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *ph

descr.physDev = physDev;
descr.palentry = palette;
descr.bits = bits;

– descr.image = NULL;
+ descr.image = physBitmap->image;

descr.infoWidth = width;
descr.lines = lines;
descr.depth = physBitmap->pixmap_depth;

�� : � � �� X11DRV_SetDIBits �� image �� physBitmap?
�� cvs.winehq.org 13 �� 2006.

��:

CyrilMargorin /10.12.2005 02:16/
�� ...
�� «��»�, �� (Part) �� exception:
wine: Unhandled page fault on read access to 0x7c2c8620 at address 0x42175ad6 (thread 0018), starting debugger...
Wine Dbg? starting on pid 0x17
Unhandled exception: page fault on read access to 0x7c2c8620 in 32-bit code (0x42175ad6).
In 32 bit mode.
Register dump:
CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:00c7
EIP:42175ad6 ESP:4067e650 EBP:4067e668 EFLAGS:00210246( – 00 -RIZP1)
EAX:00000000 EBX:4221ec18 ECX:7c2c8620 EDX:00000000
ESI:7c042e68 EDI:7c29bf00
Stack dump:
0x4067e650: 00000000 4067e664 407f80c5 420fe08c
0x4067e660: 00000040 7c042e68 4067e698 420c9db6
0x4067e670: 7c042e68 00000040 000000f7 bfe2ca00
0x4067e680: 080c7575 00002800 45f8fc90 420fe08c
0x4067e690: 45f8fc90 7c042e68 4067e6f8 420ca22f
0x4067e6a0: 00000040 000000f7 00000000 00000000
Backtrace:
=>1 0x42175ad6 in libx11.so.6 (+0x20ad6) (0x42175ad6)

2 0x420c9db6 X11DRV_InternalFloodFill+0x36(x=0x40, y=0xf7, xOrg=0x0, yOrg=0x0, pixel=0x0, fillType=0x0) [/home/cyril/prj/wine/dlls/x11drv/graphics.c:1223] in winex11.drv (0x420c9db6)
3 0x420ca22f X11DRV_ExtFloodFill+0x19f(physDev=0x45f8fc90, x=0x2, y=0x2, color=0x0, fillType=0x0) [/home/cyril/prj/wine/dlls/x11drv/graphics.c:1322] in winex11.drv (0x420ca22f)
4 0x40801467 Ext Flood Fill?(hdc=0x5be4, x=0x2, y=0x2, color=0x0, fillType=0x0) [/home/cyril/prj/wine/dlls/gdi/painting.c:671] in gdi32 (0x40801467)
5 0x40801497 Flood Fill?+0x27(hdc=0x5be4, x=0x2, y=0x2, color=0x0) [/home/cyril/prj/wine/dlls/gdi/painting.c:684] in gdi32 (0x40801497)

fixme:dbghelp:sffip_cb NIY on 'J:\KOMPAS\8_0\Release\LT\Exe\kl3DAppA.pdb'

6 0x4366b26b in kl3dappa (+0xb26b) (0x4366b26b)
7 0x00000000 (0x00000000)

0x42175ad6: movl 0x0(%ecx),%edx

2005-12-10 01:38:50

�� /WINE / �� / �� 2005-12-10 01:38:50 � 2005-12-10 02:16:44

��:

fixme:dbghelp:sffip_cb NIY on 'J:\KOMPAS\8_0\Release\LT\Exe\kl3DAppA.pdb'

6 0x4366b26b in kl3dappa (+0xb26b) (0x4366b26b)
7 0x00000000 (0x00000000)

0x42175ad6: movl 0x0(%ecx),%edx

2005-11-25 18:08:43

�� /WINE / �� / �� 2005-11-25 18:08:43 � 2005-12-10 01:38:50

��:

CyrilMargorin /10.12.2005 01:38/
�� , �� CopyImage � Get/SetBitmapBits �� Get/SetDIBits. �� -�� ....
Index: dlls/user/cursoricon.c
RCS file: /home/wine/wine/dlls/user/cursoricon.c,v
retrieving revision 1.22
diff -u -r1.22 cursoricon.c

dlls/user/cursoricon.c 5 Dec 2005 20:07:34 -0000 1.22
+++ dlls/user/cursoricon.c 9 Dec 2005 22:29:21 -0000
@@ -2322,14 +2322,39 @@

if (!Get Object W?( hnd, sizeof(bm), &bm )) return 0;
bm.bmBits = NULL;

– if CreateBitmapIndirect(&bm)
– {
– char *buf = Heap Alloc?( Get Process Heap?(), 0, bm.bmWidthBytes * bm.bmHeight );
– Get Bitmap Bits?( hnd, bm.bmWidthBytes * bm.bmHeight, buf );
– Set Bitmap Bits?( res, bm.bmWidthBytes * bm.bmHeight, buf );
– Heap Free?( Get Process Heap?(), 0, buf );
– }
– return (HICON)res;
+ if (!screen_dc) screen_dc = Create DCW?( DISPLAYW, NULL, NULL, NULL );
+ if (screen_dc)
+ {
+ ifCreateCompatibleBitmap(screen_dc,bm.bmWidth,bm.bmHeight)
+ {
+ BITMAPINFO* pbmi;
+ char *buf;
+ char *bmibuf;
+ int nColor=0;
+ if(bm.bmBitsPixel <= 8)
+ nColor = 1<<bm.bmBitsPixel;
+ if(bm.bmBitsPixel == 15 || bm.bmBitsPixel == 16)
+ nColor = 3;
+ bmibuf = Heap Alloc?( Get Process Heap?(), 0, sizeof(BITMAPINFOHEADER)+nColor*sizeof(RGBQUAD));
+ pbmi = (BITMAPINFO*)bmibuf;
+ Zero Memory?(pbmi,sizeof(BITMAPINFOHEADER)+nColor*sizeof(RGBQUAD));
+ pbmi->bmiHeader.biSize = sizeof(pbmi->bmiHeader);
+ pbmi->bmiHeader.biWidth = bm.bmWidth;
+ pbmi->bmiHeader.biHeight = bm.bmHeight;
+ pbmi->bmiHeader.biPlanes = bm.bmPlanes;
+ pbmi->bmiHeader.biBitCount = bm.bmBitsPixel;
+ pbmi->bmiHeader.biCompression = BI_RGB;
+ buf = Heap Alloc?( Get Process Heap?(), 0, bm.bmWidthBytes * bm.bmHeight );
+ Get DI Bits?(screen_dc,hnd,0,bm.bmHeight,buf,pbmi,DIB_RGB_COLORS);
+ Set DI Bits?(screen_dc,res,0,bm.bmHeight,buf,pbmi,DIB_RGB_COLORS);
+ Heap Free?( Get Process Heap?(), 0, bmibuf );
+ Heap Free?( Get Process Heap?(), 0, buf );
+ }
+ return (HICON)res;
+ }
+ /* In case of error it should return 0
+ */
+ return 0;

}
case IMAGE_ICON:

return CURSORICON_ExtCopy(hnd,type, desiredx, desiredy, flags);

2005-11-18 20:35:02

�� /WINE / �� / �� 2005-11-18 20:35:02 � 2005-11-25 18:08:43

��:

//�� 24� �� 4� ��....
�� , �� 24� �� 32 � 16.... � �� 8��.....
� �� X11_GetDIBits() (�� ) � �� (�� ) �� X11_SetBitmapBits...//

2005-10-13 03:31:52

�� /WINE / �� / �� 2005-10-13 03:31:52 � 2005-11-18 20:35:02

��:

��

�� DIB?

�� – ��
�� – ��
�� + (�� ;))

��:
1. �� BITMAP_Object ��
2. ��
3. � /wine/dlls/gdi/tests/bitmap.c
�� , �� (�� , �� Windows � �� wine)
��, ��

Index: bitmap.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/bitmap.c,v
retrieving revision 1.7
diff -u -u -r1.7 bitmap.c
--- bitmap.c    13 Apr 2005 16:11:18 -0000      1.7
+++ dlls/gdi/bitmap.c   17 May 2005 18:44:52 -0000
@@ -612,6 +612,7 @@
 /***********************************************************************
  *           BITMAP_GetObject
+ * Fill buffer with BITMAP or DIPSECTION (depends on dib field and count size)
  */
 static INT BITMAP_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer )
 {
@@ -621,26 +622,19 @@
     {
         if( !buffer )
             return sizeof(DIBSECTION);
-       if (count < sizeof(DIBSECTION))
-       {
-           if (count > sizeof(BITMAP)) count = sizeof(BITMAP);
-       }
-       else
-       {
-           if (count > sizeof(DIBSECTION)) count = sizeof(DIBSECTION);
-       }
-
-       memcpy( buffer, bmp->dib, count );
-       return count;
-    }
-    else
-    {
-        if( !buffer )
-            return sizeof(BITMAP);
-       if (count > sizeof(BITMAP)) count = sizeof(BITMAP);
-       memcpy( buffer, &bmp->bitmap, count );
-       return count;
+        if (count >= sizeof(DIBSECTION))
+        {
+            count = sizeof(DIBSECTION);
+            memcpy( buffer, bmp->dib, count );
+            return count;
+        }
+        if (count > sizeof(BITMAP)) count = sizeof(BITMAP);
     }
+    if( !buffer )
+        return sizeof(BITMAP);
+    if (count > sizeof(BITMAP)) count = sizeof(BITMAP);
+    memcpy( buffer, &bmp->bitmap, count );
+    return count;
 }