Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[akhaldi] 73986: [WSHOM_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:35:07 2017 New Revision: 73986 URL: http://svn.reactos.org/svn/reactos?rev=73986&view=rev Log: [WSHOM_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/wshom/wshom.c trunk/rostests/winetests/wshom/wshom.idl Modified: trunk/rostests/winetests/wshom/wshom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/wshom.c?r… ============================================================================== --- trunk/rostests/winetests/wshom/wshom.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wshom/wshom.c [iso-8859-1] Sun Feb 26 20:35:07 2017 @@ -33,6 +33,31 @@ #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + +#define test_provideclassinfo(a, b) _test_provideclassinfo((IDispatch*)a, b, __LINE__) +static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) +{ + IProvideClassInfo *classinfo; + TYPEATTR *attr; + ITypeInfo *ti; + HRESULT hr; + + hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); + ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#x.\n", hr); + + hr = IProvideClassInfo_GetClassInfo(classinfo, &ti); + ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &attr); + ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#x.\n", hr); + + ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), + wine_dbgstr_guid(guid)); + + IProvideClassInfo_Release(classinfo); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); +} static void test_wshshell(void) { @@ -69,10 +94,11 @@ hr = IDispatch_QueryInterface(disp, &IID_IWshShell3, (void**)&shell); EXPECT_HR(hr, S_OK); - IDispatch_Release(disp); + test_provideclassinfo(disp, &IID_IWshShell3); hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); EXPECT_HR(hr, E_NOINTERFACE); + IDispatch_Release(disp); hr = IUnknown_QueryInterface(shell, &IID_IWshShell3, (void**)&sh3); EXPECT_HR(hr, S_OK); @@ -90,6 +116,7 @@ hr = IWshShell3_get_SpecialFolders(sh3, &coll); EXPECT_HR(hr, S_OK); + test_provideclassinfo(coll, &IID_IWshCollection); hr = IWshCollection_QueryInterface(coll, &IID_IFolderCollection, (void**)&folders); EXPECT_HR(hr, E_NOINTERFACE); @@ -131,6 +158,7 @@ SysFreeString(str); hr = IDispatch_QueryInterface(shortcut, &IID_IWshShortcut, (void**)&shcut); EXPECT_HR(hr, S_OK); + test_provideclassinfo(shortcut, &IID_IWshShortcut); hr = IWshShortcut_get_Arguments(shcut, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -158,6 +186,7 @@ hr = IWshEnvironment_get_Item(env, NULL, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); + test_provideclassinfo(env, &IID_IWshEnvironment); ret = (BSTR)0x1; hr = IWshEnvironment_get_Item(env, NULL, &ret); Modified: trunk/rostests/winetests/wshom/wshom.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/wshom.idl… ============================================================================== --- trunk/rostests/winetests/wshom/wshom.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/wshom/wshom.idl [iso-8859-1] Sun Feb 26 20:35:07 2017 @@ -663,4 +663,12 @@ coclass WshNetwork { [default] interface IWshNetwork2; } + + [ + uuid(08fed191-be19-11d3-a28b-00104bd35090), + threading(apartment) + ] + coclass WshExec { + [default] interface IWshExec; + } }

7 years, 10 months

[akhaldi] 73985: [WSHOM.OCX] Sync with Wine Staging 2.2. CORE-12823 722c28c wshom: Added IProvideClassInfo support for implemented interfaces.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:33:41 2017 New Revision: 73985 URL: http://svn.reactos.org/svn/reactos?rev=73985&view=rev Log: [WSHOM.OCX] Sync with Wine Staging 2.2. CORE-12823 722c28c wshom: Added IProvideClassInfo support for implemented interfaces. Modified: trunk/reactos/dll/win32/wshom.ocx/shell.c trunk/reactos/dll/win32/wshom.ocx/wshom.idl trunk/reactos/dll/win32/wshom.ocx/wshom.tlb.rgs trunk/reactos/dll/win32/wshom.ocx/wshom_main.c trunk/reactos/dll/win32/wshom.ocx/wshom_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wshom.ocx/shell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/shell.… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/shell.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/shell.c [iso-8859-1] Sun Feb 26 20:33:41 2017 @@ -25,16 +25,23 @@ #include <wine/unicode.h> -static IWshShell3 WshShell3; - typedef struct { + struct provideclassinfo classinfo; + IWshShell3 IWshShell3_iface; +} WshShellImpl; +static WshShellImpl WshShell3; + +typedef struct +{ + struct provideclassinfo classinfo; IWshCollection IWshCollection_iface; LONG ref; } WshCollection; typedef struct { + struct provideclassinfo classinfo; IWshShortcut IWshShortcut_iface; LONG ref; @@ -44,16 +51,18 @@ typedef struct { + struct provideclassinfo classinfo; IWshEnvironment IWshEnvironment_iface; LONG ref; } WshEnvironment; typedef struct { + struct provideclassinfo classinfo; IWshExec IWshExec_iface; LONG ref; PROCESS_INFORMATION info; -} WshExec; +} WshExecImpl; static inline WshCollection *impl_from_IWshCollection( IWshCollection *iface ) { @@ -70,14 +79,14 @@ return CONTAINING_RECORD(iface, WshEnvironment, IWshEnvironment_iface); } -static inline WshExec *impl_from_IWshExec( IWshExec *iface ) -{ - return CONTAINING_RECORD(iface, WshExec, IWshExec_iface); +static inline WshExecImpl *impl_from_IWshExec( IWshExec *iface ) +{ + return CONTAINING_RECORD(iface, WshExecImpl, IWshExec_iface); } static HRESULT WINAPI WshExec_QueryInterface(IWshExec *iface, REFIID riid, void **obj) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); @@ -86,19 +95,24 @@ IsEqualGUID(riid, &IID_IUnknown)) { *obj = iface; - }else { + } + else if (IsEqualIID(riid, &IID_IProvideClassInfo)) + { + *obj = &This->classinfo.IProvideClassInfo_iface; + } + else { FIXME("Unknown iface %s\n", debugstr_guid(riid)); *obj = NULL; return E_NOINTERFACE; } - IWshExec_AddRef(iface); + IUnknown_AddRef((IUnknown *)*obj); return S_OK; } static ULONG WINAPI WshExec_AddRef(IWshExec *iface) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref = %d\n", This, ref); return ref; @@ -106,7 +120,7 @@ static ULONG WINAPI WshExec_Release(IWshExec *iface) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref = %d\n", This, ref); @@ -121,7 +135,7 @@ static HRESULT WINAPI WshExec_GetTypeInfoCount(IWshExec *iface, UINT *pctinfo) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); TRACE("(%p)->(%p)\n", This, pctinfo); *pctinfo = 1; return S_OK; @@ -129,7 +143,7 @@ static HRESULT WINAPI WshExec_GetTypeInfo(IWshExec *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo(IWshExec_tid, ppTInfo); } @@ -137,7 +151,7 @@ static HRESULT WINAPI WshExec_GetIDsOfNames(IWshExec *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); ITypeInfo *typeinfo; HRESULT hr; @@ -156,7 +170,7 @@ static HRESULT WINAPI WshExec_Invoke(IWshExec *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); ITypeInfo *typeinfo; HRESULT hr; @@ -176,7 +190,7 @@ static HRESULT WINAPI WshExec_get_Status(IWshExec *iface, WshExecStatus *status) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); DWORD code; TRACE("(%p)->(%p)\n", This, status); @@ -204,7 +218,7 @@ static HRESULT WINAPI WshExec_get_StdIn(IWshExec *iface, ITextStream **stream) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); FIXME("(%p)->(%p): stub\n", This, stream); @@ -213,7 +227,7 @@ static HRESULT WINAPI WshExec_get_StdOut(IWshExec *iface, ITextStream **stream) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); FIXME("(%p)->(%p): stub\n", This, stream); @@ -222,7 +236,7 @@ static HRESULT WINAPI WshExec_get_StdErr(IWshExec *iface, ITextStream **stream) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); FIXME("(%p)->(%p): stub\n", This, stream); @@ -231,7 +245,7 @@ static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, DWORD *pid) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); TRACE("(%p)->(%p)\n", This, pid); @@ -244,7 +258,7 @@ static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, DWORD *code) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); FIXME("(%p)->(%p): stub\n", This, code); @@ -263,7 +277,7 @@ static HRESULT WINAPI WshExec_Terminate(IWshExec *iface) { - WshExec *This = impl_from_IWshExec(iface); + WshExecImpl *This = impl_from_IWshExec(iface); BOOL ret, kill = FALSE; INT count = 0; @@ -304,7 +318,7 @@ static HRESULT WshExec_create(BSTR command, IWshExec **ret) { STARTUPINFOW si = {0}; - WshExec *This; + WshExecImpl *This; *ret = NULL; @@ -320,6 +334,7 @@ return HRESULT_FROM_WIN32(GetLastError()); } + init_classinfo(&CLSID_WshExec, (IUnknown *)&This->IWshExec_iface, &This->classinfo); *ret = &This->IWshExec_iface; return S_OK; } @@ -335,7 +350,12 @@ IsEqualGUID(riid, &IID_IWshEnvironment)) { *obj = iface; - }else { + } + else if (IsEqualIID(riid, &IID_IProvideClassInfo)) + { + *obj = &This->classinfo.IProvideClassInfo_iface; + } + else { FIXME("Unknown iface %s\n", debugstr_guid(riid)); *obj = NULL; return E_NOINTERFACE; @@ -502,6 +522,7 @@ This->IWshEnvironment_iface.lpVtbl = &WshEnvironmentVtbl; This->ref = 1; + init_classinfo(&IID_IWshEnvironment, (IUnknown *)&This->IWshEnvironment_iface, &This->classinfo); *env = &This->IWshEnvironment_iface; return S_OK; @@ -518,7 +539,12 @@ IsEqualGUID(riid, &IID_IWshCollection)) { *ppv = iface; - }else { + } + else if (IsEqualIID(riid, &IID_IProvideClassInfo)) + { + *ppv = &This->classinfo.IProvideClassInfo_iface; + } + else { FIXME("Unknown iface %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; @@ -698,6 +724,7 @@ This->IWshCollection_iface.lpVtbl = &WshCollectionVtbl; This->ref = 1; + init_classinfo(&IID_IWshCollection, (IUnknown *)&This->IWshCollection_iface, &This->classinfo); *collection = &This->IWshCollection_iface; return S_OK; @@ -715,7 +742,12 @@ IsEqualGUID(riid, &IID_IWshShortcut)) { *ppv = iface; - }else { + } + else if (IsEqualIID(riid, &IID_IProvideClassInfo)) + { + *ppv = &This->classinfo.IProvideClassInfo_iface; + } + else { FIXME("Unknown iface %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; @@ -1064,6 +1096,7 @@ return E_OUTOFMEMORY; } + init_classinfo(&IID_IWshShortcut, (IUnknown *)&This->IWshShortcut_iface, &This->classinfo); *shortcut = (IDispatch*)&This->IWshShortcut_iface; return S_OK; @@ -1087,13 +1120,17 @@ { return E_NOINTERFACE; } + else if (IsEqualIID(riid, &IID_IProvideClassInfo)) + { + *ppv = &WshShell3.classinfo.IProvideClassInfo_iface; + } else { WARN("unknown iface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } - IWshShell3_AddRef(iface); + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } @@ -1654,11 +1691,11 @@ WshShell3_put_CurrentDirectory }; -static IWshShell3 WshShell3 = { &WshShell3Vtbl }; - HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - return IWshShell3_QueryInterface(&WshShell3, riid, ppv); -} + WshShell3.IWshShell3_iface.lpVtbl = &WshShell3Vtbl; + init_classinfo(&IID_IWshShell3, (IUnknown *)&WshShell3.IWshShell3_iface, &WshShell3.classinfo); + return IWshShell3_QueryInterface(&WshShell3.IWshShell3_iface, riid, ppv); +} Modified: trunk/reactos/dll/win32/wshom.ocx/wshom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/wshom.… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/wshom.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/wshom.idl [iso-8859-1] Sun Feb 26 20:33:41 2017 @@ -663,4 +663,12 @@ coclass WshNetwork { [default] interface IWshNetwork2; } + + [ + uuid(08fed191-be19-11d3-a28b-00104bd35090), + threading(apartment) + ] + coclass WshExec { + [default] interface IWshExec; + } } Modified: trunk/reactos/dll/win32/wshom.ocx/wshom.tlb.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/wshom.… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/wshom.tlb.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/wshom.tlb.rgs [iso-8859-1] Sun Feb 26 20:33:41 2017 @@ -132,6 +132,12 @@ Version = s '1.0' VersionIndependentProgId = s 'WScript.Network' } + '{08FED191-BE19-11D3-A28B-00104BD35090}' = s 'WshExec' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' + Version = s '1.0' + } } 'WScript.Shell.1' = s 'Windows Script Host Shell Object' { Modified: trunk/reactos/dll/win32/wshom.ocx/wshom_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/wshom_… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/wshom_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/wshom_main.c [iso-8859-1] Sun Feb 26 20:33:41 2017 @@ -22,6 +22,11 @@ static HINSTANCE wshom_instance; +static inline struct provideclassinfo *impl_from_IProvideClassInfo(IProvideClassInfo *iface) +{ + return CONTAINING_RECORD(iface, struct provideclassinfo, IProvideClassInfo_iface); +} + static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; @@ -39,6 +44,9 @@ HRESULT hres; ITypeLib *tl; + if(typelib) + return S_OK; + hres = LoadRegTypeLib(&LIBID_IWshRuntimeLibrary, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08x\n", hres); @@ -50,13 +58,21 @@ return hres; } +static HRESULT get_typeinfo_of_guid(const GUID *guid, ITypeInfo **tinfo) +{ + HRESULT hres; + + if(FAILED(hres = load_typelib())) + return hres; + + return ITypeLib_GetTypeInfoOfGuid(typelib, guid, tinfo); +} + HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) { HRESULT hres; - if (!typelib) - hres = load_typelib(); - if (!typelib) + if (FAILED(hres = load_typelib())) return hres; if(!typeinfos[tid]) { @@ -90,6 +106,56 @@ ITypeInfo_Release(typeinfos[i]); ITypeLib_Release(typelib); +} + +static HRESULT WINAPI provideclassinfo_QueryInterface(IProvideClassInfo *iface, REFIID riid, void **obj) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IProvideClassInfo)) { + *obj = iface; + IProvideClassInfo_AddRef(iface); + return S_OK; + } + else + return IUnknown_QueryInterface(This->outer, riid, obj); +} + +static ULONG WINAPI provideclassinfo_AddRef(IProvideClassInfo *iface) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI provideclassinfo_Release(IProvideClassInfo *iface) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI provideclassinfo_GetClassInfo(IProvideClassInfo *iface, ITypeInfo **ti) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + + TRACE("(%p)->(%p)\n", This, ti); + + return get_typeinfo_of_guid(This->guid, ti); +} + +static const IProvideClassInfoVtbl provideclassinfovtbl = { + provideclassinfo_QueryInterface, + provideclassinfo_AddRef, + provideclassinfo_Release, + provideclassinfo_GetClassInfo +}; + +void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) +{ + classinfo->IProvideClassInfo_iface.lpVtbl = &provideclassinfovtbl; + classinfo->outer = outer; + classinfo->guid = guid; } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) Modified: trunk/reactos/dll/win32/wshom.ocx/wshom_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/wshom_… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/wshom_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/wshom_private.h [iso-8859-1] Sun Feb 26 20:33:41 2017 @@ -26,6 +26,7 @@ #include <windef.h> #include <winbase.h> #include <wshom.h> +#include <ocidl.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(wshom); @@ -43,6 +44,14 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +struct provideclassinfo { + IProvideClassInfo IProvideClassInfo_iface; + IUnknown *outer; + const GUID *guid; +}; + +extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) DECLSPEC_HIDDEN; + HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; #endif /* _WSHOM_PRIVATE_H_ */ 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] Sun Feb 26 20:33:41 2017 @@ -211,7 +211,7 @@ reactos/dll/win32/wmi # Synced to WineStaging-1.9.11 reactos/dll/win32/wmiutils # Synced to WineStaging-1.9.11 reactos/dll/win32/wmvcore # Synced to WineStaging-2.2 -reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.9.11 +reactos/dll/win32/wshom.ocx # Synced to WineStaging-2.2 reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.9.11 reactos/dll/win32/wuapi # Synced to WineStaging-1.9.11 reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73984: [WMVCORE] Sync with Wine Staging 2.2. CORE-12823 c4f829c wmvcore: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). 7b70eba wmvcore: Implement WMCreateReaderPriv.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:30:36 2017 New Revision: 73984 URL: http://svn.reactos.org/svn/reactos?rev=73984&view=rev Log: [WMVCORE] Sync with Wine Staging 2.2. CORE-12823 c4f829c wmvcore: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). 7b70eba wmvcore: Implement WMCreateReaderPriv. Modified: trunk/reactos/dll/win32/wmvcore/wmvcore.h trunk/reactos/dll/win32/wmvcore/wmvcore.spec trunk/reactos/dll/win32/wmvcore/wmvcore_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wmvcore/wmvcore.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmvcore/wmvcore.… ============================================================================== --- trunk/reactos/dll/win32/wmvcore/wmvcore.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wmvcore/wmvcore.h [iso-8859-1] Sun Feb 26 20:30:36 2017 @@ -25,9 +25,9 @@ #include "windef.h" #include "winbase.h" -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } static inline BOOL heap_free(void *mem) Modified: trunk/reactos/dll/win32/wmvcore/wmvcore.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmvcore/wmvcore.… ============================================================================== --- trunk/reactos/dll/win32/wmvcore/wmvcore.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wmvcore/wmvcore.spec [iso-8859-1] Sun Feb 26 20:30:36 2017 @@ -10,7 +10,7 @@ @ stub WMCreateIndexer @ stdcall WMCreateProfileManager(ptr) @ stdcall WMCreateReader(ptr long ptr) -@ stub WMCreateReaderPriv +@ stdcall WMCreateReaderPriv(ptr) @ stdcall WMCreateSyncReader(ptr long ptr) @ stdcall WMCreateWriter(ptr ptr) @ stub WMCreateWriterFileSink Modified: trunk/reactos/dll/win32/wmvcore/wmvcore_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmvcore/wmvcore_… ============================================================================== --- trunk/reactos/dll/win32/wmvcore/wmvcore_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wmvcore/wmvcore_main.c [iso-8859-1] Sun Feb 26 20:30:36 2017 @@ -667,6 +667,11 @@ return S_OK; } +HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader) +{ + return WMCreateReader(NULL, 0, ret_reader); +} + HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) { FIXME("(%p, %x, %p): stub\n", pcert, rights, syncreader); 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] Sun Feb 26 20:30:36 2017 @@ -210,7 +210,7 @@ reactos/dll/win32/wldap32 # Synced to WineStaging-2.2 reactos/dll/win32/wmi # Synced to WineStaging-1.9.11 reactos/dll/win32/wmiutils # Synced to WineStaging-1.9.11 -reactos/dll/win32/wmvcore # Synced to WineStaging-1.9.11 +reactos/dll/win32/wmvcore # Synced to WineStaging-2.2 reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.9.11 reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.9.11 reactos/dll/win32/wuapi # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73983: [WLDAP32] Sync with Wine Staging 2.2. CORE-12823 9743328 wldap32: Add an error message and an explanation for the lack of error constants. c7e46b7 wldap32: Use return value of spri...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:28:08 2017 New Revision: 73983 URL: http://svn.reactos.org/svn/reactos?rev=73983&view=rev Log: [WLDAP32] Sync with Wine Staging 2.2. CORE-12823 9743328 wldap32: Add an error message and an explanation for the lack of error constants. c7e46b7 wldap32: Use return value of sprintf() instead of hardcoding the number of written characters. Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Zh.rc trunk/reactos/dll/win32/wldap32/misc.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 11 "AdministrationsbegrÃ¦nsing overskredet" 12 "Kritisk udvidelse utilgÃ¦ngelig" 13 "KrÃ¦ver konfidencialitet" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Kender ikke attribut" 17 "Udefineret type" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -38,7 +38,7 @@ 11 "Verwaltungslimit Ã¼berschritten" 12 "Kritische Erweiterung nicht verfÃ¼gbar" 13 "Vertraulichkeit erforderlich" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Attribut nicht vorhanden" 17 "Nicht definierter Typ" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -20,6 +20,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +/* The error constants are defined in an enum and thus cannot be used here. */ + STRINGTABLE { 0 "Success" @@ -36,7 +38,7 @@ 11 "Administration Limit Exceeded" 12 "Unavailable Critical Extension" 13 "Confidentiality Required" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "No Such Attribute" 17 "Undefined Type" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 11 "LÃmite de administraciÃ³n excedido" 12 "ExtensiÃ³n crÃtica no disponible" 13 "Confidencialidad requerida" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "No existe dicho atributo" 17 "Tipo no definido" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -40,7 +40,7 @@ 11 "Limite administrative dÃ©passÃ©e" 12 "Extension critique indisponible" 13 "ConfidentialitÃ© requise" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Attribut inconnu" 17 "Type non dÃ©fini" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -38,7 +38,7 @@ 11 "Administration Limit Exceeded" 12 "Unavailable Critical Extension" 13 "Confidentiality Required" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "No Such Attribute" 17 "Undefined Type" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -39,7 +39,7 @@ 11 "AdminisztrÃ¡ciÃ³s korlÃ¡t tÃºllÃ©pÃ©s" 12 "Nem elÃ©rhetÅ kritikus kiterjesztÃ©s" 13 "BizalmassÃ¡g szÃ¼ksÃ©ges" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Nincs ilyen attribÃºtum" 17 "DefiniÃ¡latlan tÃpus" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -39,7 +39,7 @@ 11 "Superato il limite di amministrazione" 12 "Estensione critica non disponibile" 13 "Richiesta confidenzialitÃ " - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Attributo inesistente" 17 "Tipo non definito" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 11 "èªè¨¼å¶éãè¶ãã¾ãã" 12 "éå¤§ãªæ¡å¼µãå©ç¨ã§ãã¾ãã" 13 "æ©å¯ãè¦ãã¾ã" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "ãã®ãããªå±æ§ã¯ããã¾ãã" 17 "æªå®ç¾©ã®å" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 11 "ê´ë¦¬ íëë¥¼ ëììµëë¤" 12 "ì¹ëªì íì¥ì ê°ë¥íì§ ììµëë¤" 13 "ê¸°ë°ì±ì´ ìêµ¬ë©ëë¤" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "ì´ë¤ ìì±ë ììµëë¤" 17 "ì ìëì§ ìì íì" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -39,7 +39,7 @@ 11 "VirÅ¡yta administravimo riba" 12 "Nepasiekiamas kritinis plÄtinys" 13 "Reikalingas slaptumas" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "NÄra tokio atributo" 17 "NeapibrÄÅ¾tas tipas" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 11 "Administratieve limiet overschreden" 12 "Kritieke extensie niet beschikbaar" 13 "Vertrouwelijkheid vereist" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Attribuut bestaat niet" 17 "Ongedefinieerd type" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 11 "Administrasjonsbegrensing overskredet" 12 "Kritisk utvidelse utilgjengelig" 13 "Krever konfidensialitet" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Ingen sÃ¥nn attributt" 17 "Udefinert type" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -37,7 +37,7 @@ 11 "Przekroczony limit administracyjny na serwerze" 12 "BezwzglÄdnie wymagane rozszerzenie nie jest dostÄpne" 13 "Wymagana poufnoÅÄ" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Nie ma takiego atrybutu" 17 "Niezdefiniowany typ" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -39,7 +39,7 @@ 11 "Limite de AdministraÃ§Ã£o Excedido" 12 "ExtensÃ£o CrÃtica IndisponÃvel" 13 "Confidencialidade NecessÃ¡ria" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Atributo NÃ£o Encontrado" 17 "Tipo Indefinido" @@ -143,7 +143,7 @@ 11 "Limite de AdministraÃ§Ã£o Excedido" 12 "ExtensÃ£o CrÃtica IndisponÃvel" 13 "Confidencialidade NecessÃ¡ria" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Atributo nÃ£o Encontrado" 17 "Tipo Indefinido" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -38,7 +38,7 @@ 11 "LimitÄ administrativÄ depÄÈitÄ" 12 "Extensie criticÄ indisponibilÄ" 13 "ConfidenÈialitate necesarÄ" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Atribut necunoscut" 17 "Tip nedefinit" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -39,7 +39,7 @@ 11 "ÐÑÐµÐ²ÑÑÐµÐ½ Ð¿ÑÐµÐ´ÐµÐ» Ð¿Ð¾Ð»Ð½Ð¾Ð¼Ð¾ÑÐ¸Ð¹" 12 "ÐÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾Ðµ ÐºÑÐ¸ÑÐ¸ÑÐµÑÐºÐ¾Ðµ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ðµ" 13 "Ð¢ÑÐµÐ±ÑÐµÑÑÑ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÑ" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð°ÑÑÐ¸Ð±ÑÑÐ°" 17 "Ð¢Ð¸Ð¿ Ð½Ðµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -35,7 +35,7 @@ 11 "Limiti Administrimit Tejkaluar" 12 "Zgjerim i PadiskutueshÃ«m Kritik" 13 "Konfidencialiteti i kÃ«rkuar" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Nuk ka atribut tÃ« tillÃ«" 17 "Lloji i papÃ«rcaktuar" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 11 "Administration Limit Exceeded" 12 "Unavailable Critical Extension" 13 "Confidentiality Required" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Inget sÃ¥dant attribut" 17 "Odefinierad typ" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 11 "YÃ¶netim Hududu AÅÄ±ldÄ±" 12 "Olmayan Ãnemli Eklenti" 13 "Gizlilik Gerekli" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "BÃ¶yle Ãz Nitelik Yok" 17 "TanÄ±mlanmamÄ±Å TÃ¼r" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -41,7 +41,7 @@ 11 "ÐÐµÑÐµÐ²Ð¸ÑÐµÐ½Ð¾ Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÑÐ²Ð°Ð½Ð½Ñ" 12 "ÐÑÐ¸ÑÐ¸ÑÐ½Ðµ ÑÐ¾Ð·ÑÐ¸ÑÐµÐ½Ð½Ñ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ðµ" 13 "ÐÐ¾ÑÑÑÐ±Ð½Ð° ÐºÐ¾Ð½ÑÑÐ´ÐµÐ½ÑÑÐ¹Ð½ÑÑÑÑ" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "ÐÐµÐ¼Ð°Ñ ÑÐ°ÐºÐ¾Ñ Ð²Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ" 17 "ÐÐµÐ²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹ ÑÐ¸Ð¿" Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Zh.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -40,7 +40,7 @@ 11 "è¶è¿äºç®¡çéå¶" 12 "æ æçæ©å±å" 13 "éè¦ä¿å¯" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "æ²¡æè¿æ ·çå±æ§" 17 "æªå®ä¹çç±»å" @@ -144,7 +144,7 @@ 11 "è¶éäºç®¡çéå¶" 12 "ä¸æ£ç¢ºå¯æªå" 13 "éè¦ä¿å¯" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "æ²æéæ¨£çå±¬æ§" 17 "æªå®ç¾©çé¡å" Modified: trunk/reactos/dll/win32/wldap32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/misc.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/misc.c [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -211,10 +211,7 @@ (src[i] >= 'a' && src[i] <= 'z')) *d++ = src[i]; else - { - sprintf( d, fmt, (unsigned char)src[i] ); - d += 3; - } + d += sprintf( d, fmt, (unsigned char)src[i] ); } *++d = 0; } 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] Sun Feb 26 20:28:08 2017 @@ -207,7 +207,7 @@ reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winscard # Synced to WineStaging-2.2 reactos/dll/win32/wintrust # Synced to WineStaging-1.9.23 -reactos/dll/win32/wldap32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/wldap32 # Synced to WineStaging-2.2 reactos/dll/win32/wmi # Synced to WineStaging-1.9.11 reactos/dll/win32/wmiutils # Synced to WineStaging-1.9.11 reactos/dll/win32/wmvcore # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73982: [WINSCARD] Sync with Wine Staging 2.2. CORE-12823 4df855d winscard: Fix some spec file entries.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:20:19 2017 New Revision: 73982 URL: http://svn.reactos.org/svn/reactos?rev=73982&view=rev Log: [WINSCARD] Sync with Wine Staging 2.2. CORE-12823 4df855d winscard: Fix some spec file entries. Modified: trunk/reactos/dll/win32/winscard/winscard.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/winscard/winscard.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winscard/winscar… ============================================================================== --- trunk/reactos/dll/win32/winscard/winscard.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winscard/winscard.spec [iso-8859-1] Sun Feb 26 20:20:19 2017 @@ -34,14 +34,14 @@ @ stdcall SCardIntroduceReaderGroupW(long ptr) @ stdcall SCardIntroduceReaderW(long ptr ptr) @ stdcall SCardIsValidContext(long) -@ stdcall SCardListCardsA(long ptr ptr long str long) +@ stdcall SCardListCardsA(long ptr ptr long str ptr) @ stdcall SCardListCardsW(long ptr ptr long str long) @ stdcall SCardListInterfacesA(long ptr ptr ptr) @ stdcall SCardListInterfacesW(long ptr ptr ptr) @ stdcall SCardListReaderGroupsA(long ptr ptr) @ stdcall SCardListReaderGroupsW(long ptr ptr) -@ stdcall SCardListReadersA(long ptr ptr ptr) -@ stdcall SCardListReadersW(long ptr ptr ptr) +@ stdcall SCardListReadersA(long str ptr ptr) +@ stdcall SCardListReadersW(long wstr ptr ptr) @ stdcall SCardLocateCardsA(long ptr ptr long) @ stdcall SCardLocateCardsByATRA(long ptr long ptr long) @ stdcall SCardLocateCardsByATRW(long ptr long ptr long) @@ -55,8 +55,8 @@ @ stdcall SCardSetCardTypeProviderNameA(long ptr long ptr) @ stdcall SCardSetCardTypeProviderNameW(long ptr long ptr) @ stdcall SCardState(long ptr ptr ptr ptr) -@ stdcall SCardStatusA (long str long long long ptr long ) -@ stdcall SCardStatusW (long wstr long long long ptr long ) +@ stdcall SCardStatusA(long str ptr ptr ptr ptr ptr) +@ stdcall SCardStatusW(long wstr ptr ptr ptr ptr ptr) @ stdcall SCardTransmit(long ptr ptr long ptr ptr ptr) @ extern g_rgSCardRawPci @ extern g_rgSCardT0Pci 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] Sun Feb 26 20:20:19 2017 @@ -205,7 +205,7 @@ reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/winscard # Synced to WineStaging-1.9.11 +reactos/dll/win32/winscard # Synced to WineStaging-2.2 reactos/dll/win32/wintrust # Synced to WineStaging-1.9.23 reactos/dll/win32/wldap32 # Synced to WineStaging-1.9.11 reactos/dll/win32/wmi # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73981: [WINEMP3.ACM] Sync with Wine Staging 2.2. CORE-12823 ac2b824 winemp3.acm: Fixes compilation for older mpg123 library versions (try 2) 2253d1a winemp3.acm: Ignore XING headers when ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:18:16 2017 New Revision: 73981 URL: http://svn.reactos.org/svn/reactos?rev=73981&view=rev Log: [WINEMP3.ACM] Sync with Wine Staging 2.2. CORE-12823 ac2b824 winemp3.acm: Fixes compilation for older mpg123 library versions (try 2) 2253d1a winemp3.acm: Ignore XING headers when parsing MP3 files. Modified: trunk/reactos/dll/win32/winemp3.acm/mpegl3.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/winemp3.acm/mpegl3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/mpeg… ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/mpegl3.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/mpegl3.c [iso-8859-1] Sun Feb 26 20:18:16 2017 @@ -261,6 +261,15 @@ aad->convert = mp3_horse; aad->mh = mpg123_new(NULL,&err); mpg123_open_feed(aad->mh); + +#if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ + /* mpg123 may find a XING header in the mp3 and use that information + * to ask for seeks in order to read specific frames in the file. + * We cannot allow that since the caller application is feeding us. + * This fixes problems for mp3 files encoded with LAME (bug 42361) + */ + mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); +#endif } /* no encoding yet else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && 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] Sun Feb 26 20:18:16 2017 @@ -198,7 +198,7 @@ reactos/dll/win32/wbemprox # Synced to WineStaging-2.2 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.23 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11 -reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.23 +reactos/dll/win32/winemp3.acm # Synced to WineStaging-2.2 reactos/dll/win32/wing32 # Synced to WineStaging-1.9.11 reactos/dll/win32/winhttp # Synced to WineStaging-1.9.23 reactos/dll/win32/wininet # Synced to WineStaging-1.9.23

7 years, 10 months

[akhaldi] 73980: [WBEMPROX_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:14:44 2017 New Revision: 73980 URL: http://svn.reactos.org/svn/reactos?rev=73980&view=rev Log: [WBEMPROX_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/wbemprox/query.c Modified: trunk/rostests/winetests/wbemprox/query.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemprox/query.… ============================================================================== --- trunk/rostests/winetests/wbemprox/query.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wbemprox/query.c [iso-8859-1] Sun Feb 26 20:14:44 2017 @@ -482,9 +482,11 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) { + static const WCHAR backslashW[] = {'\\',0}; + static const WCHAR memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; + static const WCHAR modelW[] = {'M','o','d','e','l',0}; static const WCHAR nameW[] = {'N','a','m','e',0}; static const WCHAR usernameW[] = {'U','s','e','r','N','a','m','e',0}; - static const WCHAR backslashW[] = {'\\',0}; static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; @@ -523,6 +525,20 @@ hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); ok( hr == S_OK, "got %08x\n", hr ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( service, memorytypeW, 0, &value, &type, NULL ); + ok( hr == WBEM_E_NOT_FOUND, "got %08x\n", hr ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( service, modelW, 0, &value, &type, NULL ); + ok( hr == S_OK, "failed to get model %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "model: %s\n", wine_dbgstr_w(V_BSTR( &value )) ); + VariantClear( &value ); type = 0xdeadbeef; VariantInit( &value ); @@ -1066,6 +1082,10 @@ {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; static const WCHAR servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR totalvisiblememorysizeW[] = + {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; + static const WCHAR totalvirtualmemorysizeW[] = + {'T','o','t','a','l','V','i','r','t','u','a','l','M','e','m','o','r','y','S','i','z','e',0}; BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); IEnumWbemClassObject *result; IWbemClassObject *obj; @@ -1170,6 +1190,24 @@ trace( "version: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, totalvisiblememorysizeW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get visible memory size %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); + trace( "totalvisiblememorysize %s\n", wine_dbgstr_w(V_BSTR(&val)) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, totalvirtualmemorysizeW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get virtual memory size %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); + trace( "totalvirtualmemorysize %s\n", wine_dbgstr_w(V_BSTR(&val)) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query ); @@ -1184,7 +1222,7 @@ 'C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); IEnumWbemClassObject *result; - IWbemClassObject *service; + IWbemClassObject *obj; VARIANT value; CIMTYPE type; HRESULT hr; @@ -1197,20 +1235,130 @@ return; } - hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "got %08x\n", hr ); type = 0xdeadbeef; VariantInit( &value ); - hr = IWbemClassObject_Get( service, uuidW, 0, &value, &type, NULL ); + hr = IWbemClassObject_Get( obj, uuidW, 0, &value, &type, NULL ); ok( hr == S_OK, "failed to get computer name %08x\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); trace( "uuid %s\n", wine_dbgstr_w(V_BSTR(&value)) ); VariantClear( &value ); - IWbemClassObject_Release( service ); + IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + +static void test_PhysicalMemory( IWbemServices *services ) +{ + static const WCHAR capacityW[] = {'C','a','p','a','c','i','t','y',0}; + static const WCHAR memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_PhysicalMemory not available\n" ); + return; + } + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, capacityW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get capacity %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); + trace( "capacity %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, memorytypeW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get memory type %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); + trace( "memorytype %u\n", V_I4( &val ) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); + SysFreeString( query ); + SysFreeString( wql ); +} + +static void test_IP4RouteTable( IWbemServices *services ) +{ + static const WCHAR destinationW[] = {'D','e','s','t','i','n','a','t','i','o','n',0}; + static const WCHAR interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; + static const WCHAR nexthopW[] = {'N','e','x','t','H','o','p',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'I','P','4','R','o','u','t','e','T','a','b','l','e',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_IP4RouteTable not available\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, destinationW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get destination %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "destination %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, interfaceindexW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get interface index %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_SINT32, "unexpected type 0x%x\n", type ); + trace( "interfaceindex %d\n", V_I4( &val ) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, nexthopW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get nexthop %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "nexthop %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); + } + SysFreeString( query ); SysFreeString( wql ); } @@ -1254,6 +1402,8 @@ test_SystemSecurity( services ); test_OperatingSystem( services ); test_ComputerSystemProduct( services ); + test_PhysicalMemory( services ); + test_IP4RouteTable( services ); SysFreeString( path ); IWbemServices_Release( services );

7 years, 10 months

[akhaldi] 73979: [WBEMPROX] Sync with Wine Staging 2.2. CORE-12823 5e23535 wbemprox: Add DriverDate for Win32_VideoController. f9321fa wbemprox: Add InstalledDisplayDrivers for Win32_VideoControlle...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:13:53 2017 New Revision: 73979 URL: http://svn.reactos.org/svn/reactos?rev=73979&view=rev Log: [WBEMPROX] Sync with Wine Staging 2.2. CORE-12823 5e23535 wbemprox: Add DriverDate for Win32_VideoController. f9321fa wbemprox: Add InstalledDisplayDrivers for Win32_VideoController. df6e20e wbemprox: Add Status for Win32_VideoController. 9a2a366 wbemprox: Add ConfigManagerErrorCode for Win32_VideoController. af7e5f7 wbemprox: Provide DeviceID, Location and PortName for printers. 92168c4 wbemprox: Add a partial implementation of Win32_IP4RouteTable. d11a07e wbemprox: Don't define USE_WS_PREFIX on MinGW. f2c0054 wbemprox: Only include matching rows in the table row count. a254572 wbemprox: Return the machine ID for Win32_ComputerSystemProduct.UUID on Linux. 9842bf3 wbemprox: Return a non-null UUID for Win32_ComputerSystemProduct.UUID if nothing better is available. b05928a wbemprox: Implement Win32_PhysicalMemory.MemoryType. 710abd6 wbemprox: Implement Win32_OperatingSystem.TotalVirtualMemorySize. Modified: trunk/reactos/dll/win32/wbemprox/builtin.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wbemprox/builtin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] Sun Feb 26 20:13:53 2017 @@ -51,6 +51,8 @@ {'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e',0}; static const WCHAR class_diskpartitionW[] = {'W','i','n','3','2','_','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; +static const WCHAR class_ip4routetableW[] = + {'W','i','n','3','2','_','I','P','4','R','o','u','t','e','T','a','b','l','e',0}; static const WCHAR class_logicaldiskW[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_logicaldisk2W[] = @@ -128,6 +130,8 @@ {'C','o','d','e','S','e','t',0}; static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; +static const WCHAR prop_configmanagererrorcodeW[] = + {'C','o','n','f','i','g','M','a','n','a','g','e','r','E','r','r','o','r','C','o','d','e',0}; static const WCHAR prop_countrycodeW[] = {'C','o','u','n','t','r','y','C','o','d','e',0}; static const WCHAR prop_cpustatusW[] = @@ -154,6 +158,8 @@ {'D','e','f','a','u','l','t','V','a','l','u','e',0}; static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR prop_destinationW[] = + {'D','e','s','t','i','n','a','t','i','o','n',0}; static const WCHAR prop_deviceidW[] = {'D','e','v','i','c','e','I','d',0}; static const WCHAR prop_dhcpenabledW[] = @@ -174,6 +180,8 @@ {'D','o','m','a','i','n','R','o','l','e',0}; static const WCHAR prop_driveW[] = {'D','r','i','v','e',0}; +static const WCHAR prop_driverdateW[] = + {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR prop_drivernameW[] = {'D','r','i','v','e','r','N','a','m','e',0}; static const WCHAR prop_driverversionW[] = @@ -202,6 +210,8 @@ {'I','n','d','e','x',0}; static const WCHAR prop_installdateW[] = {'I','n','s','t','a','l','l','D','a','t','e',0}; +static const WCHAR prop_installeddisplaydriversW[]= + {'I','n','s','t','a','l','l','e','d','D','i','s','p','l','a','y','D','r','i','v','e','r','s',0}; static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; static const WCHAR prop_interfacetypeW[] = @@ -234,6 +244,8 @@ {'M','e','d','i','a','T','y','p','e',0}; static const WCHAR prop_memberW[] = {'M','e','m','b','e','r',0}; +static const WCHAR prop_memorytypeW[] = + {'M','e','m','o','r','y','T','y','p','e',0}; static const WCHAR prop_methodW[] = {'M','e','t','h','o','d',0}; static const WCHAR prop_modelW[] = @@ -242,6 +254,8 @@ {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; static const WCHAR prop_networkW[] = {'N','e','t','w','o','r','k',0}; +static const WCHAR prop_nexthopW[] = + {'N','e','x','t','H','o','p',0}; static const WCHAR prop_numcoresW[] = {'N','u','m','b','e','r','O','f','C','o','r','e','s',0}; static const WCHAR prop_numlogicalprocessorsW[] = @@ -310,6 +324,8 @@ {'S','t','a','r','t','i','n','g','O','f','f','s','e','t',0}; static const WCHAR prop_stateW[] = {'S','t','a','t','e',0}; +static const WCHAR prop_statusW[] = + {'S','t','a','t','u','s',0}; static const WCHAR prop_statusinfoW[] = {'S','t','a','t','u','s','I','n','f','o',0}; static const WCHAR prop_strvalueW[] = @@ -326,6 +342,8 @@ {'T','h','r','e','a','d','C','o','u','n','t',0}; static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; +static const WCHAR prop_totalvirtualmemorysizeW[] = + {'T','o','t','a','l','V','i','r','t','u','a','l','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR prop_totalvisiblememorysizeW[] = {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR prop_typeW[] = @@ -441,6 +459,12 @@ { prop_startingoffsetW, CIM_UINT64 }, { prop_typeW, CIM_STRING|COL_FLAG_DYNAMIC } }; +static const struct column col_ip4routetable[] = +{ + { prop_destinationW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_interfaceindexW, CIM_SINT32|COL_FLAG_KEY }, + { prop_nexthopW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, +}; static const struct column col_logicaldisk[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, @@ -501,6 +525,7 @@ { prop_servicepackminorW, CIM_UINT16, VT_I4 }, { prop_suitemaskW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_totalvirtualmemorysizeW, CIM_UINT64 }, { prop_totalvisiblememorysizeW, CIM_UINT64 }, { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } }; @@ -521,7 +546,8 @@ }; static const struct column col_physicalmemory[] = { - { prop_capacityW, CIM_UINT64 } + { prop_capacityW, CIM_UINT64 }, + { prop_memorytypeW, CIM_UINT16, VT_I4 } }; static const struct column col_printer[] = { @@ -633,24 +659,28 @@ }; static const struct column col_videocontroller[] = { - { prop_adapterdactypeW, CIM_STRING }, - { prop_adapterramW, CIM_UINT32, VT_I4 }, - { prop_availabilityW, CIM_UINT16 }, - { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_currentbitsperpixelW, CIM_UINT32, VT_I4 }, - { prop_currenthorizontalresW, CIM_UINT32, VT_I4 }, - { prop_currentrefreshrateW, CIM_UINT32, VT_I4 }, - { prop_currentscanmodeW, CIM_UINT16, VT_I4 }, - { prop_currentverticalresW, CIM_UINT32, VT_I4 }, - { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, - { prop_driverversionW, CIM_STRING }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_videoarchitectureW, CIM_UINT16, VT_I4 }, - { prop_videomemorytypeW, CIM_UINT16, VT_I4 }, - { prop_videomodedescriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_videoprocessorW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_adapterdactypeW, CIM_STRING }, + { prop_adapterramW, CIM_UINT32, VT_I4 }, + { prop_availabilityW, CIM_UINT16 }, + { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_configmanagererrorcodeW, CIM_UINT32, VT_I4 }, + { prop_currentbitsperpixelW, CIM_UINT32, VT_I4 }, + { prop_currenthorizontalresW, CIM_UINT32, VT_I4 }, + { prop_currentrefreshrateW, CIM_UINT32, VT_I4 }, + { prop_currentscanmodeW, CIM_UINT16, VT_I4 }, + { prop_currentverticalresW, CIM_UINT32, VT_I4 }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, + { prop_driverdateW, CIM_DATETIME }, + { prop_driverversionW, CIM_STRING }, + { prop_installeddisplaydriversW,CIM_STRING }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_statusW, CIM_STRING }, + { prop_videoarchitectureW, CIM_UINT16, VT_I4 }, + { prop_videomemorytypeW, CIM_UINT16, VT_I4 }, + { prop_videomodedescriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_videoprocessorW, CIM_STRING|COL_FLAG_DYNAMIC }, }; static const WCHAR baseboard_manufacturerW[] = @@ -695,8 +725,8 @@ static const WCHAR compsysproduct_identifyingnumberW[] = {'0',0}; static const WCHAR compsysproduct_uuidW[] = - {'0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','0','0',0}; + {'d','e','a','d','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-', + 'd','e','a','d','d','e','a','d','d','e','a','d',0}; static const WCHAR diskdrive_interfacetypeW[] = {'I','D','E',0}; static const WCHAR diskdrive_manufacturerW[] = @@ -737,8 +767,12 @@ {'I','n','t','e','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const WCHAR videocontroller_deviceidW[] = {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; +static const WCHAR videocontroller_driverDateW[] = + {'2','0','1','7','0','1','0','1','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; static const WCHAR videocontroller_driverversionW[] = {'1','.','0',0}; +static const WCHAR videocontroller_statusW[] = + {'O','K',0}; #include "pshpack1.h" struct record_baseboard @@ -825,6 +859,12 @@ UINT64 size; UINT64 startingoffset; const WCHAR *type; +}; +struct record_ip4routetable +{ + const WCHAR *destination; + INT32 interfaceindex; + const WCHAR *nexthop; }; struct record_logicaldisk { @@ -886,6 +926,7 @@ UINT16 servicepackminor; UINT32 suitemask; const WCHAR *systemdirectory; + UINT64 totalvirtualmemorysize; UINT64 totalvisiblememorysize; const WCHAR *version; }; @@ -907,6 +948,7 @@ struct record_physicalmemory { UINT64 capacity; + UINT16 memorytype; }; struct record_printer { @@ -1022,6 +1064,7 @@ UINT32 adapter_ram; UINT16 availability; const WCHAR *caption; + UINT32 config_errorcode; UINT32 current_bitsperpixel; UINT32 current_horizontalres; UINT32 current_refreshrate; @@ -1029,9 +1072,12 @@ UINT32 current_verticalres; const WCHAR *description; const WCHAR *device_id; + const WCHAR *driverdate; const WCHAR *driverversion; + const WCHAR *installeddriver; const WCHAR *name; const WCHAR *pnpdevice_id; + const WCHAR *status; UINT16 videoarchitecture; UINT16 videomemorytype; const WCHAR *videomodedescription; @@ -1326,6 +1372,33 @@ sprintfW( ret, fmtW, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], uuid[8], uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15] ); return ret; + } +#endif +#ifdef __linux__ + int file; + if ((file = open( "/var/lib/dbus/machine-id", O_RDONLY )) != -1) + { + unsigned char buf[32]; + if (read( file, buf, sizeof(buf) ) == sizeof(buf)) + { + unsigned int i, j; + WCHAR *ret, *p; + + close( file ); + if (!(p = ret = heap_alloc( 37 * sizeof(WCHAR) ))) return NULL; + for (i = 0, j = 0; i < 8; i++) p[i] = toupperW( buf[j++] ); + p[8] = '-'; + for (i = 9; i < 13; i++) p[i] = toupperW( buf[j++] ); + p[13] = '-'; + for (i = 14; i < 18; i++) p[i] = toupperW( buf[j++] ); + p[18] = '-'; + for (i = 19; i < 23; i++) p[i] = toupperW( buf[j++] ); + p[23] = '-'; + for (i = 24; i < 36; i++) p[i] = toupperW( buf[j++] ); + ret[i] = 0; + return ret; + } + close( file ); } #endif return heap_strdupW( compsysproduct_uuidW ); @@ -1970,6 +2043,59 @@ return status; } +static WCHAR *get_ip4_string( DWORD addr ) +{ + static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; + WCHAR *ret; + + if (!(ret = heap_alloc( sizeof("ddd.ddd.ddd.ddd") * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, (addr >> 24) & 0xff, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff ); + return ret; +} + +static enum fill_status fill_ip4routetable( struct table *table, const struct expr *cond ) +{ + struct record_ip4routetable *rec; + UINT i, row = 0, offset = 0, size = 0; + MIB_IPFORWARDTABLE *forwards; + enum fill_status status = FILL_STATUS_UNFILTERED; + + if (GetIpForwardTable( NULL, &size, TRUE ) != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED; + if (!(forwards = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (GetIpForwardTable( forwards, &size, TRUE )) + { + heap_free( forwards ); + return FILL_STATUS_FAILED; + } + if (!resize_table( table, forwards->dwNumEntries, sizeof(*rec) )) + { + heap_free( forwards ); + return FILL_STATUS_FAILED; + } + + for (i = 0; i < forwards->dwNumEntries; i++) + { + rec = (struct record_ip4routetable *)(table->data + offset); + + rec->destination = get_ip4_string( ntohl(forwards->table[i].dwForwardDest) ); + rec->interfaceindex = forwards->table[i].dwForwardIfIndex; + rec->nexthop = get_ip4_string( ntohl(forwards->table[i].dwForwardNextHop) ); + + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + offset += sizeof(*rec); + row++; + } + TRACE("created %u rows\n", row); + table->num_rows = row; + + heap_free( forwards ); + return status; +} + static WCHAR *get_volumename( const WCHAR *root ) { WCHAR buf[MAX_PATH + 1] = {0}; @@ -2289,7 +2415,8 @@ if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_physicalmemory *)table->data; - rec->capacity = get_total_physical_memory(); + rec->capacity = get_total_physical_memory(); + rec->memorytype = 9; /* RAM */ if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; @@ -2304,7 +2431,7 @@ struct record_printer *rec; enum fill_status status = FILL_STATUS_UNFILTERED; PRINTER_INFO_2W *info; - DWORD i, offset = 0, count = 0, size = 0; + DWORD i, offset = 0, count = 0, size = 0, num_rows = 0; WCHAR id[20]; EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); @@ -2341,9 +2468,10 @@ continue; } offset += sizeof(*rec); - } - TRACE("created %u rows\n", count); - table->num_rows = count; + num_rows++; + } + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; heap_free( info ); return status; @@ -2526,7 +2654,7 @@ static const WCHAR fmtW[] = {'C','P','U','%','u',0}; WCHAR caption[100], device_id[14], processor_id[17], manufacturer[13], name[49] = {0}, version[50]; struct record_processor *rec; - UINT i, offset = 0, num_cores, num_logical_processors, count = get_processor_count(); + UINT i, offset = 0, num_rows = 0, num_cores, num_logical_processors, count = get_processor_count(); enum fill_status status = FILL_STATUS_UNFILTERED; if (!resize_table( table, count, sizeof(*rec) )) return FILL_STATUS_FAILED; @@ -2567,10 +2695,11 @@ continue; } offset += sizeof(*rec); - } - - TRACE("created %u rows\n", count); - table->num_rows = count; + num_rows++; + } + + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; return status; } @@ -2759,7 +2888,8 @@ rec->servicepackminor = ver.wServicePackMinor; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); - rec->totalvisiblememorysize = get_total_physical_memory() / 1024; + rec->totalvirtualmemorysize = get_total_physical_memory() / 1024; + rec->totalvisiblememorysize = rec->totalvirtualmemorysize; rec->version = get_osversion( &ver ); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; @@ -3047,6 +3177,29 @@ return ret; } +#define HW_VENDOR_AMD 0x1002 +#define HW_VENDOR_NVIDIA 0x10de +#define HW_VENDOR_VMWARE 0x15ad +#define HW_VENDOR_INTEL 0x8086 + +static const WCHAR* get_video_driver(UINT vendorid) +{ + static const WCHAR driver_amdW[] = {'a','t','i','c','f','x','3','2','.','d','l','l',0}; + static const WCHAR driver_intelW[] = {'i','g','d','u','m','d','i','m','3','2','.','d','l','l',0}; + static const WCHAR driver_nvidiaW[] = {'n','v','d','3','d','u','m','.','d','l','l',0}; + static const WCHAR driver_wineW[] = {'w','i','n','e','.','d','l','l',0}; + + /* FIXME: wined3d has a better table, but we can not access this information through dxgi */ + + if (vendorid == HW_VENDOR_AMD) + return driver_amdW; + else if (vendorid == HW_VENDOR_NVIDIA) + return driver_nvidiaW; + else if (vendorid == HW_VENDOR_INTEL) + return driver_intelW; + return driver_wineW; +} + static enum fill_status fill_videocontroller( struct table *table, const struct expr *cond ) { static const WCHAR fmtW[] = {'%','u',' ','x',' ','%','u',' ','x',' ','%','I','6','4','u',' ','c','o','l','o','r','s',0}; @@ -3081,6 +3234,7 @@ rec->adapter_dactype = videocontroller_dactypeW; rec->adapter_ram = vidmem; rec->availability = 3; /* Running or Full Power */ + rec->config_errorcode = 0; /* no error */ rec->caption = heap_strdupW( name ); rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); rec->current_horizontalres = hres; @@ -3089,9 +3243,12 @@ rec->current_verticalres = vres; rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; + rec->driverdate = videocontroller_driverDateW; rec->driverversion = videocontroller_driverversionW; + rec->installeddriver = get_video_driver( desc.VendorId ); rec->name = heap_strdupW( name ); rec->pnpdevice_id = get_pnpdeviceid( &desc ); + rec->status = videocontroller_statusW; rec->videoarchitecture = 2; /* Unknown */ rec->videomemorytype = 2; /* Unknown */ wsprintfW( mode, fmtW, hres, vres, (UINT64)1 << rec->current_bitsperpixel ); @@ -3122,6 +3279,7 @@ { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, 0, 0, NULL, fill_diskdrive }, { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, 0, NULL, fill_diskpartition }, + { class_ip4routetableW, SIZEOF(col_ip4routetable), col_ip4routetable, 0, 0, NULL, fill_ip4routetable }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, 0, NULL, fill_networkadapter }, 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] Sun Feb 26 20:13:53 2017 @@ -195,7 +195,7 @@ reactos/dll/win32/version # Synced to WineStaging-1.9.11 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11 reactos/dll/win32/wbemdisp # Synced to WineStaging-2.2 -reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.23 +reactos/dll/win32/wbemprox # Synced to WineStaging-2.2 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.23 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11 reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.23

7 years, 10 months

[akhaldi] 73978: [WBEMDISP] Sync with Wine Staging 2.2. CORE-12823 11ebda0 wbemdisp: Add ISWbemSecurity stub interface. 61f0bda wbemdisp: Implement ISWbemObjectSet::ItemIndex. b47462d wbemdisp: Ret...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 20:10:35 2017 New Revision: 73978 URL: http://svn.reactos.org/svn/reactos?rev=73978&view=rev Log: [WBEMDISP] Sync with Wine Staging 2.2. CORE-12823 11ebda0 wbemdisp: Add ISWbemSecurity stub interface. 61f0bda wbemdisp: Implement ISWbemObjectSet::ItemIndex. b47462d wbemdisp: Return interface pointers from QI, not object pointers. Modified: trunk/reactos/dll/win32/wbemdisp/locator.c trunk/reactos/media/doc/README.WINE 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] Sun Feb 26 20:10:35 2017 @@ -142,7 +142,7 @@ IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { - *ppvObject = object; + *ppvObject = iface; } else { @@ -386,7 +386,7 @@ IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { - *ppvObject = objectset; + *ppvObject = iface; } else { @@ -525,8 +525,39 @@ LONG lIndex, ISWbemObject **objWbemObject ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + LONG count; + HRESULT hr; + IEnumVARIANT *enum_var; + VARIANT var; + + TRACE( "%p, %d, %p\n", objectset, lIndex, objWbemObject ); + + *objWbemObject = NULL; + hr = ISWbemObjectSet_get_Count( iface, &count ); + if (FAILED(hr)) return hr; + + if (lIndex >= count) return WBEM_E_NOT_FOUND; + + hr = ISWbemObjectSet_get__NewEnum( iface, (IUnknown **)&enum_var ); + if (FAILED(hr)) return hr; + + IEnumVARIANT_Reset( enum_var ); + hr = IEnumVARIANT_Skip( enum_var, lIndex ); + if (SUCCEEDED(hr)) + hr = IEnumVARIANT_Next( enum_var, 1, &var, NULL ); + IEnumVARIANT_Release( enum_var ); + + if (SUCCEEDED(hr)) + { + if (V_VT( &var ) == VT_DISPATCH) + hr = IDispatch_QueryInterface( V_DISPATCH( &var ), &IID_ISWbemObject, (void **)objWbemObject ); + else + hr = WBEM_E_NOT_FOUND; + VariantClear( &var ); + } + + return hr; } static const ISWbemObjectSetVtbl objectset_vtbl = @@ -617,7 +648,7 @@ if (IsEqualGUID( riid, &IID_IEnumVARIANT ) || IsEqualGUID( riid, &IID_IUnknown )) { - *ppvObject = enumvar; + *ppvObject = iface; } else { @@ -750,7 +781,7 @@ IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { - *ppvObject = services; + *ppvObject = iface; } else { 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] Sun Feb 26 20:10:35 2017 @@ -194,7 +194,7 @@ reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23 reactos/dll/win32/version # Synced to WineStaging-1.9.11 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.16 +reactos/dll/win32/wbemdisp # Synced to WineStaging-2.2 reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.23 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.23 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73977: [SHLWAPI_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 19:41:53 2017 New Revision: 73977 URL: http://svn.reactos.org/svn/reactos?rev=73977&view=rev Log: [SHLWAPI_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/shlwapi/url.c Modified: trunk/rostests/winetests/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/url.c?r… ============================================================================== --- trunk/rostests/winetests/shlwapi/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/url.c [iso-8859-1] Sun Feb 26 19:41:53 2017 @@ -198,6 +198,15 @@ {"res://c:\\tests/res\\foo%20bar/strange\\sth", 0, S_OK, "res://c:\\tests/res\\foo%20bar/strange\\sth", FALSE}, {"res://c:\\tests/res\\foo%20bar/strange\\sth", URL_FILE_USE_PATHURL, S_OK, "res://c:\\tests/res\\foo%20bar/strange\\sth", FALSE}, {"res://c:\\tests/res\\foo%20bar/strange\\sth", URL_UNESCAPE, S_OK, "res://c:\\tests/res\\foo bar/strange\\sth", FALSE}, + {"/A/../B/./C/../../test_remove_dot_segments", 0, S_OK, "/test_remove_dot_segments", FALSE}, + {"/A/../B/./C/../../test_remove_dot_segments", URL_FILE_USE_PATHURL, S_OK, "/test_remove_dot_segments", FALSE}, + {"/A/../B/./C/../../test_remove_dot_segments", URL_WININET_COMPATIBILITY, S_OK, "/test_remove_dot_segments", FALSE}, + {"/A/B\\C/D\\E", 0, S_OK, "/A/B\\C/D\\E", FALSE}, + {"/A/B\\C/D\\E", URL_FILE_USE_PATHURL, S_OK, "/A/B\\C/D\\E", FALSE}, + {"/A/B\\C/D\\E", URL_WININET_COMPATIBILITY, S_OK, "/A/B\\C/D\\E", FALSE}, + {"///A/../B", 0, S_OK, "///B", FALSE}, + {"///A/../B", URL_FILE_USE_PATHURL, S_OK, "///B", FALSE}, + {"///A/../B", URL_WININET_COMPATIBILITY, S_OK, "///B", FALSE}, {"A", 0, S_OK, "A", FALSE}, {"../A", 0, S_OK, "../A", FALSE}, {".\\A", 0, S_OK, ".\\A", FALSE}, @@ -944,12 +953,14 @@ static void test_UrlEscapeW(void) { + static const WCHAR path_test[] = {'/','t','e','s','t',0}; static const WCHAR naW[] = {'f','t','p',31,255,250,0x2122,'e','n','d','/',0}; static const WCHAR naescapedW[] = {'f','t','p','%','1','F','%','F','F','%','F','A',0x2122,'e','n','d','/',0}; static const WCHAR out[] = {'f','o','o','%','2','0','b','a','r',0}; WCHAR overwrite[] = {'f','o','o',' ','b','a','r',0,0,0}; WCHAR ret_urlW[INTERNET_MAX_URL_LENGTH]; - DWORD size = 0; + WCHAR empty_string[] = {0}; + DWORD size; HRESULT ret; WCHAR wc; int i; @@ -958,6 +969,42 @@ win_skip("UrlEscapeW not found\n"); return; } + + /* Check error paths */ + + ret = UrlEscapeW(path_test, NULL, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + + size = 0; + ret = UrlEscapeW(path_test, NULL, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + ok(size == 0, "got %d, expected %d\n", size, 0); + + ret = UrlEscapeW(path_test, empty_string, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + + size = 0; + ret = UrlEscapeW(path_test, empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + ok(size == 0, "got %d, expected %d\n", size, 0); + + ret = UrlEscapeW(path_test, NULL, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + + size = 1; + ret = UrlEscapeW(path_test, NULL, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + ok(size == 1, "got %d, expected %d\n", size, 1); + + ret = UrlEscapeW(path_test, empty_string, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + + size = 1; + ret = UrlEscapeW(path_test, empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); + ok(size == 6, "got %d, expected %d\n", size, 6); + + /* Check actual escaping */ size = sizeof(overwrite)/sizeof(WCHAR); ret = pUrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); @@ -1466,6 +1513,7 @@ {"htt?p://www.winehq.org/",URL_E_INVALID_SYNTAX}, {"ab-://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN}, {" http://www.winehq.org/",URL_E_INVALID_SYNTAX}, + {"HTTP://www.winehq.org/",S_OK,4,URL_SCHEME_HTTP}, }; static void test_ParseURL(void)

7 years, 10 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 February 2017