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
December 2018
----- 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
1 participants
352 discussions
Start a n
N
ew thread
Andrew Eikum : winegcc: Pass -static-libstdc++ to the linker.
by Alexandre Julliard
03 Dec '18
03 Dec '18
Module: wine Branch: master Commit: 590ccd0f5ce03dd2417d6ea057459f073a556ab5 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=590ccd0f5ce03dd2417d6ea0…
Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 09:05:14 2018 -0600 winegcc: Pass -static-libstdc++ to the linker. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5136cf3..b5fa881 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -71,8 +71,9 @@ * * Linker Options * object-file-name -llibrary -nostartfiles -nodefaultlibs - * -nostdlib -s -static -static-libgcc -shared -shared-libgcc - * -symbolic -Wl,option -Xlinker option -u symbol --image-base + * -nostdlib -s -static -static-libgcc -static-libstdc++ + * -shared -shared-libgcc -symbolic -Wl,option + * -Xlinker option -u symbol --image-base * * Directory Options * -Bprefix -Idir -I- -Ldir -specs=file @@ -1288,8 +1289,9 @@ static int is_linker_arg(const char* arg) { static const char* link_switches[] = { - "-nostdlib", "-s", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", - "-framework", "--coverage", "-fprofile-generate", "-fprofile-use" + "-nostdlib", "-s", "-static", "-static-libgcc", "-static-libstdc++", + "-shared", "-shared-libgcc", "-symbolic", "-framework", "--coverage", + "-fprofile-generate", "-fprofile-use" }; unsigned int j;
1
0
0
0
Alexandre Julliard : wineandroid: Add a helper function to update a window surface.
by Alexandre Julliard
03 Dec '18
03 Dec '18
Module: wine Branch: master Commit: cc06703e3abc8617ae4a3dff4024d06e235a2293 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=cc06703e3abc8617ae4a3dff…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 18:26:50 2018 +0100 wineandroid: Add a helper function to update a window surface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 6e6bbff..9229955 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -530,6 +530,20 @@ public class WineActivity extends Activity return hwnd; } + private void update_surface( boolean is_client ) + { + if (is_client) + { + Log.i( LOGTAG, String.format( "set client surface hwnd %08x %s", hwnd, client_surface )); + if (client_surface != null) wine_surface_changed( hwnd, client_surface, true ); + } + else + { + Log.i( LOGTAG, String.format( "set window surface hwnd %08x %s", hwnd, window_surface )); + if (window_surface != null) wine_surface_changed( hwnd, window_surface, false ); + } + } + public void set_surface( SurfaceTexture surftex, boolean is_client ) { if (is_client) @@ -540,8 +554,6 @@ public class WineActivity extends Activity client_surftex = surftex; client_surface = new Surface( surftex ); } - Log.i( LOGTAG, String.format( "set client surface hwnd %08x %s", hwnd, client_surface )); - wine_surface_changed( hwnd, client_surface, true ); } else { @@ -551,9 +563,8 @@ public class WineActivity extends Activity window_surftex = surftex; window_surface = new Surface( surftex ); } - Log.i( LOGTAG, String.format( "set window surface hwnd %08x %s", hwnd, window_surface )); - wine_surface_changed( hwnd, window_surface, false ); } + update_surface( is_client ); } public void get_event_pos( MotionEvent event, int[] pos )
1
0
0
0
Alexandre Julliard : wineandroid: Specify the window scale directly in the constructor.
by Alexandre Julliard
03 Dec '18
03 Dec '18
Module: wine Branch: master Commit: 357c2bb9f984122f06f9d9a75c004ff05c1b625e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=357c2bb9f984122f06f9d9a7…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 16:16:48 2018 +0100 wineandroid: Specify the window scale directly in the constructor. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 8013b3a..6e6bbff 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -348,16 +348,16 @@ public class WineActivity extends Activity protected WineWindowGroup window_group; protected WineWindowGroup client_group; - public WineWindow( int w, WineWindow parent ) + public WineWindow( int w, WineWindow parent, float scale ) { Log.i( LOGTAG, String.format( "create hwnd %08x", w )); hwnd = w; owner = 0; style = 0; - scale = 1.0f; visible = false; visible_rect = client_rect = new Rect( 0, 0, 0, 0 ); this.parent = parent; + this.scale = scale; children = new ArrayList<WineWindow>(); win_map.put( w, this ); if (parent != null) parent.children.add( this ); @@ -744,11 +744,11 @@ public class WineActivity extends Activity public TopView( Context context, int hwnd ) { super( context ); - desktop_window = new WineWindow( hwnd, null ); + desktop_window = new WineWindow( hwnd, null, 1.0f ); addView( desktop_window.create_whole_view() ); desktop_window.client_group.bringToFront(); - message_window = new WineWindow( WineWindow.HWND_MESSAGE, null ); + message_window = new WineWindow( WineWindow.HWND_MESSAGE, null, 1.0f ); message_window.create_window_groups(); } @@ -786,8 +786,7 @@ public class WineActivity extends Activity WineWindow win = get_window( hwnd ); if (win == null) { - win = new WineWindow( hwnd, get_window( parent )); - win.scale = scale; + win = new WineWindow( hwnd, get_window( parent ), scale ); win.create_window_groups(); if (win.parent == desktop_window) win.create_whole_view(); }
1
0
0
0
Alexandre Julliard : wineandroid: Generate assets checksum from the gradle build file.
by Alexandre Julliard
03 Dec '18
03 Dec '18
Module: wine Branch: master Commit: 0f19685917a9bc5cce2b581fc31d4bb90f8f2003 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0f19685917a9bc5cce2b581f…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 16:16:27 2018 +0100 wineandroid: Generate assets checksum from the gradle build file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 8 ++------ dlls/wineandroid.drv/build.gradle.in | 39 +++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index d2e2d01..40ab495 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -20,9 +20,5 @@ EXTRA_TARGETS = wine-debug.apk all: wine-debug.apk wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg - (test -d assets && \ - rm -f assets/files.sum assets/sums.sum && \ - sha256sum `find assets -type f -print` | sed 's/ assets\// /' >files.sum && \ - sha256sum files.sum >sums.sum && \ - mv files.sum sums.sum assets) || rm -rf assets - gradle -q assembleDebug && mv build/outputs/apk/wine-debug.apk . + gradle -q assembleDebug + mv build/outputs/apk/wine-debug.apk $@ diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 3fba34a..8ae2fb4 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -32,7 +32,8 @@ buildscript } } -def add_icon_task( dir, scale ) { +def add_icon_task( dir, scale ) +{ return tasks.create( "createIcon-" + dir, Exec ) { def outdir = new File( "res", "drawable-" + dir ) outputs.dir( outdir ) @@ -45,15 +46,33 @@ def add_icon_task( dir, scale ) { } } -tasks.whenTaskAdded { t -> - if (t.name.equals( "generateDebugResources" )) { - t.dependsOn add_icon_task( "ldpi", 0.75 ) - t.dependsOn add_icon_task( "mdpi", 1 ) - t.dependsOn add_icon_task( "hdpi", 1.5 ) - t.dependsOn add_icon_task( "xhdpi", 2 ) - t.dependsOn add_icon_task( "xxhdpi", 3 ) - t.dependsOn add_icon_task( "xxxhdpi", 4 ) - } +def checksum_task() +{ + return tasks.create( "checksumAssets", Exec ) { + commandLine "sh", "-c", + "(test -d assets && " + + "rm -f assets/files.sum assets/sums.sum && " + + "sha256sum \$(find assets -type f -print) | sed 's/ assets\\// /' >files.sum && " + + "sha256sum files.sum >sums.sum && " + + "mv files.sum sums.sum assets) || rm -rf assets"; + } +} + +tasks.whenTaskAdded +{ + if (name.equals( "generateDebugResources" )) + { + dependsOn add_icon_task( "ldpi", 0.75 ) + dependsOn add_icon_task( "mdpi", 1 ) + dependsOn add_icon_task( "hdpi", 1.5 ) + dependsOn add_icon_task( "xhdpi", 2 ) + dependsOn add_icon_task( "xxhdpi", 3 ) + dependsOn add_icon_task( "xxxhdpi", 4 ) + } + if (name.equals( "generateDebugAssets" )) + { + dependsOn checksum_task() + } } tasks.withType(JavaCompile)
1
0
0
0
Gabriel Ivăncescu : user32/listbox: Store the items array size instead of using HeapSize().
by Alexandre Julliard
03 Dec '18
03 Dec '18
Module: wine Branch: master Commit: ae4199e26476d739e0dddb70ce181bbefd1a7c2e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ae4199e26476d739e0dddb70…
Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 3 13:32:10 2018 +0300 user32/listbox: Store the items array size instead of using HeapSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index b104bfd..594c956 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -67,6 +67,7 @@ typedef struct INT height; /* Window height */ LB_ITEMDATA *items; /* Array of items */ INT nb_items; /* Number of items */ + UINT items_size; /* Total number of allocated items in the array */ INT top_item; /* Top visible item */ INT selected_item; /* Selected item */ INT focus_item; /* Item that has the focus */ @@ -713,7 +714,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) nb_items += LB_ARRAY_GRANULARITY - 1; nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); + nb_items += descr->items_size; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, nb_items * sizeof(LB_ITEMDATA)); } @@ -727,6 +728,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = nb_items; descr->items = item; return LB_OKAY; } @@ -1537,12 +1539,10 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; - if (!descr->items) max_items = 0; - else max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - if (descr->nb_items == max_items) + if (descr->nb_items == descr->items_size) { /* We need to grow the array */ - max_items += LB_ARRAY_GRANULARITY; + max_items = descr->items_size + LB_ARRAY_GRANULARITY; if (descr->items) item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); @@ -1554,6 +1554,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = max_items; descr->items = item; } @@ -1713,13 +1714,17 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) /* Shrink the item array if possible */ - max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(LB_ITEMDATA); + max_items = descr->items_size; if (descr->nb_items < max_items - 2*LB_ARRAY_GRANULARITY) { max_items -= LB_ARRAY_GRANULARITY; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); - if (item) descr->items = item; + if (item) + { + descr->items_size = max_items; + descr->items = item; + } } /* Repaint the items */ @@ -1765,6 +1770,7 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) descr->selected_item = -1; descr->focus_item = 0; descr->anchor_item = -1; + descr->items_size = 0; descr->items = NULL; } @@ -2506,6 +2512,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; descr->items = NULL; + descr->items_size = 0; descr->nb_items = 0; descr->top_item = 0; descr->selected_item = -1;
1
0
0
0
Gabriel Ivăncescu : user32/listbox: Account for NULL item when painting ownerdrawn list.
by Alexandre Julliard
03 Dec '18
03 Dec '18
Module: wine Branch: master Commit: 8700ef560eb50602af40a418b163f2b3f42e58b6 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8700ef560eb50602af40a418…
Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 3 13:32:09 2018 +0300 user32/listbox: Account for NULL item when painting ownerdrawn list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6a33f81..b104bfd 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -560,10 +560,10 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, if (focused) dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; - dis.itemData = item->data; + dis.itemData = item ? item->data : 0; dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", - descr->self, index, debugstr_w(item->str), action, + descr->self, index, item ? debugstr_w(item->str) : "", action, dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); SelectClipRgn( hdc, hrgn );
1
0
0
0
Nikolay Sivov : user32/listbox: Remove duplicated condition.
by Alexandre Julliard
03 Dec '18
03 Dec '18
Module: wine Branch: master Commit: db869b61a1a07421a40b65ee825e2cc7130009e1 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=db869b61a1a07421a40b65ee…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 13:32:08 2018 +0300 user32/listbox: Remove duplicated condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6dbf8d9..6a33f81 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -515,8 +515,8 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, INT index, UINT action, BOOL ignoreFocus ) { + BOOL selected = FALSE, focused; LB_ITEMDATA *item = NULL; - BOOL selected = FALSE; if (index < descr->nb_items) { @@ -524,6 +524,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, selected = is_item_selected(descr, index); } + focused = !ignoreFocus && descr->focus_item == index && descr->caret_on && descr->in_focus; + if (IS_OWNERDRAW(descr)) { DRAWITEMSTRUCT dis; @@ -555,9 +557,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.itemState = 0; if (selected) dis.itemState |= ODS_SELECTED; - if (!ignoreFocus && (descr->focus_item == index) && - (descr->caret_on) && - (descr->in_focus)) dis.itemState |= ODS_FOCUS; + if (focused) + dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; dis.itemData = item->data; dis.rcItem = *rect; @@ -607,9 +608,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, SetBkColor( hdc, oldBk ); SetTextColor( hdc, oldText ); } - if (!ignoreFocus && (descr->focus_item == index) && - (descr->caret_on) && - (descr->in_focus)) DrawFocusRect( hdc, rect ); + if (focused) + DrawFocusRect( hdc, rect ); } }
1
0
0
0
Nikolay Sivov : user32/listbox: Use helper to test for selected state on painting.
by Alexandre Julliard
03 Dec '18
03 Dec '18
Module: wine Branch: master Commit: 47058436426a306e7db8124508346204ee5865c2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=47058436426a306e7db81245…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 13:32:07 2018 +0300 user32/listbox: Use helper to test for selected state on painting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3eee691..6dbf8d9 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -516,7 +516,13 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, INT index, UINT action, BOOL ignoreFocus ) { LB_ITEMDATA *item = NULL; - if (index < descr->nb_items) item = &descr->items[index]; + BOOL selected = FALSE; + + if (index < descr->nb_items) + { + item = &descr->items[index]; + selected = is_item_selected(descr, index); + } if (IS_OWNERDRAW(descr)) { @@ -547,7 +553,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.hDC = hdc; dis.itemID = index; dis.itemState = 0; - if (item->selected) dis.itemState |= ODS_SELECTED; + if (selected) + dis.itemState |= ODS_SELECTED; if (!ignoreFocus && (descr->focus_item == index) && (descr->caret_on) && (descr->in_focus)) dis.itemState |= ODS_FOCUS; @@ -570,7 +577,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, DrawFocusRect( hdc, rect ); return; } - if (item && item->selected) + if (selected) { oldBk = SetBkColor( hdc, GetSysColor( COLOR_HIGHLIGHT ) ); oldText = SetTextColor( hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); @@ -595,7 +602,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, item->str, strlenW(item->str), descr->nb_tabs, descr->tabs, 0); } - if (item && item->selected) + if (selected) { SetBkColor( hdc, oldBk ); SetTextColor( hdc, oldText );
1
0
0
0
Gabriel Ivăncescu : user32/listbox: Use a helper function to check the selection state of an item.
by Alexandre Julliard
03 Dec '18
03 Dec '18
Module: wine Branch: master Commit: 3b087ce81faa102290f538cd6a0e2da251a9e464 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3b087ce81faa102290f538cd…
Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 3 13:32:06 2018 +0300 user32/listbox: Use a helper function to check the selection state of an item. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 286a33b..3eee691 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -120,6 +120,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) +{ + return descr->items[index].selected; +} + /********************************************************************* * listbox class descriptor */ @@ -2866,7 +2871,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case LB_GETSEL: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) return LB_ERR; - return descr->items[wParam].selected; + return is_item_selected(descr, wParam); case LB_SETSEL: ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE );
1
0
0
0
Roberto Pungartnik : po: Portuguese (Brazil) translation fixes.
by Alexandre Julliard
03 Dec '18
03 Dec '18
Module: wine Branch: master Commit: f29c09dce2a4f2e75424588677b83d6a7d341348 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=f29c09dce2a4f2e754245886…
Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sun Dec 2 22:35:56 2018 -0200 po: Portuguese (Brazil) translation fixes. Signed-off-by: Roberto Augusto Pungartnik <
rpungartnik2gmail.com
> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 77 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 37 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=f29c09dce2a4f2e75424…
1
0
0
0
← Newer
1
...
29
30
31
32
33
34
35
36
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
Results per page:
10
25
50
100
200