Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[akhaldi] 67514: [WBEMDISP] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 2 19:38:14 2015 New Revision: 67514 URL: http://svn.reactos.org/svn/reactos?rev=67514&view=rev Log: [WBEMDISP] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt trunk/reactos/dll/win32/wbemdisp/guid.c trunk/reactos/dll/win32/wbemdisp/locator.c trunk/reactos/dll/win32/wbemdisp/main.c trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt [iso-8859-1] Sat May 2 19:38:14 2015 @@ -27,6 +27,6 @@ set_module_type(wbemdisp win32dll) target_link_libraries(wbemdisp uuid wine) add_dependencies(wbemdisp stdole2 wbemdisp_idlheader) -add_importlibs(wbemdisp oleaut32 msvcrt kernel32 ntdll) +add_importlibs(wbemdisp oleaut32 ole32 msvcrt kernel32 ntdll) add_pch(wbemdisp wbemdisp_private.h SOURCE) add_cd_file(TARGET wbemdisp DESTINATION reactos/system32/wbem FOR all) Modified: trunk/reactos/dll/win32/wbemdisp/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/guid.c?… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/guid.c [iso-8859-1] Sat May 2 19:38:14 2015 @@ -12,5 +12,7 @@ #include <initguid.h> #include <wbemdisp_classes.h> #include <wbemdisp.h> +#include <wbemcli.h> +#include <wmiutils.h> /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Modified: trunk/reactos/dll/win32/wbemdisp/locator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/locator… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/locator.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/locator.c [iso-8859-1] Sat May 2 19:38:14 2015 @@ -18,78 +18,16 @@ #include "wbemdisp_private.h" -#include <winnls.h> -#include <oleauto.h> - -struct locator -{ - ISWbemLocator ISWbemLocator_iface; - LONG refs; -}; - -static inline struct locator *impl_from_ISWbemLocator( ISWbemLocator *iface ) -{ - return CONTAINING_RECORD( iface, struct locator, ISWbemLocator_iface ); -} - -static ULONG WINAPI locator_AddRef( - ISWbemLocator *iface ) -{ - struct locator *locator = impl_from_ISWbemLocator( iface ); - return InterlockedIncrement( &locator->refs ); -} - -static ULONG WINAPI locator_Release( - ISWbemLocator *iface ) -{ - struct locator *locator = impl_from_ISWbemLocator( iface ); - LONG refs = InterlockedDecrement( &locator->refs ); - if (!refs) - { - TRACE( "destroying %p\n", locator ); - heap_free( locator ); - } - return refs; -} - -static HRESULT WINAPI locator_QueryInterface( - ISWbemLocator *iface, - REFIID riid, - void **ppvObject ) -{ - struct locator *locator = impl_from_ISWbemLocator( iface ); - - TRACE( "%p, %s, %p\n", locator, debugstr_guid( riid ), ppvObject ); - - if (IsEqualGUID( riid, &IID_ISWbemLocator ) || - IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IUnknown )) - { - *ppvObject = iface; - } - else - { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); - return E_NOINTERFACE; - } - ISWbemLocator_AddRef( iface ); - return S_OK; -} - -static HRESULT WINAPI locator_GetTypeInfoCount( - ISWbemLocator *iface, - UINT *count ) -{ - struct locator *locator = impl_from_ISWbemLocator( iface ); - - TRACE( "%p, %p\n", locator, count ); - *count = 1; - return S_OK; -} +#include <wbemcli.h> + +static HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** ); enum type_id { ISWbemLocator_tid, + ISWbemObject_tid, + ISWbemObjectSet_tid, + ISWbemServices_tid, last_tid }; @@ -98,7 +36,10 @@ static REFIID wbemdisp_tid_id[] = { - &IID_ISWbemLocator + &IID_ISWbemLocator, + &IID_ISWbemObject, + &IID_ISWbemObjectSet, + &IID_ISWbemServices }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -132,6 +73,1179 @@ ITypeInfo_Release( typeinfo ); } *ret = wbemdisp_typeinfo[tid]; + ITypeInfo_AddRef( *ret ); + return S_OK; +} + +#define DISPID_BASE 0x1800000 + +struct member +{ + BSTR name; + DISPID dispid; +}; + +struct object +{ + ISWbemObject ISWbemObject_iface; + LONG refs; + IWbemClassObject *object; + struct member *members; + UINT nb_members; + DISPID last_dispid; +}; + +static inline struct object *impl_from_ISWbemObject( + ISWbemObject *iface ) +{ + return CONTAINING_RECORD( iface, struct object, ISWbemObject_iface ); +} + +static ULONG WINAPI object_AddRef( + ISWbemObject *iface ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + return InterlockedIncrement( &object->refs ); +} + +static ULONG WINAPI object_Release( + ISWbemObject *iface ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + LONG refs = InterlockedDecrement( &object->refs ); + if (!refs) + { + UINT i; + + TRACE( "destroying %p\n", object ); + IWbemClassObject_Release( object->object ); + for (i = 0; i < object->nb_members; i++) SysFreeString( object->members[i].name ); + heap_free( object->members ); + heap_free( object ); + } + return refs; +} + +static HRESULT WINAPI object_QueryInterface( + ISWbemObject *iface, + REFIID riid, + void **ppvObject ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p %s %p\n", object, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemObject ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = object; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemObject_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI object_GetTypeInfoCount( + ISWbemObject *iface, + UINT *count ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p, %p\n", object, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI object_GetTypeInfo( + ISWbemObject *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + FIXME( "%p, %u, %u, %p\n", object, index, lcid, info ); + return E_NOTIMPL; +} + +#define DISPID_BASE 0x1800000 + +static HRESULT init_members( struct object *object ) +{ + LONG bound, i; + SAFEARRAY *sa; + HRESULT hr; + + if (object->members) return S_OK; + + hr = IWbemClassObject_GetNames( object->object, NULL, 0, NULL, &sa ); + if (FAILED( hr )) return hr; + hr = SafeArrayGetUBound( sa, 1, &bound ); + if (FAILED( hr )) + { + SafeArrayDestroy( sa ); + return hr; + } + if (!(object->members = heap_alloc( sizeof(struct member) * (bound + 1) ))) + { + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } + for (i = 0; i <= bound; i++) + { + hr = SafeArrayGetElement( sa, &i, &object->members[i].name ); + if (FAILED( hr )) + { + for (i--; i >= 0; i--) SysFreeString( object->members[i].name ); + SafeArrayDestroy( sa ); + heap_free( object->members ); + object->members = NULL; + return E_OUTOFMEMORY; + } + object->members[i].dispid = 0; + } + object->nb_members = bound + 1; + SafeArrayDestroy( sa ); + return S_OK; +} + +static DISPID get_member_dispid( struct object *object, const WCHAR *name ) +{ + UINT i; + for (i = 0; i < object->nb_members; i++) + { + if (!strcmpiW( object->members[i].name, name )) + { + if (!object->members[i].dispid) object->members[i].dispid = ++object->last_dispid; + return object->members[i].dispid; + } + } + return DISPID_UNKNOWN; +} + +static HRESULT WINAPI object_GetIDsOfNames( + ISWbemObject *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + HRESULT hr; + UINT i; + + TRACE( "%p, %s, %p, %u, %u, %p\n", object, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = init_members( object ); + if (FAILED( hr )) return hr; + + for (i = 0; i < count; i++) + { + if ((dispid[i] = get_member_dispid( object, names[i] )) == DISPID_UNKNOWN) break; + } + if (i != count) return DISP_E_UNKNOWNNAME; + return S_OK; +} + +static BSTR get_member_name( struct object *object, DISPID dispid ) +{ + UINT i; + for (i = 0; i < object->nb_members; i++) + { + if (object->members[i].dispid == dispid) return object->members[i].name; + } + return NULL; +} + +static HRESULT WINAPI object_Invoke( + ISWbemObject *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + BSTR name; + + 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 (flags != (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) + { + FIXME( "flags %x not supported\n", flags ); + return E_NOTIMPL; + } + if (!(name = get_member_name( object, member ))) + return DISP_E_MEMBERNOTFOUND; + + memset( params, 0, sizeof(*params) ); + return IWbemClassObject_Get( object->object, name, 0, result, NULL, NULL ); +} + +static HRESULT WINAPI object_Put_( + ISWbemObject *iface, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectPath **objWbemObjectPath ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const ISWbemObjectVtbl object_vtbl = +{ + object_QueryInterface, + object_AddRef, + object_Release, + object_GetTypeInfoCount, + object_GetTypeInfo, + object_GetIDsOfNames, + object_Invoke, + object_Put_ +}; + +static HRESULT SWbemObject_create( IWbemClassObject *wbem_object, ISWbemObject **obj ) +{ + struct object *object; + + TRACE( "%p, %p\n", obj, wbem_object ); + + if (!(object = heap_alloc( sizeof(*object) ))) return E_OUTOFMEMORY; + object->ISWbemObject_iface.lpVtbl = &object_vtbl; + object->refs = 1; + object->object = wbem_object; + IWbemClassObject_AddRef( object->object ); + object->members = NULL; + object->nb_members = 0; + object->last_dispid = DISPID_BASE; + + *obj = &object->ISWbemObject_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + +struct objectset +{ + ISWbemObjectSet ISWbemObjectSet_iface; + LONG refs; + IEnumWbemClassObject *objectenum; +}; + +static inline struct objectset *impl_from_ISWbemObjectSet( + ISWbemObjectSet *iface ) +{ + return CONTAINING_RECORD( iface, struct objectset, ISWbemObjectSet_iface ); +} + +static ULONG WINAPI objectset_AddRef( + ISWbemObjectSet *iface ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + return InterlockedIncrement( &objectset->refs ); +} + +static ULONG WINAPI objectset_Release( + ISWbemObjectSet *iface ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + LONG refs = InterlockedDecrement( &objectset->refs ); + if (!refs) + { + TRACE( "destroying %p\n", objectset ); + IEnumWbemClassObject_Release( objectset->objectenum ); + heap_free( objectset ); + } + return refs; +} + +static HRESULT WINAPI objectset_QueryInterface( + ISWbemObjectSet *iface, + REFIID riid, + void **ppvObject ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + + TRACE( "%p %s %p\n", objectset, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemObjectSet ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = objectset; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemObjectSet_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI objectset_GetTypeInfoCount( + ISWbemObjectSet *iface, + UINT *count ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + TRACE( "%p, %p\n", objectset, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI objectset_GetTypeInfo( + ISWbemObjectSet *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + TRACE( "%p, %u, %u, %p\n", objectset, index, lcid, info ); + + return get_typeinfo( ISWbemObjectSet_tid, info ); +} + +static HRESULT WINAPI objectset_GetIDsOfNames( + ISWbemObjectSet *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", objectset, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemObjectSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI objectset_Invoke( + ISWbemObjectSet *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", objectset, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemObjectSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &objectset->ISWbemObjectSet_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI objectset_get__NewEnum( + ISWbemObjectSet *iface, + IUnknown **pUnk ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + IEnumWbemClassObject *objectenum; + HRESULT hr; + + TRACE( "%p, %p\n", objectset, pUnk ); + + hr = IEnumWbemClassObject_Clone( objectset->objectenum, &objectenum ); + if (FAILED( hr )) return hr; + + hr = EnumVARIANT_create( objectenum, (IEnumVARIANT **)pUnk ); + IEnumWbemClassObject_Release( objectenum ); + return hr; +} + +static HRESULT WINAPI objectset_Item( + ISWbemObjectSet *iface, + BSTR strObjectPath, + LONG iFlags, + ISWbemObject **objWbemObject ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI objectset_get_Count( + ISWbemObjectSet *iface, + LONG *iCount ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + LONG count = 0, total = 0; + + TRACE( "%p, %p\n", objectset, iCount ); + + while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) count++; + + IEnumWbemClassObject_Reset( objectset->objectenum ); + while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) total++; + + count = total - count; + IEnumWbemClassObject_Reset( objectset->objectenum ); + while (count--) IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ); + + *iCount = total; + return S_OK; +} + +static HRESULT WINAPI objectset_get_Security_( + ISWbemObjectSet *iface, + ISWbemSecurity **objWbemSecurity ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI objectset_ItemIndex( + ISWbemObjectSet *iface, + LONG lIndex, + ISWbemObject **objWbemObject ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const ISWbemObjectSetVtbl objectset_vtbl = +{ + objectset_QueryInterface, + objectset_AddRef, + objectset_Release, + objectset_GetTypeInfoCount, + objectset_GetTypeInfo, + objectset_GetIDsOfNames, + objectset_Invoke, + objectset_get__NewEnum, + objectset_Item, + objectset_get_Count, + objectset_get_Security_, + objectset_ItemIndex +}; + +static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISWbemObjectSet **obj ) +{ + struct objectset *objectset; + + TRACE( "%p, %p\n", obj, wbem_objectenum ); + + if (!(objectset = heap_alloc( sizeof(*objectset) ))) return E_OUTOFMEMORY; + objectset->ISWbemObjectSet_iface.lpVtbl = &objectset_vtbl; + objectset->refs = 1; + objectset->objectenum = wbem_objectenum; + IEnumWbemClassObject_AddRef( objectset->objectenum ); + + *obj = &objectset->ISWbemObjectSet_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + +struct enumvar +{ + IEnumVARIANT IEnumVARIANT_iface; + LONG refs; + IEnumWbemClassObject *objectenum; +}; + +static inline struct enumvar *impl_from_IEnumVARIANT( + IEnumVARIANT *iface ) +{ + return CONTAINING_RECORD( iface, struct enumvar, IEnumVARIANT_iface ); +} + +static ULONG WINAPI enumvar_AddRef( + IEnumVARIANT *iface ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + return InterlockedIncrement( &enumvar->refs ); +} + +static ULONG WINAPI enumvar_Release( + IEnumVARIANT *iface ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + LONG refs = InterlockedDecrement( &enumvar->refs ); + if (!refs) + { + TRACE( "destroying %p\n", enumvar ); + IEnumWbemClassObject_Release( enumvar->objectenum ); + heap_free( enumvar ); + } + return refs; +} + +static HRESULT WINAPI enumvar_QueryInterface( + IEnumVARIANT *iface, + REFIID riid, + void **ppvObject ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + + TRACE( "%p %s %p\n", enumvar, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_IEnumVARIANT ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = enumvar; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + IEnumVARIANT_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI enumvar_Next( IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + IWbemClassObject *obj; + ULONG count = 0; + + TRACE( "%p, %u, %p, %p\n", iface, celt, var, fetched ); + + if (celt) IEnumWbemClassObject_Next( enumvar->objectenum, WBEM_INFINITE, 1, &obj, &count ); + if (count) + { + ISWbemObject *sobj; + HRESULT hr; + + hr = SWbemObject_create( obj, &sobj ); + IWbemClassObject_Release( obj ); + if (FAILED( hr )) return hr; + + V_VT( var ) = VT_DISPATCH; + V_DISPATCH( var ) = (IDispatch *)sobj; + } + if (fetched) *fetched = count; + return (count < celt) ? S_FALSE : S_OK; +} + +static HRESULT WINAPI enumvar_Skip( IEnumVARIANT *iface, ULONG celt ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + + TRACE( "%p, %u\n", iface, celt ); + + return IEnumWbemClassObject_Skip( enumvar->objectenum, WBEM_INFINITE, celt ); +} + +static HRESULT WINAPI enumvar_Reset( IEnumVARIANT *iface ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + + TRACE( "%p\n", iface ); + + return IEnumWbemClassObject_Reset( enumvar->objectenum ); +} + +static HRESULT WINAPI enumvar_Clone( IEnumVARIANT *iface, IEnumVARIANT **penum ) +{ + FIXME( "%p, %p\n", iface, penum ); + return E_NOTIMPL; +} + +static const struct IEnumVARIANTVtbl enumvar_vtbl = +{ + enumvar_QueryInterface, + enumvar_AddRef, + enumvar_Release, + enumvar_Next, + enumvar_Skip, + enumvar_Reset, + enumvar_Clone +}; + +static HRESULT EnumVARIANT_create( IEnumWbemClassObject *objectenum, IEnumVARIANT **obj ) +{ + struct enumvar *enumvar; + + if (!(enumvar = heap_alloc( sizeof(*enumvar) ))) return E_OUTOFMEMORY; + enumvar->IEnumVARIANT_iface.lpVtbl = &enumvar_vtbl; + enumvar->refs = 1; + enumvar->objectenum = objectenum; + IEnumWbemClassObject_AddRef( enumvar->objectenum ); + + *obj = &enumvar->IEnumVARIANT_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + +struct services +{ + ISWbemServices ISWbemServices_iface; + LONG refs; + IWbemServices *services; +}; + +static inline struct services *impl_from_ISWbemServices( + ISWbemServices *iface ) +{ + return CONTAINING_RECORD( iface, struct services, ISWbemServices_iface ); +} + +static ULONG WINAPI services_AddRef( + ISWbemServices *iface ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + return InterlockedIncrement( &services->refs ); +} + +static ULONG WINAPI services_Release( + ISWbemServices *iface ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + LONG refs = InterlockedDecrement( &services->refs ); + if (!refs) + { + TRACE( "destroying %p\n", services ); + IWbemServices_Release( services->services ); + heap_free( services ); + } + return refs; +} + +static HRESULT WINAPI services_QueryInterface( + ISWbemServices *iface, + REFIID riid, + void **ppvObject ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + + TRACE( "%p %s %p\n", services, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemServices ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = services; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemServices_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI services_GetTypeInfoCount( + ISWbemServices *iface, + UINT *count ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + TRACE( "%p, %p\n", services, count ); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI services_GetTypeInfo( + ISWbemServices *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + TRACE( "%p, %u, %u, %p\n", services, index, lcid, info ); + + return get_typeinfo( ISWbemServices_tid, info ); +} + +static HRESULT WINAPI services_GetIDsOfNames( + ISWbemServices *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", services, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemServices_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI services_Invoke( + ISWbemServices *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", services, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemServices_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &services->ISWbemServices_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI services_Get( + ISWbemServices *iface, + BSTR strObjectPath, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObject **objWbemObject ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + IWbemClassObject *obj; + HRESULT hr; + + TRACE( "%p, %s, %d, %p, %p\n", iface, debugstr_w(strObjectPath), iFlags, objWbemNamedValueSet, + objWbemObject ); + + if (objWbemNamedValueSet) FIXME( "ignoring context\n" ); + + hr = IWbemServices_GetObject( services->services, strObjectPath, iFlags, NULL, &obj, NULL ); + if (hr != S_OK) return hr; + + hr = SWbemObject_create( obj, objWbemObject ); + IWbemClassObject_Release( obj ); + return hr; +} + +static HRESULT WINAPI services_GetAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strObjectPath, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_Delete( + ISWbemServices *iface, + BSTR strObjectPath, + LONG iFlags, + IDispatch *objWbemNamedValueSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_DeleteAsync( + ISWbemServices* This, + IDispatch *objWbemSink, + BSTR strObjectPath, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static BSTR build_query_string( const WCHAR *class ) +{ + static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; + UINT len = strlenW(class) + sizeof(selectW) / sizeof(selectW[0]); + BSTR ret; + + if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; + strcpyW( ret, selectW ); + strcatW( ret, class ); + return ret; +} + +static HRESULT WINAPI services_InstancesOf( + ISWbemServices *iface, + BSTR strClass, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + static const WCHAR wqlW[] = {'W','Q','L',0}; + BSTR query, wql = SysAllocString( wqlW ); + HRESULT hr; + + TRACE( "%p, %s, %x, %p, %p\n", iface, debugstr_w(strClass), iFlags, objWbemNamedValueSet, + objWbemObjectSet ); + + if (!(query = build_query_string( strClass ))) + { + SysFreeString( wql ); + return E_OUTOFMEMORY; + } + hr = ISWbemServices_ExecQuery( iface, query, wql, iFlags, objWbemNamedValueSet, objWbemObjectSet ); + SysFreeString( wql ); + SysFreeString( query ); + return hr; +} + +static HRESULT WINAPI services_InstancesOfAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strClass, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_SubclassesOf( + ISWbemServices *iface, + BSTR strSuperclass, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_SubclassesOfAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strSuperclass, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ExecQuery( + ISWbemServices *iface, + BSTR strQuery, + BSTR strQueryLanguage, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + IEnumWbemClassObject *iter; + HRESULT hr; + + TRACE( "%p, %s, %s, %x, %p, %p\n", iface, debugstr_w(strQuery), debugstr_w(strQueryLanguage), + iFlags, objWbemNamedValueSet, objWbemObjectSet ); + + if (objWbemNamedValueSet) FIXME( "ignoring context\n" ); + + hr = IWbemServices_ExecQuery( services->services, strQueryLanguage, strQuery, iFlags, NULL, &iter ); + if (hr != S_OK) return hr; + + hr = SWbemObjectSet_create( iter, objWbemObjectSet ); + IEnumWbemClassObject_Release( iter ); + return hr; +} + +static HRESULT WINAPI services_ExecQueryAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strQuery, + BSTR strQueryLanguage, + LONG lFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_AssociatorsOf( + ISWbemServices *iface, + BSTR strObjectPath, + BSTR strAssocClass, + BSTR strResultClass, + BSTR strResultRole, + BSTR strRole, + VARIANT_BOOL bClassesOnly, + VARIANT_BOOL bSchemaOnly, + BSTR strRequiredAssocQualifier, + BSTR strRequiredQualifier, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_AssociatorsOfAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strObjectPath, + BSTR strAssocClass, + BSTR strResultClass, + BSTR strResultRole, + BSTR strRole, + VARIANT_BOOL bClassesOnly, + VARIANT_BOOL bSchemaOnly, + BSTR strRequiredAssocQualifier, + BSTR strRequiredQualifier, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ReferencesTo( + ISWbemServices *iface, + BSTR strObjectPath, + BSTR strResultClass, + BSTR strRole, + VARIANT_BOOL bClassesOnly, + VARIANT_BOOL bSchemaOnly, + BSTR strRequiredQualifier, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ReferencesToAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strObjectPath, + BSTR strResultClass, + BSTR strRole, + VARIANT_BOOL bClassesOnly, + VARIANT_BOOL bSchemaOnly, + BSTR strRequiredQualifier, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ExecNotificationQuery( + ISWbemServices *iface, + BSTR strQuery, + BSTR strQueryLanguage, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemEventSource **objWbemEventSource ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ExecNotificationQueryAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strQuery, + BSTR strQueryLanguage, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ExecMethod( + ISWbemServices *iface, + BSTR strObjectPath, + BSTR strMethodName, + IDispatch *objWbemInParameters, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObject **objWbemOutParameters ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ExecMethodAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strObjectPath, + BSTR strMethodName, + IDispatch *objWbemInParameters, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_get_Security_( + ISWbemServices *iface, + ISWbemSecurity **objWbemSecurity ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const ISWbemServicesVtbl services_vtbl = +{ + services_QueryInterface, + services_AddRef, + services_Release, + services_GetTypeInfoCount, + services_GetTypeInfo, + services_GetIDsOfNames, + services_Invoke, + services_Get, + services_GetAsync, + services_Delete, + services_DeleteAsync, + services_InstancesOf, + services_InstancesOfAsync, + services_SubclassesOf, + services_SubclassesOfAsync, + services_ExecQuery, + services_ExecQueryAsync, + services_AssociatorsOf, + services_AssociatorsOfAsync, + services_ReferencesTo, + services_ReferencesToAsync, + services_ExecNotificationQuery, + services_ExecNotificationQueryAsync, + services_ExecMethod, + services_ExecMethodAsync, + services_get_Security_ +}; + +static HRESULT SWbemServices_create( IWbemServices *wbem_services, ISWbemServices **obj ) +{ + struct services *services; + + TRACE( "%p, %p\n", obj, wbem_services ); + + if (!(services = heap_alloc( sizeof(*services) ))) return E_OUTOFMEMORY; + services->ISWbemServices_iface.lpVtbl = &services_vtbl; + services->refs = 1; + services->services = wbem_services; + IWbemServices_AddRef( services->services ); + + *obj = &services->ISWbemServices_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + +struct locator +{ + ISWbemLocator ISWbemLocator_iface; + LONG refs; + IWbemLocator *locator; +}; + +static inline struct locator *impl_from_ISWbemLocator( ISWbemLocator *iface ) +{ + return CONTAINING_RECORD( iface, struct locator, ISWbemLocator_iface ); +} + +static ULONG WINAPI locator_AddRef( + ISWbemLocator *iface ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + return InterlockedIncrement( &locator->refs ); +} + +static ULONG WINAPI locator_Release( + ISWbemLocator *iface ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + LONG refs = InterlockedDecrement( &locator->refs ); + if (!refs) + { + TRACE( "destroying %p\n", locator ); + IWbemLocator_Release( locator->locator ); + heap_free( locator ); + } + return refs; +} + +static HRESULT WINAPI locator_QueryInterface( + ISWbemLocator *iface, + REFIID riid, + void **ppvObject ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + + TRACE( "%p, %s, %p\n", locator, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemLocator ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemLocator_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI locator_GetTypeInfoCount( + ISWbemLocator *iface, + UINT *count ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + + TRACE( "%p, %p\n", locator, count ); + *count = 1; return S_OK; } @@ -200,6 +1314,31 @@ return hr; } +static BSTR build_resource_string( BSTR server, BSTR namespace ) +{ + static const WCHAR defaultW[] = {'r','o','o','t','\\','d','e','f','a','u','l','t',0}; + ULONG len, len_server = 0, len_namespace = 0; + BSTR ret; + + if (server && *server) len_server = strlenW( server ); + else len_server = 1; + if (namespace && *namespace) len_namespace = strlenW( namespace ); + else len_namespace = sizeof(defaultW) / sizeof(defaultW[0]) - 1; + + if (!(ret = SysAllocStringLen( NULL, 2 + len_server + 1 + len_namespace ))) return NULL; + + ret[0] = ret[1] = '\\'; + if (server && *server) strcpyW( ret + 2, server ); + else ret[2] = '.'; + + len = len_server + 2; + ret[len++] = '\\'; + + if (namespace && *namespace) strcpyW( ret + len, namespace ); + else strcpyW( ret + len, defaultW ); + return ret; +} + static HRESULT WINAPI locator_ConnectServer( ISWbemLocator *iface, BSTR strServer, @@ -212,10 +1351,33 @@ IDispatch *objWbemNamedValueSet, ISWbemServices **objWbemServices ) { - FIXME( "%p, %s, %s, %s, %p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strServer), + struct locator *locator = impl_from_ISWbemLocator( iface ); + IWbemServices *services; + BSTR resource; + HRESULT hr; + + TRACE( "%p, %s, %s, %s, %p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strServer), debugstr_w(strNamespace), debugstr_w(strUser), strPassword, debugstr_w(strLocale), debugstr_w(strAuthority), iSecurityFlags, objWbemNamedValueSet, objWbemServices ); - return E_NOTIMPL; + + if (objWbemNamedValueSet) FIXME( "context not supported\n" ); + + if (!locator->locator) + { + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, + (void **)&locator->locator ); + if (hr != S_OK) return hr; + } + + if (!(resource = build_resource_string( strServer, strNamespace ))) return E_OUTOFMEMORY; + hr = IWbemLocator_ConnectServer( locator->locator, resource, strUser, strPassword, strLocale, + iSecurityFlags, strAuthority, NULL, &services ); + SysFreeString( resource ); + if (hr != S_OK) return hr; + + hr = SWbemServices_create( services, objWbemServices ); + IWbemServices_Release( services ); + return hr; } static HRESULT WINAPI locator_get_Security_( @@ -248,6 +1410,7 @@ if (!(locator = heap_alloc( sizeof(*locator) ))) return E_OUTOFMEMORY; locator->ISWbemLocator_iface.lpVtbl = &locator_vtbl; locator->refs = 1; + locator->locator = NULL; *obj = &locator->ISWbemLocator_iface; TRACE( "returning iface %p\n", *obj ); Modified: trunk/reactos/dll/win32/wbemdisp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/main.c?… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/main.c [iso-8859-1] Sat May 2 19:38:14 2015 @@ -19,9 +19,252 @@ #include "wbemdisp_private.h" #include <rpcproxy.h> +#include <wmiutils.h> #include <wbemdisp_classes.h> static HINSTANCE instance; + +struct moniker +{ + IMoniker IMoniker_iface; + LONG refs; + IUnknown *obj; +}; + +static inline struct moniker *impl_from_IMoniker( + IMoniker *iface ) +{ + return CONTAINING_RECORD( iface, struct moniker, IMoniker_iface ); +} + +static ULONG WINAPI moniker_AddRef( + IMoniker *iface ) +{ + struct moniker *moniker = impl_from_IMoniker( iface ); + return InterlockedIncrement( &moniker->refs ); +} + +static ULONG WINAPI moniker_Release( + IMoniker *iface ) +{ + struct moniker *moniker = impl_from_IMoniker( iface ); + LONG refs = InterlockedDecrement( &moniker->refs ); + if (!refs) + { + TRACE( "destroying %p\n", moniker ); + IUnknown_Release( moniker->obj ); + heap_free( moniker ); + } + return refs; +} + +static HRESULT WINAPI moniker_QueryInterface( + IMoniker *iface, REFIID riid, void **ppvObject ) +{ + struct moniker *moniker = impl_from_IMoniker( iface ); + + TRACE( "%p, %s, %p\n", moniker, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_IMoniker ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + IMoniker_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI moniker_GetClassID( + IMoniker *iface, CLSID *pClassID ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_IsDirty( + IMoniker *iface ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_Load( + IMoniker *iface, IStream *pStm ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_Save( + IMoniker *iface, IStream *pStm, BOOL fClearDirty ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_GetSizeMax( + IMoniker *iface, ULARGE_INTEGER *pcbSize ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_BindToObject( + IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riidResult, void **ppvResult ) +{ + struct moniker *moniker = impl_from_IMoniker( iface ); + + TRACE( "%p, %p, %p, %s, %p\n", iface, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult ); + return IUnknown_QueryInterface( moniker->obj, riidResult, ppvResult ); +} + +static HRESULT WINAPI moniker_BindToStorage( + IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, void **ppvObj ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_Reduce( + IMoniker *iface, IBindCtx *pbc, DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker **ppmkReduced ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_ComposeWith( + IMoniker *iface, IMoniker *pmkRight, BOOL fOnlyIfNotGeneric, IMoniker **ppmkComposite ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_Enum( + IMoniker *iface, BOOL fForward, IEnumMoniker **ppenumMoniker ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_IsEqual( + IMoniker *iface, IMoniker *pmkOtherMoniker ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_Hash( + IMoniker *iface, DWORD *pdwHash ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_IsRunning( + IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, IMoniker *pmkNewlyRunning ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_GetTimeOfLastChange( + IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, FILETIME *pFileTime ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_Inverse( + IMoniker *iface, IMoniker **ppmk ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_CommonPrefixWith( + IMoniker *iface, IMoniker *pmkOther, IMoniker **ppmkPrefix ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_RelativePathTo( + IMoniker *iface, IMoniker *pmkOther, IMoniker **ppmkRelPath ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_GetDisplayName( + IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_ParseDisplayName( + IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR pszDisplayName, ULONG *pchEaten, + IMoniker **ppmkOut ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_IsSystemMoniker( + IMoniker *iface, DWORD *pdwMksys ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const IMonikerVtbl moniker_vtbl = +{ + moniker_QueryInterface, + moniker_AddRef, + moniker_Release, + moniker_GetClassID, + moniker_IsDirty, + moniker_Load, + moniker_Save, + moniker_GetSizeMax, + moniker_BindToObject, + moniker_BindToStorage, + moniker_Reduce, + moniker_ComposeWith, + moniker_Enum, + moniker_IsEqual, + moniker_Hash, + moniker_IsRunning, + moniker_GetTimeOfLastChange, + moniker_Inverse, + moniker_CommonPrefixWith, + moniker_RelativePathTo, + moniker_GetDisplayName, + moniker_ParseDisplayName, + moniker_IsSystemMoniker +}; + +static HRESULT Moniker_create( IUnknown *unk, IMoniker **obj ) +{ + struct moniker *moniker; + + TRACE( "%p, %p\n", unk, obj ); + + if (!(moniker = heap_alloc( sizeof(*moniker) ))) return E_OUTOFMEMORY; + moniker->IMoniker_iface.lpVtbl = &moniker_vtbl; + moniker->refs = 1; + moniker->obj = unk; + IUnknown_AddRef( moniker->obj ); + + *obj = &moniker->IMoniker_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} static HRESULT WINAPI WinMGMTS_QueryInterface(IParseDisplayName *iface, REFIID riid, void **ppv) { @@ -51,11 +294,118 @@ return 1; } +static HRESULT parse_path( const WCHAR *str, BSTR *server, BSTR *namespace, BSTR *relative ) +{ + IWbemPath *path; + ULONG len; + HRESULT hr; + + *server = *namespace = *relative = NULL; + + hr = CoCreateInstance( &CLSID_WbemDefPath, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemPath, (void **)&path ); + if (hr != S_OK) return hr; + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, str ); + if (hr != S_OK) goto done; + + len = 0; + hr = IWbemPath_GetServer( path, &len, NULL ); + if (hr == S_OK) + { + if (!(*server = SysAllocStringLen( NULL, len ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + hr = IWbemPath_GetServer( path, &len, *server ); + if (hr != S_OK) goto done; + } + + len = 0; + hr = IWbemPath_GetText( path, WBEMPATH_GET_NAMESPACE_ONLY, &len, NULL ); + if (hr == S_OK) + { + if (!(*namespace = SysAllocStringLen( NULL, len ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + hr = IWbemPath_GetText( path, WBEMPATH_GET_NAMESPACE_ONLY, &len, *namespace ); + if (hr != S_OK) goto done; + } + len = 0; + hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, NULL ); + if (hr == S_OK) + { + if (!(*relative = SysAllocStringLen( NULL, len ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, *relative ); + } + +done: + IWbemPath_Release( path ); + if (hr != S_OK) + { + SysFreeString( *server ); + SysFreeString( *namespace ); + SysFreeString( *relative ); + } + return hr; +} + static HRESULT WINAPI WinMGMTS_ParseDisplayName(IParseDisplayName *iface, IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { - FIXME("(%p %s %p %p)\n", pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut); - return E_NOTIMPL; + static const WCHAR prefixW[] = {'w','i','n','m','g','m','t','s',':',0}; + const DWORD prefix_len = sizeof(prefixW) / sizeof(prefixW[0]) - 1; + ISWbemLocator *locator = NULL; + ISWbemServices *services = NULL; + ISWbemObject *obj = NULL; + BSTR server, namespace, relative; + WCHAR *p; + HRESULT hr; + + TRACE( "%p, %p, %s, %p, %p\n", iface, pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut ); + + if (strncmpiW( pszDisplayName, prefixW, prefix_len )) return MK_E_SYNTAX; + + p = pszDisplayName + prefix_len; + if (*p == '{') + { + FIXME( "ignoring security settings\n" ); + while (*p && *p != '}') p++; + if (*p == '}') p++; + if (*p == '!') p++; + } + hr = parse_path( p, &server, &namespace, &relative ); + if (hr != S_OK) return hr; + + hr = SWbemLocator_create( (void **)&locator ); + if (hr != S_OK) goto done; + + hr = ISWbemLocator_ConnectServer( locator, server, namespace, NULL, NULL, NULL, NULL, 0, NULL, &services ); + if (hr != S_OK) goto done; + + if (!relative || !*relative) Moniker_create( (IUnknown *)services, ppmkOut ); + else + { + hr = ISWbemServices_Get( services, relative, 0, NULL, &obj ); + if (hr != S_OK) goto done; + hr = Moniker_create( (IUnknown *)obj, ppmkOut ); + } + +done: + if (obj) ISWbemObject_Release( obj ); + if (services) ISWbemServices_Release( services ); + if (locator) ISWbemLocator_Release( locator ); + SysFreeString( server ); + SysFreeString( namespace ); + SysFreeString( relative ); + if (hr == S_OK) *pchEaten = strlenW( pszDisplayName ); + return hr; } static const IParseDisplayNameVtbl WinMGMTSVtbl = { Modified: trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/wbemdis… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h [iso-8859-1] Sat May 2 19:38:14 2015 @@ -32,9 +32,12 @@ #include <windef.h> #include <winbase.h> #include <objbase.h> +#include <oleauto.h> #include <wbemdisp.h> #include <wine/debug.h> +#include <wine/unicode.h> + WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 2 19:38:14 2015 @@ -200,7 +200,7 @@ reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.7.37 reactos/dll/win32/version # Synced to WineStaging-1.7.37 -reactos/dll/win32/wbemdisp # Synced to Wine-1.7.27 +reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.37 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.37 reactos/dll/win32/windowscodecs # Synced to Wine-1.7.27 reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.27

9 years, 4 months

[aandrejevic] 67513: [NTVDM] Save/restore the processor state when executing/terminating nested tasks.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat May 2 18:51:03 2015 New Revision: 67513 URL: http://svn.reactos.org/svn/reactos?rev=67513&view=rev Log: [NTVDM] Save/restore the processor state when executing/terminating nested tasks. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sat May 2 18:51:03 2015 @@ -44,6 +44,56 @@ PspBlock->CommandLineSize = min(*(PBYTE)CommandLine, DOS_CMDLINE_LENGTH); CommandLine++; RtlCopyMemory(PspBlock->CommandLine, CommandLine, DOS_CMDLINE_LENGTH); +} + +static inline VOID DosSaveState(VOID) +{ + PDOS_REGISTER_STATE State; + WORD StackPointer = getSP(); + + /* Allocate stack space for the registers */ + StackPointer -= sizeof(DOS_REGISTER_STATE); + State = SEG_OFF_TO_PTR(getSS(), StackPointer); + + /* Save */ + State->EAX = getEAX(); + State->ECX = getECX(); + State->EDX = getEDX(); + State->EBX = getEBX(); + State->ESP = getESP(); + State->EBP = getEBP(); + State->ESI = getESI(); + State->EDI = getEDI(); + State->DS = getDS(); + State->ES = getES(); + State->FS = getFS(); + State->GS = getGS(); + State->Flags = getEFLAGS(); +} + +static inline VOID DosRestoreState(VOID) +{ + PDOS_REGISTER_STATE State; + WORD StackPointer = getSP(); + + /* SS:SP points to the stack on the last entry to INT 21h */ + StackPointer -= (STACK_FLAGS + 1) * 2; /* Interrupt parameters */ + StackPointer -= sizeof(DOS_REGISTER_STATE); /* Pushed state structure */ + State = SEG_OFF_TO_PTR(getSS(), StackPointer); + + /* Restore */ + setEAX(State->EAX); + setECX(State->ECX); + setEDX(State->EDX); + setEBX(State->EBX); + setEBP(State->EBP); + setESI(State->ESI); + setEDI(State->EDI); + setDS(State->DS); + setES(State->ES); + setFS(State->FS); + setGS(State->GS); + setEFLAGS(State->Flags); } static WORD DosCopyEnvironmentBlock(LPCSTR Environment OPTIONAL, @@ -432,6 +482,9 @@ if (LoadType == DOS_LOAD_AND_EXECUTE) { + /* Save the program state */ + if (CurrentPsp != SYSTEM_PSP) DosSaveState(); + /* Set the initial segment registers */ setDS(Segment); setES(Segment); @@ -750,6 +803,9 @@ PDOS_MCB CurrentMcb; LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); PDOS_PSP PspBlock = SEGMENT_TO_PSP(Psp); +#ifndef STANDALONE + VDM_COMMAND_INFO CommandInfo; +#endif DPRINT("DosTerminateProcess: Psp 0x%04X, ReturnCode 0x%02X, KeepResident 0x%04X\n", Psp, @@ -818,29 +874,25 @@ { ResetEvent(VdmTaskEvent); CpuUnsimulate(); + return; } } #ifndef STANDALONE - // FIXME: This is probably not the best way to do it - /* Check if this was a nested DOS task */ - if (CurrentPsp != SYSTEM_PSP) - { - VDM_COMMAND_INFO CommandInfo; - - /* Decrement the re-entry count */ - CommandInfo.TaskId = SessionId; - CommandInfo.VDMState = VDM_DEC_REENTER_COUNT; - GetNextVDMCommand(&CommandInfo); - - /* Clear the structure */ - RtlZeroMemory(&CommandInfo, sizeof(CommandInfo)); - - /* Update the VDM state of the task */ - CommandInfo.TaskId = SessionId; - CommandInfo.VDMState = VDM_FLAG_DONT_WAIT; - GetNextVDMCommand(&CommandInfo); - } + + /* Decrement the re-entry count */ + CommandInfo.TaskId = SessionId; + CommandInfo.VDMState = VDM_DEC_REENTER_COUNT; + GetNextVDMCommand(&CommandInfo); + + /* Clear the structure */ + RtlZeroMemory(&CommandInfo, sizeof(CommandInfo)); + + /* Update the VDM state of the task */ + CommandInfo.TaskId = SessionId; + CommandInfo.VDMState = VDM_FLAG_DONT_WAIT; + GetNextVDMCommand(&CommandInfo); + #endif /* Save the return code - Normal termination */ @@ -850,6 +902,9 @@ setSS(HIWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); setSP(LOWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); + /* Restore the program state */ + DosRestoreState(); + /* Return control to the parent process */ CpuExecute(HIWORD(PspBlock->TerminateAddress), LOWORD(PspBlock->TerminateAddress)); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] Sat May 2 18:51:03 2015 @@ -72,6 +72,13 @@ }; } DOS_EXEC_PARAM_BLOCK, *PDOS_EXEC_PARAM_BLOCK; +typedef struct _DOS_REGISTER_STATE +{ + DWORD Flags; + WORD GS, FS, ES, DS; + DWORD EDI, ESI, EBP, ESP, EBX, EDX, ECX, EAX; +} DOS_REGISTER_STATE, *PDOS_REGISTER_STATE; + #pragma pack(pop) /* VARIABLES ******************************************************************/

9 years, 4 months

[aandrejevic] 67512: [FAST486] When storing a segment selector, the operand size attribute is only ignored when writing to memory (where it's treated as if it's always 16-bit).

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat May 2 16:09:00 2015 New Revision: 67512 URL: http://svn.reactos.org/svn/reactos?rev=67512&view=rev Log: [FAST486] When storing a segment selector, the operand size attribute is only ignored when writing to memory (where it's treated as if it's always 16-bit). Modified: trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Sat May 2 16:09:00 2015 @@ -3832,13 +3832,16 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeMovStoreSeg) { - BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + BOOLEAN OperandSize, AddressSize; FAST486_MOD_REG_RM ModRegRm; /* Make sure this is the right instruction */ ASSERT(Opcode == 0x8C); + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + TOGGLE_ADSIZE(AddressSize); + TOGGLE_OPSIZE(OperandSize); /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -3854,10 +3857,21 @@ return; } - Fast486WriteModrmWordOperands(State, - &ModRegRm, - FALSE, - State->SegmentRegs[ModRegRm.Register].Selector); + /* When the other operand is a memory location, always use 16-bit */ + if (OperandSize && !ModRegRm.Memory) + { + Fast486WriteModrmDwordOperands(State, + &ModRegRm, + FALSE, + State->SegmentRegs[ModRegRm.Register].Selector); + } + else + { + Fast486WriteModrmWordOperands(State, + &ModRegRm, + FALSE, + State->SegmentRegs[ModRegRm.Register].Selector); + } } FAST486_OPCODE_HANDLER(Fast486OpcodeLea)

9 years, 4 months

[tkreuzer] 67511: [CRT] Implement _setjmp / longjmp on ARM

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 2 14:07:28 2015 New Revision: 67511 URL: http://svn.reactos.org/svn/reactos?rev=67511&view=rev Log: [CRT] Implement _setjmp / longjmp on ARM Added: trunk/reactos/lib/sdk/crt/setjmp/arm/ (with props) trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s (with props) Propchange: trunk/reactos/lib/sdk/crt/setjmp/arm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat May 2 14:07:28 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/lib/sdk/crt/setjmp/arm/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/lib/sdk/crt/setjmp/arm/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/lib/sdk/crt/setjmp/arm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/setjmp/arm/set… ============================================================================== --- trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s (added) +++ trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s [iso-8859-1] Sat May 2 14:07:28 2015 @@ -0,0 +1,62 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of _setjmp / longjmp + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + TEXTAREA + + LEAF_ENTRY _setjmp + + mov r1, sp + + /* Store r1 (->Frame) and r4 - r11 */ + stmia r0!, {r1,r4-r11} + + /* Store r1 (->Sp), lr (->Pc), fp (->Fpscr) */ + stmia r0!, {r1,lr,fp} + + /* Store NEON registers */ + vst1.64 {d0}, [r0]! + vst1.64 {d1}, [r0]! + vst1.64 {d2}, [r0]! + vst1.64 {d3}, [r0]! + vst1.64 {d4}, [r0]! + vst1.64 {d5}, [r0]! + vst1.64 {d6}, [r0]! + vst1.64 {d7}, [r0]! + + /* Return 0 */ + mov r0, #0 + bx lr + LEAF_END _setjmp + + LEAF_ENTRY longjmp + + ldmia r0!, {r1,r4-r11} + ldmia r0!, {r1,lr,fp} + mov sp, r1 + + /* Load NEON registers */ + vld1.64 {d0}, [r0]! + vld1.64 {d1}, [r0]! + vld1.64 {d2}, [r0]! + vld1.64 {d3}, [r0]! + vld1.64 {d4}, [r0]! + vld1.64 {d5}, [r0]! + vld1.64 {d6}, [r0]! + vld1.64 {d7}, [r0]! + + /* Return 1 */ + mov r0, #1 + bx lr + LEAF_END longjmp + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/setjmp/arm/setjmp.s ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 4 months

[tkreuzer] 67510: [CRT] Add stub for __i64tod and C++ wrappers for ARM

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 2 12:48:50 2015 New Revision: 67510 URL: http://svn.reactos.org/svn/reactos?rev=67510&view=rev Log: [CRT] Add stub for __i64tod and C++ wrappers for ARM Added: trunk/reactos/lib/sdk/crt/except/arm/cpp.s (with props) trunk/reactos/lib/sdk/crt/math/arm/__i64tod.s (with props) Added: trunk/reactos/lib/sdk/crt/except/arm/cpp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/cpp… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/cpp.s (added) +++ trunk/reactos/lib/sdk/crt/except/arm/cpp.s [iso-8859-1] Sat May 2 12:48:50 2015 @@ -0,0 +1,120 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: MSVC wrappers for C++ functions + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + MACRO + DEFINE_ALIAS $FuncName, $Target + IMPORT $Target + NESTED_ENTRY $FuncName + b $Target + NESTED_END $FuncName + MEND + + DEFINE_ALIAS ??0exception@@QAE@ABQBD@Z, MSVCRT_exception_ctor + DEFINE_ALIAS ??0exception@@QAE@ABQBDH@Z, MSVCRT_exception_ctor_noalloc + DEFINE_ALIAS ??0exception@@QAE@ABV0@@Z, MSVCRT_exception_copy_ctor + DEFINE_ALIAS ??0exception@@QAE@XZ, MSVCRT_exception_default_ctor + DEFINE_ALIAS ??1exception@@UAE@XZ, MSVCRT_exception_dtor + DEFINE_ALIAS ??4exception@@QAEAAV0@ABV0@@Z, MSVCRT_exception_opequals + DEFINE_ALIAS ??_Eexception@@UAEPAXI@Z, MSVCRT_exception_vector_dtor + DEFINE_ALIAS ??_Gexception@@UAEPAXI@Z, MSVCRT_exception_scalar_dtor + DEFINE_ALIAS ?what@exception@@UBEPBDXZ, MSVCRT_what_exception + DEFINE_ALIAS ??0bad_typeid@@QAE@ABV0@@Z, MSVCRT_bad_typeid_copy_ctor + DEFINE_ALIAS ??0bad_typeid@@QAE@PBD@Z, MSVCRT_bad_typeid_ctor + DEFINE_ALIAS ??_Fbad_typeid@@QAEXXZ, MSVCRT_bad_typeid_default_ctor + DEFINE_ALIAS ??1bad_typeid@@UAE@XZ, MSVCRT_bad_typeid_dtor + DEFINE_ALIAS ??4bad_typeid@@QAEAAV0@ABV0@@Z, MSVCRT_bad_typeid_opequals + DEFINE_ALIAS ??_Ebad_typeid@@UAEPAXI@Z, MSVCRT_bad_typeid_vector_dtor + DEFINE_ALIAS ??_Gbad_typeid@@UAEPAXI@Z, MSVCRT_bad_typeid_scalar_dtor + DEFINE_ALIAS ??0__non_rtti_object@@QAE@ABV0@@Z, MSVCRT___non_rtti_object_copy_ctor + DEFINE_ALIAS ??0__non_rtti_object@@QAE@PBD@Z, MSVCRT___non_rtti_object_ctor + DEFINE_ALIAS ??1__non_rtti_object@@UAE@XZ, MSVCRT___non_rtti_object_dtor + DEFINE_ALIAS ??4__non_rtti_object@@QAEAAV0@ABV0@@Z, MSVCRT___non_rtti_object_opequals + DEFINE_ALIAS ??_E__non_rtti_object@@UAEPAXI@Z, MSVCRT___non_rtti_object_vector_dtor + DEFINE_ALIAS ??_G__non_rtti_object@@UAEPAXI@Z, MSVCRT___non_rtti_object_scalar_dtor + DEFINE_ALIAS ??0bad_cast@@AAE@PBQBD@Z, MSVCRT_bad_cast_ctor + DEFINE_ALIAS ??0bad_cast@@QAE@ABQBD@Z, MSVCRT_bad_cast_ctor + DEFINE_ALIAS ??0bad_cast@@QAE@ABV0@@Z, MSVCRT_bad_cast_copy_ctor + DEFINE_ALIAS ??0bad_cast@@QAE@PBD@Z, MSVCRT_bad_cast_ctor_charptr + DEFINE_ALIAS ??_Fbad_cast@@QAEXXZ, MSVCRT_bad_cast_default_ctor + DEFINE_ALIAS ??1bad_cast@@UAE@XZ, MSVCRT_bad_cast_dtor + DEFINE_ALIAS ??4bad_cast@@QAEAAV0@ABV0@@Z, MSVCRT_bad_cast_opequals + DEFINE_ALIAS ??_Ebad_cast@@UAEPAXI@Z, MSVCRT_bad_cast_vector_dtor + DEFINE_ALIAS ??_Gbad_cast@@UAEPAXI@Z, MSVCRT_bad_cast_scalar_dtor + DEFINE_ALIAS ??8type_info@@QBEHABV0@@Z, MSVCRT_type_info_opequals_equals + DEFINE_ALIAS ??9type_info@@QBEHABV0@@Z, MSVCRT_type_info_opnot_equals + DEFINE_ALIAS ?before@type_info@@QBEHABV1@@Z, MSVCRT_type_info_before + DEFINE_ALIAS ??1type_info@@UAE@XZ, MSVCRT_type_info_dtor + DEFINE_ALIAS ?name@type_info@@QBEPBDXZ, MSVCRT_type_info_name + DEFINE_ALIAS ?raw_name@type_info@@QBEPBDXZ, MSVCRT_type_info_raw_name + + DEFINE_ALIAS ??_V@YAXPAX@Z, MSVCRT_operator_delete + DEFINE_ALIAS ??2@YAPAXI@Z, MSVCRT_operator_new + DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, MSVCRT__query_new_handler + DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, MSVCRT__set_new_handler + DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_new_handler + DEFINE_ALIAS ?_query_new_mode@@YAHXZ, MSVCRT__query_new_mode + DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, MSVCRT__set_new_mode + DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, MSVCRT__set_se_translator + DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_terminate + DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_unexpected + DEFINE_ALIAS ?terminate@@YAXXZ, MSVCRT_terminate + DEFINE_ALIAS ?unexpected@@YAXXZ, MSVCRT_unexpected + + #undef _MSVCRT_ + MACRO + START_VTABLE $ShortName, $CxxName + LCLS RttiName + LCLS VtblName + LCLS DtorName + LCLS CxxLabel +CxxLabel SETS "|$CxxName|" +RttiName SETS "|$ShortName._rtti|" +VtblName SETS "|MSVCRT_":CC:"$ShortName._vtable|" +DtorName SETS "|MSVCRT_":CC:"$ShortName._vector_dtor|" + EXTERN $RttiName + DCD $RttiName + EXPORT $VtblName +$VtblName + EXPORT $CxxLabel +$CxxLabel + EXTERN $DtorName + DCD $DtorName + MEND + + MACRO + DEFINE_EXCEPTION_VTABLE $ShortName, $CxxName + START_VTABLE $ShortName, $CxxName + EXTERN MSVCRT_what_exception + DCD MSVCRT_what_exception + MEND + + START_VTABLE type_info, __dummyname_type_info + DEFINE_EXCEPTION_VTABLE exception, ??_7exception@@6B@ + DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ + DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ + DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ + + GBLS FuncName + + EXTERN MSVCRT_operator_delete + __ExportName ??3@YAXPAX@Z + b MSVCRT_operator_delete + + EXTERN MSVCRT_operator_new + __ExportName ??_U@YAPAXI@Z + b MSVCRT_operator_new + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/except/arm/cpp.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/__i64tod.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__i64… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__i64tod.s (added) +++ trunk/reactos/lib/sdk/crt/math/arm/__i64tod.s [iso-8859-1] Sat May 2 12:48:50 2015 @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Implementation of __i64tod + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <kxarm.h> + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY __i64tod + + __assertfail + bx lr + + LEAF_END __i64tod + + END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/__i64tod.s ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 4 months

[akhaldi] 67509: [MSPORTS] Introduce a setting that makes the driver accept resources with an IRQ instead of only resources without an IRQ. Brought to you by The ReactOS Printing Group. CORE-9645

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 2 10:23:26 2015 New Revision: 67509 URL: http://svn.reactos.org/svn/reactos?rev=67509&view=rev Log: [MSPORTS] Introduce a setting that makes the driver accept resources with an IRQ instead of only resources without an IRQ. Brought to you by The ReactOS Printing Group. CORE-9645 Modified: trunk/reactos/dll/win32/msports/classinst.c Modified: trunk/reactos/dll/win32/msports/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… ============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Sat May 2 10:23:26 2015 @@ -381,6 +381,7 @@ WCHAR szPortName[8]; DWORD dwPortNumber = 0; DWORD dwSize; + DWORD dwValue; LONG lError; HKEY hKey; @@ -457,6 +458,23 @@ REG_SZ, (LPBYTE)szPortName, (wcslen(szPortName) + 1) * sizeof(WCHAR)); + + /* + * FIXME / HACK: + * This is to get the w2k3 parport.sys to work until we have our own. + * This setting makes the driver accept resources with an IRQ instead + * of only resources without an IRQ. + * + * We should probably also fix IO manager to actually give devices a + * chance to register without an IRQ. CORE-9645 + */ + dwValue = 0; + RegSetValueExW(hKey, + L"FilterResourceMethod", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(dwValue)); RegCloseKey(hKey); }

9 years, 4 months

[akhaldi] 67508: [PARPORT] Introduce a skeleton that will serve as base for implementing the parallel port function driver. Brought to you by The ReactOS Printing Group. CORE-9644

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 2 10:15:37 2015 New Revision: 67508 URL: http://svn.reactos.org/svn/reactos?rev=67508&view=rev Log: [PARPORT] Introduce a skeleton that will serve as base for implementing the parallel port function driver. Brought to you by The ReactOS Printing Group. CORE-9644 Added: trunk/reactos/drivers/parallel/parport/CMakeLists.txt (with props) trunk/reactos/drivers/parallel/parport/parport.c (with props) trunk/reactos/drivers/parallel/parport/parport.h (with props) trunk/reactos/drivers/parallel/parport/parport.rc (with props) Modified: trunk/reactos/drivers/parallel/CMakeLists.txt trunk/reactos/media/inf/ports.inf Modified: trunk/reactos/drivers/parallel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/CMakeList… ============================================================================== --- trunk/reactos/drivers/parallel/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/CMakeLists.txt [iso-8859-1] Sat May 2 10:15:37 2015 @@ -1,2 +1,2 @@ -add_subdirectory(parallel) +add_subdirectory(parport) Added: trunk/reactos/drivers/parallel/parport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/C… ============================================================================== --- trunk/reactos/drivers/parallel/parport/CMakeLists.txt (added) +++ trunk/reactos/drivers/parallel/parport/CMakeLists.txt [iso-8859-1] Sat May 2 10:15:37 2015 @@ -0,0 +1,5 @@ + +add_library(parport SHARED parport.c parport.rc) +set_module_type(parport kernelmodedriver) +add_importlibs(parport ntoskrnl hal) +add_cd_file(TARGET parport DESTINATION reactos/system32/drivers FOR all) Propchange: trunk/reactos/drivers/parallel/parport/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/parallel/parport/parport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/p… ============================================================================== --- trunk/reactos/drivers/parallel/parport/parport.c (added) +++ trunk/reactos/drivers/parallel/parport/parport.c [iso-8859-1] Sat May 2 10:15:37 2015 @@ -0,0 +1,30 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Parallel Port Function Driver + * PURPOSE: Parport driver loading/unloading + */ + +#include "parport.h" + +static DRIVER_UNLOAD DriverUnload; +DRIVER_INITIALIZE DriverEntry; + +static +VOID +NTAPI +DriverUnload(IN PDRIVER_OBJECT DriverObject) +{ + DPRINT("Parport DriverUnload\n"); +} + +NTSTATUS +NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegPath) +{ + DPRINT("Parport DriverEntry\n"); + + DriverObject->DriverUnload = DriverUnload; + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/parallel/parport/parport.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/parallel/parport/parport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/p… ============================================================================== --- trunk/reactos/drivers/parallel/parport/parport.h (added) +++ trunk/reactos/drivers/parallel/parport/parport.h [iso-8859-1] Sat May 2 10:15:37 2015 @@ -0,0 +1,16 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Parallel Port Function Driver + * PURPOSE: Parport driver header + */ + +#ifndef _PARPORT_PCH_ +#define _PARPORT_PCH_ + +#include <ntddk.h> +#include <ntddser.h> + +//#define NDEBUG +#include <debug.h> + +#endif /* _PARPORT_PCH_ */ Propchange: trunk/reactos/drivers/parallel/parport/parport.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/parallel/parport/parport.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/p… ============================================================================== --- trunk/reactos/drivers/parallel/parport/parport.rc (added) +++ trunk/reactos/drivers/parallel/parport/parport.rc [iso-8859-1] Sat May 2 10:15:37 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Parallel Port Function Driver" +#define REACTOS_STR_INTERNAL_NAME "parport" +#define REACTOS_STR_ORIGINAL_FILENAME "parport.sys" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/parallel/parport/parport.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=67… ============================================================================== --- trunk/reactos/media/inf/ports.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/ports.inf [iso-8859-1] Sat May 2 10:15:37 2015 @@ -34,18 +34,18 @@ ;---------------------------- LPT PORT DRIVER --------------------------- [LptPort_Inst.NT] -;CopyFiles = LptPort_CopyFiles.NT +CopyFiles = LptPort_CopyFiles.NT AddReg = LptPort_AddReg.NT [LptPort_CopyFiles.NT] parport.sys [LptPort_AddReg.NT] -;HKR, , "EnumPropPages32", 0, "msports.dll,ParallelPortPropPageProvider" +HKR, , "EnumPropPages32", 0, "msports.dll,ParallelPortPropPageProvider" HKR, , "PortSubClass", 1, 00 [LptPort_Inst.NT.Services] -;AddService = parport, 0x00000002, parport_Service_Inst +AddService = parport, 0x00000002, parport_Service_Inst [parport_Service_Inst] ServiceType = 1

9 years, 4 months

[aandrejevic] 67507: [NTVDM] Implement INT 27h (Terminate and Stay Resident). Keep track of the last entry SS:SP in the INT 21h handler. Restore the stack in DosTerminateProcess. The number of byte...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat May 2 02:59:21 2015 New Revision: 67507 URL: http://svn.reactos.org/svn/reactos?rev=67507&view=rev Log: [NTVDM] Implement INT 27h (Terminate and Stay Resident). Keep track of the last entry SS:SP in the INT 21h handler. Restore the stack in DosTerminateProcess. The number of bytes to keep resident applies only to the block which holds the PSP, other blocks are not freed. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat May 2 02:59:21 2015 @@ -177,6 +177,10 @@ INT Return; (*InDos)++; + + /* Save the value of SS:SP on entry in the PSP */ + SEGMENT_TO_PSP(CurrentPsp)->LastStack = + MAKELONG(getSP() + (STACK_FLAGS + 1) * 2, getSS()); /* Check the value in the AH register */ switch (getAH()) @@ -1817,6 +1821,11 @@ Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; } +VOID WINAPI DosInt27h(LPWORD Stack) +{ + DosTerminateProcess(getCS(), 0, (getDX() + 0x0F) >> 4); +} + VOID WINAPI DosFastConOut(LPWORD Stack) { /* @@ -2002,6 +2011,7 @@ // RegisterDosInt32(0x22, DosInt22h ); // Termination RegisterDosInt32(0x23, DosBreakInterrupt); // Ctrl-C / Ctrl-Break // RegisterDosInt32(0x24, DosInt24h ); // Critical Error + RegisterDosInt32(0x27, DosInt27h ); // Terminate and Stay Resident RegisterDosInt32(0x29, DosFastConOut ); // DOS 2+ Fast Console Output RegisterDosInt32(0x2F, DosInt2Fh ); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sat May 2 02:59:21 2015 @@ -780,23 +780,20 @@ /* Check if this block was allocated by the process */ if (CurrentMcb->OwnerPsp == Psp) { - if (KeepResident == 0) + if (KeepResident) + { + /* Check if this is the PSP block and we should reduce its size */ + if (McbSegment == Psp && KeepResident < CurrentMcb->Size) + { + /* Reduce the size of the block */ + DosResizeMemory(McbSegment + 1, KeepResident, NULL); + break; + } + } + else { /* Free this entire block */ DosFreeMemory(McbSegment + 1); - } - else if (KeepResident < CurrentMcb->Size) - { - /* Reduce the size of the block */ - DosResizeMemory(McbSegment + 1, KeepResident, NULL); - - /* No further paragraphs need to stay resident */ - KeepResident = 0; - } - else - { - /* Just reduce the amount of paragraphs we need to keep resident */ - KeepResident -= CurrentMcb->Size; } } @@ -849,6 +846,10 @@ /* Save the return code - Normal termination */ DosErrorLevel = MAKEWORD(ReturnCode, 0x00); + /* Restore the old stack */ + setSS(HIWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); + setSP(LOWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); + /* Return control to the parent process */ CpuExecute(HIWORD(PspBlock->TerminateAddress), LOWORD(PspBlock->TerminateAddress));

9 years, 4 months

[hbelusca] 67506: Fix compilation.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 2 01:26:42 2015 New Revision: 67506 URL: http://svn.reactos.org/svn/reactos?rev=67506&view=rev Log: Fix compilation. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Sat May 2 01:26:42 2015 @@ -260,7 +260,7 @@ DPRINT1("Starting '%s' ('%.*s')...\n", AppName, CommandInfo.CmdLen >= 2 ? CommandInfo.CmdLen - 2 /* Display the command line without the terminating 0d 0a */ - : CommandInfo.CmdLen + : CommandInfo.CmdLen, CmdLine); Result = DosStartProcess(AppName, CmdLine, Env); if (Result != ERROR_SUCCESS) Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sat May 2 01:26:42 2015 @@ -633,7 +633,7 @@ */ CmdLineSize = min(*(PBYTE)FAR_POINTER(Parameters->CommandLine), DOS_CMDLINE_LENGTH); RtlCopyMemory(CmdLine, - FAR_POINTER(Parameters->CommandLine) + 1, + (LPSTR)FAR_POINTER(Parameters->CommandLine) + 1, CmdLineSize); /* NULL-terminate it */ CmdLine[CmdLineSize] = '\0';

9 years, 4 months

[hbelusca] 67505: [NTVDM] - Fix command-line handling. - Disable a hack introduced in r65012 for testing purposes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 2 01:23:27 2015 New Revision: 67505 URL: http://svn.reactos.org/svn/reactos?rev=67505&view=rev Log: [NTVDM] - Fix command-line handling. - Disable a hack introduced in r65012 for testing purposes. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Sat May 2 01:23:27 2015 @@ -116,29 +116,33 @@ { case 0x08: // Launch external command { -#define CMDLINE_LENGTH 1024 - BOOL Result; DWORD dwExitCode; LPSTR Command = (LPSTR)SEG_OFF_TO_PTR(getDS(), getSI()); - LPSTR CmdPtr = Command; - CHAR CommandLine[CMDLINE_LENGTH] = ""; + CHAR CmdLine[sizeof("cmd.exe /c ") + DOS_CMDLINE_LENGTH + 1] = ""; + LPSTR CmdLinePtr; + ULONG CmdLineLen; STARTUPINFOA StartupInfo; PROCESS_INFORMATION ProcessInformation; - /* NULL-terminate the command line by removing the return carriage character */ - while (*CmdPtr && *CmdPtr != '\r') CmdPtr++; - *CmdPtr = '\0'; - - DPRINT1("CMD Run Command '%s'\n", Command); - /* Spawn a user-defined 32-bit command preprocessor */ - /* Build the command line */ // FIXME: Use COMSPEC env var!! - strcpy(CommandLine, "cmd.exe /c "); - strcat(CommandLine, Command); + CmdLinePtr = CmdLine; + strcpy(CmdLinePtr, "cmd.exe /c "); + CmdLinePtr += strlen(CmdLinePtr); + + /* Build a Win32-compatible command-line */ + CmdLineLen = min(strlen(Command), sizeof(CmdLine) - strlen(CmdLinePtr) - 1); + RtlCopyMemory(CmdLinePtr, Command, CmdLineLen); + CmdLinePtr[CmdLineLen] = '\0'; + + /* Remove any trailing return carriage character and NULL-terminate the command line */ + while (*CmdLinePtr && *CmdLinePtr != '\r' && *CmdLinePtr != '\n') CmdLinePtr++; + *CmdLinePtr = '\0'; + + DPRINT1("CMD Run Command '%s' ('%s')\n", Command, CmdLine); RtlZeroMemory(&StartupInfo, sizeof(StartupInfo)); RtlZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); @@ -148,7 +152,7 @@ VidBiosDetachFromConsole(); Result = CreateProcessA(NULL, - CommandLine, + CmdLine, NULL, NULL, TRUE, @@ -159,7 +163,7 @@ &ProcessInformation); if (Result) { - DPRINT1("Command '%s' launched successfully\n", Command); + DPRINT1("Command '%s' ('%s') launched successfully\n", Command, CmdLine); /* Wait for process termination */ WaitForSingleObject(ProcessInformation.hProcess, INFINITE); @@ -173,7 +177,7 @@ } else { - DPRINT1("Failed when launched command '%s'\n"); + DPRINT1("Failed when launched command '%s' ('%s')\n", Command, CmdLine); dwExitCode = GetLastError(); } @@ -210,7 +214,7 @@ PVOID Env = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, EnvSize); UNREFERENCED_PARAMETER(Parameter); - ASSERT(Env != NULL); + ASSERT(Env); do { @@ -253,7 +257,11 @@ } /* Start the process from the command line */ - DPRINT1("Starting '%s' ('%s')...\n", AppName, CmdLine); + DPRINT1("Starting '%s' ('%.*s')...\n", + AppName, + CommandInfo.CmdLen >= 2 ? CommandInfo.CmdLen - 2 /* Display the command line without the terminating 0d 0a */ + : CommandInfo.CmdLen + CmdLine); Result = DosStartProcess(AppName, CmdLine, Env); if (Result != ERROR_SUCCESS) { @@ -467,8 +475,7 @@ /* Start the process from the command line */ DPRINT1("Starting '%s' ('%s')...\n", ApplicationName, CommandLine); - Result = DosStartProcess(ApplicationName, - CommandLine, + Result = DosStartProcess(ApplicationName, CommandLine, SEG_OFF_TO_PTR(SYSTEM_ENV_BLOCK, 0)); if (Result != ERROR_SUCCESS) { Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat May 2 01:23:27 2015 @@ -160,59 +160,6 @@ } /* PUBLIC FUNCTIONS ***********************************************************/ - -VOID DosInitializePsp(WORD PspSegment, - LPCSTR CommandLine, - WORD ProgramSize, - WORD Environment, - DWORD ReturnAddress) -{ - PDOS_PSP PspBlock = SEGMENT_TO_PSP(PspSegment); - LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); - - RtlZeroMemory(PspBlock, sizeof(*PspBlock)); - - /* Set the exit interrupt */ - PspBlock->Exit[0] = 0xCD; // int 0x20 - PspBlock->Exit[1] = 0x20; - - /* Set the number of the last paragraph */ - PspBlock->LastParagraph = PspSegment + ProgramSize - 1; - - /* Save the interrupt vectors */ - PspBlock->TerminateAddress = ReturnAddress; - PspBlock->BreakAddress = IntVecTable[0x23]; - PspBlock->CriticalAddress = IntVecTable[0x24]; - - /* Set the parent PSP */ - PspBlock->ParentPsp = CurrentPsp; - - /* Copy the parent handle table */ - DosCopyHandleTable(PspBlock->HandleTable); - - /* Set the environment block */ - PspBlock->EnvBlock = Environment; - - /* Set the handle table pointers to the internal handle table */ - PspBlock->HandleTableSize = 20; - PspBlock->HandleTablePtr = MAKELONG(0x18, PspSegment); - - /* Set the DOS version */ - PspBlock->DosVersion = DOS_VERSION; - - /* Set the far call opcodes */ - PspBlock->FarCall[0] = 0xCD; // int 0x21 - PspBlock->FarCall[1] = 0x21; - PspBlock->FarCall[2] = 0xCB; // retf - - if (CommandLine) - { - /* Set the command line */ - PspBlock->CommandLineSize = (BYTE)min(strlen(CommandLine), DOS_CMDLINE_LENGTH - 1); - RtlCopyMemory(PspBlock->CommandLine, CommandLine, PspBlock->CommandLineSize); - PspBlock->CommandLine[PspBlock->CommandLineSize] = '\r'; - } -} VOID WINAPI DosInt20h(LPWORD Stack) { @@ -1388,30 +1335,45 @@ /* Execute */ case 0x4B: { - DOS_EXEC_TYPE LoadType = (DOS_EXEC_TYPE)getAL(); + BYTE OrgAL = getAL(); LPSTR ProgramName = SEG_OFF_TO_PTR(getDS(), getDX()); PDOS_EXEC_PARAM_BLOCK ParamBlock = SEG_OFF_TO_PTR(getES(), getBX()); DWORD ReturnAddress = MAKELONG(Stack[STACK_IP], Stack[STACK_CS]); WORD ErrorCode; - + + if (OrgAL <= DOS_LOAD_OVERLAY) + { + DOS_EXEC_TYPE LoadType = (DOS_EXEC_TYPE)OrgAL; + #ifndef STANDALONE - if (LoadType == DOS_LOAD_AND_EXECUTE) - { - /* Create a new process */ - ErrorCode = DosCreateProcess(ProgramName, ParamBlock, ReturnAddress); - } - else - { -#else - { + if (LoadType == DOS_LOAD_AND_EXECUTE) + { + /* Create a new process */ + ErrorCode = DosCreateProcess(ProgramName, + ParamBlock, + ReturnAddress); + } + else #endif - /* Just load an executable */ - ErrorCode = DosLoadExecutable(LoadType, - ProgramName, - ParamBlock, - NULL, - NULL, - ReturnAddress); + { + /* Just load an executable */ + ErrorCode = DosLoadExecutable(LoadType, + ProgramName, + ParamBlock, + NULL, + NULL, + ReturnAddress); + } + } + else if (OrgAL == 0x05) + { + // http://www.ctyme.com/intr/rb-2942.htm + DPRINT1("Set execution state is UNIMPLEMENTED\n"); + ErrorCode = ERROR_CALL_NOT_IMPLEMENTED; + } + else + { + ErrorCode = ERROR_INVALID_FUNCTION; } if (ErrorCode == ERROR_SUCCESS) Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sat May 2 01:23:27 2015 @@ -37,10 +37,13 @@ { PDOS_PSP PspBlock = SEGMENT_TO_PSP(Segment); - /* Set the command line */ - PspBlock->CommandLineSize = (BYTE)min(strlen(CommandLine), DOS_CMDLINE_LENGTH - 1); - RtlCopyMemory(PspBlock->CommandLine, CommandLine, PspBlock->CommandLineSize); - PspBlock->CommandLine[PspBlock->CommandLineSize] = '\r'; + /* + * Copy the command line block. + * Format of the CommandLine parameter: 1 byte for size; 127 bytes for contents. + */ + PspBlock->CommandLineSize = min(*(PBYTE)CommandLine, DOS_CMDLINE_LENGTH); + CommandLine++; + RtlCopyMemory(PspBlock->CommandLine, CommandLine, DOS_CMDLINE_LENGTH); } static WORD DosCopyEnvironmentBlock(LPCSTR Environment OPTIONAL, @@ -115,8 +118,8 @@ VOID DosClonePsp(WORD DestSegment, WORD SourceSegment) { - PDOS_PSP DestPsp = SEGMENT_TO_PSP(DestSegment); - PDOS_PSP SourcePsp = SEGMENT_TO_PSP(SourceSegment); + PDOS_PSP DestPsp = SEGMENT_TO_PSP(DestSegment); + PDOS_PSP SourcePsp = SEGMENT_TO_PSP(SourceSegment); LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); /* Literally copy the PSP first */ @@ -132,7 +135,7 @@ /* Set the handle table pointers to the internal handle table */ DestPsp->HandleTableSize = DEFAULT_JFT_SIZE; - DestPsp->HandleTablePtr = MAKELONG(0x18, DestSegment); + DestPsp->HandleTablePtr = MAKELONG(0x18, DestSegment); /* Copy the parent handle table without referencing the SFT */ RtlCopyMemory(FAR_POINTER(DestPsp->HandleTablePtr), @@ -142,7 +145,7 @@ VOID DosCreatePsp(WORD Segment, WORD ProgramSize) { - PDOS_PSP PspBlock = SEGMENT_TO_PSP(Segment); + PDOS_PSP PspBlock = SEGMENT_TO_PSP(Segment); LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); RtlZeroMemory(PspBlock, sizeof(*PspBlock)); @@ -170,7 +173,7 @@ /* Set the handle table pointers to the internal handle table */ PspBlock->HandleTableSize = DEFAULT_JFT_SIZE; - PspBlock->HandleTablePtr = MAKELONG(0x18, Segment); + PspBlock->HandleTablePtr = MAKELONG(0x18, Segment); /* Set the DOS version */ PspBlock->DosVersion = DOS_VERSION; @@ -203,6 +206,9 @@ WORD MaxAllocSize; DWORD i, FileSize; + /* Buffer for command line conversion: 1 byte for size; 127 bytes for contents */ + CHAR CmdLineBuffer[1 + DOS_CMDLINE_LENGTH]; + DPRINT1("DosLoadExecutable(%d, %s, 0x%08X, 0x%08X)\n", LoadType, ExecutablePath, @@ -249,24 +255,72 @@ if (LoadType != DOS_LOAD_OVERLAY) { - LPSTR CmdLinePtr; - - if (CommandLine == NULL) - { - /* Get the command line from the parameter block */ + /* If an optional Win32 command line is given... */ + if (CommandLine) + { + /* ... convert it into DOS format */ + BYTE CmdLineLen; + + PBYTE CmdLineSize = (PBYTE)CmdLineBuffer; + LPSTR CmdLineStart = CmdLineBuffer + 1; + LPSTR CmdLinePtr = CmdLineStart; + + // For debugging purposes + RtlFillMemory(CmdLineBuffer, sizeof(CmdLineBuffer), 0xFF); + + /* + * Set the command line: it is either an empty command line or has + * the format: " foo bar ..." (with at least one leading whitespace), + * and is then always followed by '\r' (and optionally by '\n'). + */ + CmdLineLen = (BYTE)strlen(CommandLine); + *CmdLineSize = 0; + + /* + * Add the leading space if the command line is not empty + * and doesn't already start with some whitespace... + */ + if (*CommandLine && *CommandLine != '\r' && *CommandLine != '\n' && + *CommandLine != ' ' && *CommandLine != '\t') + { + (*CmdLineSize)++; + *CmdLinePtr++ = ' '; + } + + /* Compute the number of characters we need to copy from the original command line */ + CmdLineLen = min(CmdLineLen, DOS_CMDLINE_LENGTH - *CmdLineSize); + + /* The trailing '\r' or '\n' do not count in the PSP command line size parameter */ + while (CmdLineLen && (CommandLine[CmdLineLen - 1] == '\r' || CommandLine[CmdLineLen - 1] == '\n')) + { + CmdLineLen--; + } + + /* Finally, set everything up */ + *CmdLineSize += CmdLineLen; + RtlCopyMemory(CmdLinePtr, CommandLine, CmdLineLen); + CmdLineStart[*CmdLineSize] = '\r'; + + /* Finally make the pointer point to the static buffer */ + CommandLine = CmdLineBuffer; + } + else + { + /* + * ... otherwise, get the one from the parameter block. + * Format of the command line: 1 byte for size; 127 bytes for contents. + */ + ASSERT(Parameters); CommandLine = (LPCSTR)FAR_POINTER(Parameters->CommandLine); } + /* If no optional environment is given... */ if (Environment == NULL) { - /* Get the environment from the parameter block */ + /* ... get the one from the parameter block */ + ASSERT(Parameters); Environment = (LPCSTR)SEG_OFF_TO_PTR(Parameters->Environment, 0); } - - /* NULL-terminate the command line by removing the return carriage character */ - CmdLinePtr = (LPSTR)CommandLine; - while (*CmdLinePtr && *CmdLinePtr != '\r') CmdLinePtr++; - *CmdLinePtr = '\0'; /* Copy the environment block to DOS memory */ EnvBlock = DosCopyEnvironmentBlock(Environment, ExecutablePath); @@ -352,6 +406,7 @@ } else { + ASSERT(Parameters); LoadSegment = Parameters->Overlay.Segment; RelocFactor = Parameters->Overlay.RelocationFactor; } @@ -391,8 +446,9 @@ } else if (LoadType == DOS_LOAD_ONLY) { + ASSERT(Parameters); Parameters->StackLocation = MAKELONG(Header->e_sp, LoadSegment + Header->e_ss); - Parameters->EntryPoint = MAKELONG(Header->e_ip, LoadSegment + Header->e_cs); + Parameters->EntryPoint = MAKELONG(Header->e_ip, LoadSegment + Header->e_cs); } } else @@ -436,9 +492,11 @@ } else { + ASSERT(Parameters); LoadSegment = Parameters->Overlay.Segment; } + /* Copy the program to the code segment */ RtlCopyMemory(SEG_OFF_TO_PTR(LoadSegment, 0), Address, FileSize); @@ -465,8 +523,9 @@ } else if (LoadType == DOS_LOAD_ONLY) { + ASSERT(Parameters); Parameters->StackLocation = MAKELONG(0xFFFE, Segment); - Parameters->EntryPoint = MAKELONG(0x0100, Segment); + Parameters->EntryPoint = MAKELONG(0x0100, Segment); } } @@ -513,8 +572,9 @@ // HACK: Simulate a ENTER key release scancode on the PS/2 port because // some apps expect to read a key release scancode (> 0x80) when they // are started. - IOWriteB(PS2_CONTROL_PORT, 0xD2); // Next write is for the first PS/2 port - IOWriteB(PS2_DATA_PORT, 0x80 | 0x1C); // ENTER key release + // (hbelusca 2 May 2015: I'm not sure it's really useful. See r65012) + // IOWriteB(PS2_CONTROL_PORT, 0xD2); // Next write is for the first PS/2 port + // IOWriteB(PS2_DATA_PORT, 0x80 | 0x1C); // ENTER key release /* Start simulation */ SetEvent(VdmTaskEvent); @@ -537,18 +597,24 @@ DWORD BinaryType; LPVOID Environment = NULL; VDM_COMMAND_INFO CommandInfo; - CHAR CmdLine[MAX_PATH]; + CHAR CmdLine[MAX_PATH]; // DOS_CMDLINE_LENGTH + 1 CHAR AppName[MAX_PATH]; CHAR PifFile[MAX_PATH]; CHAR Desktop[MAX_PATH]; CHAR Title[MAX_PATH]; + LPSTR CmdLinePtr; + ULONG CmdLineSize; ULONG EnvSize = 256; - PVOID Env = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, EnvSize); + PVOID Env; STARTUPINFOA StartupInfo; PROCESS_INFORMATION ProcessInfo; /* Get the binary type */ if (!GetBinaryTypeA(ProgramName, &BinaryType)) return GetLastError(); + + /* Initialize Win32-VDM environment */ + Env = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, EnvSize); + if (Env == NULL) return GetLastError(); /* Did the caller specify an environment segment? */ if (Parameters->Environment) @@ -561,9 +627,25 @@ RtlZeroMemory(&StartupInfo, sizeof(StartupInfo)); StartupInfo.cb = sizeof(StartupInfo); + /* + * Convert the DOS command line to Win32-compatible format. + * Format of the DOS command line: 1 byte for size; 127 bytes for contents. + */ + CmdLineSize = min(*(PBYTE)FAR_POINTER(Parameters->CommandLine), DOS_CMDLINE_LENGTH); + RtlCopyMemory(CmdLine, + FAR_POINTER(Parameters->CommandLine) + 1, + CmdLineSize); + /* NULL-terminate it */ + CmdLine[CmdLineSize] = '\0'; + + /* Remove any trailing return carriage character and NULL-terminate the command line */ + CmdLinePtr = CmdLine; + while (*CmdLinePtr && *CmdLinePtr != '\r' && *CmdLinePtr != '\n') CmdLinePtr++; + *CmdLinePtr = '\0'; + /* Create the process */ if (!CreateProcessA(ProgramName, - FAR_POINTER(Parameters->CommandLine), + CmdLine, NULL, NULL, FALSE, @@ -573,6 +655,7 @@ &StartupInfo, &ProcessInfo)) { + RtlFreeHeap(RtlGetProcessHeap(), 0, Env); return GetLastError(); }

9 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015