November 2018 - Wine-commits

Alex Henrie : ntdll: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 39a06185e1921d36d0f1512356944779f693e47d URL: https://source.winehq.org/git/wine.git/?a=commit;h=39a06185e1921d36d0f15123… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 18 00:58:32 2018 -0600 ntdll: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bca3ec9fd9ff55e191c11dfe2525aa6af160d162) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ca08f9d..4494b92 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1662,7 +1662,7 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) * NOTES * This call does not SetLastError(). */ -PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) +void * WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) { ARENA_FREE *pArena; ARENA_INUSE *pInUse; @@ -1747,7 +1747,7 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) * Success: TRUE, if ptr is NULL or was freed successfully. * Failure: FALSE. */ -BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr ) +BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE heap, ULONG flags, void *ptr ) { ARENA_INUSE *pInUse; SUBHEAP *subheap;

1 0

Alex Henrie : oleaut32: Add DECLSPEC_HOTPATCH to functions patched by MS Word 2010.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 40f1ff65e1408708f5a3f4dfbe151fee770bd4df URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f1ff65e1408708f5a3f4df… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 18 00:58:59 2018 -0600 oleaut32: Add DECLSPEC_HOTPATCH to functions patched by MS Word 2010. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1e8c62b0209977aeb74e52c874dff53313117a63) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/variant.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index d03893a..608446d 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -272,7 +272,7 @@ static inline IMalloc *get_malloc(void) * See BSTR. * str may be NULL, in which case this function does nothing. */ -void WINAPI SysFreeString(BSTR str) +void WINAPI DECLSPEC_HOTPATCH SysFreeString(BSTR str) { bstr_cache_entry_t *cache_entry; bstr_t *bstr; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b9cf4b0..9c97ab3 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -648,7 +648,7 @@ HRESULT VARIANT_ClearInd(VARIANTARG *pVarg) * Success: S_OK. Any previous value in pVarg is freed and its type is set to VT_EMPTY. * Failure: DISP_E_BADVARTYPE, if the variant is not a valid variant type. */ -HRESULT WINAPI VariantClear(VARIANTARG* pVarg) +HRESULT WINAPI DECLSPEC_HOTPATCH VariantClear(VARIANTARG* pVarg) { HRESULT hres; @@ -962,8 +962,8 @@ VariantCopyInd_Return: * The LCID used for the conversion is LOCALE_USER_DEFAULT. * See VariantChangeTypeEx. */ -HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, - USHORT wFlags, VARTYPE vt) +HRESULT WINAPI DECLSPEC_HOTPATCH VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, + USHORT wFlags, VARTYPE vt) { return VariantChangeTypeEx( pvargDest, pvargSrc, LOCALE_USER_DEFAULT, wFlags, vt ); }

1 0

Alex Henrie : msvcrt: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 9d787e8203fd01edd9eeddcb709072c8ba4b07de URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d787e8203fd01edd9eeddcb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 18 00:58:21 2018 -0600 msvcrt: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b917cc66f4f7b786e7f19f63ab0c0819a5455222) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/heap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 7ea80a3..b4f11d8 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -21,6 +21,7 @@ * handler and non atomic heap operations */ +#include "config.h" #include "msvcrt.h" #include "mtdll.h" #include "wine/debug.h" @@ -127,7 +128,7 @@ static MSVCRT_size_t msvcrt_heap_size(void *ptr) /********************************************************************* * ??2(a)YAPAXI@Z (MSVCRT.@) */ -void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_operator_new(MSVCRT_size_t size) { void *retval; int freed; @@ -169,7 +170,7 @@ void* CDECL MSVCRT_operator_new_dbg(MSVCRT_size_t size, int type, const char *fi /********************************************************************* * ??3(a)YAXPAX@Z (MSVCRT.@) */ -void CDECL MSVCRT_operator_delete(void *mem) +void CDECL DECLSPEC_HOTPATCH MSVCRT_operator_delete(void *mem) { TRACE("(%p)\n", mem); msvcrt_heap_free(mem); @@ -394,7 +395,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs /********************************************************************* * calloc (MSVCRT.@) */ -void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) { MSVCRT_size_t bytes = count*size; @@ -420,7 +421,7 @@ void* CDECL _calloc_base(MSVCRT_size_t count, MSVCRT_size_t size) /********************************************************************* * free (MSVCRT.@) */ -void CDECL MSVCRT_free(void* ptr) +void CDECL DECLSPEC_HOTPATCH MSVCRT_free(void* ptr) { msvcrt_heap_free(ptr); } @@ -459,7 +460,7 @@ void* CDECL _malloc_base(MSVCRT_size_t size) /********************************************************************* * realloc (MSVCRT.@) */ -void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_realloc(void* ptr, MSVCRT_size_t size) { if (!ptr) return MSVCRT_malloc(size); if (size) return msvcrt_heap_realloc(0, ptr, size);

1 0

Alex Henrie : oleaut32: Add DECLSPEC_HOTPATCH to SysAllocStringByteLen.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 2fd00842939e36df8e58c528e913071a22358f07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fd00842939e36df8e58c528… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 2 21:30:45 2018 -0600 oleaut32: Add DECLSPEC_HOTPATCH to SysAllocStringByteLen. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 72c2af3868bd68419a0f43c3ce2d8b606cb228ca) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/oleaut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 608446d..f9a4aca 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -429,7 +429,7 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) * without checking for a terminating NUL. * See BSTR. */ -BSTR WINAPI SysAllocStringByteLen(LPCSTR str, UINT len) +BSTR WINAPI DECLSPEC_HOTPATCH SysAllocStringByteLen(LPCSTR str, UINT len) { bstr_t *bstr;

1 0

Henri Verbeet : wined3d: Add GPU information for NVIDIA GeForce GT 720.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 3feda1651203552d73cfd98ecb0da4c0c1754ccf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3feda1651203552d73cfd98e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 22:13:38 2018 +0330 wined3d: Add GPU information for NVIDIA GeForce GT 720. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 55d4f63164fc1c8c4b2b5170620ded566b69acb4) Conflicts: dlls/wined3d/adapter_gl.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e8b2607..5d3f85e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1360,6 +1360,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT720, "NVIDIA GeForce GT 720", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -2314,6 +2315,7 @@ cards_nvidia_mesa[] = {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ {"NV108", CARD_NVIDIA_GEFORCE_GT740M}, + {"NV106", CARD_NVIDIA_GEFORCE_GT720}, {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b8a3788..56b0f90 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2361,6 +2361,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX675MX = 0x11a7, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, + CARD_NVIDIA_GEFORCE_GT720 = 0x128b, CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT740M = 0x1292,

1 0

Zhiyi Zhang : crypt32/tests: Add revocation flags tests for CertGetCertificateChain().
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: aae9440b60159d5fbc5ab526d68df0c1004813dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae9440b60159d5fbc5ab526… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 22 14:52:55 2018 +0800 crypt32/tests: Add revocation flags tests for CertGetCertificateChain(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 01262515b433669ab621b9cf9b3ae01c7c02b2e8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/tests/chain.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 0839fc7..5a6ca54 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4148,6 +4148,26 @@ static void testGetCertChain(void) pCertFreeCertificateChain(chain); + /* Test revocation flags */ + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_END_CERT, NULL, + &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + todo_wine ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, + NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + /* Test HCCE_LOCAL_MACHINE */ ret = CertGetCertificateChain(HCCE_LOCAL_MACHINE, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError());

1 0

Zhiyi Zhang : crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 41e0338f59d09f4f7a21450c3083dcbc3d152527 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e0338f59d09f4f7a21450c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 22 14:54:00 2018 +0800 crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN. Original patch by Michael Müller. Root certificates don't have CRL Distribution Point or Authority Info Access field. Don't report error with CERT_CHAIN_REVOCATION_CHECK_CHAIN in CertGetCertificateChain() because of this. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a1e2c7fd2f7c4fb5377a0528bfcb03b3813747aa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/chain.c | 5 +++++ dlls/crypt32/tests/chain.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index aab2e91..e98e542 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2708,6 +2708,11 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certToCheck, revocationFlags, &revocationPara, &revocationStatus); + + if (!ret && chainFlags & CERT_CHAIN_REVOCATION_CHECK_CHAIN + && revocationStatus.dwError == CRYPT_E_NO_REVOCATION_CHECK && revocationPara.pIssuerCert == NULL) + ret = TRUE; + if (!ret) { PCERT_CHAIN_ELEMENT element = CRYPT_FindIthElementInChain( diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 5a6ca54..d4d18a5 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4157,9 +4157,9 @@ static void testGetCertChain(void) ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); - todo_wine ok(!chain->TrustStatus.dwErrorStatus - || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ - "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); pCertFreeCertificateChain(chain); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT,

1 0

Gabriel Ivăncescu : shell32/autocomplete: Don' t crash when there's another AutoComplete object on the same edit control.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: ca9c9809f1dd93b7fbc393f367842532cf1b35b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca9c9809f1dd93b7fbc393f3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 27 20:10:46 2018 +0300 shell32/autocomplete: Don't crash when there's another AutoComplete object on the same edit control. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22333 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9c2217216cbf9a56a5090c848119d84fac9b65ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/autocomplete.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 1a02c83..d804e42 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -93,6 +93,14 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoCompleteDropDown_iface); } +static void destroy_autocomplete_object(IAutoCompleteImpl *ac) +{ + ac->hwndEdit = NULL; + if (ac->hwndListBox) + DestroyWindow(ac->hwndListBox); + IAutoComplete2_Release(&ac->IAutoComplete2_iface); +} + /* Window procedure for autocompletion */ @@ -277,10 +285,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, RemovePropW(hwnd, autocomplete_propertyW); SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)proc); - This->hwndEdit = NULL; - if (This->hwndListBox) - DestroyWindow(This->hwndListBox); - IAutoComplete2_Release(&This->IAutoComplete2_iface); + destroy_autocomplete_object(This); return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam); } default: @@ -435,7 +440,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete) { - IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); + IAutoCompleteImpl *prev, *This = impl_from_IAutoComplete2(iface); TRACE("(%p)->(%p, %p, %s, %s)\n", This, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); @@ -462,10 +467,22 @@ static HRESULT WINAPI IAutoComplete2_fnInit( This->initialized = TRUE; This->hwndEdit = hwndEdit; - This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); - /* Keep at least one reference to the object until the edit window is destroyed. */ + + /* If another AutoComplete object was previously assigned to this edit control, + release it but keep the same callback on the control, to avoid an infinite + recursive loop in ACEditSubclassProc while the property is set to this object */ + prev = GetPropW(hwndEdit, autocomplete_propertyW); + SetPropW(hwndEdit, autocomplete_propertyW, This); + + if (prev && prev->initialized) { + This->wpOrigEditProc = prev->wpOrigEditProc; + destroy_autocomplete_object(prev); + } + else + This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); + + /* Keep at least one reference to the object until the edit window is destroyed */ IAutoComplete2_AddRef(&This->IAutoComplete2_iface); - SetPropW( hwndEdit, autocomplete_propertyW, This ); if (This->options & ACO_AUTOSUGGEST) create_listbox(This);

1 0

Józef Kucia : wined3d: Allow copying between different texture types.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 7a325e567b5f879b39d4005b759b4ab2879cd2a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a325e567b5f879b39d4005b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 11:09:51 2018 +0200 wined3d: Allow copying between different texture types. 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> (cherry picked from commit 2aa5b0011a657cd99690783b0c02491105ee799a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a25b98d..d5c12b8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4089,14 +4089,6 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - if (src_resource->type != dst_resource->type) - { - WARN("Resource types (%s / %s) don't match.\n", - debug_d3dresourcetype(dst_resource->type), - debug_d3dresourcetype(src_resource->type)); - return WINED3DERR_INVALIDCALL; - } - if (src_resource->format->typeless_id != dst_resource->format->typeless_id || (!src_resource->format->typeless_id && src_resource->format->id != dst_resource->format->id)) { @@ -4108,6 +4100,14 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev if (dst_resource->type == WINED3D_RTYPE_BUFFER) { + if (src_resource->type != WINED3D_RTYPE_BUFFER) + { + WARN("Resource types (%s / %s) don't match.\n", + debug_d3dresourcetype(dst_resource->type), + debug_d3dresourcetype(src_resource->type)); + return WINED3DERR_INVALIDCALL; + } + if (dst_sub_resource_idx) { WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx);

1 0

Alistair Leslie-Hughes : wininet: Always copy the password even if blank.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 870e94d19733c5fc0666ea08d3acf9e2af4973d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=870e94d19733c5fc0666ea08… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Aug 5 11:06:58 2018 +0000 wininet: Always copy the password even if blank. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6552ddaaa5c189db504e81a2360bbf4b2f6325a0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 79f7df1..a7e67d4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5814,8 +5814,7 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, session->hostName = heap_strdupW(lpszServerName); if (lpszUserName && lpszUserName[0]) session->userName = heap_strdupW(lpszUserName); - if (lpszPassword && lpszPassword[0]) - session->password = heap_strdupW(lpszPassword); + session->password = heap_strdupW(lpszPassword); session->hostPort = serverPort; session->connect_timeout = hIC->connect_timeout; session->send_timeout = 0;

1 0