February 2019 - Wine-commits

Nikolay Sivov : mfreadwrite/tests: Initialize COM only for tests that need it.
by Alexandre Julliard 21 Feb '19

21 Feb '19

Module: wine Branch: master Commit: 4bca67bd474e0265ccaacabb987311f6b700fc6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bca67bd474e0265ccaacabb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 21 15:34:58 2019 +0300 mfreadwrite/tests: Initialize COM only for tests that need it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index de5f359..b2675dc 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -96,6 +96,8 @@ static void test_factory(void) IMFReadWriteClassFactory *factory, *factory2; HRESULT hr; + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_MFReadWriteClassFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IMFReadWriteClassFactory, (void **)&factory); ok(hr == S_OK, "Failed to create class factory, hr %#x.\n", hr); @@ -105,14 +107,14 @@ static void test_factory(void) ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#x.\n", hr); IMFReadWriteClassFactory_Release(factory); + + CoUninitialize(); } START_TEST(mfplat) { HRESULT hr; - CoInitialize(NULL); - hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -122,6 +124,4 @@ START_TEST(mfplat) test_factory(); MFShutdown(); - - CoUninitialize(); }

1 0

Gabriel Ivăncescu : user32/listbox: Move the item data removal into a separate function.
by Alexandre Julliard 21 Feb '19

21 Feb '19

Module: wine Branch: master Commit: 9f5865342180af56fddec002c995fd0ae5ac7bff URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f5865342180af56fddec002… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 15:13:12 2019 +0200 user32/listbox: Move the item data removal into a separate function. 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 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 7caf24c..87404c6 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -195,6 +195,15 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR item->selected = FALSE; } +static void remove_item_data(LB_DESCR *descr, UINT index) +{ + LB_ITEMDATA *item; + + item = descr->items + index; + if (index < descr->nb_items) + memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); +} + /********************************************************************* * listbox class descriptor */ @@ -1709,8 +1718,6 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) */ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) { - LB_ITEMDATA *item; - if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; /* We need to invalidate the original rect instead of the updated one. */ @@ -1723,15 +1730,9 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) } descr->nb_items--; LISTBOX_DeleteItem( descr, index ); + remove_item_data(descr, index); - /* Remove the item */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item, item + 1, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); if (descr->anchor_item == descr->nb_items) descr->anchor_item--; - resize_storage(descr, descr->nb_items); /* Repaint the items */

1 0

Gabriel Ivăncescu : user32/tests: Test negative counts in LB_SETCOUNT.
by Alexandre Julliard 21 Feb '19

21 Feb '19

Module: wine Branch: master Commit: 20c0dda05040f5f47465f455503aeb6e3f6fc0d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c0dda05040f5f47465f455… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 15:13:14 2019 +0200 user32/tests: Test negative counts in LB_SETCOUNT. 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/tests/listbox.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 5bdffc5..d15b18a 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1893,6 +1893,11 @@ static void test_set_count( void ) GetUpdateRect( listbox, &r, TRUE ); ok( !IsRectEmpty( &r ), "got empty rect\n"); + ret = SendMessageA( listbox, LB_SETCOUNT, -5, 0 ); + ok( ret == 0, "got %d\n", ret ); + ret = SendMessageA( listbox, LB_GETCOUNT, 0, 0 ); + ok( ret == -5, "got %d\n", ret ); + DestroyWindow( listbox ); for (i = 0; i < ARRAY_SIZE(styles); ++i)

1 0

Gabriel Ivăncescu : user32/listbox: Implement LBS_NODATA for single-selection listboxes.
by Alexandre Julliard 21 Feb '19

21 Feb '19

Module: wine Branch: master Commit: 8a9ff9fb1335fa1372ba37b8556ce8ef64a9083d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a9ff9fb1335fa1372ba37b8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 15:13:13 2019 +0200 user32/listbox: Implement LBS_NODATA for single-selection listboxes. The LBS_NODATA style's purpose is to drastically improve performance and memory usage on very large lists, since they should function as virtual lists. Thus, don't store any data for single-selection listboxes (descr->items always NULL). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32374 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 | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 87404c6..0be4867 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - LBS_NODATA + * - LBS_NODATA for multi-selection listboxes */ #include <string.h> @@ -130,17 +130,20 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size + LB_ARRAY_GRANULARITY * 2 < descr->items_size) { items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); - items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); - if (!items) + if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - SEND_NOTIFICATION(descr, LBN_ERRSPACE); - return FALSE; + items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); + if (!items) + { + SEND_NOTIFICATION(descr, LBN_ERRSPACE); + return FALSE; + } + descr->items = items; } descr->items_size = items_size; - descr->items = items; } - if ((descr->style & LBS_NODATA) && items_size > descr->nb_items) + 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)); @@ -185,6 +188,8 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR { 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)); @@ -199,6 +204,8 @@ static void remove_item_data(LB_DESCR *descr, UINT index) { 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)); @@ -1772,7 +1779,8 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) { INT i; - for(i = descr->nb_items - 1; i>=0; i--) LISTBOX_DeleteItem( descr, i); + if (!(descr->style & LBS_NODATA)) + for (i = descr->nb_items - 1; i >= 0; i--) LISTBOX_DeleteItem(descr, i); HeapFree( GetProcessHeap(), 0, descr->items ); descr->nb_items = 0; descr->top_item = 0;

1 0

Henri Verbeet : wined3d: Get rid of unused wined3d_blit_op enum elements.
by Alexandre Julliard 21 Feb '19

21 Feb '19

Module: wine Branch: master Commit: 0f0d4b147737eda9e26782221f11cc3d937dbfbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f0d4b147737eda9e2678222… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 20 13:55:12 2019 +0330 wined3d: Get rid of unused wined3d_blit_op enum elements. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5751bb2..a8ba1d0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2106,8 +2106,6 @@ enum wined3d_blit_op WINED3D_BLIT_OP_COLOR_BLIT, WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST, WINED3D_BLIT_OP_COLOR_BLIT_CKEY, - WINED3D_BLIT_OP_COLOR_FILL, - WINED3D_BLIT_OP_DEPTH_FILL, WINED3D_BLIT_OP_DEPTH_BLIT, WINED3D_BLIT_OP_RAW_BLIT, };

1 0

Gabriel Ivăncescu : user32/listbox: Move the item data insertion into a separate function.
by Alexandre Julliard 21 Feb '19

21 Feb '19

Module: wine Branch: master Commit: ff1ebccdd0e3e41298f2e14cad7f43edc8551e8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff1ebccdd0e3e41298f2e14c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 15:13:11 2019 +0200 user32/listbox: Move the item data insertion into a separate function. 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 | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 7dc3e66..7caf24c 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -181,6 +181,20 @@ 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) +{ + LB_ITEMDATA *item; + + 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; +} + /********************************************************************* * listbox class descriptor */ @@ -1573,23 +1587,13 @@ static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, BOOL fully_visible ) static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, LPWSTR str, ULONG_PTR data ) { - LB_ITEMDATA *item; INT oldfocus = descr->focus_item; if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; - /* Insert the item structure */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( 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; + insert_item_data(descr, index, str, data); descr->nb_items++; /* Get item height */

1 0

Gabriel Ivăncescu : user32/listbox: Use a helper to retrieve item height by index.
by Alexandre Julliard 21 Feb '19

21 Feb '19

Module: wine Branch: master Commit: 4a27ea8494ccc149ed36279eb123a4296fad2062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a27ea8494ccc149ed36279e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 15:13:09 2019 +0200 user32/listbox: Use a helper to retrieve item height 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 | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 118f564..9cecd00 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -158,6 +158,11 @@ static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) return HAS_STRINGS(descr) ? descr->items[index].str : NULL; } +static UINT get_item_height( const LB_DESCR *descr, UINT index ) +{ + return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -212,7 +217,7 @@ static INT LISTBOX_GetCurrentPageSize( const LB_DESCR *descr ) if (!(descr->style & LBS_OWNERDRAWVARIABLE)) return descr->page_size; for (i = descr->top_item, height = 0; i < descr->nb_items; i++) { - if ((height += descr->items[i].height) > descr->height) break; + if ((height += get_item_height(descr, i)) > descr->height) break; } if (i == descr->top_item) return 1; else return i - descr->top_item; @@ -232,7 +237,7 @@ static INT LISTBOX_GetMaxTopIndex( const LB_DESCR *descr ) { page = descr->height; for (max = descr->nb_items - 1; max >= 0; max--) - if ((page -= descr->items[max].height) < 0) break; + if ((page -= get_item_height(descr, max)) < 0) break; if (max < descr->nb_items - 1) max++; } else if (descr->style & LBS_MULTICOLUMN) @@ -360,12 +365,12 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) if (index > descr->top_item) { for (i = index - 1; i >= descr->top_item; i--) - dy -= descr->items[i].height; + dy -= get_item_height(descr, i); } else { for (i = index; i < descr->top_item; i++) - dy += descr->items[i].height; + dy += get_item_height(descr, i); } } else @@ -481,14 +486,14 @@ static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect if (index < descr->top_item) { for (i = descr->top_item-1; i >= index; i--) - rect->top -= descr->items[i].height; + rect->top -= get_item_height(descr, i); } else { for (i = descr->top_item; i < index; i++) - rect->top += descr->items[i].height; + rect->top += get_item_height(descr, i); } - rect->bottom = rect->top + descr->items[index].height; + rect->bottom = rect->top + get_item_height(descr, index); } } @@ -523,7 +528,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) { while (index < descr->nb_items) { - if ((pos += descr->items[index].height) > y) break; + if ((pos += get_item_height(descr, index)) > y) break; index++; } } @@ -532,7 +537,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) while (index > 0) { index--; - if ((pos -= descr->items[index].height) <= y) break; + if ((pos -= get_item_height(descr, index)) <= y) break; } } } @@ -1099,7 +1104,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) if (!(descr->style & LBS_OWNERDRAWVARIABLE)) rect.bottom = rect.top + descr->item_height; else - rect.bottom = rect.top + descr->items[i].height; + rect.bottom = rect.top + get_item_height(descr, i); /* keep the focus rect, to paint the focus item after */ if (i == descr->focus_item) @@ -1214,7 +1219,7 @@ static LRESULT LISTBOX_GetItemHeight( const LB_DESCR *descr, INT index ) SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - return descr->items[index].height; + return get_item_height(descr, index); } else return descr->item_height; } @@ -1384,9 +1389,9 @@ static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, BOOL fully ) } else if (descr->style & LBS_OWNERDRAWVARIABLE) { - INT height = fully ? descr->items[index].height : 1; + INT height = fully ? get_item_height(descr, index) : 1; for (top = index; top > descr->top_item; top--) - if ((height += descr->items[top-1].height) > descr->height) break; + if ((height += get_item_height(descr, top - 1)) > descr->height) break; } else { @@ -1597,7 +1602,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); item->height = mis.itemHeight ? mis.itemHeight : 1; TRACE("[%p]: measure item %d (%s) = %d\n", - descr->self, index, str ? debugstr_w(str) : "", item->height ); + descr->self, index, str ? debugstr_w(str) : "", get_item_height(descr, index)); } /* Repaint the items */

1 0

Gabriel Ivăncescu : user32/listbox: Use a helper to set item height by index.
by Alexandre Julliard 21 Feb '19

21 Feb '19

Module: wine Branch: master Commit: 9b6d9cb8ae7b5b12783dc92c387afe4b37c16209 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6d9cb8ae7b5b12783dc92c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 15:13:10 2019 +0200 user32/listbox: Use a helper to set item height 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 9cecd00..7dc3e66 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -163,6 +163,11 @@ static UINT get_item_height( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; } +static void set_item_height( LB_DESCR *descr, UINT index, UINT height ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].height = height; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -1243,7 +1248,7 @@ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT height, BO return LB_ERR; } TRACE("[%p]: item %d height = %d\n", descr->self, index, height ); - descr->items[index].height = height; + set_item_height(descr, index, height); LISTBOX_UpdateScroll( descr ); if (repaint) LISTBOX_InvalidateItems( descr, index ); @@ -1600,7 +1605,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, mis.itemData = str ? (ULONG_PTR)str : data; mis.itemHeight = descr->item_height; SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); - item->height = mis.itemHeight ? mis.itemHeight : 1; + set_item_height(descr, index, mis.itemHeight ? mis.itemHeight : 1); TRACE("[%p]: measure item %d (%s) = %d\n", descr->self, index, str ? debugstr_w(str) : "", get_item_height(descr, index)); }

1 0

Dmitry Timoshkov : windowscodecs: Avoid redundant checks when reading a TIFF tile.
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: 493fbabb855645e00c304cccaf1dfca764fa5305 URL: https://source.winehq.org/git/wine.git/?a=commit;h=493fbabb855645e00c304ccc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 12:07:58 2019 +0800 windowscodecs: Avoid redundant checks when reading a TIFF tile. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 3bc8d69..295330a 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -974,34 +974,25 @@ static HRESULT WINAPI TiffFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT tile_y) { - HRESULT hr=S_OK; tsize_t ret; int swap_bytes; swap_bytes = pTIFFIsByteSwapped(This->parent->tiff); ret = pTIFFSetDirectory(This->parent->tiff, This->index); - if (ret == -1) - hr = E_FAIL; + return E_FAIL; - if (hr == S_OK) - { - if (This->decode_info.tiled) - { - ret = pTIFFReadEncodedTile(This->parent->tiff, tile_x + tile_y * This->decode_info.tiles_across, This->cached_tile, This->decode_info.tile_size); - } - else - { - ret = pTIFFReadEncodedStrip(This->parent->tiff, tile_y, This->cached_tile, This->decode_info.tile_size); - } + if (This->decode_info.tiled) + ret = pTIFFReadEncodedTile(This->parent->tiff, tile_x + tile_y * This->decode_info.tiles_across, This->cached_tile, This->decode_info.tile_size); + else + ret = pTIFFReadEncodedStrip(This->parent->tiff, tile_y, This->cached_tile, This->decode_info.tile_size); - if (ret == -1) - hr = E_FAIL; - } + if (ret == -1) + return E_FAIL; /* 8bpp grayscale with extra alpha */ - if (hr == S_OK && This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32) + if (This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32) { BYTE *src; DWORD *dst, count = This->decode_info.tile_width * This->decode_info.tile_height; @@ -1016,7 +1007,7 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT } } - if (hr == S_OK && This->decode_info.reverse_bgr) + if (This->decode_info.reverse_bgr) { if (This->decode_info.bps == 8) { @@ -1027,7 +1018,7 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT } } - if (hr == S_OK && swap_bytes && This->decode_info.bps > 8) + if (swap_bytes && This->decode_info.bps > 8) { UINT row, i, samples_per_row; BYTE *sample, temp; @@ -1055,7 +1046,7 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT } } - if (hr == S_OK && This->decode_info.invert_grayscale) + if (This->decode_info.invert_grayscale) { BYTE *byte, *end; @@ -1071,13 +1062,10 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT *byte = ~(*byte); } - if (hr == S_OK) - { - This->cached_tile_x = tile_x; - This->cached_tile_y = tile_y; - } + This->cached_tile_x = tile_x; + This->cached_tile_y = tile_y; - return hr; + return S_OK; } static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface,

1 0

Michael Stefaniuc : d3dx9/tests: Avoid using the comma operator ( coccinellery).
by Alexandre Julliard 20 Feb '19

20 Feb '19

Module: wine Branch: master Commit: eb0eaf7027797c6a99b4b5ecdb70c5ba336dccc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb0eaf7027797c6a99b4b5ec… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 19 20:27:34 2019 +0100 d3dx9/tests: Avoid using the comma operator (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 114 ++++++++++++++++++++++----------------------- dlls/d3dx9_36/tests/mesh.c | 2 +- 2 files changed, 58 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb0eaf7027797c6a99b4…

1 0