[ros-diffs] [mjansen] 71133: [SHELL32] - Stub IShellView2 Patch by Jared Smudde CORE-11049 #resolve #comment Thanks!
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.cpp?rev=71133&r1=71132&r2=71133&view=diff
==
--- 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,
public CComObjectRootEx,
-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)
[ros-diffs] [pschweitzer] 71132: [NTOSKRNL] Drop dead code in FsRtlAddBaseMcbEntry(). CORE-11002
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?rev=71132&r1=71131&r2=71132&view=diff == --- 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!
[ros-diffs] [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
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/apphelp.h?rev=71131&r1=71130&r2=71131&view=diff
==
--- 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.txt?rev=71131&r1=71130&r2=71131&view=diff
==
--- 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:logregexSat 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/ACPPage.cpp?rev=71131
==
--- 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, DW
[ros-diffs] [tfaber] 71130: [CDFS] - Implement file locking CORE-10790 #resolve
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/cdfs.c?rev=71130&r1=71129&r2=71130&view=diff
==
--- 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/cdfs.h?rev=71130&r1=71129&r2=71130&view=diff
==
--- 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/cleanup.c?rev=71130&r1=71129&r2=71130&view=diff
==
--- 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/dispatch.c?rev=71130&r1=71129&r2=71130&view=diff
==
--- 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_C
[ros-diffs] [tfaber] 71129: [NTOS:WMI] - Avoid a memory leak in failure case of WmipGetRawSMBiosTableData. CORE-11095 #resolve
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=71129&r1=71128&r2=71129&view=diff
==
--- 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;
}
[ros-diffs] [tfaber] 71128: [USBSTOR] - In USBSTOR_GetMaxLUN, correctly handle devices that do not support this request. Patch by Vadim Galyant. CORE-10515 #resolve
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?rev=71128&r1=71127&r2=71128&view=diff
==
--- 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;
}
//
[ros-diffs] [tfaber] 71127: [COM_APITEST] - Add even more interfaces
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.c?rev=71127&r1=71126&r2=71127&view=diff
==
--- 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(II
[ros-diffs] [tfaber] 71126: [COM_APITEST] - Add some more interfaces
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.c?rev=71126&r1=71125&r2=71126&view=diff
==
--- 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
[ros-diffs] [dquintana] 71125: [UNIVGA16] Change the cylliric glyphs for "Ы" and "ы", to allow them to have a pixel space before the next character. By Dmitri Poguliayev.
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?rev=71125&r1=71124&r2=71125&view=diff == Binary files - no diff available.
[ros-diffs] [tfaber] 71124: [IPHLPAPI] - Improve stub for Icmp6ParseReplies ROSTESTS-214
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/iphlpapi.spec?rev=71124&r1=71123&r2=71124&view=diff == --- 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()
[ros-diffs] [tfaber] 71123: [COM_APITEST] - Add ieframe classes CLSID_Internet, CLSID_CUrlHistory, CLSID_InternetShortcut, CLSID_ShellUIHelper, CLSID_ShellNameSpace, CLSID_WebBrowser and CLSID_WebBrow
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?rev=71123&r1=71122&r2=71123&view=diff
==
--- 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 },
+{ 0x
[ros-diffs] [tfaber] 71122: [COM_APITEST] - Add IID_ICallFactory, IID_IForegroundTransfer and IID_IRpcOptions - Fix a format string mismatch
Author: tfaber
Date: Sat Apr 9 09:18:57 2016
New Revision: 71122
URL: http://svn.reactos.org/svn/reactos?rev=71122&view=rev
Log:
[COM_APITEST]
- Add IID_ICallFactory, IID_IForegroundTransfer and IID_IRpcOptions
- Fix a format string mismatch
Modified:
trunk/rostests/apitests/com/com_apitest.c
trunk/rostests/apitests/com/ieframe.c
Modified: trunk/rostests/apitests/com/com_apitest.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.c?rev=71122&r1=71121&r2=71122&view=diff
==
--- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sat Apr 9
09:18:57 2016
@@ -73,6 +73,7 @@
{ ID_NAME(IID_IBrowserService4),TRUE },
{ ID_NAME(IID_ICDBurn) },
{ ID_NAME(IID_ICDBurnExt)},
+{ ID_NAME(IID_ICallFactory),TRUE },
{ ID_NAME(IID_IClassFactory) },
{ ID_NAME(IID_IClassFactory2)},
{ ID_NAME(IID_IClassFactory3), TRUE },
@@ -150,6 +151,7 @@
{ ID_NAME(IID_IFolderViewHost), TRUE },
{ ID_NAME(IID_IFolderViewOC) },
{ ID_NAME(IID_IFolderViewSettings) },
+{ ID_NAME(IID_IForegroundTransfer), TRUE },
{ ID_NAME(IID_IGetNameSpaceExtensionPointer),TRUE},
{ ID_NAME(IID_IGlobalFolderSettings), TRUE },
{ ID_NAME(IID_IHWEventHandler) },
@@ -168,8 +170,8 @@
{ ID_NAME(IID_IMoniker) },
{ ID_NAME(IID_IMultiMonitorDockingSite),TRUE },
{ ID_NAME(IID_IMultiQI),TRUE },
+{ ID_NAME(IID_INameSpaceTreeControl), TRUE },
{ ID_NAME(IID_INamespaceProxy), TRUE },
-{ ID_NAME(IID_INameSpaceTreeControl), TRUE },
{ ID_NAME(IID_INamespaceWalk)},
{ ID_NAME(IID_INamespaceWalkCB) },
{ ID_NAME(IID_INamespaceWalkCB2) },
@@ -232,6 +234,7 @@
{ ID_NAME(IID_IRegTreeOptions), TRUE },
{ ID_NAME(IID_IRemoteComputer) },
{ ID_NAME(IID_IResolveShellLink) },
+{ ID_NAME(IID_IRpcOptions), TRUE },
{ ID_NAME(IID_IRunnableObject) },
{ ID_NAME(IID_IScriptErrorList) },
{ ID_NAME(IID_ISearch) },
@@ -455,7 +458,7 @@
continue;
offset = GetInterfaceOffset(pUnk, iface->iid);
#ifdef GENERATE_TABLE_ENTRIES
-ok(offset == INTF_NOT_EXPOSED, "%s: { %s0x%x, &%s },\n",
class->name, offset < 0 ? "-" : "", offset < 0 ? -offset : offset, iface->name);
+ok(offset == INTF_NOT_EXPOSED, "%s: { %s0x%lx, &%s },\n",
class->name, offset < 0 ? "-" : "", offset < 0 ? -offset : offset, iface->name);
#else
ok(offset == INTF_NOT_EXPOSED, "%s exposes %s (offset %ld), but
shouldn't\n", class->name, iface->name, offset);
#endif
Modified: trunk/rostests/apitests/com/ieframe.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/ieframe.c?rev=71122&r1=71121&r2=71122&view=diff
==
--- trunk/rostests/apitests/com/ieframe.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/com/ieframe.c [iso-8859-1] Sat Apr 9
09:18:57 2016
@@ -26,6 +26,9 @@
{ -0xa0, &IID_IMarshal2 },
{ -0xa0, &IID_IMarshal },
{ -0x20, &IID_IClientSecurity },
+{ -0x18, &IID_IRpcOptions },
+{ -0xc, &IID_ICallFactory },
+{ -0x8, &IID_IForegroundTransfer },
{0x0, &IID_IMultiQI },
{0x0, &IID_IUnknown },
{ FARAWY, &IID_IShellWindows },
[ros-diffs] [tfaber] 71121: [COM_APITEST] - Add more interfaces, in particular IID_IMarshal2 and DIID_DWebBrowserEvents - Alphabetize ieframe classes
Author: tfaber
Date: Sat Apr 9 09:00:44 2016
New Revision: 71121
URL: http://svn.reactos.org/svn/reactos?rev=71121&view=rev
Log:
[COM_APITEST]
- Add more interfaces, in particular IID_IMarshal2 and DIID_DWebBrowserEvents
- Alphabetize ieframe classes
Modified:
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
Modified: trunk/rostests/apitests/com/browseui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?rev=71121&r1=71120&r2=71121&view=diff
==
--- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Sat Apr 9
09:00:44 2016
@@ -207,6 +207,7 @@
{ -0xc, &IID_IDockingWindow },
{ -0x8, &IID_IObjectWithSite },
{ -0x4, &IID_IExplorerToolbar },
+{0x0, &DIID_DWebBrowserEvents },
{0x0, &IID_IDispatch },
{0x0, &IID_IUnknown },
{0x4, &IID_IPersistStreamInit },
Modified: trunk/rostests/apitests/com/com_apitest.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.c?rev=71121&r1=71120&r2=71121&view=diff
==
--- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sat Apr 9
09:00:44 2016
@@ -54,16 +54,23 @@
{ ID_NAME(IID_IAutoComplete2), TRUE },
{ ID_NAME(IID_IAutoCompleteDropDown) },
{ ID_NAME(IID_IBandHost) },
-{ ID_NAME(IID_IBandNavigate), TRUE },
+{ ID_NAME(IID_IBandNavigate),},
{ ID_NAME(IID_IBandProxy), TRUE },
{ ID_NAME(IID_IBandSite) },
{ ID_NAME(IID_IBandSiteHelper), TRUE },
{ ID_NAME(IID_IBanneredBar),TRUE },
{ ID_NAME(IID_IBindCtx) },
+{ ID_NAME(IID_IBindEventHandler) },
+{ ID_NAME(IID_IBindHost) },
+{ ID_NAME(IID_IBinding) },
+{ ID_NAME(IID_IBindProtocol), TRUE },
+{ ID_NAME(IID_IBindResource) },
+{ ID_NAME(IID_IBindStatusCallback) },
{ ID_NAME(IID_IBrowserFrameOptions),TRUE },
{ ID_NAME(IID_IBrowserService) },
{ ID_NAME(IID_IBrowserService2),TRUE },
{ ID_NAME(IID_IBrowserService3),TRUE },
+{ ID_NAME(IID_IBrowserService4),TRUE },
{ ID_NAME(IID_ICDBurn) },
{ ID_NAME(IID_ICDBurnExt)},
{ ID_NAME(IID_IClassFactory) },
@@ -110,11 +117,13 @@
{ ID_NAME(IID_IEnumExtraSearch) },
{ ID_NAME(IID_IEnumGUID) },
{ ID_NAME(IID_IEnumIDList) },
+{ ID_NAME(IID_IEnumMoniker) },
//{ ID_NAME(IID_IEnumNetCfgBindingInterface) },
//{ ID_NAME(IID_IEnumNetCfgBindingPath)},
{ ID_NAME(IID_IEnumNetCfgComponent),TRUE },
{ ID_NAME(IID_IEnumNetConnection)},
{ ID_NAME(IID_IEnumShellItems) },
+{ ID_NAME(IID_IEnumSTATSTG) },
{ ID_NAME(IID_IEnumString) },
{ ID_NAME(IID_IEnumUnknown) },
{ ID_NAME(IID_IEnumVARIANT) },
@@ -145,11 +154,14 @@
{ ID_NAME(IID_IGlobalFolderSettings), TRUE },
{ ID_NAME(IID_IHWEventHandler) },
{ ID_NAME(IID_IHWEventHandler2) },
+{ ID_NAME(IID_IImageList), TRUE },
+{ ID_NAME(IID_IImageList2), TRUE },
{ ID_NAME(IID_IInitializeObject), TRUE },
{ ID_NAME(IID_IInputObject) },
{ ID_NAME(IID_IInputObjectSite) },
{ ID_NAME(IID_IInternalUnknown),TRUE },
{ ID_NAME(IID_IMarshal) },
+{ ID_NAME(IID_IMarshal2), TRUE },
{ ID_NAME(IID_IMenuBand), TRUE },
{ ID_NAME(IID_IMenuPopup), TRUE },
{ ID_NAME(IID_IModalWindow) },
@@ -158,9 +170,9 @@
{ ID_NAME(IID_IMultiQI),TRUE },
{ ID_NAME(IID_INamespaceProxy), TRUE },
{ ID_NAME(IID_INameSpaceTreeControl), TRUE },
-{ ID_NAME(IID_INamespaceWalk), FALSE },
-{ ID_NAME(IID_INamespaceWalkCB),FALSE },
-{ ID_NAME(IID_INamespaceWalkCB2), FALSE },
+{ ID_NAME(IID_INamespaceWalk)
[ros-diffs] [tfaber] 71120: [COM_APITEST] - Test INamespaceWalk, INamespaceWalkCB and INamespaceWalkCB2 CORE-11093
Author: tfaber
Date: Sat Apr 9 08:49:17 2016
New Revision: 71120
URL: http://svn.reactos.org/svn/reactos?rev=71120&view=rev
Log:
[COM_APITEST]
- Test INamespaceWalk, INamespaceWalkCB and INamespaceWalkCB2
CORE-11093
Modified:
trunk/rostests/apitests/com/com_apitest.c
trunk/rostests/apitests/com/com_apitest.h
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.c?rev=71120&r1=71119&r2=71120&view=diff
==
--- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sat Apr 9
08:49:17 2016
@@ -158,6 +158,9 @@
{ ID_NAME(IID_IMultiQI),TRUE },
{ ID_NAME(IID_INamespaceProxy), TRUE },
{ ID_NAME(IID_INameSpaceTreeControl), TRUE },
+{ ID_NAME(IID_INamespaceWalk), FALSE },
+{ ID_NAME(IID_INamespaceWalkCB),FALSE },
+{ ID_NAME(IID_INamespaceWalkCB2), FALSE },
{ ID_NAME(IID_INetCfg), TRUE },
//{ ID_NAME(IID_INetCfgBindingInterface) },
//{ ID_NAME(IID_INetCfgBindingPath)},
Modified: trunk/rostests/apitests/com/com_apitest.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.h?rev=71120&r1=71119&r2=71120&view=diff
==
--- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original)
+++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Sat Apr 9
08:49:17 2016
@@ -131,6 +131,9 @@
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_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_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/shell32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?rev=71120&r1=71119&r2=71120&view=diff
==
--- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Sat Apr 9
08:49:17 2016
@@ -25,6 +25,7 @@
{ 0x20, &IID_IOleCommandTarget },
{ 0x24, &IID_ICDBurn },
{ 0x2c, &IID_IPersistPropertyBag },
+{ 0x34, &IID_INamespaceWalkCB },
{ 0x3c, &IID_IServiceProvider },
}
},
[ros-diffs] [tfaber] 71119: [OLE32] - Apply Wine commit 110665a3 (ole32: Don't call spy on IMalloc::Free(NULL)) by Nikolay Sivov. Fixes test failures in atl:CComHeapPtr CORE-11107 #resolve
Author: tfaber
Date: Sat Apr 9 08:31:49 2016
New Revision: 71119
URL: http://svn.reactos.org/svn/reactos?rev=71119&view=rev
Log:
[OLE32]
- Apply Wine commit 110665a3 (ole32: Don't call spy on IMalloc::Free(NULL)) by
Nikolay Sivov. Fixes test failures in atl:CComHeapPtr
CORE-11107 #resolve
Modified:
trunk/reactos/dll/win32/ole32/ifs.c
trunk/rostests/winetests/ole32/compobj.c
Modified: trunk/reactos/dll/win32/ole32/ifs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ifs.c?rev=71119&r1=71118&r2=71119&view=diff
==
--- trunk/reactos/dll/win32/ole32/ifs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/ifs.c [iso-8859-1] Sat Apr 9 08:31:49 2016
@@ -241,6 +241,9 @@
TRACE("(%p)\n",pv);
+ if(!pv)
+ return;
+
if(Malloc32.pSpy) {
EnterCriticalSection(&IMalloc32_SpyCS);
fSpyed = RemoveMemoryLocation(pv);
Modified: trunk/rostests/winetests/ole32/compobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c?rev=71119&r1=71118&r2=71119&view=diff
==
--- trunk/rostests/winetests/ole32/compobj.c[iso-8859-1] (original)
+++ trunk/rostests/winetests/ole32/compobj.c[iso-8859-1] Sat Apr 9
08:31:49 2016
@@ -2936,6 +2936,140 @@
CoUninitialize();
}
+
+static HRESULT WINAPI testspy_QI(IMallocSpy *iface, REFIID riid, void **obj)
+{
+if (IsEqualIID(riid, &IID_IMallocSpy) || IsEqualIID(riid, &IID_IUnknown))
+{
+*obj = iface;
+IMallocSpy_AddRef(iface);
+return S_OK;
+}
+
+return E_NOINTERFACE;
+}
+
+static ULONG WINAPI testspy_AddRef(IMallocSpy *iface)
+{
+return 2;
+}
+
+static ULONG WINAPI testspy_Release(IMallocSpy *iface)
+{
+return 1;
+}
+
+static SIZE_T WINAPI testspy_PreAlloc(IMallocSpy *iface, SIZE_T cb)
+{
+ok(0, "unexpected call\n");
+return 0;
+}
+
+static void* WINAPI testspy_PostAlloc(IMallocSpy *iface, void *ptr)
+{
+ok(0, "unexpected call\n");
+return NULL;
+}
+
+static void* WINAPI testspy_PreFree(IMallocSpy *iface, void *ptr, BOOL spyed)
+{
+ok(0, "unexpected call\n");
+return NULL;
+}
+
+static void WINAPI testspy_PostFree(IMallocSpy *iface, BOOL spyed)
+{
+ok(0, "unexpected call\n");
+}
+
+static SIZE_T WINAPI testspy_PreRealloc(IMallocSpy *iface, void *ptr, SIZE_T
cb, void **newptr, BOOL spyed)
+{
+ok(0, "unexpected call\n");
+return 0;
+}
+
+static void* WINAPI testspy_PostRealloc(IMallocSpy *iface, void *ptr, BOOL
spyed)
+{
+ok(0, "unexpected call\n");
+return NULL;
+}
+
+static void* WINAPI testspy_PreGetSize(IMallocSpy *iface, void *ptr, BOOL
spyed)
+{
+ok(0, "unexpected call\n");
+return NULL;
+}
+
+static SIZE_T WINAPI testspy_PostGetSize(IMallocSpy *iface, SIZE_T actual,
BOOL spyed)
+{
+ok(0, "unexpected call\n");
+return 0;
+}
+
+static void* WINAPI testspy_PreDidAlloc(IMallocSpy *iface, void *ptr, BOOL
spyed)
+{
+ok(0, "unexpected call\n");
+return NULL;
+}
+
+static int WINAPI testspy_PostDidAlloc(IMallocSpy *iface, void *ptr, BOOL
spyed, int actual)
+{
+ok(0, "unexpected call\n");
+return 0;
+}
+
+static void WINAPI testspy_PreHeapMinimize(IMallocSpy *iface)
+{
+ok(0, "unexpected call\n");
+}
+
+static void WINAPI testspy_PostHeapMinimize(IMallocSpy *iface)
+{
+ok(0, "unexpected call\n");
+}
+
+static const IMallocSpyVtbl testspyvtbl =
+{
+testspy_QI,
+testspy_AddRef,
+testspy_Release,
+testspy_PreAlloc,
+testspy_PostAlloc,
+testspy_PreFree,
+testspy_PostFree,
+testspy_PreRealloc,
+testspy_PostRealloc,
+testspy_PreGetSize,
+testspy_PostGetSize,
+testspy_PreDidAlloc,
+testspy_PostDidAlloc,
+testspy_PreHeapMinimize,
+testspy_PostHeapMinimize
+};
+
+static IMallocSpy testspy = { &testspyvtbl };
+
+static void test_IMallocSpy(void)
+{
+IMalloc *imalloc;
+HRESULT hr;
+
+hr = CoRegisterMallocSpy(&testspy);
+ok(hr == S_OK, "got 0x%08x\n", hr);
+
+imalloc = NULL;
+hr = CoGetMalloc(MEMCTX_TASK, &imalloc);
+ok(hr == S_OK, "got 0x%08x\n", hr);
+ok(imalloc != NULL, "got %p\n", imalloc);
+
+IMalloc_Free(imalloc, NULL);
+
+IMalloc_Release(imalloc);
+
+hr = CoRevokeMallocSpy();
+ok(hr == S_OK, "got 0x%08x\n", hr);
+}
+
static void init_funcs(void)
{
HMODULE hOle32 = GetModuleHandleA("ole32");
@@ -3003,4 +3137,5 @@
test_CoGetMalloc();
test_OleRegGetUserType();
test_CoGetApartmentType();
-}
+test_IMallocSpy();
+}
