winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2010
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
663 discussions
Start a n
N
ew thread
Alexandru Balut : Fix character encoding for bugzilla query results
by Alexander Nicolaysen Sørnes
03 Jun '10
03 Jun '10
Module: appdb Branch: master Commit: 7a70a03b567daf44d7b16fa953d4659f7fc57a25 URL:
http://source.winehq.org/git/appdb.git/?a=commit;h=7a70a03b567daf44d7b16fa9…
Author: Alexandru Balut <alexandru.balut(a)gmail.com> Date: Thu Jun 3 15:24:02 2010 +0200 Fix character encoding for bugzilla query results --- include/query.php | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/query.php b/include/query.php index 9527fb8..7b02e79 100644 --- a/include/query.php +++ b/include/query.php @@ -130,6 +130,12 @@ function query_bugzilladb($sQuery,$sComment="") $hBugzillaLink = mysql_connect(BUGZILLA_DBHOST, BUGZILLA_DBUSER, BUGZILLA_DBPASS, true); if(!$hBugzillaLink) return; mysql_select_db(BUGZILLA_DB, $hBugzillaLink); + // Tell MySQL to return UTF8-encoded results + $sQueryAskingForUtf8Results = "SET SESSION CHARACTER_SET_RESULTS = 'utf8'"; + if (!mysql_query($sQueryAskingForUtf8Results, $hBugzillaLink)) + { + query_error($sQueryAskingForUtf8Results, "", $hBugzillaLink); + } } $hResult = mysql_query($sQuery, $hBugzillaLink);
1
0
0
0
Austin English : wine-dev: Fix broken link.
by Alexandre Julliard
02 Jun '10
02 Jun '10
Module: docs Branch: master Commit: 6b5de87a1bc1558193b92aef3c950d4d727d2401 URL:
http://source.winehq.org/git/docs.git/?a=commit;h=6b5de87a1bc1558193b92aef3…
Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 1 17:54:06 2010 -0500 wine-dev: Fix broken link. --- en/winedev-debugger.sgml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index 6aa9503..e4810d3 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -479,7 +479,7 @@ winedbg hl.exe -windowed <para> Disassembling win32 programs is possible using eg. <application>GoVest</> by Ansgar Trimborn. It can be found - <ulink url="
http://www.geocities.com/GoVest/
">here</>. + <ulink url="
http://www.oocities.com/govest/
">here</>. </para> <para> You can also use the newer and better @@ -834,7 +834,7 @@ winedbg myprog.exe <term> <application>GoVest</application>: <filename>govest.zip</filename> is available from - <ulink url="
http://www.geocities.com/GoVest/
">
http://www.geocities.com/GoVest/
</>. + <ulink url="
http://www.oocities.com/govest/
">
http://www.oocities.com/govest/
</>. </term> <listitem> <para>
1
0
0
0
André Hentschel : wineps.drv: Make the Apply button useable.
by Alexandre Julliard
02 Jun '10
02 Jun '10
Module: wine Branch: master Commit: 9aa9a1229f2195a8b3ac575645a10242ae6e9bc8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9aa9a1229f2195a8b3ac57564…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 2 17:12:22 2010 +0200 wineps.drv: Make the Apply button useable. --- dlls/wineps.drv/driver.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 25cf0eb..b5d1e90 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -236,26 +236,27 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, if(i >= Cursel) break; i++; } - TRACE("Setting pagesize to item %d Winpage = %d\n", Cursel, - ps->WinPage); - di->dlgdm->dmPublic.u1.s1.dmPaperSize = ps->WinPage; + TRACE("Setting pagesize to item %d Winpage = %d\n", Cursel, ps->WinPage); + di->dlgdm->dmPublic.u1.s1.dmPaperSize = ps->WinPage; + SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0); } break; case IDD_ORIENT_PORTRAIT: case IDD_ORIENT_LANDSCAPE: TRACE("Setting orientation to %s\n", wParam == IDD_ORIENT_PORTRAIT ? - "portrait" : "landscape"); + "portrait" : "landscape"); di->dlgdm->dmPublic.u1.s1.dmOrientation = wParam == IDD_ORIENT_PORTRAIT ? - DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE; + DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE; + SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0); break; case IDD_DUPLEX: if(HIWORD(wParam) == CBN_SELCHANGE) { Cursel = SendDlgItemMessageA(hwnd, LOWORD(wParam), CB_GETCURSEL, 0, 0); for(i = 0, duplex = di->pi->ppd->Duplexes; i < Cursel; i++, duplex = duplex->next) ; - TRACE("Setting duplex to item %d Winduplex = %d\n", Cursel, - duplex->WinDuplex); - di->dlgdm->dmPublic.dmDuplex = duplex->WinDuplex; + TRACE("Setting duplex to item %d Winduplex = %d\n", Cursel, duplex->WinDuplex); + di->dlgdm->dmPublic.dmDuplex = duplex->WinDuplex; + SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0); } break; }
1
0
0
0
Hwang YunSong : msi: Update Korean resource.
by Alexandre Julliard
02 Jun '10
02 Jun '10
Module: wine Branch: master Commit: 761ce56643a1133200493f28467221d47b0f20f8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=761ce56643a1133200493f284…
Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jun 2 16:10:15 2010 +0900 msi: Update Korean resource. --- dlls/msi/msi_Ko.rc | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/msi/msi_Ko.rc b/dlls/msi/msi_Ko.rc index 17ab488..04efd83 100644 --- a/dlls/msi/msi_Ko.rc +++ b/dlls/msi/msi_Ko.rc @@ -1,7 +1,9 @@ /* * Korean resources for MSI * - * Copyright 2005 YunSong Hwang + * Copyright 2005 Mike McCormack + * Copyright 2010 Detlef Riekenberg + * Copyright 2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,30 +30,30 @@ STRINGTABLE DISCARDABLE 5 "%s ��θ� ã���� �����ϴ�" 9 "��ũ %s ����" 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ + "����:\n" \ + "msiexec ���� {�ʼ� �Ű�����} [������ �Ű�����]\n\n" \ + "��ǰ ��ġ:\n" \ "\t/i {package|productcode} [property]\n" \ "\t/package {package|productcode} [property]\n" \ "\t/a package [property]\n" \ - "Repair an installation:\n" \ + "��ġ ����:\n" \ "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ + "��ǰ ����:\n" \ "\t/uninstall {package|productcode} [property]\n" \ "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ + "��ǰ �˸���:\n" \ "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ + "��ġ �߰�:\n" \ "\t/p patchpackage [property]\n" \ "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ + "���� ���ɾ ���� Log �� UI ������ :\n" \ "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ + "MSI ���� ���:\n" \ "\t/y\n" \ - "Unregister MSI Service:\n" \ + "MSI ���� ��� ����:\n" \ "\t/z\n" \ - "Display this help:\n" \ + "���� ����:\n" \ "\t/help\n" \ "\t/?\n" 11 "%s�� �����ϴ� ������ �Է��ϼ���"
1
0
0
0
Hwang YunSong : wordpad: Update Korean resource.
by Alexandre Julliard
02 Jun '10
02 Jun '10
Module: wine Branch: master Commit: 75cb09fdab6be2df4bce196f5416f2ebc41f7669 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=75cb09fdab6be2df4bce196f5…
Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jun 2 16:09:22 2010 +0900 wordpad: Update Korean resource. --- programs/wordpad/Ko.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 8111083..8a44194 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -242,6 +242,9 @@ BEGIN STRING_PREVIEW_PAGE, "������" STRING_PREVIEW_PAGES, "��������" STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "��ġ" + STRING_UNITS_PT, "pt" END STRINGTABLE DISCARDABLE
1
0
0
0
Alexandre Julliard : winex11: Fix the X image masks according to the pixmap format in Get/SetDIBits.
by Alexandre Julliard
02 Jun '10
02 Jun '10
Module: wine Branch: master Commit: 5c5c47269b599f5ec1669793e666013519ceaf1d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5c5c47269b599f5ec1669793e…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 2 15:52:20 2010 +0200 winex11: Fix the X image masks according to the pixmap format in Get/SetDIBits. --- dlls/winex11.drv/dib.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index cf58e8b..11157f1 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -71,6 +71,7 @@ typedef struct WORD depth; WORD infoBpp; WORD compression; + ColorShifts *shifts; RGBQUAD *colorMap; int nColorMap; Drawable drawable; @@ -3541,6 +3542,12 @@ static int X11DRV_DIB_SetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) wine_tsx11_unlock(); return 0; } + if (descr->shifts) + { + bmpImage->red_mask = descr->shifts->physicalRed.max << descr->shifts->physicalRed.shift; + bmpImage->green_mask = descr->shifts->physicalGreen.max << descr->shifts->physicalGreen.shift; + bmpImage->blue_mask = descr->shifts->physicalBlue.max << descr->shifts->physicalBlue.shift; + } } wine_tsx11_unlock(); @@ -3698,6 +3705,12 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) wine_tsx11_unlock(); return 0; } + if (descr->shifts) + { + bmpImage->red_mask = descr->shifts->physicalRed.max << descr->shifts->physicalRed.shift; + bmpImage->green_mask = descr->shifts->physicalGreen.max << descr->shifts->physicalGreen.shift; + bmpImage->blue_mask = descr->shifts->physicalBlue.max << descr->shifts->physicalBlue.shift; + } } #ifdef HAVE_LIBXXSHM @@ -3930,6 +3943,7 @@ INT CDECL X11DRV_SetDIBitsToDevice( X11DRV_PDEVICE *physDev, INT xDest, INT yDes descr.lines = top_down ? -lines : lines; descr.infoWidth = width; descr.depth = physDev->depth; + descr.shifts = physDev->color_shifts; descr.drawable = physDev->drawable; descr.gc = physDev->gc; descr.xSrc = xSrc; @@ -4019,6 +4033,7 @@ INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start descr.infoWidth = width; descr.lines = tmpheight >= 0 ? lines : -lines; descr.depth = physBitmap->pixmap_depth; + descr.shifts = physBitmap->trueColor ? &physBitmap->pixmap_color_shifts : NULL; descr.drawable = physBitmap->pixmap; descr.gc = get_bitmap_gc(physBitmap->pixmap_depth); descr.xSrc = 0; @@ -4175,6 +4190,7 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start descr.infoWidth = width; descr.lines = lines; descr.depth = physBitmap->pixmap_depth; + descr.shifts = physBitmap->trueColor ? &physBitmap->pixmap_color_shifts : NULL; descr.drawable = physBitmap->pixmap; descr.gc = get_bitmap_gc(physBitmap->pixmap_depth); descr.width = dib.dsBm.bmWidth; @@ -4250,6 +4266,7 @@ static void X11DRV_DIB_DoCopyDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB, descr.nColorMap = nColorMap; descr.bits = dibSection.dsBm.bmBits; descr.depth = physBitmap->pixmap_depth; + descr.shifts = physBitmap->trueColor ? &physBitmap->pixmap_color_shifts : NULL; descr.compression = dibSection.dsBmih.biCompression; descr.physBitmap = physBitmap;
1
0
0
0
Alexandre Julliard : comctl32: Load comctl32 builtin bitmaps as 32-bit DIBs .
by Alexandre Julliard
02 Jun '10
02 Jun '10
Module: wine Branch: master Commit: 48e396ea6cdba2cac3d0c1ea3df44c9f3b879f35 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=48e396ea6cdba2cac3d0c1ea3…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 2 15:51:39 2010 +0200 comctl32: Load comctl32 builtin bitmaps as 32-bit DIBs. --- dlls/comctl32/toolbar.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 684406b..fe782c3 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2710,6 +2710,9 @@ TOOLBAR_AddBitmapToImageList(TOOLBAR_INFO *infoPtr, HIMAGELIST himlDef, const TB /* Add bitmaps to the default image list */ if (bitmap->hInst == NULL) /* a handle was passed */ hbmLoad = CopyImage(ULongToHandle(bitmap->nID), IMAGE_BITMAP, 0, 0, 0); + else if (bitmap->hInst == COMCTL32_hModule) + hbmLoad = LoadImageW( bitmap->hInst, MAKEINTRESOURCEW(bitmap->nID), + IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION ); else hbmLoad = CreateMappedBitmap(bitmap->hInst, bitmap->nID, 0, NULL, 0);
1
0
0
0
Alexandre Julliard : comctl32: Only support an alpha channel for 32-bpp DIB-based imagelists.
by Alexandre Julliard
02 Jun '10
02 Jun '10
Module: wine Branch: master Commit: 95c529dee6abc68c12837c7b51fd158978f3d96e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=95c529dee6abc68c12837c7b5…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 2 12:21:41 2010 +0200 comctl32: Only support an alpha channel for 32-bpp DIB-based imagelists. --- dlls/comctl32/imagelist.c | 21 +++++++++++---------- dlls/comctl32/toolbar.c | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a73b423..e4249b9 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -153,8 +153,9 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, if (!GetObjectW( hbmImage, sizeof(bm), &bm )) return FALSE; - /* if neither the imagelist nor the source bitmap can have an alpha channel, bail out now */ - if (himl->uBitsPixel != 32 && bm.bmBitsPixel != 32) return FALSE; + /* if either the imagelist or the source bitmap don't have an alpha channel, bail out now */ + if (!himl->has_alpha) return FALSE; + if (bm.bmBitsPixel != 32) return FALSE; SelectObject( hdc, hbmImage ); mask_width = (bm.bmWidth + 31) / 32 * 4; @@ -208,7 +209,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, } else { - if (himl->has_alpha) himl->has_alpha[pos + n] = 1; + himl->has_alpha[pos + n] = 1; if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ { @@ -751,7 +752,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, else himl->hbmMask = 0; - if (himl->uBitsPixel == 32) + if (ilc == ILC_COLOR32) himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); else himl->has_alpha = NULL; @@ -1204,7 +1205,7 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des } } - if (himl->uBitsPixel == 32) /* we already have an alpha channel in this case */ + if (himl->has_alpha) /* we already have an alpha channel in this case */ { /* pre-multiply by the alpha channel */ for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) @@ -2515,7 +2516,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) if (hdcImage == 0) ERR("invalid hdcImage!\n"); - if (himl->uBitsPixel == 32) + if (himl->has_alpha) { if (!ii.hbmColor) { @@ -2525,13 +2526,13 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) SelectObject( hdcImage, color ); SelectObject( hdcMask, ii.hbmMask ); BitBlt( hdcImage, 0, 0, bmp.bmWidth, height, hdcMask, 0, height, SRCCOPY ); - add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, height, color, ii.hbmMask ); + ret = add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, height, color, ii.hbmMask ); DeleteDC( hdcMask ); DeleteObject( color ); + if (ret) goto done; } - else add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, ii.hbmColor, ii.hbmMask ); - - goto done; + else if (add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, + ii.hbmColor, ii.hbmMask )) goto done; } imagelist_point_from_index(himl, nIndex, &pt); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d24b3dc..684406b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2757,7 +2757,7 @@ TOOLBAR_CheckImageListIconSize(TOOLBAR_INFO *infoPtr) cx, cy, infoPtr->nBitmapWidth, infoPtr->nBitmapHeight); himlNew = ImageList_Create(infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, - ILC_COLORDDB|ILC_MASK, 8, 2); + ILC_COLOR32|ILC_MASK, 8, 2); for (i = 0; i < infoPtr->nNumBitmapInfos; i++) TOOLBAR_AddBitmapToImageList(infoPtr, himlNew, &infoPtr->bitmaps[i]); TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlNew, 0); @@ -2854,7 +2854,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp TRACE ("creating default image list!\n"); himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, - ILC_COLORDDB | ILC_MASK, info.nButtons, 2); + ILC_COLOR32 | ILC_MASK, info.nButtons, 2); TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlDef, 0); infoPtr->himlInt = himlDef; }
1
0
0
0
Henri Verbeet : wined3d: Sampler states are 1-based.
by Alexandre Julliard
02 Jun '10
02 Jun '10
Module: wine Branch: master Commit: eb3c81fd6913385174202a37f47af052b8185d03 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=eb3c81fd6913385174202a37f…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 2 11:24:54 2010 +0200 wined3d: Sampler states are 1-based. 0 isn't a valid sampler state, and including it would overflow the stateblock's contained_sampler_states array in stateblock_init_contained_states(). --- dlls/wined3d/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1696646..181b357 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -262,7 +262,7 @@ static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD vs_consts, stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3fff; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; states->clipplane = 0xffffffff; states->pixelShaderConstantsB = 0xffff; states->pixelShaderConstantsI = 0xffff;
1
0
0
0
Alexandre Julliard : winex11: Ignore fontconfig and Xft configuration if the app explicitly requested antialiasing .
by Alexandre Julliard
02 Jun '10
02 Jun '10
Module: wine Branch: master Commit: 46e231cc85c2940ef98e1f99920775505ffa9525 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=46e231cc85c2940ef98e1f999…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 2 10:55:19 2010 +0200 winex11: Ignore fontconfig and Xft configuration if the app explicitly requested antialiasing. --- dlls/winex11.drv/xrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cca3321..810b163 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -886,7 +886,7 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) { case ANTIALIASED_QUALITY: entry->aa_default = get_antialias_type( physDev, FALSE, hinter ); - break; + return ret; /* ignore further configuration */ case CLEARTYPE_QUALITY: case CLEARTYPE_NATURAL_QUALITY: entry->aa_default = get_antialias_type( physDev, subpixel, hinter );
1
0
0
0
← Newer
1
...
58
59
60
61
62
63
64
...
67
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
Results per page:
10
25
50
100
200