October 2011 - Wine-Commits

Vincent Povirk : windowscodecs: Use a smaller magic number to detect JPEG files.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 219b987fa11cff464eaf76065adf687e9fb400d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=219b987fa11cff464eaf76065… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 11 11:36:05 2011 -0500 windowscodecs: Use a smaller magic number to detect JPEG files. --- dlls/windowscodecs/regsvr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 1ea0aa0..bc12e40 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -720,7 +720,7 @@ static struct decoder_pattern const ico_patterns[] = { {0} }; -static const BYTE jpeg_magic[] = {0xff, 0xd8, 0xff, 0xe0}; +static const BYTE jpeg_magic[] = {0xff, 0xd8}; static GUID const * const jpeg_formats[] = { &GUID_WICPixelFormat24bppBGR, @@ -730,7 +730,7 @@ static GUID const * const jpeg_formats[] = { }; static struct decoder_pattern const jpeg_patterns[] = { - {4,0,jpeg_magic,mask_all,0}, + {2,0,jpeg_magic,mask_all,0}, {0} };

1 0

Dylan Smith : d3dx9: Removed a duplicate NULL check.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 8f8e86eaa35af2c20589fa1933e82ef3c62b2958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8e86eaa35af2c20589fa193… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Oct 13 09:12:55 2011 -0400 d3dx9: Removed a duplicate NULL check. --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6e1433e..2460373 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3444,7 +3444,7 @@ HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc current_frame = frame->pFrameSibling; frame->pFrameSibling = current_frame->pFrameSibling; current_frame->pFrameSibling = NULL; - } else if (frame) { + } else { current_frame = frame; last = TRUE; }

1 0

Vincent Povirk : msi: Use MsgWaitForMultipleObjectsEx to do waits.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 2556173f20ba9583044aaf31b16cbb2214d2b907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2556173f20ba9583044aaf31b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 13 13:32:42 2011 -0500 msi: Use MsgWaitForMultipleObjectsEx to do waits. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 7074a7b..8b10215 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3787,7 +3787,7 @@ void msi_dialog_check_messages( HANDLE handle ) if( uiThreadId != GetCurrentThreadId() ) { if( handle ) - WaitForSingleObject( handle, INFINITE ); + MsgWaitForMultipleObjectsEx( 1, &handle, INFINITE, 0, 0 ); return; }

1 0

Frédéric Delanoy : cmd/tests: Show that read-only files are MOVEable.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: ad9ae2b8ff91a0148b4216a8eb964c41588e18d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9ae2b8ff91a0148b4216a8e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 13 17:30:16 2011 +0200 cmd/tests: Show that read-only files are MOVEable. --- programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 49e3fde..1967e42 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -932,6 +932,17 @@ if not exist bar ( ) type baz +attrib +r baz +move baz bazro > nul 2>&1 +if not exist baz ( + if exist bazro ( + echo read-only files are moveable + move bazro baz > nul 2>&1 + ) +) else ( + echo read-only file not moved! +) +attrib -r baz mkdir rep move baz rep > nul 2>&1 if not exist baz ( diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 33a8113..2318d08 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -609,6 +609,7 @@ bar file move succeeded @todo_wine(a)file move with overwrite succeeded(a)or_broken@file overwrite impossible! @todo_wine(a)bar@or_broken(a)baz +(a)todo_wine@read-only files are moveable file moved in subdirectory @todo_wine(a)moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op! @todo_wine(a)ErrorLevel: 0(a)or_broken@ErrorLevel: 1

1 0

Frédéric Delanoy : cmd: Make MOVE work for read-only files.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 1e4c17e5ddc30581067c13cff48e672b1a292329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e4c17e5ddc30581067c13cff… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 13 17:30:17 2011 +0200 cmd: Make MOVE work for read-only files. --- programs/cmd/builtins.c | 87 +++++++++++++---------------- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 2 files changed, 40 insertions(+), 49 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1db9b3c..ed2b6f0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1554,8 +1554,8 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { * Move a file, directory tree or wildcarded set of files. */ -void WCMD_move (void) { - +void WCMD_move (void) +{ int status; WIN32_FIND_DATAW fd; HANDLE hff; @@ -1594,6 +1594,7 @@ void WCMD_move (void) { WCHAR dest[MAX_PATH]; WCHAR src[MAX_PATH]; DWORD attribs; + BOOL ok = TRUE; WINE_TRACE("Processing file '%s'\n", wine_dbgstr_w(fd.cFileName)); @@ -1617,60 +1618,50 @@ void WCMD_move (void) { WINE_TRACE("Source '%s'\n", wine_dbgstr_w(src)); WINE_TRACE("Dest '%s'\n", wine_dbgstr_w(dest)); - /* Check if file is read only, otherwise move it */ - attribs = GetFileAttributesW(src); - if ((attribs != INVALID_FILE_ATTRIBUTES) && - (attribs & FILE_ATTRIBUTE_READONLY)) { - SetLastError(ERROR_ACCESS_DENIED); - status = 0; - } else { - BOOL ok = TRUE; - - /* If destination exists, prompt unless /Y supplied */ - if (GetFileAttributesW(dest) != INVALID_FILE_ATTRIBUTES) { - BOOL force = FALSE; - WCHAR copycmd[MAXSTRING]; - int len; - - /* /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ - if (strstrW (quals, parmNoY)) - force = FALSE; - else if (strstrW (quals, parmY)) - force = TRUE; - else { - static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; - len = GetEnvironmentVariableW(copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR)); - force = (len && len < (sizeof(copycmd)/sizeof(WCHAR)) - && ! lstrcmpiW (copycmd, parmY)); - } + /* If destination exists, prompt unless /Y supplied */ + if (GetFileAttributesW(dest) != INVALID_FILE_ATTRIBUTES) { + BOOL force = FALSE; + WCHAR copycmd[MAXSTRING]; + int len; - /* Prompt if overwriting */ - if (!force) { - WCHAR question[MAXSTRING]; - WCHAR yesChar[10]; + /* /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ + if (strstrW (quals, parmNoY)) + force = FALSE; + else if (strstrW (quals, parmY)) + force = TRUE; + else { + static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; + len = GetEnvironmentVariableW(copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR)); + force = (len && len < (sizeof(copycmd)/sizeof(WCHAR)) + && ! lstrcmpiW (copycmd, parmY)); + } - strcpyW(yesChar, WCMD_LoadMessage(WCMD_YES)); + /* Prompt if overwriting */ + if (!force) { + WCHAR question[MAXSTRING]; + WCHAR yesChar[10]; - /* Ask for confirmation */ - wsprintfW(question, WCMD_LoadMessage(WCMD_OVERWRITE), dest); - ok = WCMD_ask_confirm(question, FALSE, NULL); + strcpyW(yesChar, WCMD_LoadMessage(WCMD_YES)); - /* So delete the destination prior to the move */ - if (ok) { - if (!DeleteFileW(dest)) { - WCMD_print_error (); - errorlevel = 1; - ok = FALSE; - } + /* Ask for confirmation */ + wsprintfW(question, WCMD_LoadMessage(WCMD_OVERWRITE), dest); + ok = WCMD_ask_confirm(question, FALSE, NULL); + + /* So delete the destination prior to the move */ + if (ok) { + if (!DeleteFileW(dest)) { + WCMD_print_error (); + errorlevel = 1; + ok = FALSE; } } } + } - if (ok) { - status = MoveFileW(src, dest); - } else { - status = 1; /* Anything other than 0 to prevent error msg below */ - } + if (ok) { + status = MoveFileW(src, dest); + } else { + status = 1; /* Anything other than 0 to prevent error msg below */ } if (!status) { diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2318d08..e45016c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -609,7 +609,7 @@ bar file move succeeded @todo_wine(a)file move with overwrite succeeded(a)or_broken@file overwrite impossible! @todo_wine(a)bar@or_broken(a)baz -(a)todo_wine@read-only files are moveable +read-only files are moveable file moved in subdirectory @todo_wine(a)moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op! @todo_wine(a)ErrorLevel: 0(a)or_broken@ErrorLevel: 1

1 0

Dan Kegel : msi: Initialize variable to placate static analyzers.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: c77395dc08ffa41da3b51278dcb8194951125d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77395dc08ffa41da3b51278d… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Oct 13 06:26:15 2011 -0700 msi: Initialize variable to placate static analyzers. --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index c1ebe17..ce08940 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -350,7 +350,7 @@ done: static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWSTR szCommandLine) { - UINT r, i; + UINT i, r = ERROR_FUNCTION_FAILED; DWORD size; LPCWSTR cmd_ptr = szCommandLine; LPWSTR cmd, *codes = NULL;

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 445b934005a607e3884ee4310dbb3bd1857f8296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=445b934005a607e3884ee4310… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 14:09:20 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 48 +++++++++--------- dlls/msvcp70/msvcp70.spec | 80 +++++++++++++++--------------- dlls/msvcp71/msvcp71.spec | 96 ++++++++++++++++++------------------ dlls/msvcp80/msvcp80.spec | 112 +++++++++++++++++++++--------------------- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 7 files changed, 171 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=445b934005a607e3884ee…

1 0

Alexandre Julliard : gdi32: Add a helper for RGB to color index mapping to avoid redundant shifts.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: e79033e6fab04e35ded889efadd66ff710258e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79033e6fab04e35ded889efa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 13 11:21:58 2011 +0200 gdi32: Add a helper for RGB to color index mapping to avoid redundant shifts. --- dlls/gdi32/dibdrv/primitives.c | 249 +++++++++++++++++++--------------------- 1 files changed, 120 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e79033e6fab04e35ded88…

1 0

Alexandre Julliard : gdi32: Get rid of the return value in DIB conversion functions, they never fail now.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: a413916802df65f169c783f88372ab5dbf05f9ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a413916802df65f169c783f88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 13 00:15:29 2011 +0200 gdi32: Get rid of the return value in DIB conversion functions, they never fail now. --- dlls/gdi32/dibdrv/dc.c | 3 +- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 10 ++---- dlls/gdi32/dibdrv/primitives.c | 68 +++++---------------------------------- 4 files changed, 15 insertions(+), 68 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 883a60a..29528f5 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -290,7 +290,8 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit __TRY { - ret = dst_dib.funcs->convert_to( &dst_dib, &src_dib, &src->visrect ); + dst_dib.funcs->convert_to( &dst_dib, &src_dib, &src->visrect ); + ret = TRUE; } __EXCEPT_PAGE_FAULT { diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 0be8ffa..7eae7cb 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -141,7 +141,7 @@ typedef struct primitive_funcs void (* copy_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); - BOOL (* convert_to)(dib_info *dst, const dib_info *src, const RECT *src_rect); + void (* convert_to)(dib_info *dst, const dib_info *src, const RECT *src_rect); BOOL (* create_rop_masks)(const dib_info *dib, const dib_info *hatch, const rop_mask *fg, const rop_mask *bg, rop_mask_bits *bits); void (* stretch_row)(const dib_info *dst_dib, const POINT *dst_start, diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 2dcd33a..67eda57 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1349,13 +1349,9 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) rect.right = orig_dib.width; rect.bottom = orig_dib.height; - if(pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &orig_dib, &rect)) - { - pdev->brush_rects = pattern_brush; - pdev->defer &= ~DEFER_BRUSH; - } - else - free_dib_info(&pdev->brush_dib); + pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &orig_dib, &rect); + pdev->brush_rects = pattern_brush; + pdev->defer &= ~DEFER_BRUSH; free_dib_info(&orig_dib); } GlobalUnlock((HGLOBAL)logbrush.lbHatch); diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 051177d..47e5f77 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -1141,7 +1141,7 @@ static inline BOOL bit_fields_match(const dib_info *d1, const dib_info *d2) d1->blue_mask == d2->blue_mask; } -static BOOL convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_rect) { DWORD *dst_start = get_pixel_ptr_32(dst, 0, 0), *dst_pixel, src_val; int x, y, pad_size = (dst->width - (src_rect->right - src_rect->left)) * 4; @@ -1376,16 +1376,10 @@ static BOOL convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_ } break; } - - default: - FIXME("Unsupported conversion: %d -> 8888\n", src->bit_count); - return FALSE; } - - return TRUE; } -static BOOL convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_rect) { DWORD *dst_start = get_pixel_ptr_32(dst, 0, 0), *dst_pixel, src_val; int x, y, pad_size = (dst->width - (src_rect->right - src_rect->left)) * 4; @@ -1648,16 +1642,10 @@ static BOOL convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_re } break; } - - default: - FIXME("Unsupported conversion: %d -> 32\n", src->bit_count); - return FALSE; } - - return TRUE; } -static BOOL convert_to_24(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_24(dib_info *dst, const dib_info *src, const RECT *src_rect) { BYTE *dst_start = get_pixel_ptr_24(dst, 0, 0), *dst_pixel; DWORD src_val; @@ -1897,16 +1885,10 @@ static BOOL convert_to_24(dib_info *dst, const dib_info *src, const RECT *src_re } break; } - - default: - FIXME("Unsupported conversion: %d -> 24\n", src->bit_count); - return FALSE; } - - return TRUE; } -static BOOL convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_rect) { WORD *dst_start = get_pixel_ptr_16(dst, 0, 0), *dst_pixel; INT x, y, pad_size = ((dst->width + 1) & ~1) * 2 - (src_rect->right - src_rect->left) * 2; @@ -2145,16 +2127,10 @@ static BOOL convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r } break; } - - default: - FIXME("Unsupported conversion: %d -> 555\n", src->bit_count); - return FALSE; - } - return TRUE; } -static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_rect) { WORD *dst_start = get_pixel_ptr_16(dst, 0, 0), *dst_pixel; INT x, y, pad_size = ((dst->width + 1) & ~1) * 2 - (src_rect->right - src_rect->left) * 2; @@ -2417,13 +2393,7 @@ static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re } break; } - - default: - FIXME("Unsupported conversion: %d -> 16\n", src->bit_count); - return FALSE; - } - return TRUE; } static inline BOOL color_tables_match(const dib_info *d1, const dib_info *d2) @@ -2434,7 +2404,7 @@ static inline BOOL color_tables_match(const dib_info *d1, const dib_info *d2) return !memcmp(d1->color_table, d2->color_table, d1->color_table_size * sizeof(d1->color_table[0])); } -static BOOL convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rect) { BYTE *dst_start = get_pixel_ptr_8(dst, 0, 0), *dst_pixel; INT x, y, pad_size = ((dst->width + 3) & ~3) - (src_rect->right - src_rect->left); @@ -2695,16 +2665,10 @@ static BOOL convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec } break; } - - default: - FIXME("Unsupported conversion: %d -> 8\n", src->bit_count); - return FALSE; - } - return TRUE; } -static BOOL convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rect) { BYTE *dst_start = get_pixel_ptr_4(dst, 0, 0), *dst_pixel, dst_val; INT x, y, pad_size = ((dst->width + 7) & ~7) / 2 - (src_rect->right - src_rect->left + 1) / 2; @@ -3088,17 +3052,10 @@ static BOOL convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rec } break; } - - default: - FIXME("Unsupported conversion: %d -> 4\n", src->bit_count); - return FALSE; - } - - return TRUE; } -static BOOL convert_to_1(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_1(dib_info *dst, const dib_info *src, const RECT *src_rect) { BYTE *dst_start = get_pixel_ptr_1(dst, 0, 0), *dst_pixel, dst_val; INT x, y, pad_size = ((dst->width + 31) & ~31) / 8 - (src_rect->right - src_rect->left + 7) / 8; @@ -3490,18 +3447,11 @@ static BOOL convert_to_1(dib_info *dst, const dib_info *src, const RECT *src_rec } break; } - - default: - FIXME("Unsupported conversion: %d -> 1\n", src->bit_count); - return FALSE; - } - return TRUE; } -static BOOL convert_to_null(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_null(dib_info *dst, const dib_info *src, const RECT *src_rect) { - return FALSE; } static BOOL create_rop_masks_32(const dib_info *dib, const dib_info *hatch, const rop_mask *fg, const rop_mask *bg, rop_mask_bits *bits)

1 0

Alexandre Julliard : gdi32: Add support for arbitrary DIB bitfields for 32-bpp conversions.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: b084e52bf68ce8e65a375c9e95c48fd629fe76dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b084e52bf68ce8e65a375c9e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 23:25:32 2011 +0200 gdi32: Add support for arbitrary DIB bitfields for 32-bpp conversions. --- dlls/gdi32/dibdrv/primitives.c | 203 ++++++++++++++++++++++++++++++++++------ dlls/gdi32/tests/bitmap.c | 2 +- 2 files changed, 176 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b084e52bf68ce8e65a375…

1 0