May 2012 - Wine-commits - list.winehq.org

Christian Costa : dmusic: COM cleanup of DirectMusicCollection and get rid of separated IUnknown interface .
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: f0324c96651976a290d73d8b2f410d918aaf547f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0324c96651976a290d73d8b2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 14 08:06:30 2012 +0200 dmusic: COM cleanup of DirectMusicCollection and get rid of separated IUnknown interface. --- dlls/dmusic/collection.c | 222 ++++++++++++++++++++++-------------------- dlls/dmusic/dmusic_private.h | 38 ++++---- 2 files changed, 137 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0324c96651976a290d73…

1 0

Christian Costa : dmusic: Implement IDirectMusicBuffer_SetUsedBytes.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 19cb2d2171ceeb5a5cb71501e4172d64fb67c8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=19cb2d2171ceeb5a5cb71501e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 14 08:06:39 2012 +0200 dmusic: Implement IDirectMusicBuffer_SetUsedBytes. --- dlls/dmusic/buffer.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 2fd76b5..35cbd88 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -1,6 +1,8 @@ -/* IDirectMusicBuffer Implementation +/* + * IDirectMusicBuffer Implementation * * Copyright (C) 2003-2004 Rok Mandeljc + * Copyright (C) 2012 Christian Costa * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -241,11 +243,16 @@ static HRESULT WINAPI IDirectMusicBufferImpl_SetStartTime(LPDIRECTMUSICBUFFER if return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes (LPDIRECTMUSICBUFFER iface, DWORD cb) +static HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes(LPDIRECTMUSICBUFFER iface, DWORD used_bytes) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - FIXME("(%p, %d): stub\n", This, cb); + TRACE("(%p)->(%u)\n", iface, used_bytes); + + if (used_bytes > This->size) + return DMUS_E_BUFFER_FULL; + + This->write_pos = used_bytes; return S_OK; }

1 0

Christian Costa : dmsynth: Implement IDirectMusicSynth8_GetAppend.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: aecd9c120190c47e3451f8f424caf91a0d983735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aecd9c120190c47e3451f8f42… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 14 08:11:46 2012 +0200 dmsynth: Implement IDirectMusicSynth8_GetAppend. --- dlls/dmsynth/synth.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index e5d5e1c..d5288b4 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -258,9 +258,10 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetFormat(LPDIRECTMUSICSYNTH8 iface static HRESULT WINAPI IDirectMusicSynth8Impl_GetAppend(LPDIRECTMUSICSYNTH8 iface, DWORD* append) { - IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + TRACE("(%p)->(%p)\n", iface, append); - FIXME("(%p)->(%p): stub\n", This, append); + /* We don't need extra space at the end of buffers passed to us for now */ + *append = 0; return S_OK; }

1 0

Christian Costa : dmsynth: Display more info in IDirectMusicSynth8Impl_Download stub.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: e5b9d0dffc1db131951abf85de9ad9676a0e3b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b9d0dffc1db131951abf85d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 14 08:11:55 2012 +0200 dmsynth: Display more info in IDirectMusicSynth8Impl_Download stub. --- dlls/dmsynth/synth.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index d5288b4..29761d7 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -123,9 +123,52 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups(LPDIRECTMUSICSY static HRESULT WINAPI IDirectMusicSynth8Impl_Download(LPDIRECTMUSICSYNTH8 iface, LPHANDLE hDownload, LPVOID data, LPBOOL free) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + DMUS_DOWNLOADINFO* info = (DMUS_DOWNLOADINFO*)data; FIXME("(%p)->(%p, %p, %p): stub\n", This, hDownload, data, free); + if (!hDownload || !data || !free) + return E_POINTER; + + if (TRACE_ON(dmsynth)) + { + TRACE("Dump DMUS_DOWNLOADINFO struct:\n"); + TRACE(" - dwDLType = %u\n", info->dwDLType); + TRACE(" - dwDLId = %u\n", info->dwDLId); + TRACE(" - dwNumOffsetTableEntries = %u\n", info->dwNumOffsetTableEntries); + TRACE(" - cbSize = %u\n", info->cbSize); + } + + if (info->dwDLType == DMUS_DOWNLOADINFO_INSTRUMENT) + { + FIXME("Download type DMUS_DOWNLOADINFO_INSTRUMENT not yet supported\n"); + } + else if (info->dwDLType == DMUS_DOWNLOADINFO_WAVE) + { + FIXME("Download type DMUS_DOWNLOADINFO_WAVE not yet supported\n"); + } + else if (info->dwDLType == DMUS_DOWNLOADINFO_INSTRUMENT2) + { + FIXME("Download type DMUS_DOWNLOADINFO_INSTRUMENT2 not yet supported\n"); + } + else if (info->dwDLType == DMUS_DOWNLOADINFO_WAVEARTICULATION) + { + FIXME("Download type DMUS_DOWNLOADINFO_WAVEARTICULATION not yet supported\n"); + } + else if (info->dwDLType == DMUS_DOWNLOADINFO_STREAMINGWAVE) + { + FIXME("Download type DMUS_DOWNLOADINFO_STREAMINGWAVE not yet supported\n"); + } + else if (info->dwDLType == DMUS_DOWNLOADINFO_ONESHOTWAVE) + { + FIXME("Download type DMUS_DOWNLOADINFO_ONESHOTWAVE not yet supported\n"); + } + else + { + WARN("Unknown download type %u\n", info->dwDLType); + return DMUS_E_UNKNOWNDOWNLOAD; + } + return S_OK; }

1 0

Francois Gouget : po: Update the English (neutral / Great Britain) translation.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: d279380671605c8675e255e2ad38b56c5fcf0a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d279380671605c8675e255e2a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 00:59:59 2012 +0200 po: Update the English (neutral / Great Britain) translation. --- po/en.po | 2116 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 1197 insertions(+), 919 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d279380671605c8675e25…

1 0

Francois Gouget : po: English (neutral / Great Britain) spelling fixes.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 953beaee864b06e6cb1517c12210eb07fa61d59b URL: http://source.winehq.org/git/wine.git/?a=commit;h=953beaee864b06e6cb1517c12… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 00:46:38 2012 +0200 po: English (neutral / Great Britain) spelling fixes. --- po/en.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/en.po b/po/en.po index 76edbc7..0c41a12 100644 --- a/po/en.po +++ b/po/en.po @@ -6868,7 +6868,7 @@ msgstr "status bar" #: oleacc.rc:51 msgid "table" -msgstr "Table" +msgstr "table" #: oleacc.rc:52 msgid "column header" @@ -8127,16 +8127,16 @@ msgid "" "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" "Wine is free software; you can redistribute it and/or modify it under the " -"terms of the GNU Lesser General Public License as published by the Free " -"Software Foundation; either version 2.1 of the License, or (at your option) " +"terms of the GNU Lesser General Public Licence as published by the Free " +"Software Foundation; either version 2.1 of the Licence, or (at your option) " "any later version.\n" "\n" "Wine is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more " +"FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public Licence for more " "details.\n" "\n" -"You should have received a copy of the GNU Lesser General Public License " +"You should have received a copy of the GNU Lesser General Public Licence " "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." @@ -10626,7 +10626,7 @@ msgstr "Bind to file via a File Moniker" #: oleview.rc:104 msgid "Open a TypeLib file and view the contents" -msgstr "Open a TypeLib file and view the " +msgstr "Open a TypeLib file and view the contents" #: oleview.rc:105 msgid "Change machine wide Distributed COM settings" @@ -12325,8 +12325,8 @@ msgid "" "option) any later version." msgstr "" "This program is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " +"under the terms of the GNU Lesser General Public Licence as published by the " +"Free Software Foundation; either version 2.1 of the Licence, or (at your " "option) any later version." #: winecfg.rc:134

1 0

Alexandre Julliard : kernel32/tests: Avoid a non-portable printf format.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 5d770503b9b9fc6e61147fd84d23e18390e22064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d770503b9b9fc6e61147fd84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 14 14:15:53 2012 +0200 kernel32/tests: Avoid a non-portable printf format. --- dlls/kernel32/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9cfb664..8768b99 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -796,7 +796,7 @@ static void dumpmem(unsigned char *mem, int len) p = hex; c = txt; do { - p += sprintf(p, "%02hhx ", mem[x]); + p += sprintf(p, "%02x ", mem[x]); *c++ = (mem[x] >= 32 && mem[x] <= 127) ? mem[x] : '.'; } while (++x % 16 && x < len); *c = '\0';

1 0

Alexandre Julliard : winex11: Use an XVisualInfo structure to store color formats in Get/PutImage.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 305b10aba67009b0a8feab32ce0caa9cbf8f671b URL: http://source.winehq.org/git/wine.git/?a=commit;h=305b10aba67009b0a8feab32c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 13:47:33 2012 +0200 winex11: Use an XVisualInfo structure to store color formats in Get/PutImage. --- dlls/winex11.drv/bitblt.c | 104 ++++++++++++++++++++++++--------------------- 1 files changed, 56 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=305b10aba67009b0a8fea…

1 0

Alexandre Julliard : winex11: Add a helper to retrieve an image from a pixmap.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: f99af0bb8f71916cae86e45b219f39153b2935b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f99af0bb8f71916cae86e45b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 11:49:20 2012 +0200 winex11: Add a helper to retrieve an image from a pixmap. --- dlls/winex11.drv/bitblt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 60 ++------------------------------------------ dlls/winex11.drv/x11drv.h | 2 + 3 files changed, 64 insertions(+), 57 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 853f2ae..413f4e4 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1461,3 +1461,62 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, wine_tsx11_unlock(); return ret; } + + +/*********************************************************************** + * get_pixmap_image + * + * Equivalent of X11DRV_GetImage that reads directly from a pixmap. + */ +DWORD get_pixmap_image( Pixmap pixmap, int width, int height, const XVisualInfo *vis, + BITMAPINFO *info, struct gdi_image_bits *bits ) +{ + DWORD ret = ERROR_SUCCESS; + XImage *image; + struct gdi_image_bits src_bits; + struct bitblt_coords coords; + const XPixmapFormatValues *format = pixmap_formats[vis->depth]; + const int *mapping = NULL; + + if (!format) return ERROR_INVALID_PARAMETER; + + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = -height; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = format->bits_per_pixel; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrImportant = 0; + set_color_info( vis, info ); + + if (!bits) return ERROR_SUCCESS; /* just querying the color information */ + + coords.x = 0; + coords.y = 0; + coords.width = width; + coords.height = height; + SetRect( &coords.visrect, 0, 0, width, height ); + + wine_tsx11_lock(); + image = XGetImage( gdi_display, pixmap, 0, 0, width, height, AllPlanes, ZPixmap ); + wine_tsx11_unlock(); + if (!image) return ERROR_OUTOFMEMORY; + + info->bmiHeader.biSizeImage = height * image->bytes_per_line; + + src_bits.ptr = image->data; + src_bits.is_copy = TRUE; + ret = copy_image_bits( info, is_r8g8b8(vis), image, &src_bits, bits, &coords, mapping, + zeropad_masks[(width * image->bits_per_pixel) & 31] ); + + if (!ret && bits->ptr == image->data) + { + bits->free = free_ximage_bits; + image->data = NULL; + } + wine_tsx11_lock(); + XDestroyImage( image ); + wine_tsx11_unlock(); + return ret; +} diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 95c1169..68854f0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2199,68 +2199,14 @@ static void flush_pixmap( struct wine_glcontext *ctx ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; - XImage *image; - struct gdi_image_bits src_bits, bits; - struct bitblt_coords coords; - DWORD *masks; - BOOL is_r8g8b8 = FALSE; - const XPixmapFormatValues *format = pixmap_formats[ctx->vis->depth]; - - coords.x = 0; - coords.y = 0; - coords.width = ctx->pixmap_size.cx; - coords.height = ctx->pixmap_size.cy; - SetRect( &coords.visrect, 0, 0, coords.width, coords.height ); - - info->bmiHeader.biSize = sizeof(info->bmiHeader); - info->bmiHeader.biWidth = coords.width; - info->bmiHeader.biHeight = -coords.height; - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = format->bits_per_pixel; - info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biClrUsed = 0; - switch (info->bmiHeader.biBitCount) - { - case 16: - masks = (DWORD *)info->bmiColors; - masks[0] = ctx->vis->red_mask; - masks[1] = ctx->vis->green_mask; - masks[2] = ctx->vis->blue_mask; - info->bmiHeader.biCompression = BI_BITFIELDS; - break; - case 24: - is_r8g8b8 = (ctx->vis->red_mask == 0xff0000 && ctx->vis->blue_mask == 0x0000ff); - break; - case 32: - masks = (DWORD *)info->bmiColors; - masks[0] = ctx->vis->red_mask; - masks[1] = ctx->vis->green_mask; - masks[2] = ctx->vis->blue_mask; - if (masks[0] != 0xff0000 || masks[1] != 0x00ff00 || masks[2] != 0x0000ff) - info->bmiHeader.biCompression = BI_BITFIELDS; - break; - default: - FIXME( "depth %u not supported\n", info->bmiHeader.biBitCount ); - return; - } - - wine_tsx11_lock(); - image = XGetImage( gdi_display, ctx->pixmap, 0, 0, coords.width, coords.height, AllPlanes, ZPixmap ); - wine_tsx11_unlock(); - if (!image) return; + struct gdi_image_bits bits; - src_bits.ptr = image->data; - src_bits.is_copy = TRUE; - if (!copy_image_bits( info, is_r8g8b8, image, &src_bits, &bits, &coords, NULL, ~0u )) + if (!get_pixmap_image( ctx->pixmap, ctx->pixmap_size.cx, ctx->pixmap_size.cy, ctx->vis, info, &bits )) { HBITMAP bitmap = GetCurrentObject( ctx->hdc, OBJ_BITMAP ); - TRACE( "drawable %lx -> hdc %p bitmap %p\n", ctx->pixmap, ctx->hdc, bitmap ); - SetDIBits( 0, bitmap, 0, coords.height, bits.ptr, info, DIB_RGB_COLORS ); + SetDIBits( 0, bitmap, 0, ctx->pixmap_size.cy, bits.ptr, info, DIB_RGB_COLORS ); if (bits.free) bits.free( &bits ); } - wine_tsx11_lock(); - XDestroyImage( image ); - wine_tsx11_unlock(); } static void flush_gl_drawable( struct glx_physdev *physdev ) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 82889c2..d17565b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -229,6 +229,8 @@ extern Pixmap X11DRV_get_pixmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, struct bitblt_coords *coords, const int *mapping, unsigned int zeropad_mask ) DECLSPEC_HIDDEN; +extern DWORD get_pixmap_image( Pixmap pixmap, int width, int height, const XVisualInfo *vis, + BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) DECLSPEC_HIDDEN; extern BOOL add_extra_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Use the get_pixmap_image helper to import XA_PIXMAP clipboard formats.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 95de085e5e1574b61d78d9141313f8b1241d6b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95de085e5e1574b61d78d9141… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 12:50:25 2012 +0200 winex11: Use the get_pixmap_image helper to import XA_PIXMAP clipboard formats. --- dlls/winex11.drv/clipboard.c | 81 +++++++++++++++++++++++++---------------- 1 files changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 6d0054e..ac17bdd 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1328,10 +1328,10 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom p if (X11DRV_CLIPBOARD_ReadProperty(display, w, prop, &lpdata, &cbytes)) { - HDC hdcMem; - X_PHYSBITMAP *physBitmap; - Pixmap orig_pixmap; - HBITMAP hBmp = 0; + XVisualInfo vis; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + struct gdi_image_bits bits; Window root; int x,y; /* Unused */ unsigned border_width; /* Unused */ @@ -1349,37 +1349,54 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom p TRACE("\tPixmap properties: width=%d, height=%d, depth=%d\n", width, height, depth); - /* - * Create an HBITMAP with the same dimensions and BPP as the pixmap, - * and make it a container for the pixmap passed. - */ - if (!(hBmp = CreateBitmap( width, height, 1, pixmap_formats[depth]->bits_per_pixel, NULL ))) + memset( &vis, 0, sizeof(vis) ); + vis.depth = depth; + if (depth == screen_depth) + { + vis.visual = visual; + vis.visualid = visual->visualid; + vis.class = visual->class; + vis.red_mask = visual->red_mask; + vis.green_mask = visual->green_mask; + vis.blue_mask = visual->blue_mask; + } + else switch (pixmap_formats[depth]->bits_per_pixel) + { + case 1: + case 4: + case 8: + break; + case 16: /* assume R5G5B5 */ + vis.red_mask = 0x7c00; + vis.green_mask = 0x03e0; + vis.blue_mask = 0x001f; + break; + case 24: /* assume R8G8B8 */ + case 32: /* assume A8R8G8B8 */ + vis.red_mask = 0xff0000; + vis.green_mask = 0x00ff00; + vis.blue_mask = 0x0000ff; + break; + default: return 0; + } - /* force bitmap to be owned by a screen DC */ - hdcMem = CreateCompatibleDC( 0 ); - SelectObject( hdcMem, SelectObject( hdcMem, hBmp )); - DeleteDC( hdcMem ); - - physBitmap = X11DRV_get_phys_bitmap( hBmp ); - - /* swap the new pixmap in */ - orig_pixmap = physBitmap->pixmap; - physBitmap->pixmap = *pPixmap; - - /* - * Create a packed DIB from the Pixmap wrapper bitmap created above. - * A packed DIB contains a BITMAPINFO structure followed immediately by - * an optional color palette and the pixel data. - */ - hClipData = create_dib_from_bitmap( hBmp ); - - /* we can now get rid of the HBITMAP and its original pixmap */ - physBitmap->pixmap = orig_pixmap; - DeleteObject(hBmp); + if (!get_pixmap_image( *pPixmap, width, height, &vis, info, &bits )) + { + DWORD info_size = bitmap_info_size( info, DIB_RGB_COLORS ); + BYTE *ptr; - /* Free the retrieved property data */ - HeapFree(GetProcessHeap(), 0, lpdata); + hClipData = GlobalAlloc( GMEM_MOVEABLE | GMEM_DDESHARE, + info_size + info->bmiHeader.biSizeImage ); + if (hClipData) + { + ptr = GlobalLock( hClipData ); + memcpy( ptr, info, info_size ); + memcpy( ptr + info_size, bits.ptr, info->bmiHeader.biSizeImage ); + GlobalUnlock( hClipData ); + } + if (bits.free) bits.free( &bits ); + } } return hClipData;

1 0