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

Rico Schüller : d3dx9: Introduce get_valid_parameter() .
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: f56af02f8ccdffb9f81c1f473b56315983082834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56af02f8ccdffb9f81c1f473… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 20 08:57:18 2011 +0200 d3dx9: Introduce get_valid_parameter(). --- dlls/d3dx9_36/effect.c | 100 ++++++++++++++++------------------------------- 1 files changed, 34 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f56af02f8ccdffb9f81c1…

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetMatrix().
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 66a820683e1c213c9ade07fb2c6a81b7713a3b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a820683e1c213c9ade07fb2… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 20 08:57:21 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetMatrix(). --- dlls/d3dx9_36/effect.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ea24d4b..fdb5859 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -880,6 +880,22 @@ static inline BOOL get_bool(void *data) return (*(DWORD *)data) ? TRUE : FALSE; } +static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) +{ + unsigned int i, k; + + for (i = 0; i < 4; ++i) + { + for (k = 0; k < 4; ++k) + { + if ((i < param->rows) && (k < param->columns)) + matrix->m[i][k] = get_float(param->type, (float *)param->data + i * param->columns + k); + else + matrix->m[i][k] = 0.0f; + } + } +} + static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_parameter *parameter, LPCSTR name) { UINT element; @@ -1835,10 +1851,35 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrix(ID3DXBaseEffect *iface, D3DX static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrix(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p stub\n", This, parameter, matrix); + TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); - return E_NOTIMPL; + if (matrix && param && !param->element_count) + { + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + get_matrix(param, matrix); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix, UINT count)

1 0

Dan Kegel : riched20/tests: Add test for WB_ISDELIMITER.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: dafd6fecd1dc5cd07e8bcbcbd2acff3798406eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dafd6fecd1dc5cd07e8bcbcbd… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Jul 18 08:43:48 2011 -0700 riched20/tests: Add test for WB_ISDELIMITER. --- dlls/riched20/tests/editor.c | 106 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 104 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c0ad42f..6bc2d6b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -46,19 +46,32 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH], string3[MAX_PATH]; static HMODULE hmoduleRichEdit; -static HWND new_window(LPCTSTR lpClassName, DWORD dwStyle, HWND parent) { +static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; - hwnd = CreateWindow(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL + hwnd = CreateWindowA(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL |WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); return hwnd; } +static HWND new_windowW(LPCWSTR lpClassName, DWORD dwStyle, HWND parent) { + HWND hwnd; + hwnd = CreateWindowW(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL + |WS_VISIBLE, 0, 0, 200, 60, parent, NULL, + hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", wine_dbgstr_w(lpClassName), (int) GetLastError()); + return hwnd; +} + static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS, ES_MULTILINE, parent); } +static HWND new_richeditW(HWND parent) { + return new_windowW(RICHEDIT_CLASS20W, ES_MULTILINE, parent); +} + /* Keeps the window reponsive for the deley_time in seconds. * This is useful for debugging a test to see what is happening. */ static void keep_responsive(time_t delay_time) @@ -7034,6 +7047,93 @@ static void test_dialogmode(void) DestroyWindow(hwParent); } +static void test_EM_FINDWORDBREAK_W(void) +{ + static const struct { + WCHAR c; + BOOL isdelimiter; /* expected result of WB_ISDELIMITER */ + } delimiter_tests[] = { + {0x0a, FALSE}, /* newline */ + {0x0b, FALSE}, /* vertical tab mark */ + {0x0c, FALSE}, /* form feed */ + {0x0d, FALSE}, /* carriage return */ + {0x20, TRUE}, /* ANSI Space */ + {0x61, FALSE}, /* ASCII capital letter a */ + {0xa0, FALSE}, /* no-break space */ + {0x2000, FALSE}, /* en quad */ + {0x3000, FALSE}, /* Ideographic space */ + {0x1100, FALSE}, /* Hangul Choseong Kiyeok (G sound) Ordinary Letter*/ + {0x11ff, FALSE}, /* Hangul Jongseoung Kiyeok-Hieuh (Hard N sound) Ordinary Letter*/ + {0x115f, FALSE}, /* Hangul Choseong Filler (no sound, used with two letter Hangul words) Ordinary Letter */ + {0xac00, FALSE}, /* Hangul character GA*/ + {0xd7af, FALSE}, /* End of Hangul character chart */ + {0xf020, TRUE}, /* High Surrogate Space */ + {0xff20, FALSE}, /* MS private for CP_SYMBOL round trip? */ + {WCH_EMBEDDING, FALSE}, /* object replacement character*/ + }; + int i; + HWND hwndRichEdit = new_richeditW(NULL); + ok(IsWindowUnicode(hwndRichEdit), "window should be unicode\n"); + for (i = 0; i < sizeof(delimiter_tests)/sizeof(delimiter_tests[0]); i++) + { + WCHAR wbuf[2]; + int result; + + wbuf[0] = delimiter_tests[i].c; + wbuf[1] = 0; + SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)wbuf); + result = SendMessageW(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER,0); + if (wbuf[0] == 0x20 || wbuf[0] == 0xf020) + todo_wine + ok(result == delimiter_tests[i].isdelimiter, + "wanted ISDELIMITER_W(0x%x) %d, got %d\n", + delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result); + else + ok(result == delimiter_tests[i].isdelimiter, + "wanted ISDELIMITER_W(0x%x) %d, got %d\n", + delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result); + } + DestroyWindow(hwndRichEdit); +} + +static void test_EM_FINDWORDBREAK_A(void) +{ + static const struct { + WCHAR c; + BOOL isdelimiter; /* expected result of WB_ISDELIMITER */ + } delimiter_tests[] = { + {0x0a, FALSE}, /* newline */ + {0x0b, FALSE}, /* vertical tab mark */ + {0x0c, FALSE}, /* form feed */ + {0x0d, FALSE}, /* carriage return */ + {0x20, TRUE}, /* ANSI Space */ + {0x61, FALSE}, /* ASCII capital letter a */ + }; + int i; + HWND hwndRichEdit = new_richedit(NULL); + + ok(!IsWindowUnicode(hwndRichEdit), "window should not be unicode\n"); + for (i = 0; i < sizeof(delimiter_tests)/sizeof(delimiter_tests[0]); i++) + { + int result; + char buf[2]; + buf[0] = delimiter_tests[i].c; + buf[1] = 0; + SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buf); + result = SendMessage(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER, 0); + if (buf[0] == 0x20) + todo_wine + ok(result == delimiter_tests[i].isdelimiter, + "wanted ISDELIMITER_A(0x%x) %d, got %d\n", + delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result); + else + ok(result == delimiter_tests[i].isdelimiter, + "wanted ISDELIMITER_A(0x%x) %d, got %d\n", + delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result); + } + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { BOOL ret; @@ -7090,6 +7190,8 @@ START_TEST( editor ) test_WM_GETDLGCODE(); test_zoom(); test_dialogmode(); + test_EM_FINDWORDBREAK_W(); + test_EM_FINDWORDBREAK_A(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Stefan Dösinger : wined3d: Don' t apply and invalidate the framebuffer when clearing the device's fb.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: f99a2748e4d2ca540f774b09d10cb99c36bb61c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f99a2748e4d2ca540f774b09d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 8 00:49:58 2011 +0200 wined3d: Don't apply and invalidate the framebuffer when clearing the device's fb. --- dlls/wined3d/context.c | 70 ++++++++++++++++++++++++++++++------------------ 1 files changed, 44 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b760154..3d17691 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2073,43 +2073,60 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d UINT i; struct wined3d_surface **rts = fb->render_targets; - if (!context_validate_rt_config(rt_count, rts, fb->depth_stencil)) - return FALSE; - - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + if (isStateDirty(context, STATE_FRAMEBUFFER) || fb != &device->fb + || rt_count != device->adapter->gl_info.limits.buffers) { - context_validate_onscreen_formats(device, context, fb->depth_stencil); - - ENTER_GL(); + if (!context_validate_rt_config(rt_count, fb->render_targets, fb->depth_stencil)) + return FALSE; - if (!rt_count || surface_is_offscreen(rts[0])) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - for (i = 0; i < rt_count; ++i) + context_validate_onscreen_formats(device, context, fb->depth_stencil); + + ENTER_GL(); + + if (!rt_count || surface_is_offscreen(fb->render_targets[0])) { - context->blit_targets[i] = rts[i]; - if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) - rt_mask |= (1 << i); + for (i = 0; i < rt_count; ++i) + { + context->blit_targets[i] = rts[i]; + if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + rt_mask |= (1 << i); + } + while (i < context->gl_info->limits.buffers) + { + context->blit_targets[i] = NULL; + ++i; + } + context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, fb->depth_stencil, SFLAG_INTEXTURE); + glReadBuffer(GL_NONE); + checkGLcall("glReadBuffer"); } - while (i < context->gl_info->limits.buffers) + else { - context->blit_targets[i] = NULL; - ++i; + context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, SFLAG_INDRAWABLE); + rt_mask = context_generate_rt_mask_from_surface(fb->render_targets[0]); } - context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, fb->depth_stencil, SFLAG_INTEXTURE); - glReadBuffer(GL_NONE); - checkGLcall("glReadBuffer"); + + LEAVE_GL(); + + /* If the framebuffer is not the device's fb the device's fb has to be reapplied + * next draw. Otherwise we could mark the framebuffer state clean here, once the + * state management allows this */ + context_invalidate_state(context, STATE_FRAMEBUFFER, device->StateTable); } else { - context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, SFLAG_INDRAWABLE); - rt_mask = context_generate_rt_mask_from_surface(rts[0]); + rt_mask = context_generate_rt_mask_no_fbo(device, rts[0]); + } + } + else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO + && (!rt_count || surface_is_offscreen(fb->render_targets[0]))) + { + for (i = 0; i < rt_count; ++i) + { + if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) rt_mask |= (1 << i); } - - LEAVE_GL(); - - /* TODO: This is not necessary if the framebuffer is the device's current framebuffer */ - context_invalidate_state(context, STATE_FRAMEBUFFER, device->StateTable); } else { @@ -2121,6 +2138,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; + context_invalidate_state(context, STATE_FRAMEBUFFER, device->StateTable); } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)

1 0

Nikolay Sivov : comctl32/tests: Test that edit box is not multiline.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 328368cba29b75f202f4153faf7edfec7d20094b URL: http://source.winehq.org/git/wine.git/?a=commit;h=328368cba29b75f202f4153fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 18 07:16:59 2011 +0400 comctl32/tests: Test that edit box is not multiline. --- dlls/comctl32/tests/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 15a0b5d..a848575 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -377,6 +377,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP /* edit control still available from this notification */ edit = (HWND)SendMessageA(((NMHDR*)lParam)->hwndFrom, LVM_GETEDITCONTROL, 0, 0); ok(IsWindow(edit), "expected valid edit control handle\n"); + ok((GetWindowLongA(edit, GWL_STYLE) & ES_MULTILINE) == 0, "edit is multiline\n"); return TRUE; }

1 0

Alexandre Julliard : winex11: Remap pixels to system palette in Get/ PutImage for 4 and 8 bpp.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: be74c47e867da6f767b911cc4678af00f9b00b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be74c47e867da6f767b911cc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 14:48:01 2011 +0200 winex11: Remap pixels to system palette in Get/PutImage for 4 and 8 bpp. --- dlls/winex11.drv/bitblt.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 7a36b8b..836e251 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1642,7 +1642,7 @@ static void set_color_info( const ColorShifts *color_shifts, BITMAPINFO *info ) /* copy the image bits, fixing up alignment and byte swapping as necessary */ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, - unsigned int zeropad_mask ) + const int *mapping, unsigned int zeropad_mask ) { #ifdef WORDS_BIGENDIAN static const int client_byte_order = MSBFirst; @@ -1678,6 +1678,7 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, if ((need_byteswap && !src_bits->is_copy) || /* need to swap bytes */ (zeropad_mask != ~0u && !src_bits->is_copy) || /* need to clear padding bytes */ + (mapping && !src_bits->is_copy) || /* need to remap pixels */ (width_bytes & 3) || /* need to fixup line alignment */ (info->bmiHeader.biHeight > 0)) /* need to flip vertically */ { @@ -1696,7 +1697,7 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, dst_bits->offset = src_bits->offset; dst_bits->is_copy = src_bits->is_copy; dst_bits->free = NULL; - if (!need_byteswap && zeropad_mask == ~0u) return ERROR_SUCCESS; /* nothing to do */ + if (!need_byteswap && zeropad_mask == ~0u && !mapping) return ERROR_SUCCESS; /* nothing to do */ } src = src_bits->ptr; @@ -1709,7 +1710,7 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, width_bytes = -width_bytes; } - if (need_byteswap) + if (need_byteswap || mapping) { switch (info->bmiHeader.biBitCount) { @@ -1724,8 +1725,20 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, case 4: for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) { + if (mapping) + for (x = 0; x < image->bytes_per_line; x++) + dst[x] = (mapping[src[x] & 0x0f] << 4) | mapping[src[x] >> 4]; + else + for (x = 0; x < image->bytes_per_line; x++) + dst[x] = (src[x] << 4) | (src[x] >> 4); + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } + break; + case 8: + for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) + { for (x = 0; x < image->bytes_per_line; x++) - dst[x] = (src[x] << 4) | (src[x] >> 4); + dst[x] = mapping[src[x]]; ((unsigned int *)dst)[padding_pos] &= zeropad_mask; } break; @@ -1787,6 +1800,8 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str struct gdi_image_bits dst_bits; const XPixmapFormatValues *format; const ColorShifts *color_shifts; + const BYTE *opcode = BITBLT_Opcodes[(rop >> 16) & 0xff]; + const int *mapping = NULL; if (hbitmap) { @@ -1845,7 +1860,13 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str wine_tsx11_unlock(); if (!image) return ERROR_OUTOFMEMORY; - ret = copy_image_bits( info, color_shifts, image, bits, &dst_bits, ~0u ); + if (image->bits_per_pixel == 4 || image->bits_per_pixel == 8) + { + if (bitmap || (!opcode[1] && OP_SRCDST(opcode[0]) == OP_ARGS(SRC,DST))) + mapping = X11DRV_PALETTE_PaletteToXPixel; + } + + ret = copy_image_bits( info, color_shifts, image, bits, &dst_bits, mapping, ~0u ); if (!ret) { @@ -1862,8 +1883,6 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str } else { - const BYTE *opcode = BITBLT_Opcodes[(rop >> 16) & 0xff]; - X11DRV_LockDIBSection( physdev, DIB_Status_GdiMod ); /* optimization for single-op ROPs */ @@ -1931,6 +1950,7 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits src_bits; const XPixmapFormatValues *format; const ColorShifts *color_shifts; + const int *mapping = NULL; if (hbitmap) { @@ -1952,8 +1972,8 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, switch (format->bits_per_pixel) { case 1: align = 32; break; - case 4: align = 8; break; - case 8: align = 4; break; + case 4: align = 8; mapping = X11DRV_PALETTE_XPixelToPalette; break; + case 8: align = 4; mapping = X11DRV_PALETTE_XPixelToPalette; break; case 16: align = 2; break; case 24: align = 4; break; case 32: align = 1; break; @@ -2021,7 +2041,7 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, src_bits.ptr = image->data; src_bits.is_copy = TRUE; - ret = copy_image_bits( info, color_shifts, image, &src_bits, bits, + ret = copy_image_bits( info, color_shifts, image, &src_bits, bits, mapping, zeropad_masks[(width * image->bits_per_pixel) & 31] ); if (!ret && bits->ptr == image->data)

1 0

Alexandre Julliard : winex11: Fill in the color table in Get/ PutImage for 4 and 8 bpp.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 476a1fa1fbdb5f770fb5a676463452e87791ceab URL: http://source.winehq.org/git/wine.git/?a=commit;h=476a1fa1fbdb5f770fb5a6764… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 11 22:45:05 2011 +0200 winex11: Fill in the color table in Get/PutImage for 4 and 8 bpp. --- dlls/winex11.drv/bitblt.c | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 836e251..3e1a4ce 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1614,27 +1614,47 @@ static void free_ximage_bits( struct gdi_image_bits *bits ) } /* store the palette or color mask data in the bitmap info structure */ -static void set_color_info( const ColorShifts *color_shifts, BITMAPINFO *info ) +static void set_color_info( PHYSDEV dev, const ColorShifts *color_shifts, BITMAPINFO *info ) { DWORD *colors = (DWORD *)((char *)info + info->bmiHeader.biSize); + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biClrUsed = 0; + switch (info->bmiHeader.biBitCount) { - case 1: case 4: case 8: - info->bmiHeader.biCompression = BI_RGB; - /* FIXME: set color palette */ + { + RGBQUAD *rgb = (RGBQUAD *)colors; + PALETTEENTRY palette[256]; + UINT i, count; + + info->bmiHeader.biClrUsed = 1 << info->bmiHeader.biBitCount; + count = X11DRV_GetSystemPaletteEntries( dev, 0, info->bmiHeader.biClrUsed, palette ); + for (i = 0; i < count; i++) + { + rgb[i].rgbRed = palette[i].peRed; + rgb[i].rgbGreen = palette[i].peGreen; + rgb[i].rgbBlue = palette[i].peBlue; + rgb[i].rgbReserved = 0; + } + memset( &rgb[count], 0, (info->bmiHeader.biClrUsed - count) * sizeof(*rgb) ); break; + } case 16: - case 32: - info->bmiHeader.biCompression = BI_BITFIELDS; colors[0] = color_shifts->logicalRed.max << color_shifts->logicalRed.shift; colors[1] = color_shifts->logicalGreen.max << color_shifts->logicalGreen.shift; colors[2] = color_shifts->logicalBlue.max << color_shifts->logicalBlue.shift; + if (colors[0] != 0x7c00 || colors[1] != 0x03e0 || colors[2] != 0x001f) + info->bmiHeader.biCompression = BI_BITFIELDS; break; - case 24: - info->bmiHeader.biCompression = BI_RGB; + case 32: + colors[0] = color_shifts->logicalRed.max << color_shifts->logicalRed.shift; + colors[1] = color_shifts->logicalGreen.max << color_shifts->logicalGreen.shift; + colors[2] = color_shifts->logicalBlue.max << color_shifts->logicalBlue.shift; + if (colors[0] != 0xff0000 || colors[1] != 0x00ff00 || colors[2] != 0x0000ff) + info->bmiHeader.biCompression = BI_BITFIELDS; break; } } @@ -1931,7 +1951,7 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = format->bits_per_pixel; if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; - set_color_info( physdev->color_shifts, info ); + set_color_info( dev, physdev->color_shifts, info ); return ERROR_BAD_FORMAT; } @@ -2035,9 +2055,8 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, info->bmiHeader.biSizeImage = height * image->bytes_per_line; info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; - info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - set_color_info( color_shifts, info ); + set_color_info( dev, color_shifts, info ); src_bits.ptr = image->data; src_bits.is_copy = TRUE;

1 0

Alexandre Julliard : winex11: Verify that the color map matches in PutImage for 4 and 8 bpp.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: be835e2d9b1b3671974c42b9610261f8bd3fe152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be835e2d9b1b3671974c42b96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 11:42:17 2011 +0200 winex11: Verify that the color map matches in PutImage for 4 and 8 bpp. --- dlls/winex11.drv/bitblt.c | 89 +++++++++++++++++++++++++++++---------------- 1 files changed, 57 insertions(+), 32 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 3e1a4ce..d186687 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1659,6 +1659,60 @@ static void set_color_info( PHYSDEV dev, const ColorShifts *color_shifts, BITMAP } } +/* check if the specified color info is suitable for PutImage */ +static BOOL matching_color_info( PHYSDEV dev, const ColorShifts *color_shifts, const BITMAPINFO *info ) +{ + DWORD *colors = (DWORD *)((char *)info + info->bmiHeader.biSize); + + switch (info->bmiHeader.biBitCount) + { + case 1: + if (info->bmiHeader.biCompression != BI_RGB) return FALSE; + return !info->bmiHeader.biClrUsed; /* color map not allowed */ + case 4: + case 8: + { + RGBQUAD *rgb = (RGBQUAD *)colors; + PALETTEENTRY palette[256]; + UINT i, count; + + if (info->bmiHeader.biCompression != BI_RGB) return FALSE; + count = X11DRV_GetSystemPaletteEntries( dev, 0, 1 << info->bmiHeader.biBitCount, palette ); + if (count != info->bmiHeader.biClrUsed) return FALSE; + for (i = 0; i < count; i++) + { + if (rgb[i].rgbRed != palette[i].peRed || + rgb[i].rgbGreen != palette[i].peGreen || + rgb[i].rgbBlue != palette[i].peBlue) return FALSE; + } + return TRUE; + } + case 16: + if (info->bmiHeader.biCompression == BI_BITFIELDS) + return (color_shifts->logicalRed.max << color_shifts->logicalRed.shift == colors[0] && + color_shifts->logicalGreen.max << color_shifts->logicalGreen.shift == colors[1] && + color_shifts->logicalBlue.max << color_shifts->logicalBlue.shift == colors[2]); + if (info->bmiHeader.biCompression == BI_RGB) + return (color_shifts->logicalRed.max << color_shifts->logicalRed.shift == 0x7c00 && + color_shifts->logicalGreen.max << color_shifts->logicalGreen.shift == 0x03e0 && + color_shifts->logicalBlue.max << color_shifts->logicalBlue.shift == 0x001f); + break; + case 32: + if (info->bmiHeader.biCompression == BI_BITFIELDS) + return (color_shifts->logicalRed.max << color_shifts->logicalRed.shift == colors[0] && + color_shifts->logicalGreen.max << color_shifts->logicalGreen.shift == colors[1] && + color_shifts->logicalBlue.max << color_shifts->logicalBlue.shift == colors[2]); + /* fall through */ + case 24: + if (info->bmiHeader.biCompression == BI_RGB) + return (color_shifts->logicalRed.max << color_shifts->logicalRed.shift == 0xff0000 && + color_shifts->logicalGreen.max << color_shifts->logicalGreen.shift == 0x00ff00 && + color_shifts->logicalBlue.max << color_shifts->logicalBlue.shift == 0x0000ff); + break; + } + return FALSE; +} + /* copy the image bits, fixing up alignment and byte swapping as necessary */ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, @@ -1814,7 +1868,7 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str { X11DRV_PDEVICE *physdev; X_PHYSBITMAP *bitmap; - DWORD ret = ERROR_SUCCESS; + DWORD ret; XImage *image; int depth; struct gdi_image_bits dst_bits; @@ -1842,37 +1896,8 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str if (info->bmiHeader.biPlanes != 1) goto update_format; if (info->bmiHeader.biBitCount != format->bits_per_pixel) goto update_format; /* FIXME: could try to handle 1-bpp using XCopyPlane */ - - if (info->bmiHeader.biCompression == BI_BITFIELDS) - { - DWORD *masks = (DWORD *)((char *)info + info->bmiHeader.biSize); - if (color_shifts->logicalRed.max << color_shifts->logicalRed.shift != masks[0] || - color_shifts->logicalGreen.max << color_shifts->logicalGreen.shift != masks[1] || - color_shifts->logicalBlue.max << color_shifts->logicalBlue.shift != masks[2]) - goto update_format; - } - else if (info->bmiHeader.biCompression == BI_RGB) - { - switch (info->bmiHeader.biBitCount) - { - case 16: - if (color_shifts->logicalRed.max << color_shifts->logicalRed.shift != 0x7c00 || - color_shifts->logicalGreen.max << color_shifts->logicalGreen.shift != 0x03e0 || - color_shifts->logicalBlue.max << color_shifts->logicalBlue.shift != 0x001f) - goto update_format; - break; - case 24: - case 32: - if (color_shifts->logicalRed.max << color_shifts->logicalRed.shift != 0xff0000 || - color_shifts->logicalGreen.max << color_shifts->logicalGreen.shift != 0x00ff00 || - color_shifts->logicalBlue.max << color_shifts->logicalBlue.shift != 0x0000ff) - goto update_format; - break; - } - } - else goto update_format; - - if (!bits) return ret; /* just querying the format */ + if (!matching_color_info( dev, color_shifts, info )) goto update_format; + if (!bits) return ERROR_SUCCESS; /* just querying the format */ wine_tsx11_lock(); image = XCreateImage( gdi_display, visual, depth, ZPixmap, 0, NULL,

1 0

Alexandre Julliard : gdi32: Add a special case for converting dibs to 1-bpp using the background color .
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 07528a24b9d93caf7fcac068a97d9971b144a515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07528a24b9d93caf7fcac068a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 19 20:06:32 2011 +0200 gdi32: Add a special case for converting dibs to 1-bpp using the background color. --- dlls/gdi32/dibdrv/primitives.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index f2908e8..e1e9aca 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -692,6 +692,14 @@ static DWORD colorref_to_pixel_colortable(const dib_info *dib, COLORREF color) rgb.rgbGreen = GetGValue(color); rgb.rgbBlue = GetBValue(color); + /* special case for conversion to 1-bpp without a color table: + * we get a 1-entry table containing the background color + */ + if (dib->bit_count == 1 && dib->color_table_size == 1) + return (rgb.rgbRed == dib->color_table[0].rgbRed && + rgb.rgbGreen == dib->color_table[0].rgbGreen && + rgb.rgbBlue == dib->color_table[0].rgbBlue); + for(i = 0; i < dib->color_table_size; i++) { RGBQUAD *cur = dib->color_table + i;

1 0

Alexandre Julliard : gdi32: Set the color maps to the destination DC colors for 1-bpp images.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 414fe85c8a99af38599cc4815fb855b10bfa77a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=414fe85c8a99af38599cc4815… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 19 14:11:04 2011 +0200 gdi32: Set the color maps to the destination DC colors for 1-bpp images. --- dlls/gdi32/bitblt.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index e87ecfd..0b61729 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -224,6 +224,34 @@ try_get_image: { RECT src_rect = src->visrect; + /* 1-bpp source without a color table uses the destination DC colors */ + if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) + { + COLORREF color = GetTextColor( dst_dev->hdc ); + src_info->bmiColors[0].rgbRed = GetRValue( color ); + src_info->bmiColors[0].rgbGreen = GetGValue( color ); + src_info->bmiColors[0].rgbBlue = GetBValue( color ); + src_info->bmiColors[0].rgbReserved = 0; + color = GetBkColor( dst_dev->hdc ); + src_info->bmiColors[1].rgbRed = GetRValue( color ); + src_info->bmiColors[1].rgbGreen = GetGValue( color ); + src_info->bmiColors[1].rgbBlue = GetBValue( color ); + src_info->bmiColors[1].rgbReserved = 0; + src_info->bmiHeader.biClrUsed = 2; + } + + /* 1-bpp destination without a color table requires a fake 1-entry table + * that contains only the background color */ + if (dst_info->bmiHeader.biBitCount == 1 && !dst_info->bmiHeader.biClrUsed) + { + COLORREF color = GetBkColor( src_dev->hdc ); + dst_info->bmiColors[0].rgbRed = GetRValue( color ); + dst_info->bmiColors[0].rgbGreen = GetGValue( color ); + dst_info->bmiColors[0].rgbBlue = GetBValue( color ); + dst_info->bmiColors[0].rgbReserved = 0; + dst_info->bmiHeader.biClrUsed = 1; + } + offset_rect( &src_rect, src_bits.offset - src->visrect.left, -src->visrect.top ); dst_info->bmiHeader.biWidth = src_rect.right - src_rect.left; dst_bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); @@ -233,7 +261,11 @@ try_get_image: dst_bits.offset = 0; dst_bits.free = free_heap_bits; if (!(err = convert_bitmapinfo( src_info, src_bits.ptr, &src_rect, dst_info, dst_bits.ptr ))) + { + /* get rid of the fake 1-bpp table */ + if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &dst_bits, &dst->visrect, rop ); + } if (dst_bits.free) dst_bits.free( &dst_bits ); } else err = ERROR_OUTOFMEMORY;

1 0