May 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : shell32: Fix marshalling of 1-bpp systray icons.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 96a939eee1617039949b249b697b9e9f8fd1a160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a939eee1617039949b249b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 12:45:55 2010 +0200 shell32: Fix marshalling of 1-bpp systray icons. --- dlls/shell32/systray.c | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 3e0b5ac..59df2f8 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -163,43 +163,54 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) BITMAP bmMask; BITMAP bmColour; LONG cbMaskBits; - LONG cbColourBits; + LONG cbColourBits = 0; char *buffer; if (!GetIconInfo(nid->hIcon, &iconinfo)) goto noicon; if (!GetObjectW(iconinfo.hbmMask, sizeof(bmMask), &bmMask) || - !GetObjectW(iconinfo.hbmColor, sizeof(bmColour), &bmColour)) + (iconinfo.hbmColor && !GetObjectW(iconinfo.hbmColor, sizeof(bmColour), &bmColour))) { DeleteObject(iconinfo.hbmMask); - DeleteObject(iconinfo.hbmColor); + if (iconinfo.hbmColor) DeleteObject(iconinfo.hbmColor); goto noicon; } cbMaskBits = (bmMask.bmPlanes * bmMask.bmWidth * bmMask.bmHeight * bmMask.bmBitsPixel + 15) / 16 * 2; - cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel + 15) / 16 * 2; + if (iconinfo.hbmColor) + cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel + 15) / 16 * 2; cds.cbData = sizeof(*data) + cbMaskBits + cbColourBits; buffer = HeapAlloc(GetProcessHeap(), 0, cds.cbData); if (!buffer) { DeleteObject(iconinfo.hbmMask); - DeleteObject(iconinfo.hbmColor); + if (iconinfo.hbmColor) DeleteObject(iconinfo.hbmColor); return FALSE; } data = (struct notify_data *)buffer; memset( data, 0, sizeof(*data) ); - data->width = bmColour.bmWidth; - data->height = bmColour.bmHeight; - data->planes = bmColour.bmPlanes; - data->bpp = bmColour.bmBitsPixel; buffer += sizeof(*data); GetBitmapBits(iconinfo.hbmMask, cbMaskBits, buffer); - buffer += cbMaskBits; - GetBitmapBits(iconinfo.hbmColor, cbColourBits, buffer); + if (!iconinfo.hbmColor) + { + data->width = bmMask.bmWidth; + data->height = bmMask.bmHeight / 2; + data->planes = 1; + data->bpp = 1; + } + else + { + data->width = bmColour.bmWidth; + data->height = bmColour.bmHeight; + data->planes = bmColour.bmPlanes; + data->bpp = bmColour.bmBitsPixel; + buffer += cbMaskBits; + GetBitmapBits(iconinfo.hbmColor, cbColourBits, buffer); + DeleteObject(iconinfo.hbmColor); + } DeleteObject(iconinfo.hbmMask); - DeleteObject(iconinfo.hbmColor); } noicon:

1 0

Vincent Povirk : ole32: Use the cached information in BlockChainStream_GetCount.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 4ad114cfaef87c885231021272ac548766d4393b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad114cfaef87c88523102127… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 6 11:35:56 2010 -0500 ole32: Use the cached information in BlockChainStream_GetCount. --- dlls/ole32/storage32.c | 20 +------------------- 1 files changed, 1 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8bae897..9ac794e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5786,28 +5786,10 @@ static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) * * Returns the number of blocks that comprises this chain. * This is not the size of the stream as the last block may not be full! - * - * FIXME: Use the cache to get this information. */ static ULONG BlockChainStream_GetCount(BlockChainStream* This) { - ULONG blockIndex; - ULONG count = 0; - - blockIndex = BlockChainStream_GetHeadOfChain(This); - - while (blockIndex != BLOCK_END_OF_CHAIN) - { - count++; - - if(FAILED(StorageImpl_GetNextBlockInChain( - This->parentStorage, - blockIndex, - &blockIndex))) - return 0; - } - - return count; + return This->numBlocks; } /******************************************************************************

1 0

Sven Baars : mshtml: Update Dutch translation.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 61493dee95741a67c16a71b4056a274c4b6efdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=61493dee95741a67c16a71b40… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu May 6 21:20:35 2010 +0200 mshtml: Update Dutch translation. --- dlls/mshtml/Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/Nl.rc b/dlls/mshtml/Nl.rc index 33baf39..d32980b 100644 --- a/dlls/mshtml/Nl.rc +++ b/dlls/mshtml/Nl.rc @@ -35,9 +35,9 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Wine-Gecko-Installatie" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine kon geen Gecko pakket vinden. Gecko is nodig voor programma's die gebruik maken " \ + "van embedded HTML. Wine kan het automatisch voor u downloaden en installeren.\n\n" \ + "Noot: het is aanbevolen om distro pakketten te gebruiken. Zie http://wiki.winehq.org/Gecko voor details.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Voortgang", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Installeren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP

1 0

Michael Stefaniuc : oleview: Replace some SendMessage wrappers with the real thing.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 5005581c8b366d196837733758eaa4e0d32db9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5005581c8b366d19683773375… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 7 10:45:29 2010 +0200 oleview: Replace some SendMessage wrappers with the real thing. --- programs/oleview/details.c | 4 ++-- programs/oleview/interface.c | 9 ++++++--- programs/oleview/oleview.c | 27 ++++++++++++++++++--------- programs/oleview/tree.c | 42 ++++++++++++++++++++++++++++-------------- programs/oleview/typelib.c | 36 ++++++++++++++++++++++++------------ 5 files changed, 78 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5005581c8b366d1968377…

1 0

Damjan Jovanovic : winemenubuilder: Launch .lnk files directly from menus.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 55e4eba2ec5657f2cac0591f0323897a1ad848a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e4eba2ec5657f2cac0591f0… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri May 7 08:29:02 2010 +0200 winemenubuilder: Launch .lnk files directly from menus. The arguments of a .lnk file are complex, with quoting and escaping rules and %windir%-style variable expansion, so winemenubuilder cannot always convert them accurately to a .desktop file. But start.exe and shell32 on the other hand can parse the .lnk file and run it themselves, so use them instead. --- programs/winemenubuilder/winemenubuilder.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 4884d7e..6569c0d 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2340,7 +2340,24 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) } } else - r = !write_menu_entry(unix_link, link_name, escaped_path, escaped_args, escaped_description, work_dir, icon_name); + { + char *arg = heap_printf("/Unix \"%s\"", unix_link); + if (arg) + { + WCHAR *warg = utf8_chars_to_wchars(arg); + if (warg) + { + char *menuarg = escape(warg); + if (menuarg) + { + r = !write_menu_entry(unix_link, link_name, "start", menuarg, escaped_description, work_dir, icon_name); + HeapFree(GetProcessHeap(), 0, menuarg); + } + HeapFree(GetProcessHeap(), 0, warg); + } + HeapFree(GetProcessHeap(), 0, arg); + } + } ReleaseSemaphore( hsem, 1, NULL );

1 0

Alexandre Julliard : user32: Use the correct rop when blitting an icon in DrawIconEx.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 4c03fd013812dcc499b83e8b34c074f36acf801b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c03fd013812dcc499b83e8b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 12:41:40 2010 +0200 user32: Use the correct rop when blitting an icon in DrawIconEx. --- dlls/user32/cursoricon.c | 8 ++++---- dlls/user32/tests/cursoricon.c | 9 +++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f4bdcdb..bafe4a7 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2275,8 +2275,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, oldFg = SetTextColor( hdc, RGB(0,0,0) ); oldBg = SetBkColor( hdc, RGB(255,255,255) ); - if (((flags & DI_MASK) && !(flags & DI_IMAGE)) || - ((flags & DI_MASK) && !has_alpha)) + if ((flags & DI_MASK) && !has_alpha) { hAndBits = CreateBitmap ( ptr->nWidth, ptr->nHeight, 1, 1, ptr + 1 ); if (hAndBits) @@ -2341,13 +2340,14 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, } else { + DWORD rop = (flags & DI_MASK) ? SRCINVERT : SRCCOPY; hBitTemp = SelectObject( hMemDC, hXorBits ); if (DoOffscreen) StretchBlt (hDC_off, 0, 0, cxWidth, cyWidth, - hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT); + hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, rop); else StretchBlt (hdc, x0, y0, cxWidth, cyWidth, - hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT); + hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, rop); SelectObject( hMemDC, hBitTemp ); } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 2a4100e..21e0dca 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1190,15 +1190,12 @@ static void test_DrawIconEx(void) check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00000000, 0x00000000, __LINE__); check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00FFFFFF, 0x00FFFFFF, __LINE__); - todo_wine - { - check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); - check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); - } + check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); /* Test normal drawing */ check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); - todo_wine check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x003F4F5F, 0x003F4F5F, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x003F4F5F, 0x003F4F5F, __LINE__); check_DrawIconEx(hdcDst, FALSE, 0xFFA0B0C0, 32, DI_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); /* Test alpha blending */

1 0

Alexandre Julliard : libwine: Add support for generating l_intl.nls, based on a patch by Andrey Turkin.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 930a13dd86613e79fd6d011edcfd27b340dce6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930a13dd86613e79fd6d011ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 20:50:14 2010 +0200 libwine: Add support for generating l_intl.nls, based on a patch by Andrey Turkin. --- libs/wine/cpmap.pl | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/l_intl.nls | Bin 0 -> 5958 bytes 2 files changed, 86 insertions(+), 0 deletions(-) diff --git a/libs/wine/cpmap.pl b/libs/wine/cpmap.pl index c67c4aa..7037ff9 100755 --- a/libs/wine/cpmap.pl +++ b/libs/wine/cpmap.pl @@ -1058,6 +1058,91 @@ sub DUMP_CASE_TABLE($@) ################################################################ +# dump a binary case mapping table in l_intl.nls format +sub dump_binary_case_table(@) +{ + my (@table) = @_; + + my %difftables_hash = (); + my @difftables; + my %offtables2_hash = (); + my @offtables2 = (); + + my @offtable = (); + for (my $i = 0; $i < 256; $i++) + { + my @offtable2 = (); + for(my $j = 0; $j < 16; $j++) # offset table for xx00-xxFF characters + { + my @difftable; + for (my $k = 0; $k < 16; $k++) # case map table for xxx0-xxxF characters + { + my $char = ($i<<8) + ($j<<4) + $k; + $difftable[$k] = (defined $table[$char]) ? (($table[$char]-$char) & 0xffff) : 0; + } + + my $diff_key = pack "S*", @difftable; + my $offset3 = $difftables_hash{$diff_key}; + if (!defined $offset3) + { + $offset3 = scalar @difftables; + $difftables_hash{$diff_key} = $offset3; + push @difftables, @difftable; + } + $offtable2[$j] = $offset3; + } + + my $offtable2_key = pack "S*", @offtable2; + my $offset2 = $offtables2_hash{$offtable2_key}; + if (!defined $offset2) + { + $offset2 = scalar @offtables2; + $offtables2_hash{$offtable2_key} = $offset2; + push @offtables2, \@offtable2; + } + $offtable[$i] = $offset2; + } + + my @output; + my $offset = 0x100; # offset of first subtable in words + foreach (@offtable) + { + push @output, 0x10 * $_ + $offset; # offset of subtable in words + } + + $offset = 0x100 + 0x10 * scalar @offtables2; # offset of first difftable in words + foreach(@offtables2) + { + my $table = $_; + foreach(@$table) + { + push @output, $_ + $offset; # offset of difftable in words + } + } + + my $len = 1 + scalar @output + scalar @difftables; + return pack "S<*", $len, @output, @difftables; +} + + +################################################################ +# dump case mappings for l_intl.nls +sub dump_intl_nls($) +{ + my $filename = shift; + open OUTPUT,">$filename.new" or die "Cannot create $filename"; + printf "Building $filename\n"; + + binmode OUTPUT; + print OUTPUT pack "S<", 1; # version + print OUTPUT dump_binary_case_table( @toupper_table ); + print OUTPUT dump_binary_case_table( @tolower_table ); + close OUTPUT; + save_file($filename); +} + + +################################################################ # dump the ctype tables sub DUMP_CTYPE_TABLES($) { @@ -1470,6 +1555,7 @@ DUMP_SORTKEYS( "collation.c", READ_SORTKEYS_FILE() ); DUMP_COMPOSE_TABLES( "compose.c" ); DUMP_CTYPE_TABLES( "wctype.c" ); dump_mirroring( "../../dlls/usp10/mirror.c" ); +dump_intl_nls("../tools/l_intl.nls"); foreach my $file (@allfiles) { HANDLE_FILE( @{$file} ); } diff --git a/tools/l_intl.nls b/tools/l_intl.nls new file mode 100644 index 0000000..4939fb2 Binary files /dev/null and b/tools/l_intl.nls differ

1 0

Alexandre Julliard : user32: Return the icon depth instead of number of colors when loading from a . ico file.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 2e96abd0d432ae1374a4e268e3655df9e01822ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e96abd0d432ae1374a4e268e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 11:34:17 2010 +0200 user32: Return the icon depth instead of number of colors when loading from a .ico file. --- dlls/user32/cursoricon.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 27d3040..60ff29f 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -677,13 +677,16 @@ static BOOL CURSORICON_GetFileEntry( LPVOID dir, int n, { CURSORICONFILEDIR *filedir = dir; CURSORICONFILEDIRENTRY *entry; + BITMAPINFOHEADER *info; if ( filedir->idCount <= n ) return FALSE; entry = &filedir->idEntries[n]; + /* FIXME: check against file size */ + info = (BITMAPINFOHEADER *)((char *)dir + entry->dwDIBOffset); *width = entry->bWidth; *height = entry->bHeight; - *bits = entry->bColorCount; + *bits = info->biBitCount; return TRUE; }

1 0

Alexandre Julliard : configure: Create a symlink from l_intl. nls in the build tree, and install it.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: 321d3883bf07016cc14699da0bc4de3781fb8871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=321d3883bf07016cc14699da0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 20:51:53 2010 +0200 configure: Create a symlink from l_intl.nls in the build tree, and install it. --- configure | 3 +++ configure.ac | 1 + tools/Makefile.in | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 52410fb..a178112 100755 --- a/configure +++ b/configure @@ -14220,6 +14220,8 @@ if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf fi +ac_config_links="$ac_config_links tools/l_intl.nls:tools/l_intl.nls" +test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine @@ -15538,6 +15540,7 @@ do "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; + "tools/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS tools/l_intl.nls:tools/l_intl.nls" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; diff --git a/configure.ac b/configure.ac index 227dee5..4224e37 100644 --- a/configure.ac +++ b/configure.ac @@ -2170,6 +2170,7 @@ WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts) +WINE_CONFIG_SYMLINK(tools/l_intl.nls) WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv) diff --git a/tools/Makefile.in b/tools/Makefile.in index 39209f9..447ab62 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -70,6 +70,7 @@ wineapploader: wineapploader.in install install-lib:: wine.inf $(INSTALLDIRS) $(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf + $(INSTALL_DATA) $(SRCDIR)/l_intl.nls $(DESTDIR)$(datadir)/wine/l_intl.nls $(INSTALL_DATA) $(SRCDIR)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) @@ -79,7 +80,12 @@ install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) $(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) uninstall:: - $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop + $(RM) $(DESTDIR)$(datadir)/wine/wine.inf \ + $(DESTDIR)$(datadir)/wine/l_intl.nls \ + $(DESTDIR)$(datadir)/applications/wine.desktop \ + $(DESTDIR)$(bindir)/winemaker \ + $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \ + $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) -$(UPDATE_DESKTOP_DATABASE) depend: makedep$(EXEEXT)

1 0

Alexandre Julliard : user32: Fix drawing of 1-bpp icons in DrawIconEx.
by Alexandre Julliard May 7, 2010

May 7, 2010

Module: wine Branch: master Commit: a59d79c9a6ce3b9cd1acb88617a4e33af2118b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59d79c9a6ce3b9cd1acb8861… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 12:08:29 2010 +0200 user32: Fix drawing of 1-bpp icons in DrawIconEx. --- dlls/user32/cursoricon.c | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 60ff29f..f4bdcdb 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2294,28 +2294,40 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (flags & DI_IMAGE) { - BITMAPINFOHEADER bmih; - unsigned char *dibBits; - - memset(&bmih, 0, sizeof(BITMAPINFOHEADER)); - bmih.biSize = sizeof(BITMAPINFOHEADER); - bmih.biWidth = ptr->nWidth; - bmih.biHeight = -ptr->nHeight; - bmih.biPlanes = ptr->bPlanes; - bmih.biBitCount = ptr->bBitsPerPixel; - bmih.biCompression = BI_RGB; - - hXorBits = CreateDIBSection(hdc, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, - (void*)&dibBits, NULL, 0); + if (ptr->bPlanes * ptr->bBitsPerPixel == 1) + { + hXorBits = CreateBitmap( ptr->nWidth, ptr->nHeight, 1, 1, xorBitmapBits ); + } + else + { + unsigned char *dibBits; + BITMAPINFO *bmi = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biWidth = ptr->nWidth; + bmi->bmiHeader.biHeight = -ptr->nHeight; + bmi->bmiHeader.biPlanes = ptr->bPlanes; + bmi->bmiHeader.biBitCount = ptr->bBitsPerPixel; + bmi->bmiHeader.biCompression = BI_RGB; + /* FIXME: color table */ + + hXorBits = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, (void*)&dibBits, NULL, 0); + if (hXorBits) + { + if(has_alpha) + premultiply_alpha_channel(dibBits, xorBitmapBits, xorLength); + else + memcpy(dibBits, xorBitmapBits, xorLength); + } + } - if (hXorBits && dibBits) + if (hXorBits) { if(has_alpha) { BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; /* Do the alpha blending render */ - premultiply_alpha_channel(dibBits, xorBitmapBits, xorLength); hBitTemp = SelectObject( hMemDC, hXorBits ); if (DoOffscreen) @@ -2329,7 +2341,6 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, } else { - memcpy(dibBits, xorBitmapBits, xorLength); hBitTemp = SelectObject( hMemDC, hXorBits ); if (DoOffscreen) StretchBlt (hDC_off, 0, 0, cxWidth, cyWidth,

1 0