February 2019 - Wine-Commits

Gabriel Ivăncescu : user32/listbox: Send LB_RESETCONTENT from RemoveItem rather than DeleteItem.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 0beea9f4748abb900aae0052e803cbf956df2e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0beea9f4748abb900aae0052… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 14 14:06:48 2019 +0200 user32/listbox: Send LB_RESETCONTENT from RemoveItem rather than DeleteItem. 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 | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 7f9076f..2e0f17b 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1665,19 +1665,12 @@ static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) */ 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 = get_item_string(descr, index); - - if (!descr->nb_items) - SendMessageW( descr->self, LB_RESETCONTENT, 0, 0 ); - /* Note: Win 3.1 only sends DELETEITEM on owner-draw items, * while Win95 sends it for all items with user data. * It's probably better to send it too often than not * often enough, so this is what we do here. */ - if (IS_OWNERDRAW(descr) || item_data) + if (IS_OWNERDRAW(descr) || get_item_data(descr, index)) { DELETEITEMSTRUCT dis; UINT id = (UINT)GetWindowLongPtrW( descr->self, GWLP_ID ); @@ -1686,10 +1679,10 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) dis.CtlID = id; dis.itemID = index; dis.hwndItem = descr->self; - dis.itemData = item_data; + dis.itemData = get_item_data(descr, index); SendMessageW( descr->owner, WM_DELETEITEM, id, (LPARAM)&dis ); } - HeapFree( GetProcessHeap(), 0, item_str ); + HeapFree( GetProcessHeap(), 0, get_item_string(descr, index) ); } @@ -1707,11 +1700,14 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) /* We need to invalidate the original rect instead of the updated one. */ LISTBOX_InvalidateItems( descr, index ); + if (descr->nb_items == 1) + { + SendMessageW(descr->self, LB_RESETCONTENT, 0, 0); + return LB_OKAY; + } descr->nb_items--; LISTBOX_DeleteItem( descr, index ); - if (!descr->nb_items) return LB_OKAY; - /* Remove the item */ item = &descr->items[index];

1 0

Gabriel Ivăncescu : user32/listbox: Use a helper to set the selected item state.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 84ac6eebaa583bfc30bb54d6b5a5e4cd61748304 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ac6eebaa583bfc30bb54d6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 14 14:06:47 2019 +0200 user32/listbox: Use a helper to set the selected item state. 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 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index f2d12ed..7f9076f 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -165,6 +165,12 @@ static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) return descr->items[index].selected; } +static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) +{ + if (descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) + descr->items[index].selected = state; +} + /********************************************************************* * listbox class descriptor */ @@ -1443,7 +1449,7 @@ static LRESULT LISTBOX_SelectItemRange( LB_DESCR *descr, INT first, for (i = first; i <= last; i++) { if (is_item_selected(descr, i)) continue; - descr->items[i].selected = TRUE; + set_item_selected_state(descr, i, TRUE); LISTBOX_InvalidateItemRect(descr, i); } } @@ -1452,7 +1458,7 @@ static LRESULT LISTBOX_SelectItemRange( LB_DESCR *descr, INT first, for (i = first; i <= last; i++) { if (!is_item_selected(descr, i)) continue; - descr->items[i].selected = FALSE; + set_item_selected_state(descr, i, FALSE); LISTBOX_InvalidateItemRect(descr, i); } } @@ -1485,8 +1491,8 @@ static LRESULT LISTBOX_SetSelection( LB_DESCR *descr, INT index, { INT oldsel = descr->selected_item; if (index == oldsel) return LB_OKAY; - if (oldsel != -1) descr->items[oldsel].selected = FALSE; - if (index != -1) descr->items[index].selected = TRUE; + if (oldsel != -1) set_item_selected_state(descr, oldsel, FALSE); + if (index != -1) set_item_selected_state(descr, index, TRUE); descr->selected_item = index; if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); if (index != -1) LISTBOX_RepaintItem( descr, index, ODA_SELECT );

1 0

Gabriel Ivăncescu : user32/listbox: Use descr-> selected_item for single-selection listboxes when checking selection.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 076fa5f3ed9423e10e8516792cbd8b9d41a8bbab URL: https://source.winehq.org/git/wine.git/?a=commit;h=076fa5f3ed9423e10e851679… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 14 14:06:42 2019 +0200 user32/listbox: Use descr->selected_item for single-selection listboxes when checking selection. 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, 2 insertions(+) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index ac301c1..0e0399f 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -150,6 +150,8 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { + if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) + return index == descr->selected_item; return descr->items[index].selected; }

1 0

Paul Gofman : d3dx9: Use parameter data for the first constant only in d3dx_set_shader_const_state ().
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: f72204abd6037e59ba1bf500a3a9d0316e65a024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f72204abd6037e59ba1bf500… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Feb 13 21:03:41 2019 +0300 d3dx9: Use parameter data for the first constant only in d3dx_set_shader_const_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/effect.c | 15 ++++++++++----- dlls/d3dx9_36/tests/effect.c | 4 ++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 497c9c9..e8ae7b5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2934,11 +2934,15 @@ static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum return D3DERR_INVALIDCALL; } - if (param->bytes % const_tbl[op].elem_size) + if (param->bytes % const_tbl[op].elem_size || element_count > 1) { + unsigned int param_data_size; + TRACE("Parameter size %u, rows %u, cols %u.\n", param->bytes, param->rows, param->columns); - if (++element_count > 1) + if (param->bytes % const_tbl[op].elem_size) + ++element_count; + if (element_count > 1) { WARN("Setting %u elements.\n", element_count); buffer = HeapAlloc(GetProcessHeap(), 0, const_tbl[op].elem_size * element_count); @@ -2954,9 +2958,10 @@ static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum 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); + param_data_size = min(param->bytes, const_tbl[op].elem_size); + memcpy(buffer, value_ptr, param_data_size); + memset((unsigned char *)buffer + param_data_size, 0, + const_tbl[op].elem_size * element_count - param_data_size); } switch (op) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index b0e78c0..c10decc 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3178,12 +3178,12 @@ static void test_effect_states(IDirect3DDevice9 *device) fvect.x, fvect.y, fvect.z, fvect.w); hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 5, &fvect.x, 1); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); - todo_wine ok(fvect.x == 0.0f && fvect.y == 0.0f && fvect.z == 0.0f && fvect.w == 0.0f, + ok(fvect.x == 0.0f && fvect.y == 0.0f && fvect.z == 0.0f && fvect.w == 0.0f, "Got unexpected vertex shader constant (%.8e, %.8e, %.8e, %.8e).\n", fvect.x, fvect.y, fvect.z, fvect.w); hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 6, &fvect.x, 1); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); - todo_wine ok(fvect.x == 0.0f && fvect.y == 0.0f && fvect.z == 0.0f && fvect.w == 0.0f, + ok(fvect.x == 0.0f && fvect.y == 0.0f && fvect.z == 0.0f && fvect.w == 0.0f, "Got unexpected vertex shader constant (%.8e, %.8e, %.8e, %.8e).\n", fvect.x, fvect.y, fvect.z, fvect.w); hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 7, &fvect.x, 1);

1 0

Paul Gofman : d3dx9/tests: Clear vertex shader constants in test_effect_states().
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: cf992bebb056814a05fe3a82011c4de701c144c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf992bebb056814a05fe3a82… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Feb 13 21:03:38 2019 +0300 d3dx9/tests: Clear vertex shader constants in test_effect_states(). 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 | 83 +++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf992bebb056814a05fe…

1 0

Nikolay Sivov : msvcrt: Add _ismbcl2().
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: cebb94702761914ee169b3c421f3d744d09ae567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cebb94702761914ee169b3c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 15 12:24:57 2019 +0100 msvcrt: Add _ismbcl2(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 15 +++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index eefa573..aa817bf 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -990,7 +990,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a6ed5c1..1b85830 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1336,7 +1336,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 441c0be..769ee50 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1341,7 +1341,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 629dce9..1a68a65 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -383,7 +383,7 @@ @ cdecl _ismbckata(long) @ cdecl _ismbcl0(long) @ cdecl _ismbcl1(long) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbclegal(long) @ cdecl _ismbclower(long) @ cdecl _ismbcprint(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f0009be..f4c0e6d 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -378,7 +378,7 @@ @ cdecl _ismbckata(long) @ cdecl _ismbcl0(long) @ cdecl _ismbcl1(long) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbclegal(long) @ cdecl _ismbclower(long) @ cdecl _ismbcprint(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 43c3e46..8295a71 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -662,7 +662,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a9bf0a2..9e97770 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -640,7 +640,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index ca6dca3..9b22adc 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2629,3 +2629,11 @@ int CDECL _ismbcl2_l(unsigned int c, MSVCRT__locale_t locale) return 0; } + +/********************************************************************* + * _ismbcl2 (MSVCRT.@) + */ +int CDECL _ismbcl2(unsigned int c) +{ + return _ismbcl2_l(c, NULL); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 42de9ce..c2c272b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -611,7 +611,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 53fbfd3..eb8e304 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3278,6 +3278,9 @@ static void test__ismbclx(void) ret = _ismbcl1(0); ok(!ret, "got %d\n", ret); + ret = _ismbcl2(0); + ok(!ret, "got %d\n", ret); + cp = _setmbcp(1252); ret = _ismbcl0(0x8140); @@ -3286,6 +3289,9 @@ static void test__ismbclx(void) ret = _ismbcl1(0x889f); ok(!ret, "got %d\n", ret); + ret = _ismbcl2(0x989f); + ok(!ret, "got %d\n", ret); + _setmbcp(932); ret = _ismbcl0(0); @@ -3306,6 +3312,15 @@ static void test__ismbclx(void) ret = _ismbcl1(0x88fd); ok(!ret, "got %d\n", ret); + ret = _ismbcl2(0); + ok(!ret, "got %d\n", ret); + + ret = _ismbcl2(0x989f); + ok(ret, "got %d\n", ret); + + ret = _ismbcl2(0x993f); + ok(!ret, "got %d\n", ret); + _setmbcp(cp); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e1315ec..eb08843 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -480,7 +480,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr)

1 0

Hans Leidekker : msi: Initialize assembly caches before disabling redirection.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: a70ece68b7fa98e55e62eaed1006ceea961666ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a70ece68b7fa98e55e62eaed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 15 10:32:30 2019 +0100 msi: Initialize assembly caches before disabling redirection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46638 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 13 ++++++------- dlls/msi/assembly.c | 5 +++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9407d36..d959605 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -995,13 +995,6 @@ UINT msi_load_all_components( MSIPACKAGE *package ) if (r != ERROR_SUCCESS) return r; - if (!msi_init_assembly_caches( package )) - { - ERR("can't initialize assembly caches\n"); - msiobj_release( &view->hdr ); - return ERROR_FUNCTION_FAILED; - } - r = MSI_IterateRecords(view, NULL, load_component, package); msiobj_release(&view->hdr); return r; @@ -8094,6 +8087,12 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action) TRACE("Performing action (%s)\n", debugstr_w(action)); + if (!msi_init_assembly_caches( package )) + { + ERR("can't initialize assembly caches\n"); + return ERROR_FUNCTION_FAILED; + } + package->action_progress_increment = 0; rc = ACTION_HandleStandardAction(package, action); diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index f46ff02..cb40611 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -41,6 +41,7 @@ static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, D static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree, hsxs; +static BOOL assembly_caches_initialized; static BOOL init_function_pointers( void ) { @@ -91,12 +92,16 @@ static BOOL init_function_pointers( void ) BOOL msi_init_assembly_caches( MSIPACKAGE *package ) { + if (assembly_caches_initialized) return TRUE; if (!init_function_pointers()) return FALSE; + if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 ); + + assembly_caches_initialized = TRUE; return TRUE; }

1 0

Gabriel Ivăncescu : user32/listbox: Repaint the old selected item after setting the item selection.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 087304f117de46d41fd995bad787a8876a3cb324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=087304f117de46d41fd995ba… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 14 14:06:41 2019 +0200 user32/listbox: Repaint the old selected item after setting the item selection. 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 a9195dc..ac301c1 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1475,8 +1475,8 @@ static LRESULT LISTBOX_SetSelection( LB_DESCR *descr, INT index, if (index == oldsel) return LB_OKAY; if (oldsel != -1) descr->items[oldsel].selected = FALSE; if (index != -1) descr->items[index].selected = TRUE; - if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); descr->selected_item = index; + if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); if (index != -1) LISTBOX_RepaintItem( descr, index, ODA_SELECT ); if (send_notify && descr->nb_items) SEND_NOTIFICATION( descr, (index != -1) ? LBN_SELCHANGE : LBN_SELCANCEL );

1 0

Gabriel Ivăncescu : user32/listbox: Use is_item_selected in more places.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: e0e939501f286e630dda3502acaae75aa0529ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0e939501f286e630dda3502… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 14 14:06:46 2019 +0200 user32/listbox: Use is_item_selected in more places. 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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 7646486..f2d12ed 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1442,7 +1442,7 @@ static LRESULT LISTBOX_SelectItemRange( LB_DESCR *descr, INT first, { for (i = first; i <= last; i++) { - if (descr->items[i].selected) continue; + if (is_item_selected(descr, i)) continue; descr->items[i].selected = TRUE; LISTBOX_InvalidateItemRect(descr, i); } @@ -1451,7 +1451,7 @@ static LRESULT LISTBOX_SelectItemRange( LB_DESCR *descr, INT first, { for (i = first; i <= last; i++) { - if (!descr->items[i].selected) continue; + if (!is_item_selected(descr, i)) continue; descr->items[i].selected = FALSE; LISTBOX_InvalidateItemRect(descr, i); } @@ -2091,7 +2091,7 @@ static LRESULT LISTBOX_HandleLButtonDown( LB_DESCR *descr, DWORD keys, INT x, IN { LISTBOX_SetCaretIndex( descr, index, FALSE ); LISTBOX_SetSelection( descr, index, - !descr->items[index].selected, + !is_item_selected(descr, index), (descr->style & LBS_NOTIFY) != 0); } else @@ -2101,13 +2101,13 @@ static LRESULT LISTBOX_HandleLButtonDown( LB_DESCR *descr, DWORD keys, INT x, IN if (descr->style & LBS_EXTENDEDSEL) { LISTBOX_SetSelection( descr, index, - descr->items[index].selected, + is_item_selected(descr, index), (descr->style & LBS_NOTIFY) != 0 ); } else { LISTBOX_SetSelection( descr, index, - !descr->items[index].selected, + !is_item_selected(descr, index), (descr->style & LBS_NOTIFY) != 0 ); } } @@ -2427,7 +2427,7 @@ static LRESULT LISTBOX_HandleKeyDown( LB_DESCR *descr, DWORD key ) else if (descr->style & LBS_MULTIPLESEL) { LISTBOX_SetSelection( descr, descr->focus_item, - !descr->items[descr->focus_item].selected, + !is_item_selected(descr, descr->focus_item), (descr->style & LBS_NOTIFY) != 0 ); } break;

1 0

Piotr Caban : msvcrt: Change __getmainargs signature.
by Alexandre Julliard Feb. 15, 2019

Feb. 15, 2019

Module: wine Branch: master Commit: 35e570eb0949742a00e691a2149a347756e139c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35e570eb0949742a00e691a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 12:25:14 2019 +0100 msvcrt: Change __getmainargs signature. It was changed in newer versions of msvcrt/msvcrXX dlls. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index c781503..82ad47b 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -444,7 +444,7 @@ static int build_expanded_argv(int *argc, char **argv) /********************************************************************* * __getmainargs (MSVCRT.@) */ -void CDECL __getmainargs(int *argc, char** *argv, char** *envp, +int CDECL __getmainargs(int *argc, char** *argv, char** *envp, int expand_wildcards, int *new_mode) { TRACE("(%p,%p,%p,%d,%p).\n", argc, argv, envp, expand_wildcards, new_mode); @@ -475,6 +475,7 @@ void CDECL __getmainargs(int *argc, char** *argv, char** *envp, if (new_mode) MSVCRT__set_new_mode( *new_mode ); + return 0; } static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) @@ -542,7 +543,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) /********************************************************************* * __wgetmainargs (MSVCRT.@) */ -void CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *wenvp, +int CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *wenvp, int expand_wildcards, int *new_mode) { TRACE("(%p,%p,%p,%d,%p).\n", argc, wargv, wenvp, expand_wildcards, new_mode); @@ -575,6 +576,7 @@ void CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** * *wenvp = MSVCRT___winitenv; if (new_mode) MSVCRT__set_new_mode( *new_mode ); + return 0; } /*********************************************************************

1 0