February 2018 - Wine-Commits

Józef Kucia : wined3d: Use wined3d_bit_scan() in context_apply_compute_state().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 9ab04c564e1a14348a4b81c2f61744821b65e61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ab04c564e1a14348a4b81c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 11:40:04 2018 +0100 wined3d: Use wined3d_bit_scan() in context_apply_compute_state(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 81a0f4f..ccfe630 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3983,7 +3983,7 @@ void context_apply_compute_state(struct wined3d_context *context, { const struct StateEntry *state_table = context->state_table; const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int state_id, i, j; + unsigned int state_id, i; context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_COMPUTE], @@ -3991,11 +3991,13 @@ void context_apply_compute_state(struct wined3d_context *context, for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context->dirty_compute_states); ++i) { - for (j = 0; j < sizeof(*context->dirty_compute_states) * CHAR_BIT; ++j, ++state_id) + unsigned int dirty_mask = context->dirty_compute_states[i]; + while (dirty_mask) { - if (context->dirty_compute_states[i] & (1u << j)) - state_table[state_id].apply(context, state, state_id); + unsigned int current_state_id = state_id + wined3d_bit_scan(&dirty_mask); + state_table[current_state_id].apply(context, state, current_state_id); } + state_id += sizeof(*context->dirty_compute_states) * CHAR_BIT; } memset(context->dirty_compute_states, 0, sizeof(*context->dirty_compute_states));

1 0

Zebediah Figura : urlmon/tests: Fix a couple of allocations.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 8d773e2c8332c5c0b3fac1235c104d6ab273221f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d773e2c8332c5c0b3fac123… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 5 18:40:14 2018 -0600 urlmon/tests: Fix a couple of allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 73c6374..e88c960 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -2332,7 +2332,7 @@ static void test_bsc_marshaling(void) rem_bindinfo.stgmedData.tymed = TYMED_HGLOBAL; - buf = GlobalAlloc(0, sizeof(5)); + buf = GlobalAlloc(0, 5); strcpy(buf, "test"); rem_bindinfo.stgmedData.u.hGlobal = buf; rem_bindinfo.cbstgmedData = 5; @@ -2549,7 +2549,7 @@ static void test_bsc_marshaling(void) rem_bindinfo.stgmedData.tymed = TYMED_HGLOBAL; - buf = GlobalAlloc(0, sizeof(5)); + buf = GlobalAlloc(0, 5); strcpy(buf, "test"); rem_bindinfo.stgmedData.u.hGlobal = buf; rem_bindinfo.cbstgmedData = 5;

1 0

Michael Stefaniuc : oleaut32: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: d0ecd514b4de6e0761322b1e688c344f0412d08e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0ecd514b4de6e0761322b1e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:55 2018 +0100 oleaut32: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 1 + dlls/oleaut32/typelib.h | 20 -------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 49366ae..4ee6aa5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -73,6 +73,7 @@ #include "typelib.h" #include "wine/debug.h" #include "variant.h" +#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index d977dfb..2003c75 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -596,26 +596,6 @@ WORD typeofarray #include "poppack.h" -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc( LPVOID mem, SIZE_T size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, mem, size ); -} - -static inline BOOL heap_free( LPVOID mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) DECLSPEC_HIDDEN; extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Properly set the MsiNetAssemblySupport property.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 691a7fa9faecdf10abb3a87ee6f498836c3556f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=691a7fa9faecdf10abb3a87e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 6 13:56:16 2018 +0100 msi: Properly set the MsiNetAssemblySupport property. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 100 ++++++++++++++++++++++++----------------------- dlls/msi/tests/package.c | 5 +++ 2 files changed, 56 insertions(+), 49 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 477fa0f..5aa3dd0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -528,71 +528,73 @@ done: static LPWSTR get_fusion_filename(MSIPACKAGE *package) { - HKEY netsetup; + static const WCHAR fusion[] = + {'f','u','s','i','o','n','.','d','l','l',0}; + static const WCHAR subkey[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'N','E','T',' ','F','r','a','m','e','w','o','r','k',' ','S','e','t','u','p','\\','N','D','P',0}; + static const WCHAR subdir[] = + {'M','i','c','r','o','s','o','f','t','.','N','E','T','\\','F','r','a','m','e','w','o','r','k','\\',0}; + static const WCHAR v2050727[] = + {'v','2','.','0','.','5','0','7','2','7',0}; + static const WCHAR v4client[] = + {'v','4','\\','C','l','i','e','n','t',0}; + static const WCHAR installpath[] = + {'I','n','s','t','a','l','l','P','a','t','h',0}; + HKEY netsetup, hkey; LONG res; - LPWSTR file = NULL; - DWORD index = 0, size; - WCHAR ver[MAX_PATH]; - WCHAR name[MAX_PATH]; - WCHAR windir[MAX_PATH]; - - static const WCHAR fusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; - static const WCHAR sub[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'N','E','T',' ','F','r','a','m','e','w','o','r','k',' ','S','e','t','u','p','\\', - 'N','D','P',0 - }; - static const WCHAR subdir[] = { - 'M','i','c','r','o','s','o','f','t','.','N','E','T','\\', - 'F','r','a','m','e','w','o','r','k','\\',0 - }; + DWORD size, len, type; + WCHAR windir[MAX_PATH], path[MAX_PATH], *filename = NULL; - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, sub, 0, KEY_ENUMERATE_SUB_KEYS, &netsetup); + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, subkey, 0, KEY_CREATE_SUB_KEY, &netsetup); if (res != ERROR_SUCCESS) return NULL; - GetWindowsDirectoryW(windir, MAX_PATH); - - ver[0] = '\0'; - size = MAX_PATH; - while (RegEnumKeyExW(netsetup, index, name, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + if (!RegCreateKeyExW(netsetup, v4client, 0, NULL, 0, KEY_QUERY_VALUE, NULL, &hkey, NULL)) { - index++; - - /* verify existence of fusion.dll .Net 3.0 does not install a new one */ - if (strcmpW( ver, name ) < 0) + size = sizeof(path)/sizeof(path[0]); + if (!RegQueryValueExW(hkey, installpath, NULL, &type, (BYTE *)path, &size)) { - LPWSTR check; - size = lstrlenW(windir) + lstrlenW(subdir) + lstrlenW(name) +lstrlenW(fusion) + 3; - check = msi_alloc(size * sizeof(WCHAR)); + len = strlenW(path) + strlenW(fusion) + 2; + if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; - if (!check) + strcpyW(filename, path); + strcatW(filename, szBackSlash); + strcatW(filename, fusion); + if (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES) { - msi_free(file); - return NULL; + TRACE( "found %s\n", debugstr_w(filename) ); + RegCloseKey(hkey); + RegCloseKey(netsetup); + return filename; } + } + RegCloseKey(hkey); + } - lstrcpyW(check, windir); - lstrcatW(check, szBackSlash); - lstrcatW(check, subdir); - lstrcatW(check, name); - lstrcatW(check, szBackSlash); - lstrcatW(check, fusion); + if (!RegCreateKeyExW(netsetup, v2050727, 0, NULL, 0, KEY_QUERY_VALUE, NULL, &hkey, NULL)) + { + RegCloseKey(hkey); + GetWindowsDirectoryW(windir, MAX_PATH); + len = strlenW(windir) + strlenW(subdir) + strlenW(v2050727) + strlenW(fusion) + 3; + if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; - if(GetFileAttributesW(check) != INVALID_FILE_ATTRIBUTES) - { - msi_free(file); - file = check; - lstrcpyW(ver, name); - } - else - msi_free(check); + strcpyW(filename, windir); + strcatW(filename, szBackSlash); + strcatW(filename, subdir); + strcatW(filename, v2050727); + strcatW(filename, szBackSlash); + strcatW(filename, fusion); + if (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES) + { + TRACE( "found %s\n", debugstr_w(filename) ); + RegCloseKey(netsetup); + return filename; } } RegCloseKey(netsetup); - return file; + return filename; } typedef struct tagLANGANDCODEPAGE diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e4cee59..2022953 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5652,6 +5652,11 @@ static void test_installprops(void) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); + buf[0] = 0; + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "MsiNetAssemblySupport", buf, &size); + if (r == ERROR_SUCCESS) trace( "MsiNetAssemblySupport \"%s\"\n", buf ); + if (pGetSystemInfo && pSHGetFolderPathA) { pGetSystemInfo(&si);

1 0

Mark Jansen : comctl32/listview: Include the checkbox in column width calculation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 71cf0a31d99febf0e260fdc1552465529144bde9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71cf0a31d99febf0e260fdc1… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Tue Feb 6 15:37:39 2018 +0300 comctl32/listview: Include the checkbox in column width calculation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 ++ dlls/comctl32/tests/listview.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c085578..0d7f7ec 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8406,6 +8406,8 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) if (infoPtr->himlSmall && (nColumn == 0 || (LISTVIEW_GetColumnInfo(infoPtr, nColumn)->fmt & LVCFMT_IMAGE))) max_cx += infoPtr->iconSize.cx; max_cx += TRAILING_LABEL_PADDING; + if (nColumn == 0 && (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES)) + max_cx += GetSystemMetrics(SM_CXSMICON); } /* autosize based on listview items width */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0506eaa..c9a165c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6298,7 +6298,6 @@ static void test_LVSCW_AUTOSIZE(void) width2 = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); ok(width2 > 0, "Unexpected column width %d.\n", width2); -todo_wine ok(width2 > width, "Expected increased column width.\n"); /* Turn off checkboxes. */ @@ -6310,7 +6309,6 @@ todo_wine width = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); ok(width > 0, "Unexpected column width %d.\n", width2); -todo_wine ok(width2 > width, "Expected reduced column width.\n"); DestroyWindow(hwnd);

1 0

Nikolay Sivov : comctl32/tests: Add some tests for LVSCW_AUTOSIZE.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: e00a2379fcc22eb417c45da1b50d50e01e2eedd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e00a2379fcc22eb417c45da1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 15:37:38 2018 +0300 comctl32/tests: Add some tests for LVSCW_AUTOSIZE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c6e3127..0506eaa 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6270,6 +6270,52 @@ static void test_state_image(void) } } +static void test_LVSCW_AUTOSIZE(void) +{ + int width, width2; + HWND hwnd; + BOOL ret; + + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + + insert_column(hwnd, 0); + insert_column(hwnd, 1); + insert_item(hwnd, 0); + + ret = SendMessageA(hwnd, LVM_SETCOLUMNWIDTH, 0, LVSCW_AUTOSIZE); + ok(ret, "Failed to set column width.\n"); + + width = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + ok(width > 0, "Unexpected column width %d.\n", width); + + /* Turn on checkboxes. */ + ret = SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); + ok(ret == 0, "Unexpected previous extended style.\n"); + + ret = SendMessageA(hwnd, LVM_SETCOLUMNWIDTH, 0, LVSCW_AUTOSIZE); + ok(ret, "Failed to set column width.\n"); + + width2 = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + ok(width2 > 0, "Unexpected column width %d.\n", width2); +todo_wine + ok(width2 > width, "Expected increased column width.\n"); + + /* Turn off checkboxes. */ + ret = SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, 0); + ok(ret == LVS_EX_CHECKBOXES, "Unexpected previous extended style.\n"); + + ret = SendMessageA(hwnd, LVM_SETCOLUMNWIDTH, 0, LVSCW_AUTOSIZE); + ok(ret, "Failed to set column width.\n"); + + width = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + ok(width > 0, "Unexpected column width %d.\n", width2); +todo_wine + ok(width2 > width, "Expected reduced column width.\n"); + + DestroyWindow(hwnd); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6330,6 +6376,7 @@ START_TEST(listview) test_oneclickactivate(); test_callback_mask(); test_state_image(); + test_LVSCW_AUTOSIZE(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -6371,6 +6418,7 @@ START_TEST(listview) test_LVM_REDRAWITEMS(); test_oneclickactivate(); test_state_image(); + test_LVSCW_AUTOSIZE(); unload_v6_module(ctx_cookie, hCtx);

1 0

Nikolay Sivov : msxml3/tests: Use the global HeapAlloc() helpers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 75782e7cc3a14f46273f24d2bd0aa03147bb4deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=75782e7cc3a14f46273f24d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 08:57:32 2018 +0300 msxml3/tests: Use the global HeapAlloc() helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 5 +++-- dlls/msxml3/tests/httpreq.c | 5 +++-- dlls/msxml3/tests/saxreader.c | 20 +++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 81e2493..7aeafa5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -40,6 +40,7 @@ #include "initguid.h" #include "asptlb.h" +#include "wine/heap.h" #include "wine/test.h" /* undef the #define in msxml2 so that we can access all versions */ @@ -172,7 +173,7 @@ static ULONG WINAPI dispevent_Release(IDispatch *iface) ULONG ref = InterlockedDecrement( &This->ref ); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -232,7 +233,7 @@ static const IDispatchVtbl dispeventVtbl = static IDispatch* create_dispevent(void) { - dispevent *event = HeapAlloc(GetProcessHeap(), 0, sizeof(*event)); + dispevent *event = heap_alloc(sizeof(*event)); event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 538e23f..4f51ef9 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -35,6 +35,7 @@ #include "objsafe.h" #include "mshtml.h" +#include "wine/heap.h" #include "wine/test.h" #define EXPECT_HR(hr,hr_exp) \ @@ -1243,7 +1244,7 @@ static ULONG WINAPI dispevent_Release(IDispatch *iface) ULONG ref = InterlockedDecrement( &This->ref ); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -1320,7 +1321,7 @@ static const IDispatchVtbl dispeventVtbl = static IDispatch* create_dispevent(void) { - dispevent *event = HeapAlloc(GetProcessHeap(), 0, sizeof(*event)); + dispevent *event = heap_alloc(sizeof(*event)); event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 34d11e6..9ebed62 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -33,6 +33,7 @@ #include "ocidl.h" #include "dispex.h" +#include "wine/heap.h" #include "wine/test.h" static const WCHAR emptyW[] = {0}; @@ -257,16 +258,13 @@ static void add_call(struct call_sequence **seq, int sequence_index, if (!call_seq->sequence) { call_seq->size = 10; - call_seq->sequence = HeapAlloc(GetProcessHeap(), 0, - call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = heap_alloc(call_seq->size * sizeof (struct call_entry)); } if (call_seq->count == call_seq->size) { call_seq->size *= 2; - call_seq->sequence = HeapReAlloc(GetProcessHeap(), 0, - call_seq->sequence, - call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = heap_realloc(call_seq->sequence, call_seq->size * sizeof (struct call_entry)); } assert(call_seq->sequence); @@ -301,7 +299,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index SysFreeString(call_seq->sequence[i].attributes[j].qnameW); SysFreeString(call_seq->sequence[i].attributes[j].valueW); } - HeapFree(GetProcessHeap(), 0, call_seq->sequence[i].attributes); + heap_free(call_seq->sequence[i].attributes); call_seq->sequence[i].attr_count = 0; SysFreeString(call_seq->sequence[i].arg1W); @@ -309,7 +307,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index SysFreeString(call_seq->sequence[i].arg3W); } - HeapFree(GetProcessHeap(), 0, call_seq->sequence); + heap_free(call_seq->sequence); call_seq->sequence = NULL; call_seq->count = call_seq->size = 0; } @@ -536,7 +534,7 @@ static void init_call_sequences(struct call_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct call_sequence)); + seq[i] = heap_alloc_zero(sizeof(struct call_sequence)); } static const WCHAR szSimpleXML[] = { @@ -1223,7 +1221,7 @@ static HRESULT WINAPI contentHandler_startElement( int i; struct attribute_entry *attr; - attr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(struct attribute_entry)); + attr = heap_alloc_zero(len * sizeof(*attr)); v = VARIANT_TRUE; hr = ISAXXMLReader_getFeature(g_reader, _bstr_("http://xml.org/sax/features/namespaces"), &v); @@ -3307,7 +3305,7 @@ static void test_mxwriter_flush(void) ok(pos2.QuadPart == 0, "expected stream beginning\n"); len = 2048; - buff = HeapAlloc(GetProcessHeap(), 0, len+1); + buff = heap_alloc(len + 1); memset(buff, 'A', len); buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); @@ -3390,7 +3388,7 @@ static void test_mxwriter_flush(void) ok(SysStringLen(V_BSTR(&dest)) == len, "got len=%d, expected %d\n", SysStringLen(V_BSTR(&dest)), len); VariantClear(&dest); - HeapFree(GetProcessHeap(), 0, buff); + heap_free(buff); ISAXContentHandler_Release(content); IStream_Release(stream); IMXWriter_Release(writer);

1 0

Hans Leidekker : kerberos: Support non-DCE style contexts.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: ddfa042db1112488e2b110963aa78226107742be URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddfa042db1112488e2b11096… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 6 09:55:00 2018 +0100 kerberos: Support non-DCE style contexts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 168 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 139 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddfa042db1112488e2b1…

1 0

Fabian Maurer : comctl32/tests: Add test for v6 combobox dropdown size.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 1f1e7259e6d0f6e87f79c31f3ff4710ac2a84d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f1e7259e6d0f6e87f79c31f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Feb 6 10:26:25 2018 +0300 comctl32/tests: Add test for v6 combobox dropdown size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 895d942..da2ded2 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1151,6 +1151,114 @@ static void test_combo_WS_VSCROLL(void) DestroyWindow(hCombo); } +static void test_combo_dropdown_size(DWORD style) +{ + static const char wine_test[] = "Wine Test"; + HWND hCombo, hList; + COMBOBOXINFO cbInfo; + int i, test, ret; + + static const struct list_size_info + { + int num_items; + int height_combo; + int limit; + } info_height[] = { + {33, 50, -1}, + {35, 50, 40}, + {15, 50, 3}, + }; + + for (test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) + { + const struct list_size_info *info_test = &info_height[test]; + int height_item; /* Height of a list item */ + int height_list; /* Height of the list we got */ + int expected_height_list; + RECT rect_list_client; + int min_visible_expected; + + hCombo = CreateWindowA(WC_COMBOBOXA, "Combo", CBS_DROPDOWN | WS_VISIBLE | WS_CHILD | style, 5, 5, 100, + info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); + + min_visible_expected = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); + todo_wine + ok(min_visible_expected == 30, "Unexpected number of items %d.\n", min_visible_expected); + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + ret = SendMessageA(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo); + ok(ret, "Failed to get combo info, %d\n", ret); + + hList = cbInfo.hwndList; + for (i = 0; i < info_test->num_items; i++) + { + ret = SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM) wine_test); + ok(ret == i, "Failed to add string %d, returned %d.\n", i, ret); + } + + if (info_test->limit != -1) + { + int min_visible_actual; + min_visible_expected = info_test->limit; + + ret = SendMessageA(hCombo, CB_SETMINVISIBLE, min_visible_expected, 0); + todo_wine + ok(ret, "Failed to set visible limit.\n"); + min_visible_actual = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); + todo_wine + ok(min_visible_expected == min_visible_actual, "test %d: unexpected number of items %d.\n", + test, min_visible_actual); + } + + ret = SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE,0); + ok(ret, "Failed to show dropdown.\n"); + ret = SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0); + ok(ret, "Unexpected dropped state.\n"); + + GetClientRect(hList, &rect_list_client); + height_list = rect_list_client.bottom - rect_list_client.top; + height_item = (int)SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0); + + if (style & CBS_NOINTEGRALHEIGHT) + { + RECT rect_list_complete; + int list_height_nonclient; + int list_height_calculated; + int edit_padding_size = cbInfo.rcItem.top; /* edit client rect top is the padding it has to its parent + We assume it's the same on the bottom */ + + GetWindowRect(hList, &rect_list_complete); + + list_height_nonclient = (rect_list_complete.bottom - rect_list_complete.top) + - (rect_list_client.bottom - rect_list_client.top); + + /* Calculate the expected client size of the listbox popup from the size of the combobox. */ + list_height_calculated = info_test->height_combo /* Take height we created combobox with */ + - (cbInfo.rcItem.bottom - cbInfo.rcItem.top) /* Subtract size of edit control */ + - list_height_nonclient /* Subtract list nonclient area */ + - edit_padding_size * 2; /* subtract space around the edit control */ + + expected_height_list = min(list_height_calculated, height_item * info_test->num_items); + if (expected_height_list < 0) + expected_height_list = 0; + + todo_wine + ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", + test, expected_height_list, height_list); + } + else + { + expected_height_list = min(info_test->num_items, min_visible_expected) * height_item; + + todo_wine + ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", + test, expected_height_list, height_list); + } + + DestroyWindow(hCombo); + } +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1192,6 +1300,8 @@ START_TEST(combo) test_combo_listbox_styles(CBS_SIMPLE); test_combo_listbox_styles(CBS_DROPDOWN); test_combo_listbox_styles(CBS_DROPDOWNLIST); + test_combo_dropdown_size(0); + test_combo_dropdown_size(CBS_NOINTEGRALHEIGHT); cleanup(); unload_v6_module(ctx_cookie, hCtx);

1 0

Alexandre Julliard : ntdll: Fix crash on nested thread exit.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 7ccae68f6cf85388ef6eed98792127b7fbf01396 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ccae68f6cf85388ef6eed98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 16:06:42 2018 +0100 ntdll: Fix crash on nested thread exit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 3d25f13..fcadcf9 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2566,6 +2566,7 @@ __ASM_GLOBAL_FUNC( start_thread, extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int) ); __ASM_GLOBAL_FUNC( call_thread_exit_func, + "movl 8(%esp),%ecx\n\t" /* fetch exit frame */ "movl %fs:0x1f4,%edx\n\t" /* x86_thread_data()->exit_frame */ "testl %edx,%edx\n\t" @@ -2573,7 +2574,6 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, "jmp *%ecx\n\t" /* switch to exit frame stack */ "1:\tmovl 4(%esp),%eax\n\t" - "movl 8(%esp),%ecx\n\t" "movl $0,%fs:0x1f4\n\t" "movl %edx,%ebp\n\t" __ASM_CFI(".cfi_def_cfa %ebp,4\n\t")

1 0