February 2019 - Wine-commits

Gabriel Ivăncescu : user32/listbox: Check for out of bounds using the index when painting the item.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: ea185314b37a59640f59a9dd3321205fc53068a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea185314b37a59640f59a9dd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 8 13:17:18 2019 +0200 user32/listbox: Check for out of bounds using the index when painting the item. Needed for LBS_NODATA. 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 594c956..821da60 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -533,7 +533,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, RECT r; HRGN hrgn; - if (!item) + if (index >= descr->nb_items) { if (action == ODA_FOCUS) DrawFocusRect( hdc, rect );

1 0

Gabriel Ivăncescu : user32/listbox: Use a helper to expand the item array.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: d7f2f33575cf6de36a0fc9b3b6732bcc5e161330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7f2f33575cf6de36a0fc9b3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 8 13:17:19 2019 +0200 user32/listbox: Use a helper to expand the item array. 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 | 64 ++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 821da60..80ba38b 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -33,10 +33,11 @@ #include "controls.h" #include "wine/exception.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(listbox); -/* Items array granularity */ +/* Items array granularity (must be power of 2) */ #define LB_ARRAY_GRANULARITY 16 /* Scrolling timeout in ms */ @@ -121,6 +122,26 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static BOOL resize_storage(LB_DESCR *descr, UINT items_size) +{ + LB_ITEMDATA *items; + + if (items_size > descr->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) + { + SEND_NOTIFICATION(descr, LBN_ERRSPACE); + return FALSE; + } + descr->items_size = items_size; + descr->items = items; + } + return TRUE; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { return descr->items[index].selected; @@ -709,27 +730,10 @@ static void LISTBOX_DrawFocusRect( LB_DESCR *descr, BOOL on ) */ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) { - LB_ITEMDATA *item; - - nb_items += LB_ARRAY_GRANULARITY - 1; - nb_items -= (nb_items % LB_ARRAY_GRANULARITY); - if (descr->items) { - nb_items += descr->items_size; - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - nb_items * sizeof(LB_ITEMDATA)); - } - else { - item = HeapAlloc( GetProcessHeap(), 0, - nb_items * sizeof(LB_ITEMDATA)); - } + UINT new_size = descr->nb_items + nb_items; - if (!item) - { - SEND_NOTIFICATION( descr, LBN_ERRSPACE ); + if (new_size > descr->items_size && !resize_storage(descr, new_size)) return LB_ERRSPACE; - } - descr->items_size = nb_items; - descr->items = item; return LB_OKAY; } @@ -1534,29 +1538,11 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, LPWSTR str, ULONG_PTR data ) { LB_ITEMDATA *item; - INT max_items; INT oldfocus = descr->focus_item; if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; - if (descr->nb_items == descr->items_size) - { - /* We need to grow the array */ - max_items = descr->items_size + LB_ARRAY_GRANULARITY; - if (descr->items) - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - max_items * sizeof(LB_ITEMDATA) ); - else - item = HeapAlloc( GetProcessHeap(), 0, - max_items * sizeof(LB_ITEMDATA) ); - if (!item) - { - SEND_NOTIFICATION( descr, LBN_ERRSPACE ); - return LB_ERRSPACE; - } - descr->items_size = max_items; - descr->items = item; - } + if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; /* Insert the item structure */

1 0

Paul Gofman : wined3d: Initialise stream frequency to 1.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 53b6e77a5d9fa7c7b331c49d4cd36aee34339d39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53b6e77a5d9fa7c7b331c49d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 8 19:34:13 2019 +0300 wined3d: Initialise stream frequency to 1. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39080 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/wined3d/context.c | 2 +- dlls/wined3d/stateblock.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 81b1fc0..96ba06d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5388,7 +5388,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, stream = &state->streams[element->stream_idx]; if ((stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) && !context->instance_count) - context->instance_count = state->streams[0].frequency ? state->streams[0].frequency : 1; + context->instance_count = state->streams[0].frequency; if (gl_info->supported[ARB_INSTANCED_ARRAYS]) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4f16c99..1ae0f35 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1448,6 +1448,9 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->blend_factor.g = 1.0f; state->blend_factor.b = 1.0f; state->blend_factor.a = 1.0f; + + for (i = 0; i < MAX_STREAMS; ++i) + state->streams[i].frequency = 1; } void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, @@ -1496,6 +1499,9 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state state->blend_factor.g = 1.0f; state->blend_factor.b = 1.0f; state->blend_factor.a = 1.0f; + + for (i = 0; i < MAX_STREAMS; ++i) + state->streams[i].frequency = 1; } void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state,

1 0

Paul Gofman : d3d9/tests: Test GetStreamSourceFreq() before any values were set.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 4ac31569f93c6e8c77ba652915755275d8946538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ac31569f93c6e8c77ba6529… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 8 19:34:14 2019 +0300 d3d9/tests: Test GetStreamSourceFreq() before any values were set. 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/visual.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3a6608a..13cf6c7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12419,9 +12419,15 @@ static void stream_test(void) goto done; } - /* set the default value because it isn't done in wine? */ + hr = IDirect3DDevice9_GetStreamSourceFreq(device, 0, &ind); + ok(hr == D3D_OK && ind == 1, "IDirect3DDevice9_GetStreamSourceFreq unexpected result, " + "hr %#x, ind %#x.\n", hr, ind); + hr = IDirect3DDevice9_GetStreamSourceFreq(device, 1, &ind); + ok(hr == D3D_OK && ind == 1, "IDirect3DDevice9_GetStreamSourceFreq unexpected result, " + "hr %#x, ind %#x.\n", hr, ind); + hr = IDirect3DDevice9_SetStreamSourceFreq(device, 1, 1); - ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSourceFreq failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSourceFreq failed, hr %#x.\n", hr); /* check for D3DSTREAMSOURCE_INDEXEDDATA at stream0 */ hr = IDirect3DDevice9_SetStreamSourceFreq(device, 0, (D3DSTREAMSOURCE_INSTANCEDATA | 1));

1 0

Brendan McGrath : wineboot: Fix PROCESSOR_ARCHITECTURE reg value.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 4cd78c35072b1b118727a02aa22c51ed0516a0a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cd78c35072b1b118727a02a… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Sat Feb 9 15:06:29 2019 +1100 wineboot: Fix PROCESSOR_ARCHITECTURE reg value. On my Windows machine, PROCESSOR_ARCHITECTURE has the value "AMD64", but under wine (since 4.1) the value is "Intel64". Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 32e4225..b85a3b6 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -422,7 +422,7 @@ static void create_environment_registry_keys( void ) HKEY env_key; SYSTEM_CPU_INFORMATION sci; WCHAR buffer[60], vendorid[13]; - const WCHAR *arch; + const WCHAR *arch, *parch; if (RegCreateKeyW( HKEY_LOCAL_MACHINE, EnvironW, &env_key )) return; @@ -435,12 +435,13 @@ static void create_environment_registry_keys( void ) switch (sci.Architecture) { case PROCESSOR_ARCHITECTURE_AMD64: - arch = !strcmpW(vendorid, authenticamdW) ? amd64W : intel64W; + arch = amd64W; + parch = !strcmpW(vendorid, authenticamdW) ? amd64W : intel64W; break; case PROCESSOR_ARCHITECTURE_INTEL: default: - arch = x86W; + arch = parch = x86W; break; } set_reg_value( env_key, ProcArchW, arch ); @@ -455,7 +456,7 @@ static void create_environment_registry_keys( void ) case PROCESSOR_ARCHITECTURE_AMD64: case PROCESSOR_ARCHITECTURE_INTEL: default: - get_identifier( buffer, arch ); + get_identifier( buffer, parch ); strcatW( buffer, commaW ); strcatW( buffer, vendorid ); break;

1 0

Sven Baars : wininet/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 3f05534ca81d5b34f4e3809a59ad2fe50dc9d02d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f05534ca81d5b34f4e3809a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Feb 9 20:18:13 2019 +0100 wininet/tests: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 9ec4902..5a0cc11 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5813,6 +5813,9 @@ static void test_security_flags(void) ok(!cert->lpszEncryptionAlgName, "unexpected encryption algorithm name\n"); ok(!cert->lpszProtocolName, "unexpected protocol name\n"); ok(cert->dwKeySize != 0xdeadbeef, "unexpected key size\n"); + + LocalFree(cert->lpszSubjectInfo); + LocalFree(cert->lpszIssuerInfo); } HeapFree(GetProcessHeap(), 0, cert);

1 0

Nikolay Sivov : comctl32/listview: Take care of scrolling offset when repositioning header.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 5b397df63147ec83a929ba997b395687e6c4c10d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b397df63147ec83a929ba99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 9 23:23:40 2019 +0300 comctl32/listview: Take care of scrolling offset when repositioning header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1230c55..078bea1 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11084,13 +11084,21 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) infoPtr->rcList.bottom = max (infoPtr->rcList.bottom - 2, 0); } - /* if control created invisible header isn't created */ + /* When ListView control is created invisible, header isn't created right away. */ if (infoPtr->hwndHeader) { - HDLAYOUT hl; - WINDOWPOS wp; + POINT origin; + WINDOWPOS wp; + HDLAYOUT hl; + RECT rect; - hl.prc = &infoPtr->rcList; + LISTVIEW_GetOrigin(infoPtr, &origin); + + rect = infoPtr->rcList; + rect.left += origin.x; + rect.top += origin.y; + + hl.prc = &rect; hl.pwpos = &wp; SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); TRACE(" wp.flags=0x%08x, wp=%d,%d (%dx%d)\n", wp.flags, wp.x, wp.y, wp.cx, wp.cy);

1 0

Nikolay Sivov : comctl32/listview: Remove duplicated handle check.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: f1f7b7b509a002bd4c4b3a0b77d8c9b4d229613b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1f7b7b509a002bd4c4b3a0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 9 23:23:41 2019 +0300 comctl32/listview: Remove duplicated handle check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 078bea1..7fa6996 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9899,7 +9899,7 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, /* carry on only if it really changed */ if (nNewScrollPos == nOldScrollPos) return 0; - if (infoPtr->hwndHeader) LISTVIEW_UpdateHeaderSize(infoPtr, nNewScrollPos); + LISTVIEW_UpdateHeaderSize(infoPtr, nNewScrollPos); /* now adjust to client coordinates */ nScrollDiff = nOldScrollPos - nNewScrollPos;

1 0

Kai Krakow : editorconfig: Indent Makefiles properly.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: f519dd28fd2c820fdc94bb91b0c72ef63b9058b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f519dd28fd2c820fdc94bb91… Author: Kai Krakow <kai(a)kaishome.de> Date: Sun Feb 10 11:06:36 2019 +0100 editorconfig: Indent Makefiles properly. Signed-off-by: Kai Krakow <kai(a)kaishome.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.editorconfig b/.editorconfig index 5f1c49f..289038d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,3 +9,7 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true max_line_length = 100 + +[Makefile*] +indent_style = tab +indent_size = 8

1 0

Zebediah Figura : comsvcs/tests: Add tests for implicit MTA creation in RegisterDispenser().
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 62d67bdebe8c45faf611ae76a55ecf5e663a85af URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d67bdebe8c45faf611ae76… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 7 12:21:33 2019 -0600 comsvcs/tests: Add tests for implicit MTA creation in RegisterDispenser(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/dispenser.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c index 187800e..6fae802 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/dispenser.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "ole2.h" #include "comsvcs.h" +#include "msxml.h" #include "wine/test.h" @@ -141,6 +142,17 @@ static const struct IDispenserDriverVtbl driver_vtbl = static IDispenserDriver DispenserDriver = { &driver_vtbl }; +static DWORD WINAPI com_thread(void *arg) +{ + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + if (hr == S_OK) IUnknown_Release(unk); + + return hr; +} + static void create_dispenser(void) { static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0}; @@ -149,7 +161,9 @@ static void create_dispenser(void) HRESULT hr; IDispenserManager *dispenser = NULL; IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL; + HANDLE thread; RESID resid; + DWORD ret; BSTR str; hr = CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)&dispenser); @@ -160,9 +174,23 @@ static void create_dispenser(void) return; } + thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + GetExitCodeThread(thread, &ret); + ok(ret == CO_E_NOTINITIALIZED, "got unexpected hr %#x\n", ret); + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder1); ok(hr == S_OK, "got 0x%08x\n", hr); + /* The above call creates an MTA thread, but we need to wait for it to + * actually initialize. */ + Sleep(200); + thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + GetExitCodeThread(thread, &ret); +todo_wine + ok(ret == S_OK, "got unexpected hr %#x\n", ret); + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(holder1 != holder2, "same holder object returned\n");

1 0