September 2020 - Wine-commits

Nikolay Sivov : combase: Move CoReleaseMarshalData().
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 1a6afac0e49eaf9eca7295611596e14093670144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a6afac0e49eaf9eca729561… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 1 15:16:30 2020 +0100 combase: Move CoReleaseMarshalData(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/combase_private.h | 2 + dlls/combase/marshal.c | 141 +++++++++++++++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 50 --------------- dlls/ole32/ole32.spec | 2 +- 5 files changed, 145 insertions(+), 52 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 4ac93ff545..e1ffdc8253 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -146,7 +146,7 @@ @ stdcall CoRegisterPSClsid(ptr ptr) @ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate @ stdcall CoRegisterSurrogateEx(ptr ptr) ole32.CoRegisterSurrogateEx -@ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData +@ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() @ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects @ stub CoRetireServer diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 898d42b3c7..cc1c3d3438 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -222,3 +222,5 @@ struct stub_manager * WINAPI get_stub_manager_from_object(struct apartment *apt, void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; ULONG WINAPI stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; ULONG WINAPI stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; +struct stub_manager * WINAPI get_stub_manager(struct apartment *apt, OID oid); +void WINAPI stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak); diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index db5089f013..bfe31ff17d 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -29,6 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +/* private flag indicating that the object was marshaled as table-weak */ +#define SORFP_TABLEWEAK SORF_OXRES1 + struct ftmarshaler { IUnknown IUnknown_inner; @@ -507,3 +510,141 @@ cleanup: return hr; } + +/* Creates an IMarshal* object according to the data marshaled to the stream. + * The function leaves the stream pointer at the start of the data written + * to the stream by the IMarshal* object. + */ +static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, IID *iid) +{ + OBJREF objref; + HRESULT hr; + ULONG res; + + /* read common OBJREF header */ + hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); + if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) + { + ERR("Failed to read common OBJREF header, 0x%08x\n", hr); + return STG_E_READFAULT; + } + + /* sanity check on header */ + if (objref.signature != OBJREF_SIGNATURE) + { + ERR("Bad OBJREF signature 0x%08x\n", objref.signature); + return RPC_E_INVALID_OBJREF; + } + + if (iid) *iid = objref.iid; + + /* FIXME: handler marshaling */ + if (objref.flags & OBJREF_STANDARD) + { + TRACE("Using standard unmarshaling\n"); + *marshal = NULL; + return S_FALSE; + } + else if (objref.flags & OBJREF_CUSTOM) + { + ULONG custom_header_size = FIELD_OFFSET(OBJREF, u_objref.u_custom.pData) - + FIELD_OFFSET(OBJREF, u_objref.u_custom); + TRACE("Using custom unmarshaling\n"); + /* read constant sized OR_CUSTOM data from stream */ + hr = IStream_Read(stream, &objref.u_objref.u_custom, + custom_header_size, &res); + if (hr != S_OK || (res != custom_header_size)) + { + ERR("Failed to read OR_CUSTOM header, 0x%08x\n", hr); + return STG_E_READFAULT; + } + /* now create the marshaler specified in the stream */ + hr = CoCreateInstance(&objref.u_objref.u_custom.clsid, NULL, + CLSCTX_INPROC_SERVER, &IID_IMarshal, + (LPVOID*)marshal); + } + else + { + FIXME("Invalid or unimplemented marshaling type specified: %x\n", + objref.flags); + return RPC_E_INVALID_OBJREF; + } + + if (hr != S_OK) + ERR("Failed to create marshal, 0x%08x\n", hr); + + return hr; +} + +static HRESULT std_release_marshal_data(IStream *stream) +{ + struct stub_manager *stubmgr; + struct OR_STANDARD obj; + struct apartment *apt; + ULONG res; + HRESULT hr; + + hr = IStream_Read(stream, &obj, FIELD_OFFSET(struct OR_STANDARD, saResAddr.aStringArray), &res); + if (hr != S_OK) return STG_E_READFAULT; + + if (obj.saResAddr.wNumEntries) + { + ERR("unsupported size of DUALSTRINGARRAY\n"); + return E_NOTIMPL; + } + + TRACE("oxid = %s, oid = %s, ipid = %s\n", wine_dbgstr_longlong(obj.std.oxid), + wine_dbgstr_longlong(obj.std.oid), wine_dbgstr_guid(&obj.std.ipid)); + + if (!(apt = apartment_findfromoxid(obj.std.oxid))) + { + WARN("Could not map OXID %s to apartment object\n", + wine_dbgstr_longlong(obj.std.oxid)); + return RPC_E_INVALID_OBJREF; + } + + if (!(stubmgr = get_stub_manager(apt, obj.std.oid))) + { + apartment_release(apt); + ERR("could not map object ID to stub manager, oxid=%s, oid=%s\n", + wine_dbgstr_longlong(obj.std.oxid), wine_dbgstr_longlong(obj.std.oid)); + return RPC_E_INVALID_OBJREF; + } + + stub_manager_release_marshal_data(stubmgr, obj.std.cPublicRefs, &obj.std.ipid, obj.std.flags & SORFP_TABLEWEAK); + + stub_manager_int_release(stubmgr); + apartment_release(apt); + + return S_OK; +} + +/*********************************************************************** + * CoReleaseMarshalData (combase.@) + */ +HRESULT WINAPI CoReleaseMarshalData(IStream *stream) +{ + IMarshal *marshal; + HRESULT hr; + + TRACE("%p\n", stream); + + hr = get_unmarshaler_from_stream(stream, &marshal, NULL); + if (hr == S_FALSE) + { + hr = std_release_marshal_data(stream); + if (hr != S_OK) + ERR("StdMarshal ReleaseMarshalData failed with error %#x\n", hr); + return hr; + } + if (hr != S_OK) + return hr; + + /* call the helper object to do the releasing of marshal data */ + hr = IMarshal_ReleaseMarshalData(marshal, stream); + if (hr != S_OK) + ERR("IMarshal::ReleaseMarshalData failed with error %#x\n", hr); + + IMarshal_Release(marshal); + return hr; +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 87017dbc92..e462c9ffd4 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1837,56 +1837,6 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *pStream, REFIID riid, LPVOID *ppv) return hr; } -/*********************************************************************** - * CoReleaseMarshalData [OLE32.@] - * - * Releases resources associated with an object that has been marshaled into - * a stream. - * - * PARAMS - * - * pStream [I] The stream that the object has been marshaled into. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT error code. - * - * NOTES - * - * Call this function to release resources associated with a normal or - * table-weak marshal that will not be unmarshaled, and all table-strong - * marshals when they are no longer needed. - * - * SEE ALSO - * CoMarshalInterface(), CoUnmarshalInterface(). - */ -HRESULT WINAPI CoReleaseMarshalData(IStream *pStream) -{ - HRESULT hr; - LPMARSHAL pMarshal; - - TRACE("(%p)\n", pStream); - - hr = get_unmarshaler_from_stream(pStream, &pMarshal, NULL); - if (hr == S_FALSE) - { - hr = std_release_marshal_data(pStream); - if (hr != S_OK) - ERR("StdMarshal ReleaseMarshalData failed with error 0x%08x\n", hr); - return hr; - } - if (hr != S_OK) - return hr; - - /* call the helper object to do the releasing of marshal data */ - hr = IMarshal_ReleaseMarshalData(pMarshal, pStream); - if (hr != S_OK) - ERR("IMarshal::ReleaseMarshalData failed with error 0x%08x\n", hr); - - IMarshal_Release(pMarshal); - return hr; -} - static HRESULT WINAPI StdMarshalCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppv) { diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 972629ecb7..2ecfcf6b51 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -72,7 +72,7 @@ @ stdcall CoRegisterPSClsid(ptr ptr) combase.CoRegisterPSClsid @ stdcall CoRegisterSurrogate(ptr) @ stdcall CoRegisterSurrogateEx(ptr ptr) -@ stdcall CoReleaseMarshalData(ptr) +@ stdcall CoReleaseMarshalData(ptr) combase.CoReleaseMarshalData @ stdcall CoReleaseServerProcess() combase.CoReleaseServerProcess @ stdcall CoResumeClassObjects() @ stdcall CoRevertToSelf() combase.CoRevertToSelf

1 0

Nikolay Sivov : combase: Move CoUnmarshalInterface().
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 59a724d0cd4b46c412a901f1a156bfc7e4b11182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59a724d0cd4b46c412a901f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 1 15:16:31 2020 +0100 combase: Move CoUnmarshalInterface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 5 ++ dlls/combase/combase.spec | 2 +- dlls/combase/combase_private.h | 3 + dlls/combase/marshal.c | 146 +++++++++++++++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 143 +--------------------------------------- dlls/ole32/ole32.spec | 3 +- 6 files changed, 159 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59a724d0cd4b46c412a9…

1 0

Nikolay Sivov : combase: Move remaining marshalling code.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 11057c1370ca90e7405a051f63f9fbc35f836d99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11057c1370ca90e7405a051f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 1 15:16:32 2020 +0100 combase: Move remaining marshalling code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 8 +- dlls/combase/combase.spec | 15 +- dlls/combase/combase_private.h | 22 +- dlls/combase/marshal.c | 1493 +++++++++++++++++++++++++++++++++++- dlls/combase/stubmanager.c | 18 +- dlls/ole32/compobj_private.h | 23 +- dlls/ole32/marshal.c | 1661 +--------------------------------------- dlls/ole32/ole32.spec | 9 +- dlls/ole32/rpc.c | 8 +- 9 files changed, 1533 insertions(+), 1724 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11057c1370ca90e7405a…

1 0

Nikolay Sivov : combase: Move ORPC functionality.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 5c15a6c1ec5b0ea250cc37c15d57d50248c5b26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c15a6c1ec5b0ea250cc37c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 1 15:16:33 2020 +0100 combase: Move ORPC functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 13 +- dlls/combase/combase.c | 11 + dlls/combase/combase.spec | 10 +- dlls/combase/combase_private.h | 31 +- dlls/combase/marshal.c | 24 +- dlls/combase/rpc.c | 1615 +++++++++++++++++++++++++++++++++++++++ dlls/combase/stubmanager.c | 22 +- dlls/ole32/Makefile.in | 1 - dlls/ole32/compobj.c | 21 - dlls/ole32/compobj_private.h | 146 +--- dlls/ole32/ole32.spec | 10 +- dlls/ole32/rpc.c | 1654 ---------------------------------------- 12 files changed, 1676 insertions(+), 1882 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c15a6c1ec5b0ea250cc…

1 0

Biswapriyo Nath : include/d3d10.idl: Add flags in D3D10_CREATE_DEVICE_FLAG enum.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 472b5ffc9a051860a873e085d8f935a3d94a9979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=472b5ffc9a051860a873e085… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 1 12:00:12 2020 +0530 include/d3d10.idl: Add flags in D3D10_CREATE_DEVICE_FLAG enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d10.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index 4a94034a7c..146332ac1c 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -984,7 +984,9 @@ typedef enum D3D10_CREATE_DEVICE_FLAG { D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS = 0x8, D3D10_CREATE_DEVICE_ALLOW_NULL_FROM_MAP = 0x10, D3D10_CREATE_DEVICE_BGRA_SUPPORT = 0x20, - D3D10_CREATE_DEVICE_STRICT_VALIDATION = 0x0200 + D3D10_CREATE_DEVICE_PREVENT_ALTERING_LAYER_SETTINGS_FROM_REGISTRY = 0x80, + D3D10_CREATE_DEVICE_STRICT_VALIDATION = 0x200, + D3D10_CREATE_DEVICE_DEBUGGABLE = 0x400, } D3D10_CREATE_DEVICE_FLAG; /* Core */

1 0

Biswapriyo Nath : include/d3d11.idl: Add flags in D3D11_RESOURCE_MISC_FLAG enum.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 46caa0fb1baf4381cd3bbf1f6af0031af5d7b35f URL: https://source.winehq.org/git/wine.git/?a=commit;h=46caa0fb1baf4381cd3bbf1f… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 1 12:00:12 2020 +0530 include/d3d11.idl: Add flags in D3D11_RESOURCE_MISC_FLAG enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index 507cfd012a..1ea0a6a6c9 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -987,7 +987,10 @@ typedef enum D3D11_RESOURCE_MISC_FLAG D3D11_RESOURCE_MISC_RESTRICTED_CONTENT = 0x00001000L, D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE = 0x00002000L, D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER = 0x00004000L, - D3D11_RESOURCE_MISC_GUARDED = 0x00008000L + D3D11_RESOURCE_MISC_GUARDED = 0x00008000L, + D3D11_RESOURCE_MISC_TILE_POOL = 0x00020000L, + D3D11_RESOURCE_MISC_TILED = 0x00040000L, + D3D11_RESOURCE_MISC_HW_PROTECTED = 0x00080000L } D3D11_RESOURCE_MISC_FLAG; typedef struct D3D11_QUERY_DESC

1 0

Biswapriyo Nath : include/d3d11.idl: Add names in D3D11_FILTER enum.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: a3500122400680a1f3969e8673af54fc3ac45e74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3500122400680a1f3969e86… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 1 12:00:12 2020 +0530 include/d3d11.idl: Add names in D3D11_FILTER enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index 1ea0a6a6c9..80a65c9ae1 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -875,7 +875,25 @@ typedef enum D3D11_FILTER D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x91, D3D11_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x94, D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x95, - D3D11_FILTER_COMPARISON_ANISOTROPIC = 0xd5 + D3D11_FILTER_COMPARISON_ANISOTROPIC = 0xd5, + D3D11_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100, + D3D11_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101, + D3D11_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104, + D3D11_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105, + D3D11_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110, + D3D11_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111, + D3D11_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114, + D3D11_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115, + D3D11_FILTER_MINIMUM_ANISOTROPIC = 0x155, + D3D11_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180, + D3D11_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181, + D3D11_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184, + D3D11_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185, + D3D11_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190, + D3D11_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191, + D3D11_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194, + D3D11_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195, + D3D11_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5 } D3D11_FILTER; typedef enum D3D11_DSV_FLAG

1 0

Carlos Rivera : kernel32/tests: Change file name to avoid collision with other tests.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 00a0e2cd8c4df240371ddd22516e4e3544a142ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=00a0e2cd8c4df240371ddd22… Author: Carlos Rivera <carlos(a)superkaos.org> Date: Tue Sep 1 11:17:36 2020 +0200 kernel32/tests: Change file name to avoid collision with other tests. Entries in IniFileMapping are persisted in Windows until the next reboot, even if removed from the registry. This made the function test_registry_mapping to cause other tests that accessed the actual winetest.ini file to fail if the profile test was run more than once on Windows without rebooting. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 182 +++++++++++++++++++++--------------------- 1 file changed, 91 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00a0e2cd8c4df240371d…

1 0

Paul Gofman : wbemprox: Provide semi-stub implementation for client_security_QueryBlanket().
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 9dea12d87d550291afc37fa5bcd1ee56eda2c78e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dea12d87d550291afc37fa5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 31 22:01:25 2020 +0300 wbemprox: Provide semi-stub implementation for client_security_QueryBlanket(). Horizon Zero Dawn fails to query system memory size if CoQueryProxyBlanket() fails for wbem services. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/services.c | 20 ++++++++++++++++++-- dlls/wbemprox/tests/query.c | 7 +++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 3a0963e1f6..ab7146db2d 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -88,8 +88,24 @@ static HRESULT WINAPI client_security_QueryBlanket( void **pAuthInfo, DWORD *pCapabilities ) { - FIXME("\n"); - return WBEM_E_FAILED; + FIXME("semi-stub.\n"); + + if (pAuthnSvc) + *pAuthnSvc = RPC_C_AUTHN_NONE; + if (pAuthzSvc) + *pAuthzSvc = RPC_C_AUTHZ_NONE; + if (pServerPrincName) + *pServerPrincName = NULL; + if (pAuthnLevel) + *pAuthnLevel = RPC_C_AUTHN_LEVEL_NONE; + if (pImpLevel) + *pImpLevel = RPC_C_IMP_LEVEL_DEFAULT; + if (pAuthInfo) + *pAuthInfo = NULL; + if (pCapabilities) + *pCapabilities = 0; + + return WBEM_NO_ERROR; } static HRESULT WINAPI client_security_SetBlanket( diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 17942cd89a..74fdfaa9bc 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1713,6 +1713,7 @@ START_TEST(query) BSTR path = SysAllocString( L"ROOT\\CIMV2" ); IWbemLocator *locator; IWbemServices *services; + DWORD authn_svc; HRESULT hr; CoInitialize( NULL ); @@ -1728,6 +1729,12 @@ START_TEST(query) hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoQueryProxyBlanket( (IUnknown *)services, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "failed to query proxy blanket %08x\n", hr ); + + hr = CoQueryProxyBlanket( (IUnknown *)services, &authn_svc, NULL, NULL, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "failed to query proxy blanket %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr );

1 0

Zebediah Figura : kernel32/tests: Pass the correct size for PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: c0ab7af1b0553e6177fad872d95e4195582e4d94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ab7af1b0553e6177fad872… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 31 18:21:33 2020 -0500 kernel32/tests: Pass the correct size for PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE. Fixes test failures on 64-bit Wine and Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b794c8f0c0..b2441019e3 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3887,7 +3887,7 @@ static void test_ProcThreadAttributeList(void) expect_list.count++; } - ret = pUpdateProcThreadAttribute(&list, 0, PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE, handles, sizeof(PROCESSOR_NUMBER), NULL, NULL); + ret = pUpdateProcThreadAttribute(&list, 0, PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE, handles, sizeof(handles[0]), NULL, NULL); ok(ret || broken(GetLastError() == ERROR_NOT_SUPPORTED), "got %d gle %d\n", ret, GetLastError()); if (ret)

1 0