December 2018 - Wine-Commits

Gabriel Ivăncescu : user32/listbox: Use a helper function to check the selection state of an item.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 3b087ce81faa102290f538cd6a0e2da251a9e464 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b087ce81faa102290f538cd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 3 13:32:06 2018 +0300 user32/listbox: Use a helper function to check the selection state of an item. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 286a33b..3eee691 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -120,6 +120,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) +{ + return descr->items[index].selected; +} + /********************************************************************* * listbox class descriptor */ @@ -2866,7 +2871,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case LB_GETSEL: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) return LB_ERR; - return descr->items[wParam].selected; + return is_item_selected(descr, wParam); case LB_SETSEL: ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE );

1 0

Nikolay Sivov : shlwapi: Forward SHCreateMemStream() to shcore.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: ee235188552e38d43721186d3c98040fc126e28b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee235188552e38d43721186d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:40:56 2018 +0300 shlwapi: Forward SHCreateMemStream() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/regstream.c | 40 ---------------------------------------- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 63615d3..47e9317 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -633,46 +633,6 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, } /************************************************************************* - * @ [SHLWAPI.12] - * - * Create an IStream object on a block of memory. - * - * PARAMS - * lpbData [I] Memory block to create the IStream object on - * dwDataLen [I] Length of data block - * - * RETURNS - * Success: A pointer to the IStream object. - * Failure: NULL, if any parameters are invalid or an error occurs. - * - * NOTES - * A copy of the memory pointed to by lpbData is made, and is freed - * when the stream is released. - */ -IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) -{ - ISHRegStream *strm = NULL; - LPBYTE lpbDup; - - TRACE("(%p,%d)\n", lpbData, dwDataLen); - - if (!lpbData) - dwDataLen = 0; - - lpbDup = HeapAlloc(GetProcessHeap(), 0, dwDataLen); - - if (lpbDup) - { - memcpy(lpbDup, lpbData, dwDataLen); - strm = IStream_Create(NULL, lpbDup, dwDataLen); - - if (!strm) - HeapFree(GetProcessHeap(), 0, lpbDup); - } - return &strm->IStream_iface; -} - -/************************************************************************* * SHCreateStreamWrapper [SHLWAPI.@] * * Create an IStream object on a block of memory. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 62ebb85..ddc76ec 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -9,7 +9,7 @@ 9 stdcall -ordinal SHUnlockShared(ptr) 10 stdcall -ordinal SHFreeShared(long long) 11 stdcall -noname SHMapHandle(long long long long long) -12 stdcall -ordinal SHCreateMemStream(ptr long) +12 stdcall -ordinal SHCreateMemStream(ptr long) shcore.SHCreateMemStream 13 stdcall -noname RegisterDefaultAcceptHeaders(ptr ptr) 14 stdcall -ordinal GetAcceptLanguagesA(ptr ptr) 15 stdcall -ordinal GetAcceptLanguagesW(ptr ptr)

1 0

Alexandre Julliard : wineandroid: Generate assets checksum from the gradle build file.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 0f19685917a9bc5cce2b581fc31d4bb90f8f2003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f19685917a9bc5cce2b581f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 16:16:27 2018 +0100 wineandroid: Generate assets checksum from the gradle build file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 8 ++------ dlls/wineandroid.drv/build.gradle.in | 39 +++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index d2e2d01..40ab495 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -20,9 +20,5 @@ EXTRA_TARGETS = wine-debug.apk all: wine-debug.apk wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg - (test -d assets && \ - rm -f assets/files.sum assets/sums.sum && \ - sha256sum `find assets -type f -print` | sed 's/ assets\// /' >files.sum && \ - sha256sum files.sum >sums.sum && \ - mv files.sum sums.sum assets) || rm -rf assets - gradle -q assembleDebug && mv build/outputs/apk/wine-debug.apk . + gradle -q assembleDebug + mv build/outputs/apk/wine-debug.apk $@ diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 3fba34a..8ae2fb4 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -32,7 +32,8 @@ buildscript } } -def add_icon_task( dir, scale ) { +def add_icon_task( dir, scale ) +{ return tasks.create( "createIcon-" + dir, Exec ) { def outdir = new File( "res", "drawable-" + dir ) outputs.dir( outdir ) @@ -45,15 +46,33 @@ def add_icon_task( dir, scale ) { } } -tasks.whenTaskAdded { t -> - if (t.name.equals( "generateDebugResources" )) { - t.dependsOn add_icon_task( "ldpi", 0.75 ) - t.dependsOn add_icon_task( "mdpi", 1 ) - t.dependsOn add_icon_task( "hdpi", 1.5 ) - t.dependsOn add_icon_task( "xhdpi", 2 ) - t.dependsOn add_icon_task( "xxhdpi", 3 ) - t.dependsOn add_icon_task( "xxxhdpi", 4 ) - } +def checksum_task() +{ + return tasks.create( "checksumAssets", Exec ) { + commandLine "sh", "-c", + "(test -d assets && " + + "rm -f assets/files.sum assets/sums.sum && " + + "sha256sum \$(find assets -type f -print) | sed 's/ assets\\// /' >files.sum && " + + "sha256sum files.sum >sums.sum && " + + "mv files.sum sums.sum assets) || rm -rf assets"; + } +} + +tasks.whenTaskAdded +{ + if (name.equals( "generateDebugResources" )) + { + dependsOn add_icon_task( "ldpi", 0.75 ) + dependsOn add_icon_task( "mdpi", 1 ) + dependsOn add_icon_task( "hdpi", 1.5 ) + dependsOn add_icon_task( "xhdpi", 2 ) + dependsOn add_icon_task( "xxhdpi", 3 ) + dependsOn add_icon_task( "xxxhdpi", 4 ) + } + if (name.equals( "generateDebugAssets" )) + { + dependsOn checksum_task() + } } tasks.withType(JavaCompile)

1 0

Alexandre Julliard : wineandroid: Add a helper function to update a window surface.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: cc06703e3abc8617ae4a3dff4024d06e235a2293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc06703e3abc8617ae4a3dff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 18:26:50 2018 +0100 wineandroid: Add a helper function to update a window surface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 6e6bbff..9229955 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -530,6 +530,20 @@ public class WineActivity extends Activity return hwnd; } + private void update_surface( boolean is_client ) + { + if (is_client) + { + Log.i( LOGTAG, String.format( "set client surface hwnd %08x %s", hwnd, client_surface )); + if (client_surface != null) wine_surface_changed( hwnd, client_surface, true ); + } + else + { + Log.i( LOGTAG, String.format( "set window surface hwnd %08x %s", hwnd, window_surface )); + if (window_surface != null) wine_surface_changed( hwnd, window_surface, false ); + } + } + public void set_surface( SurfaceTexture surftex, boolean is_client ) { if (is_client) @@ -540,8 +554,6 @@ public class WineActivity extends Activity client_surftex = surftex; client_surface = new Surface( surftex ); } - Log.i( LOGTAG, String.format( "set client surface hwnd %08x %s", hwnd, client_surface )); - wine_surface_changed( hwnd, client_surface, true ); } else { @@ -551,9 +563,8 @@ public class WineActivity extends Activity window_surftex = surftex; window_surface = new Surface( surftex ); } - Log.i( LOGTAG, String.format( "set window surface hwnd %08x %s", hwnd, window_surface )); - wine_surface_changed( hwnd, window_surface, false ); } + update_surface( is_client ); } public void get_event_pos( MotionEvent event, int[] pos )

1 0

Dmitry Timoshkov : oleaut32: Accept DISP_E_PARAMNOTFOUND for missing optional parameters in ITypeInfo: :Invoke implementation.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 54d17b95326851a685d0bac253129c0fd428901d URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d17b95326851a685d0bac2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Dec 2 10:34:44 2018 +0300 oleaut32: Accept DISP_E_PARAMNOTFOUND for missing optional parameters in ITypeInfo::Invoke implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 3 ++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 756cca8..0b6776b 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -2861,7 +2861,7 @@ static void test_typelibmarshal(void) ok(!lstrcmpW(bstr, szCat), "IWidget_get_Name should have returned string \"Cat\" instead of %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - /* call DoSomething */ + /* call DoSomething without optional arguments */ VariantInit(&vararg[0]); VariantInit(&vararg[1]); V_VT(&vararg[1]) = VT_R8; @@ -2876,6 +2876,43 @@ static void test_typelibmarshal(void) ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); VariantClear(&varresult); + /* call DoSomething with optional argument set to VT_EMPTY */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + VariantInit(&vararg[2]); + V_VT(&vararg[2]) = VT_R8; + V_R8(&vararg[2]) = 3.141; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 3; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_DOSOMETHING, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + VariantClear(&varresult); + + /* call DoSomething with optional arguments set to VT_ERROR/DISP_E_PARAMNOTFOUND */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + VariantInit(&vararg[2]); + VariantInit(&vararg[3]); + V_VT(&vararg[3]) = VT_R8; + V_R8(&vararg[3]) = 3.141; + V_VT(&vararg[1]) = VT_ERROR; + V_ERROR(&vararg[1]) = DISP_E_PARAMNOTFOUND; + V_VT(&vararg[0]) = VT_ERROR; + V_ERROR(&vararg[0]) = DISP_E_PARAMNOTFOUND; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 4; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_DOSOMETHING, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + VariantClear(&varresult); + /* call get_State */ dispparams.cNamedArgs = 0; dispparams.cArgs = 0; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f32bed3..f17a926 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7217,7 +7217,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( break; } } - else if (src_arg) + else if (src_arg && !((wParamFlags & PARAMFLAG_FOPT) && + V_VT(src_arg) == VT_ERROR && V_ERROR(src_arg) == DISP_E_PARAMNOTFOUND)) { TRACE("%s\n", debugstr_variant(src_arg));

1 0

Alex Henrie : shlwapi: Turn several constants and variables into static constants.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 94f08b1019401ba61ba019608bc93a47d3bc1a6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f08b1019401ba61ba01960… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:05:32 2018 -0700 shlwapi: Turn several constants and variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/url.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 8313b98..fb38920 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -746,26 +746,24 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, * the last leaf starting from the '#'. Otherwise the '#' is not * meaningful and just start looking from the end. */ if ((work = strpbrkW(base.pszSuffix + sizeloc, fragquerystr))) { - const WCHAR htmlW[] = {'.','h','t','m','l',0}; - const int len_htmlW = 5; - const WCHAR htmW[] = {'.','h','t','m',0}; - const int len_htmW = 4; + static const WCHAR htmlW[] = {'.','h','t','m','l'}; + static const WCHAR htmW[] = {'.','h','t','m'}; if (*work == '?' || base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) manual_search = TRUE; - else if (work - base.pszSuffix > len_htmW) { - work -= len_htmW; - if (strncmpiW(work, htmW, len_htmW) == 0) + else if (work - base.pszSuffix > ARRAY_SIZE(htmW)) { + work -= ARRAY_SIZE(htmW); + if (strncmpiW(work, htmW, ARRAY_SIZE(htmW)) == 0) manual_search = TRUE; - work += len_htmW; + work += ARRAY_SIZE(htmW); } if (!manual_search && - work - base.pszSuffix > len_htmlW) { - work -= len_htmlW; - if (strncmpiW(work, htmlW, len_htmlW) == 0) + work - base.pszSuffix > ARRAY_SIZE(htmlW)) { + work -= ARRAY_SIZE(htmlW); + if (strncmpiW(work, htmlW, ARRAY_SIZE(htmlW)) == 0) manual_search = TRUE; - work += len_htmlW; + work += ARRAY_SIZE(htmlW); } } @@ -1734,11 +1732,11 @@ static HRESULT URL_GuessScheme(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) static HRESULT URL_CreateFromPath(LPCWSTR pszPath, LPWSTR pszUrl, LPDWORD pcchUrl) { + static const WCHAR file_colonW[] = {'f','i','l','e',':',0}; + static const WCHAR three_slashesW[] = {'/','/','/',0}; DWORD needed; HRESULT ret = S_OK; WCHAR *pszNewUrl; - WCHAR file_colonW[] = {'f','i','l','e',':',0}; - WCHAR three_slashesW[] = {'/','/','/',0}; PARSEDURLW parsed_url; parsed_url.cbSize = sizeof(parsed_url);

1 0

Nikolay Sivov : shlwapi: Forward ThreadRef functions to shcore.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 678c18b22ed81d2036c4b458eed29a33bc4c4751 URL: https://source.winehq.org/git/wine.git/?a=commit;h=678c18b22ed81d2036c4b458… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:41:00 2018 +0300 shlwapi: Forward ThreadRef functions to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 1 - dlls/shlwapi/shlwapi.spec | 10 +- dlls/shlwapi/shlwapi_main.c | 3 - dlls/shlwapi/thread.c | 310 -------------------------------------------- 4 files changed, 5 insertions(+), 319 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=678c18b22ed81d2036c4…

1 0

Nikolay Sivov : user32/listbox: Remove duplicated condition.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: db869b61a1a07421a40b65ee825e2cc7130009e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db869b61a1a07421a40b65ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 13:32:08 2018 +0300 user32/listbox: Remove duplicated condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6dbf8d9..6a33f81 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -515,8 +515,8 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) 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; - BOOL selected = FALSE; if (index < descr->nb_items) { @@ -524,6 +524,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, selected = is_item_selected(descr, index); } + focused = !ignoreFocus && descr->focus_item == index && descr->caret_on && descr->in_focus; + if (IS_OWNERDRAW(descr)) { DRAWITEMSTRUCT dis; @@ -555,9 +557,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.itemState = 0; if (selected) dis.itemState |= ODS_SELECTED; - if (!ignoreFocus && (descr->focus_item == index) && - (descr->caret_on) && - (descr->in_focus)) dis.itemState |= ODS_FOCUS; + if (focused) + dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; dis.itemData = item->data; dis.rcItem = *rect; @@ -607,9 +608,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, SetBkColor( hdc, oldBk ); SetTextColor( hdc, oldText ); } - if (!ignoreFocus && (descr->focus_item == index) && - (descr->caret_on) && - (descr->in_focus)) DrawFocusRect( hdc, rect ); + if (focused) + DrawFocusRect( hdc, rect ); } }

1 0

Gabriel Ivăncescu : user32/listbox: Account for NULL item when painting ownerdrawn list.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 8700ef560eb50602af40a418b163f2b3f42e58b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8700ef560eb50602af40a418… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 3 13:32:09 2018 +0300 user32/listbox: Account for NULL item when painting ownerdrawn list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6a33f81..b104bfd 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -560,10 +560,10 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, if (focused) dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; - dis.itemData = item->data; + dis.itemData = item ? item->data : 0; dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", - descr->self, index, debugstr_w(item->str), action, + descr->self, index, item ? debugstr_w(item->str) : "", action, dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); SelectClipRgn( hdc, hrgn );

1 0

Gabriel Ivăncescu : user32/listbox: Store the items array size instead of using HeapSize().
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: ae4199e26476d739e0dddb70ce181bbefd1a7c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae4199e26476d739e0dddb70… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 3 13:32:10 2018 +0300 user32/listbox: Store the items array size instead of using HeapSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index b104bfd..594c956 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -67,6 +67,7 @@ typedef struct INT height; /* Window height */ LB_ITEMDATA *items; /* Array of items */ INT nb_items; /* Number of items */ + UINT items_size; /* Total number of allocated items in the array */ INT top_item; /* Top visible item */ INT selected_item; /* Selected item */ INT focus_item; /* Item that has the focus */ @@ -713,7 +714,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) nb_items += LB_ARRAY_GRANULARITY - 1; nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); + nb_items += descr->items_size; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, nb_items * sizeof(LB_ITEMDATA)); } @@ -727,6 +728,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = nb_items; descr->items = item; return LB_OKAY; } @@ -1537,12 +1539,10 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; - if (!descr->items) max_items = 0; - else max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - if (descr->nb_items == max_items) + if (descr->nb_items == descr->items_size) { /* We need to grow the array */ - max_items += LB_ARRAY_GRANULARITY; + max_items = descr->items_size + LB_ARRAY_GRANULARITY; if (descr->items) item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); @@ -1554,6 +1554,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = max_items; descr->items = item; } @@ -1713,13 +1714,17 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) /* Shrink the item array if possible */ - max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(LB_ITEMDATA); + 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 = item; + if (item) + { + descr->items_size = max_items; + descr->items = item; + } } /* Repaint the items */ @@ -1765,6 +1770,7 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) descr->selected_item = -1; descr->focus_item = 0; descr->anchor_item = -1; + descr->items_size = 0; descr->items = NULL; } @@ -2506,6 +2512,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; descr->items = NULL; + descr->items_size = 0; descr->nb_items = 0; descr->top_item = 0; descr->selected_item = -1;

1 0