April 2017 - Wine-Commits - list.winehq.org

Huw Davies : wbemdisp: Implement ISWbemObject::get_Properties_.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: cb2660b40da1364656fd1cc0757d5841ee0cd310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2660b40da1364656fd1cc07… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 3 09:57:31 2017 +0100 wbemdisp: Implement ISWbemObject::get_Properties_. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 189 +++++++++++++++++++++++++++++++++++++++-- dlls/wbemdisp/tests/wbemdisp.c | 10 +++ 2 files changed, 194 insertions(+), 5 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index e6ef02b..4abb80e 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -43,6 +43,7 @@ enum type_id ISWbemLocator_tid, ISWbemObject_tid, ISWbemObjectSet_tid, + ISWbemPropertySet_tid, ISWbemServices_tid, last_tid }; @@ -55,6 +56,7 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemLocator, &IID_ISWbemObject, &IID_ISWbemObjectSet, + &IID_ISWbemPropertySet, &IID_ISWbemServices }; @@ -93,6 +95,183 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) return S_OK; } +struct propertyset +{ + ISWbemPropertySet ISWbemPropertySet_iface; + LONG refs; + IWbemClassObject *object; +}; + +static inline struct propertyset *impl_from_ISWbemPropertySet( + ISWbemPropertySet *iface ) +{ + return CONTAINING_RECORD( iface, struct propertyset, ISWbemPropertySet_iface ); +} + +static ULONG WINAPI propertyset_AddRef( ISWbemPropertySet *iface ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + return InterlockedIncrement( &propertyset->refs ); +} + +static ULONG WINAPI propertyset_Release( ISWbemPropertySet *iface ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + LONG refs = InterlockedDecrement( &propertyset->refs ); + if (!refs) + { + TRACE( "destroying %p\n", propertyset ); + IWbemClassObject_Release( propertyset->object ); + heap_free( propertyset ); + } + return refs; +} + +static HRESULT WINAPI propertyset_QueryInterface( ISWbemPropertySet *iface, + REFIID riid, void **obj ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + + TRACE( "%p %s %p\n", propertyset, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID_ISWbemPropertySet ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemPropertySet_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI propertyset_GetTypeInfoCount( ISWbemPropertySet *iface, UINT *count ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + TRACE( "%p, %p\n", propertyset, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI propertyset_GetTypeInfo( ISWbemPropertySet *iface, + UINT index, LCID lcid, ITypeInfo **info ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + TRACE( "%p, %u, %u, %p\n", propertyset, index, lcid, info ); + + return get_typeinfo( ISWbemPropertySet_tid, info ); +} + +static HRESULT WINAPI propertyset_GetIDsOfNames( ISWbemPropertySet *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", propertyset, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemPropertySet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI propertyset_Invoke( ISWbemPropertySet *iface, DISPID member, REFIID riid, + LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", propertyset, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemPropertySet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &propertyset->ISWbemPropertySet_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI propertyset_get__NewEnum( ISWbemPropertySet *iface, IUnknown **unk ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI propertyset_Item( ISWbemPropertySet *iface, BSTR name, + LONG flags, ISWbemProperty **prop ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI propertyset_get_Count( ISWbemPropertySet *iface, LONG *count ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI propertyset_Add( ISWbemPropertySet *iface, BSTR name, WbemCimtypeEnum type, + VARIANT_BOOL is_array, LONG flags, ISWbemProperty **prop ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI propertyset_Remove( ISWbemPropertySet *iface, BSTR name, LONG flags ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const ISWbemPropertySetVtbl propertyset_vtbl = +{ + propertyset_QueryInterface, + propertyset_AddRef, + propertyset_Release, + propertyset_GetTypeInfoCount, + propertyset_GetTypeInfo, + propertyset_GetIDsOfNames, + propertyset_Invoke, + propertyset_get__NewEnum, + propertyset_Item, + propertyset_get_Count, + propertyset_Add, + propertyset_Remove +}; + +static HRESULT SWbemPropertySet_create( IWbemClassObject *wbem_object, ISWbemPropertySet **obj ) +{ + struct propertyset *propertyset; + + TRACE( "%p, %p\n", obj, wbem_object ); + + if (!(propertyset = heap_alloc( sizeof(*propertyset) ))) return E_OUTOFMEMORY; + propertyset->ISWbemPropertySet_iface.lpVtbl = &propertyset_vtbl; + propertyset->refs = 1; + propertyset->object = wbem_object; + IWbemClassObject_AddRef( propertyset->object ); + *obj = &propertyset->ISWbemPropertySet_iface; + + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + #define DISPID_BASE 0x1800000 struct member @@ -559,12 +738,12 @@ static HRESULT WINAPI object_get_Qualifiers_( return E_NOTIMPL; } -static HRESULT WINAPI object_get_Properties_( - ISWbemObject *iface, - ISWbemPropertySet **objWbemPropertySet ) +static HRESULT WINAPI object_get_Properties_( ISWbemObject *iface, ISWbemPropertySet **prop_set ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p, %p\n", object, prop_set ); + return SWbemPropertySet_create( object->object, prop_set ); } static HRESULT WINAPI object_get_Methods_( diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 308dff6..f88ed1a 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -260,6 +260,8 @@ static void test_locator(void) ISWbemServices *services; ISWbemObjectSet *object_set; IEnumVARIANT *enum_var; + ISWbemObject *object; + ISWbemPropertySet *prop_set; VARIANT var; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); @@ -293,7 +295,15 @@ static void test_locator(void) ok( id == 21, "got %d\n", id ); SysFreeString( props_bstr ); + hr = IDispatch_QueryInterface( V_DISPATCH(&var), &IID_ISWbemObject, (void**)&object ); + ok( hr == S_OK, "got %x\n", hr ); VariantClear( &var ); + + hr = ISWbemObject_get_Properties_( object, &prop_set ); + ok( hr == S_OK, "got %x\n", hr ); + + ISWbemPropertySet_Release( prop_set ); + ISWbemObject_Release( object ); IEnumVARIANT_Release( enum_var ); ISWbemObjectSet_Release( object_set ); ISWbemServices_Release( services );

1 0

Huw Davies : wbemdisp: Invoke the generic methods and properties as well as the dynamic ones.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: a11aed32ca5b326baddd179a2768abd7ce03e9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11aed32ca5b326baddd179a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 3 09:57:30 2017 +0100 wbemdisp: Invoke the generic methods and properties as well as the dynamic ones. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 74691bc..e6ef02b 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -300,10 +300,24 @@ static HRESULT WINAPI object_Invoke( { struct object *object = impl_from_ISWbemObject( iface ); BSTR name; + ITypeInfo *typeinfo; + HRESULT hr; TRACE( "%p, %x, %s, %u, %x, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); + if (member <= DISPID_BASE) + { + hr = get_typeinfo( ISWbemObject_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &object->ISWbemObject_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; + } + if (flags != (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) { FIXME( "flags %x not supported\n", flags );

1 0

Huw Davies : wbemdisp: Search for the generic methods and properties as well as the dynamic ones.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 66edb817f0c32bc9eae7a30ec2ad9614f5c75f59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66edb817f0c32bc9eae7a30ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 3 09:57:29 2017 +0100 wbemdisp: Search for the generic methods and properties as well as the dynamic ones. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 11 +++++++-- dlls/wbemdisp/tests/wbemdisp.c | 54 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 9f1c7f4..74691bc 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -188,8 +188,6 @@ static HRESULT WINAPI object_GetTypeInfo( return E_NOTIMPL; } -#define DISPID_BASE 0x1800000 - static HRESULT init_members( struct object *object ) { LONG bound, i; @@ -254,6 +252,7 @@ static HRESULT WINAPI object_GetIDsOfNames( struct object *object = impl_from_ISWbemObject( iface ); HRESULT hr; UINT i; + ITypeInfo *typeinfo; TRACE( "%p, %s, %p, %u, %u, %p\n", object, debugstr_guid(riid), names, count, lcid, dispid ); @@ -262,6 +261,14 @@ static HRESULT WINAPI object_GetIDsOfNames( hr = init_members( object ); if (FAILED( hr )) return hr; + hr = get_typeinfo( ISWbemObject_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + if (SUCCEEDED(hr)) return hr; + for (i = 0; i < count; i++) { if ((dispid[i] = get_member_dispid( object, names[i] )) == DISPID_UNKNOWN) break; diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 3cc4c86..308dff6 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -28,6 +28,8 @@ DEFINE_GUID(CLSID_WINMGMTS,0x172bddf8,0xceea,0x11d1,0x8b,0x05,0x00,0x60,0x08,0x06,0xd9,0xb6); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static const LCID english = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); + static void test_ParseDisplayName(void) { static const WCHAR biosW[] = {'W','i','n','3','2','_','B','i','o','s',0}; @@ -58,7 +60,6 @@ static void test_ParseDisplayName(void) { name3, S_OK, &IID_ISWbemObject, sizeof(name3)/sizeof(name3[0]) - 1 }, { name4, S_OK, &IID_ISWbemObject, sizeof(name4)/sizeof(name4[0]) - 1 } }; - LCID english = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); IParseDisplayName *displayname; IBindCtx *ctx; IMoniker *moniker; @@ -243,15 +244,60 @@ static void test_ParseDisplayName(void) IParseDisplayName_Release( displayname ); } +static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; +static const WCHAR root[] = {'r','o','o','t','\\','C','I','M','V','2',0}; +static const WCHAR query[] = {'S','e','l','e','c','t',' ','P','r','o','c','e','s','s','o','r','I','d',' ','f','r','o','m', + ' ','W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; +static const WCHAR lang[] = {'W','Q','L',0}; +static const WCHAR props[] = {'P','r','o','p','e','r','t','i','e','s','_',0}; + static void test_locator(void) { - IUnknown *locator; HRESULT hr; + DISPID id; + BSTR host_bstr, root_bstr, query_bstr, lang_bstr, props_bstr; + ISWbemLocator *locator; + ISWbemServices *services; + ISWbemObjectSet *object_set; + IEnumVARIANT *enum_var; + VARIANT var; + + hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); + ok( hr == S_OK, "got %x\n", hr ); + + host_bstr = SysAllocString(localhost); + root_bstr = SysAllocString(root); + hr = ISWbemLocator_ConnectServer( locator, host_bstr, root_bstr, NULL, NULL, NULL, NULL, 0, NULL, &services); + ok( hr == S_OK, "got %x\n", hr ); + SysFreeString( root_bstr ); + SysFreeString( host_bstr ); + + query_bstr = SysAllocString(query); + lang_bstr = SysAllocString(lang); + hr = ISWbemServices_ExecQuery( services, query_bstr, lang_bstr, wbemFlagForwardOnly, NULL, &object_set); + ok( hr == S_OK, "got %x\n", hr ); + SysFreeString( lang_bstr ); + SysFreeString( query_bstr ); + + hr = ISWbemObjectSet_get__NewEnum( object_set, (IUnknown**)&enum_var ); + ok( hr == S_OK, "got %x\n", hr ); + + VariantInit( &var ); + hr = IEnumVARIANT_Next( enum_var, 1, &var, NULL ); + ok( hr == S_OK, "got %x\n", hr ); + ok( V_VT(&var) == VT_DISPATCH, "got %x\n", V_VT(&var)); - hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&locator ); + props_bstr = SysAllocString( props ); + hr = IDispatch_GetIDsOfNames( V_DISPATCH(&var), &IID_NULL, &props_bstr, 1, english, &id ); ok( hr == S_OK, "got %x\n", hr ); + ok( id == 21, "got %d\n", id ); + SysFreeString( props_bstr ); - IUnknown_Release( locator ); + VariantClear( &var ); + IEnumVARIANT_Release( enum_var ); + ISWbemObjectSet_Release( object_set ); + ISWbemServices_Release( services ); + ISWbemLocator_Release( locator ); } START_TEST(wbemdisp)

1 0

Owen Rudge : include: Add partial wsddisco.idl.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 2ba3cc0fe343ea0257b2821cef06e931ec339867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba3cc0fe343ea0257b2821ce… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 29 22:53:53 2017 +0100 include: Add partial wsddisco.idl. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wsddisco.idl | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index a6f5feb..7b3b72f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -182,6 +182,7 @@ IDL_SRCS = \ wmsdkidl.idl \ wpcapi.idl \ wsdbase.idl \ + wsddisco.idl \ wsdxml.idl \ wtypes.idl \ wuapi.idl \ diff --git a/include/wsddisco.idl b/include/wsddisco.idl new file mode 100644 index 0000000..50d2198 --- /dev/null +++ b/include/wsddisco.idl @@ -0,0 +1,107 @@ +/* + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; +import "wsdxmldom.h"; +import "wsdtypes.h"; + +interface IWSDScopeMatchingRule; +interface IWSDiscoveryPublisherNotify; +interface IWSDiscoveryPublisher; +interface IWSDXMLContext; + +[ +uuid(fcafe424-fef5-481a-bd9f-33ce0574256f), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDScopeMatchingRule : IUnknown +{ + HRESULT GetScopeRule([out] LPCWSTR *ppszScopeMatchingRule); + HRESULT MatchScopes([in] LPCWSTR pszScope1, [in] LPCWSTR pszScope2, [out] BOOL *pfMatch); +} + +[ +uuid(e67651b0-337a-4b3c-9758-733388568251), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveryPublisherNotify : IUnknown +{ + HRESULT ProbeHandler([in] const WSD_SOAP_MESSAGE *pSoap, [in] IWSDMessageParameters *pMessageParameters); + HRESULT ResolveHandler([in] const WSD_SOAP_MESSAGE *pSoap, [in] IWSDMessageParameters *pMessageParameters); +} + +[ +uuid(AE01E1A8-3ff9-4148-8116-057cc616fe13), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveryPublisher : IUnknown +{ + HRESULT SetAddressFamily([in] DWORD dwAddressFamily); + HRESULT RegisterNotificationSink([in] IWSDiscoveryPublisherNotify *pSink); + HRESULT UnRegisterNotificationSink([in] IWSDiscoveryPublisherNotify *pSink); + + HRESULT Publish([in] LPCWSTR pszId, [in] ULONGLONG ullMetadataVersion, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, + [in, optional] LPCWSTR pszSessionId, [in, optional] const WSD_NAME_LIST *pTypesList, [in, optional] const WSD_URI_LIST *pScopesList, + [in, optional] const WSD_URI_LIST *pXAddrsList); + + HRESULT UnPublish([in] LPCWSTR pszId, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, [in, optional] LPCWSTR pszSessionId, + [in, optional] const WSDXML_ELEMENT *pAny); + + HRESULT MatchProbe([in] const WSD_SOAP_MESSAGE *pProbeMessage, [in] IWSDMessageParameters *pMessageParameters, [in] LPCWSTR pszId, + [in] ULONGLONG ullMetadataVersion, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, [in, optional] LPCWSTR pszSessionId, + [in, optional] const WSD_NAME_LIST *pTypesList, [in, optional] const WSD_URI_LIST *pScopesList, [in, optional] const WSD_URI_LIST *pXAddrsList); + + HRESULT MatchResolve([in] const WSD_SOAP_MESSAGE *pResolveMessage, [in] IWSDMessageParameters *pMessageParameters, [in] LPCWSTR pszId, + [in] ULONGLONG ullMetadataVersion, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, [in, optional] LPCWSTR pszSessionId, + [in, optional] const WSD_NAME_LIST *pTypesList, [in, optional] const WSD_URI_LIST *pScopesList, [in, optional] const WSD_URI_LIST *pXAddrsList); + + HRESULT PublishEx([in] LPCWSTR pszId, [in] ULONGLONG ullMetadataVersion, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, + [in, optional] LPCWSTR pszSessionId, [in, optional] const WSD_NAME_LIST *pTypesList, [in, optional] const WSD_URI_LIST *pScopesList, + [in, optional] const WSD_URI_LIST *pXAddrsList, [in, optional] const WSDXML_ELEMENT *pHeaderAny, + [in, optional] const WSDXML_ELEMENT *pReferenceParameterAny, [in, optional] const WSDXML_ELEMENT *pPolicyAny, + [in, optional] const WSDXML_ELEMENT *pEndpointReferenceAny, [in, optional] const WSDXML_ELEMENT *pAny); + + HRESULT MatchProbeEx([in] const WSD_SOAP_MESSAGE *pProbeMessage, [in] IWSDMessageParameters *pMessageParameters, [in] LPCWSTR pszId, + [in] ULONGLONG ullMetadataVersion, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, [in, optional] LPCWSTR pszSessionId, + [in, optional] const WSD_NAME_LIST *pTypesList, [in, optional] const WSD_URI_LIST *pScopesList, [in, optional] const WSD_URI_LIST *pXAddrsList, + [in, optional] const WSDXML_ELEMENT *pHeaderAny, [in, optional] const WSDXML_ELEMENT *pReferenceParameterAny, + [in, optional] const WSDXML_ELEMENT *pPolicyAny, [in, optional] const WSDXML_ELEMENT *pEndpointReferenceAny, + [in, optional] const WSDXML_ELEMENT *pAny); + + HRESULT MatchResolveEx([in] const WSD_SOAP_MESSAGE *pResolveMessage, [in] IWSDMessageParameters *pMessageParameters, [in] LPCWSTR pszId, + [in] ULONGLONG ullMetadataVersion, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, [in, optional] LPCWSTR pszSessionId, + [in, optional] const WSD_NAME_LIST *pTypesList, [in, optional] const WSD_URI_LIST *pScopesList, [in, optional] const WSD_URI_LIST *pXAddrsList, + [in, optional] const WSDXML_ELEMENT *pHeaderAny, [in, optional] const WSDXML_ELEMENT *pReferenceParameterAny, + [in, optional] const WSDXML_ELEMENT *pPolicyAny, [in, optional] const WSDXML_ELEMENT *pEndpointReferenceAny, + [in, optional] const WSDXML_ELEMENT *pAny); + + HRESULT RegisterScopeMatchingRule([in] IWSDScopeMatchingRule *pScopeMatchingRule); + HRESULT UnRegisterScopeMatchingRule([in] IWSDScopeMatchingRule *pScopeMatchingRule); + HRESULT GetXMLContext([out] IWSDXMLContext **ppContext); +} + +cpp_quote("HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext* pContext, IWSDiscoveryPublisher **ppPublisher);")

1 0

Owen Rudge : include: Add partial wsdtypes.h.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 4d8f5dc9bd65671667bd5dcc6c43094750fa2d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8f5dc9bd65671667bd5dcc6… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 29 22:52:45 2017 +0100 include: Add partial wsdtypes.h. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wsdtypes.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 10fea7e..fa32beb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -686,6 +686,7 @@ HEADER_SRCS = \ ws2ipdef.h \ ws2spi.h \ ws2tcpip.h \ + wsdtypes.h \ wsdxmldom.h \ wshisotp.h \ wsipx.h \ diff --git a/include/wsdtypes.h b/include/wsdtypes.h new file mode 100644 index 0000000..387b6c3 --- /dev/null +++ b/include/wsdtypes.h @@ -0,0 +1,99 @@ +/* + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef WSDTYPES_H +#define WSDTYPES_H + +interface IWSDMessageParameters; + +typedef struct _WSD_APP_SEQUENCE WSD_APP_SEQUENCE; +typedef struct _WSD_HEADER_RELATESTO WSD_HEADER_RELATESTO; +typedef struct _WSD_SOAP_HEADER WSD_SOAP_HEADER; +typedef struct _WSD_SOAP_MESSAGE WSD_SOAP_MESSAGE; +typedef struct _WSD_NAME_LIST WSD_NAME_LIST; +typedef struct _WSD_REFERENCE_PARAMETERS WSD_REFERENCE_PARAMETERS; +typedef struct _WSD_REFERENCE_PROPERTIES WSD_REFERENCE_PROPERTIES; +typedef struct _WSD_ENDPOINT_REFERENCE WSD_ENDPOINT_REFERENCE; +typedef struct _WSD_URI_LIST WSD_URI_LIST; + +struct _WSD_APP_SEQUENCE +{ + ULONGLONG InstanceId; + const WCHAR *SequenceId; + ULONGLONG MessageNumber; +}; + +struct _WSD_NAME_LIST +{ + WSD_NAME_LIST *Next; + WSDXML_NAME *Element; +}; + +struct _WSD_REFERENCE_PARAMETERS +{ + WSDXML_ELEMENT *Any; +}; + +struct _WSD_REFERENCE_PROPERTIES +{ + WSDXML_ELEMENT *Any; +}; + +struct _WSD_ENDPOINT_REFERENCE +{ + const WCHAR *Address; + WSD_REFERENCE_PROPERTIES ReferenceProperties; + WSD_REFERENCE_PARAMETERS ReferenceParameters; + WSDXML_NAME *PortType; + WSDXML_NAME *ServiceName; + WSDXML_ELEMENT *Any; +}; + +struct _WSD_URI_LIST +{ + WSD_URI_LIST *Next; + const WCHAR *Element; +}; + +struct _WSD_HEADER_RELATESTO +{ + WSDXML_NAME *RelationshipType; + const WCHAR *MessageID; +}; + +struct _WSD_SOAP_HEADER +{ + const WCHAR *To; + const WCHAR *Action; + const WCHAR *MessageID; + WSD_HEADER_RELATESTO RelatesTo; + WSD_ENDPOINT_REFERENCE *ReplyTo; + WSD_ENDPOINT_REFERENCE *From; + WSD_ENDPOINT_REFERENCE *FaultTo; + WSD_APP_SEQUENCE *AppSequence; + WSDXML_ELEMENT *AnyHeaders; +}; + +struct _WSD_SOAP_MESSAGE +{ + WSD_SOAP_HEADER Header; + void *Body; + WSDXML_TYPE *BodyType; +}; + +#endif

1 0

Owen Rudge : wsdapi: Add stub DLL.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 4a3bb0acc58ff081940d8e9bd8269bab3086602c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3bb0acc58ff081940d8e9bd… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 29 22:51:44 2017 +0100 wsdapi: Add stub DLL. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/wsdapi/Makefile.in | 6 ++++++ dlls/wsdapi/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi.spec | 45 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+) diff --git a/configure b/configure index f032b1a..9e46fbc 100755 --- a/configure +++ b/configure @@ -1496,6 +1496,7 @@ enable_wnaspi32 enable_wpc enable_wpcap enable_ws2_32 +enable_wsdapi enable_wshom_ocx enable_wsnmp32 enable_wsock32 @@ -18479,6 +18480,7 @@ wine_fn_config_test dlls/wpc/tests wpc_test wine_fn_config_dll wpcap enable_wpcap wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test +wine_fn_config_dll wsdapi enable_wsdapi implib wine_fn_config_dll wshom.ocx enable_wshom_ocx clean wine_fn_config_test dlls/wshom.ocx/tests wshom.ocx_test clean wine_fn_config_dll wsnmp32 enable_wsnmp32 implib diff --git a/configure.ac b/configure.ac index 7e3f643..ac6ecbb 100644 --- a/configure.ac +++ b/configure.ac @@ -3527,6 +3527,7 @@ WINE_CONFIG_TEST(dlls/wpc/tests) WINE_CONFIG_DLL(wpcap) WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) +WINE_CONFIG_DLL(wsdapi,,[implib]) WINE_CONFIG_DLL(wshom.ocx,,[clean]) WINE_CONFIG_TEST(dlls/wshom.ocx/tests,[clean]) WINE_CONFIG_DLL(wsnmp32,,[implib]) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in new file mode 100644 index 0000000..134bb18 --- /dev/null +++ b/dlls/wsdapi/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wsdapi.dll +IMPORTLIB = wsdapi +IMPORTS = kernel32 + +C_SRCS = \ + main.c diff --git a/dlls/wsdapi/main.c b/dlls/wsdapi/main.c new file mode 100644 index 0000000..ea0fef3 --- /dev/null +++ b/dlls/wsdapi/main.c @@ -0,0 +1,43 @@ +/* + * Web Services on Devices + * + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec new file mode 100644 index 0000000..7771b7b --- /dev/null +++ b/dlls/wsdapi/wsdapi.spec @@ -0,0 +1,45 @@ +@ stub WSDAddFirewallCheck +@ stub WSDCancelNetworkChangeNotify +@ stub WSDCopyNameList +@ stub WSDNotifyNetworkChange +@ stub WSDRemoveFirewallCheck +@ stub WSDXMLCompareNames +@ stub WSDAllocateLinkedMemory +@ stub WSDAttachLinkedMemory +@ stub WSDCompareEndpoints +@ stub WSDCopyEndpoint +@ stub WSDCreateDeviceHost2 +@ stub WSDCreateDeviceHost +@ stub WSDCreateDeviceHostAdvanced +@ stub WSDCreateDeviceProxy2 +@ stub WSDCreateDeviceProxy +@ stub WSDCreateDeviceProxyAdvanced +@ stub WSDCreateDiscoveryProvider2 +@ stub WSDCreateDiscoveryProvider +@ stub WSDCreateDiscoveryPublisher2 +@ stub WSDCreateDiscoveryPublisher +@ stub WSDCreateHttpAddress +@ stub WSDCreateHttpMessageParameters +@ stub WSDCreateHttpTransport +@ stub WSDCreateMetadataAgent +@ stub WSDCreateOutboundAttachment +@ stub WSDCreateUdpAddress +@ stub WSDCreateUdpMessageParameters +@ stub WSDCreateUdpTransport +@ stub WSDDetachLinkedMemory +@ stub WSDFreeLinkedMemory +@ stub WSDGenerateFault +@ stub WSDGenerateFaultEx +@ stub WSDGenerateRandomDelay +@ stub WSDGetConfigurationOption +@ stub WSDProcessFault +@ stub WSDSetConfigurationOption +@ stub WSDUriDecode +@ stub WSDUriEncode +@ stub WSDXMLAddChild +@ stub WSDXMLAddSibling +@ stub WSDXMLBuildAnyForSingleElement +@ stub WSDXMLCleanupElement +@ stub WSDXMLCreateContext +@ stub WSDXMLGetNameFromBuiltinNamespace +@ stub WSDXMLGetValueFromAny

1 0

Henri Verbeet : wined3d: Use resource.map_binding as destination location for blits to WINED3D_POOL_SYSTEM_MEM textures.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 5e40695310739ea7d34703c7a961fb313f043ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e40695310739ea7d34703c7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 3 07:39:46 2017 +0200 wined3d: Use resource.map_binding as destination location for blits to WINED3D_POOL_SYSTEM_MEM textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 237b604..5031fcb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3405,6 +3405,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst struct wined3d_swapchain *src_swapchain, *dst_swapchain; DWORD src_ds_flags, dst_ds_flags; BOOL scale, convert; + DWORD dst_location; static const DWORD simple_blit = WINED3D_BLT_ASYNC | WINED3D_BLT_SRC_CKEY @@ -3511,17 +3512,19 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst src_rect, src_texture->resource.usage, src_texture->resource.pool, src_texture->resource.format, dst_rect, dst_texture->resource.usage, dst_texture->resource.pool, dst_texture->resource.format))) { + if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + dst_location = dst_texture->resource.map_binding; + else + dst_location = dst_texture->resource.draw_binding; + context = context_acquire(device, dst_texture, dst_sub_resource_idx); blitter->blit_surface(device, WINED3D_BLIT_OP_DEPTH_BLIT, context, src_surface, src_texture->resource.draw_binding, src_rect, - dst_surface, dst_texture->resource.draw_binding, dst_rect, - NULL, filter); + dst_surface, dst_location, dst_rect, NULL, filter); context_release(context); - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, - dst_texture->resource.draw_binding); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, - ~dst_texture->resource.draw_binding); + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); return WINED3D_OK; } @@ -3620,17 +3623,19 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst { struct wined3d_context *context; + if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + dst_location = dst_texture->resource.map_binding; + else + dst_location = dst_texture->resource.draw_binding; + context = context_acquire(device, dst_texture, dst_sub_resource_idx); blitter->blit_surface(device, blit_op, context, src_surface, src_texture->resource.draw_binding, src_rect, - dst_surface, dst_texture->resource.draw_binding, dst_rect, - colour_key, filter); + dst_surface, dst_location, dst_rect, colour_key, filter); context_release(context); - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, - dst_texture->resource.draw_binding); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, - ~dst_texture->resource.draw_binding); + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); return WINED3D_OK; }

1 0

Daniel Lehman : msvcp140: Add __crtWaitForThreadpoolTimerCallbacks.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 5fb502b06e60ce58a6def812e1cf0b25d6d4ff8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb502b06e60ce58a6def812e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 14:07:03 2017 -0700 msvcp140: Add __crtWaitForThreadpoolTimerCallbacks. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 1b5bdcb..c32514a 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3778,6 +3778,6 @@ @ stub __crtSetFileInformationByHandle @ cdecl __crtSetThreadpoolTimer(ptr ptr long long) MSVCP__crtSetThreadpoolTimer @ cdecl __crtSetThreadpoolWait(ptr long ptr) MSVCP__crtSetThreadpoolWait -@ stub __crtWaitForThreadpoolTimerCallbacks +@ cdecl __crtWaitForThreadpoolTimerCallbacks(ptr long) MSVCP__crtWaitForThreadpoolTimerCallbacks @ stub __set_stl_sync_api_mode @ cdecl xtime_get(ptr long) xtime_get diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ac23c2b..7b97b5c 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1296,6 +1296,15 @@ VOID CDECL MSVCP__crtSetThreadpoolTimer(TP_TIMER *timer, } /********************************************************************* + * __crtWaitForThreadpoolTimerCallbacks (MSVCP140.@) + */ +VOID CDECL MSVCP__crtWaitForThreadpoolTimerCallbacks(TP_TIMER *timer, BOOL cancel) +{ + TRACE("(%p %d)\n", timer, cancel); + WaitForThreadpoolTimerCallbacks(timer, cancel); +} + +/********************************************************************* * __crtCreateThreadpoolWait (MSVCP140.@) */ PTP_WAIT CDECL MSVCP__crtCreateThreadpoolWait(PTP_WAIT_CALLBACK callback, diff --git a/include/winbase.h b/include/winbase.h index be1cb64..25e5077 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2636,6 +2636,7 @@ WINBASEAPI DWORD WINAPI WaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DW WINBASEAPI DWORD WINAPI WaitForMultipleObjectsEx(DWORD,const HANDLE*,BOOL,DWORD,BOOL); WINBASEAPI DWORD WINAPI WaitForSingleObject(HANDLE,DWORD); WINBASEAPI DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL); +WINBASEAPI VOID WINAPI WaitForThreadpoolTimerCallbacks(PTP_TIMER,BOOL); WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD); WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); #define WaitNamedPipe WINELIB_NAME_AW(WaitNamedPipe)

1 0

Piotr Caban : msvcrt: Fix wide characters handling in wscanf functions.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: e7f9b562b9da5aa1fbe369f9e57fe63d08cbb743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f9b562b9da5aa1fbe369f9e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 12:45:58 2017 +0200 msvcrt: Fix wide characters handling in wscanf functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 16 ++++++++-------- dlls/msvcrt/tests/scanf.c | 12 +++++++++++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 0fa1e6f..2920b9b 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -68,11 +68,11 @@ #undef _EOF_ #define _EOF_ 0 #ifdef STRING_LEN -#ifdef WIDE_CHAR +#ifdef WIDE_SCANF #define _GETC_(file) (consumed==length ? '\0' : (consumed++, *file++)) -#else /* WIDE_CHAR */ +#else /* WIDE_SCANF */ #define _GETC_(file) (consumed==length ? '\0' : (consumed++, (unsigned char)*file++)) -#endif /* WIDE_CHAR */ +#endif /* WIDE_SCANF */ #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #define _LOCK_FILE_(file) do {} while(0) #define _UNLOCK_FILE_(file) do {} while(0) @@ -90,11 +90,11 @@ #endif /* SECURE */ #endif /* WIDE_SCANF */ #else /* STRING_LEN */ -#ifdef WIDE_CHAR +#ifdef WIDE_SCANF #define _GETC_(file) (consumed++, *file++) -#else /* WIDE_CHAR */ +#else /* WIDE_SCANF */ #define _GETC_(file) (consumed++, (unsigned char)*file++) -#endif /* WIDE_CHAR */ +#endif /* WIDE_SCANF */ #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #define _LOCK_FILE_(file) do {} while(0) #define _UNLOCK_FILE_(file) do {} while(0) @@ -685,7 +685,7 @@ _FUNCTION_ { * use %%." */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); - if (nch==*format) { + if ((_CHAR_)nch == *format) { suppress = 1; /* whoops no field to be read */ st = 1; /* but we got what we expected */ nch = _GETC_(file); @@ -699,7 +699,7 @@ _FUNCTION_ { * a matching non-white-space character. */ else { /* check for character match */ - if (nch == (unsigned char)*format) { + if ((_CHAR_)nch == *format) { nch = _GETC_(file); } else break; } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index ecb270b..1d1f28e 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -252,7 +252,7 @@ static void test_sscanf( void ) ok(!strcmp(buffer, "test"), "buf %s\n", buffer); ok(!strcmp(buffer1, "value\xda"), "buf %s\n", buffer1); - ret = sscanf("\x81test", "\x81%s", buffer); + ret = sscanf("\x81\x82test", "\x81%\x82%s", buffer); ok(ret == 1, "got %d\n", ret); ok(!strcmp(buffer, "test"), "buf = %s\n", buffer); } @@ -303,6 +303,8 @@ static void test_swscanf( void ) wchar_t buffer[100]; int result, ret; static const WCHAR formatd[] = {'%','d',0}; + const WCHAR format2[] = {'a',0x1234,'%',0x1234,'%','c',0}; + WCHAR c; /* check WEOF */ /* WEOF is an unsigned short -1 but swscanf returns int @@ -312,6 +314,14 @@ static void test_swscanf( void ) /* msvcrt returns 0 but should return -1 (later versions do) */ ok( ret == (short)WEOF || broken(ret == 0), "swscanf returns %x instead of %x\n", ret, WEOF ); + + buffer[0] = 'a'; + buffer[1] = 0x1234; + buffer[2] = 0x1234; + buffer[3] = 'b'; + ret = swscanf(buffer, format2, &c); + ok(ret == 1, "swscanf returned %d\n", ret); + ok(c == 'b', "c = %x\n", c); } START_TEST(scanf)

1 0

Owen Rudge : include: Add partial wsdapi.h.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: db680113317911feda2a1009755f37b288885230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db680113317911feda2a10097… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 29 22:54:01 2017 +0100 include: Add partial wsdapi.h. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wsdapi.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7b3b72f..2384c93 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -689,6 +689,7 @@ HEADER_SRCS = \ ws2ipdef.h \ ws2spi.h \ ws2tcpip.h \ + wsdapi.h \ wsdtypes.h \ wsdxmldom.h \ wshisotp.h \ diff --git a/include/wsdapi.h b/include/wsdapi.h new file mode 100644 index 0000000..8deb377 --- /dev/null +++ b/include/wsdapi.h @@ -0,0 +1,49 @@ +/* + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef WSDAPI_H +#define WSDAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct IWSDMessageParameters IWSDMessageParameters; + +typedef struct _WSD_URI_LIST WSD_URI_LIST; +typedef struct _WSD_NAME_LIST WSD_NAME_LIST; + +typedef struct _WSDXML_NAME WSDXML_NAME; +typedef struct _WSDXML_ELEMENT WSDXML_ELEMENT; +typedef struct _WSDXML_NODE WSDXML_NODE; +typedef struct _WSDXML_ATTRIBUTE WSDXML_ATTRIBUTE; +typedef struct _WSDXML_PREFIX_MAPPING WSDXML_PREFIX_MAPPING; +typedef struct _WSDXML_ELEMENT_LIST WSDXML_ELEMENT_LIST; +typedef struct _WSDXML_TYPE WSDXML_TYPE; + +#ifdef __cplusplus +} +#endif + +#include <wsdtypes.h> +#include <wsdbase.h> +#include <wsdxmldom.h> +#include <wsdxml.h> +#include <wsddisco.h> + +#endif

1 0