January 2018 - Wine-devel - list.winehq.org

[PATCH] ucrtbase: Hook up __intrinsic_setjmpex for x86_64 and arm64
by Martin Storsjo 21 Jan '18

21 Jan '18

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 5e67f92..cb6fd4e 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -39,7 +39,7 @@ @ stub __dcrt_initial_narrow_environment @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b142a17..5d12b4c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -94,7 +94,7 @@ @ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) MSVCRT__setjmpex @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index b2d11bc..c4f9f6a 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -33,7 +33,7 @@ @ stub __current_exception @ stub __current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy -- 2.7.4

1 0

[PATCH] ntdll: Implement NtFlushInstructionCache using __clear_cache where available
by Martin Storsjo 21 Jan '18

21 Jan '18

The configure check needs to be done with a more elaborate test than just AC_CHECK_FUNC, since it's a built-in function in clang and errors out if invoked with no parameters. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- configure.ac | 8 ++++++++ dlls/ntdll/process.c | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/configure.ac b/configure.ac index 223c985..25d88d8 100644 --- a/configure.ac +++ b/configure.ac @@ -2717,6 +2717,14 @@ then AC_DEFINE(HAVE___BUILTIN_POPCOUNT, 1, [Define to 1 if you have the `__builtin_popcount' built-in function.]) fi +AC_CACHE_CHECK([for __clear_cache], ac_cv_have___clear_cache, + AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[__clear_cache((void*)0, (void*)0); return 0;]])], + [ac_cv_have___clear_cache="yes"], [ac_cv_have___clear_cache="no"])) +if test "$ac_cv_have___clear_cache" = "yes" +then + AC_DEFINE(HAVE___CLEAR_CACHE, 1, [Define to 1 if you have the `__clear_cache' (potentially built-in) function.]) +fi + dnl *** check for the need to define platform-specific symbols case $host_cpu in diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index f615ce2..47a389a 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -658,6 +658,17 @@ NTSTATUS WINAPI NtFlushInstructionCache( IN LPCVOID BaseAddress, IN SIZE_T Size) { +#ifdef HAVE___CLEAR_CACHE + if (ProcessHandle == GetCurrentProcess()) + { + __clear_cache(BaseAddress, (char*)BaseAddress + Size); + } + else + { + FIXME("%p %p %ld - Flush for other process not supported\n", + ProcessHandle, BaseAddress, Size); + } +#else static int once; if (!once++) { @@ -667,6 +678,7 @@ NTSTATUS WINAPI NtFlushInstructionCache( FIXME("%p %p %ld\n", ProcessHandle, BaseAddress, Size ); #endif } +#endif return STATUS_SUCCESS; } -- 2.7.4

1 0

[PATCH] dmusic: Use the new global HeapReAlloc wrappers in CreatePort()
by Michael Stefaniuc 21 Jan '18

21 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Actually I remembered one of my dmusic patches where the new heap_realloc() semantics (alloc for NULL ptr and free for 0 size) could have come in handy. Also I used there the "nofail" approach aka did not check for memory failure as the alloc size it at most a handful of (void*) sizes. That are also tests that exercise those code paths. Of course I could have added a heap_reallocarray() too, but don't want to start with the scope creep already... dlls/dmusic/dmusic.c | 21 +++++---------------- dlls/dmusic/dmusic_private.h | 1 + 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 58dcd9d952..eb3bc71af2 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -159,12 +159,7 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSI return hr; } This->num_ports++; - if (!This->ports) - This->ports = HeapAlloc(GetProcessHeap(), 0, - sizeof(*This->ports) * This->num_ports); - else - This->ports = HeapReAlloc(GetProcessHeap(), 0, This->ports, - sizeof(*This->ports) * This->num_ports); + This->ports = heap_realloc_nofail(This->ports, sizeof(*This->ports) * This->num_ports); This->ports[This->num_ports - 1] = new_port; *port = new_port; return S_OK; @@ -195,16 +190,10 @@ void dmusic_remove_port(IDirectMusic8Impl *dmusic, IDirectMusicPort *port) return; } - if (!--dmusic->num_ports) { - HeapFree(GetProcessHeap(), 0, dmusic->ports); - dmusic->ports = NULL; - return; - } - - memmove(&dmusic->ports[i], &dmusic->ports[i + 1], - (dmusic->num_ports - i) * sizeof(*dmusic->ports)); - dmusic->ports = HeapReAlloc(GetProcessHeap(), 0, dmusic->ports, - sizeof(*dmusic->ports) * dmusic->num_ports); + if (--dmusic->num_ports) + memmove(&dmusic->ports[i], &dmusic->ports[i + 1], + (dmusic->num_ports - i) * sizeof(*dmusic->ports)); + dmusic->ports = heap_realloc_nofail(dmusic->ports, sizeof(*dmusic->ports) * dmusic->num_ports); } static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DWORD index, LPDMUS_CLOCKINFO clock_info) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index f9839edfda..f948099bbd 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -35,6 +35,7 @@ #include "winuser.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "winreg.h" -- 2.14.3

1 0

[PATCH 2/2] vbscript: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 21 Jan '18

21 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- I did not bother to find the locations where the _nofail variants can be used. Will start working on that stuff only after the patch implementing the generic HeapAlloc wrappers is in. dlls/vbscript/interp.c | 6 +++--- dlls/vbscript/vbdisp.c | 8 ++++---- dlls/vbscript/vbregexp.c | 10 +++++----- dlls/vbscript/vbscript.c | 4 ++-- dlls/vbscript/vbscript.h | 21 +-------------------- 5 files changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9ec329924c..8853ef9ee5 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1034,7 +1034,7 @@ static HRESULT interp_dim(exec_ctx_t *ctx) assert(array_id < ctx->func->array_cnt); if(!ctx->arrays) { - ctx->arrays = heap_alloc_zero(ctx->func->array_cnt * sizeof(SAFEARRAY*)); + ctx->arrays = heap_calloc(ctx->func->array_cnt, sizeof(SAFEARRAY*)); if(!ctx->arrays) return E_OUTOFMEMORY; } @@ -2087,7 +2087,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP VARIANT *v; unsigned i; - exec.args = heap_alloc_zero(func->arg_cnt * sizeof(VARIANT)); + exec.args = heap_calloc(func->arg_cnt, sizeof(VARIANT)); if(!exec.args) { release_exec(&exec); return E_OUTOFMEMORY; @@ -2113,7 +2113,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP } if(func->var_cnt) { - exec.vars = heap_alloc_zero(func->var_cnt * sizeof(VARIANT)); + exec.vars = heap_calloc(func->var_cnt, sizeof(VARIANT)); if(!exec.vars) { release_exec(&exec); return E_OUTOFMEMORY; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 9c0c4c1d9a..714bab6e05 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -564,7 +564,7 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) vbdisp_t *vbdisp; HRESULT hres = S_OK; - vbdisp = heap_alloc_zero( FIELD_OFFSET( vbdisp_t, props[desc->prop_cnt] )); + vbdisp = heap_zalloc( offsetof( vbdisp_t, props[desc->prop_cnt] )); if(!vbdisp) return E_OUTOFMEMORY; @@ -575,7 +575,7 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) list_add_tail(&desc->ctx->objects, &vbdisp->entry); if(desc->array_cnt) { - vbdisp->arrays = heap_alloc_zero(desc->array_cnt * sizeof(*vbdisp->arrays)); + vbdisp->arrays = heap_calloc(desc->array_cnt, sizeof(*vbdisp->arrays)); if(vbdisp->arrays) { unsigned i, j; @@ -642,7 +642,7 @@ HRESULT create_procedure_disp(script_ctx_t *ctx, vbscode_t *code, IDispatch **re vbdisp_t *vbdisp; HRESULT hres; - desc = heap_alloc_zero(sizeof(*desc)); + desc = heap_zalloc(sizeof(*desc)); if(!desc) return E_OUTOFMEMORY; @@ -960,7 +960,7 @@ HRESULT create_script_disp(script_ctx_t *ctx, ScriptDisp **ret) { ScriptDisp *script_disp; - script_disp = heap_alloc_zero(sizeof(*script_disp)); + script_disp = heap_zalloc(sizeof(*script_disp)); if(!script_disp) return E_OUTOFMEMORY; diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 800ea5e74f..ad0f60944c 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -307,7 +307,7 @@ static HRESULT create_sub_matches(DWORD pos, match_state_t *result, SubMatches * if(FAILED(hres)) return hres; - ret = heap_alloc_zero(sizeof(*ret)); + ret = heap_zalloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -605,7 +605,7 @@ static HRESULT create_match2(DWORD pos, match_state_t **result, IMatch2 **match) if(FAILED(hres)) return hres; - ret = heap_alloc_zero(sizeof(*ret)); + ret = heap_zalloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -754,7 +754,7 @@ static HRESULT create_enum_variant_mc2(IMatchCollection2 *mc, ULONG pos, IEnumVA { MatchCollectionEnum *ret; - ret = heap_alloc_zero(sizeof(*ret)); + ret = heap_zalloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -1051,7 +1051,7 @@ static HRESULT create_match_collection2(IMatchCollection2 **match_collection) if(FAILED(hres)) return hres; - ret = heap_alloc_zero(sizeof(*ret)); + ret = heap_zalloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -1602,7 +1602,7 @@ HRESULT create_regexp(IDispatch **ret) if(FAILED(hres)) return hres; - regexp = heap_alloc_zero(sizeof(*regexp)); + regexp = heap_zalloc(sizeof(*regexp)); if(!regexp) return E_OUTOFMEMORY; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 645068e347..1aae7f23a9 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -565,7 +565,7 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) if(This->ctx) return E_UNEXPECTED; - ctx = heap_alloc_zero(sizeof(script_ctx_t)); + ctx = heap_zalloc(sizeof(script_ctx_t)); if(!ctx) return E_OUTOFMEMORY; @@ -757,7 +757,7 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); - ret = heap_alloc_zero(sizeof(*ret)); + ret = heap_zalloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index ec41737083..5e935ff76a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -28,6 +28,7 @@ #include "vbscript_classes.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -430,26 +431,6 @@ HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -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(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.14.3

1 0

[PATCH] kernel32/tests: Fix the HeapReAlloc name in two comments
by Michael Stefaniuc 21 Jan '18

21 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 2c91bb95aa..67dc8b6df4 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -568,7 +568,7 @@ static void test_HeapCreate(void) ok(HeapFree(heap,0,mem3),"HeapFree didn't pass successfully\n"); } - /* Check that HeapRealloc works */ + /* Check that HeapReAlloc works */ mem2a=HeapReAlloc(heap,HEAP_ZERO_MEMORY,mem2,memchunk+5*sysInfo.dwPageSize); ok(mem2a!=NULL,"HeapReAlloc failed\n"); if(mem2a) { @@ -582,7 +582,7 @@ static void test_HeapCreate(void) ok(!error,"HeapReAlloc should have zeroed out its allocated memory\n"); } - /* Check that HeapRealloc honours HEAP_REALLOC_IN_PLACE_ONLY */ + /* Check that HeapReAlloc honours HEAP_REALLOC_IN_PLACE_ONLY */ error=FALSE; mem1a=HeapReAlloc(heap,HEAP_REALLOC_IN_PLACE_ONLY,mem1,memchunk+sysInfo.dwPageSize); if(mem1a!=NULL) { -- 2.14.3

1 0

[PATCH] ntdll: Determine write fault based on failed instruction on ARM64
by André Hentschel 21 Jan '18

21 Jan '18

Based on code from Qemu Reported-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm64.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index a04fe93..57ec13a 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -568,6 +568,23 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f return STATUS_SUCCESS; } +static inline DWORD is_write_fault( ucontext_t *context ) +{ + DWORD inst = *(DWORD *)PC_sig(context); + if ((inst & 0xbfff0000) == 0x0c000000 /* C3.3.1 */ || + (inst & 0xbfe00000) == 0x0c800000 /* C3.3.2 */ || + (inst & 0xbfdf0000) == 0x0d000000 /* C3.3.3 */ || + (inst & 0xbfc00000) == 0x0d800000 /* C3.3.4 */ || + (inst & 0x3f400000) == 0x08000000 /* C3.3.6 */ || + (inst & 0x3bc00000) == 0x38000000 /* C3.3.8-12 */ || + (inst & 0x3fe00000) == 0x3c800000 /* C3.3.8-12 128bit */ || + (inst & 0x3bc00000) == 0x39000000 /* C3.3.13 */ || + (inst & 0x3fc00000) == 0x3d800000 /* C3.3.13 128bit */ || + (inst & 0x3a400000) == 0x28000000) /* C3.3.7,14-16 */ + return EXCEPTION_WRITE_FAULT; + return EXCEPTION_READ_FAULT; +} + /********************************************************************** * segv_handler * @@ -604,8 +621,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) case SIGSEGV: /* Segmentation fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; - /* FIXME: Currently the kernel provides no way to determine if it's read or write */ - rec->ExceptionInformation[0] = 0; + rec->ExceptionInformation[0] = is_write_fault(context); rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr; break; case SIGBUS: /* Alignment check exception */ -- 2.7.4

1 0

[PATCH] ws2_32/tests: Fix the printed value in a few ok lines.
by Stefan Dösinger 21 Jan '18

21 Jan '18

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 96631aea37..e188724203 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1768,8 +1768,8 @@ todo_wine ok(!csinfoA.cs.LocalAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); ok(csinfoA.cs.LocalAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); /* Socket is not connected, no information provided */ - ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); - ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.RemoteAddr.lpSockaddr); err = bind(s, (struct sockaddr*)&saddr, sizeof(saddr)); ok(!err, "Expected 0, got %d\n", err); @@ -1781,8 +1781,8 @@ todo_wine ok(csinfoA.cs.LocalAddr.iSockaddrLength, "Expected non-zero\n"); ok(csinfoA.cs.LocalAddr.lpSockaddr != NULL, "Expected non-null\n"); /* Socket is not connected, no information provided */ - ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); - ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.RemoteAddr.lpSockaddr); err = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); ok(!err, "Expected 0, got %d\n", err); -- 2.13.6

1 0

[PATCH] ole2disp: Implement SafeArrayDestroyData()
by Nikolay Sivov 21 Jan '18

21 Jan '18

Based on patch by Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole2disp.dll16/ole2disp.c | 19 +++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 98aca3dbee..b98148550f 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -270,6 +270,25 @@ HRESULT WINAPI SafeArrayDestroyDescriptor16(SEGPTR s) return S_OK; } +/****************************************************************************** + * SafeArrayDestroyData [OLE2DISP.41] + */ +HRESULT WINAPI SafeArrayDestroyData16(SAFEARRAY16 *sa) +{ + TRACE("%p\n", sa); + + if (!sa) + return S_OK; + + if (sa->cLocks) + return DISP_E_ARRAYISLOCKED; + + if (!(sa->fFeatures & FADF_STATIC)) + safearray_free(sa->pvData); + + return S_OK; +} + /* This implementation of the BSTR API is 16-bit only. It represents BSTR as a 16:16 far pointer, and the strings as ISO-8859 */ diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 7b00ac353b..57d2254afd 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -38,7 +38,7 @@ 38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16 39 pascal SafeArrayAllocData(ptr) SafeArrayAllocData16 40 pascal SafeArrayDestroyDescriptor(segptr) SafeArrayDestroyDescriptor16 -41 stub SAFEARRAYDESTROYDATA +41 pascal SafeArrayDestroyData(ptr) SafeArrayDestroyData16 42 stub SAFEARRAYREDIM 43 stub VARI2FROMI4 44 stub VARI2FROMR4 -- 2.15.1

1 0

[PATCH] comctl32/listview: Always return zero state mask for subitems
by Nikolay Sivov 21 Jan '18

21 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 11 +++++++---- dlls/comctl32/tests/listview.c | 43 ++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 589d5c4a7e..c085578062 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6679,16 +6679,19 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, /* make a local copy */ isubitem = lpLVItem->iSubItem; + if (isubitem && (lpLVItem->mask & LVIF_STATE)) + lpLVItem->state = 0; + /* a quick optimization if all we're asked is the focus state * these queries are worth optimising since they are common, * and can be answered in constant time, without the heavy accesses */ if ( (lpLVItem->mask == LVIF_STATE) && (lpLVItem->stateMask == LVIS_FOCUSED) && !(infoPtr->uCallbackMask & LVIS_FOCUSED) ) { - lpLVItem->state = 0; - if (infoPtr->nFocusedItem == lpLVItem->iItem) - lpLVItem->state |= LVIS_FOCUSED; - return TRUE; + lpLVItem->state = 0; + if (infoPtr->nFocusedItem == lpLVItem->iItem && isubitem == 0) + lpLVItem->state |= LVIS_FOCUSED; + return TRUE; } ZeroMemory(&dispInfo, sizeof(dispInfo)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8efd3dab69..18e874a00f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6152,16 +6152,17 @@ static void test_state_image(void) insert_column(hwnd, 0); insert_column(hwnd, 1); - item.mask = LVIF_TEXT; + item.mask = LVIF_TEXT | LVIF_PARAM; item.iItem = 0; item.iSubItem = 0; item.pszText = text; + item.lParam = 123456; r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(r == 0, "Failed to insert an item.\n"); item.mask = LVIF_STATE; - item.state = INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.state = INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED | LVIS_FOCUSED; item.iItem = 0; item.iSubItem = 0; r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); @@ -6174,27 +6175,49 @@ static void test_state_image(void) r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); ok(r, "Failed to set subitem text.\n"); - item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.mask = LVIF_STATE | LVIF_PARAM; + item.stateMask = ~0u; item.state = 0; item.iItem = 0; item.iSubItem = 0; + item.lParam = 0; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); ok(r, "Failed to get item state.\n"); - ok(item.state == (INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED), "Unexpected item state %#x.\n", item.state); + ok(item.state == (INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED | LVIS_FOCUSED), + "Unexpected item state %#x.\n", item.state); + ok(item.lParam == 123456, "Unexpected lParam %ld.\n", item.lParam); - item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.mask = 0; + item.stateMask = ~0u; item.state = INDEXTOSTATEIMAGEMASK(2); item.iItem = 0; item.iSubItem = 1; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); ok(r, "Failed to get subitem state.\n"); - todo_wine + ok(item.state == INDEXTOSTATEIMAGEMASK(2), "Unexpected state %#x.\n", item.state); + + item.mask = LVIF_STATE | LVIF_PARAM; + item.stateMask = ~0u; + item.state = INDEXTOSTATEIMAGEMASK(2); + item.iItem = 0; + item.iSubItem = 1; + item.lParam = 0; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); + ok(item.state == 0, "Unexpected state %#x.\n", item.state); + ok(item.lParam == 123456, "Unexpected lParam %ld.\n", item.lParam); + + item.mask = LVIF_STATE; + item.stateMask = LVIS_FOCUSED; + item.state = 0; + item.iItem = 0; + item.iSubItem = 1; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); ok(item.state == 0, "Unexpected state %#x.\n", item.state); item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.stateMask = ~0u; item.state = INDEXTOSTATEIMAGEMASK(2); item.iItem = 0; item.iSubItem = 2; -- 2.15.1

1 0

[PATCH] shell32: Reduce code duplication in GetCommandString()
by Nikolay Sivov 21 Jan '18

21 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shlview_cmenu.c | 167 ++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 99 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 5c5ba1b002..3f09413f61 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -471,111 +471,80 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( return S_OK; } -static HRESULT WINAPI ItemMenu_GetCommandString( - IContextMenu3 *iface, - UINT_PTR idCommand, - UINT uFlags, - UINT* lpReserved, - LPSTR lpszName, - UINT uMaxNameLen) +static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR cmdid, UINT flags, + UINT *reserved, LPSTR name, UINT maxlen) { - ContextMenu *This = impl_from_IContextMenu3(iface); - HRESULT hr = E_INVALIDARG; + static const WCHAR openW[] = {'o','p','e','n',0}; + static const WCHAR exploreW[] = {'e','x','p','l','o','r','e',0}; + static const WCHAR cutW[] = {'c','u','t',0}; + static const WCHAR copyW[] = {'c','o','p','y',0}; + static const WCHAR linkW[] = {'l','i','n','k',0}; + static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; + static const WCHAR propertiesW[] = {'p','r','o','p','e','r','t','i','e','s',0}; + static const WCHAR renameW[] = {'r','e','n','a','m','e',0}; + ContextMenu *This = impl_from_IContextMenu3(iface); + const WCHAR *cmdW = NULL; + HRESULT hr = S_OK; - TRACE("(%p)->(%lx flags=%x %p name=%p len=%x)\n", This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + TRACE("(%p)->(%lx, %#x, %p, %p, %u)\n", This, cmdid, flags, reserved, name, maxlen); - switch(uFlags) - { - case GCS_HELPTEXTA: - case GCS_HELPTEXTW: - hr = E_NOTIMPL; - break; + switch (flags) + { + case GCS_HELPTEXTA: + case GCS_HELPTEXTW: + hr = E_NOTIMPL; + break; + + case GCS_VERBA: + case GCS_VERBW: + switch (cmdid) + { + case FCIDM_SHVIEW_OPEN: + cmdW = openW; + break; + case FCIDM_SHVIEW_EXPLORE: + cmdW = exploreW; + break; + case FCIDM_SHVIEW_CUT: + cmdW = cutW; + break; + case FCIDM_SHVIEW_COPY: + cmdW = copyW; + break; + case FCIDM_SHVIEW_CREATELINK: + cmdW = linkW; + break; + case FCIDM_SHVIEW_DELETE: + cmdW = deleteW; + break; + case FCIDM_SHVIEW_PROPERTIES: + cmdW = propertiesW; + break; + case FCIDM_SHVIEW_RENAME: + cmdW = renameW; + break; + } - case GCS_VERBA: - switch(idCommand) - { - case FCIDM_SHVIEW_OPEN: - strcpy(lpszName, "open"); - hr = S_OK; - break; - case FCIDM_SHVIEW_EXPLORE: - strcpy(lpszName, "explore"); - hr = S_OK; - break; - case FCIDM_SHVIEW_CUT: - strcpy(lpszName, "cut"); - hr = S_OK; - break; - case FCIDM_SHVIEW_COPY: - strcpy(lpszName, "copy"); - hr = S_OK; - break; - case FCIDM_SHVIEW_CREATELINK: - strcpy(lpszName, "link"); - hr = S_OK; - break; - case FCIDM_SHVIEW_DELETE: - strcpy(lpszName, "delete"); - hr = S_OK; - break; - case FCIDM_SHVIEW_PROPERTIES: - strcpy(lpszName, "properties"); - hr = S_OK; - break; - case FCIDM_SHVIEW_RENAME: - strcpy(lpszName, "rename"); - hr = S_OK; - break; - } - break; + if (!cmdW) + { + hr = E_INVALIDARG; + break; + } - /* NT 4.0 with IE 3.0x or no IE will always call This with GCS_VERBW. In This - case, you need to do the lstrcpyW to the pointer passed.*/ - case GCS_VERBW: - switch(idCommand) - { - case FCIDM_SHVIEW_OPEN: - MultiByteToWideChar(CP_ACP, 0, "open", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_EXPLORE: - MultiByteToWideChar(CP_ACP, 0, "explore", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_CUT: - MultiByteToWideChar(CP_ACP, 0, "cut", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_COPY: - MultiByteToWideChar(CP_ACP, 0, "copy", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_CREATELINK: - MultiByteToWideChar(CP_ACP, 0, "link", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_DELETE: - MultiByteToWideChar(CP_ACP, 0, "delete", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_PROPERTIES: - MultiByteToWideChar(CP_ACP, 0, "properties", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_RENAME: - MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); - hr = S_OK; - break; - } - break; + if (flags == GCS_VERBA) + WideCharToMultiByte(CP_ACP, 0, cmdW, -1, name, maxlen, NULL, NULL); + else + lstrcpynW((WCHAR *)name, cmdW, maxlen); - case GCS_VALIDATEA: - case GCS_VALIDATEW: - hr = S_OK; - break; - } - TRACE("-- (%p)->(name=%s)\n", This, lpszName); - return hr; + TRACE("name %s\n", flags == GCS_VERBA ? debugstr_a(name) : debugstr_w((WCHAR *)name)); + break; + + case GCS_VALIDATEA: + case GCS_VALIDATEW: + break; + } + + return hr; } /************************************************************************** -- 2.15.1

1 0