Ros-diffs April 2016

ros-diffs@reactos.org

13 participants
133 discussions

[tfaber] 71140: [MOUNTMGR] - Avoid an unnecessarily large stack buffer in MountMgrMountedDeviceArrival - Add missing OBJ_KERNEL_HANDLE. CORE-10207

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 10 17:51:47 2016 New Revision: 71140 URL: http://svn.reactos.org/svn/reactos?rev=71140&view=rev Log: [MOUNTMGR] - Avoid an unnecessarily large stack buffer in MountMgrMountedDeviceArrival - Add missing OBJ_KERNEL_HANDLE. CORE-10207 Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Sun Apr 10 17:51:47 2016 @@ -958,7 +958,7 @@ PMOUNTDEV_UNIQUE_ID UniqueId, NewUniqueId; PSAVED_LINK_INFORMATION SavedLinkInformation; PDEVICE_INFORMATION DeviceInformation, CurrentDevice; - WCHAR CSymLinkBuffer[MAX_PATH], LinkTargetBuffer[MAX_PATH]; + WCHAR CSymLinkBuffer[RTL_NUMBER_OF(Cunc)], LinkTargetBuffer[MAX_PATH]; UNICODE_STRING TargetDeviceName, SuggestedLinkName, DeviceName, VolumeName, DriveLetter, LinkTarget, CSymLink; BOOLEAN HasGuid, HasGptDriveLetter, Valid, UseOnlyIfThereAreNoOtherLinks, IsDrvLetter, IsOff, IsVolumeName, LinkError; @@ -1119,7 +1119,7 @@ InitializeObjectAttributes(&ObjectAttributes, &CSymLink, - OBJ_CASE_INSENSITIVE, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL);

8 years, 9 months

[mjansen] 71139: [ATL] - Implement Typelib registration in CComModule::RegisterServer, based on dll/win32/atl/atl.c and dll/win32/atl80/atl80.c - Add oleaut32 to devmgr and stobject import librarie...

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Apr 10 16:53:00 2016 New Revision: 71139 URL: http://svn.reactos.org/svn/reactos?rev=71139&view=rev Log: [ATL] - Implement Typelib registration in CComModule::RegisterServer, based on dll/win32/atl/atl.c and dll/win32/atl80/atl80.c - Add oleaut32 to devmgr and stobject import libraries CORE-11104 #resolve Modified: trunk/reactos/dll/shellext/stobject/CMakeLists.txt trunk/reactos/dll/win32/devmgr/CMakeLists.txt trunk/reactos/lib/atl/atlbase.h Modified: trunk/reactos/dll/shellext/stobject/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/CMak… ============================================================================== --- trunk/reactos/dll/shellext/stobject/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/CMakeLists.txt [iso-8859-1] Sun Apr 10 16:53:00 2016 @@ -31,6 +31,7 @@ advapi32 winmm ole32 + oleaut32 shlwapi shell32 comctl32 Modified: trunk/reactos/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] Sun Apr 10 16:53:00 2016 @@ -36,6 +36,6 @@ set_module_type(devmgr win32dll UNICODE) target_link_libraries(devmgr uuid atlnew wine) -add_importlibs(devmgr setupapi advapi32 newdev user32 gdi32 comctl32 version msvcrt kernel32 ole32 uxtheme ntdll) +add_importlibs(devmgr setupapi advapi32 newdev user32 gdi32 comctl32 version msvcrt kernel32 ole32 oleaut32 uxtheme ntdll) add_pch(devmgr precomp.h SOURCE) add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=7113… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Sun Apr 10 16:53:00 2016 @@ -24,6 +24,7 @@ #include "statreg.h" #include "atlcomcli.h" #include "atlalloc.h" +#include "comcat.h" #ifdef _MSC_VER // It is common to use this in ATL constructors. They only store this for later use, so the usage is safe. @@ -63,6 +64,18 @@ __declspec(selectany) CAtlModule *_pAtlModule = NULL; __declspec(selectany) CComModule *_pModule = NULL; extern CAtlComModule _AtlComModule; + + +struct _ATL_CATMAP_ENTRY +{ + int iType; + const GUID* pcatid; +}; + +#define _ATL_CATMAP_ENTRY_END 0 +#define _ATL_CATMAP_ENTRY_IMPLEMENTED 1 +#define _ATL_CATMAP_ENTRY_REQUIRED 2 + typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void *pv, REFIID riid, LPVOID *ppv); typedef LPCTSTR (WINAPI _ATL_DESCRIPTIONFUNC)(); @@ -178,6 +191,10 @@ void __stdcall AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pWinModule, _AtlCreateWndData *pData, void *pObject); void *__stdcall AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE *pWinModule); HRESULT __stdcall AtlComModuleGetClassObject(_ATL_COM_MODULE *pComModule, REFCLSID rclsid, REFIID riid, LPVOID *ppv); + +HRESULT __stdcall AtlComModuleRegisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid); +HRESULT __stdcall AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid); + template<class TLock> class CComCritSecLock @@ -516,6 +533,10 @@ { public: + HRESULT RegisterServer(BOOL bRegTypeLib = FALSE, const CLSID *pCLSID = NULL); + HRESULT UnregisterServer(BOOL bUnRegTypeLib, const CLSID *pCLSID = NULL); + + virtual HRESULT AddCommonRGSReplacements(IRegistrarBase *pRegistrar) { return pRegistrar->AddReplacement(L"APPID", T::GetAppId()); @@ -549,6 +570,17 @@ Term(); } + HRESULT RegisterServer(BOOL bRegTypeLib = FALSE, const CLSID *pCLSID = NULL) + { + return AtlComModuleRegisterServer(this, bRegTypeLib, pCLSID); + } + + HRESULT UnregisterServer(BOOL bUnRegTypeLib, const CLSID *pCLSID = NULL) + { + return AtlComModuleUnregisterServer(this, bUnRegTypeLib, pCLSID); + } + + void Term() { if (cbSize != 0) @@ -560,6 +592,18 @@ } } }; + +template <class T> +HRESULT CAtlModuleT<T>::RegisterServer(BOOL bRegTypeLib, const CLSID *pCLSID) +{ + return _AtlComModule.RegisterServer(bRegTypeLib, pCLSID); +} + +template <class T> +HRESULT CAtlModuleT<T>::UnregisterServer(BOOL bUnRegTypeLib, const CLSID *pCLSID) +{ + return _AtlComModule.UnregisterServer(bUnRegTypeLib, pCLSID); +} template <class T> class CAtlDllModuleT : public CAtlModuleT<T> @@ -730,6 +774,8 @@ objectMapEntry++; } } + if (SUCCEEDED(hResult)) + hResult = CAtlModuleT<CComModule>::RegisterServer(bRegTypeLib, pCLSID); return hResult; } @@ -753,6 +799,9 @@ objectMapEntry++; } } + if (SUCCEEDED(hResult)) + hResult = CAtlModuleT<CComModule>::UnregisterServer(bUnRegTypeLib, pCLSID); + return hResult; } @@ -992,6 +1041,202 @@ return result; } +// Adapted from dll/win32/atl/atl.c +inline HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, + BSTR *pbstrPath, ITypeLib **ppTypeLib) +{ + size_t index_len = lpszIndex ? wcslen(lpszIndex) : 0; + CComHeapPtr<WCHAR> path; + path.Allocate(MAX_PATH + index_len + wcslen(L".tlb")); + + if (!path) + return E_OUTOFMEMORY; + + size_t path_len = GetModuleFileNameW(inst, path, MAX_PATH); + if (!path_len) + return HRESULT_FROM_WIN32(GetLastError()); + + if (index_len) + wcscat(path, lpszIndex); + + CComPtr<ITypeLib> typelib; + HRESULT hResult = LoadTypeLib(path, &typelib); + if (FAILED(hResult)) + { + WCHAR *ptr; + for (ptr = path+path_len-1; ptr > path && *ptr != '\\' && *ptr != '.'; ptr--) + ; + if (*ptr != '.') + ptr = (WCHAR*)path + path_len; + wcscpy(ptr, L".tlb"); + + hResult = LoadTypeLib(path, &typelib); + } + + if (SUCCEEDED(hResult)) + { + *pbstrPath = SysAllocString(path); + if (!*pbstrPath) + { + typelib.Release(); + hResult = E_OUTOFMEMORY; + } + } + + if (FAILED(hResult)) + return hResult; + + *ppTypeLib = typelib.Detach(); + return S_OK; +} + +// Adapted from dll/win32/atl/atl.c +inline HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE inst, const WCHAR *index) +{ + CComBSTR path; + CComPtr<ITypeLib> typelib; + HRESULT hResult = AtlLoadTypeLib(inst, index, &path, &typelib); + if (FAILED(hResult)) + return hResult; + + return RegisterTypeLib(typelib, path, NULL); /* FIXME: pass help directory */ +} + +// Adapted from dll/win32/atl/atl.c +inline HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID clsid, const _ATL_CATMAP_ENTRY *catmap, BOOL reg) +{ + if (!catmap) + return S_OK; + + CComPtr<ICatRegister> catreg; + + HRESULT hResult = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_ICatRegister, (void**)&catreg); + if (FAILED(hResult)) + return hResult; + + for (const _ATL_CATMAP_ENTRY *iter = catmap; iter->iType != _ATL_CATMAP_ENTRY_END; iter++) + { + CATID catid = *iter->pcatid; + + if (iter->iType == _ATL_CATMAP_ENTRY_IMPLEMENTED) + { + if (reg) + hResult = catreg->RegisterClassImplCategories(clsid, 1, &catid); + else + hResult = catreg->UnRegisterClassImplCategories(clsid, 1, &catid); + } + else + { + if (reg) + hResult = catreg->RegisterClassReqCategories(clsid, 1, &catid); + else + hResult = catreg->UnRegisterClassReqCategories(clsid, 1, &catid); + } + if (FAILED(hResult)) + return hResult; + } + + if (!reg) + { + WCHAR reg_path[256] = L"CLSID\\"; + + StringFromGUID2(clsid, reg_path + wcslen(reg_path), 64); + wcscat(reg_path, L"\\"); + WCHAR* ptr = reg_path + wcslen(reg_path); + + wcscpy(ptr, L"Implemented Categories"); + RegDeleteKeyW(HKEY_CLASSES_ROOT, reg_path); + + wcscpy(ptr, L"Required Categories"); + RegDeleteKeyW(HKEY_CLASSES_ROOT, reg_path); + } + + return hResult; +} + + +// Adapted from dll/win32/atl80/atl80.c +inline HRESULT __stdcall AtlComModuleRegisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid) +{ + HRESULT hResult = S_OK; + + for (_ATL_OBJMAP_ENTRY ** iter = mod->m_ppAutoObjMapFirst; iter < mod->m_ppAutoObjMapLast; iter++) + { + if (!*iter) + continue; + _ATL_OBJMAP_ENTRY* entry = *iter; + if (clsid && !IsEqualCLSID(*entry->pclsid, *clsid)) + continue; + + hResult = entry->pfnUpdateRegistry(TRUE); + if (FAILED(hResult)) + return hResult; + + const _ATL_CATMAP_ENTRY *catmap = entry->pfnGetCategoryMap(); + if (catmap) + { + hResult = AtlRegisterClassCategoriesHelper(*entry->pclsid, catmap, TRUE); + if (FAILED(hResult)) + return hResult; + } + } + + if (bRegTypeLib) + { + hResult = AtlRegisterTypeLib(mod->m_hInstTypeLib, NULL); + } + + return hResult; +} + +// Adapted from dll/win32/atl/atl.c +inline HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bUnRegTypeLib, const CLSID *clsid) +{ + HRESULT hResult = S_OK; + + for (_ATL_OBJMAP_ENTRY **iter = mod->m_ppAutoObjMapFirst; iter < mod->m_ppAutoObjMapLast; iter++) + { + if (!*iter) + continue; + _ATL_OBJMAP_ENTRY* entry = *iter; + if (clsid && !IsEqualCLSID(*entry->pclsid, *clsid)) + continue; + + const _ATL_CATMAP_ENTRY *catmap = entry->pfnGetCategoryMap(); + if (catmap) + { + hResult = AtlRegisterClassCategoriesHelper(*entry->pclsid, catmap, FALSE); + if (FAILED(hResult)) + return hResult; + } + + hResult = entry->pfnUpdateRegistry(FALSE); + if (FAILED(hResult)) + return hResult; + } + + if (bUnRegTypeLib) + { + CComPtr<ITypeLib> typelib; + TLIBATTR *attr; + CComBSTR path; + + hResult = AtlLoadTypeLib(mod->m_hInstTypeLib, NULL, &path, &typelib); + if (FAILED(hResult)) + return hResult; + + hResult = typelib->GetLibAttr(&attr); + if (SUCCEEDED(hResult)) + { + hResult = UnRegisterTypeLib(attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, attr->lcid, attr->syskind); + typelib->ReleaseTLibAttr(attr); + } + } + + return hResult; +} + + }; // namespace ATL #ifndef _ATL_NO_AUTOMATIC_NAMESPACE

8 years, 9 months

[mjansen] 71138: [SHELL32] - Stub IShellFolderViewDual2 ROSTESTS-209 #comment CDefViewDual.patch committed.

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Apr 10 12:05:06 2016 New Revision: 71138 URL: http://svn.reactos.org/svn/reactos?rev=71138&view=rev Log: [SHELL32] - Stub IShellFolderViewDual2 ROSTESTS-209 #comment CDefViewDual.patch committed. Added: trunk/reactos/dll/win32/shell32/CDefViewDual.cpp (with props) Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/shell32.cpp trunk/reactos/dll/win32/shell32/wine/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Sun Apr 10 12:05:06 2016 @@ -80,6 +80,7 @@ CComPtr<IShellFolder2> m_pSF2Parent; CComPtr<IShellBrowser> m_pShellBrowser; CComPtr<ICommDlgBrowser> m_pCommDlgBrowser; + CComPtr<IShellFolderViewDual> m_pShellFolderViewDual; CListView m_ListView; HWND m_hWndParent; FOLDERSETTINGS m_FolderSettings; @@ -2302,6 +2303,12 @@ return hr; *ppvOut = pcm; } + else if (IsEqualIID(riid, IID_IDispatch)) + { + if (m_pShellFolderViewDual == NULL) + hr = CDefViewDual_Constructor(riid, (LPVOID*)&m_pShellFolderViewDual); + hr = m_pShellFolderViewDual->QueryInterface(riid, ppvOut); + } break; case SVGIO_SELECTION: Added: trunk/reactos/dll/win32/shell32/CDefViewDual.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefViewDual.cpp (added) +++ trunk/reactos/dll/win32/shell32/CDefViewDual.cpp [iso-8859-1] Sun Apr 10 12:05:06 2016 @@ -0,0 +1,143 @@ +/* + * ShellFolderViewDual + * + * Copyright 2016 Mark Jansen + * + * 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 "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +class CDefViewDual : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDispatchImpl<IShellFolderViewDual2, &IID_IShellFolderViewDual2> +{ + public: + CDefViewDual() + { + } + + ~CDefViewDual() + { + } + + HRESULT STDMETHODCALLTYPE Initialize() + { + // Nothing to do for now.. + return S_OK; + } + + // *** IShellFolderViewDual methods *** + virtual HRESULT STDMETHODCALLTYPE get_Application(IDispatch **app) override + { + if (!app) return E_INVALIDARG; + *app = NULL; + FIXME("CDefViewDual::get_Application is UNIMPLEMENTED (%p, %p)\n", this, app); + return E_NOTIMPL; + } + + virtual HRESULT STDMETHODCALLTYPE get_Parent(IDispatch **parent) override + { + if (!parent) return E_INVALIDARG; + *parent = NULL; + FIXME("CDefViewDual::get_Parent is UNIMPLEMENTED (%p, %p)\n", this, parent); + return E_NOTIMPL; + } + + virtual HRESULT STDMETHODCALLTYPE get_Folder(Folder **folder) override + { + if (!folder) return E_INVALIDARG; + *folder = NULL; + FIXME("CDefViewDual::get_Folder is UNIMPLEMENTED (%p, %p)\n", this, folder); + return E_NOTIMPL; + } + + virtual HRESULT STDMETHODCALLTYPE SelectedItems(FolderItems **items) override + { + if (!items) return E_INVALIDARG; + *items = NULL; + FIXME("CDefViewDual::SelectedItems is UNIMPLEMENTED (%p, %p)\n", this, items); + return E_NOTIMPL; + } + + virtual HRESULT STDMETHODCALLTYPE get_FocusedItem(FolderItem **item) override + { + if (!item) return E_INVALIDARG; + *item = NULL; + FIXME("CDefViewDual::get_FocusedItem is UNIMPLEMENTED (%p, %p)\n", this, item); + return E_NOTIMPL; + } + + virtual HRESULT STDMETHODCALLTYPE SelectItem(VARIANT *item, int flags) override + { + FIXME("CDefViewDual::SelectItem is UNIMPLEMENTED (%p, %p, %i)\n", this, item, flags); + return E_NOTIMPL; + } + + virtual HRESULT STDMETHODCALLTYPE PopupItemMenu(FolderItem *item, VARIANT vx, VARIANT vy, BSTR *command) override + { + FIXME("CDefViewDual::PopupItemMenu is UNIMPLEMENTED (%p, %p, %s, %s, %p)\n", this, item, wine_dbgstr_variant(&vx), wine_dbgstr_variant(&vy), command); + return E_NOTIMPL; + } + + virtual HRESULT STDMETHODCALLTYPE get_Script(IDispatch **script) override + { + FIXME("CDefViewDual::get_Script is UNIMPLEMENTED (%p, %p)\n", this, script); + return E_NOTIMPL; + } + + virtual HRESULT STDMETHODCALLTYPE get_ViewOptions(long *options) override + { + FIXME("CDefViewDual::get_ViewOptions is UNIMPLEMENTED (%p, %p)\n", this, options); + return E_NOTIMPL; + } + + // *** IShellFolderViewDual2 methods *** + virtual HRESULT STDMETHODCALLTYPE get_CurrentViewMode(UINT *mode) override + { + FIXME("CDefViewDual::get_CurrentViewMode is UNIMPLEMENTED (%p, %p)\n", this, mode); + return E_NOTIMPL; + } + + virtual HRESULT STDMETHODCALLTYPE put_CurrentViewMode(UINT mode) override + { + FIXME("CDefViewDual::put_CurrentViewMode is UNIMPLEMENTED (%p, %u)\n", this, mode); + return E_NOTIMPL; + } + + virtual HRESULT STDMETHODCALLTYPE SelectItemRelative(int relative) override + { + FIXME("CDefViewDual::SelectItemRelative is UNIMPLEMENTED (%p, %i)\n", this, relative); + return E_NOTIMPL; + } + + BEGIN_COM_MAP(CDefViewDual) + COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) + COM_INTERFACE_ENTRY_IID(IID_IShellFolderViewDual, IShellFolderViewDual) + COM_INTERFACE_ENTRY_IID(IID_IShellFolderViewDual2, IShellFolderViewDual2) + END_COM_MAP() +}; + +/********************************************************** + * CDefViewDual_Constructor + */ + +HRESULT WINAPI CDefViewDual_Constructor(REFIID riid, LPVOID * ppvOut) +{ + return ShellObjectCreatorInit<CDefViewDual>(riid, ppvOut); +} Propchange: trunk/reactos/dll/win32/shell32/CDefViewDual.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sun Apr 10 12:05:06 2016 @@ -5,6 +5,11 @@ set_cpp(WITH_RUNTIME) spec2def(shell32.dll shell32.spec ADD_IMPORTLIB) + +if(NOT MSVC) + # HACK: this should be enabled globally! + add_compile_flags_language("-std=c++11" "CXX") +endif() remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -53,6 +58,7 @@ shlfolder.cpp CFileSysBindData.cpp CDefView.cpp + CDefViewDual.cpp stubs.cpp systray.cpp CDefaultContextMenu.cpp Modified: trunk/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Sun Apr 10 12:05:06 2016 @@ -292,7 +292,7 @@ if (dwReason == DLL_PROCESS_ATTACH) { shell32_hInstance = hInstance; - gModule.Init(ObjectMap, hInstance, NULL); + gModule.Init(ObjectMap, hInstance, &LIBID_Shell32); DisableThreadLibraryCalls (hInstance); Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Sun Apr 10 12:05:06 2016 @@ -71,6 +71,7 @@ IContextMenu2 * ISvBgCm_Constructor(LPSHELLFOLDER pSFParent, BOOL bDesktop); HRESULT WINAPI IShellView_Constructor(IShellFolder *pFolder, IShellView **newView); HRESULT WINAPI CDefView_Constructor(IShellFolder *pFolder, REFIID riid, LPVOID * ppvOut); +HRESULT WINAPI CDefViewDual_Constructor(REFIID riid, LPVOID * ppvOut); HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID * ppv); HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV);

8 years, 9 months

[pschweitzer] 71137: [NTOSKRNL] In FsRtlAddBaseMcbEntry(): only merge runs if LBNs are consistent. This fixes a few failing tests. CORE-11002

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 10 10:29:28 2016 New Revision: 71137 URL: http://svn.reactos.org/svn/reactos?rev=71137&view=rev Log: [NTOSKRNL] In FsRtlAddBaseMcbEntry(): only merge runs if LBNs are consistent. This fixes a few failing tests. CORE-11002 Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Sun Apr 10 10:29:28 2016 @@ -171,7 +171,8 @@ NeedleRun.RunEndVbn.QuadPart = NeedleRun.RunStartVbn.QuadPart + 1; NeedleRun.StartingLbn.QuadPart = ~0ULL; Mcb->Mapping->Table.CompareRoutine = McbMappingIntersectCompare; - if ((LowerRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRun))) + if ((LowerRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRun)) && + (LowerRun->StartingLbn.QuadPart < Node.StartingLbn.QuadPart)) { ASSERT(LowerRun->RunEndVbn.QuadPart == Node.RunStartVbn.QuadPart); Node.RunStartVbn.QuadPart = LowerRun->RunStartVbn.QuadPart; @@ -185,7 +186,8 @@ NeedleRun.RunStartVbn.QuadPart = Node.RunEndVbn.QuadPart; NeedleRun.RunEndVbn.QuadPart = NeedleRun.RunStartVbn.QuadPart + 1; Mcb->Mapping->Table.CompareRoutine = McbMappingIntersectCompare; - if ((HigherRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRun))) + if ((HigherRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRun)) && + (Node.StartingLbn.QuadPart <= HigherRun->StartingLbn.QuadPart)) { ASSERT(HigherRun->RunStartVbn.QuadPart == Node.RunEndVbn.QuadPart); Node.RunEndVbn.QuadPart = HigherRun->RunEndVbn.QuadPart;

8 years, 9 months

[tfaber] 71136: [COM_APITEST] - Add some classes and interfaces related to CORE-10838.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 10 09:40:16 2016 New Revision: 71136 URL: http://svn.reactos.org/svn/reactos?rev=71136&view=rev Log: [COM_APITEST] - Add some classes and interfaces related to CORE-10838. Added: trunk/rostests/apitests/com/ole32.c (with props) Modified: trunk/rostests/apitests/com/CMakeLists.txt trunk/rostests/apitests/com/browseui.c trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/ieframe.c trunk/rostests/apitests/com/shdocvw.c trunk/rostests/apitests/com/testlist.c Modified: trunk/rostests/apitests/com/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/com/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/com/CMakeLists.txt [iso-8859-1] Sun Apr 10 09:40:16 2016 @@ -6,6 +6,7 @@ ieframe.c netcfgx.c netshell.c + ole32.c shdocvw.c shell32.c com_apitest.c Modified: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Sun Apr 10 09:40:16 2016 @@ -263,6 +263,27 @@ } }, { + ID_NAME(CLSID_SH_SearchBand), + { + { 0x0, &IID_IUnknown }, + { 0x74, &IID_IOleContainer }, + { 0x78, &IID_IOleInPlaceFrame }, + //{ 0x78, &IID_IOleInPlaceUIWindow }, + { 0x78, &IID_IOleWindow }, + { 0xb0, &IID_IDeskBand }, + { 0xb0, &IID_IDockingWindow }, + { 0xb4, &IID_IInputObject }, + { 0xb8, &IID_IObjectWithSite }, + { 0xbc, &IID_IContextMenu }, + { 0xc0, &IID_IServiceProvider }, + { 0xc8, &IID_ISearchBar }, + { 0xcc, &IID_IFileSearchBand }, + { 0xcc, &IID_IDispatch }, + { 0xd0, &IID_IBandNavigate }, + { 0xd8, &IID_IPersist }, + } + }, + { ID_NAME(CLSID_SharedTaskScheduler), { { 0x0, &IID_IShellTaskScheduler }, Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sun Apr 10 09:40:16 2016 @@ -75,6 +75,8 @@ { ID_NAME(IID_ICDBurnExt) }, { ID_NAME(IID_ICDBurnPriv) }, { ID_NAME(IID_ICallFactory), TRUE }, + { ID_NAME(IID_ICatInformation) }, + { ID_NAME(IID_ICatRegister) }, { ID_NAME(IID_IClassFactory) }, { ID_NAME(IID_IClassFactory2) }, { ID_NAME(IID_IClassFactory3), TRUE }, @@ -214,6 +216,7 @@ { ID_NAME(IID_IObjectWithSite) }, { ID_NAME(IID_IOleClientSite) }, { ID_NAME(IID_IOleCommandTarget) }, + { ID_NAME(IID_IOleContainer) }, { ID_NAME(IID_IOleControl) }, { ID_NAME(IID_IOleControlSite) }, { ID_NAME(IID_IOleInPlaceActiveObject) }, @@ -267,6 +270,7 @@ { ID_NAME(IID_ISearchAssistantOC) }, { ID_NAME(IID_ISearchAssistantOC2) }, { ID_NAME(IID_ISearchAssistantOC3) }, + { ID_NAME(IID_ISearchBar) }, { ID_NAME(IID_ISearches) }, { ID_NAME(IID_ISecMgrCacheSeedTarget) }, { ID_NAME(IID_IServerSecurity), TRUE }, Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Sun Apr 10 09:40:16 2016 @@ -81,7 +81,6 @@ DEFINE_GUID(CLSID_CDBurn, 0xfbeb8a05, 0xbeee, 0x4442, 0x80, 0x4e, 0x40, 0x9d, 0x6c, 0x45, 0x15, 0xe9); DEFINE_GUID(CLSID_DeskMovr, 0x72267F6A, 0xA6F9, 0x11D0, 0xBC, 0x94, 0x00, 0xC0, 0x4F, 0xB6, 0x78, 0x63); DEFINE_GUID(CLSID_FadeTask, 0x7EB5FBE4, 0x2100, 0x49E6, 0x85, 0x93, 0x17, 0xE1, 0x30, 0x12, 0x2F, 0x91); -DEFINE_GUID(CLSID_FileSearchBand, 0xc4ee31f3, 0x4768, 0x11d2, 0xbe, 0x5c, 0x00, 0xa0, 0xc9, 0xa8, 0x3d, 0xa1); DEFINE_GUID(CLSID_FolderItem, 0xfef10fa2, 0x355e, 0x4e06, 0x93, 0x81, 0x9b, 0x24, 0xd7, 0xf7, 0xcc, 0x88); DEFINE_GUID(CLSID_FolderItemsFDF, 0x53c74826, 0xab99, 0x4d33, 0xac, 0xa4, 0x31, 0x17, 0xf5, 0x1d, 0x37, 0x88); DEFINE_GUID(CLSID_FolderViewHost, 0x20b1cb23, 0x6968, 0x4eb9, 0xb7, 0xd4, 0xa6, 0x6d, 0x00, 0xd0, 0x7c, 0xee); @@ -159,6 +158,7 @@ DEFINE_GUID(IID_IPreviewHandlerFrame, 0xfec87aaf, 0x35f9, 0x447a, 0xad, 0xb7, 0x20, 0x23, 0x44, 0x91, 0x40, 0x1a); DEFINE_GUID(IID_IPreviewHandlerVisuals, 0x196bf9a5, 0xb346, 0x4ef0, 0xaa, 0x1e, 0x5d, 0xcd, 0xb7, 0x67, 0x68, 0xb1); DEFINE_GUID(IID_ISLTracker, 0x7c9e512f, 0x41d7, 0x11d1, 0x8e, 0x2e, 0x00, 0xc0, 0x4f, 0xb9, 0x38, 0x6d); +DEFINE_GUID(IID_ISearchBar, 0xc66abac9, 0x96d0, 0x4940, 0xbf, 0xbc, 0x8f, 0x51, 0x9c, 0xee, 0xeb, 0x13); DEFINE_GUID(IID_ISecMgrCacheSeedTarget, 0xfc8afc62, 0xf788, 0x4b36, 0x88, 0x89, 0xfd, 0x07, 0x3f, 0xdd, 0x2f, 0xd9); DEFINE_GUID(IID_IShellApp, 0xa3e14960, 0x935f, 0x11d1, 0xb8, 0xb8, 0x00, 0x60, 0x08, 0x05, 0x93, 0x82); DEFINE_GUID(IID_IShellDispatch3, 0x177160ca, 0xbb5a, 0x411c, 0x84, 0x1d, 0xbd, 0x38, 0xfa, 0xcd, 0xea, 0xa0); Modified: trunk/rostests/apitests/com/ieframe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/ieframe.c?re… ============================================================================== --- trunk/rostests/apitests/com/ieframe.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/ieframe.c [iso-8859-1] Sun Apr 10 09:40:16 2016 @@ -12,6 +12,25 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { + { + ID_NAME(CLSID_IE_SearchBand), + { + { -0x30, &IID_IObjectWithSite }, + { -0x28, &IID_IDeskBand }, + { -0x28, &IID_IDockingWindow }, + { -0x28, &IID_IOleWindow }, + { -0x24, &IID_IInputObject }, + { -0x20, &IID_IPersistStream }, + { -0x20, &IID_IPersist }, + { -0x1c, &IID_IOleCommandTarget }, + { -0x18, &IID_IServiceProvider }, + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IDispatch }, + { 0x10, &IID_IPersistPropertyBag }, + { 0x8c, &IID_IBandNavigate }, + } + }, { ID_NAME(CLSID_Internet), { Added: trunk/rostests/apitests/com/ole32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/ole32.c?rev=… ============================================================================== --- trunk/rostests/apitests/com/ole32.c (added) +++ trunk/rostests/apitests/com/ole32.c [iso-8859-1] Sun Apr 10 09:40:16 2016 @@ -0,0 +1,30 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: COM interface test for ole32 classes + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_StdComponentCategoriesMgr), + { + { 0x0, &IID_IUnknown }, + { FARAWY, &IID_ICatRegister }, + { FARAWY, &IID_ICatInformation }, + }, + L"Both" + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(ole32) +{ + TestClasses(L"ole32", ExpectedInterfaces, ExpectedInterfaceCount); +} Propchange: trunk/rostests/apitests/com/ole32.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/com/shdocvw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shdocvw.c?re… ============================================================================== --- trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] Sun Apr 10 09:40:16 2016 @@ -86,6 +86,45 @@ ID_NAME(CLSID_MruLongList), { { 0x0, &IID_IUnknown }, + } + }, + { + ID_NAME(CLSID_SH_FavBand), + { + { -0x30, &IID_IDeskBand }, + { -0x30, &IID_IDockingWindow }, + { -0x30, &IID_IOleWindow }, + { -0x2c, &IID_IObjectWithSite }, + { -0x24, &IID_IInputObject }, + { -0x20, &IID_IPersistStream }, + { -0x20, &IID_IPersist }, + { -0x1c, &IID_IOleCommandTarget }, + { -0x18, &IID_IServiceProvider }, + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IBandNavigate }, + { 0x8, &IID_IWinEventHandler }, + { 0xc, &IID_INamespaceProxy }, + } + }, + { + ID_NAME(CLSID_SH_HistBand), + { + { -0xb4, &IID_IDeskBand }, + { -0xb4, &IID_IDockingWindow }, + { -0xb4, &IID_IOleWindow }, + { -0xb0, &IID_IObjectWithSite }, + { -0xa8, &IID_IInputObject }, + { -0xa4, &IID_IPersistStream }, + { -0xa4, &IID_IPersist }, + { -0xa0, &IID_IOleCommandTarget }, + { -0x9c, &IID_IServiceProvider }, + { -0x84, &IID_IContextMenu }, + { -0x80, &IID_IBandNavigate }, + { -0x7c, &IID_IWinEventHandler }, + { -0x78, &IID_INamespaceProxy }, + { 0x0, &IID_IShellFolderSearchableCallback }, + { 0x0, &IID_IUnknown }, } }, { @@ -112,6 +151,16 @@ { 0x34, &IID_IObjectSafety }, { 0x3c, &IID_IOleCommandTarget }, { 0x40, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_SearchBand), + { + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellExtInit }, + { 0x8, &IID_IPersistPropertyBag }, + { 0x8, &IID_IPersist }, } }, { Modified: trunk/rostests/apitests/com/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/com/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/testlist.c [iso-8859-1] Sun Apr 10 09:40:16 2016 @@ -8,6 +8,7 @@ extern void func_interfaces(void); extern void func_netcfgx(void); extern void func_netshell(void); +extern void func_ole32(void); extern void func_shdocvw(void); extern void func_shell32(void); @@ -18,6 +19,7 @@ { "interfaces", func_interfaces }, { "netcfgx", func_netcfgx }, { "netshell", func_netshell }, + { "ole32", func_ole32 }, { "shdocvw", func_shdocvw }, { "shell32", func_shell32 },

8 years, 9 months

[tfaber] 71135: [PSDK] - Correct CLSID_FileSearchBand and add CLSID_IE_SearchBand and CLSID_ChannelsBand. Patch by Sylvain Deverre. CORE-10838

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 10 09:33:03 2016 New Revision: 71135 URL: http://svn.reactos.org/svn/reactos?rev=71135&view=rev Log: [PSDK] - Correct CLSID_FileSearchBand and add CLSID_IE_SearchBand and CLSID_ChannelsBand. Patch by Sylvain Deverre. CORE-10838 Modified: trunk/reactos/include/reactos/shlguid_undoc.h Modified: trunk/reactos/include/reactos/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlguid_un… ============================================================================== --- trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] Sun Apr 10 09:33:03 2016 @@ -67,7 +67,9 @@ DEFINE_GUID(CLSID_SH_HistBand, 0xEFA24E62, 0xB078, 0x11D0, 0x89, 0xE4, 0x00, 0xC0, 0x4F, 0xC9, 0xE2, 0x6E); DEFINE_GUID(CLSID_ExplorerBand, 0xEFA24E64, 0xB078, 0x11D0, 0x89, 0xE4, 0x00, 0xC0, 0x4F, 0xC9, 0xE2, 0x6E); DEFINE_GUID(CLSID_SH_SearchBand, 0x21569614, 0xB795, 0x46B1, 0x85, 0xF4, 0xE7, 0x37, 0xA8, 0xDC, 0x09, 0xAD); -DEFINE_GUID(CLSID_FileSearchBand, 0xC4EE31F3, 0x4768, 0x11D2, 0x5C, 0xBE, 0x00, 0xA0, 0xC9, 0xA8, 0x3D, 0xA1); +DEFINE_GUID(CLSID_FileSearchBand, 0xC4EE31F3, 0x4768, 0x11D2, 0xBE, 0x5C, 0x00, 0xA0, 0xC9, 0xA8, 0x3D, 0xA1); +DEFINE_GUID(CLSID_IE_SearchBand, 0x30D02401, 0x6A81, 0x11D0, 0x82, 0x74, 0x00, 0xC0, 0x4F, 0xD5, 0xAE, 0x38); +DEFINE_GUID(CLSID_ChannelsBand, 0xEFA24E63, 0xB078, 0x11D0, 0x89, 0xE4, 0x00, 0xC0, 0x4F, 0xC9, 0xE2, 0x6E); // missing ResearchBand DEFINE_GUID(IID_IBandNavigate, 0x3697C30B, 0xCD88, 0x11D0, 0x8A, 0x3E, 0x00, 0xC0, 0x4F, 0xC9, 0xE2, 0x6E);

8 years, 9 months

[tfaber] 71134: [PSDK] - Add DSA_GetItemCount and DSA_AppendItem. Patch by Sylvain Deverre. CORE-10838

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 10 09:22:08 2016 New Revision: 71134 URL: http://svn.reactos.org/svn/reactos?rev=71134&view=rev Log: [PSDK] - Add DSA_GetItemCount and DSA_AppendItem. Patch by Sylvain Deverre. CORE-10838 Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sun Apr 10 09:22:08 2016 @@ -4771,6 +4771,9 @@ _In_ int i, _In_ void *pitem); + #define DSA_GetItemCount(hdsa) (*(int *) (hdsa)) + #define DSA_AppendItem(hdsa, pitem) DSA_InsertItem (hdsa, DA_LAST, pitem) + typedef struct _DPA *HDPA; WINCOMMCTRLAPI HDPA WINAPI DPA_Create(int cItemGrow);

8 years, 9 months

[mjansen] 71133: [SHELL32] - Stub IShellView2 Patch by Jared Smudde CORE-11049 #resolve #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Apr 9 23:20:15 2016 New Revision: 71133 URL: http://svn.reactos.org/svn/reactos?rev=71133&view=rev Log: [SHELL32] - Stub IShellView2 Patch by Jared Smudde CORE-11049 #resolve #comment Thanks! Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Sat Apr 9 23:20:15 2016 @@ -66,7 +66,7 @@ class CDefView : public CWindowImpl<CDefView, CWindow, CControlWinTraits>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IShellView, + public IShellView2, public IFolderView, public IShellFolderView, public IOleCommandTarget, @@ -165,6 +165,12 @@ virtual HRESULT STDMETHODCALLTYPE SelectItem(PCUITEMID_CHILD pidlItem, SVSIF uFlags); virtual HRESULT STDMETHODCALLTYPE GetItemObject(UINT uItem, REFIID riid, void **ppv); + // *** IShellView2 methods *** + virtual HRESULT STDMETHODCALLTYPE GetView(SHELLVIEWID *view_guid, ULONG view_type); + virtual HRESULT STDMETHODCALLTYPE CreateViewWindow2(LPSV2CVW2_PARAMS view_params); + virtual HRESULT STDMETHODCALLTYPE HandleRename(LPCITEMIDLIST new_pidl); + virtual HRESULT STDMETHODCALLTYPE SelectAndPositionItem(LPCITEMIDLIST item, UINT flags, POINT *point); + // *** IFolderView methods *** virtual HRESULT STDMETHODCALLTYPE GetCurrentViewMode(UINT *pViewMode); virtual HRESULT STDMETHODCALLTYPE SetCurrentViewMode(UINT ViewMode); @@ -319,6 +325,7 @@ // Windows returns E_NOINTERFACE for IOleWindow // COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) COM_INTERFACE_ENTRY_IID(IID_IShellView, IShellView) + COM_INTERFACE_ENTRY_IID(IID_IShellView2, IShellView2) COM_INTERFACE_ENTRY_IID(IID_IFolderView, IFolderView) COM_INTERFACE_ENTRY_IID(IID_IShellFolderView, IShellFolderView) COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) @@ -2490,6 +2497,34 @@ } /********************************************************** + * IShellView2 implementation + */ + +HRESULT STDMETHODCALLTYPE CDefView::GetView(SHELLVIEWID *view_guid, ULONG view_type) +{ + FIXME("(%p)->(%p, %lu) stub\n", this, view_guid, view_type); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CDefView::CreateViewWindow2(LPSV2CVW2_PARAMS view_params) +{ + FIXME("(%p)->(%p) stub\n", this, view_params); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CDefView::HandleRename(LPCITEMIDLIST new_pidl) +{ + FIXME("(%p)->(%p) stub\n", this, new_pidl); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CDefView::SelectAndPositionItem(LPCITEMIDLIST item, UINT flags, POINT *point) +{ + FIXME("(%p)->(%p, %u, %p) stub\n", this, item, flags, point); + return E_NOTIMPL; +} + +/********************************************************** * IShellFolderView implementation */ HRESULT STDMETHODCALLTYPE CDefView::Rearrange(LPARAM sort)

8 years, 9 months

[pschweitzer] 71132: [NTOSKRNL] Drop dead code in FsRtlAddBaseMcbEntry(). CORE-11002

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Apr 9 22:18:14 2016 New Revision: 71132 URL: http://svn.reactos.org/svn/reactos?rev=71132&view=rev Log: [NTOSKRNL] Drop dead code in FsRtlAddBaseMcbEntry(). CORE-11002 Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Sat Apr 9 22:18:14 2016 @@ -198,9 +198,6 @@ /* finally insert the resulting run */ RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Node, sizeof(Node), &NewElement); ASSERT(NewElement); - Node.RunStartVbn.QuadPart = Vbn; - Node.RunEndVbn.QuadPart = Vbn + SectorCount; - Node.StartingLbn.QuadPart = Lbn; // NB: Two consecutive runs can only be merged, if actual LBNs also match!

8 years, 9 months

[mjansen] 71131: [ACPPAGE] Implement the base of the compatibility tab in explorer as shell extension. Because the underlying shim infrastructure is not active yet, the page is disabled by default....

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Apr 9 21:40:32 2016 New Revision: 71131 URL: http://svn.reactos.org/svn/reactos?rev=71131&view=rev Log: [ACPPAGE] Implement the base of the compatibility tab in explorer as shell extension. Because the underlying shim infrastructure is not active yet, the page is disabled by default. Hello Reactos :) CORE-10375 Added: trunk/reactos/dll/shellext/acppage/ (with props) trunk/reactos/dll/shellext/acppage/ACPPage.cpp (with props) trunk/reactos/dll/shellext/acppage/ACPPage.rc (with props) trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp (with props) trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp (with props) trunk/reactos/dll/shellext/acppage/CMakeLists.txt (with props) trunk/reactos/dll/shellext/acppage/acppage.spec (with props) trunk/reactos/dll/shellext/acppage/lang/ (with props) trunk/reactos/dll/shellext/acppage/lang/en-US.rc (with props) trunk/reactos/dll/shellext/acppage/precomp.h (with props) trunk/reactos/dll/shellext/acppage/res/ (with props) trunk/reactos/dll/shellext/acppage/res/acppage.rgs (with props) trunk/reactos/dll/shellext/acppage/resource.h (with props) Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/shellext/CMakeLists.txt trunk/reactos/media/inf/syssetup.inf Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Sat Apr 9 21:40:32 2016 @@ -64,6 +64,13 @@ #endif + +/* layer.c */ +BOOL WINAPI AllowPermLayer(PCWSTR path); +BOOL WINAPI SdbGetPermLayerKeys(PCWSTR wszPath, PWSTR pwszLayers, PDWORD pdwBytes, DWORD dwFlags); +BOOL WINAPI SetPermLayerState(PCWSTR wszPath, PCWSTR wszLayer, DWORD dwFlags, BOOL bMachine, BOOL bEnable); + + #ifdef __cplusplus } // extern "C" #endif Modified: trunk/reactos/dll/shellext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/shellext/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/CMakeLists.txt [iso-8859-1] Sat Apr 9 21:40:32 2016 @@ -1,4 +1,5 @@ +add_subdirectory(acppage) add_subdirectory(deskadp) add_subdirectory(deskmon) add_subdirectory(devcpux) Propchange: trunk/reactos/dll/shellext/acppage/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Apr 9 21:40:32 2016 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/shellext/acppage/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/shellext/acppage/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Added: trunk/reactos/dll/shellext/acppage/ACPPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/ACPPa… ============================================================================== --- trunk/reactos/dll/shellext/acppage/ACPPage.cpp (added) +++ trunk/reactos/dll/shellext/acppage/ACPPage.cpp [iso-8859-1] Sat Apr 9 21:40:32 2016 @@ -0,0 +1,122 @@ +/* + * Copyright 2015 Mark Jansen + * + * 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 "precomp.h" + +HMODULE g_hModule = NULL; +LONG g_ModuleRefCnt = 0; + +class CLayerUIPropPageModule : public CComModule +{ +public: + void Term() + { + CComModule::Term(); + } +}; + +BEGIN_OBJECT_MAP(ObjectMap) + OBJECT_ENTRY(CLSID_CLayerUIPropPage, CLayerUIPropPage) +END_OBJECT_MAP() + +CLayerUIPropPageModule gModule; + +EXTERN_C +BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstance); + g_hModule = hInstance; + gModule.Init(ObjectMap, hInstance, NULL); + break; + } + + return(TRUE); +} + +STDAPI DllCanUnloadNow() +{ + if (g_ModuleRefCnt) + return S_FALSE; + return gModule.DllCanUnloadNow(); +} + +STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + return gModule.DllGetClassObject(rclsid, riid, ppv); +} + +STDAPI DllRegisterServer() +{ + HRESULT hr; + + hr = gModule.DllRegisterServer(FALSE); + if (FAILED(hr)) + return hr; + + hr = gModule.UpdateRegistryFromResource(IDR_ACPPAGE, TRUE, NULL); + if (FAILED(hr)) + return hr; + + return S_OK; +} + +STDAPI DllUnregisterServer() +{ + HRESULT hr; + + hr = gModule.DllUnregisterServer(FALSE); + if (FAILED(hr)) + return hr; + + hr = gModule.UpdateRegistryFromResource(IDR_ACPPAGE, FALSE, NULL); + if (FAILED(hr)) + return hr; + + return S_OK; +} + +struct CCoInit +{ + CCoInit() { hres = CoInitialize(NULL); } + ~CCoInit() { if (SUCCEEDED(hres)) { CoUninitialize(); } } + HRESULT hres; +}; + +EXTERN_C +BOOL WINAPI GetExeFromLnk(PCWSTR pszLnk, PWSTR pszExe, size_t cchSize) +{ + CCoInit init; + if (FAILED(init.hres)) + return FALSE; + + CComPtr<IShellLinkW> spShellLink; + if (FAILED(CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellLinkW, &spShellLink)))) + return FALSE; + + CComPtr<IPersistFile> spPersistFile; + if (FAILED(spShellLink->QueryInterface(IID_PPV_ARG(IPersistFile, &spPersistFile)))) + return FALSE; + + if (FAILED(spPersistFile->Load(pszLnk, STGM_READ)) || FAILED(spShellLink->Resolve(NULL, SLR_NO_UI | SLR_NOUPDATE | SLR_NOSEARCH))) + return FALSE; + + return SUCCEEDED(spShellLink->GetPath(pszExe, cchSize, NULL, SLGP_RAWPATH)); +} Propchange: trunk/reactos/dll/shellext/acppage/ACPPage.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/acppage/ACPPage.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/ACPPa… ============================================================================== --- trunk/reactos/dll/shellext/acppage/ACPPage.rc (added) +++ trunk/reactos/dll/shellext/acppage/ACPPage.rc [iso-8859-1] Sat Apr 9 21:40:32 2016 @@ -0,0 +1,87 @@ +#include <windef.h> +#include <winuser.h> + +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Compatibility Layer Shell Extension" +#define REACTOS_STR_INTERNAL_NAME "acppage" +#define REACTOS_STR_ORIGINAL_FILENAME "acppage.dll" +#include <reactos/version.rc> + +#include <reactos/manifest_dll.rc> + +IDR_ACPPAGE REGISTRY "res/acppage.rgs" + +/* UTF-8 */ +#pragma code_page(65001) +/* +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +*/ +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +/* +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_EU_ES + #include "lang/eu-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif +#ifdef LANGUAGE_ID_ID + #include "lang/id-ID.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_NL_NL + #include "lang/nl-NL.rc" +#endif +#ifdef LANGUAGE_NB_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif +#ifdef LANGUAGE_SV_SE + #include "lang/sv-SE.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif +*/ Propchange: trunk/reactos/dll/shellext/acppage/ACPPage.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp (added) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] Sat Apr 9 21:40:32 2016 @@ -0,0 +1,414 @@ +/* + * Copyright 2015 Mark Jansen + * + * 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 "precomp.h" +#include <windowsx.h> +#include <sfc.h> + +const GUID CLSID_CLayerUIPropPage = { 0x513D916F, 0x2A8E, 0x4F51, { 0xAE, 0xAB, 0x0C, 0xBC, 0x76, 0xFB, 0x1A, 0xF8 } }; +#define ACP_WNDPROP L"{513D916F-2A8E-4F51-AEAB-0CBC76FB1AF8}.Prop" + +#define GPLK_USER 1 +#define GPLK_MACHINE 2 +#define MAX_LAYER_LENGTH 256 + +void ACDBG_FN(PCSTR FunctionName, PCWSTR Format, ...) +{ + WCHAR Buffer[512]; + WCHAR* Current = Buffer; + size_t Length = _countof(Buffer); + + StringCchPrintfExW(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, L"[%-20S] ", FunctionName); + va_list ArgList; + va_start(ArgList, Format); + StringCchVPrintfExW(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, Format, ArgList); + va_end(ArgList); + OutputDebugStringW(Buffer); +} + +#define ACDBG(fmt, ...) ACDBG_FN(__FUNCTION__, fmt, ##__VA_ARGS__ ) + + + +CLayerUIPropPage::CLayerUIPropPage() +:m_Filename(NULL) +, m_IsSfcProtected(FALSE) +, m_AllowPermLayer(FALSE) +, m_LayerQueryFlags(GPLK_USER) +, m_RegistryOSMode(0) +, m_OSMode(0) +, m_RegistryEnabledLayers(0) +, m_EnabledLayers(0) +{ +} + +CLayerUIPropPage::~CLayerUIPropPage() +{ +} + + +#if 0 +HKCU\Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers +WINXPSP3 256COLOR 640X480 DISABLETHEMES DISABLEDWM HIGHDPIAWARE RUNASADMIN +#endif + +static struct { + const PCWSTR Display; + const PCWSTR Name; +} g_CompatModes[] = { + { L"Windows 95", L"WIN95" }, + { L"Windows 98", L"WIN98" }, + { L"Windows NT 4.0 (SP5)", L"NT4SP5" }, + { L"Windows 2000", L"WIN2000" }, + { L"Windows XP (SP2)", L"WINXPSP2" }, + { L"Windows XP (SP3)", L"WINXPSP3" }, + { L"Windows Server 2003 (SP1)", L"WINSRV03SP1" }, +#if 0 + { L"Windows Server 2008 (SP1)", L"WINSRV08SP1" }, + { L"Windows Vista", L"VISTARTM" }, + { L"Windows Vista (SP1)", L"VISTASP1" }, + { L"Windows Vista (SP2)", L"VISTASP2" }, + { L"Windows 7", L"WIN7RTM" }, +#endif + { NULL, NULL } +}; + +static struct { + const PCWSTR Name; + DWORD Id; + BOOL Enabled; +} g_Layers[] = { + { L"256COLOR", IDC_CHKRUNIN256COLORS, TRUE }, + { L"640X480", IDC_CHKRUNIN640480RES, TRUE }, + { L"DISABLETHEMES", IDC_CHKDISABLEVISUALTHEMES, TRUE }, + { NULL, 0, FALSE } +}; + +static const WCHAR* g_AllowedExtensions[] = { + L".exe", + L".msi", + L".pif", + L".bat", + L".cmd", + 0 +}; + +HRESULT CLayerUIPropPage::InitFile(PCWSTR Filename) +{ + PCWSTR pwszExt = PathFindExtensionW(Filename); + if (!pwszExt) + { + ACDBG(L"Failed to find an extension: '%s'\r\n", Filename); + return E_FAIL; + } + if (!wcsicmp(pwszExt, L".lnk")) + { + WCHAR Buffer[MAX_PATH]; + if (!GetExeFromLnk(Filename, Buffer, _countof(Buffer))) + { + ACDBG(L"Failed to read link target from: '%s'\r\n", Filename); + return E_FAIL; + } + if (!wcsicmp(Buffer, Filename)) + { + ACDBG(L"Link redirects to itself: '%s'\r\n", Filename); + return E_FAIL; + } + return InitFile(Buffer); + } + for (size_t n = 0; g_AllowedExtensions[n]; ++n) + { + if (!wcsicmp(g_AllowedExtensions[n], pwszExt)) + { + m_Filename = Filename; + ACDBG(L"Got: %s\r\n", Filename); + m_IsSfcProtected = SfcIsFileProtected(NULL, m_Filename); + m_AllowPermLayer = AllowPermLayer(Filename); + return S_OK; + } + } + ACDBG(L"Extension not included: '%s'\r\n", pwszExt); + return E_FAIL; +} + +BOOL GetLayerInfo(BSTR Filename, DWORD QueryFlags, PDWORD OSMode, PDWORD Enabledlayers) +{ + *OSMode = *Enabledlayers = 0; + WCHAR wszLayers[MAX_LAYER_LENGTH] = { 0 }; + DWORD dwBytes = sizeof(wszLayers); + if (!SdbGetPermLayerKeys(Filename, wszLayers, &dwBytes, QueryFlags)) + return FALSE; + + for (PWCHAR Layer = wcstok(wszLayers, L" "); Layer; Layer = wcstok(NULL, L" ")) + { + size_t n; + for (n = 0; g_Layers[n].Name; ++n) + { + if (g_Layers[n].Enabled && !wcsicmp(g_Layers[n].Name, Layer)) + { + *Enabledlayers |= (1<<n); + break; + } + } + if (!g_Layers[n].Name) + { + for (n = 0; g_CompatModes[n].Name; ++n) + { + if (!wcsicmp(g_CompatModes[n].Name, Layer)) + { + *OSMode = n+1; + break; + } + } + } + } + return TRUE; +} + +void CLayerUIPropPage::OnRefresh(HWND hWnd) +{ + if (!GetLayerInfo(m_Filename, m_LayerQueryFlags, &m_RegistryOSMode, &m_RegistryEnabledLayers)) + m_RegistryOSMode = m_RegistryEnabledLayers = 0; + + for (size_t n = 0; g_Layers[n].Name; ++n) + CheckDlgButton(hWnd, g_Layers[n].Id, (m_RegistryEnabledLayers & (1<<n)) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_CHKRUNCOMPATIBILITY, m_RegistryOSMode ? BST_CHECKED : BST_UNCHECKED); + if (m_RegistryOSMode) + ComboBox_SetCurSel(GetDlgItem(hWnd, IDC_COMPATIBILITYMODE), m_RegistryOSMode-1); + UpdateControls(hWnd); +} + +void CLayerUIPropPage::OnApply(HWND hWnd) +{ + if (m_RegistryEnabledLayers != m_EnabledLayers || m_RegistryOSMode != m_OSMode) + { + BOOL bMachine = m_LayerQueryFlags == GPLK_MACHINE; + for (size_t n = 0; g_CompatModes[n].Name; ++n) + SetPermLayerState(m_Filename, g_CompatModes[n].Name, 0, bMachine, (n+1) == m_OSMode); + for (size_t n = 0; g_Layers[n].Name; ++n) + { + if (g_Layers[n].Enabled) + SetPermLayerState(m_Filename, g_Layers[n].Name, 0, bMachine, ((1<<n) & m_EnabledLayers) != 0); + } + SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATHW, (BSTR)m_Filename, NULL); + } +} + +INT_PTR CLayerUIPropPage::InitDialog(HWND hWnd) +{ + HWND cboMode = GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); + for (size_t n = 0; g_CompatModes[n].Display; ++n) + ComboBox_AddString(cboMode, g_CompatModes[n].Display); + ComboBox_SetCurSel(cboMode, 5); + EnableWindow(GetDlgItem(hWnd, IDC_EDITCOMPATIBILITYMODES), 0); + + CComBSTR explanation; + if (!m_AllowPermLayer) + { + explanation.LoadString(g_hModule, IDS_FAILED_NETWORK); + DisableControls(hWnd); + ACDBG(L"AllowPermLayer returned FALSE\r\n"); + } + else if (m_IsSfcProtected) + { + explanation.LoadString(g_hModule, IDS_FAILED_PROTECTED); + DisableControls(hWnd); + ACDBG(L"Protected OS file\r\n"); + } + else + { + return TRUE; + } + SetDlgItemTextW(hWnd, IDC_EXPLANATION, explanation); + return TRUE; +} + +INT_PTR CLayerUIPropPage::DisableControls(HWND hWnd) +{ + EnableWindow(GetDlgItem(hWnd, IDC_COMPATIBILITYMODE), 0); + EnableWindow(GetDlgItem(hWnd, IDC_CHKRUNCOMPATIBILITY), 0); + for (size_t n = 0; g_Layers[n].Name; ++n) + EnableWindow(GetDlgItem(hWnd, g_Layers[n].Id), 0); + EnableWindow(GetDlgItem(hWnd, IDC_EDITCOMPATIBILITYMODES), 0); + return TRUE; +} + +void CLayerUIPropPage::UpdateControls(HWND hWnd) +{ + m_OSMode = 0, m_EnabledLayers = 0; + BOOL ModeEnabled = IsDlgButtonChecked(hWnd, IDC_CHKRUNCOMPATIBILITY); + if (ModeEnabled) + m_OSMode = ComboBox_GetCurSel(GetDlgItem(hWnd, IDC_COMPATIBILITYMODE))+1; + EnableWindow(GetDlgItem(hWnd, IDC_COMPATIBILITYMODE), ModeEnabled); + for (size_t n = 0; g_Layers[n].Name; ++n) + { + if (g_Layers[n].Enabled) + { + m_EnabledLayers |= IsDlgButtonChecked(hWnd, g_Layers[n].Id) ? (1<<n) : 0; + ShowWindow(GetDlgItem(hWnd, g_Layers[n].Id), SW_SHOW); + } + else + { + ShowWindow(GetDlgItem(hWnd, g_Layers[n].Id), SW_HIDE); + } + } + if (m_RegistryOSMode != m_OSMode || m_RegistryEnabledLayers != m_EnabledLayers) + { + PropSheet_Changed(GetParent(hWnd), hWnd); + } + else + { + PropSheet_UnChanged(GetParent(hWnd), hWnd); + } +} + +INT_PTR CLayerUIPropPage::OnCommand(HWND hWnd, WORD id) +{ + switch (id) + { + case IDC_CHKRUNCOMPATIBILITY: + UpdateControls(hWnd); + break; + case IDC_COMPATIBILITYMODE: + UpdateControls(hWnd); + break; + case IDC_CHKRUNIN256COLORS: + case IDC_CHKRUNIN640480RES: + case IDC_CHKDISABLEVISUALTHEMES: + UpdateControls(hWnd); + break; + case IDC_EDITCOMPATIBILITYMODES: + break; + } + return FALSE; +} + +INT_PTR CALLBACK CLayerUIPropPage::PropDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + CLayerUIPropPage* page = NULL; + + switch (uMsg) + { + case WM_INITDIALOG: + page = (CLayerUIPropPage*)((LPPROPSHEETPAGE)lParam)->lParam; + SetProp(hWnd, ACP_WNDPROP, page); + return page->InitDialog(hWnd); + + case WM_ENDSESSION: + case WM_DESTROY: + page = (CLayerUIPropPage*)GetProp(hWnd, ACP_WNDPROP); + RemoveProp(hWnd, ACP_WNDPROP); + page->Release(); + break; + + case WM_COMMAND: + page = (CLayerUIPropPage*)GetProp(hWnd, ACP_WNDPROP); + return page->OnCommand(hWnd, LOWORD(wParam)); + case WM_NOTIFY: + switch (((LPNMHDR)lParam)->code) + { + case PSN_SETACTIVE: + if (((LPNMHDR)lParam)->hwndFrom == GetParent(hWnd)) + { + page = (CLayerUIPropPage*)GetProp(hWnd, ACP_WNDPROP); + page->OnRefresh(hWnd); + } + break; + case PSN_APPLY: + if (((LPNMHDR)lParam)->hwndFrom == GetParent(hWnd)) + { + page = (CLayerUIPropPage*)GetProp(hWnd, ACP_WNDPROP); + page->OnApply(hWnd); + } + break; + case NM_CLICK: + case NM_RETURN: + if (((LPNMHDR)lParam)->idFrom == IDC_INFOLINK) + { + ShellExecute(NULL, L"open", L"https://www.reactos.org/forum/viewforum.php?f=4", NULL, NULL, SW_SHOW); + } + break; + default: + break; + } + break; + } + + return FALSE; +} + +STDMETHODIMP CLayerUIPropPage::Initialize(LPCITEMIDLIST pidlFolder, LPDATAOBJECT pDataObj, HKEY hkeyProgID) +{ + FORMATETC etc = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + STGMEDIUM stg; + HRESULT hr = pDataObj->GetData(&etc, &stg); + if (FAILED(hr)) + { + ACDBG(L"Failed to retrieve Data from pDataObj.\r\n"); + return E_INVALIDARG; + } + hr = E_FAIL; + HDROP hdrop = (HDROP)GlobalLock(stg.hGlobal); + if (hdrop) + { + UINT uNumFiles = DragQueryFileW(hdrop, 0xFFFFFFFF, NULL, 0); + if (uNumFiles == 1) + { + WCHAR szFile[MAX_PATH * 2]; + if (DragQueryFileW(hdrop, 0, szFile, _countof(szFile))) + { + this->AddRef(); + hr = InitFile(szFile); + } + else + { + ACDBG(L"Failed to query the file.\r\n"); + } + } + else + { + ACDBG(L"Invalid number of files: %d\r\n", uNumFiles); + } + GlobalUnlock(stg.hGlobal); + } + else + { + ACDBG(L"Could not lock stg.hGlobal\r\n"); + } + ReleaseStgMedium(&stg); + return hr; +} + +STDMETHODIMP CLayerUIPropPage::AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) +{ + PROPSHEETPAGEW psp = { 0 }; + psp.dwSize = sizeof(psp); + psp.dwFlags = PSP_USEREFPARENT | PSP_USETITLE; + psp.hInstance = g_hModule; + psp.pszTemplate = MAKEINTRESOURCE(IDD_ACPPAGESHEET); + psp.pszTitle = MAKEINTRESOURCE(IDS_TABTITLE); + psp.pfnDlgProc = PropDlgProc; + psp.lParam = (LPARAM)this; + psp.pcRefParent = (PUINT)&g_ModuleRefCnt; + HPROPSHEETPAGE hPage = CreatePropertySheetPageW(&psp); + if (hPage && !pfnAddPage(hPage, lParam)) + DestroyPropertySheetPage(hPage); + + return S_OK; +} + Propchange: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp (added) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp [iso-8859-1] Sat Apr 9 21:40:32 2016 @@ -0,0 +1,73 @@ +/* + * Copyright 2015 Mark Jansen + * + * 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 + */ + + +class CLayerUIPropPage : + public CComCoClass<CLayerUIPropPage, &CLSID_CLayerUIPropPage>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IShellExtInit, + public IShellPropSheetExt +{ +public: + CLayerUIPropPage(); + ~CLayerUIPropPage(); + + // IShellExtInit + STDMETHODIMP Initialize(LPCITEMIDLIST pidlFolder, LPDATAOBJECT pdtobj, HKEY hkeyProgID); + + + // IShellPropSheetExt + STDMETHODIMP AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); + STDMETHODIMP ReplacePage(UINT, LPFNADDPROPSHEETPAGE, LPARAM) + { + return E_NOTIMPL; + } + + HRESULT InitFile(PCWSTR Filename); + INT_PTR InitDialog(HWND hWnd); + INT_PTR OnCommand(HWND hWnd, WORD id); + void UpdateControls(HWND hWnd); + INT_PTR DisableControls(HWND hWnd); + + void OnRefresh(HWND hWnd); + void OnApply(HWND hWnd); + + static INT_PTR CALLBACK PropDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + /*static INT_PTR CALLBACK EditModesProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);*/ + + +protected: + CComBSTR m_Filename; + HWND m_Wnd; + BOOL m_IsSfcProtected; + BOOL m_AllowPermLayer; + DWORD m_LayerQueryFlags; + DWORD m_RegistryOSMode, m_OSMode; + DWORD m_RegistryEnabledLayers, m_EnabledLayers; + +public: + DECLARE_REGISTRY_RESOURCEID(IDR_ACPPAGE) + DECLARE_NOT_AGGREGATABLE(CLayerUIPropPage) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CLayerUIPropPage) + COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) + COM_INTERFACE_ENTRY_IID(IID_IShellPropSheetExt, IShellPropSheetExt) + END_COM_MAP() +}; Propchange: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.hpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/acppage/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CMake… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CMakeLists.txt (added) +++ trunk/reactos/dll/shellext/acppage/CMakeLists.txt [iso-8859-1] Sat Apr 9 21:40:32 2016 @@ -0,0 +1,34 @@ +project(appcompat) + +set_cpp(WITH_RUNTIME) +if(NOT MSVC) + # HACK: this should be enabled globally! + add_compile_flags_language("-std=c++11" "CXX") +endif() + +include_directories( + ${REACTOS_SOURCE_DIR}/lib/atl + ${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp + ${REACTOS_SOURCE_DIR}) +spec2def(acppage.dll acppage.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + ACPPage.cpp + CLayerUIPropPage.cpp + CLayerUIPropPage.hpp + acppage.spec + precomp.h + resource.h) + +add_library(acppage SHARED + ${SOURCE} + ACPPage.rc + ${CMAKE_CURRENT_BINARY_DIR}/acppage.def) + +set_module_type(acppage win32dll UNICODE) +target_link_libraries(acppage atlnew wine uuid) +add_delay_importlibs(acppage apphelp ole32 oleaut32 shlwapi comctl32 sfc_os) +add_importlibs(acppage shell32 user32 advapi32 msvcrt kernel32) +add_pch(acppage precomp.h SOURCE) +add_cd_file(TARGET acppage DESTINATION reactos/system32 FOR all) + Propchange: trunk/reactos/dll/shellext/acppage/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/acppage/acppage.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/acppa… ============================================================================== --- trunk/reactos/dll/shellext/acppage/acppage.spec (added) +++ trunk/reactos/dll/shellext/acppage/acppage.spec [iso-8859-1] Sat Apr 9 21:40:32 2016 @@ -0,0 +1,5 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stdcall GetExeFromLnk(wstr wstr long) Propchange: trunk/reactos/dll/shellext/acppage/acppage.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/shellext/acppage/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Apr 9 21:40:32 2016 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/shellext/acppage/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/shellext/acppage/lang/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Added: trunk/reactos/dll/shellext/acppage/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/en-US.rc (added) +++ trunk/reactos/dll/shellext/acppage/lang/en-US.rc [iso-8859-1] Sat Apr 9 21:40:32 2016 @@ -0,0 +1,40 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_ACPPAGESHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Compatibility" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "If you have problems running this program in ReactOS, select an operating system ReactOS should report to the application.\nPlease note that this is a work in progress, and at this stage will not do anything.", IDC_EXPLANATION, 7, 7, 210, 31 + GROUPBOX "Compatibility mode", IDC_COMPATGROUP, 7, 41, 210, 49 + CHECKBOX "Run this program in compatibility mode for:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "Display settings", -1, 7, 99, 210, 61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "Run in 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Run in 640x480 screenresolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Disable visual themes", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "E&dit compatibility modes...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 + CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit Compatibility Modes" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&Add...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED + PUSHBUTTON "&Edit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED + PUSHBUTTON "&Delete", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED + PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 162, 116, 60, 14 +END + +STRINGTABLE +BEGIN + IDS_TABTITLE "Compatibility" + IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." + IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." +END + Propchange: trunk/reactos/dll/shellext/acppage/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/acppage/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/preco… ============================================================================== --- trunk/reactos/dll/shellext/acppage/precomp.h (added) +++ trunk/reactos/dll/shellext/acppage/precomp.h [iso-8859-1] Sat Apr 9 21:40:32 2016 @@ -0,0 +1,42 @@ +#ifndef ACPPAGE_PRECOMP_H +#define ACPPAGE_PRECOMP_H + +#include <stdarg.h> +#include <assert.h> + +#define COBJMACROS +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define NTOS_MODE_USER + +#include <windows.h> + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> + +#include <shlobj.h> +#include <shlwapi.h> +#include <shellapi.h> +#include <tchar.h> +#include <strsafe.h> +#include <atlbase.h> +#include <atlcom.h> +#include <atlwin.h> +ULONG DbgPrint(PCH Format,...); +#include <shellutils.h> +#include <prsht.h> +#include <apphelp.h> + +extern const GUID CLSID_CLayerUIPropPage; +extern HMODULE g_hModule; +extern LONG g_ModuleRefCnt; + +EXTERN_C BOOL WINAPI GetExeFromLnk(PCWSTR pszLnk, PWSTR pszExe, size_t cchSize); + +#include "resource.h" +#include "CLayerUIPropPage.hpp" + +#endif /* ACPPAGE_PRECOMP_H */ Propchange: trunk/reactos/dll/shellext/acppage/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/shellext/acppage/res/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Apr 9 21:40:32 2016 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/shellext/acppage/res/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/shellext/acppage/res/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Added: trunk/reactos/dll/shellext/acppage/res/acppage.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/res/a… ============================================================================== --- trunk/reactos/dll/shellext/acppage/res/acppage.rgs (added) +++ trunk/reactos/dll/shellext/acppage/res/acppage.rgs [iso-8859-1] Sat Apr 9 21:40:32 2016 @@ -0,0 +1,85 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {513D916F-2A8E-4F51-AEAB-0CBC76FB1AF8} = s 'LayerUIPropPage' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } + NoRemove batfile + { + NoRemove shellex + { + NoRemove PropertySheetHandlers + { + ForceRemove ShimLayer Property Page = s '{513D916F-2A8E-4F51-AEAB-0CBC76FB1AF8}' + { + } + } + } + } + NoRemove cmdfile + { + NoRemove shellex + { + NoRemove PropertySheetHandlers + { + ForceRemove ShimLayer Property Page = s '{513D916F-2A8E-4F51-AEAB-0CBC76FB1AF8}' + { + } + } + } + } + NoRemove exefile + { + NoRemove shellex + { + NoRemove PropertySheetHandlers + { + ForceRemove ShimLayer Property Page = s '{513D916F-2A8E-4F51-AEAB-0CBC76FB1AF8}' + { + } + } + } + } + NoRemove lnkfile + { + NoRemove shellex + { + NoRemove PropertySheetHandlers + { + ForceRemove ShimLayer Property Page = s '{513D916F-2A8E-4F51-AEAB-0CBC76FB1AF8}' + { + } + } + } + } + NoRemove Msi.Package + { + NoRemove shellex + { + NoRemove PropertySheetHandlers + { + ForceRemove ShimLayer Property Page = s '{513D916F-2A8E-4F51-AEAB-0CBC76FB1AF8}' + { + } + } + } + } + NoRemove piffile + { + NoRemove shellex + { + NoRemove PropertySheetHandlers + { + ForceRemove ShimLayer Property Page = s '{513D916F-2A8E-4F51-AEAB-0CBC76FB1AF8}' + { + } + } + } + } +} Propchange: trunk/reactos/dll/shellext/acppage/res/acppage.rgs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/acppage/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/resou… ============================================================================== --- trunk/reactos/dll/shellext/acppage/resource.h (added) +++ trunk/reactos/dll/shellext/acppage/resource.h [iso-8859-1] Sat Apr 9 21:40:32 2016 @@ -0,0 +1,30 @@ +#pragma once + +#define IDD_ACPPAGESHEET 100 +#define IDD_EDITCOMPATIBILITYMODES 101 + +#define IDC_EXPLANATION 1000 +#define IDC_CHKRUNCOMPATIBILITY 1001 +#define IDC_COMPATIBILITYMODE 1002 +#define IDC_CHKRUNIN256COLORS 1003 +#define IDC_CHKRUNIN640480RES 1004 +#define IDC_CHKDISABLEVISUALTHEMES 1005 +#define IDC_EDITCOMPATIBILITYMODES 1006 +#define IDC_INFOLINK 1007 +#define IDC_COMPATGROUP 1008 +#define IDC_NEWCOMPATIBILITYMODE 1009 +#define IDC_ADD 1010 +#define IDC_EDIT 1011 +#define IDC_DELETE 1012 + +#define IDS_DESCRIPTION 101 + +/* strings */ +#define IDS_TABTITLE 2000 +#define IDS_FAILED_NETWORK 2001 +#define IDS_FAILED_PROTECTED 2002 + + +/* registry stuff */ +#define IDR_ACPPAGE 8000 + Propchange: trunk/reactos/dll/shellext/acppage/resource.h ------------------------------------------------------------------------------ svn:eol-style = native 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 Apr 9 21:40:32 2016 @@ -35,6 +35,7 @@ [OleControlDlls] 11,,atl.dll,1 11,,actxprxy.dll,1 +;11,,acppage.dll,1 11,,amstream.dll,1 11,,avifil32.dll,1 11,,browseui.dll,1

8 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
13
14
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2016