Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 71132: [NTOSKRNL] Drop dead code in FsRtlAddBaseMcbEntry(). CORE-11002
by pschweitzer＠svn.reactos.org 09 Apr '16

09 Apr '16

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!

1 0

[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 09 Apr '16

09 Apr '16

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

1 0

[tfaber] 71130: [CDFS] - Implement file locking CORE-10790 #resolve
by tfaber＠svn.reactos.org 09 Apr '16

09 Apr '16

Author: tfaber Date: Sat Apr 9 19:33:42 2016 New Revision: 71130 URL: http://svn.reactos.org/svn/reactos?rev=71130&view=rev Log: [CDFS] - Implement file locking CORE-10790 #resolve Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/cleanup.c trunk/reactos/drivers/filesystems/cdfs/dispatch.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] Sat Apr 9 19:33:42 2016 @@ -96,6 +96,7 @@ DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = CdfsFsdDispatch; + DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = CdfsFsdDispatch; CdfsGlobalData->FastIoDispatch.SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); CdfsGlobalData->FastIoDispatch.FastIoCheckIfPossible = CdfsFastIoCheckIfPossible; Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Sat Apr 9 19:33:42 2016 @@ -220,6 +220,7 @@ ERESOURCE NameListResource; LIST_ENTRY ShortNameList; + FILE_LOCK FileLock; } FCB, *PFCB; Modified: trunk/reactos/drivers/filesystems/cdfs/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] Sat Apr 9 19:33:42 2016 @@ -35,18 +35,20 @@ /* FUNCTIONS ****************************************************************/ static NTSTATUS -CdfsCleanupFile(PDEVICE_EXTENSION DeviceExt, +CdfsCleanupFile(PCDFS_IRP_CONTEXT IrpContext, PFILE_OBJECT FileObject) /* * FUNCTION: Cleans up after a file has been closed. */ { + PDEVICE_EXTENSION DeviceExt; PFCB Fcb; DPRINT("CdfsCleanupFile(DeviceExt %p, FileObject %p)\n", DeviceExt, FileObject); + DeviceExt = IrpContext->DeviceObject->DeviceExtension; Fcb = FileObject->FsContext; if (!Fcb) { @@ -57,6 +59,15 @@ FsRtlNotifyCleanup(DeviceExt->NotifySync, &(DeviceExt->NotifyList), FileObject->FsContext2); + + if (!CdfsFCBIsDirectory(Fcb) && + FsRtlAreThereCurrentFileLocks(&Fcb->FileLock)) + { + FsRtlFastUnlockAll(&Fcb->FileLock, + FileObject, + IoGetRequestorProcess(IrpContext->Irp), + NULL); + } /* Uninitialize file cache if initialized for this file object. */ if (FileObject->SectionObjectPointer && FileObject->SectionObjectPointer->SharedCacheMap) @@ -99,7 +110,7 @@ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&DeviceExtension->DirResource, TRUE); - Status = CdfsCleanupFile(DeviceExtension, FileObject); + Status = CdfsCleanupFile(IrpContext, FileObject); ExReleaseResourceLite(&DeviceExtension->DirResource); KeLeaveCriticalRegion(); Modified: trunk/reactos/drivers/filesystems/cdfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dispatch.c [iso-8859-1] Sat Apr 9 19:33:42 2016 @@ -55,6 +55,34 @@ static NTSTATUS +CdfsLockControl( + IN PCDFS_IRP_CONTEXT IrpContext) +{ + PFCB Fcb; + NTSTATUS Status; + + DPRINT("CdfsLockControl(IrpContext %p)\n", IrpContext); + + if (IrpContext->DeviceObject == CdfsGlobalData->DeviceObject) + { + return STATUS_INVALID_DEVICE_REQUEST; + } + + Fcb = IrpContext->FileObject->FsContext; + if (CdfsFCBIsDirectory(Fcb)) + { + return STATUS_INVALID_PARAMETER; + } + + IrpContext->Flags &= ~IRPCONTEXT_COMPLETE; + Status = FsRtlProcessFileLock(&Fcb->FileLock, + IrpContext->Irp, + NULL); + return Status; +} + +static +NTSTATUS CdfsDispatch(PCDFS_IRP_CONTEXT IrpContext) { PIRP Irp = IrpContext->Irp; @@ -114,6 +142,10 @@ case IRP_MJ_FILE_SYSTEM_CONTROL: Status = CdfsFileSystemControl(IrpContext); + break; + + case IRP_MJ_LOCK_CONTROL: + Status = CdfsLockControl(IrpContext); break; } Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Sat Apr 9 19:33:42 2016 @@ -97,6 +97,7 @@ Fcb->RFCB.Resource = &Fcb->MainResource; Fcb->RFCB.IsFastIoPossible = FastIoIsNotPossible; InitializeListHead(&Fcb->ShortNameList); + FsRtlInitializeFileLock(&Fcb->FileLock, NULL, NULL); return(Fcb); } @@ -107,6 +108,7 @@ { PLIST_ENTRY Entry; + FsRtlUninitializeFileLock(&Fcb->FileLock); ExDeleteResourceLite(&Fcb->PagingIoResource); ExDeleteResourceLite(&Fcb->MainResource); Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] Sat Apr 9 19:33:42 2016 @@ -41,7 +41,7 @@ /* FUNCTIONS ****************************************************************/ static NTSTATUS -CdfsReadFile(PDEVICE_EXTENSION DeviceExt, +CdfsReadFile(PCDFS_IRP_CONTEXT IrpContext, PFILE_OBJECT FileObject, PUCHAR Buffer, ULONG Length, @@ -53,6 +53,7 @@ */ { NTSTATUS Status = STATUS_SUCCESS; + PDEVICE_EXTENSION DeviceExt; PFCB Fcb; ULONG ToRead = Length; @@ -63,6 +64,7 @@ if (Length == 0) return(STATUS_SUCCESS); + DeviceExt = IrpContext->DeviceObject->DeviceExtension; Fcb = (PFCB)FileObject->FsContext; if (ReadOffset >= Fcb->Entry.DataLengthL) @@ -70,6 +72,15 @@ if (ReadOffset + Length > Fcb->Entry.DataLengthL) ToRead = Fcb->Entry.DataLengthL - ReadOffset; + + if (!(IrpFlags & IRP_PAGING_IO) && + FsRtlAreThereCurrentFileLocks(&Fcb->FileLock)) + { + if (!FsRtlCheckLockForReadAccess(&Fcb->FileLock, IrpContext->Irp)) + { + return STATUS_FILE_LOCK_CONFLICT; + } + } DPRINT("Reading %u bytes at %u\n", Length, ReadOffset); @@ -179,8 +190,6 @@ PCDFS_IRP_CONTEXT IrpContext) { PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PDEVICE_EXTENSION DeviceExt; PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; PVOID Buffer = NULL; @@ -194,17 +203,15 @@ ASSERT(IrpContext); Irp = IrpContext->Irp; - DeviceObject = IrpContext->DeviceObject; Stack = IrpContext->Stack; - DeviceExt = DeviceObject->DeviceExtension; FileObject = Stack->FileObject; ReadLength = Stack->Parameters.Read.Length; ReadOffset = Stack->Parameters.Read.ByteOffset; if (ReadLength) Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); - Status = CdfsReadFile(DeviceExt, + Status = CdfsReadFile(IrpContext, FileObject, Buffer, ReadLength,

1 0

[tfaber] 71129: [NTOS:WMI] - Avoid a memory leak in failure case of WmipGetRawSMBiosTableData. CORE-11095 #resolve
by tfaber＠svn.reactos.org 09 Apr '16

09 Apr '16

Author: tfaber Date: Sat Apr 9 16:16:12 2016 New Revision: 71129 URL: http://svn.reactos.org/svn/reactos?rev=71129&view=rev Log: [NTOS:WMI] - Avoid a memory leak in failure case of WmipGetRawSMBiosTableData. CORE-11095 #resolve Modified: trunk/reactos/ntoskrnl/wmi/smbios.c Modified: trunk/reactos/ntoskrnl/wmi/smbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/smbios.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/smbios.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/smbios.c [iso-8859-1] Sat Apr 9 16:16:12 2016 @@ -196,6 +196,7 @@ TableMapping = MmMapIoSpace(PhysicalAddress, TableSize, MmCached); if (TableMapping == NULL) { + ExFreePoolWithTag(BiosTables, 'BTMS'); return STATUS_UNSUCCESSFUL; }

1 0

[tfaber] 71128: [USBSTOR] - In USBSTOR_GetMaxLUN, correctly handle devices that do not support this request. Patch by Vadim Galyant. CORE-10515 #resolve
by tfaber＠svn.reactos.org 09 Apr '16

09 Apr '16

Author: tfaber Date: Sat Apr 9 16:13:37 2016 New Revision: 71128 URL: http://svn.reactos.org/svn/reactos?rev=71128&view=rev Log: [USBSTOR] - In USBSTOR_GetMaxLUN, correctly handle devices that do not support this request. Patch by Vadim Galyant. CORE-10515 #resolve Modified: trunk/reactos/drivers/usb/usbstor/misc.c Modified: trunk/reactos/drivers/usb/usbstor/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/misc.c [iso-8859-1] Sat Apr 9 16:13:37 2016 @@ -23,7 +23,7 @@ NTAPI USBSTOR_SyncForwardIrpCompletionRoutine( PDEVICE_OBJECT DeviceObject, - PIRP Irp, + PIRP Irp, PVOID Context) { if (Irp->PendingReturned) @@ -362,19 +362,34 @@ DPRINT("MaxLUN: %x\n", *Buffer); - if (*Buffer > 0xF) - { - // - // invalid response documented in usb mass storage specification - // - Status = STATUS_DEVICE_DATA_ERROR; + if (NT_SUCCESS(Status)) + { + if (*Buffer > 0xF) + { + // + // invalid response documented in usb mass storage specification + // + Status = STATUS_DEVICE_DATA_ERROR; + } + else + { + // + // store maxlun + // + DeviceExtension->MaxLUN = *Buffer; + } } else { // - // store maxlun - // - DeviceExtension->MaxLUN = *Buffer; + // "USB Mass Storage Class. Bulk-Only Transport. Revision 1.0" + // 3.2 Get Max LUN (class-specific request) : + // Devices that do not support multiple LUNs may STALL this command. + // + USBSTOR_ResetDevice(DeviceExtension->LowerDeviceObject, DeviceExtension); + + DeviceExtension->MaxLUN = 0; + Status = STATUS_SUCCESS; } //

1 0

[tfaber] 71127: [COM_APITEST] - Add even more interfaces
by tfaber＠svn.reactos.org 09 Apr '16

09 Apr '16

Author: tfaber Date: Sat Apr 9 15:13:01 2016 New Revision: 71127 URL: http://svn.reactos.org/svn/reactos?rev=71127&view=rev Log: [COM_APITEST] - Add even more interfaces Modified: trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/ieframe.c trunk/rostests/apitests/com/shell32.c 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] Sat Apr 9 15:13:01 2016 @@ -73,6 +73,7 @@ { ID_NAME(IID_IBrowserService4), TRUE }, { ID_NAME(IID_ICDBurn) }, { ID_NAME(IID_ICDBurnExt) }, + { ID_NAME(IID_ICDBurnPriv) }, { ID_NAME(IID_ICallFactory), TRUE }, { ID_NAME(IID_IClassFactory) }, { ID_NAME(IID_IClassFactory2) }, @@ -109,6 +110,7 @@ { ID_NAME(IID_IDeskBar), TRUE }, { ID_NAME(IID_IDeskBarClient), TRUE }, { ID_NAME(IID_IDeskMovr), TRUE }, + { ID_NAME(IID_IDiscMasterProgressEvents) }, { ID_NAME(IID_IDispatch) }, { ID_NAME(IID_IDispatchEx) }, { ID_NAME(IID_IDockingWindow) }, @@ -116,9 +118,11 @@ { ID_NAME(IID_IDockingWindowSite), TRUE }, { ID_NAME(IID_IDocViewSite), TRUE }, { ID_NAME(IID_IDragSourceHelper), TRUE }, + { ID_NAME(IID_IDriveFolderExt) }, { ID_NAME(IID_IDropSource) }, { ID_NAME(IID_IDropTarget) }, { ID_NAME(IID_IDropTargetHelper), TRUE }, + { ID_NAME(IID_IEFrameAuto) }, { ID_NAME(IID_IEnumExtraSearch) }, { ID_NAME(IID_IEnumGUID) }, { ID_NAME(IID_IEnumIDList) }, @@ -161,9 +165,12 @@ { ID_NAME(IID_IGlobalFolderSettings), TRUE }, { ID_NAME(IID_IHWEventHandler) }, { ID_NAME(IID_IHWEventHandler2) }, + { ID_NAME(IID_IHlinkFrame) }, { ID_NAME(IID_IImageList), TRUE }, { ID_NAME(IID_IImageList2), TRUE }, { ID_NAME(IID_IInitializeObject), TRUE }, + { ID_NAME(IID_IInitializeWithBindCtx) }, + { ID_NAME(IID_IInitializeWithFile) }, { ID_NAME(IID_IInputObject) }, { ID_NAME(IID_IInputObjectSite) }, { ID_NAME(IID_IInternalUnknown), TRUE }, @@ -195,6 +202,7 @@ { ID_NAME(IID_INetConnectionPropertyUi2), TRUE }, { ID_NAME(IID_INetConnectionManager) }, { ID_NAME(IID_INetLanConnectionUiInfo), TRUE }, + { ID_NAME(IID_INewMenuClient) }, { ID_NAME(IID_INewShortcutHookA), TRUE }, { ID_NAME(IID_INewShortcutHookW), TRUE }, { ID_NAME(IID_INewWindowManager) }, @@ -245,6 +253,7 @@ { ID_NAME(IID_IProvideClassInfo) }, { ID_NAME(IID_IProvideClassInfo2) }, { ID_NAME(IID_IQueryAssociations), TRUE }, + { ID_NAME(IID_IQueryCancelAutoPlay) }, { ID_NAME(IID_IQueryInfo), TRUE }, { ID_NAME(IID_IQuickActivate) }, { ID_NAME(IID_IRegTreeOptions), TRUE }, @@ -252,12 +261,14 @@ { ID_NAME(IID_IResolveShellLink) }, { ID_NAME(IID_IRpcOptions), TRUE }, { ID_NAME(IID_IRunnableObject) }, + { ID_NAME(IID_ISLTracker) }, { ID_NAME(IID_IScriptErrorList) }, { ID_NAME(IID_ISearch) }, { ID_NAME(IID_ISearchAssistantOC) }, { ID_NAME(IID_ISearchAssistantOC2) }, { ID_NAME(IID_ISearchAssistantOC3) }, { ID_NAME(IID_ISearches) }, + { ID_NAME(IID_ISecMgrCacheSeedTarget) }, { ID_NAME(IID_IServerSecurity), TRUE }, { ID_NAME(IID_IServiceProvider) }, { ID_NAME(IID_IShellApp), TRUE }, @@ -326,21 +337,40 @@ { ID_NAME(IID_ISynchronizeContainer), TRUE }, { ID_NAME(IID_ISynchronizeEvent), TRUE }, { ID_NAME(IID_ISynchronizeHandle), TRUE }, + { ID_NAME(IID_ITargetEmbedding) }, + { ID_NAME(IID_ITargetFrame) }, + { ID_NAME(IID_ITargetFrame2) }, + { ID_NAME(IID_ITargetFramePriv) }, + { ID_NAME(IID_ITargetFramePriv2) }, + { ID_NAME(IID_ITargetNotify) }, { ID_NAME(IID_ITaskbarList) }, { ID_NAME(IID_ITaskbarList2) }, { ID_NAME(IID_ITrackShellMenu), TRUE }, + /* This interface is completely different between PSDK and registry/shell32 */ + { ID_NAME(IID_ITransferAdviseSink), TRUE }, +#define IID_ITransferAdviseSink IID_ITransferAdviseSinkPriv + { ID_NAME(IID_ITransferAdviseSink) }, +#undef IID_ITransferAdviseSink + { ID_NAME(IID_ITransferDestination), TRUE }, + { ID_NAME(IID_ITransferSource), TRUE }, { ID_NAME(IID_ITranslateShellChangeNotify), TRUE }, { ID_NAME(IID_ITrayPriv), TRUE }, { ID_NAME(IID_ITrayPriv2), TRUE }, { ID_NAME(IID_IUnknown) }, { ID_NAME(IID_IURLSearchHook), TRUE }, { ID_NAME(IID_IURLSearchHook2), TRUE }, + { ID_NAME(IID_IUrlHistoryNotify) }, + { ID_NAME(IID_IUrlHistoryStg) }, + { ID_NAME(IID_IUrlHistoryStg2) }, { ID_NAME(IID_IViewObject) }, { ID_NAME(IID_IViewObject2) }, { ID_NAME(IID_IViewObjectEx), TRUE }, + { ID_NAME(IID_IVisualProperties) }, { ID_NAME(IID_IWebBrowser) }, { ID_NAME(IID_IWebBrowser2) }, { ID_NAME(IID_IWebBrowserApp) }, + { ID_NAME(IID_IWebBrowserPriv) }, + { ID_NAME(IID_IWebBrowserPriv2) }, { ID_NAME(IID_IWinEventHandler), TRUE }, { ID_NAME(IID_DFConstraint), 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] Sat Apr 9 15:13:01 2016 @@ -39,6 +39,10 @@ #include <shlwapi.h> #include <commoncontrols.h> #include <activscp.h> +#include <urlhist.h> +#include <htiface.h> +#include <htiframe.h> +#include <mshtml.h> #include <ndk/rtlfuncs.h> #include <initguid.h> @@ -114,6 +118,7 @@ DEFINE_OLEGUID(IID_ICopyHookW, 0x000214fc, 0x0000, 0x0000); DEFINE_GUID(IID_ICDBurn, 0x3d73a659, 0xe5d0, 0x4d42, 0xaf, 0xc0, 0x51, 0x21, 0xba, 0x42, 0x5c, 0x8d); DEFINE_GUID(IID_ICDBurnExt, 0x2271dcca, 0x74fc, 0x4414, 0x8f, 0xb7, 0xc5, 0x6b, 0x05, 0xac, 0xe2, 0xd7); +DEFINE_GUID(IID_ICDBurnPriv, 0xc3d92d66, 0x68ad, 0x4b2a, 0x86, 0xf5, 0x4d, 0xfe, 0x97, 0xfb, 0xd2, 0xc7); DEFINE_GUID(IID_ICompositeFolder, 0x601ac3dd, 0x786a, 0x4eb0, 0xbf, 0x40, 0xee, 0x35, 0x21, 0xe7, 0x0b, 0xfb); DEFINE_GUID(IID_IDVGetEnum, 0x70f55181, 0x5fea, 0x4900, 0xb6, 0xb8, 0x73, 0x43, 0xcb, 0x0a, 0x34, 0x8c); DEFINE_GUID(IID_IDefViewID, 0x985f64f0, 0xd410, 0x4e02, 0xbe, 0x22, 0xda, 0x07, 0xf2, 0xb5, 0xc5, 0xe1); @@ -124,7 +129,10 @@ DEFINE_GUID(IID_IDefViewScript, 0x4706b500, 0x09ef, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x44, 0x97); DEFINE_GUID(IID_IDeskBandEx, 0x5dd6b79a, 0x3ab7, 0x49c0, 0xab, 0x82, 0x6b, 0x2d, 0xa7, 0xd7, 0x8d, 0x75); DEFINE_GUID(IID_IDeskMovr, 0x72267f69, 0xa6f9, 0x11d0, 0xbc, 0x94, 0x00, 0xc0, 0x4f, 0xb6, 0x78, 0x63); +DEFINE_GUID(IID_IDiscMasterProgressEvents, 0xec9e51c1, 0x4e5d, 0x11d3, 0x91, 0x44, 0x00, 0x10, 0x4b, 0xa1, 0x1c, 0x5e); DEFINE_GUID(IID_IDocViewSite, 0x87D605E0, 0xC511, 0x11CF, 0x89, 0xA9, 0x00, 0xA0, 0xC9, 0x05, 0x41, 0x29); +DEFINE_GUID(IID_IDriveFolderExt, 0x98467961, 0x4f27, 0x4a1f, 0x96, 0x29, 0x22, 0xb0, 0x6d, 0x0b, 0x5c, 0xcb); +DEFINE_GUID(IID_IEFrameAuto, 0x0b7b9bb9, 0xade1, 0x4ea0, 0xa4, 0xb6, 0x02, 0xb9, 0xc6, 0x6e, 0x31, 0x69); DEFINE_GUID(IID_IExtractImage, 0xbb2e617c, 0x0920, 0x11d1, 0x9a, 0x0b, 0x00, 0xc0, 0x4f, 0xc2, 0xd6, 0xc1); DEFINE_GUID(IID_IExtractImage2, 0x953bb1ee, 0x93b4, 0x11d1, 0x98, 0xa3, 0x00, 0xc0, 0x4f, 0xb6, 0x87, 0xda); DEFINE_GUID(IID_IFileSearchBand, 0x2d91eea1, 0x9932, 0x11d2, 0xbe, 0x86, 0x00, 0xa0, 0xc9, 0xa8, 0x3d, 0xa1); @@ -137,17 +145,21 @@ DEFINE_GUID(IID_IGetNameSpaceExtensionPointer,0x287d4a71, 0x439f, 0x43a4, 0x8d, 0x5b, 0x0e, 0x0a, 0xe7, 0x1e, 0x84, 0xa9); DEFINE_GUID(IID_IHWEventHandler, 0xc1fb73d0, 0xec3a, 0x4ba2, 0xb5, 0x12, 0x8c, 0xdb, 0x91, 0x87, 0xb6, 0xd1); DEFINE_GUID(IID_IHWEventHandler2, 0xcfcc809f, 0x295d, 0x42e8, 0x9f, 0xfc, 0x42, 0x4b, 0x33, 0xc4, 0x87, 0xe6); +DEFINE_GUID(IID_IInitializeWithBindCtx, 0x71c0d2bc, 0x726d, 0x45cc, 0xa6, 0xc0, 0x2e, 0x31, 0xc1, 0xdb, 0x21, 0x59); DEFINE_GUID(IID_IItemNameLimits, 0x1df0d7f1, 0xb267, 0x4d28, 0x8b, 0x10, 0x12, 0xe2, 0x32, 0x02, 0xa5, 0xc4); DEFINE_GUID(IID_IMultiMonitorDockingSite, 0x03879de0, 0xa205, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); DEFINE_GUID(IID_INamespaceWalk, 0x57ced8a7, 0x3f4a, 0x432c, 0x93, 0x50, 0x30, 0xf2, 0x44, 0x83, 0xf7, 0x4f); DEFINE_GUID(IID_INamespaceWalkCB, 0xd92995f8, 0xcf5e, 0x4a76, 0xbf, 0x59, 0xea, 0xd3, 0x9e, 0xa2, 0xb9, 0x7e); DEFINE_GUID(IID_INamespaceWalkCB2, 0x7ac7492b, 0xc38e, 0x438a, 0x87, 0xdb, 0x68, 0x73, 0x78, 0x44, 0xff, 0x70); +DEFINE_GUID(IID_INewMenuClient, 0xdcb07fdc, 0x3bb5, 0x451c, 0x90, 0xbe, 0x96, 0x66, 0x44, 0xfe, 0xd7, 0xb0); DEFINE_GUID(IID_IObjectWithBackReferences, 0x321a6a6a, 0xd61f, 0x4bf3, 0x97, 0xae, 0x14, 0xbe, 0x29, 0x86, 0xbb, 0x36); DEFINE_GUID(IID_IParentAndItem, 0xB3A4B685, 0xB685, 0x4805, 0x99, 0xD9, 0x5D, 0xEA, 0xD2, 0x87, 0x32, 0x36); DEFINE_GUID(IID_IPersistFreeThreadedObject,0xc7264bf0, 0xedb6, 0x11d1, 0x85, 0x46, 0x00, 0x60, 0x08, 0x05, 0x93, 0x68); DEFINE_GUID(IID_IPreviewHandler, 0x8895b1c6, 0xb41f, 0x4c1c, 0xa5, 0x62, 0x0d, 0x56, 0x42, 0x50, 0x83, 0x6f); 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_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); DEFINE_GUID(IID_IShellDispatch4, 0xefd84b2d, 0x4bcf, 0x4298, 0xbe, 0x25, 0xeb, 0x54, 0x2a, 0x59, 0xfb, 0xda); @@ -167,8 +179,12 @@ DEFINE_GUID(IID_IShellLinkDual, 0x88a05c00, 0xf000, 0x11ce, 0x83, 0x50, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); DEFINE_GUID(IID_IShellLinkDual2, 0x317ee249, 0xf12e, 0x11d2, 0xb1, 0xe4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); DEFINE_GUID(IID_IShellView3, 0xec39fa88, 0xf8af, 0x41c5, 0x84, 0x21, 0x38, 0xbe, 0xd2, 0x8f, 0x46, 0x73); +DEFINE_GUID(IID_ITargetEmbedding, 0x548793c0, 0x9e74, 0x11cf, 0x96, 0x55, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0x23); +DEFINE_GUID(IID_ITransferAdviseSinkPriv, 0xd082c196, 0xa2b2, 0x41ff, 0xa5, 0xe5, 0x80, 0xef, 0xf9, 0x1b, 0x7d, 0x79); DEFINE_GUID(IID_ITranslateShellChangeNotify,0xb4df2675, 0xba23, 0x11d2, 0xb5, 0xee, 0x00, 0x60, 0x97, 0xc6, 0x86, 0xf6); DEFINE_GUID(IID_IViewObjectEx, 0x3af24292, 0x0c96, 0x11ce, 0xa0, 0xcf, 0x00, 0xaa, 0x00, 0x60, 0x0a, 0xb8); +DEFINE_GUID(IID_IVisualProperties, 0xe693cf68, 0xd967, 0x4112, 0x87, 0x63, 0x99, 0x17, 0x2a, 0xee, 0x5e, 0x5a); +DEFINE_GUID(IID_IWebBrowserPriv2, 0x486f6159, 0x9f3f, 0x4827, 0x82, 0xd4, 0x28, 0x3c, 0xef, 0x39, 0x77, 0x33); DEFINE_GUID(IID_DFConstraint, 0x403df050, 0x23bd, 0x11d2, 0x93, 0x9f, 0x00, 0xa0, 0xc9, 0x1e, 0xed, 0xba); 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] Sat Apr 9 15:13:01 2016 @@ -30,7 +30,9 @@ { ID_NAME(CLSID_CUrlHistory), { - { 0x0, &IID_IUnknown }, + { 0x0, &IID_IUrlHistoryStg2 }, + { 0x0, &IID_IUrlHistoryStg }, + { 0x0, &IID_IUnknown }, } }, { @@ -65,6 +67,8 @@ { 0x44, &IID_IOleCommandTarget }, { 0x48, &IID_IServiceProvider }, { 0x4c, &IID_IPropertyStore }, + { 0x50, &IID_IInitializeWithFile }, + { 0x54, &IID_IInitializeWithBindCtx }, } }, { @@ -106,8 +110,10 @@ { 0xbc, &IID_INSCTree }, { 0xc4, &IID_IShellBrowser }, { 0xc8, &IID_IFolderFilterSite }, + { 0xcc, &IID_INewMenuClient }, { 0xd0, &IID_IServiceProvider }, { 0xd4, &IID_INameSpaceTreeControl }, + { 0xe0, &IID_IVisualProperties }, { 0xe4, &IID_IWinEventHandler }, } }, @@ -152,10 +158,22 @@ { 0x120, &IID_IDispatch }, { 0x130, &IID_IOleCommandTarget }, { 0x134, &IID_IObjectSafety }, + { 0x13c, &IID_ITargetEmbedding }, { 0x140, &IID_IPersistStorage }, { 0x144, &IID_IPersistHistory }, { FARAWY, &IID_IShellService }, { FARAWY, &IID_IServiceProvider }, + { FARAWY, &IID_IHlinkFrame }, + { FARAWY, &IID_IUrlHistoryNotify }, + { FARAWY, &IID_ITargetFrame2 }, + { FARAWY, &IID_ITargetNotify }, + { FARAWY, &IID_ITargetFramePriv2 }, + { FARAWY, &IID_ITargetFramePriv }, + { FARAWY, &IID_IEFrameAuto }, + { FARAWY, &IID_IWebBrowserPriv }, + { FARAWY, &IID_IWebBrowserPriv2 }, + { FARAWY, &IID_ISecMgrCacheSeedTarget }, + { FARAWY, &IID_ITargetFrame }, } }, { @@ -183,10 +201,22 @@ { 0x120, &IID_IDispatch }, { 0x130, &IID_IOleCommandTarget }, { 0x134, &IID_IObjectSafety }, + { 0x13c, &IID_ITargetEmbedding }, { 0x140, &IID_IPersistStorage }, { 0x144, &IID_IPersistHistory }, { FARAWY, &IID_IShellService }, { FARAWY, &IID_IServiceProvider }, + { FARAWY, &IID_IHlinkFrame }, + { FARAWY, &IID_IUrlHistoryNotify }, + { FARAWY, &IID_ITargetFrame2 }, + { FARAWY, &IID_ITargetNotify }, + { FARAWY, &IID_ITargetFramePriv2 }, + { FARAWY, &IID_ITargetFramePriv }, + { FARAWY, &IID_IEFrameAuto }, + { FARAWY, &IID_IWebBrowserPriv }, + { FARAWY, &IID_IWebBrowserPriv2 }, + { FARAWY, &IID_ISecMgrCacheSeedTarget }, + { FARAWY, &IID_ITargetFrame }, } }, }; Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Sat Apr 9 15:13:01 2016 @@ -20,13 +20,18 @@ { 0x8, &IID_IShellExtInit }, { 0xc, &IID_IContextMenu }, { 0x10, &IID_IShellPropSheetExt }, + { 0x14, &IID_IDiscMasterProgressEvents }, { 0x18, &IID_IDropTarget }, { 0x1c, &IID_IPersistFile }, { 0x20, &IID_IOleCommandTarget }, { 0x24, &IID_ICDBurn }, + { 0x28, &IID_ICDBurnPriv }, { 0x2c, &IID_IPersistPropertyBag }, + { 0x30, &IID_IDriveFolderExt }, { 0x34, &IID_INamespaceWalkCB }, { 0x3c, &IID_IServiceProvider }, + { 0x40, &IID_ITransferAdviseSinkPriv }, + { 0x44, &IID_IQueryCancelAutoPlay }, } }, { @@ -550,6 +555,7 @@ { 0x38, &IID_IFilter }, { 0x3c, &IID_IObjectWithSite }, { 0x44, &IID_ICustomizeInfoTip }, + { FARAWY, &IID_ISLTracker }, } }, #if 0 // Apparently we can only get this through Folder.Items().GetLink

1 0

[tfaber] 71126: [COM_APITEST] - Add some more interfaces
by tfaber＠svn.reactos.org 09 Apr '16

09 Apr '16

Author: tfaber Date: Sat Apr 9 14:05:08 2016 New Revision: 71126 URL: http://svn.reactos.org/svn/reactos?rev=71126&view=rev Log: [COM_APITEST] - Add some more interfaces Modified: 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/shell32.c 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] Sat Apr 9 14:05:08 2016 @@ -81,8 +81,10 @@ { ID_NAME(IID_ICommDlgBrowser) }, { ID_NAME(IID_ICommDlgBrowser2) }, { ID_NAME(IID_ICommDlgBrowser3) }, + { ID_NAME(IID_ICompositeFolder) }, { ID_NAME(IID_IComputerInfoChangeNotify), }, { ID_NAME(IID_IComThreadingInfo), TRUE }, + { ID_NAME(IID_IConnectionPointContainer) }, { ID_NAME(IID_IContext), TRUE }, { ID_NAME(IID_IContextMenu), TRUE }, { ID_NAME(IID_IContextMenu2), TRUE }, @@ -92,6 +94,7 @@ { ID_NAME(IID_IContinue) }, { ID_NAME(IID_ICopyHookA), TRUE }, { ID_NAME(IID_ICopyHookW), TRUE }, + { ID_NAME(IID_ICustomizeInfoTip) }, { ID_NAME(IID_IDVGetEnum), TRUE }, { ID_NAME(IID_IDataObject) }, //{ ID_NAME(IID_IDefViewID) }, == DefViewFrame3 @@ -107,6 +110,7 @@ { ID_NAME(IID_IDeskBarClient), TRUE }, { ID_NAME(IID_IDeskMovr), TRUE }, { ID_NAME(IID_IDispatch) }, + { ID_NAME(IID_IDispatchEx) }, { ID_NAME(IID_IDockingWindow) }, { ID_NAME(IID_IDockingWindowFrame), TRUE }, { ID_NAME(IID_IDockingWindowSite), TRUE }, @@ -143,6 +147,7 @@ { ID_NAME(IID_IFileViewerA), TRUE }, { ID_NAME(IID_IFileViewerSite), TRUE }, { ID_NAME(IID_IFileViewerW), TRUE }, + { ID_NAME(IID_IFilter) }, { ID_NAME(IID_IFolderBandPriv) }, { ID_NAME(IID_IFolderFilter) }, { ID_NAME(IID_IFolderFilterSite) }, @@ -162,6 +167,7 @@ { ID_NAME(IID_IInputObject) }, { ID_NAME(IID_IInputObjectSite) }, { ID_NAME(IID_IInternalUnknown), TRUE }, + { ID_NAME(IID_IItemNameLimits) }, { ID_NAME(IID_IMarshal) }, { ID_NAME(IID_IMarshal2), TRUE }, { ID_NAME(IID_IMenuBand), TRUE }, @@ -196,8 +202,12 @@ { ID_NAME(IID_INSCTree2), TRUE }, { ID_NAME(IID_IObjMgr), TRUE }, { ID_NAME(IID_IObjectSafety) }, + { ID_NAME(IID_IObjectWithBackReferences) }, { ID_NAME(IID_IObjectWithSite) }, + { ID_NAME(IID_IOleClientSite) }, { ID_NAME(IID_IOleCommandTarget) }, + { ID_NAME(IID_IOleControl) }, + { ID_NAME(IID_IOleControlSite) }, { ID_NAME(IID_IOleInPlaceActiveObject) }, { ID_NAME(IID_IOleInPlaceFrame) }, { ID_NAME(IID_IOleInPlaceObject) }, @@ -208,6 +218,7 @@ { ID_NAME(IID_IOleInPlaceUIWindow) }, { ID_NAME(IID_IOleObject) }, { ID_NAME(IID_IOleWindow) }, + { ID_NAME(IID_IParentAndItem) }, { ID_NAME(IID_IPersist) }, { ID_NAME(IID_IPersistFile) }, { ID_NAME(IID_IPersistFolder) }, @@ -228,9 +239,14 @@ { ID_NAME(IID_IProgressDialog), TRUE }, { ID_NAME(IID_IPropertyBag) }, { ID_NAME(IID_IPropertyBag2) }, + { ID_NAME(IID_IPropertySetStorage) }, + { ID_NAME(IID_IPropertyStore) }, { ID_NAME(IID_IPropSheetPage), TRUE }, + { ID_NAME(IID_IProvideClassInfo) }, + { ID_NAME(IID_IProvideClassInfo2) }, { ID_NAME(IID_IQueryAssociations), TRUE }, { ID_NAME(IID_IQueryInfo), TRUE }, + { ID_NAME(IID_IQuickActivate) }, { ID_NAME(IID_IRegTreeOptions), TRUE }, { ID_NAME(IID_IRemoteComputer) }, { ID_NAME(IID_IResolveShellLink) }, @@ -302,6 +318,7 @@ { ID_NAME(IID_IShellView2) }, { ID_NAME(IID_IShellView3) }, { ID_NAME(IID_IShellWindows) }, + { ID_NAME(IID_ISpecifyPropertyPages) }, { ID_NAME(IID_IStorage) }, { ID_NAME(IID_IStream) }, { ID_NAME(IID_ISurrogate) }, 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] Sat Apr 9 14:05:08 2016 @@ -23,6 +23,7 @@ #include <oleacc.h> #include <oledb.h> #include <oaidl.h> +#include <dispex.h> #include <netcon.h> #include <netcfgx.h> #include <netcfgn.h> @@ -107,11 +108,13 @@ DEFINE_GUID(IID_IBandHost, 0xb9075c7c, 0xd48e, 0x403f, 0xab, 0x99, 0xd6, 0xc7, 0x7a, 0x10, 0x84, 0xac); DEFINE_GUID(IID_IBrowserFrameOptions, 0x10df43c8, 0x1dbe, 0x11d3, 0x8b, 0x34, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4); DEFINE_GUID(IID_IComputerInfoChangeNotify, 0x0df60d92, 0x6818, 0x46d6, 0xb3, 0x58, 0xd6, 0x61, 0x70, 0xdd, 0xe4, 0x66); +DEFINE_GUID(IID_ICustomizeInfoTip, 0xda22171f, 0x70b4, 0x43db, 0xb3, 0x8f, 0x29, 0x67, 0x41, 0xd1, 0x49, 0x4c); DEFINE_OLEGUID(IID_IContext, 0x000001c0, 0x0000, 0x0000); DEFINE_OLEGUID(IID_ICopyHookA, 0x000214ef, 0x0000, 0x0000); DEFINE_OLEGUID(IID_ICopyHookW, 0x000214fc, 0x0000, 0x0000); DEFINE_GUID(IID_ICDBurn, 0x3d73a659, 0xe5d0, 0x4d42, 0xaf, 0xc0, 0x51, 0x21, 0xba, 0x42, 0x5c, 0x8d); DEFINE_GUID(IID_ICDBurnExt, 0x2271dcca, 0x74fc, 0x4414, 0x8f, 0xb7, 0xc5, 0x6b, 0x05, 0xac, 0xe2, 0xd7); +DEFINE_GUID(IID_ICompositeFolder, 0x601ac3dd, 0x786a, 0x4eb0, 0xbf, 0x40, 0xee, 0x35, 0x21, 0xe7, 0x0b, 0xfb); DEFINE_GUID(IID_IDVGetEnum, 0x70f55181, 0x5fea, 0x4900, 0xb6, 0xb8, 0x73, 0x43, 0xcb, 0x0a, 0x34, 0x8c); DEFINE_GUID(IID_IDefViewID, 0x985f64f0, 0xd410, 0x4e02, 0xbe, 0x22, 0xda, 0x07, 0xf2, 0xb5, 0xc5, 0xe1); DEFINE_GUID(IID_IDefViewFrame, 0x710EB7A0, 0x45ED, 0x11D0, 0x92, 0x4A, 0x00, 0x20, 0xAF, 0xC7, 0xAC, 0x4D); @@ -125,6 +128,7 @@ DEFINE_GUID(IID_IExtractImage, 0xbb2e617c, 0x0920, 0x11d1, 0x9a, 0x0b, 0x00, 0xc0, 0x4f, 0xc2, 0xd6, 0xc1); DEFINE_GUID(IID_IExtractImage2, 0x953bb1ee, 0x93b4, 0x11d1, 0x98, 0xa3, 0x00, 0xc0, 0x4f, 0xb6, 0x87, 0xda); DEFINE_GUID(IID_IFileSearchBand, 0x2d91eea1, 0x9932, 0x11d2, 0xbe, 0x86, 0x00, 0xa0, 0xc9, 0xa8, 0x3d, 0xa1); +DEFINE_GUID(IID_IFilter, 0x89bcb740, 0x6119, 0x101a, 0xbc, 0xb7, 0x00, 0xdd, 0x01, 0x06, 0x55, 0xaf); DEFINE_GUID(IID_IFolderBandPriv, 0x47c01f95, 0xe185, 0x412c, 0xb5, 0xc5, 0x4f, 0x27, 0xdf, 0x96, 0x5a, 0xea); DEFINE_GUID(IID_IFolderFilter, 0x9cc22886, 0xdc8e, 0x11d2, 0xb1, 0xd0, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); DEFINE_GUID(IID_IFolderFilterSite, 0xc0a651f5, 0xb48b, 0x11d2, 0xb5, 0xed, 0x00, 0x60, 0x97, 0xc6, 0x86, 0xf6); @@ -133,10 +137,13 @@ DEFINE_GUID(IID_IGetNameSpaceExtensionPointer,0x287d4a71, 0x439f, 0x43a4, 0x8d, 0x5b, 0x0e, 0x0a, 0xe7, 0x1e, 0x84, 0xa9); DEFINE_GUID(IID_IHWEventHandler, 0xc1fb73d0, 0xec3a, 0x4ba2, 0xb5, 0x12, 0x8c, 0xdb, 0x91, 0x87, 0xb6, 0xd1); DEFINE_GUID(IID_IHWEventHandler2, 0xcfcc809f, 0x295d, 0x42e8, 0x9f, 0xfc, 0x42, 0x4b, 0x33, 0xc4, 0x87, 0xe6); +DEFINE_GUID(IID_IItemNameLimits, 0x1df0d7f1, 0xb267, 0x4d28, 0x8b, 0x10, 0x12, 0xe2, 0x32, 0x02, 0xa5, 0xc4); DEFINE_GUID(IID_IMultiMonitorDockingSite, 0x03879de0, 0xa205, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); DEFINE_GUID(IID_INamespaceWalk, 0x57ced8a7, 0x3f4a, 0x432c, 0x93, 0x50, 0x30, 0xf2, 0x44, 0x83, 0xf7, 0x4f); DEFINE_GUID(IID_INamespaceWalkCB, 0xd92995f8, 0xcf5e, 0x4a76, 0xbf, 0x59, 0xea, 0xd3, 0x9e, 0xa2, 0xb9, 0x7e); DEFINE_GUID(IID_INamespaceWalkCB2, 0x7ac7492b, 0xc38e, 0x438a, 0x87, 0xdb, 0x68, 0x73, 0x78, 0x44, 0xff, 0x70); +DEFINE_GUID(IID_IObjectWithBackReferences, 0x321a6a6a, 0xd61f, 0x4bf3, 0x97, 0xae, 0x14, 0xbe, 0x29, 0x86, 0xbb, 0x36); +DEFINE_GUID(IID_IParentAndItem, 0xB3A4B685, 0xB685, 0x4805, 0x99, 0xD9, 0x5D, 0xEA, 0xD2, 0x87, 0x32, 0x36); DEFINE_GUID(IID_IPersistFreeThreadedObject,0xc7264bf0, 0xedb6, 0x11d1, 0x85, 0x46, 0x00, 0x60, 0x08, 0x05, 0x93, 0x68); DEFINE_GUID(IID_IPreviewHandler, 0x8895b1c6, 0xb41f, 0x4c1c, 0xa5, 0x62, 0x0d, 0x56, 0x42, 0x50, 0x83, 0x6f); DEFINE_GUID(IID_IPreviewHandlerFrame, 0xfec87aaf, 0x35f9, 0x447a, 0xad, 0xb7, 0x20, 0x23, 0x44, 0x91, 0x40, 0x1a); 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] Sat Apr 9 14:05:08 2016 @@ -15,6 +15,7 @@ { ID_NAME(CLSID_Internet), { + { -0x18, &IID_IObjectWithBackReferences }, { -0x14, &IID_IShellFolder2 }, { -0x14, &IID_IShellFolder }, { -0x10, &IID_IPersistFolder2 }, @@ -56,12 +57,14 @@ { 0x10, &IID_IShellLinkA }, { 0x14, &IID_IShellLinkW }, { 0x18, &IID_IShellPropSheetExt }, + { 0x1c, &IID_IPropertySetStorage }, { 0x20, &IID_INewShortcutHookA }, { 0x24, &IID_INewShortcutHookW }, { 0x30, &IID_IQueryInfo }, { 0x38, &IID_IObjectWithSite }, { 0x44, &IID_IOleCommandTarget }, { 0x48, &IID_IServiceProvider }, + { 0x4c, &IID_IPropertyStore }, } }, { @@ -73,6 +76,7 @@ { 0x14, &IID_IShellUIHelper2 }, { 0x14, &IID_IShellUIHelper }, { 0x14, &IID_IDispatch }, + { 0x18, &IID_IDispatchEx }, } }, { @@ -82,8 +86,12 @@ { 0x0, &IID_IShellFavoritesNameSpace }, { 0x0, &IID_IDispatch }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IProvideClassInfo2 }, + { 0x4, &IID_IProvideClassInfo }, { 0x8, &IID_IPersistStreamInit }, { 0x10, &IID_IPersistPropertyBag }, + { 0x14, &IID_IQuickActivate }, + { 0x18, &IID_IOleControl }, { 0x1c, &IID_IOleObject }, { 0x20, &IID_IOleInPlaceActiveObject }, { 0x24, &IID_IViewObjectEx }, @@ -92,6 +100,7 @@ { 0x28, &IID_IOleInPlaceObjectWindowless }, { 0x28, &IID_IOleInPlaceObject }, { 0x28, &IID_IOleWindow }, + { 0x38, &IID_IConnectionPointContainer }, { 0x3c, &IID_IDropTarget }, { 0xb4, &IID_IObjectWithSite }, { 0xbc, &IID_INSCTree }, @@ -115,6 +124,7 @@ { 0x0, &IID_IUnknown }, { FARAWY, &IID_IShellWindows }, { FARAWY, &IID_IDispatch }, + { FARAWY, &IID_IConnectionPointContainer }, } }, { @@ -132,6 +142,10 @@ { 0x98, &IID_IPersistStream }, { 0x98, &IID_IPersistStreamInit }, { 0x9c, &IID_IPersistPropertyBag }, + { 0xa0, &IID_IOleControl }, + { 0xa8, &IID_IProvideClassInfo2 }, + { 0xa8, &IID_IProvideClassInfo }, + { 0xac, &IID_IConnectionPointContainer }, { 0x120, &IID_IWebBrowser2 }, { 0x120, &IID_IWebBrowserApp }, { 0x120, &IID_IWebBrowser }, @@ -159,6 +173,10 @@ { 0x98, &IID_IPersistStream }, { 0x98, &IID_IPersistStreamInit }, { 0x9c, &IID_IPersistPropertyBag }, + { 0xa0, &IID_IOleControl }, + { 0xa8, &IID_IProvideClassInfo2 }, + { 0xa8, &IID_IProvideClassInfo }, + { 0xac, &IID_IConnectionPointContainer }, { 0x120, &IID_IWebBrowser2 }, { 0x120, &IID_IWebBrowserApp }, { 0x120, &IID_IWebBrowser }, 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] Sat Apr 9 14:05:08 2016 @@ -95,6 +95,10 @@ { 0x0, &IID_ISearchAssistantOC }, { 0x0, &IID_IDispatch }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IProvideClassInfo2 }, + { 0x4, &IID_IProvideClassInfo }, + { 0x8, &IID_IQuickActivate }, + { 0xc, &IID_IOleControl }, { 0x10, &IID_IOleObject }, { 0x14, &IID_IOleInPlaceActiveObject }, { 0x18, &IID_IViewObjectEx }, @@ -104,6 +108,7 @@ { 0x1c, &IID_IOleInPlaceObject }, { 0x1c, &IID_IOleWindow }, { 0x20, &IID_IDataObject }, + { 0x30, &IID_IConnectionPointContainer }, { 0x34, &IID_IObjectSafety }, { 0x3c, &IID_IOleCommandTarget }, { 0x40, &IID_IObjectWithSite }, @@ -116,6 +121,10 @@ { 0x0, &IID_ISearchAssistantOC }, { 0x0, &IID_IDispatch }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IProvideClassInfo2 }, + { 0x4, &IID_IProvideClassInfo }, + { 0x8, &IID_IQuickActivate }, + { 0xc, &IID_IOleControl }, { 0x10, &IID_IOleObject }, { 0x14, &IID_IOleInPlaceActiveObject }, { 0x18, &IID_IViewObjectEx }, @@ -125,6 +134,7 @@ { 0x1c, &IID_IOleInPlaceObject }, { 0x1c, &IID_IOleWindow }, { 0x20, &IID_IDataObject }, + { 0x30, &IID_IConnectionPointContainer }, { 0x34, &IID_IObjectSafety }, { 0x3c, &IID_IOleCommandTarget }, { 0x40, &IID_IObjectWithSite }, @@ -137,8 +147,12 @@ { 0x0, &IID_IShellFavoritesNameSpace }, { 0x0, &IID_IDispatch }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IProvideClassInfo2 }, + { 0x4, &IID_IProvideClassInfo }, { 0x8, &IID_IPersistStreamInit }, { 0xc, &IID_IPersistPropertyBag }, + { 0x10, &IID_IQuickActivate }, + { 0x14, &IID_IOleControl }, { 0x18, &IID_IOleObject }, { 0x1c, &IID_IOleInPlaceActiveObject }, { 0x20, &IID_IViewObjectEx }, @@ -147,6 +161,8 @@ { 0x24, &IID_IOleInPlaceObjectWindowless }, { 0x24, &IID_IOleInPlaceObject }, { 0x24, &IID_IOleWindow }, + { 0x28, &IID_ISpecifyPropertyPages }, + { 0x38, &IID_IConnectionPointContainer }, { 0x3c, &IID_IShellChangeNotify }, { 0x40, &IID_IDropTarget }, { 0xb4, &IID_IObjectWithSite }, Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Sat Apr 9 14:05:08 2016 @@ -60,6 +60,7 @@ { 0x70, &IID_IDeskMovr }, { 0x74, &IID_IOleObject }, { 0x78, &IID_IPersistPropertyBag }, + { 0x7c, &IID_IOleControl }, { 0x80, &IID_IOleInPlaceActiveObject }, { 0x84, &IID_IViewObjectEx }, { 0x84, &IID_IViewObject2 }, @@ -67,6 +68,7 @@ { 0x88, &IID_IOleWindow }, { 0x88, &IID_IOleInPlaceObject }, { 0x88, &IID_IOleInPlaceObjectWindowless }, + { 0x8c, &IID_IQuickActivate }, } }, { @@ -96,7 +98,9 @@ { 0xc, &IID_IDockingWindow }, { 0xc, &IID_IOleWindow }, { 0x10, &IID_IInputObject }, + { 0x14, &IID_IOleClientSite }, { 0x18, &IID_IOleInPlaceSite }, + { 0x1c, &IID_IOleControlSite }, } }, { @@ -111,6 +115,7 @@ { 0x4, &IID_IPersistFolder }, { 0x4, &IID_IPersist }, { 0x8, &IID_IObjectSafety }, + { 0x10, &IID_IParentAndItem }, } }, { @@ -254,6 +259,8 @@ { 0xc, &IID_IPersist }, { 0x10, &IID_IPersistPropertyBag }, { 0x14, &IID_IShellIconOverlay }, + { 0x18, &IID_ICompositeFolder }, + { 0x1c, &IID_IItemNameLimits }, } }, { @@ -296,6 +303,8 @@ { FARAWY, &IID_IStorage }, { FARAWY, &IID_IContextMenuCB }, { FARAWY, &IID_IOleCommandTarget }, + { FARAWY, &IID_IItemNameLimits }, + { FARAWY, &IID_IPropertySetStorage }, } }, { @@ -438,6 +447,7 @@ { 0xc, &IID_IShellIcon }, { 0x14, &IID_IContextMenuCB }, { 0x18, &IID_ITranslateShellChangeNotify }, + { 0x1c, &IID_IItemNameLimits }, { 0x20, &IID_IOleCommandTarget }, { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, @@ -458,6 +468,8 @@ { 0x18, &IID_IPersist }, { 0x18, &IID_IPersistFreeThreadedObject }, { 0x1c, &IID_IStorage }, + { 0x24, &IID_IPropertySetStorage }, + { 0x28, &IID_IItemNameLimits }, { 0x2c, &IID_IContextMenuCB }, { 0x34, &IID_IOleCommandTarget }, } @@ -482,6 +494,7 @@ { 0x8, &IID_IServiceProvider }, { 0xc, &IID_IObjectSafety }, { 0x14, &IID_IObjectWithSite }, + { 0x1c, &IID_IConnectionPointContainer }, } }, { @@ -490,9 +503,13 @@ { 0x0, &IID_IFolderViewOC }, { 0x0, &IID_IDispatch }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IProvideClassInfo2 }, + { 0x4, &IID_IProvideClassInfo }, { 0x8, &IID_IObjectSafety }, + { 0x10, &IID_IConnectionPointContainer }, { 0x88, &IID_IPersistStreamInit }, { 0x88, &IID_IPersist }, + { 0x8c, &IID_IOleControl }, { 0x90, &IID_IOleObject }, { 0x94, &IID_IOleInPlaceActiveObject }, { 0x98, &IID_IOleInPlaceObjectWindowless }, @@ -506,6 +523,7 @@ { 0x0, &IID_IShellItem }, { 0x0, &IID_IUnknown }, { 0x4, &IID_IPersistIDList }, + { 0x8, &IID_IParentAndItem }, } }, { @@ -529,7 +547,9 @@ { 0x2c, &IID_IExtractImage }, { 0x30, &IID_IPersistPropertyBag }, { 0x34, &IID_IServiceProvider }, + { 0x38, &IID_IFilter }, { 0x3c, &IID_IObjectWithSite }, + { 0x44, &IID_ICustomizeInfoTip }, } }, #if 0 // Apparently we can only get this through Folder.Items().GetLink

1 0

[dquintana] 71125: [UNIVGA16] Change the cylliric glyphs for "Ы" and "ы", to allow them to have a pixel space before the next character. By Dmitri Poguliayev.
by dquintana＠svn.reactos.org 09 Apr '16

09 Apr '16

Author: dquintana Date: Sat Apr 9 13:46:52 2016 New Revision: 71125 URL: http://svn.reactos.org/svn/reactos?rev=71125&view=rev Log: [UNIVGA16] Change the cylliric glyphs for "Ы" and "ы", to allow them to have a pixel space before the next character. By Dmitri Poguliayev. Modified: trunk/reactos/media/fonts/UniVGA16.ttf Modified: trunk/reactos/media/fonts/UniVGA16.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/UniVGA16.ttf?r… ============================================================================== Binary files - no diff available.

1 0

[tfaber] 71124: [IPHLPAPI] - Improve stub for Icmp6ParseReplies ROSTESTS-214
by tfaber＠svn.reactos.org 09 Apr '16

09 Apr '16

Author: tfaber Date: Sat Apr 9 09:26:19 2016 New Revision: 71124 URL: http://svn.reactos.org/svn/reactos?rev=71124&view=rev Log: [IPHLPAPI] - Improve stub for Icmp6ParseReplies ROSTESTS-214 Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec [iso-8859-1] Sat Apr 9 09:26:19 2016 @@ -80,7 +80,7 @@ @ stub GetUdpTableFromStack @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) @ stdcall Icmp6CreateFile() -@ stub Icmp6ParseReplies +@ stdcall -stub Icmp6ParseReplies(ptr long) @ stdcall Icmp6SendEcho2(ptr ptr ptr ptr ptr ptr ptr long ptr ptr long long) @ stdcall IcmpCloseHandle(ptr) @ stdcall IcmpCreateFile()

1 0

[tfaber] 71123: [COM_APITEST] - Add ieframe classes CLSID_Internet, CLSID_CUrlHistory, CLSID_InternetShortcut, CLSID_ShellUIHelper, CLSID_ShellNameSpace, CLSID_WebBrowser and CLSID_WebBrowser_V1 - ...
by tfaber＠svn.reactos.org 09 Apr '16

09 Apr '16

Author: tfaber Date: Sat Apr 9 09:22:57 2016 New Revision: 71123 URL: http://svn.reactos.org/svn/reactos?rev=71123&view=rev Log: [COM_APITEST] - Add ieframe classes CLSID_Internet, CLSID_CUrlHistory, CLSID_InternetShortcut, CLSID_ShellUIHelper, CLSID_ShellNameSpace, CLSID_WebBrowser and CLSID_WebBrowser_V1 - Add shdocvw classes CLSID_SearchAssistantOC, CLSID_ShellSearchAssistantOC and CLSID_ShellShellNameSpace Modified: trunk/rostests/apitests/com/ieframe.c trunk/rostests/apitests/com/shdocvw.c 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] Sat Apr 9 09:22:57 2016 @@ -13,11 +13,93 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { { + ID_NAME(CLSID_Internet), + { + { -0x14, &IID_IShellFolder2 }, + { -0x14, &IID_IShellFolder }, + { -0x10, &IID_IPersistFolder2 }, + { -0x10, &IID_IPersistFolder }, + { -0x10, &IID_IPersist }, + { -0xc, &IID_IBrowserFrameOptions }, + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellExtInit }, + } + }, + { + ID_NAME(CLSID_CUrlHistory), + { + { 0x0, &IID_IUnknown }, + } + }, + { ID_NAME(CLSID_CURLSearchHook), { { 0x0, &IID_IURLSearchHook2 }, { 0x0, &IID_IURLSearchHook }, { 0x0, &IID_IUnknown }, + } + }, + { + ID_NAME(CLSID_InternetShortcut), + { + { -0xc, &IID_IDataObject }, + { -0x8, &IID_IContextMenu2 }, + { -0x8, &IID_IContextMenu }, + { -0x4, &IID_IExtractIconA }, + { 0x0, &IID_IExtractIconW }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFile }, + { 0x4, &IID_IPersist }, + { 0x8, &IID_IPersistStream }, + { 0xc, &IID_IShellExtInit }, + { 0x10, &IID_IShellLinkA }, + { 0x14, &IID_IShellLinkW }, + { 0x18, &IID_IShellPropSheetExt }, + { 0x20, &IID_INewShortcutHookA }, + { 0x24, &IID_INewShortcutHookW }, + { 0x30, &IID_IQueryInfo }, + { 0x38, &IID_IObjectWithSite }, + { 0x44, &IID_IOleCommandTarget }, + { 0x48, &IID_IServiceProvider }, + } + }, + { + ID_NAME(CLSID_ShellUIHelper), + { + { 0x0, &IID_IUnknown }, + { 0xc, &IID_IObjectWithSite }, + { 0x10, &IID_IObjectSafety }, + { 0x14, &IID_IShellUIHelper2 }, + { 0x14, &IID_IShellUIHelper }, + { 0x14, &IID_IDispatch }, + } + }, + { + ID_NAME(CLSID_ShellNameSpace), + { + { 0x0, &IID_IShellNameSpace }, + { 0x0, &IID_IShellFavoritesNameSpace }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IPersistStreamInit }, + { 0x10, &IID_IPersistPropertyBag }, + { 0x1c, &IID_IOleObject }, + { 0x20, &IID_IOleInPlaceActiveObject }, + { 0x24, &IID_IViewObjectEx }, + { 0x24, &IID_IViewObject2 }, + { 0x24, &IID_IViewObject }, + { 0x28, &IID_IOleInPlaceObjectWindowless }, + { 0x28, &IID_IOleInPlaceObject }, + { 0x28, &IID_IOleWindow }, + { 0x3c, &IID_IDropTarget }, + { 0xb4, &IID_IObjectWithSite }, + { 0xbc, &IID_INSCTree }, + { 0xc4, &IID_IShellBrowser }, + { 0xc8, &IID_IFolderFilterSite }, + { 0xd0, &IID_IServiceProvider }, + { 0xd4, &IID_INameSpaceTreeControl }, + { 0xe4, &IID_IWinEventHandler }, } }, { @@ -35,6 +117,60 @@ { FARAWY, &IID_IDispatch }, } }, + { + ID_NAME(CLSID_WebBrowser), + { + { -0x20, &IID_IPersist }, + { -0x1c, &IID_IOleObject }, + { -0x18, &IID_IViewObject2 }, + { -0x18, &IID_IViewObject }, + { -0x14, &IID_IDataObject }, + { -0x10, &IID_IOleInPlaceObject }, + { -0x10, &IID_IOleWindow }, + { -0xc, &IID_IOleInPlaceActiveObject }, + { 0x0, &IID_IUnknown }, + { 0x98, &IID_IPersistStream }, + { 0x98, &IID_IPersistStreamInit }, + { 0x9c, &IID_IPersistPropertyBag }, + { 0x120, &IID_IWebBrowser2 }, + { 0x120, &IID_IWebBrowserApp }, + { 0x120, &IID_IWebBrowser }, + { 0x120, &IID_IDispatch }, + { 0x130, &IID_IOleCommandTarget }, + { 0x134, &IID_IObjectSafety }, + { 0x140, &IID_IPersistStorage }, + { 0x144, &IID_IPersistHistory }, + { FARAWY, &IID_IShellService }, + { FARAWY, &IID_IServiceProvider }, + } + }, + { + ID_NAME(CLSID_WebBrowser_V1), + { + { -0x20, &IID_IPersist }, + { -0x1c, &IID_IOleObject }, + { -0x18, &IID_IViewObject2 }, + { -0x18, &IID_IViewObject }, + { -0x14, &IID_IDataObject }, + { -0x10, &IID_IOleInPlaceObject }, + { -0x10, &IID_IOleWindow }, + { -0xc, &IID_IOleInPlaceActiveObject }, + { 0x0, &IID_IUnknown }, + { 0x98, &IID_IPersistStream }, + { 0x98, &IID_IPersistStreamInit }, + { 0x9c, &IID_IPersistPropertyBag }, + { 0x120, &IID_IWebBrowser2 }, + { 0x120, &IID_IWebBrowserApp }, + { 0x120, &IID_IWebBrowser }, + { 0x120, &IID_IDispatch }, + { 0x130, &IID_IOleCommandTarget }, + { 0x134, &IID_IObjectSafety }, + { 0x140, &IID_IPersistStorage }, + { 0x144, &IID_IPersistHistory }, + { FARAWY, &IID_IShellService }, + { FARAWY, &IID_IServiceProvider }, + } + }, }; static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); 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] Sat Apr 9 09:22:57 2016 @@ -89,6 +89,75 @@ } }, { + ID_NAME(CLSID_SearchAssistantOC), + { + { 0x0, &IID_ISearchAssistantOC3 }, + { 0x0, &IID_ISearchAssistantOC }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x10, &IID_IOleObject }, + { 0x14, &IID_IOleInPlaceActiveObject }, + { 0x18, &IID_IViewObjectEx }, + { 0x18, &IID_IViewObject2 }, + { 0x18, &IID_IViewObject }, + { 0x1c, &IID_IOleInPlaceObjectWindowless }, + { 0x1c, &IID_IOleInPlaceObject }, + { 0x1c, &IID_IOleWindow }, + { 0x20, &IID_IDataObject }, + { 0x34, &IID_IObjectSafety }, + { 0x3c, &IID_IOleCommandTarget }, + { 0x40, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_ShellSearchAssistantOC), + { + { 0x0, &IID_ISearchAssistantOC3 }, + { 0x0, &IID_ISearchAssistantOC }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x10, &IID_IOleObject }, + { 0x14, &IID_IOleInPlaceActiveObject }, + { 0x18, &IID_IViewObjectEx }, + { 0x18, &IID_IViewObject2 }, + { 0x18, &IID_IViewObject }, + { 0x1c, &IID_IOleInPlaceObjectWindowless }, + { 0x1c, &IID_IOleInPlaceObject }, + { 0x1c, &IID_IOleWindow }, + { 0x20, &IID_IDataObject }, + { 0x34, &IID_IObjectSafety }, + { 0x3c, &IID_IOleCommandTarget }, + { 0x40, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_ShellShellNameSpace), + { + { 0x0, &IID_IShellNameSpace }, + { 0x0, &IID_IShellFavoritesNameSpace }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IPersistStreamInit }, + { 0xc, &IID_IPersistPropertyBag }, + { 0x18, &IID_IOleObject }, + { 0x1c, &IID_IOleInPlaceActiveObject }, + { 0x20, &IID_IViewObjectEx }, + { 0x20, &IID_IViewObject2 }, + { 0x20, &IID_IViewObject }, + { 0x24, &IID_IOleInPlaceObjectWindowless }, + { 0x24, &IID_IOleInPlaceObject }, + { 0x24, &IID_IOleWindow }, + { 0x3c, &IID_IShellChangeNotify }, + { 0x40, &IID_IDropTarget }, + { 0xb4, &IID_IObjectWithSite }, + { 0xbc, &IID_INSCTree2 }, + { 0xbc, &IID_INSCTree }, + { 0xc0, &IID_IWinEventHandler }, + { 0xc4, &IID_IShellBrowser }, + { 0xc8, &IID_IFolderFilterSite }, + } + }, + { ID_NAME(CLSID_TaskbarList), { { 0x0, &IID_ITaskbarList2 },

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs