February 2019 - Wine-Commits

Aric Stewart : configure: Use SDL2_LIBS if set.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 967e2622fbcb830f88b636c613afa95c5cecd97e URL: https://source.winehq.org/git/wine.git/?a=commit;h=967e2622fbcb830f88b636c6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 15 10:53:51 2019 -0600 configure: Use SDL2_LIBS if set. Fix by Andrew Eikum. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 7f89b1e..87ebf3c 100755 --- a/configure +++ b/configure @@ -13925,7 +13925,7 @@ if ${ac_cv_lib_soname_SDL2+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lSDL2 $LIBS" +LIBS="-lSDL2 $SDL2_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/configure.ac b/configure.ac index 36add65..60f8acc 100644 --- a/configure.ac +++ b/configure.ac @@ -1629,7 +1629,7 @@ if test "x$with_sdl" != "xno" then WINE_PACKAGE_FLAGS(SDL2,[sdl2],[-lSDL2],,, [AC_CHECK_HEADERS([SDL2/SDL.h], - [WINE_CHECK_SONAME(SDL2,SDL_Init,,,,[[libSDL2-2.0*]])])]) + [WINE_CHECK_SONAME(SDL2,SDL_Init,,,[$SDL2_LIBS],[[libSDL2-2.0*]])])]) fi WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], [libSDL2 ${notice_platform}development files not found, SDL2 won't be supported.])

1 0

Zebediah Figura : xinput: Fix axis scaling arithmetic.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 7fd8ae1e4f0f44f58745119d35ac3c1fd231780b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fd8ae1e4f0f44f58745119d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 12 00:06:07 2019 -0600 xinput: Fix axis scaling arithmetic. Cast difference to ULONGLONG to ensure unsigned division, and correct off-by-one error present when inverting axes (previously hidden by signed division bug). Fixes a regression introduced by bd9e130ee5b569433f2c847c5b2b562f0ae35ac5. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46623 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 7553aab..c0c405f 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -318,8 +318,15 @@ void HID_destroy_gamepads(xinput_controller *devices) LeaveCriticalSection(&hid_xinput_crit); } -#define SCALE_SHORT(v,r) (SHORT)((((0xffff)*(v - (r).min))/(r).range)-32767) -#define SCALE_BYTE(v,r) (BYTE)((((0xff)*(v - (r).min))/(r).range)) +static SHORT scale_short(LONG value, const struct axis_info *axis) +{ + return ((((ULONGLONG)(value - axis->min)) * 0xffff) / axis->range) - 32768; +} + +static BYTE scale_byte(LONG value, const struct axis_info *axis) +{ + return (((ULONGLONG)(value - axis->min)) * 0xff) / axis->range; +} void HID_update_state(xinput_controller* device) { @@ -382,22 +389,22 @@ void HID_update_state(xinput_controller* device) } HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLX = SCALE_SHORT(value, private->lx); + device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLY = -SCALE_SHORT(value, private->ly); + device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRX = SCALE_SHORT(value, private->rx); + device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRY = -SCALE_SHORT(value, private->ry); + device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bRightTrigger = SCALE_BYTE(value, private->rtrigger); + device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bLeftTrigger = SCALE_BYTE(value, private->ltrigger); + device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); LeaveCriticalSection(&private->crit); }

1 0

Alexandre Julliard : Release 4.2.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 06531b1d9898ba3ac3b7c69d6192682202606f8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=06531b1d9898ba3ac3b7c69d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 21:34:44 2019 +0100 Release 4.2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 794 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 409 insertions(+), 406 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06531b1d9898ba3ac3b7…

1 0

Zebediah Figura : wined3d: Get rid of the "update_state" field from struct wined3d_device.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 477e01af718ec7dbff628bdac9a173e834bd9ea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=477e01af718ec7dbff628bda… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 15 00:38:12 2019 -0600 wined3d: Get rid of the "update_state" field from struct wined3d_device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++---------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6831c63..d9d6cf2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2055,13 +2055,13 @@ void CDECL wined3d_device_set_rasterizer_state(struct wined3d_device *device, TRACE("device %p, rasterizer_state %p.\n", device, rasterizer_state); - prev = device->update_state->rasterizer_state; + prev = device->state.rasterizer_state; if (prev == rasterizer_state) return; if (rasterizer_state) wined3d_rasterizer_state_incref(rasterizer_state); - device->update_state->rasterizer_state = rasterizer_state; + device->state.rasterizer_state = rasterizer_state; wined3d_cs_emit_set_rasterizer_state(device->cs, rasterizer_state); if (prev) wined3d_rasterizer_state_decref(prev); @@ -2802,12 +2802,12 @@ void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct TRACE("device %p, shader %p.\n", device, shader); - prev = device->update_state->shader[WINED3D_SHADER_TYPE_HULL]; + prev = device->state.shader[WINED3D_SHADER_TYPE_HULL]; if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->update_state->shader[WINED3D_SHADER_TYPE_HULL] = shader; + device->state.shader[WINED3D_SHADER_TYPE_HULL] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_HULL, shader); if (prev) wined3d_shader_decref(prev); @@ -2857,12 +2857,12 @@ void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struc TRACE("device %p, shader %p.\n", device, shader); - prev = device->update_state->shader[WINED3D_SHADER_TYPE_DOMAIN]; + prev = device->state.shader[WINED3D_SHADER_TYPE_DOMAIN]; if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->update_state->shader[WINED3D_SHADER_TYPE_DOMAIN] = shader; + device->state.shader[WINED3D_SHADER_TYPE_DOMAIN] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_DOMAIN, shader); if (prev) wined3d_shader_decref(prev); @@ -3636,7 +3636,6 @@ HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device) return hr; device->recording = stateblock; - device->update_state = &stateblock->state; device->update_stateblock_state = &stateblock->stateblock_state; TRACE("Recording stateblock %p.\n", stateblock); @@ -3662,7 +3661,6 @@ HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device, *stateblock = object; device->recording = NULL; - device->update_state = &device->state; device->update_stateblock_state = &device->stateblock_state; TRACE("Returning stateblock %p.\n", *stateblock); @@ -5094,7 +5092,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); - device->update_state = &device->state; memset(&device->stateblock_state, 0, sizeof(device->stateblock_state)); wined3d_stateblock_state_init(&device->stateblock_state, device, WINED3D_STATE_INIT_DEFAULT); device->update_stateblock_state = &device->stateblock_state; @@ -5371,7 +5368,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, } state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); - device->update_state = &device->state; wined3d_stateblock_state_init(&device->stateblock_state, device, WINED3D_STATE_INIT_DEFAULT); device->update_stateblock_state = &device->stateblock_state; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eaca69b..fbde36c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3047,7 +3047,6 @@ struct wined3d_device enum wined3d_feature_level feature_level; struct wined3d_state state; - struct wined3d_state *update_state; struct wined3d_stateblock *recording; struct wined3d_stateblock_state stateblock_state; struct wined3d_stateblock_state *update_stateblock_state;

1 0

Gabriel Ivăncescu : user32/listbox: Use a helper to retrieve item string by index.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 8ffe69d705ce8297a095927bd89f90e94ab0baf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ffe69d705ce8297a095927b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 14 14:06:45 2019 +0200 user32/listbox: Use a helper to retrieve item string 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 | 51 ++++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 70b55e1..7646486 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -153,6 +153,11 @@ static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; } +static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) +{ + return HAS_STRINGS(descr) ? descr->items[index].str : NULL; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -551,11 +556,11 @@ 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; + WCHAR *item_str = NULL; if (index < descr->nb_items) { - item = &descr->items[index]; + item_str = get_item_string(descr, index); selected = is_item_selected(descr, index); } @@ -598,7 +603,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.itemData = get_item_data(descr, index); dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", - descr->self, index, item ? debugstr_w(item->str) : "", action, + descr->self, index, debugstr_w(item_str), action, dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); SelectClipRgn( hdc, hrgn ); @@ -620,22 +625,22 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, } TRACE("[%p]: painting %d (%s) action=%02x rect=%s\n", - descr->self, index, item ? debugstr_w(item->str) : "", action, + descr->self, index, debugstr_w(item_str), action, wine_dbgstr_rect(rect) ); - if (!item) + if (!item_str) ExtTextOutW( hdc, rect->left + 1, rect->top, ETO_OPAQUE | ETO_CLIPPED, rect, NULL, 0, NULL ); else if (!(descr->style & LBS_USETABSTOPS)) ExtTextOutW( hdc, rect->left + 1, rect->top, - ETO_OPAQUE | ETO_CLIPPED, rect, item->str, - strlenW(item->str), NULL ); + ETO_OPAQUE | ETO_CLIPPED, rect, item_str, + strlenW(item_str), NULL ); else { /* Output empty string to paint background in the full width. */ ExtTextOutW( hdc, rect->left + 1, rect->top, ETO_OPAQUE | ETO_CLIPPED, rect, NULL, 0, NULL ); TabbedTextOutW( hdc, rect->left + 1 , rect->top, - item->str, strlenW(item->str), + item_str, strlenW(item_str), descr->nb_tabs, descr->tabs, 0); } if (selected) @@ -797,28 +802,29 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL } if (HAS_STRINGS(descr)) { + WCHAR *str = get_item_string(descr, index); + if (!buffer) { - len = strlenW(descr->items[index].str); + len = strlenW(str); if( unicode ) return len; - return WideCharToMultiByte( CP_ACP, 0, descr->items[index].str, len, - NULL, 0, NULL, NULL ); + return WideCharToMultiByte( CP_ACP, 0, str, len, NULL, 0, NULL, NULL ); } - TRACE("index %d (0x%04x) %s\n", index, index, debugstr_w(descr->items[index].str)); + TRACE("index %d (0x%04x) %s\n", index, index, debugstr_w(str)); __TRY /* hide a Delphi bug that passes a read-only buffer */ { if(unicode) { - strcpyW( buffer, descr->items[index].str ); + strcpyW(buffer, str); len = strlenW(buffer); } else { - len = WideCharToMultiByte(CP_ACP, 0, descr->items[index].str, -1, - (LPSTR)buffer, 0x7FFFFFFF, NULL, NULL) - 1; + len = WideCharToMultiByte(CP_ACP, 0, str, -1, (LPSTR)buffer, + 0x7FFFFFFF, NULL, NULL) - 1; } } __EXCEPT_PAGE_FAULT @@ -866,7 +872,7 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { index = (min + max) / 2; if (HAS_STRINGS(descr)) - res = LISTBOX_lstrcmpiW( descr->locale, descr->items[index].str, str ); + res = LISTBOX_lstrcmpiW( descr->locale, get_item_string(descr, index), str ); else { COMPAREITEMSTRUCT cis; @@ -909,7 +915,7 @@ static INT LISTBOX_FindFileStrPos( LB_DESCR *descr, LPCWSTR str ) while (min != max) { INT index = (min + max) / 2; - LPCWSTR p = descr->items[index].str; + LPCWSTR p = get_item_string(descr, index); if (*p == '[') /* drive or directory */ { if (*str != '[') res = -1; @@ -1655,7 +1661,7 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) { /* save the item data before it gets freed by LB_RESETCONTENT */ ULONG_PTR item_data = get_item_data(descr, index); - LPWSTR item_str = descr->items[index].str; + LPWSTR item_str = get_item_string(descr, index); if (!descr->nb_items) SendMessageW( descr->self, LB_RESETCONTENT, 0, 0 ); @@ -1677,8 +1683,7 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) dis.itemData = item_data; SendMessageW( descr->owner, WM_DELETEITEM, id, (LPARAM)&dis ); } - if (HAS_STRINGS(descr)) - HeapFree( GetProcessHeap(), 0, item_str ); + HeapFree( GetProcessHeap(), 0, item_str ); } @@ -2730,9 +2735,9 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return LB_ERR; } if (!HAS_STRINGS(descr)) return sizeof(ULONG_PTR); - if (unicode) return strlenW( descr->items[wParam].str ); - return WideCharToMultiByte( CP_ACP, 0, descr->items[wParam].str, - strlenW(descr->items[wParam].str), NULL, 0, NULL, NULL ); + if (unicode) return strlenW(get_item_string(descr, wParam)); + return WideCharToMultiByte( CP_ACP, 0, get_item_string(descr, wParam), + strlenW(get_item_string(descr, wParam)), NULL, 0, NULL, NULL ); case LB_GETCURSEL: if (descr->nb_items == 0)

1 0

Gabriel Ivăncescu : user32/tests: Test changing the selection styles after listbox creation.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 3179e48f69a07c118f7110cba2fd5611493fd38c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3179e48f69a07c118f7110cb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 14 14:06:43 2019 +0200 user32/tests: Test changing the selection styles after listbox creation. 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 | 130 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 7f1e9cf..5bdffc5 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -665,6 +665,135 @@ static void test_listbox_height(void) DestroyWindow( hList ); } +static void test_changing_selection_styles(void) +{ + static const DWORD styles[] = + { + 0, + LBS_NODATA | LBS_OWNERDRAWFIXED + }; + static const DWORD selstyles[] = + { + 0, + LBS_MULTIPLESEL, + LBS_EXTENDEDSEL, + LBS_MULTIPLESEL | LBS_EXTENDEDSEL + }; + static const LONG selexpect_single[] = { 0, 0, 1 }; + static const LONG selexpect_single2[] = { 1, 0, 0 }; + static const LONG selexpect_multi[] = { 1, 0, 1 }; + static const LONG selexpect_multi2[] = { 1, 1, 0 }; + + HWND parent, listbox; + DWORD style; + LONG ret; + UINT i, j, k; + + parent = create_parent(); + ok(parent != NULL, "Failed to create parent window.\n"); + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + /* Test if changing selection styles affects selection storage */ + for (j = 0; j < ARRAY_SIZE(selstyles); j++) + { + LONG setcursel_expect, selitemrange_expect, getselcount_expect; + const LONG *selexpect; + + listbox = CreateWindowA("listbox", "TestList", styles[i] | selstyles[j] | WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, parent, (HMENU)1, NULL, 0); + ok(listbox != NULL, "%u: Failed to create ListBox window.\n", j); + + if (selstyles[j] & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) + { + setcursel_expect = LB_ERR; + selitemrange_expect = LB_OKAY; + getselcount_expect = 2; + selexpect = selexpect_multi; + } + else + { + setcursel_expect = 2; + selitemrange_expect = LB_ERR; + getselcount_expect = LB_ERR; + selexpect = selexpect_single; + } + + for (k = 0; k < ARRAY_SIZE(selexpect_multi); k++) + { + ret = SendMessageA(listbox, LB_INSERTSTRING, -1, (LPARAM)"x"); + ok(ret == k, "%u: Unexpected return value %d, expected %d.\n", j, ret, k); + } + ret = SendMessageA(listbox, LB_GETCOUNT, 0, 0); + ok(ret == ARRAY_SIZE(selexpect_multi), "%u: Unexpected count %d.\n", j, ret); + + /* Select items with different methods */ + ret = SendMessageA(listbox, LB_SETCURSEL, 2, 0); + ok(ret == setcursel_expect, "%u: Unexpected return value %d.\n", j, ret); + ret = SendMessageA(listbox, LB_SELITEMRANGE, TRUE, MAKELPARAM(0, 0)); + ok(ret == selitemrange_expect, "%u: Unexpected return value %d.\n", j, ret); + ret = SendMessageA(listbox, LB_SELITEMRANGE, TRUE, MAKELPARAM(2, 2)); + ok(ret == selitemrange_expect, "%u: Unexpected return value %d.\n", j, ret); + + /* Verify that the proper items are selected */ + for (k = 0; k < ARRAY_SIZE(selexpect_multi); k++) + { + ret = SendMessageA(listbox, LB_GETSEL, k, 0); + ok(ret == selexpect[k], "%u: Unexpected selection state %d, expected %d.\n", + j, ret, selexpect[k]); + } + + /* Now change the selection style */ + style = GetWindowLongA(listbox, GWL_STYLE); + ok((style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) == selstyles[j], + "%u: unexpected window styles %#x.\n", j, style); + if (selstyles[j] & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) + style &= ~selstyles[j]; + else + style |= LBS_MULTIPLESEL | LBS_EXTENDEDSEL; + SetWindowLongA(listbox, GWL_STYLE, style); + style = GetWindowLongA(listbox, GWL_STYLE); + ok(!(style & selstyles[j]), "%u: unexpected window styles %#x.\n", j, style); + + /* Verify that the same items are selected */ + ret = SendMessageA(listbox, LB_GETSELCOUNT, 0, 0); + ok(ret == getselcount_expect, "%u: expected %d from LB_GETSELCOUNT, got %d\n", + j, getselcount_expect, ret); + + for (k = 0; k < ARRAY_SIZE(selexpect_multi); k++) + { + ret = SendMessageA(listbox, LB_GETSEL, k, 0); + ok(ret == selexpect[k], "%u: Unexpected selection state %d, expected %d.\n", + j, ret, selexpect[k]); + } + + /* Lastly see if we can still change the selection as before with old style */ + if (setcursel_expect != LB_ERR) setcursel_expect = 0; + ret = SendMessageA(listbox, LB_SETCURSEL, 0, 0); + ok(ret == setcursel_expect, "%u: Unexpected return value %d.\n", j, ret); + ret = SendMessageA(listbox, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, 1)); + ok(ret == selitemrange_expect, "%u: Unexpected return value %d.\n", j, ret); + ret = SendMessageA(listbox, LB_SELITEMRANGE, FALSE, MAKELPARAM(2, 2)); + ok(ret == selitemrange_expect, "%u: Unexpected return value %d.\n", j, ret); + + /* And verify the selections */ + selexpect = (selstyles[j] & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) ? selexpect_multi2 : selexpect_single2; + ret = SendMessageA(listbox, LB_GETSELCOUNT, 0, 0); + ok(ret == getselcount_expect, "%u: expected %d from LB_GETSELCOUNT, got %d\n", + j, getselcount_expect, ret); + + for (k = 0; k < ARRAY_SIZE(selexpect_multi); k++) + { + ret = SendMessageA(listbox, LB_GETSEL, k, 0); + ok(ret == selexpect[k], "%u: Unexpected selection state %d, expected %d.\n", + j, ret, selexpect[k]); + } + + DestroyWindow(listbox); + } + } + DestroyWindow(parent); +} + static void test_itemfrompoint(void) { /* WS_POPUP is required in order to have a more accurate size calculation ( @@ -2309,6 +2438,7 @@ START_TEST(listbox) test_LB_SELITEMRANGE(); test_LB_SETCURSEL(); test_listbox_height(); + test_changing_selection_styles(); test_itemfrompoint(); test_listbox_item_data(); test_listbox_LB_DIR();

1 0

Gabriel Ivăncescu : user32/listbox: Resize the entire item array at once in SetCount.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 3ef790b9680cbf38fc93b4902e3ca6c9f57c5422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ef790b9680cbf38fc93b490… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 14 14:06:40 2019 +0200 user32/listbox: Resize the entire item array at once in 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/listbox.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index a2791eb..a9195dc 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -139,6 +139,12 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) descr->items_size = items_size; descr->items = items; } + + if ((descr->style & LBS_NODATA) && items_size > descr->nb_items) + { + memset(&descr->items[descr->nb_items], 0, + (items_size - descr->nb_items) * sizeof(LB_ITEMDATA)); + } return TRUE; } @@ -1751,9 +1757,9 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) /*********************************************************************** * LISTBOX_SetCount */ -static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) +static LRESULT LISTBOX_SetCount( LB_DESCR *descr, UINT count ) { - LRESULT ret; + UINT orig_num = descr->nb_items; if (!(descr->style & LBS_NODATA)) { @@ -1761,19 +1767,30 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) return LB_ERR; } - /* FIXME: this is far from optimal... */ - if (count > descr->nb_items) - { - while (count > descr->nb_items) - if ((ret = LISTBOX_InsertString( descr, -1, 0 )) < 0) - return ret; - } - else if (count < descr->nb_items) + if (!resize_storage(descr, count)) + return LB_ERRSPACE; + descr->nb_items = count; + + if (count) { - while (count < descr->nb_items) - if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) - return ret; + LISTBOX_UpdateScroll(descr); + if (count < orig_num) + { + descr->anchor_item = min(descr->anchor_item, count - 1); + if (descr->selected_item >= count) + descr->selected_item = -1; + + /* If we removed the scrollbar, reset the top of the list */ + if (count <= descr->page_size && orig_num > descr->page_size) + LISTBOX_SetTopItem(descr, 0, TRUE); + + descr->focus_item = min(descr->focus_item, count - 1); + } + + /* If it was empty before growing, set focus to the first item */ + else if (orig_num == 0) LISTBOX_SetCaretIndex(descr, 0, FALSE); } + else SendMessageW(descr->self, LB_RESETCONTENT, 0, 0); InvalidateRect( descr->self, NULL, TRUE ); return LB_OKAY;

1 0

Paul Gofman : d3dx9: Handle short parameter in d3dx_set_shader_const_state ().
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: b3e91c3408797da72fdd5066e983d8861d9271ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3e91c3408797da72fdd5066… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Feb 13 21:03:40 2019 +0300 d3dx9: Handle short parameter in d3dx_set_shader_const_state(). The issue is spotted in https://bugs.winehq.org/show_bug.cgi?id=46553, while fixing it alone is reported not to affect the bug. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 59 ++++++++++++++++++++++++++++++++++++-------- dlls/d3dx9_36/tests/effect.c | 10 ++++---- 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 33197de..497c9c9 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -21,6 +21,7 @@ #include "wine/port.h" #include <stdio.h> +#include <assert.h> #include "d3dx9_private.h" #include "d3dcompiler.h" @@ -2913,7 +2914,12 @@ static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum {D3DXPT_BOOL, sizeof(BOOL), "SCT_PSBOOL"}, {D3DXPT_INT, sizeof(int) * 4, "SCT_PSINT"}, }; + + BOOL is_heap_buffer = FALSE; unsigned int element_count; + void *buffer = value_ptr; + D3DXVECTOR4 value; + HRESULT ret; if (op < 0 || op > SCT_PSINT) { @@ -2927,28 +2933,61 @@ static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum FIXME("Unexpected param type %u.\n", param->type); return D3DERR_INVALIDCALL; } - if (param->bytes % const_tbl[op].elem_size != 0) + + if (param->bytes % const_tbl[op].elem_size) { - FIXME("Unexpected param size %u, rows %u, cols %u.\n", param->bytes, param->rows, param->columns); - return D3DERR_INVALIDCALL; + TRACE("Parameter size %u, rows %u, cols %u.\n", param->bytes, param->rows, param->columns); + + if (++element_count > 1) + { + WARN("Setting %u elements.\n", element_count); + buffer = HeapAlloc(GetProcessHeap(), 0, const_tbl[op].elem_size * element_count); + if (!buffer) + { + ERR("Out of memory.\n"); + return E_OUTOFMEMORY; + } + is_heap_buffer = TRUE; + } + else + { + assert(const_tbl[op].elem_size <= sizeof(value)); + buffer = &value; + } + memcpy(buffer, value_ptr, param->bytes); + memset((unsigned char *)buffer + param->bytes, 0, + const_tbl[op].elem_size * element_count - param->bytes); } switch (op) { case SCT_VSFLOAT: - return SET_D3D_STATE(effect, SetVertexShaderConstantF, index, (const float *)value_ptr, element_count); + ret = SET_D3D_STATE(effect, SetVertexShaderConstantF, index, (const float *)buffer, element_count); + break; case SCT_VSBOOL: - return SET_D3D_STATE(effect, SetVertexShaderConstantB, index, (const BOOL *)value_ptr, element_count); + ret = SET_D3D_STATE(effect, SetVertexShaderConstantB, index, (const BOOL *)buffer, element_count); + break; case SCT_VSINT: - return SET_D3D_STATE(effect, SetVertexShaderConstantI, index, (const int *)value_ptr, element_count); + ret = SET_D3D_STATE(effect, SetVertexShaderConstantI, index, (const int *)buffer, element_count); + break; case SCT_PSFLOAT: - return SET_D3D_STATE(effect, SetPixelShaderConstantF, index, (const float *)value_ptr, element_count); + ret = SET_D3D_STATE(effect, SetPixelShaderConstantF, index, (const float *)buffer, element_count); + break; case SCT_PSBOOL: - return SET_D3D_STATE(effect, SetPixelShaderConstantB, index, (const BOOL *)value_ptr, element_count); + ret = SET_D3D_STATE(effect, SetPixelShaderConstantB, index, (const BOOL *)buffer, element_count); + break; case SCT_PSINT: - return SET_D3D_STATE(effect, SetPixelShaderConstantI, index, (const int *)value_ptr, element_count); + ret = SET_D3D_STATE(effect, SetPixelShaderConstantI, index, (const int *)buffer, element_count); + break; + default: + ret = D3DERR_INVALIDCALL; + break; } - return D3D_OK; + + if (is_heap_buffer) + HeapFree(GetProcessHeap(), 0, buffer); + + return ret; } static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 88d0a42..b0e78c0 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3113,7 +3113,7 @@ static void test_effect_states(IDirect3DDevice9 *device) test_effect_clear_vconsts(device); hr = effect->lpVtbl->BeginPass(effect, 0); - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); @@ -3158,11 +3158,11 @@ static void test_effect_states(IDirect3DDevice9 *device) * contain garbage data on native. */ hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 1, &fvect.x, 1); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); - todo_wine ok(fvect.x == 3.0f, "Got unexpected vertex shader constant (%.8e, %.8e, %.8e, %.8e).\n", + ok(fvect.x == 3.0f, "Got unexpected vertex shader constant (%.8e, %.8e, %.8e, %.8e).\n", fvect.x, fvect.y, fvect.z, fvect.w); hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 2, &fvect.x, 1); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); - todo_wine ok(fvect.x == 1.0f, "Got unexpected vertex shader constant (%.8e, %.8e, %.8e, %.8e).\n", + ok(fvect.x == 1.0f, "Got unexpected vertex shader constant (%.8e, %.8e, %.8e, %.8e).\n", fvect.x, fvect.y, fvect.z, fvect.w); hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 3, &fvect.x, 1); @@ -3173,7 +3173,7 @@ static void test_effect_states(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 4, &fvect.x, 1); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); - todo_wine ok(fvect.x == 4.0f && fvect.y == 4.0f && fvect.z == 4.0f && fvect.w == 4.0f, + ok(fvect.x == 4.0f && fvect.y == 4.0f && fvect.z == 4.0f && fvect.w == 4.0f, "Got unexpected vertex shader constant (%.8e, %.8e, %.8e, %.8e).\n", fvect.x, fvect.y, fvect.z, fvect.w); hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 5, &fvect.x, 1); @@ -3193,7 +3193,7 @@ static void test_effect_states(IDirect3DDevice9 *device) fvect.x, fvect.y, fvect.z, fvect.w); hr = effect->lpVtbl->EndPass(effect); - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); ok(value == 2, "Got result %u, expected %u\n", value, 2);

1 0

Paul Gofman : d3dx9/tests: Add more tests for VertexShaderConstant state.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 6fe2728b215fcc22940c556f195fe223c5ac2cff URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fe2728b215fcc22940c556f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Feb 13 21:03:39 2019 +0300 d3dx9/tests: Add more tests for VertexShaderConstant state. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 112 +++++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6fe2728b215fcc22940c…

1 0

Alexandre Julliard : server: Report a 64-bit CPU for IL-only binaries.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 9381da9f1c8a685f806b922383c7f9356f87d94d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9381da9f1c8a685f806b9223… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 15:52:50 2019 +0100 server: Report a 64-bit CPU for IL-only binaries. Based on a patch by Brendan McGrath. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46319 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/mapping.c b/server/mapping.c index 37c17b0..085d7aa 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -722,7 +722,11 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.image_flags |= IMAGE_FLAGS_ComPlusILOnly; if (nt.opt.hdr32.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC && !(clr.Flags & COMIMAGE_FLAGS_32BITREQUIRED)) + { mapping->image.image_flags |= IMAGE_FLAGS_ComPlusNativeReady; + if (cpu_mask & CPU_FLAG(CPU_x86_64)) mapping->image.cpu = CPU_x86_64; + else if (cpu_mask & CPU_FLAG(CPU_ARM64)) mapping->image.cpu = CPU_ARM64; + } } if (!build_shared_mapping( mapping, unix_fd, sec, nt.FileHeader.NumberOfSections ))

1 0