February 2019 - Wine-commits

Paul Gofman : d3d9/tests: Add test for MaxVertexW device capability.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 2416578e32d0181f548582cce322874ee17d358c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2416578e32d0181f548582cc… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Feb 11 14:04:54 2019 +0300 d3d9/tests: Add test for MaxVertexW device capability. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ad1d289..2217569 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12643,6 +12643,8 @@ static void test_device_caps(void) /* AMD gives 6, Nvidia returns 8. */ ok(caps.MaxUserClipPlanes <= 8, "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); + ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, + "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Paul Gofman : d3d8/tests: Add test for MaxVertexW device capability.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: e70c4846ff4f7755f7c00b19947c0b2cc44665d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e70c4846ff4f7755f7c00b19… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Feb 11 14:04:55 2019 +0300 d3d8/tests: Add test for MaxVertexW device capability. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 315640d..39a2359 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8758,6 +8758,8 @@ static void test_device_caps(void) /* AMD gives 6, Nvidia returns 8. */ ok(caps.MaxUserClipPlanes <= 8, "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); + ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, + "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Andrey Gusev : msi: Remove duplicate condition in msi_dialog_destroy().
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 57dd594865b002205edb4e053102241bed72bd1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=57dd594865b002205edb4e05… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 11 16:28:38 2019 +0200 msi: Remove duplicate condition in msi_dialog_destroy(). Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b6de1f5..a3e5481 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4129,10 +4129,10 @@ void msi_dialog_destroy( msi_dialog *dialog ) } if( dialog->hwnd ) + { ShowWindow( dialog->hwnd, SW_HIDE ); - - if( dialog->hwnd ) DestroyWindow( dialog->hwnd ); + } /* unsubscribe events */ event_cleanup_subscriptions( dialog->package, dialog->name );

1 0

Andrey Gusev : crypt32: Remove duplicate condition in CRYPT_AsnDecodeNameValueInternal().
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 15b7112d07dc4f13c90c03c3f1e6776e7727148a URL: https://source.winehq.org/git/wine.git/?a=commit;h=15b7112d07dc4f13c90c03c3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 11 16:29:23 2019 +0200 crypt32: Remove duplicate condition in CRYPT_AsnDecodeNameValueInternal(). Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d886abb..27f4870 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1588,15 +1588,12 @@ static BOOL CRYPT_AsnDecodeNameValueInternal(const BYTE *pbEncoded, case ASN_VISIBLESTRING: case ASN_GENERALSTRING: value->Value.cbData = dataLen; - if (dataLen) - { - if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) - memcpy(value->Value.pbData, - pbEncoded + 1 + lenBytes, dataLen); - else - value->Value.pbData = (LPBYTE)pbEncoded + 1 + - lenBytes; - } + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + memcpy(value->Value.pbData, + pbEncoded + 1 + lenBytes, dataLen); + else + value->Value.pbData = (LPBYTE)pbEncoded + 1 + + lenBytes; break; case ASN_BMPSTRING: {

1 0

Alexandre Julliard : crypt32: Don' t build password_to_ascii without GnuTLS.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 5cfeed53974ed8d670170131b61fe17403f17e4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cfeed53974ed8d670170131… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 18:32:12 2019 +0100 crypt32: Don't build password_to_ascii without GnuTLS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/pfx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index 46bf356..a515585 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -240,8 +240,6 @@ done: return prov; } -#endif - static char *password_to_ascii( const WCHAR *str ) { char *ret; @@ -257,6 +255,8 @@ static char *password_to_ascii( const WCHAR *str ) return ret; } +#endif + HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *password, DWORD flags ) { #ifdef SONAME_LIBGNUTLS

1 0

Nikolay Sivov : uiautomationcore: Return success from UiaRaiseAutomationEvent().
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: d0727decdedb5aba250038458e0a28dec5687e50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0727decdedb5aba25003845… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 11 18:00:57 2019 +0300 uiautomationcore: Return success from UiaRaiseAutomationEvent(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 31b7d3e..0730846 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -91,5 +91,5 @@ LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id) { FIXME("(%p, %d): stub\n", provider, id); - return E_NOTIMPL; + return S_OK; }

1 0

Gabriel Ivăncescu : user32/listbox: Shrink the item array with resize_storage.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 1ece9f62056d1ce88bc528b6e55c26b05cc17522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ece9f62056d1ce88bc528b6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 8 13:17:20 2019 +0200 user32/listbox: Shrink the item array with resize_storage. 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, 1 insertion(+), 14 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 80ba38b..3bd1b58 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1678,7 +1678,6 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) { LB_ITEMDATA *item; - INT max_items; if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; @@ -1698,20 +1697,8 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); if (descr->anchor_item == descr->nb_items) descr->anchor_item--; - /* Shrink the item array if possible */ + resize_storage(descr, descr->nb_items); - 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_size = max_items; - descr->items = item; - } - } /* Repaint the items */ LISTBOX_UpdateScroll( descr );

1 0

Gabriel Ivăncescu : user32/listbox: Return proper value for LB_INITSTORAGE.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 0dd9eaf4e32ad15be524fefa79bc01034c454b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dd9eaf4e32ad15be524fefa… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 8 13:17:21 2019 +0200 user32/listbox: Return proper value for LB_INITSTORAGE. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3bd1b58..a2791eb 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -734,7 +734,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) if (new_size > descr->items_size && !resize_storage(descr, new_size)) return LB_ERRSPACE; - return LB_OKAY; + return descr->items_size; }

1 0

Gabriel Ivăncescu : user32/tests: Add tests for LB_INITSTORAGE.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 0d19628ef5511d23e2d793af4ad5adca0aede884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d19628ef5511d23e2d793af… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 8 13:17:22 2019 +0200 user32/tests: Add tests for LB_INITSTORAGE. 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 | 64 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index b87acd7..7f1e9cf 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1824,6 +1824,69 @@ todo_wine DestroyWindow(parent); } +static void test_init_storage( void ) +{ + static const DWORD styles[] = + { + LBS_HASSTRINGS, + LBS_NODATA | LBS_OWNERDRAWFIXED, + }; + HWND parent, listbox; + LONG ret, items_size; + int i, j; + + parent = create_parent(); + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + listbox = CreateWindowA("listbox", "TestList", styles[i] | WS_CHILD, + 0, 0, 100, 100, parent, (HMENU)1, NULL, 0); + + items_size = SendMessageA(listbox, LB_INITSTORAGE, 100, 0); + ok(items_size >= 100, "expected at least 100, got %d\n", items_size); + + ret = SendMessageA(listbox, LB_INITSTORAGE, 0, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + + /* it doesn't grow since the space was already reserved */ + ret = SendMessageA(listbox, LB_INITSTORAGE, items_size, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + + /* it doesn't shrink the reserved space */ + ret = SendMessageA(listbox, LB_INITSTORAGE, 42, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + + /* now populate almost all of it so it's not reserved anymore */ + if (styles[i] & LBS_NODATA) + { + ret = SendMessageA(listbox, LB_SETCOUNT, items_size - 1, 0); + ok(ret == 0, "unexpected return value %d\n", ret); + } + else + { + for (j = 0; j < items_size - 1; j++) + { + ret = SendMessageA(listbox, LB_INSERTSTRING, -1, (LPARAM)""); + ok(ret == j, "expected %d, got %d\n", j, ret); + } + } + + /* we still have one more reserved slot, so it doesn't grow yet */ + ret = SendMessageA(listbox, LB_INITSTORAGE, 1, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + + /* fill the slot and check again, it should grow this time */ + ret = SendMessageA(listbox, LB_INSERTSTRING, -1, (LPARAM)""); + ok(ret == items_size - 1, "expected %d, got %d\n", items_size - 1, ret); + ret = SendMessageA(listbox, LB_INITSTORAGE, 0, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + ret = SendMessageA(listbox, LB_INITSTORAGE, 1, 0); + ok(ret > items_size, "expected it to grow past %d, got %d\n", items_size, ret); + + DestroyWindow(listbox); + } + DestroyWindow(parent); +} + static void test_missing_lbuttonup( void ) { HWND listbox, parent, capture; @@ -2251,6 +2314,7 @@ START_TEST(listbox) test_listbox_LB_DIR(); test_listbox_dlgdir(); test_set_count(); + test_init_storage(); test_GetListBoxInfo(); test_missing_lbuttonup(); test_extents();

1 0

Sergio Gómez Del Real : gdi32/dibdrv : Clip segment points to dib rect in wide_line_segment().
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: c20285218b55a08c1ad3a9a5e049d50913319de6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c20285218b55a08c1ad3a9a5… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Fri Feb 8 10:05:10 2019 -0500 gdi32/dibdrv: Clip segment points to dib rect in wide_line_segment(). Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/objects.c | 43 +++++++++++++++++++++++++++++++++---------- dlls/gdi32/gdi_private.h | 8 ++++++++ 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f95475a..26710dd 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1334,15 +1334,21 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P { HRGN join; POINT pts[4]; + RECT rect; switch (pdev->pen_join) { default: FIXME( "Unknown line join %x\n", pdev->pen_join ); /* fall through */ case PS_JOIN_ROUND: - OffsetRgn( round_cap, pt->x, pt->y ); - CombineRgn( region, region, round_cap, RGN_OR ); - OffsetRgn( round_cap, -pt->x, -pt->y ); + GetRgnBox( round_cap, &rect ); + offset_rect( &rect, pt->x, pt->y ); + if (clip_rect_to_dib( &pdev->dib, &rect )) + { + OffsetRgn( round_cap, pt->x, pt->y ); + CombineRgn( region, region, round_cap, RGN_OR ); + OffsetRgn( round_cap, -pt->x, -pt->y ); + } return; case PS_JOIN_MITER: @@ -1358,7 +1364,9 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P break; } - CombineRgn( region, region, join, RGN_OR ); + GetRgnBox( join, &rect ); + if (clip_rect_to_dib( &pdev->dib, &rect )) + CombineRgn( region, region, join, RGN_OR ); DeleteObject( join ); return; } @@ -1367,7 +1375,7 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, const POINT *pt_1, const POINT *pt_2, int dx, int dy, BOOL need_cap_1, BOOL need_cap_2, struct face *face_1, struct face *face_2 ) { - RECT rect; + RECT rect, clip_rect; BOOL sq_cap_1 = need_cap_1 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); BOOL sq_cap_2 = need_cap_2 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); @@ -1381,7 +1389,9 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, rect.bottom = rect.top + pdev->pen_width; if ((sq_cap_1 && dx > 0) || (sq_cap_2 && dx < 0)) rect.left -= pdev->pen_width / 2; if ((sq_cap_2 && dx > 0) || (sq_cap_1 && dx < 0)) rect.right += pdev->pen_width / 2; - add_rect_to_region( total, &rect ); + clip_rect = rect; + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + add_rect_to_region( total, &clip_rect ); if (dx > 0) { face_1->start.x = face_1->end.x = rect.left; @@ -1405,7 +1415,9 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, rect.right = rect.left + pdev->pen_width; if ((sq_cap_1 && dy > 0) || (sq_cap_2 && dy < 0)) rect.top -= pdev->pen_width / 2; if ((sq_cap_2 && dy > 0) || (sq_cap_1 && dy < 0)) rect.bottom += pdev->pen_width / 2; - add_rect_to_region( total, &rect ); + clip_rect = rect; + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + add_rect_to_region( total, &clip_rect ); if (dy > 0) { face_1->start.x = face_2->end.x = rect.left; @@ -1475,9 +1487,20 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, seg_pts[3].y += wide_half.x; } - segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); - CombineRgn( total, total, segment, RGN_OR ); - DeleteObject( segment ); + if (dx > 0 && dy > 0) + set_rect( &clip_rect, seg_pts[0].x, seg_pts[1].y, seg_pts[2].x, seg_pts[3].y ); + else if (dx > 0 && dy < 0) + set_rect( &clip_rect, seg_pts[1].x, seg_pts[2].y, seg_pts[3].x, seg_pts[0].y ); + else if (dx < 0 && dy > 0) + set_rect( &clip_rect, seg_pts[3].x, seg_pts[0].y, seg_pts[1].x, seg_pts[2].y ); + else + set_rect( &clip_rect, seg_pts[2].x, seg_pts[3].y, seg_pts[0].x, seg_pts[1].y ); + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + { + segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); + CombineRgn( total, total, segment, RGN_OR ); + DeleteObject( segment ); + } face_1->start = seg_pts[0]; face_1->end = seg_pts[1]; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 920cd1e..01473dd 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -521,6 +521,14 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } +static inline void set_rect( RECT *rect, int left, int top, int right, int bottom ) +{ + rect->left = left; + rect->top = top; + rect->right = right; + rect->bottom = bottom; +} + static inline void order_rect( RECT *rect ) { if (rect->left > rect->right)

1 0