September 2021 - Wine-commits

Esme Povirk : mscoree: Update Wine Mono to 6.4.0.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: e6513521ff8b81ba838bb96d10fb20c64c1c2306 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6513521ff8b81ba838bb96d… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Sep 17 10:59:58 2021 -0500 mscoree: Update Wine Mono to 6.4.0. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index dda94d34e1a..7ef7ca312ae 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.3.0" +#define MONO_VERSION "6.4.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0" +#define MONO_SHA "db8b85f3b910590f61adbfa0005a995d613e299a1cc73d00553d70dc81010e36" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 985cdeff770..04844c8da69 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.3.0" +#define WINE_MONO_VERSION "6.4.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Hans Leidekker : adsldp: Fix error returned from openobj_OpenDSObject().
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 3370d24917b2545a8e580ebcb6da5e9a1fd5e83f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3370d24917b2545a8e580ebc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 17 13:09:14 2021 +0200 adsldp: Fix error returned from openobj_OpenDSObject(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 701f27cd969..3d5ea29882c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -990,7 +990,7 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B err = DsGetDcNameW(NULL, NULL, NULL, NULL, DS_RETURN_DNS_NAME, &dcinfo); if (err != ERROR_SUCCESS) { - hr = HRESULT_FROM_WIN32(LdapGetLastError()); + hr = HRESULT_FROM_WIN32(err); goto fail; }

1 0

Nikolay Sivov : oleaut32/tests: Remove unused variable.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 3c7b0e8d85985aee5d5c51c97f46b7d5c33c13f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c7b0e8d85985aee5d5c51c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 17 14:12:48 2021 +0300 oleaut32/tests: Remove unused variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 4e9a8baeca0..1e75a93ebce 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -30,9 +30,6 @@ #include "tmarshal.h" -static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); - - #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) static inline void release_iface_(unsigned int line, void *iface) { @@ -3747,8 +3744,6 @@ static void test_marshal_dispinterface(void) START_TEST(tmarshal) { HRESULT hr; - HANDLE hOleaut32 = GetModuleHandleA("oleaut32.dll"); - pVarAdd = (void*)GetProcAddress(hOleaut32, "VarAdd"); CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);

1 0

Nikolay Sivov : oleaut32/tests: Link to SafeArrayGetVartype() directly.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 5b04eacfa9f39f0f52ec4a86f82ddfed670f1f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b04eacfa9f39f0f52ec4a86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 17 14:12:50 2021 +0300 oleaut32/tests: Link to SafeArrayGetVartype() directly. It was already available on XP. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 78 +++++++++++----------------------------- 1 file changed, 21 insertions(+), 57 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 4fc26f33c63..92d0da3403b 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -36,14 +36,12 @@ # define V_U2(A) (*(A)) #endif -static HRESULT (WINAPI *pSafeArrayGetVartype)(SAFEARRAY*,VARTYPE*); - static inline SF_TYPE get_union_type(SAFEARRAY *psa) { VARTYPE vt; HRESULT hr; - hr = pSafeArrayGetVartype(psa, &vt); + hr = SafeArrayGetVartype(psa, &vt); if (FAILED(hr)) { if(psa->fFeatures & FADF_VARIANT) return SF_VARIANT; @@ -131,10 +129,7 @@ static void check_safearray(void *buffer, LPSAFEARRAY lpsa) return; } - if (!pSafeArrayGetVartype) - return; - - if(FAILED(pSafeArrayGetVartype(lpsa, &vt))) + if(FAILED(SafeArrayGetVartype(lpsa, &vt))) vt = 0; sftype = get_union_type(lpsa); @@ -266,12 +261,9 @@ static void test_marshal_LPSAFEARRAY(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserUnmarshal(&umcb.Flags, buffer, &lpsa2); ok(lpsa2 != NULL, "LPSAFEARRAY didn't unmarshal\n"); - if (pSafeArrayGetVartype) - { - pSafeArrayGetVartype(lpsa, &vt); - pSafeArrayGetVartype(lpsa2, &vt2); - ok(vt == vt2, "vts differ %x %x\n", vt, vt2); - } + SafeArrayGetVartype(lpsa, &vt); + SafeArrayGetVartype(lpsa2, &vt2); + ok(vt == vt2, "vts differ %x %x\n", vt, vt2); ok(lpsa2->cLocks == 0, "got lock count %u, expected 0\n", lpsa2->cLocks); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); @@ -313,12 +305,9 @@ static void test_marshal_LPSAFEARRAY(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserUnmarshal(&umcb.Flags, buffer, &lpsa2); ok(lpsa2 != NULL, "LPSAFEARRAY didn't unmarshal\n"); - if (pSafeArrayGetVartype) - { - pSafeArrayGetVartype(lpsa, &vt); - pSafeArrayGetVartype(lpsa2, &vt2); - ok(vt == vt2, "vts differ %x %x\n", vt, vt2); - } + SafeArrayGetVartype(lpsa, &vt); + SafeArrayGetVartype(lpsa2, &vt2); + ok(vt == vt2, "vts differ %x %x\n", vt, vt2); ok(lpsa2->cLocks == 0, "got lock count %u, expected 0\n", lpsa2->cLocks); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); @@ -387,12 +376,8 @@ static void test_marshal_LPSAFEARRAY(void) lpsa->rgsabound[0].cElements = 48; hr = SafeArrayAllocData(lpsa); ok(hr == S_OK, "saad failed %08x\n", hr); - - if (pSafeArrayGetVartype) - { - hr = pSafeArrayGetVartype(lpsa, &vt); - ok(hr == E_INVALIDARG, "ret %08x\n", hr); - } + hr = SafeArrayGetVartype(lpsa, &vt); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); @@ -496,12 +481,8 @@ static void test_marshal_LPSAFEARRAY(void) lpsa->rgsabound[0].cElements = 48; hr = SafeArrayAllocData(lpsa); ok(hr == S_OK, "saad failed %08x\n", hr); - - if (pSafeArrayGetVartype) - { - hr = pSafeArrayGetVartype(lpsa, &vt); - ok(hr == E_INVALIDARG, "ret %08x\n", hr); - } + hr = SafeArrayGetVartype(lpsa, &vt); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); @@ -1321,12 +1302,9 @@ static void test_marshal_VARIANT(void) SafeArrayGetUBound(V_ARRAY(&v), 1, &bound); SafeArrayGetUBound(V_ARRAY(&v2), 1, &bound2); ok(bound == bound2, "array ubounds differ\n"); - if (pSafeArrayGetVartype) - { - pSafeArrayGetVartype(V_ARRAY(&v), &vt); - pSafeArrayGetVartype(V_ARRAY(&v2), &vt2); - ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); - } + SafeArrayGetVartype(V_ARRAY(&v), &vt); + SafeArrayGetVartype(V_ARRAY(&v2), &vt2); + ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1363,12 +1341,9 @@ static void test_marshal_VARIANT(void) SafeArrayGetUBound(*V_ARRAYREF(&v), 1, &bound); SafeArrayGetUBound(*V_ARRAYREF(&v2), 1, &bound2); ok(bound == bound2, "array ubounds differ\n"); - if (pSafeArrayGetVartype) - { - pSafeArrayGetVartype(*V_ARRAYREF(&v), &vt); - pSafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); - ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); - } + SafeArrayGetVartype(*V_ARRAYREF(&v), &vt); + SafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); + ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1413,12 +1388,9 @@ static void test_marshal_VARIANT(void) SafeArrayGetUBound(*V_ARRAYREF(&v), 1, &bound); SafeArrayGetUBound(*V_ARRAYREF(&v2), 1, &bound2); ok(bound == bound2, "array ubounds differ\n"); - if (pSafeArrayGetVartype) - { - pSafeArrayGetVartype(*V_ARRAYREF(&v), &vt); - pSafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); - ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); - } + SafeArrayGetVartype(*V_ARRAYREF(&v), &vt); + SafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); + ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); lpsa2->fFeatures &= ~FADF_STATIC; hr = SafeArrayDestroy(*V_ARRAYREF(&v2)); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1608,14 +1580,6 @@ todo_wine START_TEST(usrmarshal) { - HANDLE hOleaut32 = GetModuleHandleA("oleaut32.dll"); -#define GETPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func) - GETPTR(SafeArrayGetVartype); -#undef GETPTR - - if (!pSafeArrayGetVartype) - win_skip("SafeArrayGetVartype is not available, some tests will be skipped\n"); - CoInitialize(NULL); test_marshal_LPSAFEARRAY();

1 0

Nikolay Sivov : oleaut32: Use single local variable to access missing args array in Invoke().
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 3b2db03d2d38ece7196a37c556966a946d1ad152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b2db03d2d38ece7196a37c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 17 14:12:51 2021 +0300 oleaut32: Use single local variable to access missing args array in Invoke(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ac326afe1a1..fb49cd303fe 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7273,6 +7273,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( VARIANTARG **prgpvarg = INVBUF_GET_ARG_PTR_ARRAY(buffer, func_desc->cParams); VARIANTARG *rgvarg = INVBUF_GET_ARG_ARRAY(buffer, func_desc->cParams); VARTYPE *rgvt = INVBUF_GET_ARG_TYPE_ARRAY(buffer, func_desc->cParams); + VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); UINT cNamedArgs = pDispParams->cNamedArgs; DISPID *rgdispidNamedArgs = pDispParams->rgdispidNamedArgs; UINT vargs_converted=0; @@ -7387,7 +7388,6 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( V_VARIANTREF(&rgvarg[i]) = V_VARIANTREF(src_arg); else { - VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); if (wParamFlags & PARAMFLAG_FIN) hres = VariantCopy(&missing_arg[i], src_arg); V_VARIANTREF(&rgvarg[i]) = &missing_arg[i]; @@ -7430,7 +7430,6 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) { - VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); if (wParamFlags & PARAMFLAG_FIN) hres = VariantChangeType(&missing_arg[i], src_arg, 0, rgvt[i] & ~VT_BYREF); else @@ -7500,20 +7499,22 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } else { - VARIANTARG *missing_arg; /* if the function wants a pointer to a variant then * set that up, otherwise just pass the VT_ERROR in * the argument by value */ if (rgvt[i] & VT_BYREF) { - missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams) + i; + V_VT(&missing_arg[i]) = VT_ERROR; + V_ERROR(&missing_arg[i]) = DISP_E_PARAMNOTFOUND; + V_VT(arg) = VT_VARIANT | VT_BYREF; - V_VARIANTREF(arg) = missing_arg; + V_VARIANTREF(arg) = &missing_arg[i]; } else - missing_arg = arg; - V_VT(missing_arg) = VT_ERROR; - V_ERROR(missing_arg) = DISP_E_PARAMNOTFOUND; + { + V_VT(arg) = VT_ERROR; + V_ERROR(arg) = DISP_E_PARAMNOTFOUND; + } } } else @@ -7544,7 +7545,6 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( for (i = 0; i < func_desc->cParams; i++) { USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; - VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); if (wParamFlags & PARAMFLAG_FLCID) continue;

1 0

Nikolay Sivov : oleaut32: Remove unnecessary initialization of retval arg slot in Invoke().
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 93a4fd5887a348ee9d6a887bad6247a27ddadfd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a4fd5887a348ee9d6a887b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 17 14:12:52 2021 +0300 oleaut32: Remove unnecessary initialization of retval arg slot in Invoke(). Whole argument buffer is already zero-initialized. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index fb49cd303fe..5c5aca63538 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7361,7 +7361,6 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( { VARIANTARG *arg; arg = prgpvarg[i] = &rgvarg[i]; - memset(arg, 0, sizeof(*arg)); V_VT(arg) = rgvt[i]; memset(&retval, 0, sizeof(retval)); V_BYREF(arg) = &retval;

1 0

Nikolay Sivov : oleaut32: Remove some local variables in Invoke() that don't improve readability.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 82f71d8bbef0e81a8d8e67b3ac5d5dd549336e91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82f71d8bbef0e81a8d8e67b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 17 14:12:53 2021 +0300 oleaut32: Remove some local variables in Invoke() that don't improve readability. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5c5aca63538..70f15679811 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7269,7 +7269,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( case FUNC_VIRTUAL: { void *buffer = heap_alloc_zero(INVBUF_ELEMENT_SIZE * func_desc->cParams); VARIANT varresult; - VARIANT retval; /* pointer for storing byref retvals in */ + VARIANT retval = {{{0}}}; /* pointer for storing byref retvals in */ VARIANTARG **prgpvarg = INVBUF_GET_ARG_PTR_ARRAY(buffer, func_desc->cParams); VARIANTARG *rgvarg = INVBUF_GET_ARG_ARRAY(buffer, func_desc->cParams); VARTYPE *rgvt = INVBUF_GET_ARG_TYPE_ARRAY(buffer, func_desc->cParams); @@ -7315,10 +7315,9 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( if (wParamFlags & PARAMFLAG_FLCID) { - VARIANTARG *arg; - arg = prgpvarg[i] = &rgvarg[i]; - V_VT(arg) = VT_I4; - V_I4(arg) = This->pTypeLib->lcid; + prgpvarg[i] = &rgvarg[i]; + V_VT(prgpvarg[i]) = VT_I4; + V_I4(prgpvarg[i]) = This->pTypeLib->lcid; continue; } @@ -7359,11 +7358,9 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( * native does */ if (i == func_desc->cParams - 1) { - VARIANTARG *arg; - arg = prgpvarg[i] = &rgvarg[i]; - V_VT(arg) = rgvt[i]; - memset(&retval, 0, sizeof(retval)); - V_BYREF(arg) = &retval; + prgpvarg[i] = &rgvarg[i]; + V_BYREF(prgpvarg[i]) = &retval; + V_VT(prgpvarg[i]) = rgvt[i]; } else {

1 0

Nikolay Sivov : mfplat/allocator: Reduce duplication by returning ready-to-queue structure from allocation helper.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 12f72681da3ab4a8499233fc4b9e244a1ea3f311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f72681da3ab4a8499233fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 17 14:15:41 2021 +0300 mfplat/allocator: Reduce duplication by returning ready-to-queue structure from allocation helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 53 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index d99e2b046a6..04c68c87199 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -1305,20 +1305,18 @@ static void sample_allocator_release_surface_service(struct sample_allocator *al } static HRESULT sample_allocator_allocate_sample(struct sample_allocator *allocator, const struct surface_service *service, - IMFSample **sample) + struct queued_sample **queued_sample) { - struct queued_sample *queued_sample = malloc(sizeof(*queued_sample)); IMFTrackedSample *tracked_sample; IMFMediaBuffer *buffer; + IMFSample *sample; unsigned int i; HRESULT hr; if (FAILED(hr = MFCreateTrackedSample(&tracked_sample))) - { return hr; - } - IMFTrackedSample_QueryInterface(tracked_sample, &IID_IMFSample, (void **)sample); + IMFTrackedSample_QueryInterface(tracked_sample, &IID_IMFSample, (void **)&sample); IMFTrackedSample_Release(tracked_sample); for (i = 0; i < allocator->frame_desc.buffer_count; ++i) @@ -1369,11 +1367,24 @@ static HRESULT sample_allocator_allocate_sample(struct sample_allocator *allocat if (SUCCEEDED(hr)) { - hr = IMFSample_AddBuffer(*sample, buffer); + hr = IMFSample_AddBuffer(sample, buffer); IMFMediaBuffer_Release(buffer); } } + if (FAILED(hr)) + { + IMFSample_Release(sample); + return hr; + } + + if (!(*queued_sample = malloc(sizeof(**queued_sample)))) + { + IMFSample_Release(sample); + return E_OUTOFMEMORY; + } + (*queued_sample)->sample = sample; + return hr; } @@ -1381,11 +1392,11 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u unsigned int max_sample_count, IMFAttributes *attributes, IMFMediaType *media_type) { struct surface_service service; + struct queued_sample *sample; DXGI_FORMAT dxgi_format; unsigned int i, value; GUID major, subtype; UINT64 frame_size; - IMFSample *sample; D3D11_USAGE usage; HRESULT hr; @@ -1458,13 +1469,9 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u for (i = 0; i < sample_count; ++i) { - struct queued_sample *queued_sample; - if (SUCCEEDED(hr = sample_allocator_allocate_sample(allocator, &service, &sample))) { - queued_sample = malloc(sizeof(*queued_sample)); - queued_sample->sample = sample; - list_add_tail(&allocator->free_samples, &queued_sample->entry); + list_add_tail(&allocator->free_samples, &sample->entry); allocator->free_sample_count++; } } @@ -1512,7 +1519,7 @@ static HRESULT sample_allocator_track_sample(struct sample_allocator *allocator, static HRESULT WINAPI sample_allocator_AllocateSample(IMFVideoSampleAllocatorEx *iface, IMFSample **out) { struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface); - IMFSample *sample; + struct queued_sample *sample; HRESULT hr; TRACE("%p, %p.\n", iface, out); @@ -1527,9 +1534,9 @@ static HRESULT WINAPI sample_allocator_AllocateSample(IMFVideoSampleAllocatorEx { struct list *head = list_head(&allocator->free_samples); - sample = LIST_ENTRY(head, struct queued_sample, entry)->sample; + sample = LIST_ENTRY(head, struct queued_sample, entry); - if (SUCCEEDED(hr = sample_allocator_track_sample(allocator, sample))) + if (SUCCEEDED(hr = sample_allocator_track_sample(allocator, sample->sample))) { list_remove(head); list_add_tail(&allocator->used_samples, head); @@ -1538,7 +1545,7 @@ static HRESULT WINAPI sample_allocator_AllocateSample(IMFVideoSampleAllocatorEx /* Reference counter is not increased when sample is returned, so next release could trigger tracking condition. This is balanced by incremented reference counter when sample is returned back to the free list. */ - *out = sample; + *out = sample->sample; } } else /* allocator->cold_sample_count != 0 */ @@ -1549,15 +1556,17 @@ static HRESULT WINAPI sample_allocator_AllocateSample(IMFVideoSampleAllocatorEx { if (SUCCEEDED(hr = sample_allocator_allocate_sample(allocator, &service, &sample))) { - if (SUCCEEDED(hr = sample_allocator_track_sample(allocator, sample))) + if (SUCCEEDED(hr = sample_allocator_track_sample(allocator, sample->sample))) { - struct queued_sample *queued_sample = malloc(sizeof(*queued_sample)); - - queued_sample->sample = sample; - list_add_tail(&allocator->used_samples, &queued_sample->entry); + list_add_tail(&allocator->used_samples, &sample->entry); allocator->cold_sample_count--; - *out = queued_sample->sample; + *out = sample->sample; + } + else + { + IMFSample_Release(sample->sample); + free(sample); } }

1 0

Jacek Caban : gdi32: Access stretch mode directly from DC in NtGdiTransparentBlt.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 6b1cdd1b5ee0db822f350ffe95c7579f33a0a851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b1cdd1b5ee0db822f350ffe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 17 13:44:16 2021 +0200 gdi32: Access stretch mode directly from DC in NtGdiTransparentBlt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 83ef949ec3f..cf56f39da4c 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -852,19 +852,22 @@ BOOL WINAPI NtGdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDes COLORREF oldForeground; int oldStretchMode; DIBSECTION dib; + DC *dc_src; if(widthDest < 0 || heightDest < 0 || widthSrc < 0 || heightSrc < 0) { TRACE("Cannot mirror\n"); return FALSE; } + if (!(dc_src = get_dc_ptr( hdcSrc ))) return FALSE; + NtGdiGetAndSetDCDword( hdcDest, NtGdiSetBkColor, RGB(255,255,255), &oldBackground ); NtGdiGetAndSetDCDword( hdcDest, NtGdiSetTextColor, RGB(0,0,0), &oldForeground ); /* Stretch bitmap */ - oldStretchMode = GetStretchBltMode(hdcSrc); - if(oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) - SetStretchBltMode(hdcSrc, COLORONCOLOR); + oldStretchMode = dc_src->attr->stretch_blt_mode; + if (oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) + dc_src->attr->stretch_blt_mode = COLORONCOLOR; hdcWork = NtGdiCreateCompatibleDC( hdcDest ); if ((get_gdi_object_type( hdcDest ) != NTGDI_OBJ_MEMDC || NtGdiExtGetObjectW( NtGdiGetDCObject( hdcDest, NTGDI_OBJ_SURF ), @@ -926,7 +929,8 @@ BOOL WINAPI NtGdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDes ret = TRUE; error: - SetStretchBltMode(hdcSrc, oldStretchMode); + dc_src->attr->stretch_blt_mode = oldStretchMode; + release_dc_ptr( dc_src ); NtGdiGetAndSetDCDword( hdcDest, NtGdiSetBkColor, oldBackground, NULL ); NtGdiGetAndSetDCDword( hdcDest, NtGdiSetTextColor, oldForeground, NULL ); if(hdcWork) {

1 0

Jacek Caban : gdi32: Avoid calling gdi32 functions from ntgdi functions.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 57460dbb5859f1f6285707829d29fe88c73eb978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57460dbb5859f1f628570782… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 17 13:44:30 2021 +0200 gdi32: Avoid calling gdi32 functions from ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/clipping.c | 8 ++++---- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/driver.c | 2 +- dlls/gdi32/palette.c | 2 +- dlls/gdi32/path.c | 10 +++++----- dlls/gdi32/region.c | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 598f738cad1..4fefa834b58 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -133,7 +133,7 @@ static inline void create_default_clip_region( DC * dc ) rect.right = NtGdiGetDeviceCaps( dc->hSelf, DESKTOPHORZRES ); rect.bottom = NtGdiGetDeviceCaps( dc->hSelf, DESKTOPVERTRES ); } - dc->hClipRgn = CreateRectRgnIndirect( &rect ); + dc->hClipRgn = NtGdiCreateRectRgn( rect.left, rect.top, rect.right, rect.bottom ); } @@ -265,7 +265,7 @@ INT WINAPI NtGdiExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bott rect = get_clip_rect( dc, left, top, right, bottom ); - if ((rgn = CreateRectRgnIndirect( &rect ))) + if ((rgn = NtGdiCreateRectRgn( rect.left, rect.top, rect.right, rect.bottom ))) { if (!dc->hClipRgn) create_default_clip_region( dc ); ret = NtGdiCombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_DIFF ); @@ -293,10 +293,10 @@ INT WINAPI NtGdiIntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bo rect = get_clip_rect( dc, left, top, right, bottom ); if (!dc->hClipRgn) { - if ((dc->hClipRgn = CreateRectRgnIndirect( &rect ))) + if ((dc->hClipRgn = NtGdiCreateRectRgn( rect.left, rect.top, rect.right, rect.bottom ))) ret = SIMPLEREGION; } - else if ((rgn = CreateRectRgnIndirect( &rect ))) + else if ((rgn = NtGdiCreateRectRgn( rect.left, rect.top, rect.right, rect.bottom ))) { ret = NtGdiCombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_AND ); NtGdiDeleteObjectApp( rgn ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 9f10f479c2f..db517b89745 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -936,8 +936,8 @@ UINT set_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries, const RGBQUAD if (result) /* update colors of selected objects */ { - SetTextColor( hdc, dc->attr->text_color ); - SetBkColor( hdc, dc->attr->background_color ); + NtGdiGetAndSetDCDword( hdc, NtGdiSetTextColor, dc->attr->text_color, NULL ); + NtGdiGetAndSetDCDword( hdc, NtGdiSetBkColor, dc->attr->background_color, NULL ); NtGdiSelectPen( hdc, dc->hPen ); NtGdiSelectBrush( hdc, dc->hBrush ); } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 75f82fbabe7..ac1a64016a1 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -608,7 +608,7 @@ static INT CDECL nulldrv_GetTextFace( PHYSDEV dev, INT size, LPWSTR name ) LOGFONTW font; DC *dc = get_nulldrv_dc( dev ); - if (GetObjectW( dc->hFont, sizeof(font), &font )) + if (NtGdiExtGetObjectW( dc->hFont, sizeof(font), &font )) { ret = lstrlenW( font.lfFaceName ) + 1; if (name) diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 09959c6d398..2f3fc7dd215 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -158,7 +158,7 @@ HPALETTE WINAPI NtGdiCreateHalftonePalette( HDC hdc ) pal->palPalEntry[i].peBlue = entries[i].rgbBlue; pal->palPalEntry[i].peFlags = 0; } - return CreatePalette( pal ); + return NtGdiCreatePaletteInternal( pal, pal->palNumEntries ); } diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index cc6c6c714c2..9eb0c40665e 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -348,7 +348,7 @@ static HRGN path_to_region( const struct gdi_path *path, int mode ) if (i > pos + 1) counts[polygons++] = i - pos; assert( polygons <= path->count / 2 ); - hrgn = CreatePolyPolygonRgn( path->points, counts, polygons, mode ); + hrgn = create_polypolygon_region( path->points, counts, polygons, mode, NULL ); HeapFree( GetProcessHeap(), 0, counts ); return hrgn; } @@ -1535,7 +1535,7 @@ static BOOL CDECL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, con DWORD dwSize; void *outline; - dwSize = GetGlyphOutlineW(dev->hdc, str[idx], ggo_flags, &gm, 0, NULL, &identity); + dwSize = NtGdiGetGlyphOutline( dev->hdc, str[idx], ggo_flags, &gm, 0, NULL, &identity, FALSE ); if (dwSize == GDI_ERROR) continue; /* add outline only if char is printable */ @@ -1544,7 +1544,7 @@ static BOOL CDECL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, con outline = HeapAlloc(GetProcessHeap(), 0, dwSize); if (!outline) return FALSE; - GetGlyphOutlineW(dev->hdc, str[idx], ggo_flags, &gm, dwSize, outline, &identity); + NtGdiGetGlyphOutline( dev->hdc, str[idx], ggo_flags, &gm, dwSize, outline, &identity, FALSE ); PATH_add_outline(physdev, x + offset.x, y + offset.y, outline, dwSize); HeapFree(GetProcessHeap(), 0, outline); @@ -1618,14 +1618,14 @@ static struct gdi_path *PATH_WidenPath(DC *dc) BYTE *type; DWORD obj_type, joint, endcap, penType; - size = GetObjectW( dc->hPen, 0, NULL ); + size = NtGdiExtGetObjectW( dc->hPen, 0, NULL ); if (!size) { SetLastError(ERROR_CAN_NOT_COMPLETE); return NULL; } elp = HeapAlloc( GetProcessHeap(), 0, size ); - GetObjectW( dc->hPen, size, elp ); + NtGdiExtGetObjectW( dc->hPen, size, elp ); obj_type = get_gdi_object_type(dc->hPen); switch (obj_type) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 757efc0ac1a..44ac1744793 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -927,7 +927,7 @@ HRGN WINAPI NtGdiExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA pt[3].y = pCurRect->bottom; translate( pt, 4, xform ); - poly_hrgn = CreatePolyPolygonRgn( pt, &count, 1, WINDING ); + poly_hrgn = create_polypolygon_region( pt, &count, 1, WINDING, NULL ); NtGdiCombineRgn( hrgn, hrgn, poly_hrgn, RGN_OR ); NtGdiDeleteObjectApp( poly_hrgn ); }

1 0