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

Marcus Meissner : windowscodecs: Mark 3 vtables static.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 42ef8a5705bc80056fb4866cd60348d2e992e3df URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ef8a5705bc80056fb4866cd… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat May 28 10:49:31 2011 +0200 windowscodecs: Mark 3 vtables static. --- dlls/windowscodecs/stream.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index 1ed08f3..cd235a3 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -242,7 +242,7 @@ static HRESULT WINAPI StreamOnMemory_Clone(IStream *iface, } -const IStreamVtbl StreamOnMemory_Vtbl = +static const IStreamVtbl StreamOnMemory_Vtbl = { /*** IUnknown methods ***/ StreamOnMemory_QueryInterface, @@ -538,7 +538,7 @@ static HRESULT WINAPI StreamOnStreamRange_Clone(IStream *iface, } -const IStreamVtbl StreamOnStreamRange_Vtbl = +static const IStreamVtbl StreamOnStreamRange_Vtbl = { /*** IUnknown methods ***/ StreamOnStreamRange_QueryInterface, @@ -854,7 +854,7 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromIStreamRegion(IWICStream *ifa } -const IWICStreamVtbl WICStream_Vtbl = +static const IWICStreamVtbl WICStream_Vtbl = { /*** IUnknown methods ***/ IWICStreamImpl_QueryInterface,

1 0

Marcus Meissner : wineoss.drv: Mark internal symbols with hidden visibility .
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: f8c8c13cc5d6d28ed8b60eab82f9fc0dabfd6f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c8c13cc5d6d28ed8b60eab8… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat May 28 10:49:32 2011 +0200 wineoss.drv: Mark internal symbols with hidden visibility. --- dlls/wineoss.drv/audio.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wineoss.drv/audio.h b/dlls/wineoss.drv/audio.h index 602e842..c917196 100644 --- a/dlls/wineoss.drv/audio.h +++ b/dlls/wineoss.drv/audio.h @@ -158,26 +158,26 @@ typedef struct { OSS_MSG_RING msgRing; } WINE_WAVEIN; -extern WINE_WAVEOUT WOutDev[MAX_WAVEDRV]; -extern WINE_WAVEIN WInDev[MAX_WAVEDRV]; -extern unsigned numOutDev; -extern unsigned numInDev; +extern WINE_WAVEOUT WOutDev[MAX_WAVEDRV] DECLSPEC_HIDDEN; +extern WINE_WAVEIN WInDev[MAX_WAVEDRV] DECLSPEC_HIDDEN; +extern unsigned numOutDev DECLSPEC_HIDDEN; +extern unsigned numInDev DECLSPEC_HIDDEN; -extern int getEnables(OSS_DEVICE *ossdev); -extern void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2); +extern int getEnables(OSS_DEVICE *ossdev) DECLSPEC_HIDDEN; +extern void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) DECLSPEC_HIDDEN; extern DWORD OSS_OpenDevice(OSS_DEVICE* ossdev, unsigned req_access, int* frag, int strict_format, - int sample_rate, int stereo, int fmt); + int sample_rate, int stereo, int fmt) DECLSPEC_HIDDEN; -extern void OSS_CloseDevice(OSS_DEVICE* ossdev); +extern void OSS_CloseDevice(OSS_DEVICE* ossdev) DECLSPEC_HIDDEN; -extern DWORD wodSetVolume(WORD wDevID, DWORD dwParam); +extern DWORD wodSetVolume(WORD wDevID, DWORD dwParam) DECLSPEC_HIDDEN; /* dscapture.c */ -extern DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv); -extern DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc); +extern DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv) DECLSPEC_HIDDEN; +extern DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc) DECLSPEC_HIDDEN; /* dsrender.c */ -extern DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv); -extern DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc); +extern DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) DECLSPEC_HIDDEN; +extern DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) DECLSPEC_HIDDEN;

1 0

Dylan Smith : include: Pack ACMDRVSTREAMHEADER since ACMSTREAMHEADER is packed.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 836308ff17ad82836f23dd4f3ff61df4d1ccaadc URL: http://source.winehq.org/git/wine.git/?a=commit;h=836308ff17ad82836f23dd4f3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat May 28 18:02:49 2011 -0400 include: Pack ACMDRVSTREAMHEADER since ACMSTREAMHEADER is packed. --- include/msacmdrv.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/msacmdrv.h b/include/msacmdrv.h index 6436404..3933ea1 100644 --- a/include/msacmdrv.h +++ b/include/msacmdrv.h @@ -109,6 +109,7 @@ typedef struct _ACMDRVSTREAMINSTANCE } ACMDRVSTREAMINSTANCE, *PACMDRVSTREAMINSTANCE; typedef struct _ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER; +#include <pshpack1.h> typedef struct _ACMDRVSTREAMHEADER { DWORD cbStruct; DWORD fdwStatus; @@ -135,6 +136,7 @@ typedef struct _ACMDRVSTREAMHEADER { LPBYTE pbPreparedDst; DWORD cbPreparedDstLength; } ACMDRVSTREAMHEADER; +#include <poppack.h> typedef struct _ACMDRVSTREAMSIZE {

1 0

Marcus Meissner : ntdll: Specify div to be divl.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: a73a6e0cded6b49de05af9eca69199a96b89adb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73a6e0cded6b49de05af9eca… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 29 20:59:01 2011 +0200 ntdll: Specify div to be divl. Avoids a clang bug. --- dlls/ntdll/large_int.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index cb98bae..54ce6b0 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -264,7 +264,7 @@ UINT WINAPI RtlEnlargedUnsignedDivide( ULONGLONG a, UINT b, UINT *remptr ) p1 = a >> 32; p2 = a & 0xffffffffLL; - __asm__("div %4,%%eax" + __asm__("divl %4,%%eax" : "=a" (ret), "=d" (rem) : "0" (p2), "1" (p1), "g" (b) ); if (remptr) *remptr = rem;

1 0

Marcus Meissner : mpr: Added missing pointer dereference (Coverity).
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: c1833ea96345dbfe6f1f7ec0e60242bb2617a3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1833ea96345dbfe6f1f7ec0e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 29 23:24:16 2011 +0200 mpr: Added missing pointer dereference (Coverity). --- dlls/mpr/wnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 2c57aaa..946f47e 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1173,7 +1173,7 @@ static DWORD _enumerateContextW(PWNetEnumerator enumerator, LPDWORD lpcCount, if (ret == WN_SUCCESS) { /* reflect the fact that we already enumerated "Entire Network" */ - lpcCount++; + (*lpcCount)++; *lpBufferSize = bufferSize + bytesNeeded; } else

1 0

Alexandre Julliard : Wine release 1.3.21
by Alexandre Julliard 27 May '11

27 May '11

Module: website Branch: master Commit: 6e97ee3c36d3aac885f1b579f9f773c3f5fe6d3c URL: http://source.winehq.org/git/website.git/?a=commit;h=6e97ee3c36d3aac885f1b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 20:35:36 2011 +0200 Wine release 1.3.21 --- news/en/2011052701.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2011052701.xml b/news/en/2011052701.xml new file mode 100644 index 0000000..639a606 --- /dev/null +++ b/news/en/2011052701.xml @@ -0,0 +1,18 @@ +<news> +<date>May 27, 2011</date> +<title>Wine 1.3.21 Released</title> +<body> + The Wine development release 1.3.21 is now available. + <a href="{$root}/announce/1.3.21">What's new</a> in this release: +<ul> + <li>Support for installation rollbacks in MSI.</li> + <li>8- and 16-bit bitmap formats in the DIB engine.</li> + <li>Fixes in the XInput2 mouse support.</li> + <li>Better support for text shaping in Uniscribe.</li> + <li>Improvements to the Item common dialog.</li> + <li>More MSVC runtime functions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.21.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.21.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 3d318679c65729deb0339fe31761c87223132c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d318679c65729deb0339fe31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 20:27:04 2011 +0200 Release 1.3.21. --- ANNOUNCE | 1155 +++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 634 insertions(+), 541 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d318679c65729deb0339…

1 0

Tag wine-1.3.21 : Alexandre Julliard : Release 1.3.21
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: refs/tags/wine-1.3.21 Tag: 190a5d85e614ded20ead075efe6f3a23ef7b4a1b URL: http://source.winehq.org/git/wine.git/?a=tag;h=190a5d85e614ded20ead075efe6f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 20:27:04 2011 +0200 Release 1.3.21

1 0

Huw Davies : gdi32/tests: Add tests for non-standard BI_BITFIELD dibs.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 6ff7cb8ff6dc16293a4b81057a1733ff79f43a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff7cb8ff6dc16293a4b81057… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 27 13:54:46 2011 +0100 gdi32/tests: Add tests for non-standard BI_BITFIELD dibs. --- dlls/gdi32/tests/dib.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 5c341d5..75519b6 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -100,6 +100,32 @@ static const char *sha1_graphics_a8r8g8b8[] = NULL }; +static const char *sha1_graphics_a8b8g8r8[] = +{ + "a3cadd34d95d3d5cc23344f69aab1c2e55935fcf", + "e0bc877697093ed440e125154e247ca9d65e933c", + "c6d7faf5a502299f99d59eef3f7650bd63dbe108", + "9d8c05c3ebd786e7d052418e905a80a64bf7853d", + "3da12af0a810fd993fa3dbe23328a4fcd2b6c92a", + "b91c8f21cc4d7994abc551feff5b6927d267a9db", + "d49dd2c6a37e975b6dc3d201ccc217a788b30284", + "ca6753f9eb44529cf8c67cd6abcd4ed1ef758904", + "18c3ae944e0afb6c43c21cde093ddb22a27611e4", + "b753ebb39d90210cc717f57b53dd439f7de6b077", + "38c017dd1fff26b492a57e09f3ce2c4370faf225", + "94368cea5033b435454daa56d55546310675131e", + "bf57a6a37fb107d29ed3d45695919887abcb7902", + "3db0f8bcca3d94920aa57be6321202b8c3c08822", + "1f1fc165a4dae7ba118ddccb58a279bfe3876b0a", + "66da15b6780a4ca3b3d2eb1d1dba4e30f7b74964", + "42fefefe4435570fa8038ec759140c66c76570e9", + "3369889a67d6c79a24ee15f7d14374f9995215e4", + "4851c5b7d5bc18590e787c0c218a592ef504e738", + "9aa506e3df33e0d5298755aa4144e10eb4b5adcf", + "abdf003699364fe45fab7dc61e67c606d0063b40", + NULL +}; + static const char *sha1_graphics_r5g5b5[] = { "2a2ab8b3c019e70b788ade028b0e9e53ffc529ae", @@ -126,6 +152,32 @@ static const char *sha1_graphics_r5g5b5[] = NULL }; +static const char *sha1_graphics_r4g4b4[] = +{ + "2a2ab8b3c019e70b788ade028b0e9e53ffc529ae", + "cfa0ab83ee93283ad914c3748f0532da1697af1d", + "8bd18697d1ef27492805667a0bc956343ac08667", + "e8501c830321584474654f90e40eaf27dc21e6a8", + "d95ab10fcfb8447b41742e89f1ae8cd297a32fc4", + "821177710961d2cb5f7e7dfc0e06e767b6042753", + "667124365ffadeea1d8791bedda77a0c7b898de8", + "c9f23e684b600dea17575b4b17175fbd9106c3a9", + "7678876e50eae35d1eaa096aae25afaa0b864bf3", + "fb52b0c373a5f2a60b981604b120962942d2447a", + "5ab8dd07436681d762fa04ad7c6d71291c488924", + "0167981d9e1490a2ebd396ff7582f0943aa8e1b8", + "115a6bd382410a4a1d3c1fa71d8bf02536863e38", + "65c6d1228e3b6d63d42647f14217bc1658b70d9a", + "25fcb75aa687aac35b8f72640889fe92413e00c5", + "dbc8d66b419880108793db91c05766c0c6efd86d", + "6092ccbab6b6e073c6ac8244d122f2cfc453aa38", + "32b6e0aa79b7e96cd0ab2da167f6463c011023a8", + "d591232bbc2592462c819a9486750f64180518fd", + "0e183a4c30b3da345129cffe33fe0fc593d8666b", + "f14d9a4bd8a365b7c8f068a0dad481b6eb2b178b", + NULL +}; + static inline DWORD get_stride(BITMAPINFO *bmi) { return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; @@ -679,6 +731,29 @@ static void test_simple_graphics(void) SelectObject(mem_dc, orig_bm); DeleteObject(dib); + /* a8b8g8r8 - bitfields. */ + trace("a8b8g8r8 - bitfields\n"); + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biCompression = BI_BITFIELDS; + bit_fields[0] = 0x0000ff; + bit_fields[1] = 0x00ff00; + bit_fields[2] = 0xff0000; + + dib = CreateDIBSection(mem_dc, bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(dib != NULL, "ret NULL\n"); + ok(GetObjectW( dib, sizeof(ds), &ds ), "GetObject failed\n"); + ok(ds.dsBitfields[0] == 0x0000ff, "got %08x\n", ds.dsBitfields[0]); + ok(ds.dsBitfields[1] == 0x00ff00, "got %08x\n", ds.dsBitfields[1]); + ok(ds.dsBitfields[2] == 0xff0000, "got %08x\n", ds.dsBitfields[2]); + ok(ds.dsBmih.biCompression == BI_BITFIELDS, "got %x\n", ds.dsBmih.biCompression); + + orig_bm = SelectObject(mem_dc, dib); + + sha1 = sha1_graphics_a8b8g8r8; + draw_graphics(mem_dc, bmi, bits, &sha1); + + SelectObject(mem_dc, orig_bm); + DeleteObject(dib); /* r5g5b5 */ trace("555\n"); @@ -702,6 +777,29 @@ todo_wine SelectObject(mem_dc, orig_bm); DeleteObject(dib); + /* r4g4b4 */ + trace("444\n"); + bmi->bmiHeader.biBitCount = 16; + bmi->bmiHeader.biCompression = BI_BITFIELDS; + bit_fields[0] = 0x0f00; + bit_fields[1] = 0x00f0; + bit_fields[2] = 0x000f; + dib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(dib != NULL, "ret NULL\n"); + ok(GetObjectW( dib, sizeof(ds), &ds ), "GetObject failed\n"); + ok(ds.dsBitfields[0] == 0x0f00, "got %08x\n", ds.dsBitfields[0]); + ok(ds.dsBitfields[1] == 0x00f0, "got %08x\n", ds.dsBitfields[1]); + ok(ds.dsBitfields[2] == 0x000f, "got %08x\n", ds.dsBitfields[2]); + ok(ds.dsBmih.biCompression == BI_BITFIELDS, "got %x\n", ds.dsBmih.biCompression); + + orig_bm = SelectObject(mem_dc, dib); + + sha1 = sha1_graphics_r4g4b4; + draw_graphics(mem_dc, bmi, bits, &sha1); + + SelectObject(mem_dc, orig_bm); + DeleteObject(dib); + DeleteDC(mem_dc); }

1 0

Huw Davies : gdi32: Add support for colour tables.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: a44aa8a95426c38ba1badeff0082973a809e2138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44aa8a95426c38ba1badeff0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 27 14:17:20 2011 +0100 gdi32: Add support for colour tables. --- dlls/gdi32/dibdrv/dc.c | 65 ++++++++++++++++++++++++++++++++++++------ dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 4 ++- dlls/gdi32/gdi_private.h | 3 ++ 4 files changed, 62 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 07227a1..d6023b0 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -63,7 +63,8 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) calc_shift_and_len(dib->blue_mask, &dib->blue_shift, &dib->blue_len); } -static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, void *bits) +static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, + RGBQUAD *color_table, int color_table_size, void *bits) { static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; static const DWORD bit_fields_555[3] = {0x7c00, 0x03e0, 0x001f}; @@ -118,13 +119,26 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD return FALSE; } + if(color_table) + { + dib->color_table = HeapAlloc(GetProcessHeap(), 0, color_table_size * sizeof(dib->color_table[0])); + if(!dib->color_table) return FALSE; + dib->color_table_size = color_table_size; + memcpy(dib->color_table, color_table, color_table_size * sizeof(color_table[0])); + } + else + { + dib->color_table = NULL; + dib->color_table_size = 0; + } + return TRUE; } -BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage) +BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage, HPALETTE palette) { DWORD *masks = NULL; - RGBQUAD *color_table = NULL; + RGBQUAD *color_table = NULL, pal_table[256]; BYTE *ptr = (BYTE*)bi + bi->biSize; int num_colors = bi->biClrUsed; @@ -135,17 +149,37 @@ BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD u } if(!num_colors && bi->biBitCount <= 8) num_colors = 1 << bi->biBitCount; - if(num_colors) color_table = (RGBQUAD*)ptr; - if(usage == DIB_PAL_COLORS) - ptr += num_colors * sizeof(WORD); - else - ptr += num_colors * sizeof(*color_table); + if(num_colors) + { + if(usage == DIB_PAL_COLORS) + { + PALETTEENTRY entries[256]; + const WORD *index = (const WORD*) ptr; + UINT i, count = GetPaletteEntries( palette, 0, num_colors, entries ); + for (i = 0; i < num_colors; i++, index++) + { + PALETTEENTRY *entry = &entries[*index % count]; + pal_table[i].rgbRed = entry->peRed; + pal_table[i].rgbGreen = entry->peGreen; + pal_table[i].rgbBlue = entry->peBlue; + pal_table[i].rgbReserved = 0; + } + color_table = pal_table; + ptr += num_colors * sizeof(WORD); + } + else + { + color_table = (RGBQUAD*)ptr; + ptr += num_colors * sizeof(*color_table); + } + } - return init_dib_info(dib, bi, masks, ptr); + return init_dib_info(dib, bi, masks, color_table, num_colors, ptr); } static void clear_dib_info(dib_info *dib) { + dib->color_table = NULL; dib->bits = NULL; } @@ -156,6 +190,8 @@ static void clear_dib_info(dib_info *dib) */ void free_dib_info(dib_info *dib, BOOL free_bits) { + HeapFree(GetProcessHeap(), 0, dib->color_table); + dib->color_table = NULL; if(free_bits) { HeapFree(GetProcessHeap(), 0, dib->bits); @@ -176,6 +212,14 @@ void copy_dib_color_info(dib_info *dst, const dib_info *src) dst->green_shift = src->green_shift; dst->blue_shift = src->blue_shift; dst->funcs = src->funcs; + dst->color_table_size = src->color_table_size; + dst->color_table = NULL; + if(dst->color_table_size) + { + int size = dst->color_table_size * sizeof(dst->color_table[0]); + dst->color_table = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(dst->color_table, src->color_table, size); + } } /************************************************************** @@ -239,7 +283,8 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) clear_dib_info(&pdev->brush_dib); pdev->brush_and_bits = pdev->brush_xor_bits = NULL; - if(!init_dib_info(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->dib->dsBm.bmBits)) + if(!init_dib_info(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, + bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits)) pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index a8e1dd9..a330d0a 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -54,7 +54,7 @@ extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; -extern BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage) DECLSPEC_HIDDEN; +extern BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage, HPALETTE pal) DECLSPEC_HIDDEN; extern void free_dib_info(dib_info *dib, BOOL free_bits) DECLSPEC_HIDDEN; extern void free_pattern_brush(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index ebe94c0..ce6e710 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1117,9 +1117,11 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) { BITMAPINFOHEADER *bi = GlobalLock((HGLOBAL)logbrush.lbHatch); dib_info orig_dib; + WORD usage = LOWORD(logbrush.lbColor); + HPALETTE pal = (usage == DIB_PAL_COLORS) ? GetCurrentObject(dev->hdc, OBJ_PAL) : NULL; if(!bi) return NULL; - if(init_dib_info_from_packed(&orig_dib, bi, LOWORD(logbrush.lbColor))) + if(init_dib_info_from_packed(&orig_dib, bi, usage, pal)) { copy_dib_color_info(&pdev->brush_dib, &pdev->dib); if(convert_dib(&pdev->brush_dib, &orig_dib)) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0f59f48..9a188ee 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -89,6 +89,9 @@ typedef struct int red_shift, green_shift, blue_shift; int red_len, green_len, blue_len; + RGBQUAD *color_table; + DWORD color_table_size; + const struct primitive_funcs *funcs; } dib_info;

1 0