Ros-diffs November 2014

ros-diffs@reactos.org

18 participants
373 discussions

[akhaldi] 65315: [WSHOM.OCX] * Import from Wine 1.7.27. CORE-8768 #resolve #comment Imported in r65315. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 8 10:22:22 2014 New Revision: 65315 URL: http://svn.reactos.org/svn/reactos?rev=65315&view=rev Log: [WSHOM.OCX] * Import from Wine 1.7.27. CORE-8768 #resolve #comment Imported in r65315. CORE-8540 Added: trunk/reactos/dll/win32/wshom.ocx/ (with props) trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt (with props) trunk/reactos/dll/win32/wshom.ocx/guid.c (with props) trunk/reactos/dll/win32/wshom.ocx/shell.c (with props) trunk/reactos/dll/win32/wshom.ocx/wshom.idl (with props) trunk/reactos/dll/win32/wshom.ocx/wshom.ocx.spec (with props) trunk/reactos/dll/win32/wshom.ocx/wshom.rc (with props) trunk/reactos/dll/win32/wshom.ocx/wshom.rgs (with props) trunk/reactos/dll/win32/wshom.ocx/wshom.tlb.rgs (with props) trunk/reactos/dll/win32/wshom.ocx/wshom_main.c (with props) trunk/reactos/dll/win32/wshom.ocx/wshom_private.h (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE trunk/reactos/media/inf/syssetup.inf Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sat Nov 8 10:22:22 2014 @@ -243,6 +243,7 @@ add_subdirectory(ws2_32_new) add_subdirectory(ws2help) add_subdirectory(wshirda) +add_subdirectory(wshom.ocx) add_subdirectory(wshtcpip) add_subdirectory(wsock32) add_subdirectory(wtsapi32) Propchange: trunk/reactos/dll/win32/wshom.ocx/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Nov 8 10:22:22 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/wshom.ocx/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/wshom.ocx/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/wshom.ocx/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/CMakeL… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt [iso-8859-1] Sat Nov 8 10:22:22 2014 @@ -0,0 +1,30 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +spec2def(wshom.ocx wshom.ocx.spec) +add_idl_headers(wshom_idlheader wshom.idl) +add_typelib(wshom.idl) + +list(APPEND SOURCE + shell.c + wshom_main.c + wshom_private.h) + +add_library(wshom SHARED + ${SOURCE} + guid.c + wshom.rc + ${CMAKE_CURRENT_BINARY_DIR}/wshom.def) + +list(APPEND wshom_rc_deps + ${CMAKE_CURRENT_SOURCE_DIR}/wshom.rgs + ${CMAKE_CURRENT_SOURCE_DIR}/wshom.tlb.rgs + ${CMAKE_CURRENT_BINARY_DIR}/wshom.tlb) + +set_source_files_properties(wshom.rc PROPERTIES OBJECT_DEPENDS "${wshom_rc_deps}") +set_module_type(wshom win32ocx) +target_link_libraries(wshom uuid wine) +add_importlibs(wshom oleaut32 ole32 shell32 msvcrt kernel32 ntdll) +add_dependencies(wshom stdole2 wshom_idlheader) +add_pch(wshom wshom_private.h SOURCE) +add_cd_file(TARGET wshom DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wshom.ocx/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/guid.c… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/guid.c (added) +++ trunk/reactos/dll/win32/wshom.ocx/guid.c [iso-8859-1] Sat Nov 8 10:22:22 2014 @@ -0,0 +1,15 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <initguid.h> +#include <wshom.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/wshom.ocx/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/dll/win32/wshom.ocx/shell.c [iso-8859-1] Sat Nov 8 10:22:22 2014 @@ -0,0 +1,1069 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wshom_private.h" + +#include <shellapi.h> +#include <shlobj.h> +#include <dispex.h> + +#include <wine/unicode.h> + +static IWshShell3 WshShell3; + +typedef struct +{ + IWshCollection IWshCollection_iface; + LONG ref; +} WshCollection; + +typedef struct +{ + IWshShortcut IWshShortcut_iface; + LONG ref; + + IShellLinkW *link; + BSTR path_link; +} WshShortcut; + +typedef struct +{ + IWshEnvironment IWshEnvironment_iface; + LONG ref; +} WshEnvironment; + +static inline WshCollection *impl_from_IWshCollection( IWshCollection *iface ) +{ + return CONTAINING_RECORD(iface, WshCollection, IWshCollection_iface); +} + +static inline WshShortcut *impl_from_IWshShortcut( IWshShortcut *iface ) +{ + return CONTAINING_RECORD(iface, WshShortcut, IWshShortcut_iface); +} + +static inline WshEnvironment *impl_from_IWshEnvironment( IWshEnvironment *iface ) +{ + return CONTAINING_RECORD(iface, WshEnvironment, IWshEnvironment_iface); +} + +static HRESULT WINAPI WshEnvironment_QueryInterface(IWshEnvironment *iface, REFIID riid, void **obj) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IWshEnvironment)) + { + *obj = iface; + }else { + FIXME("Unknown iface %s\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; +} + +static ULONG WINAPI WshEnvironment_AddRef(IWshEnvironment *iface) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref = %d\n", This, ref); + return ref; +} + +static ULONG WINAPI WshEnvironment_Release(IWshEnvironment *iface) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + LONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) ref = %d\n", This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI WshEnvironment_GetTypeInfoCount(IWshEnvironment *iface, UINT *pctinfo) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI WshEnvironment_GetTypeInfo(IWshEnvironment *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshEnvironment_tid, ppTInfo); +} + +static HRESULT WINAPI WshEnvironment_GetIDsOfNames(IWshEnvironment *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IWshEnvironment_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshEnvironment_Invoke(IWshEnvironment *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IWshEnvironment_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &This->IWshEnvironment_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, BSTR *value) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + DWORD len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); + + if (!value) + return E_POINTER; + + len = GetEnvironmentVariableW(name, NULL, 0); + *value = SysAllocStringLen(NULL, len); + if (!*value) + return E_OUTOFMEMORY; + + if (len) + GetEnvironmentVariableW(name, *value, len+1); + + return S_OK; +} + +static HRESULT WINAPI WshEnvironment_put_Item(IWshEnvironment *iface, BSTR name, BSTR value) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + FIXME("(%p)->(%s %s): stub\n", This, debugstr_w(name), debugstr_w(value)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshEnvironment_Count(IWshEnvironment *iface, LONG *count) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + FIXME("(%p)->(%p): stub\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshEnvironment_get_length(IWshEnvironment *iface, LONG *len) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + FIXME("(%p)->(%p): stub\n", This, len); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshEnvironment__NewEnum(IWshEnvironment *iface, IUnknown **penum) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + FIXME("(%p)->(%p): stub\n", This, penum); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshEnvironment_Remove(IWshEnvironment *iface, BSTR name) +{ + WshEnvironment *This = impl_from_IWshEnvironment(iface); + FIXME("(%p)->(%s): stub\n", This, debugstr_w(name)); + return E_NOTIMPL; +} + +static const IWshEnvironmentVtbl WshEnvironmentVtbl = { + WshEnvironment_QueryInterface, + WshEnvironment_AddRef, + WshEnvironment_Release, + WshEnvironment_GetTypeInfoCount, + WshEnvironment_GetTypeInfo, + WshEnvironment_GetIDsOfNames, + WshEnvironment_Invoke, + WshEnvironment_get_Item, + WshEnvironment_put_Item, + WshEnvironment_Count, + WshEnvironment_get_length, + WshEnvironment__NewEnum, + WshEnvironment_Remove +}; + +static HRESULT WshEnvironment_Create(IWshEnvironment **env) +{ + WshEnvironment *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IWshEnvironment_iface.lpVtbl = &WshEnvironmentVtbl; + This->ref = 1; + + *env = &This->IWshEnvironment_iface; + + return S_OK; +} + +static HRESULT WINAPI WshCollection_QueryInterface(IWshCollection *iface, REFIID riid, void **ppv) +{ + WshCollection *This = impl_from_IWshCollection(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IWshCollection)) + { + *ppv = iface; + }else { + FIXME("Unknown iface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WshCollection_AddRef(IWshCollection *iface) +{ + WshCollection *This = impl_from_IWshCollection(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref = %d\n", This, ref); + return ref; +} + +static ULONG WINAPI WshCollection_Release(IWshCollection *iface) +{ + WshCollection *This = impl_from_IWshCollection(iface); + LONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) ref = %d\n", This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI WshCollection_GetTypeInfoCount(IWshCollection *iface, UINT *pctinfo) +{ + WshCollection *This = impl_from_IWshCollection(iface); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI WshCollection_GetTypeInfo(IWshCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + WshCollection *This = impl_from_IWshCollection(iface); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshCollection_tid, ppTInfo); +} + +static HRESULT WINAPI WshCollection_GetIDsOfNames(IWshCollection *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WshCollection *This = impl_from_IWshCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IWshCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshCollection_Invoke(IWshCollection *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WshCollection *This = impl_from_IWshCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IWshCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &This->IWshCollection_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, VARIANT *value) +{ + WshCollection *This = impl_from_IWshCollection(iface); + static const WCHAR allusersdesktopW[] = {'A','l','l','U','s','e','r','s','D','e','s','k','t','o','p',0}; + static const WCHAR allusersprogramsW[] = {'A','l','l','U','s','e','r','s','P','r','o','g','r','a','m','s',0}; + static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; + PIDLIST_ABSOLUTE pidl; + WCHAR pathW[MAX_PATH]; + int kind = 0; + BSTR folder; + HRESULT hr; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(index), value); + + if (V_VT(index) != VT_BSTR) + { + FIXME("only BSTR index supported, got %d\n", V_VT(index)); + return E_NOTIMPL; + } + + folder = V_BSTR(index); + if (!strcmpiW(folder, desktopW)) + kind = CSIDL_DESKTOP; + else if (!strcmpiW(folder, allusersdesktopW)) + kind = CSIDL_COMMON_DESKTOPDIRECTORY; + else if (!strcmpiW(folder, allusersprogramsW)) + kind = CSIDL_COMMON_PROGRAMS; + else + { + FIXME("folder kind %s not supported\n", debugstr_w(folder)); + return E_NOTIMPL; + } + + hr = SHGetSpecialFolderLocation(NULL, kind, &pidl); + if (hr != S_OK) return hr; + + if (SHGetPathFromIDListW(pidl, pathW)) + { + V_VT(value) = VT_BSTR; + V_BSTR(value) = SysAllocString(pathW); + hr = V_BSTR(value) ? S_OK : E_OUTOFMEMORY; + } + else + hr = E_FAIL; + + CoTaskMemFree(pidl); + + return hr; +} + +static HRESULT WINAPI WshCollection_Count(IWshCollection *iface, LONG *count) +{ + WshCollection *This = impl_from_IWshCollection(iface); + FIXME("(%p)->(%p): stub\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshCollection_get_length(IWshCollection *iface, LONG *count) +{ + WshCollection *This = impl_from_IWshCollection(iface); + FIXME("(%p)->(%p): stub\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown *Enum) +{ + WshCollection *This = impl_from_IWshCollection(iface); + FIXME("(%p)->(%p): stub\n", This, Enum); + return E_NOTIMPL; +} + +static const IWshCollectionVtbl WshCollectionVtbl = { + WshCollection_QueryInterface, + WshCollection_AddRef, + WshCollection_Release, + WshCollection_GetTypeInfoCount, + WshCollection_GetTypeInfo, + WshCollection_GetIDsOfNames, + WshCollection_Invoke, + WshCollection_Item, + WshCollection_Count, + WshCollection_get_length, + WshCollection__NewEnum +}; + +static HRESULT WshCollection_Create(IWshCollection **collection) +{ + WshCollection *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IWshCollection_iface.lpVtbl = &WshCollectionVtbl; + This->ref = 1; + + *collection = &This->IWshCollection_iface; + + return S_OK; +} + +/* IWshShortcut */ +static HRESULT WINAPI WshShortcut_QueryInterface(IWshShortcut *iface, REFIID riid, void **ppv) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IWshShortcut)) + { + *ppv = iface; + }else { + FIXME("Unknown iface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WshShortcut_AddRef(IWshShortcut *iface) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref = %d\n", This, ref); + return ref; +} + +static ULONG WINAPI WshShortcut_Release(IWshShortcut *iface) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + LONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) ref = %d\n", This, ref); + + if (!ref) + { + SysFreeString(This->path_link); + IShellLinkW_Release(This->link); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI WshShortcut_GetTypeInfoCount(IWshShortcut *iface, UINT *pctinfo) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI WshShortcut_GetTypeInfo(IWshShortcut *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshShortcut_tid, ppTInfo); +} + +static HRESULT WINAPI WshShortcut_GetIDsOfNames(IWshShortcut *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IWshShortcut_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshShortcut_Invoke(IWshShortcut *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IWshShortcut_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &This->IWshShortcut_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshShortcut_get_FullName(IWshShortcut *iface, BSTR *name) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + FIXME("(%p)->(%p): stub\n", This, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShortcut_get_Arguments(IWshShortcut *iface, BSTR *Arguments) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + WCHAR buffW[INFOTIPSIZE]; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, Arguments); + + if (!Arguments) + return E_POINTER; + + *Arguments = NULL; + + hr = IShellLinkW_GetArguments(This->link, buffW, sizeof(buffW)/sizeof(WCHAR)); + if (FAILED(hr)) + return hr; + + *Arguments = SysAllocString(buffW); + return *Arguments ? S_OK : E_OUTOFMEMORY; +} + +static HRESULT WINAPI WshShortcut_put_Arguments(IWshShortcut *iface, BSTR Arguments) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + + TRACE("(%p)->(%s)\n", This, debugstr_w(Arguments)); + + return IShellLinkW_SetArguments(This->link, Arguments); +} + +static HRESULT WINAPI WshShortcut_get_Description(IWshShortcut *iface, BSTR *Description) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + FIXME("(%p)->(%p): stub\n", This, Description); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShortcut_put_Description(IWshShortcut *iface, BSTR Description) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + TRACE("(%p)->(%s)\n", This, debugstr_w(Description)); + return IShellLinkW_SetDescription(This->link, Description); +} + +static HRESULT WINAPI WshShortcut_get_Hotkey(IWshShortcut *iface, BSTR *Hotkey) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + FIXME("(%p)->(%p): stub\n", This, Hotkey); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShortcut_put_Hotkey(IWshShortcut *iface, BSTR Hotkey) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + FIXME("(%p)->(%s): stub\n", This, debugstr_w(Hotkey)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShortcut_get_IconLocation(IWshShortcut *iface, BSTR *IconPath) +{ + static const WCHAR fmtW[] = {'%','s',',',' ','%','d',0}; + WshShortcut *This = impl_from_IWshShortcut(iface); + WCHAR buffW[MAX_PATH], pathW[MAX_PATH]; + INT icon = 0; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, IconPath); + + if (!IconPath) + return E_POINTER; + + hr = IShellLinkW_GetIconLocation(This->link, buffW, sizeof(buffW)/sizeof(WCHAR), &icon); + if (FAILED(hr)) return hr; + + sprintfW(pathW, fmtW, buffW, icon); + *IconPath = SysAllocString(pathW); + if (!*IconPath) return E_OUTOFMEMORY; + + return S_OK; +} + +static HRESULT WINAPI WshShortcut_put_IconLocation(IWshShortcut *iface, BSTR IconPath) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + HRESULT hr; + WCHAR *ptr; + BSTR path; + INT icon; + + TRACE("(%p)->(%s)\n", This, debugstr_w(IconPath)); + + /* scan for icon id */ + ptr = strrchrW(IconPath, ','); + if (!ptr) + { + WARN("icon index not found\n"); + return E_FAIL; + } + + path = SysAllocStringLen(IconPath, ptr-IconPath); + + /* skip spaces if any */ + while (isspaceW(*++ptr)) + ; + + icon = atoiW(ptr); + + hr = IShellLinkW_SetIconLocation(This->link, path, icon); + SysFreeString(path); + + return hr; +} + +static HRESULT WINAPI WshShortcut_put_RelativePath(IWshShortcut *iface, BSTR rhs) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + FIXME("(%p)->(%s): stub\n", This, debugstr_w(rhs)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShortcut_get_TargetPath(IWshShortcut *iface, BSTR *Path) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + FIXME("(%p)->(%p): stub\n", This, Path); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShortcut_put_TargetPath(IWshShortcut *iface, BSTR Path) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + TRACE("(%p)->(%s)\n", This, debugstr_w(Path)); + return IShellLinkW_SetPath(This->link, Path); +} + +static HRESULT WINAPI WshShortcut_get_WindowStyle(IWshShortcut *iface, int *ShowCmd) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + TRACE("(%p)->(%p)\n", This, ShowCmd); + return IShellLinkW_GetShowCmd(This->link, ShowCmd); +} + +static HRESULT WINAPI WshShortcut_put_WindowStyle(IWshShortcut *iface, int ShowCmd) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + TRACE("(%p)->(%d)\n", This, ShowCmd); + return IShellLinkW_SetShowCmd(This->link, ShowCmd); +} + +static HRESULT WINAPI WshShortcut_get_WorkingDirectory(IWshShortcut *iface, BSTR *WorkingDirectory) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + WCHAR buffW[MAX_PATH]; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, WorkingDirectory); + + if (!WorkingDirectory) + return E_POINTER; + + *WorkingDirectory = NULL; + hr = IShellLinkW_GetWorkingDirectory(This->link, buffW, sizeof(buffW)/sizeof(WCHAR)); + if (FAILED(hr)) return hr; + + *WorkingDirectory = SysAllocString(buffW); + return *WorkingDirectory ? S_OK : E_OUTOFMEMORY; +} + +static HRESULT WINAPI WshShortcut_put_WorkingDirectory(IWshShortcut *iface, BSTR WorkingDirectory) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + TRACE("(%p)->(%s)\n", This, debugstr_w(WorkingDirectory)); + return IShellLinkW_SetWorkingDirectory(This->link, WorkingDirectory); +} + +static HRESULT WINAPI WshShortcut_Load(IWshShortcut *iface, BSTR PathLink) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + FIXME("(%p)->(%s): stub\n", This, debugstr_w(PathLink)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShortcut_Save(IWshShortcut *iface) +{ + WshShortcut *This = impl_from_IWshShortcut(iface); + IPersistFile *file; + HRESULT hr; + + TRACE("(%p)\n", This); + + IShellLinkW_QueryInterface(This->link, &IID_IPersistFile, (void**)&file); + hr = IPersistFile_Save(file, This->path_link, TRUE); + IPersistFile_Release(file); + + return hr; +} + +static const IWshShortcutVtbl WshShortcutVtbl = { + WshShortcut_QueryInterface, + WshShortcut_AddRef, + WshShortcut_Release, + WshShortcut_GetTypeInfoCount, + WshShortcut_GetTypeInfo, + WshShortcut_GetIDsOfNames, + WshShortcut_Invoke, + WshShortcut_get_FullName, + WshShortcut_get_Arguments, + WshShortcut_put_Arguments, + WshShortcut_get_Description, + WshShortcut_put_Description, + WshShortcut_get_Hotkey, + WshShortcut_put_Hotkey, + WshShortcut_get_IconLocation, + WshShortcut_put_IconLocation, + WshShortcut_put_RelativePath, + WshShortcut_get_TargetPath, + WshShortcut_put_TargetPath, + WshShortcut_get_WindowStyle, + WshShortcut_put_WindowStyle, + WshShortcut_get_WorkingDirectory, + WshShortcut_put_WorkingDirectory, + WshShortcut_Load, + WshShortcut_Save +}; + +static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) +{ + WshShortcut *This; + HRESULT hr; + + *shortcut = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IWshShortcut_iface.lpVtbl = &WshShortcutVtbl; + This->ref = 1; + + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (void**)&This->link); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, This); + return hr; + } + + This->path_link = SysAllocString(path); + if (!This->path_link) + { + IShellLinkW_Release(This->link); + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + + *shortcut = (IDispatch*)&This->IWshShortcut_iface; + + return S_OK; +} + +static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, void **ppv) +{ + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + *ppv = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IWshShell3)) + { + *ppv = iface; + } + else if (IsEqualGUID(riid, &IID_IDispatchEx)) + { + return E_NOINTERFACE; + } + else + { + FIXME("Unknown iface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IWshShell3_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI WshShell3_AddRef(IWshShell3 *iface) +{ + TRACE("()\n"); + return 2; +} + +static ULONG WINAPI WshShell3_Release(IWshShell3 *iface) +{ + TRACE("()\n"); + return 2; +} + +static HRESULT WINAPI WshShell3_GetTypeInfoCount(IWshShell3 *iface, UINT *pctinfo) +{ + TRACE("(%p)\n", pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI WshShell3_GetTypeInfo(IWshShell3 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + TRACE("(%u %u %p)\n", iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshShell3_tid, ppTInfo); +} + +static HRESULT WINAPI WshShell3_GetIDsOfNames(IWshShell3 *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%s %p %u %u %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IWshShell3_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshShell3_Invoke(IWshShell3 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%d %s %d %d %p %p %p %p)\n", dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IWshShell3_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &WshShell3, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshShell3_get_SpecialFolders(IWshShell3 *iface, IWshCollection **folders) +{ + TRACE("(%p)\n", folders); + return WshCollection_Create(folders); +} + +static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *type, IWshEnvironment **env) +{ + FIXME("(%s %p): semi-stub\n", debugstr_variant(type), env); + return WshEnvironment_Create(env); +} + +static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *WaitOnReturn, int *exit_code) +{ + SHELLEXECUTEINFOW info; + int waitforprocess; + VARIANT s, w; + HRESULT hr; + + TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(WaitOnReturn), exit_code); + + VariantInit(&s); + hr = VariantChangeType(&s, style, 0, VT_I4); + if (FAILED(hr)) + { + ERR("failed to convert style argument, 0x%08x\n", hr); + return hr; + } + + VariantInit(&w); + hr = VariantChangeType(&w, WaitOnReturn, 0, VT_I4); + if (FAILED(hr)) + { + ERR("failed to convert wait argument, 0x%08x\n", hr); + return hr; + } + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + + waitforprocess = V_I4(&w); + + info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; + info.lpFile = cmd; + info.nShow = V_I4(&s); + + if (!ShellExecuteExW(&info)) + { + TRACE("ShellExecute failed, %d\n", GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + else + { + if (waitforprocess) + { + if (exit_code) + { + DWORD code; + GetExitCodeProcess(info.hProcess, &code); + *exit_code = code; + } + CloseHandle(info.hProcess); + } + else + if (exit_code) *exit_code = 0; + + return S_OK; + } +} + +static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR Text, VARIANT* SecondsToWait, VARIANT *Title, VARIANT *Type, int *button) +{ + FIXME("(%s %s %s %s %p): stub\n", debugstr_w(Text), debugstr_variant(SecondsToWait), + debugstr_variant(Title), debugstr_variant(Type), button); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_CreateShortcut(IWshShell3 *iface, BSTR PathLink, IDispatch** Shortcut) +{ + TRACE("(%s %p)\n", debugstr_w(PathLink), Shortcut); + return WshShortcut_Create(PathLink, Shortcut); +} + +static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* Dst) +{ + DWORD ret; + + TRACE("(%s %p)\n", debugstr_w(Src), Dst); + + if (!Src || !Dst) return E_POINTER; + + ret = ExpandEnvironmentStringsW(Src, NULL, 0); + *Dst = SysAllocStringLen(NULL, ret); + if (!*Dst) return E_OUTOFMEMORY; + + if (ExpandEnvironmentStringsW(Src, *Dst, ret)) + return S_OK; + else + { + SysFreeString(*Dst); + *Dst = NULL; + return HRESULT_FROM_WIN32(GetLastError()); + } +} + +static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR Name, VARIANT* out_Value) +{ + FIXME("(%s %p): stub\n", debugstr_w(Name), out_Value); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR Name, VARIANT *Value, VARIANT *Type) +{ + FIXME("(%s %s %s): stub\n", debugstr_w(Name), debugstr_variant(Value), debugstr_variant(Type)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_RegDelete(IWshShell3 *iface, BSTR Name) +{ + FIXME("(%s): stub\n", debugstr_w(Name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_LogEvent(IWshShell3 *iface, VARIANT *Type, BSTR Message, BSTR Target, VARIANT_BOOL *out_Success) +{ + FIXME("(%s %s %s %p): stub\n", debugstr_variant(Type), debugstr_w(Message), debugstr_w(Target), out_Success); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_AppActivate(IWshShell3 *iface, VARIANT *App, VARIANT *Wait, VARIANT_BOOL *out_Success) +{ + FIXME("(%s %s %p): stub\n", debugstr_variant(App), debugstr_variant(Wait), out_Success); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_SendKeys(IWshShell3 *iface, BSTR Keys, VARIANT *Wait) +{ + FIXME("(%s %p): stub\n", debugstr_w(Keys), Wait); + return E_NOTIMPL; +} + +static const IWshShell3Vtbl WshShell3Vtbl = { + WshShell3_QueryInterface, + WshShell3_AddRef, + WshShell3_Release, + WshShell3_GetTypeInfoCount, + WshShell3_GetTypeInfo, + WshShell3_GetIDsOfNames, + WshShell3_Invoke, + WshShell3_get_SpecialFolders, + WshShell3_get_Environment, + WshShell3_Run, + WshShell3_Popup, + WshShell3_CreateShortcut, + WshShell3_ExpandEnvironmentStrings, + WshShell3_RegRead, + WshShell3_RegWrite, + WshShell3_RegDelete, + WshShell3_LogEvent, + WshShell3_AppActivate, + WshShell3_SendKeys +}; + +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); +} Propchange: trunk/reactos/dll/win32/wshom.ocx/shell.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/dll/win32/wshom.ocx/wshom.idl [iso-8859-1] Sat Nov 8 10:22:22 2014 @@ -0,0 +1,666 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib + +import "oaidl.idl"; +cpp_quote("#undef ExpandEnvironmentStrings") + +[ + helpstring("Windows Script Host Object Model"), + uuid(f935dc20-1cf0-11d0-adb9-00c04fd58a0b), + version(1.0) +] +library IWshRuntimeLibrary +{ + importlib("stdole2.tlb"); + + typedef enum { + WshRunning = 0, + WshFinished, + WshFailed + } WshExecStatus; + + typedef enum { + UnknownType = 0, + Removable, + Fixed, + Remote, + CDRom, + RamDisk + } DriveTypeConst; + + typedef enum { + Normal = 0x000, + ReadOnly = 0x001, + Hidden = 0x002, + System = 0x004, + Volume = 0x008, + Directory = 0x010, + Archive = 0x020, + Alias = 0x400, + Compressed = 0x800 + } FileAttribute; + + typedef enum { + ForReading = 0x1, + ForWriting = 0x2, + ForAppending = 0x8 + } IOMode; + + typedef enum { + TristateTrue = -1, + TristateFalse = 0, + TristateUseDefault = -2, + TristateMixed = -2 + } Tristate; + + interface IFolder; + interface IFolderCollection; + + [ + uuid(53bad8c1-e718-11cf-893d-00a0c9054228), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface ITextStream : IDispatch { + [id(0x2710), propget] + HRESULT Line([out, retval] long* Line); + + [id(0xfffffdef), propget] + HRESULT Column([out, retval] long* Column); + + [id(0x2712), propget] + HRESULT AtEndOfStream([out, retval] VARIANT_BOOL* EOS); + + [id(0x2713), propget] + HRESULT AtEndOfLine([out, retval] VARIANT_BOOL* EOL); + + [id(0x2714)] + HRESULT Read([in] long Characters, [out, retval] BSTR* Text); + + [id(0x2715)] + HRESULT ReadLine([out, retval] BSTR* Text); + + [id(0x2716)] + HRESULT ReadAll([out, retval] BSTR* Text); + + [id(0x2717)] + HRESULT Write([in] BSTR Text); + + [id(0x2718)] + HRESULT WriteLine([in, defaultvalue("")] BSTR Text); + + [id(0x2719)] + HRESULT WriteBlankLines([in] long Lines); + + [id(0x271a)] + HRESULT Skip([in] long Characters); + + [id(0x271b)] + HRESULT SkipLine(); + + [id(0x271c)] + HRESULT Close(); + }; + + [ + uuid(c7c3f5a0-88a3-11d0-abcb-00a0c90fffc0), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface IDrive : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT Path([out, retval] BSTR* path); + + [id(0x2710), propget] + HRESULT DriveLetter([out, retval] BSTR* letter); + + [id(0x2711), propget] + HRESULT ShareName([out, retval] BSTR* ShareName); + + [id(0x2712), propget] + HRESULT DriveType([out, retval] DriveTypeConst* type); + + [id(0x2713), propget] + HRESULT RootFolder([out, retval] IFolder** folder); + + [id(0x2715), propget] + HRESULT AvailableSpace([out, retval] VARIANT* Avail); + + [id(0x2714), propget] + HRESULT FreeSpace([out, retval] VARIANT* pFree); + + [id(0x2716), propget] + HRESULT TotalSize([out, retval] VARIANT* Total); + + [id(0x2717), propget] + HRESULT VolumeName([out, retval] BSTR* Name); + + [id(0x2717), propput] + HRESULT VolumeName([in] BSTR Name); + + [id(0x2718), propget] + HRESULT FileSystem([out, retval] BSTR* pFileSystem); + + [id(0x2719), propget] + HRESULT SerialNumber([out, retval] long* SerialNumber); + + [id(0x271a), propget] + HRESULT IsReady([out, retval] VARIANT_BOOL* pfReady); + }; + + [ + uuid(c7c3f5a4-88a3-11d0-abcb-00a0c90fffc0), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface IFile : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT Path([out, retval] BSTR* path); + + [id(0x03e8), propget] + HRESULT Name([out, retval] BSTR* Name); + + [id(0x03e8), propput] + HRESULT Name([in] BSTR Name); + + [id(0x03ea), propget] + HRESULT ShortPath([out, retval] BSTR* path); + + [id(0x03e9), propget] + HRESULT ShortName([out, retval] BSTR* Name); + + [id(0x03ec), propget] + HRESULT Drive([out, retval] IDrive** drive); + + [id(0x03ed), propget] + HRESULT ParentFolder([out, retval] IFolder** folder); + + [id(0x03eb), propget] + HRESULT Attributes([out, retval] FileAttribute* attr); + + [id(0x03eb), propput] + HRESULT Attributes([in] FileAttribute attr); + + [id(0x03ee), propget] + HRESULT DateCreated([out, retval] DATE* date); + + [id(0x03ef), propget] + HRESULT DateLastModified([out, retval] DATE* date); + + [id(0x03f0), propget] + HRESULT DateLastAccessed([out, retval] DATE* date); + + [id(0x03f1), propget] + HRESULT Size([out, retval] VARIANT* Size); + + [id(0x03f2), propget] + HRESULT Type([out, retval] BSTR* Type); + + [id(0x04b0)] + HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL Force); + + [id(0x04b2)] + HRESULT Copy( + [in] BSTR Destination, + [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + + [id(0x04b4)] + HRESULT Move([in] BSTR Destination); + + [id(0x044c)] + HRESULT OpenAsTextStream( + [in, defaultvalue(1)] IOMode IOMode, + [in, defaultvalue(0)] Tristate Format, + [out, retval] ITextStream** ppts); + }; + + [ + uuid(c7c3f5a5-88a3-11d0-abcb-00a0c90fffc0), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface IFileCollection : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT Item( + [in] VARIANT Key, + [out, retval] IFile** ppfile); + [id(DISPID_NEWENUM), propget, restricted, hidden] + HRESULT _NewEnum([out, retval] IUnknown** ppenum); + [id(1), propget] + HRESULT Count([out, retval] long* count); + }; + + [ + uuid(c7c3f5a2-88a3-11d0-abcb-00a0c90fffc0), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface IFolder : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT Path([out, retval] BSTR* path); + + [id(0x03e8), propget] + HRESULT Name([out, retval] BSTR* name); + + [id(0x03e8), propput] + HRESULT Name([in] BSTR name); + + [id(0x03ea), propget] + HRESULT ShortPath([out, retval] BSTR* path); + + [id(0x03e9), propget] + HRESULT ShortName([out, retval] BSTR* name); + + [id(0x03ec), propget] + HRESULT Drive([out, retval] IDrive** drive); + + [id(0x03ed), propget] + HRESULT ParentFolder([out, retval] IFolder** folder); + + [id(0x03eb), propget] + HRESULT Attributes([out, retval] FileAttribute* attr); + + [id(0x03eb), propput] + HRESULT Attributes([in] FileAttribute attr); + + [id(0x03ee), propget] + HRESULT DateCreated([out, retval] DATE* date); + + [id(0x03ef), propget] + HRESULT DateLastModified([out, retval] DATE* date); + + [id(0x03f0), propget] + HRESULT DateLastAccessed([out, retval] DATE* date); + + [id(0x03f2), propget] + HRESULT Type([out, retval] BSTR* type); + + [id(0x04b1)] + HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL force); + + [id(0x04b3)] + HRESULT Copy( + [in] BSTR Destination, + [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + + [id(0x04b5)] + HRESULT Move([in] BSTR Destination); + + [id(0x2710), propget] + HRESULT IsRootFolder([out, retval] VARIANT_BOOL* root); + + [id(0x03f1), propget] + HRESULT Size([out, retval] VARIANT* size); + + [id(0x2711), propget] + HRESULT SubFolders([out, retval] IFolderCollection** folders); + + [id(0x2712), propget] + HRESULT Files([out, retval] IFileCollection** files); + + [id(0x044d)] + HRESULT CreateTextFile( + [in] BSTR FileName, + [in, defaultvalue(-1)] VARIANT_BOOL Overwrite, + [in, defaultvalue(0)] VARIANT_BOOL Unicode, + [out, retval] ITextStream** ppts); + }; + + [ + uuid(c7c3f5a3-88a3-11d0-abcb-00a0c90fffc0), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface IFolderCollection : IDispatch { + [id(2)] + HRESULT Add( + [in] BSTR Name, + [out, retval] IFolder** folder); + + [id(DISPID_VALUE), propget] + HRESULT Item( + [in] VARIANT Key, + [out, retval] IFolder** folder); + + [id(DISPID_NEWENUM), propget, restricted, hidden] + HRESULT _NewEnum([out, retval] IUnknown** ppenum); + + [id(1), propget] + HRESULT Count([out, retval] long* count); + }; + + [ + uuid(f935dc27-1cf0-11d0-adb9-00c04fd58a0b), + odl, + dual, + oleautomation + ] + interface IWshCollection : IDispatch { + [id(DISPID_VALUE)] + HRESULT Item( + [in] VARIANT *Index, + [out, retval] VARIANT *out_Value); + + [id(1)] + HRESULT Count([out, retval] long *out_Count); + + [id(2), propget] + HRESULT length([out, retval] long *out_Count); + + [id(DISPID_NEWENUM)] + HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + } + + [ + uuid(f935dc29-1cf0-11d0-adb9-00c04fd58a0b), + odl, + dual, + oleautomation + ] + interface IWshEnvironment : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT Item( + [in] BSTR Name, + [out, retval] BSTR *out_Value); + + [id(DISPID_VALUE), propput] + HRESULT Item( + [in] BSTR Name, + [in] BSTR Value); + + [id(1)] + HRESULT Count([out, retval] long *out_Count); + + [id(2), propget] + HRESULT length([out, retval] long *out_Count); + + [id(DISPID_NEWENUM)] + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); + + [id(0x03e9)] + HRESULT Remove([in] BSTR Name); + } + + [ + uuid(08fed190-be19-11d3-a28b-00104bd35090), + odl, + dual, + oleautomation + ] + interface IWshExec : IDispatch { + [id(0x0001), propget] + HRESULT Status([out, retval] WshExecStatus* Status); + + [id(0x0003), propget] + HRESULT StdIn([out, retval] ITextStream** stream); + + [id(0x0004), propget] + HRESULT StdOut([out, retval] ITextStream** stream); + + [id(0x0005), propget] + HRESULT StdErr([out, retval] ITextStream** stream); + + [id(0x0006), propget] + HRESULT ProcessID([out, retval] long* pid); + + [id(0x0007), propget] + HRESULT ExitCode([out, retval] long* ExitCode); + + [id(0x0008)] + HRESULT Terminate(); + }; + + [ + uuid(f935dc23-1cf0-11d0-adb9-00c04fd58a0b), + odl, + dual, + oleautomation + ] + interface IWshShortcut : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT FullName([out, retval] BSTR* name); + + [id(0x03e8), propget] + HRESULT Arguments([out, retval] BSTR* Arguments); + + [id(0x03e8), propput] + HRESULT Arguments([in] BSTR Arguments); + + [id(0x03e9), propget] + HRESULT Description([out, retval] BSTR* Description); + + [id(0x03e9), propput] + HRESULT Description([in] BSTR Description); + + [id(0x03ea), propget] + HRESULT Hotkey([out, retval] BSTR* HotKey); + + [id(0x03ea), propput] + HRESULT Hotkey([in] BSTR HotKey); + + [id(0x03eb), propget] + HRESULT IconLocation([out, retval] BSTR* IconPath); + + [id(0x03eb), propput] + HRESULT IconLocation([in] BSTR IconPath); + + [id(0x03ec), propput] + HRESULT RelativePath([in] BSTR rhs); + + [id(0x03ed), propget] + HRESULT TargetPath([out, retval] BSTR* Path); + + [id(0x03ed), propput] + HRESULT TargetPath([in] BSTR Path); + + [id(0x03ee), propget] + HRESULT WindowStyle([out, retval] int* ShowCmd); + + [id(0x03ee), propput] + HRESULT WindowStyle([in] int ShowCmd); + + [id(0x03ef), propget] + HRESULT WorkingDirectory([out, retval] BSTR* WorkingDirectory); + + [id(0x03ef), propput] + HRESULT WorkingDirectory([in] BSTR WorkingDirectory); + + [id(0x07d0), hidden] + HRESULT Load([in] BSTR PathLink); + + [id(0x07d1)] + HRESULT Save(); + }; + + [ + uuid(f935dc21-1cf0-11d0-adb9-00c04fd58a0b), + odl, + dual, + oleautomation, + hidden + ] + interface IWshShell : IDispatch { + [id(0x0064), propget] + HRESULT SpecialFolders([out, retval] IWshCollection** out_Folders); + + [id(0x00c8), propget] + HRESULT Environment( + [in, optional] VARIANT* Type, + [out, retval] IWshEnvironment** out_Env); + + [id(0x03e8)] + HRESULT Run( + [in] BSTR Command, + [in, optional] VARIANT* WindowStyle, + [in, optional] VARIANT* WaitOnReturn, + [out, retval] int* out_ExitCode); + + [id(0x03e9)] + HRESULT Popup( + [in] BSTR Text, + [in, optional] VARIANT* SecondsToWait, + [in, optional] VARIANT* Title, + [in, optional] VARIANT* Type, + [out, retval] int* out_Button); + + [id(0x03ea)] + HRESULT CreateShortcut( + [in] BSTR PathLink, + [out, retval] IDispatch** out_Shortcut); + + [id(0x03ee)] + HRESULT ExpandEnvironmentStrings( + [in] BSTR Src, + [out, retval] BSTR* out_Dst); + + [id(0x07d0)] + HRESULT RegRead( + [in] BSTR Name, + [out, retval] VARIANT* out_Value); + + [id(0x07d1)] + HRESULT RegWrite( + [in] BSTR Name, + [in] VARIANT* Value, + [in, optional] VARIANT* Type); + + [id(0x07d2)] + HRESULT RegDelete([in] BSTR Name); + }; + + [ + uuid(24be5a30-edfe-11d2-b933-00104b365c9f), + odl, + dual, + oleautomation, + hidden + ] + interface IWshShell2 : IWshShell { + [id(0x0bb8)] + HRESULT LogEvent( + [in] VARIANT* Type, + [in] BSTR Message, + [in, defaultvalue("")] BSTR Target, + [out, retval] VARIANT_BOOL* out_Success); + + [id(0x0bc2)] + HRESULT AppActivate( + [in] VARIANT* App, + [in, optional] VARIANT* Wait, + [out, retval] VARIANT_BOOL* out_Success); + + [id(0x0bc3)] + HRESULT SendKeys( + [in] BSTR Keys, + [in, optional] VARIANT* Wait); + }; + + [ + uuid(41904400-be18-11d3-a28b-00104bd35090), + odl, + dual, + oleautomation + ] + interface IWshShell3 : IWshShell2 { + [id(0x0bc4)] + HRESULT Exec( + [in] BSTR Command, + [out, retval] IWshExec** out_Exec); + + [id(0x0bc5), propget] + HRESULT CurrentDirectory([out, retval] BSTR* out_Directory); + + [id(0x0bc5), propput] + HRESULT CurrentDirectory([in] BSTR out_Directory); + }; + + [ + uuid(24be5a31-edfe-11d2-b933-00104b365c9f), + odl, + dual, + oleautomation + ] + interface IWshNetwork2 : IDispatch { + [id(0x60020000), propget] + HRESULT UserDomain([out, retval] BSTR *out_UserDomain); + } + + [ + helpstring("Windows Script Host Shell Object"), + uuid(f935dc22-1cf0-11d0-adb9-00c04fd58a0b), + threading(apartment), + progid("WScript.Shell.1"), + vi_progid("WScript.Shell") + ] + coclass IWshShell_Class { + [default] interface IWshShell3; + } + + [ + helpstring("Windows Script Host Shell Object"), + uuid(72c24dd5-d70a-438b-8a42-98424b88afb8), + threading(apartment), + progid("WScript.Shell.1"), + vi_progid("WScript.Shell") + ] + coclass WshShell { + [default] interface IWshShell3; + } + + [ + helpstring("Windows Script Host Network Object"), + uuid(f935dc26-1cf0-11d0-adb9-00c04fd58a0b), + threading(apartment), + progid("WScript.Network.1"), + vi_progid("WScript.Network") + ] + coclass IWshNetwork_Class { + [default] interface IWshNetwork2; + } + + [ + helpstring("Windows Script Host Network Object"), + uuid(093ff999-1ea0-4079-9525-9614c3504b74), + threading(apartment), + progid("WScript.Network.1"), + vi_progid("WScript.Network") + ] + coclass WshNetwork { + [default] interface IWshNetwork2; + } +} Propchange: trunk/reactos/dll/win32/wshom.ocx/wshom.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wshom.ocx/wshom.ocx.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/wshom.… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/wshom.ocx.spec (added) +++ trunk/reactos/dll/win32/wshom.ocx/wshom.ocx.spec [iso-8859-1] Sat Nov 8 10:22:22 2014 @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Propchange: trunk/reactos/dll/win32/wshom.ocx/wshom.ocx.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wshom.ocx/wshom.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/wshom.… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/wshom.rc (added) +++ trunk/reactos/dll/win32/wshom.ocx/wshom.rc [iso-8859-1] Sat Nov 8 10:22:22 2014 @@ -0,0 +1,27 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: wshom.rgs */ +1 WINE_REGISTRY wshom.rgs + +2 WINE_REGISTRY wshom.tlb.rgs +1 TYPELIB wshom.tlb Propchange: trunk/reactos/dll/win32/wshom.ocx/wshom.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wshom.ocx/wshom.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/wshom.… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/wshom.rgs (added) +++ trunk/reactos/dll/win32/wshom.ocx/wshom.rgs [iso-8859-1] Sat Nov 8 10:22:22 2014 @@ -0,0 +1,34 @@ +HKCR +{ + NoRemove CLSID + { + '{f935dc22-1cf0-11d0-adb9-00c04fd58a0b}' + { + 'Implemented Categories' + { + '{40fc6ed5-2438-11cf-a3db-080036f12502}' + } + } + '{72c24dd5-d70a-438b-8a42-98424b88afb8}' + { + 'Implemented Categories' + { + '{40fc6ed5-2438-11cf-a3db-080036f12502}' + } + } + '{f935dc26-1cf0-11d0-adb9-00c04fd58a0b}' + { + 'Implemented Categories' + { + '{40fc6ed5-2438-11cf-a3db-080036f12502}' + } + } + '{093ff999-1ea0-4079-9525-9614c3504b74}' + { + 'Implemented Categories' + { + '{40fc6ed5-2438-11cf-a3db-080036f12502}' + } + } + } +} Propchange: trunk/reactos/dll/win32/wshom.ocx/wshom.rgs ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/dll/win32/wshom.ocx/wshom.tlb.rgs [iso-8859-1] Sat Nov 8 10:22:22 2014 @@ -0,0 +1,172 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' + { + '1.0' = s 'Windows Script Host Object Model' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + '{53BAD8C1-E718-11CF-893D-00A0C9054228}' = s 'ITextStream' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{C7C3F5A0-88A3-11D0-ABCB-00A0C90FFFC0}' = s 'IDrive' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{C7C3F5A4-88A3-11D0-ABCB-00A0C90FFFC0}' = s 'IFile' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{C7C3F5A5-88A3-11D0-ABCB-00A0C90FFFC0}' = s 'IFileCollection' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{C7C3F5A2-88A3-11D0-ABCB-00A0C90FFFC0}' = s 'IFolder' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{C7C3F5A3-88A3-11D0-ABCB-00A0C90FFFC0}' = s 'IFolderCollection' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{F935DC27-1CF0-11D0-ADB9-00C04FD58A0B}' = s 'IWshCollection' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{F935DC29-1CF0-11D0-ADB9-00C04FD58A0B}' = s 'IWshEnvironment' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{08FED190-BE19-11D3-A28B-00104BD35090}' = s 'IWshExec' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{F935DC23-1CF0-11D0-ADB9-00C04FD58A0B}' = s 'IWshShortcut' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{F935DC21-1CF0-11D0-ADB9-00C04FD58A0B}' = s 'IWshShell' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{24BE5A30-EDFE-11D2-B933-00104B365C9F}' = s 'IWshShell2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{41904400-BE18-11D3-A28B-00104BD35090}' = s 'IWshShell3' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + '{24BE5A31-EDFE-11D2-B933-00104B365C9F}' = s 'IWshNetwork2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' { val Version = s '1.0' } + } + } + NoRemove CLSID + { + '{F935DC22-1CF0-11D0-ADB9-00C04FD58A0B}' = s 'Windows Script Host Shell Object' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'WScript.Shell.1' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' + Version = s '1.0' + VersionIndependentProgId = s 'WScript.Shell' + } + '{72C24DD5-D70A-438B-8A42-98424B88AFB8}' = s 'Windows Script Host Shell Object' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'WScript.Shell.1' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' + Version = s '1.0' + VersionIndependentProgId = s 'WScript.Shell' + } + '{F935DC26-1CF0-11D0-ADB9-00C04FD58A0B}' = s 'Windows Script Host Network Object' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'WScript.Network.1' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' + Version = s '1.0' + VersionIndependentProgId = s 'WScript.Network' + } + '{093FF999-1EA0-4079-9525-9614C3504B74}' = s 'Windows Script Host Network Object' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'WScript.Network.1' + TypeLib = s '{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}' + Version = s '1.0' + VersionIndependentProgId = s 'WScript.Network' + } + } + 'WScript.Shell.1' = s 'Windows Script Host Shell Object' + { + CLSID = s '{F935DC22-1CF0-11D0-ADB9-00C04FD58A0B}' + } + 'WScript.Shell' = s 'Windows Script Host Shell Object' + { + CLSID = s '{F935DC22-1CF0-11D0-ADB9-00C04FD58A0B}' + CurVer = s 'WScript.Shell.1' + } + 'WScript.Shell.1' = s 'Windows Script Host Shell Object' + { + CLSID = s '{72C24DD5-D70A-438B-8A42-98424B88AFB8}' + } + 'WScript.Shell' = s 'Windows Script Host Shell Object' + { + CLSID = s '{72C24DD5-D70A-438B-8A42-98424B88AFB8}' + CurVer = s 'WScript.Shell.1' + } + 'WScript.Network.1' = s 'Windows Script Host Network Object' + { + CLSID = s '{F935DC26-1CF0-11D0-ADB9-00C04FD58A0B}' + } + 'WScript.Network' = s 'Windows Script Host Network Object' + { + CLSID = s '{F935DC26-1CF0-11D0-ADB9-00C04FD58A0B}' + CurVer = s 'WScript.Network.1' + } + 'WScript.Network.1' = s 'Windows Script Host Network Object' + { + CLSID = s '{093FF999-1EA0-4079-9525-9614C3504B74}' + } + 'WScript.Network' = s 'Windows Script Host Network Object' + { + CLSID = s '{093FF999-1EA0-4079-9525-9614C3504B74}' + CurVer = s 'WScript.Network.1' + } +} Propchange: trunk/reactos/dll/win32/wshom.ocx/wshom.tlb.rgs ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/dll/win32/wshom.ocx/wshom_main.c [iso-8859-1] Sat Nov 8 10:22:22 2014 @@ -0,0 +1,205 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wshom_private.h" + +#include <rpcproxy.h> + +static HINSTANCE wshom_instance; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_NULL, + &IID_IWshCollection, + &IID_IWshEnvironment, + &IID_IWshShell3, + &IID_IWshShortcut +}; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_IWshRuntimeLibrary, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (!typelib) + hres = load_typelib(); + if (!typelib) + return hres; + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); + return S_OK; +} + +static +void release_typelib(void) +{ + unsigned i; + + if(!typelib) + return; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl WshShellFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + WshShellFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory WshShellFactory = { &WshShellFactoryVtbl }; + +/****************************************************************** + * DllMain (wshom.ocx.@) + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + wshom_instance = hInstDLL; + DisableThreadLibraryCalls(wshom_instance); + break; + case DLL_PROCESS_DETACH: + if (lpv) break; + release_typelib(); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (wshom.ocx.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + if(IsEqualGUID(&CLSID_WshShell, rclsid)) { + TRACE("(CLSID_WshShell %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&WshShellFactory, riid, ppv); + } + + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (wshom.ocx.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (wshom.ocx.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(wshom_instance); +} + +/*********************************************************************** + * DllUnregisterServer (wshom.ocx.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(wshom_instance); +} Propchange: trunk/reactos/dll/win32/wshom.ocx/wshom_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/dll/win32/wshom.ocx/wshom_private.h [iso-8859-1] Sat Nov 8 10:22:22 2014 @@ -0,0 +1,47 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WSHOM_PRIVATE_H_ +#define _WSHOM_PRIVATE_H_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <wshom.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wshom); + +/* typelibs */ +typedef enum tid_t { + NULL_tid, + IWshCollection_tid, + IWshEnvironment_tid, + IWshShell3_tid, + IWshShortcut_tid, + LAST_tid +} tid_t; + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; + +HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; + +#endif /* _WSHOM_PRIVATE_H_ */ Propchange: trunk/reactos/dll/win32/wshom.ocx/wshom_private.h ------------------------------------------------------------------------------ svn:eol-style = native 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 Nov 8 10:22:22 2014 @@ -221,6 +221,7 @@ reactos/dll/win32/wintrust # Synced to Wine-1.7.27 reactos/dll/win32/wldap32 # Synced to Wine-1.7.27 reactos/dll/win32/wmi # Synced to Wine-1.7.27 +reactos/dll/win32/wshom.ocx # Synced to Wine-1.7.27 reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.27 reactos/dll/win32/wuapi # Synced to Wine-1.7.27 reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.27 Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Sat Nov 8 10:22:22 2014 @@ -101,6 +101,7 @@ 11,,winhttp.dll,1 11,,wininet.dll,2 11,,wintrust.dll,1 +11,,wshom.ocx,1 11,,wuapi.dll,1 11,wbem,wbemdisp.dll,1 11,wbem,wbemprox.dll,1

9 years, 10 months

[janderwald] 65314: [USBHUB] - register device interface GUID_DEVINTERFACE_USB_DEVICE for usb devices

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Nov 8 09:26:21 2014 New Revision: 65314 URL: http://svn.reactos.org/svn/reactos?rev=65314&view=rev Log: [USBHUB] - register device interface GUID_DEVINTERFACE_USB_DEVICE for usb devices Modified: trunk/reactos/drivers/usb/usbhub/pdo.c Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sat Nov 8 09:26:21 2014 @@ -17,6 +17,9 @@ #include <debug.h> #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) + +DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, + 0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED); NTSTATUS NTAPI @@ -408,8 +411,9 @@ ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); // - // FIXME: Fow now assume success - // + // register device interface + // + IoRegisterDeviceInterface(DeviceObject, &GUID_DEVINTERFACE_USB_DEVICE, NULL, &ChildDeviceExtension->SymbolicLinkName); UNIMPLEMENTED return STATUS_SUCCESS;

9 years, 10 months

[aandrejevic] 65313: [FAST486] Clear the prefix flags when an exception occurs. Add another missing return after a call to Fast486Exception.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Nov 8 05:56:49 2014 New Revision: 65313 URL: http://svn.reactos.org/svn/reactos?rev=65313&view=rev Log: [FAST486] Clear the prefix flags when an exception occurs. Add another missing return after a call to Fast486Exception. Modified: trunk/reactos/lib/fast486/common.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Sat Nov 8 05:56:49 2014 @@ -290,11 +290,8 @@ if (GateSize != (State->SegmentRegs[FAST486_REG_CS].Size)) { - /* - * The gate size doesn't match the current operand size, so toggle - * the OPSIZE flag. - */ - State->PrefixFlags ^= FAST486_PREFIX_OPSIZE; + /* The gate size doesn't match the current operand size, so set the OPSIZE flag. */ + State->PrefixFlags |= FAST486_PREFIX_OPSIZE; } /* Check if the interrupt handler is more privileged */ @@ -469,6 +466,9 @@ return; } + /* Clear the prefix flags */ + State->PrefixFlags = 0; + /* Restore the IP to the saved IP */ State->InstPtr = State->SavedInstPtr; @@ -566,7 +566,8 @@ if (NewTssLimit < sizeof(FAST486_TSS)) { /* TSS limit too small */ - Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, Selector); + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, Selector); + return FALSE; } /*

9 years, 10 months

[aandrejevic] 65312: [FAST486] - Fix the FPU_CHECK() macro. - Make sure pages are marked dirty even if they have been accessed before. - Always return after calling Fast486Exception.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Nov 8 02:56:54 2014 New Revision: 65312 URL: http://svn.reactos.org/svn/reactos?rev=65312&view=rev Log: [FAST486] - Fix the FPU_CHECK() macro. - Make sure pages are marked dirty even if they have been accessed before. - Always return after calling Fast486Exception. Modified: trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/fpu.h Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Sat Nov 8 02:56:54 2014 @@ -112,13 +112,12 @@ /* Make sure it is present */ if (!TableEntry.Present) return 0; - if (MarkAsDirty) TableEntry.Dirty = TRUE; - - /* Was the table entry accessed before? */ - if (!TableEntry.Accessed) - { - /* Well, it is now */ + /* Do we need to change any flags? */ + if (!TableEntry.Accessed || (MarkAsDirty && !TableEntry.Dirty)) + { + /* Mark it as accessed and optionally dirty too */ TableEntry.Accessed = TRUE; + if (MarkAsDirty) TableEntry.Dirty = TRUE; /* Write back the table entry */ State->MemWriteCallback(State, @@ -512,6 +511,7 @@ { /* Invalid selector */ Fast486ExceptionWithErrorCode(State, Exception, Selector); + return FALSE; } if (Segment == FAST486_REG_SS) @@ -569,6 +569,7 @@ { /* Must be a segment descriptor */ Fast486ExceptionWithErrorCode(State, Exception, Selector); + return FALSE; } if (!GdtEntry.Present) Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6531… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Sat Nov 8 02:56:54 2014 @@ -28,7 +28,7 @@ /* DEFINES ********************************************************************/ -#define FPU_CHECK() if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_EM) \ +#define FPU_CHECK() if (State->ControlRegisters[FAST486_REG_CR0] & (FAST486_CR0_EM | FAST486_CR0_TS)) \ { \ Fast486Exception(State, FAST486_EXCEPTION_NM); \ return; \

9 years, 10 months

[hbelusca] 65311: [HALx86]: Display the invalid opcodes when HalpOpcodeInvalid is called.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Nov 7 21:19:27 2014 New Revision: 65311 URL: http://svn.reactos.org/svn/reactos?rev=65311&view=rev Log: [HALx86]: Display the invalid opcodes when HalpOpcodeInvalid is called. Modified: trunk/reactos/hal/halx86/generic/bios.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Fri Nov 7 21:19:27 2014 @@ -60,9 +60,14 @@ FASTCALL HalpOpcodeInvalid(IN PHAL_BIOS_FRAME BiosFrame) { + PUCHAR Inst = (PUCHAR)(BiosFrame->CsBase + BiosFrame->Eip); + /* Print error message */ - DPRINT1("HAL: An invalid V86 opcode was encountered at address %x:%x\n", - BiosFrame->SegCs, BiosFrame->Eip); + DPRINT1("HAL: An invalid V86 opcode was encountered at address %X:%X\n", + "Opcode: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", + BiosFrame->SegCs, BiosFrame->Eip, + Inst[0], Inst[1], Inst[2], Inst[3], Inst[4], + Inst[5], Inst[6], Inst[7], Inst[8], Inst[9]); /* Break */ DbgBreakPoint();

9 years, 10 months

[aandrejevic] 65310: [FAST486] Fix BT, BTC, BTS and BTR.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Nov 7 19:20:38 2014 New Revision: 65310 URL: http://svn.reactos.org/svn/reactos?rev=65310&view=rev Log: [FAST486] Fix BT, BTC, BTS and BTR. Modified: trunk/reactos/lib/fast486/extraops.c Modified: trunk/reactos/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.c [iso-8859-1] Fri Nov 7 19:20:38 2014 @@ -752,7 +752,7 @@ * For memory operands, add the bit offset divided by * the data size to the address */ - ModRegRm.MemoryAddress += BitNumber / DataSize; + ModRegRm.MemoryAddress += (BitNumber / DataSize) * (DataSize / 8); } /* Normalize the bit number */ @@ -936,7 +936,7 @@ * For memory operands, add the bit offset divided by * the data size to the address */ - ModRegRm.MemoryAddress += BitNumber / DataSize; + ModRegRm.MemoryAddress += (BitNumber / DataSize) * (DataSize / 8); } /* Normalize the bit number */ @@ -1378,7 +1378,7 @@ * For memory operands, add the bit offset divided by * the data size to the address */ - ModRegRm.MemoryAddress += BitNumber / DataSize; + ModRegRm.MemoryAddress += (BitNumber / DataSize) * (DataSize / 8); } /* Normalize the bit number */ @@ -1592,7 +1592,7 @@ * For memory operands, add the bit offset divided by * the data size to the address */ - ModRegRm.MemoryAddress += BitNumber / DataSize; + ModRegRm.MemoryAddress += (BitNumber / DataSize) * (DataSize / 8); } /* Normalize the bit number */

9 years, 10 months

[pschweitzer] 65309: [FASTFAT] Properly check for volume open on lock request

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Nov 7 15:38:31 2014 New Revision: 65309 URL: http://svn.reactos.org/svn/reactos?rev=65309&view=rev Log: [FASTFAT] Properly check for volume open on lock request Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Fri Nov 7 15:38:31 2014 @@ -865,14 +865,16 @@ { PFILE_OBJECT FileObject; PDEVICE_EXTENSION DeviceExt; + PVFATFCB Fcb; DPRINT("VfatLockOrUnlockVolume(%p, %d)\n", IrpContext, Lock); DeviceExt = IrpContext->DeviceExt; FileObject = IrpContext->FileObject; + Fcb = FileObject->FsContext; /* Only allow locking with the volume open */ - if (FileObject->FsContext != DeviceExt->VolumeFcb) + if (!(Fcb->Flags & FCB_IS_VOLUME)) { return STATUS_ACCESS_DENIED; }

9 years, 10 months

[akhaldi] 65308: [TRANSLATIONS] * Russian translation update by Kudratov Olimjon. CORE-8701 #resolve #comment Committed in r65308. Thanks!

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 7 15:08:59 2014 New Revision: 65308 URL: http://svn.reactos.org/svn/reactos?rev=65308&view=rev Log: [TRANSLATIONS] * Russian translation update by Kudratov Olimjon. CORE-8701 #resolve #comment Committed in r65308. Thanks! Added: trunk/reactos/base/system/diskpart/lang/ru-RU.rc (with props) trunk/reactos/base/system/subst/lang/ru-RU.rc (with props) trunk/reactos/dll/cpl/wined3dcfg/lang/ru-RU.rc (with props) trunk/reactos/dll/win32/crypt32/lang/crypt32_Ru.rc (with props) trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Ru.rc (with props) trunk/reactos/dll/win32/lsasrv/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/cacls/lang/ru-RU.rc trunk/reactos/base/applications/charmap/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/help/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/taskkill/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/fontview/lang/ru-RU.rc trunk/reactos/base/applications/mmc/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/lang/ru-RU.rc trunk/reactos/base/applications/network/net/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/base/system/diskpart/diskpart.rc trunk/reactos/base/system/format/lang/ru-RU.rc trunk/reactos/base/system/subst/subst.rc trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc trunk/reactos/dll/cpl/console/lang/ru-RU.rc trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Ru.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Ru.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc trunk/reactos/dll/win32/crypt32/crypt32.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/iccvid/lang/iccvid_Ru.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc trunk/reactos/dll/win32/lsasrv/lsasrv.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msi/msi_Ru.rc trunk/reactos/dll/win32/msports/lang/ru-RU.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc trunk/reactos/dll/win32/msvidc32/lang/msvidc32_Ru.rc trunk/reactos/dll/win32/netcfgx/lang/en-US.rc trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc trunk/reactos/dll/win32/netid/lang/ru-RU.rc trunk/reactos/dll/win32/netshell/lang/ru-RU.rc trunk/reactos/dll/win32/newdev/lang/ru-RU.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Ru.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/wininet/lang/wininet_Ru.rc trunk/reactos/dll/win32/winmm/lang/winmm_Ru.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cacls/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/cmdutils/help/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/taskkill/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/fontview/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/mmc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/network/net/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/system/diskpart/diskpart.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… Added: trunk/reactos/base/system/diskpart/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… Modified: trunk/reactos/base/system/format/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/ru… Added: trunk/reactos/base/system/subst/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/ru-… Modified: trunk/reactos/base/system/subst/subst.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/subst.rc… Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… Modified: trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… Modified: trunk/reactos/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ru-RU… Modified: trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ru-RU… Added: trunk/reactos/dll/cpl/wined3dcfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/ru… Modified: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d… Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/co… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… Added: trunk/reactos/dll/win32/crypt32/lang/crypt32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… Added: trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/lang/cr… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Added: trunk/reactos/dll/win32/lsasrv/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lang/ru-R… Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rc… Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ru.… Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… Modified: trunk/reactos/dll/win32/msi/msi_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Ru.rc?re… Modified: trunk/reactos/dll/win32/msports/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/ru-… Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… Modified: trunk/reactos/dll/win32/msvidc32/lang/msvidc32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/lang/ms… Modified: trunk/reactos/dll/win32/netcfgx/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/en-… Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ru-… Modified: trunk/reactos/dll/win32/netid/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ru-RU… Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru… Modified: trunk/reactos/dll/win32/newdev/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ru-R… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… Modified: trunk/reactos/dll/win32/winmm/lang/winmm_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/lang/winmm… Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… Modified: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ru-R…

9 years, 10 months

[akhaldi] 65307: [SHELL32] * Work on the exports a bit to match native. * There are still cases worth inspecting, marked as FIXME. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 7 14:26:27 2014 New Revision: 65307 URL: http://svn.reactos.org/svn/reactos?rev=65307&view=rev Log: [SHELL32] * Work on the exports a bit to match native. * There are still cases worth inspecting, marked as FIXME. CORE-8174 Modified: branches/shell-experiments/dll/win32/shell32/shell32.spec Modified: branches/shell-experiments/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shell32.spec [iso-8859-1] Fri Nov 7 14:26:27 2014 @@ -1,106 +1,126 @@ -2 stdcall SHChangeNotifyRegister(long long long long long ptr) -3 stdcall SHDefExtractIconA(str long long ptr ptr long) -4 stdcall SHChangeNotifyDeregister(long) -5 stdcall -noname SHChangeNotifyUpdateEntryList(long long long long) -6 stdcall SHDefExtractIconW(wstr long long ptr ptr long) -7 stdcall -noname SHLookupIconIndexA(str long long) -8 stdcall -noname SHLookupIconIndexW(wstr long long) -9 stdcall PifMgr_OpenProperties(wstr wstr long long) -10 stdcall PifMgr_GetProperties(ptr wstr ptr long long) -11 stdcall PifMgr_SetProperties(ptr wstr ptr long long) -12 stdcall -noname SHStartNetConnectionDialogA(ptr str long) -13 stdcall PifMgr_CloseProperties(ptr long) -14 stdcall SHStartNetConnectionDialogW(ptr wstr long) -15 stdcall -noname ILGetDisplayName(ptr ptr) -16 stdcall ILFindLastID(ptr) -17 stdcall ILRemoveLastID(ptr) -18 stdcall ILClone(ptr) -19 stdcall ILCloneFirst(ptr) -20 stdcall -noname ILGlobalClone(ptr) -21 stdcall ILIsEqual(ptr ptr) -22 stdcall DAD_DragEnterEx2(ptr long long ptr) -23 stdcall ILIsParent(ptr ptr long) -24 stdcall ILFindChild(ptr ptr) -25 stdcall ILCombine(ptr ptr) -26 stdcall ILLoadFromStream(ptr ptr) -27 stdcall ILSaveToStream(ptr ptr) -28 stdcall SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW -29 stdcall -noname PathIsRoot(ptr) PathIsRootAW -30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW # FIXME: should be PathBuildRootW -31 stdcall -noname PathFindExtension(wstr) PathFindExtensionW -32 stdcall -noname PathAddBackslash(wstr) PathAddBackslashW -33 stdcall -noname PathRemoveBlanks(wstr) PathRemoveBlanksW -34 stdcall -noname PathFindFileName(wstr) PathFindFileNameW -35 stdcall -noname PathRemoveFileSpec(ptr) PathRemoveFileSpecAW # Fixme -36 stdcall -noname PathAppend(ptr ptr) PathAppendAW # Fixme -37 stdcall -noname PathCombine(wstr wstr wstr) PathCombineW -38 stdcall -noname PathStripPath(wstr) PathStripPathW -39 stdcall -noname PathIsUNC(wstr) PathIsUNCW -40 stdcall -noname PathIsRelative(wstr) PathIsRelativeW -41 stdcall IsLFNDriveA(str) -42 stdcall IsLFNDriveW(wstr) -43 stdcall PathIsExe(ptr) PathIsExeAW -45 stdcall -noname PathFileExists(ptr) PathFileExistsAW # Fixme -46 stdcall -noname PathMatchSpec(wstr wstr) PathMatchSpecW -47 stdcall PathMakeUniqueName(ptr long ptr ptr ptr) PathMakeUniqueNameAW -48 stdcall -noname PathSetDlgItemPath(long long wstr) PathSetDlgItemPathW -49 stdcall PathQualify(ptr) PathQualifyAW -50 stdcall -noname PathStripToRoot(wstr) PathStripToRootW -51 stdcall PathResolve(str long long) PathResolveAW -52 stdcall -noname PathGetArgs(wstr) PathGetArgsW -53 stdcall -noname IsSuspendAllowed() # FIXME: Wine says DoEnvironmentSubst -54 stdcall -noname LogoffWindowsDialog(ptr) -55 stdcall -noname PathQuoteSpaces(wstr) PathQuoteSpacesW -56 stdcall -noname PathUnquoteSpaces(wstr) PathUnquoteSpacesW -57 stdcall -noname PathGetDriveNumber(wstr) PathGetDriveNumberW -58 stdcall -noname ParseField(str long ptr long) ParseFieldAW # Fixme -59 stdcall RestartDialog(long wstr long) -60 stdcall -noname ExitWindowsDialog(long) # Fixme -61 stdcall -noname RunFileDlg(long long long wstr wstr long) RunFileDlg # Fixme? -62 stdcall PickIconDlg(long long long long) -63 stdcall GetFileNameFromBrowse(long long long long wstr wstr wstr) -64 stdcall DriveType(long) -65 stdcall -noname InvalidateDriveType(long) -66 stdcall IsNetDrive(long) -67 stdcall Shell_MergeMenus(long long long long long long) -68 stdcall SHGetSetSettings(ptr long long) -69 stdcall -noname SHGetNetResource(ptr long ptr long) -70 stdcall -noname SHCreateDefClassObject(long long long long long) -71 stdcall Shell_GetImageLists(ptr ptr) -72 stdcall Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW -73 stdcall SHShellFolderView_Message(long long long) -74 stdcall SHCreateStdEnumFmtEtc(long ptr ptr) -75 stdcall PathYetAnotherMakeUniqueName(ptr wstr wstr wstr) -76 stdcall -noname DragQueryInfo(ptr ptr) -77 stdcall SHMapPIDLToSystemImageListIndex(ptr ptr ptr) -78 stdcall -noname OleStrToStrN(str long wstr long) OleStrToStrNAW # Fixme -79 stdcall -noname StrToOleStrN(wstr long str long) StrToOleStrNAW # Fixme -80 stdcall SHOpenPropSheetW(wstr ptr long ptr ptr ptr wstr) -82 stdcall -noname DDECreatePostNotify(ptr) -83 stdcall -noname CIDLData_CreateFromIDArray(ptr long ptr ptr) -84 stdcall -noname SHIsBadInterfacePtr(ptr long) # Fixme -85 stdcall OpenRegStream(long str str long) shlwapi.SHOpenRegStreamA -86 stdcall -noname SHRegisterDragDrop(long ptr) -87 stdcall -noname SHRevokeDragDrop(long) -88 stdcall SHDoDragDrop(long ptr ptr long ptr) -89 stdcall SHCloneSpecialIDList(long long long) -90 stdcall SHFindFiles(ptr ptr) -91 stdcall -noname SHFindComputer(ptr ptr) -92 stdcall PathGetShortPath(ptr) PathGetShortPathAW -93 stdcall -noname Win32CreateDirectory(wstr ptr) Win32CreateDirectoryW -94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryW -95 stdcall -noname SHLogILFromFSIL(ptr) -96 stdcall -noname StrRetToStrN(ptr long ptr ptr) StrRetToStrNAW # Fixme -97 stdcall -noname SHWaitForFileToOpen(long long long) -98 stdcall SHGetRealIDL(ptr ptr ptr) -99 stdcall -noname SetAppStartingCursor(long long) # Fixme +2 stdcall SHChangeNotifyRegister(long long long long long ptr) +3 stdcall SHDefExtractIconA(str long long ptr ptr long) +4 stdcall SHChangeNotifyDeregister(long) +5 stdcall -noname SHChangeNotifyUpdateEntryList(long long long long) # FIXME: Inspect +6 stdcall SHDefExtractIconW(wstr long long ptr ptr long) +7 stdcall -noname SHLookupIconIndexA(str long long) +8 stdcall -noname SHLookupIconIndexW(wstr long long) +9 stdcall PifMgr_OpenProperties(wstr wstr long long) +10 stdcall PifMgr_GetProperties(ptr wstr ptr long long) +11 stdcall PifMgr_SetProperties(ptr wstr ptr long long) +12 stdcall -noname SHStartNetConnectionDialogA(ptr str long) +13 stdcall PifMgr_CloseProperties(ptr long) +14 stdcall SHStartNetConnectionDialogW(ptr wstr long) +15 stdcall -noname ILGetDisplayName(ptr ptr) +16 stdcall ILFindLastID(ptr) +17 stdcall ILRemoveLastID(ptr) +18 stdcall ILClone(ptr) +19 stdcall ILCloneFirst(ptr) +20 stdcall -noname ILGlobalClone(ptr) +21 stdcall ILIsEqual(ptr ptr) +22 stdcall DAD_DragEnterEx2(ptr long long ptr) +23 stdcall ILIsParent(ptr ptr long) +24 stdcall ILFindChild(ptr ptr) +25 stdcall ILCombine(ptr ptr) +26 stdcall ILLoadFromStream(ptr ptr) +27 stdcall ILSaveToStream(ptr ptr) +28 stdcall SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW +29 stdcall -noname PathIsRoot(ptr) PathIsRootAW +30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW # FIXME: should be PathBuildRootW +31 stdcall -noname PathFindExtension(wstr) PathFindExtensionW +32 stdcall -noname PathAddBackslash(wstr) PathAddBackslashW +33 stdcall -noname PathRemoveBlanks(wstr) PathRemoveBlanksW +34 stdcall -noname PathFindFileName(wstr) PathFindFileNameW +35 stdcall -noname PathRemoveFileSpec(ptr) PathRemoveFileSpecAW # Fixme +36 stdcall -noname PathAppend(ptr ptr) PathAppendAW # Fixme +37 stdcall -noname PathCombine(wstr wstr wstr) PathCombineW +38 stdcall -noname PathStripPath(wstr) PathStripPathW +39 stdcall -noname PathIsUNC(wstr) PathIsUNCW +40 stdcall -noname PathIsRelative(wstr) PathIsRelativeW +41 stdcall IsLFNDriveA(str) +42 stdcall IsLFNDriveW(wstr) +43 stdcall PathIsExe(ptr) PathIsExeAW +45 stdcall -noname PathFileExists(ptr) PathFileExistsAW # Fixme +46 stdcall -noname PathMatchSpec(wstr wstr) PathMatchSpecW +47 stdcall PathMakeUniqueName(ptr long ptr ptr ptr) PathMakeUniqueNameAW +48 stdcall -noname PathSetDlgItemPath(long long wstr) PathSetDlgItemPathW +49 stdcall PathQualify(ptr) PathQualifyAW +50 stdcall -noname PathStripToRoot(wstr) PathStripToRootW +51 stdcall PathResolve(str long long) PathResolveAW +52 stdcall -noname PathGetArgs(wstr) PathGetArgsW +53 stdcall -noname IsSuspendAllowed() # FIXME: Wine says DoEnvironmentSubst +54 stdcall -noname LogoffWindowsDialog(ptr) +55 stdcall -noname PathQuoteSpaces(wstr) PathQuoteSpacesW +56 stdcall -noname PathUnquoteSpaces(wstr) PathUnquoteSpacesW +57 stdcall -noname PathGetDriveNumber(wstr) PathGetDriveNumberW # FIXME: Inspect +58 stdcall -noname ParseField(str long ptr long) ParseFieldAW # Fixme +59 stdcall RestartDialog(long wstr long) +60 stdcall -noname ExitWindowsDialog(long) # Fixme +61 stdcall -noname RunFileDlg(long long long wstr wstr long) RunFileDlg # Fixme? +62 stdcall PickIconDlg(long long long long) +63 stdcall GetFileNameFromBrowse(long long long long wstr wstr wstr) +64 stdcall DriveType(long) +65 stdcall -noname InvalidateDriveType(long) # FIXME: Inspect +66 stdcall IsNetDrive(long) +67 stdcall Shell_MergeMenus(long long long long long long) +68 stdcall SHGetSetSettings(ptr long long) +69 stdcall -noname SHGetNetResource(ptr long ptr long) +70 stdcall -noname SHCreateDefClassObject(long long long long long) +71 stdcall Shell_GetImageLists(ptr ptr) +72 stdcall Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW +73 stdcall SHShellFolderView_Message(long long long) +74 stdcall SHCreateStdEnumFmtEtc(long ptr ptr) +75 stdcall PathYetAnotherMakeUniqueName(ptr wstr wstr wstr) +76 stdcall -noname DragQueryInfo(ptr ptr) +77 stdcall SHMapPIDLToSystemImageListIndex(ptr ptr ptr) +78 stdcall -noname OleStrToStrN(str long wstr long) OleStrToStrNAW # Fixme +79 stdcall -noname StrToOleStrN(wstr long str long) StrToOleStrNAW # Fixme +80 stdcall SHOpenPropSheetW(wstr ptr long ptr ptr ptr wstr) +81 stdcall OpenAs_RunDLL(long long str long) OpenAs_RunDLLA +82 stdcall -noname DDECreatePostNotify(ptr) +83 stdcall -noname CIDLData_CreateFromIDArray(ptr long ptr ptr) +84 stdcall -noname SHIsBadInterfacePtr(ptr long) # Fixme +85 stdcall OpenRegStream(long str str long) shlwapi.SHOpenRegStreamA +86 stdcall -noname SHRegisterDragDrop(long ptr) +87 stdcall -noname SHRevokeDragDrop(long) +88 stdcall SHDoDragDrop(long ptr ptr long ptr) +89 stdcall SHCloneSpecialIDList(long long long) +90 stdcall SHFindFiles(ptr ptr) +91 stdcall -noname SHFindComputer(ptr ptr) +92 stdcall PathGetShortPath(ptr) PathGetShortPathAW +93 stdcall -noname Win32CreateDirectory(wstr ptr) Win32CreateDirectoryW +94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryW +95 stdcall -noname SHLogILFromFSIL(ptr) +96 stdcall -noname StrRetToStrN(ptr long ptr ptr) StrRetToStrNAW # Fixme +97 stdcall -noname SHWaitForFileToOpen(long long long) +98 stdcall SHGetRealIDL(ptr ptr ptr) +99 stdcall -noname SetAppStartingCursor(long long) # Fixme 100 stdcall SHRestricted(long) +101 stdcall OpenAs_RunDLLA(long long str long) 102 stdcall SHCoCreateInstance(wstr ptr long ptr ptr) 103 stdcall SignalFileOpen(ptr) +104 stdcall OpenAs_RunDLLW(long long wstr long) +105 stdcall Activate_RunDLL(long ptr ptr ptr) +106 stdcall AppCompat_RunDLLW(ptr ptr wstr long) +107 stdcall CheckEscapesA(str long) +108 stdcall CheckEscapesW(wstr long) +109 stdcall CommandLineToArgvW(wstr ptr) +110 stdcall Control_FillCache_RunDLL(long long long long) Control_FillCache_RunDLLA +111 stdcall Control_FillCache_RunDLLA(long long long long) +112 stdcall Control_FillCache_RunDLLW(long long long long) +113 stdcall Control_RunDLL(ptr ptr str long) Control_RunDLLA +114 stdcall Control_RunDLLA(ptr ptr str long) +115 stdcall Control_RunDLLAsUserW(ptr ptr wstr long) +116 stdcall Control_RunDLLW(ptr ptr wstr long) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) 119 stdcall IsLFNDrive(ptr) IsLFNDriveAW +@ stdcall -private DllGetVersion(ptr) 121 stdcall SHFlushClipboard() 122 stdcall -noname RunDLL_CallEntry16(long long long str long) # Fixme #name wrong? 123 stdcall -noname SHFreeUnusedLibraries() +@ stdcall -private DllInstall(long wstr) +@ stdcall -private DllRegisterServer() 126 stdcall -noname SHOutOfMemoryMessageBox(long long long) # Fixme 127 stdcall -noname SHWinHelp(long long long long) 128 stdcall -noname SHDllGetClassObject(ptr ptr ptr) DllGetClassObject @@ -108,14 +128,24 @@ 130 stdcall -noname DAD_DragEnter(long) 131 stdcall DAD_DragEnterEx(long double) 132 stdcall DAD_DragLeave() +@ stdcall -private DllUnregisterServer() 134 stdcall DAD_DragMove(double) +135 stdcall DoEnvironmentSubstA(str str) 136 stdcall DAD_SetDragImage(long long) 137 stdcall DAD_ShowDragImage(long) +138 stdcall DoEnvironmentSubstW(wstr wstr) +139 stdcall DragAcceptFiles(long long) +140 stdcall DragFinish(long) +141 stdcall DragQueryFile(long long ptr long) DragQueryFileA +142 stdcall DragQueryFileA(long long ptr long) +143 stdcall DragQueryFileAorW(ptr long wstr long long long) +144 stdcall DragQueryFileW(long long ptr long) 145 stdcall -noname PathFindOnPath(wstr wstr) PathFindOnPathW 146 stdcall -noname RLBuildListOfPaths() 147 stdcall SHCLSIDFromString(long long) SHCLSIDFromStringAW 148 stdcall SHMapIDListToImageListIndexAsync(ptr ptr ptr long ptr ptr ptr ptr ptr) 149 stdcall SHFind_InitMenuPopup(long long long long) +150 stdcall DragQueryPoint(long ptr) 151 stdcall SHLoadOLE(long) 152 stdcall ILGetSize(ptr) 153 stdcall ILGetNext(ptr) @@ -142,7 +172,7 @@ 174 stdcall SHCreateShellFolderViewEx(ptr ptr) 175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathW 176 stdcall SHSetInstanceExplorer(long) -177 stdcall DAD_SetDragImageFromListView(ptr long long) +177 stdcall -noname DAD_SetDragImageFromListView(ptr long long) 178 stdcall SHObjectProperties(long long wstr wstr) 179 stdcall SHGetNewLinkInfoA(str str ptr long long) 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) @@ -162,15 +192,18 @@ 194 stdcall -noname SHCreatePropSheetExtArrayEx(long wstr long ptr) 195 stdcall SHFree(ptr) 196 stdcall SHAlloc(long) -197 stdcall -noname SHGlobalDefect(long) +197 stdcall -noname SHGlobalDefect(long) # FIXME: Inspect 198 stdcall -noname SHAbortInvokeCommand() -# FIXME: Wine has SHGetFileIcon/SHLocalAlloc/SHLocalFree/SHLocalReAlloc from 199-202 +199 stdcall DuplicateIcon(long long) 200 stdcall -noname SHCreateDesktop(ptr) 201 stdcall -noname SHDesktopMessageLoop(ptr) 202 stub -noname DDEHandleViewFolderNotify 203 stdcall -noname AddCommasW(long wstr) 204 stdcall -noname ShortSizeFormatW(double) 205 stdcall -noname Printer_LoadIconsW(wstr ptr ptr) +206 stdcall ExtractAssociatedIconA(long str ptr) +207 stdcall ExtractAssociatedIconExA(long str long long) +208 stdcall ExtractAssociatedIconExW(long wstr long long) 209 stdcall -noname Int64ToString(double wstr long long ptr long) # Fixme 210 stdcall -noname LargeIntegerToString(ptr wstr long long ptr long) # Fixme 211 stdcall -noname Printers_GetPidl(ptr str) # Fixme @@ -178,6 +211,20 @@ 213 stdcall -noname Printers_RegisterWindowW(wstr long ptr ptr) 214 stdcall -noname Printers_UnregisterWindow(long long) 215 stdcall -noname SHStartNetConnectionDialog(long str long) +216 stdcall ExtractAssociatedIconW(long wstr ptr) +217 stdcall ExtractIconA(long str long) +218 stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExA +219 stdcall ExtractIconExA(str long ptr ptr long) +220 stdcall ExtractIconExW(wstr long ptr ptr long) +221 stdcall ExtractIconResInfoA(ptr str long ptr ptr) +222 stdcall ExtractIconResInfoW(ptr wstr long ptr ptr) +223 stdcall ExtractIconW(long wstr long) +224 stdcall ExtractVersionResource16W(wstr ptr) +225 stdcall FindExeDlgProc(ptr long ptr ptr) +226 stdcall FindExecutableA(str str ptr) +227 stdcall FindExecutableW(wstr wstr ptr) +228 stdcall FreeIconList(long) +229 stdcall InternalExtractIconListA(ptr str ptr) 230 stdcall -noname FirstUserLogon(wstr wstr) 231 stdcall -noname SHSetFolderPathA(long ptr long str) 232 stdcall -noname SHSetFolderPathW(long ptr long wstr) @@ -186,12 +233,13 @@ 235 stdcall -noname SHOpenEffectiveToken(ptr) 236 stdcall -noname SHTestTokenPrivilegeW(ptr ptr) 237 stdcall -noname SHShouldShowWizards(ptr) +238 stdcall InternalExtractIconListW(ptr wstr ptr) 239 stdcall PathIsSlowW(wstr long) 240 stdcall PathIsSlowA(str long) 241 stdcall -noname SHGetUserDisplayName(wstr ptr) -242 stdcall -noname SHGetProcessDword(long long) +242 stdcall -noname SHGetProcessDword(long long) # FIXME: Inspect 243 stdcall -noname SHSetShellWindowEx(ptr ptr) user32.SetShellWindowEx -244 stdcall -noname SHInitRestricted(ptr ptr) +244 stdcall -noname SHInitRestricted(ptr ptr) # FIXME: Inspect 245 stdcall SHTestTokenMembership(ptr ptr) 246 stub -noname SHInvokePrivilegedFunctionW 247 stub -noname SHGetActiveConsoleSessionId @@ -202,14 +250,153 @@ 252 stdcall -noname PathIsURL(wstr) shlwapi.PathIsURLW 253 stub -noname SHIsCurrentProcessConsoleSession 254 stub -noname DisconnectWindowsDialog +255 stdcall Options_RunDLL(ptr ptr str long) 256 stdcall SHCreateShellFolderView(ptr ptr) -257 stdcall -noname SHGetShellFolderViewCB(ptr) +257 stdcall -noname SHGetShellFolderViewCB(ptr) # FIXME: Inspect 258 stdcall -noname LinkWindow_RegisterClass() -259 stdcall -noname LinkWindow_UnregisterClass() -520 stdcall SHAllocShared(ptr long long) -521 stdcall SHLockShared(long long) -522 stdcall SHUnlockShared(ptr) -523 stdcall SHFreeShared(long long) +259 stdcall -noname LinkWindow_UnregisterClass() # FIXME: Inspect +260 stdcall Options_RunDLLA(ptr ptr str long) +261 stdcall Options_RunDLLW(ptr ptr wstr long) +262 stdcall PrintersGetCommand_RunDLL(ptr ptr wstr long) +263 stdcall PrintersGetCommand_RunDLLA(ptr ptr str long) +264 stdcall PrintersGetCommand_RunDLLW(ptr ptr wstr long) +265 stdcall RealShellExecuteA(ptr str str str str str str str long ptr) +266 stdcall RealShellExecuteExA(ptr str str str str str str str long ptr long) +267 stdcall RealShellExecuteExW(ptr str str str str str str str long ptr long) +268 stdcall RealShellExecuteW(ptr wstr wstr wstr wstr wstr wstr wstr long ptr) +269 stdcall RegenerateUserEnvironment(ptr long) +270 stdcall SHAddToRecentDocs(long ptr) +271 stdcall SHAppBarMessage(long ptr) +272 stdcall SHBindToParent(ptr ptr ptr ptr) +273 stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA +274 stdcall SHBrowseForFolderA(ptr) +275 stdcall SHBrowseForFolderW(ptr) +276 stdcall SHChangeNotify(long long ptr ptr) +277 stdcall SHChangeNotifySuspendResume(long ptr long long) +278 stdcall SHCreateDirectoryExA(long str ptr) +279 stdcall SHCreateDirectoryExW(long wstr ptr) +280 stub SHCreateLocalServerRunDll +281 stdcall SHCreateProcessAsUserW(ptr) +282 stdcall SHCreateQueryCancelAutoPlayMoniker(ptr) +283 stdcall SHCreateShellItem(ptr ptr ptr ptr) +284 stdcall SHEmptyRecycleBinA(long str long) +285 stdcall SHEmptyRecycleBinW(long wstr long) +286 stub SHEnableServiceObject +287 stub SHEnumerateUnreadMailAccountsW +288 stdcall SHExtractIconsW(wstr long long long ptr ptr long long) user32.PrivateExtractIconsW +289 stdcall SHFileOperation(ptr) SHFileOperationA +290 stdcall SHFileOperationA(ptr) +291 stdcall SHFileOperationW(ptr) +292 stdcall SHFormatDrive(long long long long) +293 stdcall SHFreeNameMappings(ptr) +294 stdcall SHGetDataFromIDListA(ptr ptr long ptr long) +295 stdcall SHGetDataFromIDListW(ptr ptr long ptr long) +296 stdcall SHGetDesktopFolder(ptr) +297 stdcall SHGetDiskFreeSpaceA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA +298 stdcall SHGetDiskFreeSpaceExA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA +299 stdcall SHGetDiskFreeSpaceExW(wstr ptr ptr ptr) kernel32.GetDiskFreeSpaceExW +300 stdcall SHGetFileInfo(ptr long ptr long long) SHGetFileInfoA +301 stdcall SHGetFileInfoA(ptr long ptr long long) +302 stdcall SHGetFileInfoW(ptr long ptr long long) +303 stdcall SHGetFolderLocation(long long long long ptr) +304 stdcall SHGetFolderPathA(long long long long ptr) +305 stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) +306 stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) +307 stdcall SHGetFolderPathW(long long long long ptr) +308 stdcall SHGetIconOverlayIndexA(str long) +309 stdcall SHGetIconOverlayIndexW(wstr long) +310 stdcall SHGetInstanceExplorer(long) +311 stdcall SHGetMalloc(ptr) +312 stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA +313 stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA +314 stdcall SHGetPathFromIDListA(ptr ptr) +315 stdcall SHGetPathFromIDListW(ptr ptr) +316 stdcall SHGetSettings(ptr long) +317 stdcall SHGetSpecialFolderLocation(long long ptr) +318 stdcall SHGetSpecialFolderPathA(long ptr long long) +319 stdcall SHGetSpecialFolderPathW(long ptr long long) +320 stdcall SHGetUnreadMailCountW (long wstr long ptr wstr long) +321 stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLLA +322 stdcall SHHelpShortcuts_RunDLLA(long long long long) +323 stdcall SHHelpShortcuts_RunDLLW(long long long long) +324 stdcall SHInvokePrinterCommandA(ptr long str str long) +325 stdcall SHInvokePrinterCommandW(ptr long wstr wstr long) +326 stdcall SHIsFileAvailableOffline(wstr ptr) +327 stdcall SHLoadInProc(long) +328 stdcall SHLoadNonloadedIconOverlayIdentifiers() +329 stdcall SHOpenFolderAndSelectItems(ptr long ptr long) +330 stdcall SHParseDisplayName(wstr ptr ptr long ptr) +331 stdcall SHPathPrepareForWriteA(long ptr str long) +332 stdcall SHPathPrepareForWriteW(long ptr wstr long) +333 stdcall SHQueryRecycleBinA(str ptr) +334 stdcall SHQueryRecycleBinW(wstr ptr) +335 stdcall SHSetLocalizedName(wstr wstr long) +336 stdcall SHSetUnreadMailCountW (wstr long wstr) +337 stdcall SHUpdateRecycleBinIcon() +338 stdcall SheChangeDirA(str) +339 stdcall SheChangeDirExA(str) +340 stdcall SheChangeDirExW(wstr) +341 stdcall SheChangeDirW(wstr) +342 stdcall SheConvertPathW(wstr wstr long) +343 stdcall SheFullPathA(str long str) +344 stdcall SheFullPathW(wstr long wstr) +345 stdcall SheGetCurDrive() +346 stdcall SheGetDirA(long long) +347 stdcall SheGetDirExW(wstr ptr wstr) +348 stdcall SheGetDirW(long long) +349 stdcall SheGetPathOffsetW(wstr) +350 stdcall SheRemoveQuotesA(str) +351 stdcall SheRemoveQuotesW(wstr) +352 stdcall SheSetCurDrive(long) +353 stdcall SheShortenPathA(str long) +354 stdcall SheShortenPathW(wstr long) +355 stdcall ShellAboutA(long str str long) +356 stdcall ShellAboutW(long wstr wstr long) +357 stdcall ShellExec_RunDLL(ptr ptr wstr long) +358 stdcall ShellExec_RunDLLA(ptr ptr str long) +359 stdcall ShellExec_RunDLLW(ptr ptr wstr long) +360 stdcall ShellExecuteA(long str str str str long) +361 stdcall ShellExecuteEx(long) ShellExecuteExA +362 stdcall ShellExecuteExA (long) +363 stdcall ShellExecuteExW (long) +364 stdcall ShellExecuteW(long wstr wstr wstr wstr long) +365 stdcall ShellHookProc(long ptr ptr) +366 stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA +367 stdcall Shell_NotifyIconA(long ptr) +368 stdcall Shell_NotifyIconW(long ptr) +369 stdcall StrChrA(str long) shlwapi.StrChrA +370 stdcall StrChrIA(str long) shlwapi.StrChrIA +371 stdcall StrChrIW(wstr long) shlwapi.StrChrIW +372 stdcall StrChrW(wstr long) shlwapi.StrChrW +373 stdcall StrCmpNA(str str long) shlwapi.StrCmpNA +374 stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA +375 stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW +376 stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW +377 stdcall StrCpyNA (ptr str long) kernel32.lstrcpynA +378 stdcall StrCpyNW(wstr wstr long) shlwapi.StrCpyNW +379 stdcall StrNCmpA(str str long) shlwapi.StrCmpNA +380 stdcall StrNCmpIA(str str long) shlwapi.StrCmpNIA +381 stdcall StrNCmpIW(wstr wstr long) shlwapi.StrCmpNIW +382 stdcall StrNCmpW(wstr wstr long) shlwapi.StrCmpNW +383 stdcall StrNCpyA (ptr str long) kernel32.lstrcpynA +384 stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW +385 stdcall StrRChrA(str str long) shlwapi.StrRChrA +386 stdcall StrRChrIA(str str long) shlwapi.StrRChrIA +387 stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW +388 stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW +389 stdcall StrRStrA(str str str) +390 stdcall StrRStrIA(str str str) shlwapi.StrRStrIA +391 stdcall StrRStrIW(wstr wstr wstr) shlwapi.StrRStrIW +392 stdcall StrRStrW(wstr wstr wstr) +393 stdcall StrStrA(str str) shlwapi.StrStrA +394 stdcall StrStrIA(str str) shlwapi.StrStrIA +395 stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW +396 stdcall StrStrW(wstr wstr) shlwapi.StrStrW +397 stdcall WOWShellExecute(ptr str str str str long ptr) +520 stdcall SHAllocShared(ptr long long) # FIXME: Inspect +521 stdcall SHLockShared(long long) # FIXME: Inspect +522 stdcall SHUnlockShared(ptr) # FIXME: Inspect +523 stdcall SHFreeShared(long long) # FIXME: Inspect 524 stdcall RealDriveType(long long) 525 stdcall -noname RealDriveTypeFlags(long long) 526 stdcall SHFlushSFCache() @@ -218,7 +405,7 @@ 643 stdcall -noname SHChangeNotifyReceive(long long ptr ptr) 644 stdcall SHChangeNotification_Lock(long long ptr ptr) 645 stdcall SHChangeNotification_Unlock(long) -646 stdcall -noname SHChangeRegistrationReceive(ptr long) +646 stdcall -noname SHChangeRegistrationReceive(ptr long) # FIXME: Inspect 648 stdcall -noname SHWaitOp_Operate(ptr long) 650 stdcall -noname PathIsSameRoot(ptr ptr) PathIsSameRootAW # Fixme 651 stdcall -noname OldReadCabinetState(long long) ReadCabinetState @@ -244,7 +431,7 @@ 708 stdcall -noname SHGetSetFolderCustomSettingsA(ptr str long) 709 stdcall SHGetSetFolderCustomSettingsW(ptr wstr long) 711 stdcall -noname CheckWinIniForAssocs() -712 stdcall -noname SHCopyMonikerToTemp(ptr wstr wstr long) +712 stdcall -noname SHCopyMonikerToTemp(ptr wstr wstr long) # FIXME: Inspect 713 stdcall -noname PathIsTemporaryA(str) 714 stdcall -noname PathIsTemporaryW(wstr) 715 stdcall -noname SHCreatePropertyBag(ptr ptr) @@ -276,232 +463,3 @@ 754 stub -noname SHLimitInputEditWithFlags 755 stdcall -noname PathIsEqualOrSubFolder(wstr wstr) 756 stub -noname DeleteFileThumbnail - -@ stdcall Activate_RunDLL(long ptr ptr ptr) -@ stdcall AppCompat_RunDLLW(ptr ptr wstr long) -@ stdcall CheckEscapesA(str long) -@ stdcall CheckEscapesW(wstr long) -@ stdcall CommandLineToArgvW(wstr ptr) -@ stdcall Control_FillCache_RunDLL(long long long long) Control_FillCache_RunDLLA -@ stdcall Control_FillCache_RunDLLA(long long long long) -@ stdcall Control_FillCache_RunDLLW(long long long long) -@ stdcall Control_RunDLL(ptr ptr str long) Control_RunDLLA -@ stdcall Control_RunDLLA(ptr ptr str long) -@ stdcall Control_RunDLLAsUserW(ptr ptr wstr long) -@ stdcall Control_RunDLLW(ptr ptr wstr long) -@ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stdcall -private DllGetVersion(ptr) -@ stdcall -private DllInstall(long wstr) -@ stdcall -private DllRegisterServer() -@ stdcall -private DllUnregisterServer() -@ stdcall DoEnvironmentSubstA(str str) -@ stdcall DoEnvironmentSubstW(wstr wstr) -@ stdcall DragAcceptFiles(long long) -@ stdcall DragFinish(long) -@ stdcall DragQueryFile(long long ptr long) DragQueryFileA -@ stdcall DragQueryFileA(long long ptr long) -@ stdcall DragQueryFileAorW(ptr long wstr long long long) -@ stdcall DragQueryFileW(long long ptr long) -@ stdcall DragQueryPoint(long ptr) -@ stdcall DuplicateIcon(long long) -@ stdcall ExtractAssociatedIconA(long str ptr) -@ stdcall ExtractAssociatedIconExA(long str long long) -@ stdcall ExtractAssociatedIconExW(long wstr long long) -@ stdcall ExtractAssociatedIconW(long wstr ptr) -@ stdcall ExtractIconA(long str long) -@ stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExA -@ stdcall ExtractIconExA(str long ptr ptr long) -@ stdcall ExtractIconExW(wstr long ptr ptr long) -@ stdcall ExtractIconResInfoA(ptr str long ptr ptr) -@ stdcall ExtractIconResInfoW(ptr wstr long ptr ptr) -@ stdcall ExtractIconW(long wstr long) -@ stdcall ExtractVersionResource16W(wstr ptr) -@ stdcall FindExecutableA(str str ptr) -@ stdcall FindExecutableW(wstr wstr ptr) -@ stdcall FindExeDlgProc(ptr long ptr ptr) -@ stdcall FreeIconList(long) -@ stdcall InternalExtractIconListA(ptr str ptr) -@ stdcall InternalExtractIconListW(ptr wstr ptr) -@ stdcall OpenAs_RunDLL(long long str long) OpenAs_RunDLLA -@ stdcall OpenAs_RunDLLA(long long str long) -@ stdcall OpenAs_RunDLLW(long long wstr long) -@ stdcall Options_RunDLL(ptr ptr str long) -@ stdcall Options_RunDLLA(ptr ptr str long) -@ stdcall Options_RunDLLW(ptr ptr wstr long) -@ stdcall PrintersGetCommand_RunDLL(ptr ptr wstr long) -@ stdcall PrintersGetCommand_RunDLLA(ptr ptr str long) -@ stdcall PrintersGetCommand_RunDLLW(ptr ptr wstr long) -@ stdcall RealShellExecuteA(ptr str str str str str str str long ptr) -@ stdcall RealShellExecuteExA(ptr str str str str str str str long ptr long) -@ stdcall RealShellExecuteExW(ptr str str str str str str str long ptr long) -@ stdcall RealShellExecuteW(ptr wstr wstr wstr wstr wstr wstr wstr long ptr) -@ stdcall RegenerateUserEnvironment(ptr long) -@ stdcall SHAddToRecentDocs(long ptr) -@ stdcall SHAppBarMessage(long ptr) -@ stdcall SHBindToParent(ptr ptr ptr ptr) -@ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA -@ stdcall SHBrowseForFolderA(ptr) -@ stdcall SHBrowseForFolderW(ptr) -@ stdcall SHChangeNotify(long long ptr ptr) -@ stdcall SHChangeNotifySuspendResume(long ptr long long) -@ stdcall SHCreateDirectoryExA(long str ptr) -@ stdcall SHCreateDirectoryExW(long wstr ptr) -@ stub SHCreateLocalServerRunDll -@ stdcall SHCreateProcessAsUserW(ptr) -@ stdcall SHCreateQueryCancelAutoPlayMoniker(ptr) -@ stdcall SHCreateShellItem(ptr ptr ptr ptr) -@ stdcall SHEmptyRecycleBinA(long str long) -@ stdcall SHEmptyRecycleBinW(long wstr long) -@ stub SHEnableServiceObject -@ stub SHEnumerateUnreadMailAccountsW -@ stdcall SHExtractIconsW(wstr long long long ptr ptr long long) user32.PrivateExtractIconsW -@ stdcall SHFileOperation(ptr) SHFileOperationA -@ stdcall SHFileOperationA(ptr) -@ stdcall SHFileOperationW(ptr) -@ stdcall SHFormatDrive(long long long long) -@ stdcall SHFreeNameMappings(ptr) -@ stdcall SHGetDataFromIDListA(ptr ptr long ptr long) -@ stdcall SHGetDataFromIDListW(ptr ptr long ptr long) -@ stdcall SHGetDesktopFolder(ptr) -@ stdcall SHGetDiskFreeSpaceA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA -@ stdcall SHGetDiskFreeSpaceExA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA -@ stdcall SHGetDiskFreeSpaceExW(wstr ptr ptr ptr) kernel32.GetDiskFreeSpaceExW -@ stdcall SHGetFileInfo(ptr long ptr long long) SHGetFileInfoA -@ stdcall SHGetFileInfoA(ptr long ptr long long) -@ stdcall SHGetFileInfoW(ptr long ptr long long) -@ stdcall SHGetFolderLocation(long long long long ptr) -@ stdcall SHGetFolderPathA(long long long long ptr) -@ stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) -@ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) -@ stdcall SHGetFolderPathW(long long long long ptr) -@ stdcall SHGetIconOverlayIndexA(str long) -@ stdcall SHGetIconOverlayIndexW(wstr long) -@ stdcall SHGetInstanceExplorer(long) -@ stdcall SHGetMalloc(ptr) -@ stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA -@ stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA -@ stdcall SHGetPathFromIDListA(ptr ptr) -@ stdcall SHGetPathFromIDListW(ptr ptr) -@ stdcall SHGetSettings(ptr long) -@ stdcall SHGetSpecialFolderLocation(long long ptr) -@ stdcall SHGetSpecialFolderPathA(long ptr long long) -@ stdcall SHGetSpecialFolderPathW(long ptr long long) -@ stdcall SHGetUnreadMailCountW (long wstr long ptr wstr long) -@ stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLLA -@ stdcall SHHelpShortcuts_RunDLLA(long long long long) -@ stdcall SHHelpShortcuts_RunDLLW(long long long long) -@ stdcall SHInvokePrinterCommandA(ptr long str str long) -@ stdcall SHInvokePrinterCommandW(ptr long wstr wstr long) -@ stdcall SHIsFileAvailableOffline(wstr ptr) -@ stdcall SHLoadInProc(long) -@ stdcall SHLoadNonloadedIconOverlayIdentifiers() -@ stdcall SHOpenFolderAndSelectItems(ptr long ptr long) -@ stdcall SHParseDisplayName(wstr ptr ptr long ptr) -@ stdcall SHPathPrepareForWriteA(long ptr str long) -@ stdcall SHPathPrepareForWriteW(long ptr wstr long) -@ stdcall SHQueryRecycleBinA(str ptr) -@ stdcall SHQueryRecycleBinW(wstr ptr) -@ stdcall SHSetLocalizedName(wstr wstr long) -@ stdcall SHSetUnreadMailCountW (wstr long wstr) -@ stdcall SHUpdateRecycleBinIcon() -@ stdcall SheChangeDirA(str) -@ stdcall SheChangeDirExA(str) -@ stdcall SheChangeDirExW(wstr) -@ stdcall SheChangeDirW(wstr) -@ stdcall SheConvertPathW(wstr wstr long) -@ stdcall SheFullPathA(str long str) -@ stdcall SheFullPathW(wstr long wstr) -@ stdcall SheGetCurDrive() -@ stdcall SheGetDirA(long long) -@ stdcall SheGetDirExW(wstr ptr wstr) -@ stdcall SheGetDirW(long long) -@ stdcall SheGetPathOffsetW(wstr) -@ stdcall SheRemoveQuotesA(str) -@ stdcall SheRemoveQuotesW(wstr) -@ stdcall SheSetCurDrive(long) -@ stdcall SheShortenPathA(str long) -@ stdcall SheShortenPathW(wstr long) -@ stdcall ShellAboutA(long str str long) -@ stdcall ShellAboutW(long wstr wstr long) -@ stdcall ShellExec_RunDLL(ptr ptr wstr long) -@ stdcall ShellExec_RunDLLA(ptr ptr str long) -@ stdcall ShellExec_RunDLLW(ptr ptr wstr long) -@ stdcall ShellExecuteA(long str str str str long) -@ stdcall ShellExecuteEx(long) ShellExecuteExA -@ stdcall ShellExecuteExA (long) -@ stdcall ShellExecuteExW (long) -@ stdcall ShellExecuteW(long wstr wstr wstr wstr long) -@ stdcall ShellHookProc(long ptr ptr) -@ stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA -@ stdcall Shell_NotifyIconA(long ptr) -@ stdcall Shell_NotifyIconW(long ptr) -@ stdcall StrChrA(str long) shlwapi.StrChrA -@ stdcall StrChrIA(str long) shlwapi.StrChrIA -@ stdcall StrChrIW(wstr long) shlwapi.StrChrIW -@ stdcall StrChrW(wstr long) shlwapi.StrChrW -@ stdcall StrCmpNA(str str long) shlwapi.StrCmpNA -@ stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA -@ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW -@ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW -@ stdcall StrCpyNA (ptr str long) kernel32.lstrcpynA -@ stdcall StrCpyNW(wstr wstr long) shlwapi.StrCpyNW -@ stdcall StrNCmpA(str str long) shlwapi.StrCmpNA -@ stdcall StrNCmpIA(str str long) shlwapi.StrCmpNIA -@ stdcall StrNCmpIW(wstr wstr long) shlwapi.StrCmpNIW -@ stdcall StrNCmpW(wstr wstr long) shlwapi.StrCmpNW -@ stdcall StrNCpyA (ptr str long) kernel32.lstrcpynA -@ stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW -@ stdcall StrRChrA(str str long) shlwapi.StrRChrA -@ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA -@ stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW -@ stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW -@ stdcall StrRStrA(str str str) -@ stdcall StrRStrIA(str str str) shlwapi.StrRStrIA -@ stdcall StrRStrIW(wstr wstr wstr) shlwapi.StrRStrIW -@ stdcall StrRStrW(wstr wstr wstr) -@ stdcall StrStrA(str str) shlwapi.StrStrA -@ stdcall StrStrIA(str str) shlwapi.StrStrIA -@ stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW -@ stdcall StrStrW(wstr wstr) shlwapi.StrStrW -@ stdcall WOWShellExecute(ptr str str str str long ptr) - -# Functions exported by the WinVista shell32.dll -@ stdcall SHCreateDefaultContextMenu(ptr ptr ptr) -@ stdcall SHCreateDefaultExtractIcon(ptr ptr) - -# Discontinued in version 6.0. Until retired in WinVista and higher -@ stdcall FileMenu_DeleteAllItems(long) -@ stdcall FileMenu_DrawItem(long ptr) -@ stdcall FileMenu_FindSubMenuByPidl(long ptr) -@ stdcall FileMenu_GetLastSelectedItemPidls(long ptr ptr) -@ stdcall FileMenu_HandleMenuChar(long long) -@ stdcall FileMenu_InitMenuPopup(long) -@ stdcall FileMenu_InsertUsingPidl (long long ptr long long ptr) -@ stdcall FileMenu_Invalidate(long) -@ stdcall FileMenu_MeasureItem(long ptr) -@ stdcall FileMenu_ReplaceUsingPidl(long long ptr long ptr) -@ stdcall FileMenu_Create(long long long long long) -@ stdcall FileMenu_AppendItem(long ptr long long long long) FileMenu_AppendItemAW -@ stdcall FileMenu_TrackPopupMenuEx(long long long long long long) -@ stdcall FileMenu_DeleteItemByCmd(long long) -@ stdcall FileMenu_Destroy(long) -@ stdcall FileMenu_AbortInitMenu() -@ stdcall FileMenu_AppendFilesForPidl(long ptr long) -@ stdcall FileMenu_AddFilesForPidl(long long long ptr long long ptr) -@ stdcall FileMenu_DeleteItemByIndex(long long) -@ stdcall FileMenu_DeleteItemByFirstID(long long) -@ stdcall FileMenu_DeleteSeparator(long) -@ stdcall FileMenu_EnableItemByCmd(long long long) -@ stdcall FileMenu_GetItemExtent(long long) - -# 4.0 (NT) and higher. Until discontinued in 5.0 -# FIXME: ordinals 505-512? -@ stdcall SHRegCloseKey(long) -@ stdcall SHRegOpenKeyA(long str long) -@ stdcall SHRegOpenKeyW(long wstr long) -@ stdcall SHRegQueryValueA(long str ptr ptr) -@ stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr) -@ stdcall SHRegQueryValueW (long long long long) -@ stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr) -@ stdcall SHRegDeleteKeyW(long wstr)

9 years, 10 months

[akhaldi] 65306: [SHELL32] * Another partial sync of pidl.c with Wine 1.7.27. * Move some functions where they are used, and remove some unused ones. * Mark some of our changes with history revisio...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 7 11:30:38 2014 New Revision: 65306 URL: http://svn.reactos.org/svn/reactos?rev=65306&view=rev Log: [SHELL32] * Another partial sync of pidl.c with Wine 1.7.27. * Move some functions where they are used, and remove some unused ones. * Mark some of our changes with history revisions. CORE-8540 Modified: branches/shell-experiments/dll/win32/shell32/folders/CDrivesFolder.cpp branches/shell-experiments/dll/win32/shell32/folders/CFontsFolder.cpp branches/shell-experiments/dll/win32/shell32/folders/CNetFolder.cpp branches/shell-experiments/dll/win32/shell32/wine/pidl.c branches/shell-experiments/dll/win32/shell32/wine/pidl.h Modified: branches/shell-experiments/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Fri Nov 7 11:30:38 2014 @@ -328,6 +328,17 @@ } TRACE ("-- (%p)->(interface=%p)\n", this, ppvOut); return hr; +} + +static BOOL _ILIsControlPanel(LPCITEMIDLIST pidl) +{ + IID *iid = _ILGetGUIDPointer(pidl); + + TRACE("(%p)\n", pidl); + + if (iid) + return IsEqualIID(iid, CLSID_ControlPanel); + return FALSE; } /************************************************************************** Modified: branches/shell-experiments/dll/win32/shell32/folders/CFontsFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/CFontsFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/CFontsFolder.cpp [iso-8859-1] Fri Nov 7 11:30:38 2014 @@ -49,6 +49,11 @@ SHFree(pidlRoot); } +static LPITEMIDLIST _ILCreateFont(void) +{ + return _ILCreateGuid(PT_GUID, CLSID_FontsFolderShortcut); +} + HRESULT WINAPI CFontsFolder::FinalConstruct() { HRESULT hr; @@ -72,7 +77,6 @@ return hr; } - HRESULT WINAPI CFontsFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, ULONG *pchEaten, PIDLIST_RELATIVE *ppidl, ULONG *pdwAttributes) Modified: branches/shell-experiments/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Fri Nov 7 11:30:38 2014 @@ -56,7 +56,7 @@ HRESULT WINAPI CNetFolder::FinalConstruct() { - pidlRoot = _ILCreateNetHood(); /* my qualified pidl */ + pidlRoot = _ILCreateGuid(PT_GUID, CLSID_NetworkPlaces); /* my qualified pidl */ if (pidlRoot == NULL) return E_OUTOFMEMORY; return S_OK; Modified: branches/shell-experiments/dll/win32/shell32/wine/pidl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/wine/pidl.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/wine/pidl.c [iso-8859-1] Fri Nov 7 11:30:38 2014 @@ -107,47 +107,44 @@ return FALSE; } - if (type <= 2) - { - switch (type) + switch (type) + { + case ILGDN_FORPARSING: + flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; + break; + case ILGDN_NORMAL: + flag = SHGDN_NORMAL; + break; + case ILGDN_INFOLDER: + flag = SHGDN_INFOLDER; + break; + default: + FIXME("Unknown type parameter = %x\n", type); + flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; + break; + } + + if (!*(const WORD*)pidl || type == ILGDN_FORPARSING) + { + ret = IShellFolder_GetDisplayNameOf(lsf, pidl, flag, &strret); + if (SUCCEEDED(ret)) { - case ILGDN_FORPARSING: - flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; - break; - case ILGDN_NORMAL: - flag = SHGDN_NORMAL; - break; - case ILGDN_INFOLDER: - flag = SHGDN_INFOLDER; - break; - default: - FIXME("Unknown type parameter = %x\n", type); - flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; - break; + if(!StrRetToStrNW(path, MAX_PATH, &strret, pidl)) + ret = E_FAIL; } - - if (!*(const WORD*)pidl || type == ILGDN_FORPARSING) + } + else + { + ret = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&psfParent, &pidllast); + if (SUCCEEDED(ret)) { - ret = IShellFolder_GetDisplayNameOf(lsf, pidl, flag, &strret); + ret = IShellFolder_GetDisplayNameOf(psfParent, pidllast, flag, &strret); if (SUCCEEDED(ret)) { - if(!StrRetToStrNW(path, MAX_PATH, &strret, pidl)) + if(!StrRetToStrNW(path, MAX_PATH, &strret, pidllast)) ret = E_FAIL; } - } - else - { - ret = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&psfParent, &pidllast); - if (SUCCEEDED(ret)) - { - ret = IShellFolder_GetDisplayNameOf(psfParent, pidllast, flag, &strret); - if (SUCCEEDED(ret)) - { - if(!StrRetToStrNW(path, MAX_PATH, &strret, pidllast)) - ret = E_FAIL; - } - IShellFolder_Release(psfParent); - } + IShellFolder_Release(psfParent); } } @@ -1849,17 +1846,6 @@ return FALSE; } -BOOL _ILIsControlPanel(LPCITEMIDLIST pidl) -{ - IID *iid = _ILGetGUIDPointer(pidl); - - TRACE("(%p)\n", pidl); - - if (iid) - return IsEqualIID(iid, &CLSID_ControlPanel); - return FALSE; -} - BOOL _ILIsNetHood(LPCITEMIDLIST pidl) { IID *iid = _ILGetGUIDPointer(pidl); @@ -1871,17 +1857,6 @@ return FALSE; } - -LPITEMIDLIST _ILCreateNetHood(void) -{ - return _ILCreateGuid(PT_GUID, &CLSID_NetworkPlaces); -} - -LPITEMIDLIST _ILCreateFont(void) -{ - return _ILCreateGuid(PT_GUID, &CLSID_FontsFolderShortcut); -} - BOOL _ILIsMyComputer(LPCITEMIDLIST pidl) { REFIID iid = _ILGetGUIDPointer(pidl); @@ -1893,17 +1868,6 @@ return FALSE; } -BOOL _ILIsPrinter(LPCITEMIDLIST pidl) -{ - IID *iid = _ILGetGUIDPointer(pidl); - - TRACE("(%p)\n", pidl); - - if (iid) - return IsEqualIID(iid, &CLSID_Printers); - return FALSE; -} - BOOL _ILIsBitBucket(LPCITEMIDLIST pidl) { IID *iid = _ILGetGUIDPointer(pidl); @@ -1913,18 +1877,6 @@ if (iid) return IsEqualIID(iid, &CLSID_RecycleBin); return FALSE; -} - -BOOL _ILIsAdminTools(LPCITEMIDLIST pidl) -{ - IID *iid = _ILGetGUIDPointer(pidl); - - TRACE("(%p)\n", pidl); - - if (iid) - return IsEqualIID(iid, &CLSID_AdminFolderShortcut); - else - return FALSE; } BOOL _ILIsSpecialFolder (LPCITEMIDLIST pidl) @@ -2258,8 +2210,10 @@ case PT_SHARE: return pdata->u.network.szNames; +#ifdef __REACTOS__ /* r54423 */ case PT_CPLAPPLET: return pdata->u.cpanel.szName; +#endif } return NULL; } @@ -2506,7 +2460,9 @@ */ void _ILGetFileType(LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize) { +#ifdef __REACTOS__ /* r32966 */ char sType[64]; +#endif if(_ILIsValue(pidl)) { @@ -2514,6 +2470,7 @@ if(uOutSize > 0) pOut[0] = 0; +#ifdef __REACTOS__ /* r32966 */ if (_ILGetExtension (pidl, sType, 64)) { if (HCR_MapTypeToValueA(sType, sTemp, 64, TRUE)) @@ -2534,14 +2491,29 @@ strcat(pOut, sTemp); } } +#else + if (_ILGetExtension (pidl, sTemp, 64)) + { + if (!( HCR_MapTypeToValueA(sTemp, sTemp, 64, TRUE) + && HCR_MapTypeToValueA(sTemp, pOut, uOutSize, FALSE ))) + { + lstrcpynA (pOut, sTemp, uOutSize - 6); + strcat (pOut, "-file"); + } + } +#endif } else +#ifdef __REACTOS__ /* r32966 */ { pOut[0] = '\0'; LoadStringA(shell32_hInstance, IDS_DIRECTORY, pOut, uOutSize); /* make sure its null terminated */ pOut[uOutSize-1] = '\0'; } +#else + lstrcpynA(pOut, "Folder", uOutSize); +#endif } /************************************************************************* Modified: branches/shell-experiments/dll/win32/shell32/wine/pidl.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/wine/pidl.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/wine/pidl.h [iso-8859-1] Fri Nov 7 11:30:38 2014 @@ -236,11 +236,8 @@ BOOL _ILIsDesktop (LPCITEMIDLIST pidl) DECLSPEC_HIDDEN; BOOL _ILIsMyComputer (LPCITEMIDLIST pidl) DECLSPEC_HIDDEN; #ifdef __REACTOS__ -BOOL _ILIsPrinter (LPCITEMIDLIST pidl); BOOL _ILIsMyDocuments (LPCITEMIDLIST pidl); -BOOL _ILIsControlPanel (LPCITEMIDLIST pidl); BOOL _ILIsBitBucket (LPCITEMIDLIST pidl); -BOOL _ILIsAdminTools (LPCITEMIDLIST pidl); BOOL _ILIsNetHood (LPCITEMIDLIST pidl); #endif BOOL _ILIsDrive (LPCITEMIDLIST pidl) DECLSPEC_HIDDEN; @@ -286,7 +283,6 @@ LPITEMIDLIST _ILCreateNetHood (void) DECLSPEC_HIDDEN; #ifdef __REACTOS__ LPITEMIDLIST _ILCreateAdminTools (void); -LPITEMIDLIST _ILCreateFont (void); #endif LPITEMIDLIST _ILCreateBitBucket (void) DECLSPEC_HIDDEN; LPITEMIDLIST _ILCreateDrive (LPCWSTR) DECLSPEC_HIDDEN;

9 years, 10 months

← Newer
1
...
20
21
22
23
24
25
26
...
38
Older →

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 November 2014