wine-commits March 2019

2 participants
1097 discussions

Gabriel Ivăncescu : user32/listbox: Use a helper to get the size of an item.

by Alexandre Julliard

Module: wine Branch: master Commit: 80ff468748a19a89b78c73cfbb49584122697af8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80ff468748a19a89b78c73cf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 28 15:10:30 2019 +0200 user32/listbox: Use a helper to get the size of an item. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(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 127ba35..219910b 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -122,6 +122,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static size_t get_sizeof_item( const LB_DESCR *descr ) +{ + return sizeof(LB_ITEMDATA); +} + static BOOL resize_storage(LB_DESCR *descr, UINT items_size) { LB_ITEMDATA *items; @@ -132,7 +137,7 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); + items = heap_realloc(descr->items, items_size * get_sizeof_item(descr)); if (!items) { SEND_NOTIFICATION(descr, LBN_ERRSPACE); @@ -146,7 +151,7 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) { memset(&descr->items[descr->nb_items], 0, - (items_size - descr->nb_items) * sizeof(LB_ITEMDATA)); + (items_size - descr->nb_items) * get_sizeof_item(descr)); } return TRUE; } @@ -196,24 +201,26 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) static void insert_item_data(LB_DESCR *descr, UINT index) { + size_t size = get_sizeof_item(descr); LB_ITEMDATA *item; if (!descr->items) return; item = descr->items + index; if (index < descr->nb_items) - memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + memmove(item + 1, item, (descr->nb_items - index) * size); } static void remove_item_data(LB_DESCR *descr, UINT index) { + size_t size = get_sizeof_item(descr); LB_ITEMDATA *item; if (!descr->items) return; item = descr->items + index; if (index < descr->nb_items) - memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + memmove(item, item + 1, (descr->nb_items - index) * size); } /*********************************************************************

5 years, 2 months

Huw Davies : user32/listbox: Use helper functions for item initialization.

by Alexandre Julliard

Module: wine Branch: master Commit: 0092a4bb19e808342d2761d72b5ad21e8825fa03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0092a4bb19e808342d2761d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 28 15:10:29 2019 +0200 user32/listbox: Use helper functions for item initialization. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 75257ad..127ba35 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -166,6 +166,11 @@ static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) return HAS_STRINGS(descr) ? descr->items[index].str : NULL; } +static void set_item_string( const LB_DESCR *descr, UINT index, WCHAR *string ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].str = string; +} + static UINT get_item_height( const LB_DESCR *descr, UINT index ) { return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; @@ -189,7 +194,7 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) descr->items[index].selected = state; } -static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data) +static void insert_item_data(LB_DESCR *descr, UINT index) { LB_ITEMDATA *item; @@ -198,11 +203,6 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR item = descr->items + index; if (index < descr->nb_items) memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); - - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; } static void remove_item_data(LB_DESCR *descr, UINT index) @@ -1609,8 +1609,12 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; - insert_item_data(descr, index, str, data); + insert_item_data(descr, index); descr->nb_items++; + set_item_string(descr, index, str); + set_item_data(descr, index, HAS_STRINGS(descr) ? 0 : data); + set_item_height(descr, index, 0); + set_item_selected_state(descr, index, FALSE); /* Get item height */

5 years, 2 months

Gabriel Ivăncescu : user32/listbox: Rewrite FindString to use helpers and avoid the macro.

by Alexandre Julliard

Module: wine Branch: master Commit: 18a6e37ce1116471bb60091f519ed4e88341da08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18a6e37ce1116471bb60091f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 28 15:10:28 2019 +0200 user32/listbox: Rewrite FindString to use helpers and avoid the macro. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 57 ++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 9bf9f90..75257ad 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1003,8 +1003,7 @@ static INT LISTBOX_FindFileStrPos( LB_DESCR *descr, LPCWSTR str ) */ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exact ) { - INT i; - LB_ITEMDATA *item; + INT i, index; if (descr->style & LBS_NODATA) { @@ -1012,41 +1011,38 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa return LB_ERR; } - if (start >= descr->nb_items) start = -1; - item = descr->items + start + 1; + start++; + if (start >= descr->nb_items) start = 0; if (HAS_STRINGS(descr)) { if (!str || ! str[0] ) return LB_ERR; if (exact) { - for (i = start + 1; i < descr->nb_items; i++, item++) - if (!LISTBOX_lstrcmpiW( descr->locale, str, item->str )) return i; - for (i = 0, item = descr->items; i <= start; i++, item++) - if (!LISTBOX_lstrcmpiW( descr->locale, str, item->str )) return i; + for (i = 0, index = start; i < descr->nb_items; i++, index++) + { + if (index == descr->nb_items) index = 0; + if (!LISTBOX_lstrcmpiW(descr->locale, str, get_item_string(descr, index))) + return index; + } } else { - /* Special case for drives and directories: ignore prefix */ -#define CHECK_DRIVE(item) \ - if ((item)->str[0] == '[') \ - { \ - if (!strncmpiW( str, (item)->str+1, len )) return i; \ - if (((item)->str[1] == '-') && !strncmpiW(str, (item)->str+2, len)) \ - return i; \ - } - + /* Special case for drives and directories: ignore prefix */ INT len = strlenW(str); - for (i = start + 1; i < descr->nb_items; i++, item++) - { - if (!strncmpiW( str, item->str, len )) return i; - CHECK_DRIVE(item); - } - for (i = 0, item = descr->items; i <= start; i++, item++) + WCHAR *item_str; + + for (i = 0, index = start; i < descr->nb_items; i++, index++) { - if (!strncmpiW( str, item->str, len )) return i; - CHECK_DRIVE(item); + if (index == descr->nb_items) index = 0; + item_str = get_item_string(descr, index); + + if (!strncmpiW(str, item_str, len)) return index; + if (item_str[0] == '[') + { + if (!strncmpiW(str, item_str + 1, len)) return index; + if (item_str[1] == '-' && !strncmpiW(str, item_str + 2, len)) return index; + } } -#undef CHECK_DRIVE } } else @@ -1056,10 +1052,11 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa return LISTBOX_FindStringPos( descr, str, TRUE ); /* Otherwise use a linear search */ - for (i = start + 1; i < descr->nb_items; i++, item++) - if (item->data == (ULONG_PTR)str) return i; - for (i = 0, item = descr->items; i <= start; i++, item++) - if (item->data == (ULONG_PTR)str) return i; + for (i = 0, index = start; i < descr->nb_items; i++, index++) + { + if (index == descr->nb_items) index = 0; + if (get_item_data(descr, index) == (ULONG_PTR)str) return index; + } } return LB_ERR; }

5 years, 2 months

Gabriel Ivăncescu : user32/listbox: Use a helper to set item data by index.

by Alexandre Julliard

Module: wine Branch: master Commit: a01b90d382254ee64ebf12ef11a67b4a31961961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a01b90d382254ee64ebf12ef… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 28 15:10:27 2019 +0200 user32/listbox: Use a helper to set item data by index. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(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 826ce01..9bf9f90 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -156,6 +156,11 @@ static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; } +static void set_item_data( LB_DESCR *descr, UINT index, ULONG_PTR data ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].data = data; +} + static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) { return HAS_STRINGS(descr) ? descr->items[index].str : NULL; @@ -2743,7 +2748,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; + set_item_data(descr, wParam, lParam); /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE;

5 years, 2 months

Michael Stefaniuc : riched20/tests: Avoid using the comma operator.

by Alexandre Julliard

Module: wine Branch: master Commit: 350123e18313f3c0f8bfcd8aaf5c41d67b5f6056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=350123e18313f3c0f8bfcd8a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 00:50:30 2019 +0100 riched20/tests: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/tests/richole.c | 62 +++++++++++++++++++++---------------------- dlls/riched32/tests/editor.c | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=350123e18313f3c0f8bf…

5 years, 2 months

Michael Stefaniuc : msxml3: Remove redundant not-NULL check (coccinellery) .

by Alexandre Julliard

Module: wine Branch: master Commit: b3a464a83559fc06cd7e15a0001bc278509efede URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3a464a83559fc06cd7e15a0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 21 20:35:34 2019 +0100 msxml3: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/selection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index b7c560a..31be4d8 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -831,7 +831,7 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) TRACE("found %d matches\n", xmlXPathNodeSetGetLength(This->result->nodesetval)); cleanup: - if (This && FAILED(hr)) + if (FAILED(hr)) IXMLDOMSelection_Release( &This->IXMLDOMSelection_iface ); xmlXPathFreeContext(ctxt); return hr;

5 years, 2 months

Michael Stefaniuc : dwrite: Remove useless casts to self.

by Alexandre Julliard

Module: wine Branch: master Commit: 6f5436f9f4b0bbb664d9ac3b78a634ccb33230bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f5436f9f4b0bbb664d9ac3b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 00:50:27 2019 +0100 dwrite: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 +- dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/opentype.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 948c1df..3742366 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2420,7 +2420,7 @@ static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT3 BOOL is_system_collection(IDWriteFontCollection *collection) { void *obj; - return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, (void**)&obj) == S_OK; + return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, &obj) == S_OK; } static HRESULT WINAPI dwritesystemfontcollection_QueryInterface(IDWriteFontCollection1 *iface, REFIID riid, void **obj) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index de79fd4..4cd5ce4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2520,7 +2520,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ changed = set_layout_range_iface_attr((IUnknown**)&dest->object, (IUnknown*)value->u.object); break; case LAYOUT_RANGE_ATTR_EFFECT: - changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.effect); + changed = set_layout_range_iface_attr(&dest_iface->iface, value->u.effect); break; case LAYOUT_RANGE_ATTR_UNDERLINE: changed = dest_bool->value != value->u.underline; @@ -2560,7 +2560,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ dest_spacing->min_advance = value->u.spacing.min_advance; break; case LAYOUT_RANGE_ATTR_TYPOGRAPHY: - changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.typography); + changed = set_layout_range_iface_attr(&dest_iface->iface, (IUnknown*)value->u.typography); break; default: ; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b13f424..4772236 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -538,7 +538,7 @@ struct ot_lookup_table WORD subtable[1]; }; -#define GLYPH_NOT_COVERED ((unsigned int)~0u) +#define GLYPH_NOT_COVERED (~0u) struct ot_coverage_format1 {

5 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019