Ros-diffs July 2013

ros-diffs@reactos.org

13 participants
199 discussions

[tfaber] 59443: [CMAKE] - Try again to fix version detection. If anyone sees compilers that are not .00 versions, please complain. This is required because a simply "contains" check can match all p...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 7 09:42:57 2013 New Revision: 59443 URL: http://svn.reactos.org/svn/reactos?rev=59443&view=rev Log: [CMAKE] - Try again to fix version detection. If anyone sees compilers that are not .00 versions, please complain. This is required because a simply "contains" check can match all parts of the version number -- e.g. 16.00.40219.01 contains "19." in addition to "16." Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59443&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sun Jul 7 09:42:57 2013 @@ -57,10 +57,11 @@ cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm - cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8 - cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9 - cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10 - cl 2>&1 | find "17." > NUL && set BUILD_ENVIRONMENT=VS11 + cl 2>&1 | find "14.00." > NUL && set BUILD_ENVIRONMENT=VS8 + cl 2>&1 | find "15.00." > NUL && set BUILD_ENVIRONMENT=VS9 + cl 2>&1 | find "16.00." > NUL && set BUILD_ENVIRONMENT=VS10 + cl 2>&1 | find "17.00." > NUL && set BUILD_ENVIRONMENT=VS11 + ::cl 2>&1 | find "18.00." > NUL && set BUILD_ENVIRONMENT=VS12 if not defined BUILD_ENVIRONMENT ( echo Error: Visual Studio version too old or version detection failed. exit /b

11 years, 2 months

[tfaber] 59442: [COM_APITEST] - Add a test verifying the interfaces exposed by various COM classes, grouped by server dll ROSTESTS-98

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 7 09:10:31 2013 New Revision: 59442 URL: http://svn.reactos.org/svn/reactos?rev=59442&view=rev Log: [COM_APITEST] - Add a test verifying the interfaces exposed by various COM classes, grouped by server dll ROSTESTS-98 Added: trunk/rostests/apitests/com/ trunk/rostests/apitests/com/CMakeLists.txt (with props) trunk/rostests/apitests/com/browseui.c (with props) trunk/rostests/apitests/com/com_apitest.c (with props) trunk/rostests/apitests/com/com_apitest.h (with props) trunk/rostests/apitests/com/ieframe.c (with props) trunk/rostests/apitests/com/shdocvw.c (with props) trunk/rostests/apitests/com/shell32.c (with props) trunk/rostests/apitests/com/testlist.c (with props) Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -3,6 +3,7 @@ add_subdirectory(advapi32) add_subdirectory(browseui) +add_subdirectory(com) add_subdirectory(crt) add_subdirectory(dciman32) add_subdirectory(gdi32) Added: trunk/rostests/apitests/com/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/com/CMakeLists.txt (added) +++ trunk/rostests/apitests/com/CMakeLists.txt [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,17 @@ + +add_definitions(-DWINE_NO_UNICODE_MACROS) + +list(APPEND SOURCE + browseui.c + ieframe.c + shdocvw.c + shell32.c + com_apitest.c + testlist.c) + +add_executable(com_apitest ${SOURCE}) +target_link_libraries(com_apitest wine uuid) +set_module_type(com_apitest win32cui) +add_importlibs(com_apitest advapi32 ole32 shlwapi shell32 msvcrt kernel32 ntdll) + +add_cd_file(TARGET com_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/com/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c (added) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,65 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: COM interface test for browseui classes + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_RebarBandSite), + { + { 0x0, &IID_IUnknown }, + { 0xc, &IID_IBandSite }, + { 0x10, &IID_IInputObjectSite }, + { 0x14, &IID_IInputObject }, + { 0x18, &IID_IDeskBarClient }, + { 0x18, &IID_IOleWindow }, + { 0x1c, &IID_IWinEventHandler }, + { 0x20, &IID_IPersistStream }, + { 0x20, &IID_IPersist }, + { 0x24, &IID_IDropTarget }, + { 0x28, &IID_IServiceProvider }, + { 0x2c, &IID_IBandSiteHelper }, + { 0x30, &IID_IOleCommandTarget }, + } + }, + { + ID_NAME(CLSID_SH_AddressBand), + { + { 0x0, &IID_IDeskBand }, + { 0x0, &IID_IDockingWindow }, + { 0x0, &IID_IOleWindow }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + { 0xc, &IID_IInputObject }, + { 0x10, &IID_IPersistStream }, + { 0x10, &IID_IPersist }, + { 0x14, &IID_IOleCommandTarget }, + { 0x18, &IID_IServiceProvider }, + { 0x30, &IID_IWinEventHandler }, + { 0x34, &IID_IAddressBand }, + { 0x38, &IID_IInputObjectSite }, + } + }, + { + ID_NAME(CLSID_ShellSearchExt), + { + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + } + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(browseui) +{ + TestClasses(L"browseui", ExpectedInterfaces, ExpectedInterfaceCount); +} Propchange: trunk/rostests/apitests/com/browseui.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,459 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: COM interface test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +#define myskip(c, ...) ((c) ? 0 : (skip(__VA_ARGS__), 1)) +#define mytrace(...) do { \ + int debug = winetest_debug; \ + winetest_debug = 1; \ + trace(__VA_ARGS__); \ + winetest_debug = debug; \ +} while (0) + +typedef struct _KNOWN_INTERFACE +{ + const IID *iid; + PCSTR name; +} KNOWN_INTERFACE; +typedef const KNOWN_INTERFACE *PCKNOWN_INTERFACE; + +#undef ID_NAME +#define ID_NAME(c) { &c, #c } +static KNOWN_INTERFACE KnownInterfaces[] = +{ + ID_NAME(IID_IACList), + ID_NAME(IID_IACList2), + ID_NAME(IID_IAccessible), + ID_NAME(IID_IAddressBand), + ID_NAME(IID_IAddressEditBox), + ID_NAME(IID_IBandNavigate), + ID_NAME(IID_IBandProxy), + ID_NAME(IID_IBandSite), + ID_NAME(IID_IBandSiteHelper), + ID_NAME(IID_IBanneredBar), + ID_NAME(IID_IBindCtx), + ID_NAME(IID_IBrowserService), + ID_NAME(IID_IBrowserService2), + ID_NAME(IID_IClassFactory), + ID_NAME(IID_IClassFactory2), + ID_NAME(IID_IClassFactory3), + ID_NAME(IID_IClientSecurity), + ID_NAME(IID_IComThreadingInfo), + ID_NAME(IID_IContextMenu), + ID_NAME(IID_IContextMenu2), + ID_NAME(IID_IContextMenu3), + ID_NAME(IID_IContextMenuCB), + ID_NAME(IID_IContextMenuSite), + ID_NAME(IID_IContinue), + ID_NAME(IID_IDataObject), + ID_NAME(IID_IDefViewFrame), + ID_NAME(IID_IDeskBand), + ID_NAME(IID_IDeskBar), + ID_NAME(IID_IDeskBarClient), + ID_NAME(IID_IDispatch), + ID_NAME(IID_IDockingWindow), + ID_NAME(IID_IDockingWindowFrame), + ID_NAME(IID_IDockingWindowSite), + ID_NAME(IID_IDocViewSite), + ID_NAME(IID_IDragSourceHelper), + ID_NAME(IID_IDropSource), + ID_NAME(IID_IDropTarget), + ID_NAME(IID_IDropTargetHelper), + ID_NAME(IID_IEnumExtraSearch), + ID_NAME(IID_IEnumGUID), + ID_NAME(IID_IEnumIDList), + ID_NAME(IID_IEnumShellItems), + ID_NAME(IID_IEnumString), + ID_NAME(IID_IEnumUnknown), + ID_NAME(IID_IErrorLog), + ID_NAME(IID_IExplorerToolbar), + ID_NAME(IID_IExtractIconA), + ID_NAME(IID_IExtractIconW), + ID_NAME(IID_IExtractImage), + ID_NAME(IID_IExtractImage2), + ID_NAME(IID_IFileDialog), + ID_NAME(IID_IFileDialog2), + ID_NAME(IID_IFileSearchBand), + ID_NAME(IID_IFolderBandPriv), + ID_NAME(IID_IFolderView), + ID_NAME(IID_IFolderView2), + ID_NAME(IID_IFolderViewOC), + ID_NAME(IID_IFolderViewSettings), + ID_NAME(IID_IGlobalFolderSettings), + ID_NAME(IID_IInitializeObject), + ID_NAME(IID_IInputObject), + ID_NAME(IID_IInputObjectSite), + ID_NAME(IID_IInternalUnknown), + ID_NAME(IID_IMarshal), + ID_NAME(IID_IMenuBand), + ID_NAME(IID_IMenuPopup), + ID_NAME(IID_IMoniker), + ID_NAME(IID_IMultiQI), + ID_NAME(IID_INamespaceProxy), + ID_NAME(IID_INameSpaceTreeControl), + ID_NAME(IID_INSCTree), + ID_NAME(IID_INSCTree2), + ID_NAME(IID_IObjMgr), + ID_NAME(IID_IObjectSafety), + ID_NAME(IID_IObjectWithSite), + ID_NAME(IID_IOleCommandTarget), + ID_NAME(IID_IOleInPlaceActiveObject), + ID_NAME(IID_IOleInPlaceFrame), + ID_NAME(IID_IOleInPlaceObject), + ID_NAME(IID_IOleInPlaceObjectWindowless), + ID_NAME(IID_IOleInPlaceSite), + ID_NAME(IID_IOleInPlaceSiteEx), + ID_NAME(IID_IOleInPlaceSiteWindowless), + ID_NAME(IID_IOleInPlaceUIWindow), + ID_NAME(IID_IOleObject), + ID_NAME(IID_IOleWindow), + ID_NAME(IID_IPersist), + ID_NAME(IID_IPersistFile), + ID_NAME(IID_IPersistFolder), + ID_NAME(IID_IPersistFolder2), + ID_NAME(IID_IPersistFolder3), + ID_NAME(IID_IPersistHistory), + ID_NAME(IID_IPersistIDList), + ID_NAME(IID_IPersistMemory), + ID_NAME(IID_IPersistPropertyBag), + ID_NAME(IID_IPersistPropertyBag2), + ID_NAME(IID_IPersistStorage), + ID_NAME(IID_IPersistStream), + ID_NAME(IID_IPersistStreamInit), + ID_NAME(IID_IProgressDialog), + ID_NAME(IID_IPropertyBag), + ID_NAME(IID_IPropertyBag2), + ID_NAME(IID_IQueryAssociations), + ID_NAME(IID_IQueryInfo), + ID_NAME(IID_IRegTreeOptions), + ID_NAME(IID_IRunnableObject), + ID_NAME(IID_IServerSecurity), + ID_NAME(IID_IServiceProvider), + ID_NAME(IID_IShellBrowser), + ID_NAME(IID_IShellBrowserService), + ID_NAME(IID_IShellChangeNotify), + ID_NAME(IID_IShellDesktopTray), + ID_NAME(IID_IShellDispatch), + ID_NAME(IID_IShellDispatch2), + ID_NAME(IID_IShellDispatch3), + ID_NAME(IID_IShellDispatch4), + ID_NAME(IID_IShellDispatch5), + ID_NAME(IID_IShellIconOverlayIdentifier), + ID_NAME(IID_IShellFolder), + ID_NAME(IID_IShellFolder2), + ID_NAME(IID_IShellFolderBand), + ID_NAME(IID_IShellFolderView), + ID_NAME(IID_IShellFolderViewCB), + ID_NAME(IID_IShellFolderViewDual), + ID_NAME(IID_IShellFolderViewDual2), + ID_NAME(IID_IShellIcon), + ID_NAME(IID_IShellItem), + ID_NAME(IID_IShellItem2), + ID_NAME(IID_IShellItemArray), + ID_NAME(IID_IShellItemFilter), + ID_NAME(IID_IShellLinkA), + ID_NAME(IID_IShellLinkDual), + ID_NAME(IID_IShellLinkDual2), + ID_NAME(IID_IShellLinkW), + ID_NAME(IID_IShellMenu), + ID_NAME(IID_IShellMenu2), + ID_NAME(IID_IShellMenuAcc), + ID_NAME(IID_IShellMenuCallback), + ID_NAME(IID_IShellService), + ID_NAME(IID_IShellView), + ID_NAME(IID_IShellView2), + ID_NAME(IID_IShellView3), + ID_NAME(IID_IShellWindows), + ID_NAME(IID_IStream), + ID_NAME(IID_ISurrogate), + ID_NAME(IID_ISynchronize), + ID_NAME(IID_ISynchronizeContainer), + ID_NAME(IID_ISynchronizeEvent), + ID_NAME(IID_ISynchronizeHandle), + ID_NAME(IID_ITaskbarList), + ID_NAME(IID_ITaskbarList2), + ID_NAME(IID_ITrackShellMenu), + ID_NAME(IID_ITrayPriv), + ID_NAME(IID_ITrayPriv2), + ID_NAME(IID_IUnknown), + ID_NAME(IID_IViewObject), + ID_NAME(IID_IViewObject2), + ID_NAME(IID_IWinEventHandler), + + ID_NAME(IID_DFConstraint), + ID_NAME(DIID_DShellFolderViewEvents), + + ID_NAME(IID_Folder), + ID_NAME(IID_Folder2), + ID_NAME(IID_Folder3), + ID_NAME(IID_FolderItem), + ID_NAME(IID_FolderItem2), + ID_NAME(IID_FolderItems), + ID_NAME(IID_FolderItems2), + ID_NAME(IID_FolderItems3), + ID_NAME(IID_FolderItemVerb), + ID_NAME(IID_FolderItemVerbs), +}; +static const INT KnownInterfaceCount = RTL_NUMBER_OF(KnownInterfaces); + +static +PCKNOWN_INTERFACE +FindInterface( + _In_ const IID *iid) +{ + INT i; + + for (i = 0; i < KnownInterfaceCount; i++) + if (IsEqualIID(KnownInterfaces[i].iid, iid)) + return &KnownInterfaces[i]; + ASSERT(i != KnownInterfaceCount); + return NULL; +} + +static +BOOLEAN +IsInterfaceExpected( + _In_ PCCLASS_AND_INTERFACES class, + _In_ const IID *iid) +{ + INT i; + + for (i = 0; class->ifaces[i].iid; i++) + if (IsEqualIID(class->ifaces[i].iid, iid)) + return TRUE; + return FALSE; +} + +#define INTF_NOT_EXPOSED LONG_MAX +static +LONG +GetInterfaceOffset( + _In_ PUNKNOWN pUnk, + _In_ const IID *iid) +{ + HRESULT hr; + PVOID pObj; + PUNKNOWN pUnk2; + LONG offset; + + hr = IUnknown_QueryInterface(pUnk, iid, &pObj); + ok(hr == S_OK || hr == E_NOINTERFACE, "IUnknown::QueryInterface returned 0x%lx\n", hr); + if (FAILED(hr)) + return INTF_NOT_EXPOSED; + + pUnk2 = pObj; + offset = (LONG_PTR)pObj - (LONG_PTR)pUnk; + IUnknown_Release(pUnk2); + return offset; +} + +static +VOID +TestModuleInterfaces( + _In_ PCCLASS_AND_INTERFACES ExpectedInterfaces, + _In_ INT ExpectedInterfaceCount) +{ + HRESULT hr; + PVOID pObj; + PUNKNOWN pUnk; + INT iClass, iIntf; + PCCLASS_AND_INTERFACES class; + + for (iClass = 0; iClass < ExpectedInterfaceCount; iClass++) + { + class = &ExpectedInterfaces[iClass]; + hr = CoCreateInstance(class->clsid, + NULL, + CLSCTX_INPROC_SERVER, + &IID_IUnknown, + &pObj); + ok(hr == S_OK, "CoCreateInstance failed. hr=0x%lx\n", hr); + if (FAILED(hr)) + { + skip("Failed to instantiate %s.\n", class->name); + continue; + } + + pUnk = pObj; + + /* Check that all expected interfaces are present and have the right offset */ + for (iIntf = 0; class->ifaces[iIntf].iid; iIntf++) + { + PCKNOWN_INTERFACE iface = FindInterface(class->ifaces[iIntf].iid); + LONG offset = GetInterfaceOffset(pUnk, iface->iid); + if (offset == INTF_NOT_EXPOSED) + ok(0, "%s is missing %s (offset %ld)\n", class->name, iface->name, class->ifaces[iIntf].offset); + else if (class->ifaces[iIntf].offset != FARAWY) + { +#ifdef FAIL_WRONG_OFFSET + ok(offset == class->ifaces[iIntf].offset, "%s, %s offset is %ld, expected %ld\n", class->name, iface->name, offset, class->ifaces[iIntf].offset); +#else + if (offset != class->ifaces[iIntf].offset) + mytrace("%s, %s offset is %ld, expected %ld\n", class->name, iface->name, offset, class->ifaces[iIntf].offset); +#endif + } + } + + /* Check that none other than the expected interfaces are present */ + for (iIntf = 0; iIntf < KnownInterfaceCount; iIntf++) + { + PCKNOWN_INTERFACE iface = &KnownInterfaces[iIntf]; + LONG offset; + if (IsInterfaceExpected(class, iface->iid)) + continue; + offset = GetInterfaceOffset(pUnk, iface->iid); +#ifdef GENERATE_TABLE_ENTRIES + ok(offset == INTF_NOT_EXPOSED, "%s: { %s%x, &%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 + } + + // TODO: do some aggregation + + IUnknown_Release(pUnk); + } +} + +static +VOID +TestModuleRegistry( + _In_ PCWSTR ModuleName, + _In_ PCCLASS_AND_INTERFACES ExpectedInterfaces, + _In_ INT ExpectedInterfaceCount) +{ + INT iClass; + PCCLASS_AND_INTERFACES class; + HKEY hKeyClasses; + LONG result; + + result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Classes\\CLSID", 0, KEY_ENUMERATE_SUB_KEYS, &hKeyClasses); + ok(result == NO_ERROR, "Failed to open classes key, error %lu\n", result); + if (!myskip(result == NO_ERROR, "No classes key\n")) + { + for (iClass = 0; iClass < ExpectedInterfaceCount; iClass++) + { + HKEY hKey; + HKEY hKeyServer; + NTSTATUS status; + UNICODE_STRING clsid; + DWORD type; + WCHAR dllName[100]; + DWORD dllNameSize; + + class = &ExpectedInterfaces[iClass]; + status = RtlStringFromGUID(class->clsid, &clsid); + ok(status == STATUS_SUCCESS, "Failed to convert guid to string for %s, status %lx\n", class->name, status); + if (myskip(NT_SUCCESS(status), "No guid string\n")) + continue; + + result = RegOpenKeyEx(hKeyClasses, clsid.Buffer, 0, KEY_ENUMERATE_SUB_KEYS, &hKey); + ok(result == NO_ERROR, "Failed to open key for %s, error %lu\n", class->name, result); + RtlFreeUnicodeString(&clsid); + if (myskip(result == NO_ERROR, "No key\n")) + continue; + + result = RegOpenKeyEx(hKey, L"InProcServer32", 0, KEY_QUERY_VALUE, &hKeyServer); + ok(result == NO_ERROR, "Failed to open key for %s, error %lu\n", class->name, result); + RegCloseKey(hKey); + if (myskip(result == NO_ERROR, "No key\n")) + continue; + + dllNameSize = sizeof(dllName); + result = RegQueryValueEx(hKeyServer, NULL, NULL, &type, (PBYTE)dllName, &dllNameSize); + ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", class->name, result); + if (!myskip(result == NO_ERROR, "No module name\n")) + { + ok(type == REG_SZ || type == REG_EXPAND_SZ, "type %lu for %s\n", type, class->name); + ok(dllNameSize % sizeof(WCHAR) == 0, "size %lu for %s\n", dllNameSize, class->name); + ok(dllNameSize <= sizeof(dllName), "size %lu for %s\n", dllNameSize, class->name); + ok(dllName[dllNameSize / sizeof(WCHAR) - 1] == UNICODE_NULL, "Not null terminated for %s\n", class->name); + // TODO: Use SearchPath (or assume everything's in system32) and do a proper full path compare + PathStripPathW(dllName); + PathRemoveExtensionW(dllName); + ok(!wcsicmp(dllName, ModuleName), "Server is %ls, expected %ls for %s\n", dllName, ModuleName, class->name); + } + + dllNameSize = sizeof(dllName); + result = RegQueryValueEx(hKeyServer, L"ThreadingModel", NULL, &type, (PBYTE)dllName, &dllNameSize); + ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", class->name, result); + if (!myskip(result == NO_ERROR, "No ThreadingModel\n")) + { + ok(type == REG_SZ || type == REG_EXPAND_SZ, "type %lu for %s\n", type, class->name); + ok(dllNameSize % sizeof(WCHAR) == 0, "size %lu for %s\n", dllNameSize, class->name); + ok(dllNameSize <= sizeof(dllName), "size %lu for %s\n", dllNameSize, class->name); + ok(dllName[dllNameSize / sizeof(WCHAR) - 1] == UNICODE_NULL, "Not null terminated for %s\n", class->name); + ok(!wcsicmp(dllName, L"Apartment"), "Server is %ls, expected %ls for %s\n", dllName, L"Apartment", class->name); + } + + RegCloseKey(hKeyServer); + } + RegCloseKey(hKeyClasses); + } +} + +static +VOID +TestManualInstantiation( + _In_ PCWSTR ModuleName, + _In_ PCCLASS_AND_INTERFACES ExpectedInterfaces, + _In_ INT ExpectedInterfaceCount) +{ + INT iClass; + PCCLASS_AND_INTERFACES class; + HRESULT (__stdcall *DllGetClassObject)(REFCLSID, REFIID, PVOID *); + + DllGetClassObject = (PVOID)GetProcAddress(GetModuleHandle(ModuleName), "DllGetClassObject"); + ok(DllGetClassObject != NULL, "DllGetClassObject not found in %ls, error %lu\n", ModuleName, GetLastError()); + if (myskip(DllGetClassObject != NULL, "No DllGetClassObject\n")) + return; + + for (iClass = 0; iClass < ExpectedInterfaceCount; iClass++) + { + PVOID pv; + HRESULT hr; + class = &ExpectedInterfaces[iClass]; + hr = DllGetClassObject(class->clsid, &IID_IClassFactory, &pv); + ok(hr == S_OK, "DllGetClassObject failed for %s, hr = 0x%lx\n", class->name, hr); + if (!myskip(SUCCEEDED(hr), "No class factory\n")) + { + IClassFactory *pCF = pv; + hr = IClassFactory_CreateInstance(pCF, NULL, &IID_IUnknown, &pv); + ok(hr == S_OK, "IClassFactory::CreateInstance failed for %s, hr = 0x%lx\n", class->name, hr); + if (SUCCEEDED(hr)) + { + IUnknown *pUnk = pv; + IUnknown_Release(pUnk); + } + IClassFactory_Release(pCF); + } + } +} + +VOID +TestClasses( + _In_ PCWSTR ModuleName, + _In_ PCCLASS_AND_INTERFACES ExpectedInterfaces, + _In_ INT ExpectedInterfaceCount) +{ + HRESULT hr; + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "CoInitializeEx failed. hr=0x%lx\n", hr); + if (myskip(SUCCEEDED(hr), "Failed to initialize COM. Cannot perform tests\n")) + return; + + TestModuleInterfaces(ExpectedInterfaces, ExpectedInterfaceCount); + TestModuleRegistry(ModuleName, ExpectedInterfaces, ExpectedInterfaceCount); + TestManualInstantiation(ModuleName, ExpectedInterfaces, ExpectedInterfaceCount); + + CoUninitialize(); +} Propchange: trunk/rostests/apitests/com/com_apitest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,108 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: COM interface test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#pragma once + +/* Define this if you're adding new classes - the test will auto-generate the + * interface table entries for you ;) */ +//#define GENERATE_TABLE_ENTRIES + +/* Define this to make wrong interface offsets count as test failures... + * we usually don't want to be that strict */ +//#define FAIL_WRONG_OFFSET + +#define COBJMACROS +#define WIN32_NO_STATUS +#define UNICODE +#include <wine/test.h> +#include <objbase.h> +#include <objsafe.h> +#include <oleacc.h> +#include <oaidl.h> +#include <mshtmhst.h> +#include <perhist.h> +#include <shlguid.h> +#include <shlobj.h> +#include <shobjidl.h> +#include <shldisp.h> +#include <shdeprecated.h> +#include <shlobj_undoc.h> +#include <shlguid_undoc.h> +#include <shlwapi.h> +#include <ndk/rtlfuncs.h> +#include <initguid.h> + +#define RTL_NUMBER_OF(x) (sizeof(x) / sizeof(x[0])) +typedef IUnknown *PUNKNOWN; + +typedef struct _CLASS_AND_INTERFACES +{ + const CLSID *clsid; + PCSTR name; + struct + { + LONG offset; + const IID *iid; + } ifaces[80]; +} CLASS_AND_INTERFACES; +typedef const CLASS_AND_INTERFACES *PCCLASS_AND_INTERFACES; + +#define ID_NAME(c) &c, #c + +VOID +TestClasses( + _In_ PCWSTR ModuleName, + _In_ PCCLASS_AND_INTERFACES ExpectedInterfaces, + _In_ INT ExpectedInterfaceCount); + +/* Indicate that the interface is implemented in another (probably aggregate) object, + * so its offset varies and is "far away" */ +#define FARAWY (-65535) + +// TODO: fix our headers... we really shouldn't need these here +DEFINE_GUID(CLSID_CopyToMenu, 0xC2FBB630, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); +DEFINE_GUID(CLSID_DeskMovr, 0x72267F6A, 0xA6F9, 0x11D0, 0xBC, 0x94, 0x00, 0xC0, 0x4F, 0xB6, 0x78, 0x63); +DEFINE_GUID(CLSID_FadeTask, 0x7EB5FBE4, 0x2100, 0x49E6, 0x85, 0x93, 0x17, 0xE1, 0x30, 0x12, 0x2F, 0x91); +DEFINE_GUID(CLSID_FileSearchBand, 0xc4ee31f3, 0x4768, 0x11d2, 0xbe, 0x5c, 0x00, 0xa0, 0xc9, 0xa8, 0x3d, 0xa1); +DEFINE_GUID(CLSID_FolderItem, 0xfef10fa2, 0x355e, 0x4e06, 0x93, 0x81, 0x9b, 0x24, 0xd7, 0xf7, 0xcc, 0x88); +DEFINE_GUID(CLSID_FolderItemsFDF, 0x53c74826, 0xab99, 0x4d33, 0xac, 0xa4, 0x31, 0x17, 0xf5, 0x1d, 0x37, 0x88); +DEFINE_GUID(CLSID_FolderViewHost, 0x20b1cb23, 0x6968, 0x4eb9, 0xb7, 0xd4, 0xa6, 0x6d, 0x00, 0xd0, 0x7c, 0xee); +DEFINE_GUID(CLSID_ISFBand, 0xD82BE2B0, 0x5764, 0x11D0, 0xA9, 0x6E, 0x00, 0xC0, 0x4F, 0xD7, 0x05, 0xA2); +DEFINE_GUID(CLSID_MenuDeskBar, 0xECD4FC4F, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); +DEFINE_GUID(CLSID_MenuToolbarBase, 0x40b96610, 0xb522, 0x11d1, 0xb3, 0xb4, 0x00, 0xaa, 0x00, 0x6e, 0xfd, 0xe7); +DEFINE_GUID(CLSID_MoveToMenu, 0xC2FBB631, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); +DEFINE_GUID(CLSID_QuickLinks, 0x0E5CBF21, 0xD15F, 0x11D0, 0x83, 0x01, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); +DEFINE_GUID(CLSID_SendToMenu, 0x7BA4C740, 0x9E81, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); +DEFINE_GUID(CLSID_ShellFolderView, 0x62112aa1, 0xebe4, 0x11cf, 0xa5, 0xfb, 0x00, 0x20, 0xaf, 0xe7, 0x29, 0x2d); +DEFINE_GUID(CLSID_ShellLinkObject, 0x11219420, 0x1768, 0x11d1, 0x95, 0xbe, 0x00, 0x60, 0x97, 0x97, 0xea, 0x4f); +DEFINE_GUID(CLSID_StartMenuPin, 0xa2a9545d, 0xa0c2, 0x42b4, 0x97, 0x08, 0xa0, 0xb2, 0xba, 0xdd, 0x77, 0xc8); +DEFINE_GUID(CLSID_TrackShellMenu, 0x8278F931, 0x2A3E, 0x11d2, 0x83, 0x8F, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); + +DEFINE_GUID(IID_IDefViewFrame, 0x710EB7A0, 0x45ED, 0x11D0, 0x92, 0x4A, 0x00, 0x20, 0xAF, 0xC7, 0xAC, 0x4D); +DEFINE_GUID(IID_IDocViewSite, 0x87D605E0, 0xC511, 0x11CF, 0x89, 0xA9, 0x00, 0xA0, 0xC9, 0x05, 0x41, 0x29); +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_IFolderBandPriv, 0x47c01f95, 0xe185, 0x412c, 0xb5, 0xc5, 0x4f, 0x27, 0xdf, 0x96, 0x5a, 0xea); +DEFINE_GUID(IID_IFolderView2, 0x1af3a467, 0x214f, 0x4298, 0x90, 0x8e, 0x06, 0xb0, 0x3e, 0x0b, 0x39, 0xf9); +DEFINE_GUID(IID_IFolderViewSettings, 0xae8c987d, 0x8797, 0x4ed3, 0xbe, 0x72, 0x2a, 0x47, 0xdd, 0x93, 0x8d, 0xb0); +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); +DEFINE_GUID(IID_IShellDispatch5, 0x866738b9, 0x6cf2, 0x4de8, 0x87, 0x67, 0xf7, 0x94, 0xeb, 0xe7, 0x4f, 0x4e); +DEFINE_GUID(IID_IContextMenuSite, 0x0811aebe, 0x0b87, 0x4c54, 0x9e, 0x72, 0x54, 0x8c, 0xf6, 0x49, 0x01, 0x6b); +DEFINE_GUID(IID_IShellDesktopTray, 0x213e2df9, 0x9a14, 0x4328, 0x99, 0xb1, 0x69, 0x61, 0xf9, 0x14, 0x3c, 0xe9); +DEFINE_GUID(IID_IShellFolderBand, 0x7fe80cc8, 0xc247, 0x11d0, 0xb9, 0x3a, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); +DEFINE_GUID(IID_IShellFolderViewDual, 0xe7a1af80, 0x4d96, 0x11cf, 0x96, 0x0c, 0x00, 0x80, 0xc7, 0xf4, 0xee, 0x85); +DEFINE_GUID(IID_IShellFolderViewDual2, 0x31c147b6, 0x0ade, 0x4a3c, 0xb5, 0x14, 0xdd, 0xf9, 0x32, 0xef, 0x6d, 0x17); +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_DFConstraint, 0x403df050, 0x23bd, 0x11d2, 0x93, 0x9f, 0x00, 0xa0, 0xc9, 0x1e, 0xed, 0xba); + +DEFINE_GUID(IID_FolderItems2, 0xc94f0ad0, 0xf363, 0x11d2, 0xa3, 0x27, 0x00, 0xc0, 0x4f, 0x8e, 0xec, 0x7f); +DEFINE_GUID(IID_FolderItems3, 0xeaa7c309, 0xbbec, 0x49d5, 0x82, 0x1d, 0x64, 0xd9, 0x66, 0xcb, 0x66, 0x7f); Propchange: trunk/rostests/apitests/com/com_apitest.h ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rostests/apitests/com/ieframe.c [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: COM interface test for ieframe classes + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_ShellWindows), + { + { -0xa0, &IID_IMarshal }, + { -0x20, &IID_IClientSecurity }, + { 0x0, &IID_IMultiQI }, + { 0x0, &IID_IUnknown }, + { FARAWY, &IID_IShellWindows }, + { FARAWY, &IID_IDispatch }, + } + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(ieframe) +{ + TestClasses(L"ieframe", ExpectedInterfaces, ExpectedInterfaceCount); +} Propchange: trunk/rostests/apitests/com/ieframe.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,57 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: COM interface test for shdocvw classes + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_FontsFolderShortcut), + { + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder3 }, + { 0x4, &IID_IPersistFolder2 }, + { 0x4, &IID_IPersistFolder }, + { 0x4, &IID_IPersist }, + { 0x8, &IID_IShellLinkA }, + { 0xc, &IID_IShellLinkW }, + { 0x10, &IID_IPersistFile }, + { 0x14, &IID_IExtractIconW }, + { 0x18, &IID_IQueryInfo }, + { 0x20, &IID_IPersistStream }, + { 0x20, &IID_IPersistStreamInit }, + { 0x24, &IID_IPersistPropertyBag }, + } + }, +#if 0 // E_OUTOFMEMORY? + { + ID_NAME(CLSID_ShellDispatchInproc), + { + { 0x0, &IID_IUnknown }, + } + }, +#endif + { + ID_NAME(CLSID_TaskbarList), + { + { 0x0, &IID_ITaskbarList2 }, + { 0x0, &IID_ITaskbarList }, + { 0x0, &IID_IUnknown }, + } + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(shdocvw) +{ + TestClasses(L"shdocvw", ExpectedInterfaces, ExpectedInterfaceCount); +} Propchange: trunk/rostests/apitests/com/shdocvw.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,437 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: COM interface test for shell32 classes + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_CopyToMenu), + { + { 0x0, &IID_IContextMenu3 }, + { 0x0, &IID_IContextMenu2 }, + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_DeskMovr), + { + { 0x0, &IID_IUnknown }, + { 0x74, &IID_IOleObject }, + { 0x78, &IID_IPersistPropertyBag }, + { 0x80, &IID_IOleInPlaceActiveObject }, + { 0x84, &IID_IViewObject2 }, + { 0x84, &IID_IViewObject }, + { 0x88, &IID_IOleWindow }, + { 0x88, &IID_IOleInPlaceObject }, + { 0x88, &IID_IOleInPlaceObjectWindowless }, + } + }, + { + ID_NAME(CLSID_DragDropHelper), + { + { 0x0, &IID_IDragSourceHelper }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IDropTargetHelper }, + } + }, + { + ID_NAME(CLSID_FadeTask), + { + { 0x0, &IID_IUnknown }, + } + }, + { + ID_NAME(CLSID_FileSearchBand), + { + { 0x0, &IID_IFileSearchBand }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + { 0x8, &IID_IPersistStream }, + { 0x8, &IID_IPersist }, + { 0xc, &IID_IDeskBand }, + { 0xc, &IID_IDockingWindow }, + { 0xc, &IID_IOleWindow }, + { 0x10, &IID_IInputObject }, + { 0x18, &IID_IOleInPlaceSite }, + } + }, + { + ID_NAME(CLSID_FolderItem), + { + //{ 0x0, &CLSID_ShellFolderItem }, // broken QueryInterface that doesn't add a reference + { 0x0, &IID_FolderItem2 }, + { 0x0, &IID_FolderItem }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder2 }, + { 0x4, &IID_IPersistFolder }, + { 0x4, &IID_IPersist }, + { 0x8, &IID_IObjectSafety }, + } + }, + { + ID_NAME(CLSID_FolderItemsFDF), + { + { 0x0, &IID_FolderItems3 }, + //{ 0x0, &IID_FolderItems2 }, ???? + { 0x0, &IID_FolderItems }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder }, + { 0x8, &IID_IObjectSafety }, + } + }, + { + ID_NAME(CLSID_FolderShortcut), + { + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder3 }, + { 0x4, &IID_IPersistFolder2 }, + { 0x4, &IID_IPersistFolder }, + { 0x4, &IID_IPersist }, + { 0x8, &IID_IShellLinkA }, + { 0xc, &IID_IShellLinkW }, + { 0x10, &IID_IPersistFile }, + { 0x14, &IID_IExtractIconW }, + { 0x18, &IID_IQueryInfo }, + { 0x20, &IID_IPersistStream }, + { 0x20, &IID_IPersistStreamInit }, + { 0x24, &IID_IPersistPropertyBag }, + } + }, + { + ID_NAME(CLSID_FolderViewHost), + { + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IServiceProvider }, + { 0x8, &IID_IOleWindow }, + { 0xc, &IID_IFolderView }, + { 0x10, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_ISFBand), + { + { -0xac, &IID_IDeskBand }, + { -0xac, &IID_IDockingWindow }, + { -0xac, &IID_IOleWindow }, + { -0xa8, &IID_IObjectWithSite }, + { -0xa0, &IID_IInputObject }, + { -0x9c, &IID_IPersistStream }, + { -0x9c, &IID_IPersist }, + { -0x98, &IID_IOleCommandTarget }, + { -0x94, &IID_IServiceProvider }, + { -0x78, &IID_IWinEventHandler }, + { -0x74, &IID_IShellChangeNotify }, + { -0x70, &IID_IDropTarget }, + { -0x4, &IID_IContextMenu }, + { 0x0, &IID_IShellFolderBand }, + { 0x0, &IID_IUnknown }, + { 0x94, &IID_IFolderBandPriv }, + } + }, + { + ID_NAME(CLSID_MenuBand), + { + { -0x30, &IID_IDeskBand }, + { -0x30, &IID_IDockingWindow }, + { -0x30, &IID_IOleWindow }, + { -0x2c, &IID_IObjectWithSite }, + { -0x24, &IID_IInputObject }, + { -0x20, &IID_IPersistStream }, + { -0x20, &IID_IPersist }, + { -0x1c, &IID_IOleCommandTarget }, + { -0x18, &IID_IServiceProvider }, + { 0x0, &IID_IMenuPopup }, + { 0x0, &IID_IDeskBar }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IMenuBand }, + { 0x8, &IID_IShellMenu2 }, + { 0x8, &IID_IShellMenu }, + { 0xc, &IID_IWinEventHandler }, + { 0x10, &IID_IShellMenuAcc }, + } + }, + { + ID_NAME(CLSID_MenuBandSite), + { + { 0x0, &IID_IBandSite }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IDeskBarClient }, + { 0x4, &IID_IOleWindow }, + { 0x8, &IID_IOleCommandTarget }, + { 0xc, &IID_IInputObject }, + { 0x10, &IID_IInputObjectSite }, + { 0x14, &IID_IWinEventHandler }, + { 0x18, &IID_IServiceProvider }, + } + }, + { + ID_NAME(CLSID_MenuDeskBar), + { + { -0x48, &IID_IOleCommandTarget }, + { -0x44, &IID_IServiceProvider }, + { -0x40, &IID_IDeskBar }, + { -0x40, &IID_IOleWindow }, + { -0x3c, &IID_IInputObjectSite }, + { -0x38, &IID_IInputObject }, + { 0x0, &IID_IMenuPopup }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + { 0x8, &IID_IBanneredBar }, + { 0xc, &IID_IInitializeObject }, + } + }, +#if 0 // This is registered to shell32, but can't be instanciated + { + ID_NAME(CLSID_MenuToolbarBase), + { + { 0x0, &IID_IUnknown }, + } + }, +#endif + { + ID_NAME(CLSID_MoveToMenu), + { + { 0x0, &IID_IContextMenu3 }, + { 0x0, &IID_IContextMenu2 }, + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_NewMenu), + { + { -0xc, &IID_IObjectWithSite }, + { -0x4, &IID_IContextMenu3 }, + { -0x4, &IID_IContextMenu2 }, + { -0x4, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + } + }, + { + ID_NAME(CLSID_PersonalStartMenu), + { + { -0x30, &IID_IDeskBand }, + { -0x30, &IID_IDockingWindow }, + { -0x30, &IID_IOleWindow }, + { -0x2c, &IID_IObjectWithSite }, + { -0x24, &IID_IInputObject }, + { -0x20, &IID_IPersistStream }, + { -0x20, &IID_IPersist }, + { -0x1c, &IID_IOleCommandTarget }, + { -0x18, &IID_IServiceProvider }, + { 0x0, &IID_IMenuPopup }, + { 0x0, &IID_IDeskBar }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IMenuBand }, + { 0x8, &IID_IShellMenu2 }, + { 0x8, &IID_IShellMenu }, + { 0xc, &IID_IWinEventHandler }, + { 0x10, &IID_IShellMenuAcc }, + } + }, + { + ID_NAME(CLSID_QuickLinks), + { + { -0xac, &IID_IDeskBand }, + { -0xac, &IID_IDockingWindow }, + { -0xac, &IID_IOleWindow }, + { -0xa8, &IID_IObjectWithSite }, + { -0xa0, &IID_IInputObject }, + { -0x9c, &IID_IPersistStream }, + { -0x9c, &IID_IPersist }, + { -0x98, &IID_IOleCommandTarget }, + { -0x94, &IID_IServiceProvider }, + { -0x78, &IID_IWinEventHandler }, + { -0x74, &IID_IShellChangeNotify }, + { -0x70, &IID_IDropTarget }, + { -0x4, &IID_IContextMenu }, + { 0x0, &IID_IShellFolderBand }, + { 0x0, &IID_IUnknown }, + { 0x94, &IID_IFolderBandPriv }, + } + }, + { + ID_NAME(CLSID_SendToMenu), + { + { -0x4, &IID_IContextMenu3 }, + { -0x4, &IID_IContextMenu2 }, + { -0x4, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IOleWindow }, + } + }, + { + ID_NAME(CLSID_Shell), + { + { 0x0, &IID_IShellDispatch4 }, + { 0x0, &IID_IShellDispatch3 }, + { 0x0, &IID_IShellDispatch2 }, + { 0x0, &IID_IShellDispatch }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectSafety }, + { 0x20, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_ShellDesktop), + { + { -0x8, &IID_IObjectWithSite }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IPersistFolder2 }, + { 0x8, &IID_IPersistFolder }, + { 0x8, &IID_IPersist }, + { 0xc, &IID_IShellIcon }, + { 0x14, &IID_IContextMenuCB }, + { 0x20, &IID_IOleCommandTarget }, + { FARAWY, &IID_IShellFolder2 }, + { FARAWY, &IID_IShellFolder }, + } + }, + { + ID_NAME(CLSID_ShellFSFolder), + { + { 0x0, &IID_IUnknown }, + { 0xc, &IID_IShellFolder2 }, + { 0xc, &IID_IShellFolder }, + { 0x10, &IID_IShellIcon }, + { 0x18, &IID_IPersistFolder3 }, + { 0x18, &IID_IPersistFolder2 }, + { 0x18, &IID_IPersistFolder }, + { 0x18, &IID_IPersist }, + { 0x2c, &IID_IContextMenuCB }, + { 0x34, &IID_IOleCommandTarget }, + } + }, + { + ID_NAME(CLSID_ShellFldSetExt), + { + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_ShellFolderView), + { + { 0x0, &IID_IShellFolderViewDual2 }, + { 0x0, &IID_IShellFolderViewDual }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellService }, + { 0x8, &IID_IServiceProvider }, + { 0xc, &IID_IObjectSafety }, + { 0x14, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_ShellFolderViewOC), + { + { 0x0, &IID_IFolderViewOC }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IObjectSafety }, + { 0x88, &IID_IPersistStreamInit }, + { 0x88, &IID_IPersist }, + { 0x90, &IID_IOleObject }, + { 0x94, &IID_IOleInPlaceActiveObject }, + { 0x98, &IID_IOleInPlaceObjectWindowless }, + { 0x98, &IID_IOleInPlaceObject }, + { 0x98, &IID_IOleWindow }, + } + }, + { + ID_NAME(CLSID_ShellItem), + { + { 0x0, &IID_IShellItem }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistIDList }, + } + }, + { + ID_NAME(CLSID_ShellLink), + { + { 0x0, &IID_IShellLinkA }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellLinkW }, + { 0x8, &IID_IPersistStream }, + { 0xc, &IID_IPersistFile }, + { 0x14, &IID_IContextMenu3 }, + { 0x14, &IID_IContextMenu2 }, + { 0x14, &IID_IContextMenu }, + { 0x18, &IID_IDropTarget }, + { 0x1c, &IID_IQueryInfo }, + { 0x24, &IID_IExtractIconA }, + { 0x28, &IID_IExtractIconW }, + { 0x2c, &IID_IExtractImage2 }, + { 0x2c, &IID_IExtractImage }, + { 0x30, &IID_IPersistPropertyBag }, + { 0x34, &IID_IServiceProvider }, + { 0x3c, &IID_IObjectWithSite }, + } + }, +#if 0 // Apparently we can only get this through Folder.Items().GetLink + { + ID_NAME(CLSID_ShellLinkObject), + { + { 0x0, &IID_IUnknown }, + } + }, +#endif + { + ID_NAME(CLSID_StartMenu), + { + { -0x48, &IID_IOleCommandTarget }, + { -0x44, &IID_IServiceProvider }, + { -0x40, &IID_IDeskBar }, + { -0x40, &IID_IOleWindow }, + { -0x3c, &IID_IInputObjectSite }, + { -0x38, &IID_IInputObject }, + { 0x0, &IID_IMenuPopup }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + { 0x8, &IID_IBanneredBar }, + { 0xc, &IID_IInitializeObject }, + } + }, + { + ID_NAME(CLSID_StartMenuPin), + { + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IContextMenu }, + { 0xc, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_TrackShellMenu), + { + { 0x0, &IID_ITrackShellMenu }, + { 0x0, &IID_IShellMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellMenu2 }, + { 0x8, &IID_IObjectWithSite }, + { 0xc, &IID_IServiceProvider }, + } + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(shell32) +{ + TestClasses(L"shell32", ExpectedInterfaces, ExpectedInterfaceCount); +} Propchange: trunk/rostests/apitests/com/shell32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/com/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/com/testlist.c (added) +++ trunk/rostests/apitests/com/testlist.c [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,21 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_browseui(void); +extern void func_ieframe(void); +extern void func_shdocvw(void); +extern void func_shell32(void); + +const struct test winetest_testlist[] = +{ + { "browseui", func_browseui }, + { "ieframe", func_ieframe }, + { "shdocvw", func_shdocvw }, + { "shell32", func_shell32 }, + + { 0, 0 } +}; Propchange: trunk/rostests/apitests/com/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 2 months

[tfaber] 59441: [NDK] - Add RtlStringFromGUID

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 7 07:56:46 2013 New Revision: 59441 URL: http://svn.reactos.org/svn/reactos?rev=59441&view=rev Log: [NDK] - Add RtlStringFromGUID Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Jul 7 07:56:46 2013 @@ -4112,12 +4112,22 @@ #endif #ifdef NTOS_MODE_USER +_Must_inspect_result_ NTSYSAPI NTSTATUS NTAPI RtlGUIDFromString( _In_ PUNICODE_STRING GuidString, _Out_ GUID *Guid); + +_Must_inspect_result_ +NTSYSAPI +NTSTATUS +NTAPI +RtlStringFromGUID( + _In_ REFGUID Guid, + _Out_ _At_(GuidString->Buffer, __drv_allocatesMem(Mem)) + PUNICODE_STRING GuidString); NTSYSAPI NTSTATUS

11 years, 2 months

[tfaber] 59440: [PSDK] - Fix IShellFolderView too

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 7 07:48:32 2013 New Revision: 59440 URL: http://svn.reactos.org/svn/reactos?rev=59440&view=rev Log: [PSDK] - Fix IShellFolderView too Modified: trunk/reactos/include/psdk/shlguid_undoc.h Modified: trunk/reactos/include/psdk/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid_undoc… ============================================================================== --- trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] Sun Jul 7 07:48:32 2013 @@ -30,7 +30,7 @@ DEFINE_GUID(IID_IWinEventHandler, 0xEA5F2D61, 0xE008, 0x11CF, 0x99, 0xCB, 0x00, 0xC0, 0x4F, 0xD6, 0x44, 0x97); DEFINE_GUID(IID_IShellMenuAcc, 0xFAF6FE96, 0xCE5E, 0x11D1, 0x83, 0x71, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); DEFINE_GUID(IID_IShellBrowserService, 0x1307EE17, 0xEA83, 0x49EB, 0x96, 0xB2, 0x3A, 0x28, 0xE2, 0xD7, 0x04, 0x8A); -//DEFINE_GUID(IID_IFolderView, 0xCDE725B0, 0xCCC9, 0x4519, 0x91, 0x7E, 0x32, 0x5D, 0x72, 0xFA, 0xB4, 0xCE); +DEFINE_GUID(IID_IShellFolderView, 0x37A378C0, 0xF82D, 0x11CE, 0xAE, 0x65, 0x08, 0x00, 0x2B, 0x2E, 0x12, 0x62); DEFINE_GUID(SID_SProxyBrowser, 0x20C46561, 0x8491, 0x11CF, 0x96, 0x0C, 0x00, 0x80, 0xC7, 0xF4, 0xEE, 0x85);

11 years, 2 months

[tfaber] 59439: [PSDK] - Declare IID only once aka fix GCC build

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 7 07:28:43 2013 New Revision: 59439 URL: http://svn.reactos.org/svn/reactos?rev=59439&view=rev Log: [PSDK] - Declare IID only once aka fix GCC build Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Sun Jul 7 07:28:43 2013 @@ -1903,7 +1903,6 @@ #define INTERFACE IShellIconOverlayIdentifier -DEFINE_GUID(IID_IShellIconOverlayIdentifier, 0x0c6c4200L, 0xc589, 0x11d0, 0x99, 0x9a, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); DECLARE_INTERFACE_(IShellIconOverlayIdentifier, IUnknown) { STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE;

11 years, 2 months

[tfaber] 59438: [PSDK] - Fix ShellItem/ShellFolderItem confusion and some misc GUIDs

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 7 07:19:35 2013 New Revision: 59438 URL: http://svn.reactos.org/svn/reactos?rev=59438&view=rev Log: [PSDK] - Fix ShellItem/ShellFolderItem confusion and some misc GUIDs Modified: trunk/reactos/include/psdk/shldisp.idl trunk/reactos/include/psdk/shlguid.h trunk/reactos/include/psdk/shlguid_undoc.h trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/lib/sdk/uuid/otherguids.c Modified: trunk/reactos/include/psdk/shldisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shldisp.idl?r… ============================================================================== --- trunk/reactos/include/psdk/shldisp.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shldisp.idl [iso-8859-1] Sun Jul 7 07:19:35 2013 @@ -72,7 +72,7 @@ [in] IUnknown *punkACL, [in] LPCOLESTR pwszRegKeyPath, [in] LPCOLESTR pwszQuickComplete); - + HRESULT Enable( [in] BOOL fEnable ); } @@ -308,6 +308,27 @@ HRESULT Verbs( [out, retval] FolderItemVerbs **ppfic ); HRESULT InvokeVerb( [in, optional] VARIANT vVerb ); +} + +[ + object, + uuid(edc817aa-92b8-11d1-b075-00c04fc33aa5), + oleautomation, + dual +] +interface FolderItem2 : FolderItem +{ + HRESULT InvokeVerbEx( [in, optional] VARIANT vVerb, [in, optional] VARIANT vArgs ); + + HRESULT ExtendedProperty( [in] BSTR sPropName, [out, retval] VARIANT *pvRet ); +} + +[ + uuid(2fe352ea-fd1f-11d2-b1f4-00c04f8eeb3e) +] +coclass ShellFolderItem +{ + interface FolderItem2; } /***************************************************************************** Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Sun Jul 7 07:19:35 2013 @@ -121,6 +121,7 @@ DEFINE_GUID(IID_IDockingWindowSite, 0x2A342FC2, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IInputObject, 0x68284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); DEFINE_GUID(IID_IInputObjectSite, 0xF1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); +DEFINE_GUID(IID_IShellIconOverlayIdentifier, 0x0c6c4200L, 0xc589, 0x11d0, 0x99, 0x9a, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); /**************************************************************************** * the next IID's are the namespace elements of the pidls @@ -145,8 +146,6 @@ DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); - -DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} DEFINE_GUID(FMTID_ShellDetails, 0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); Modified: trunk/reactos/include/psdk/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid_undoc… ============================================================================== --- trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] Sun Jul 7 07:19:35 2013 @@ -102,17 +102,14 @@ DEFINE_GUID(CLSID_ShellDrvDefExt, 0x5F5295E0, 0x429F, 0x1069, 0xA2, 0xE2, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); DEFINE_GUID(CLSID_ShellNetDefExt, 0x86422020, 0x42A0, 0x1069, 0xA2, 0xE5, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); -// In theory, this is documented. But until I see an SDK header that defines it, it will be treated as undocumented... -DEFINE_GUID(CLSID_ShellItem, 0x2FE352EA, 0xFD1F, 0x11D2, 0xB1, 0xF4, 0x00, 0xC0, 0x4F, 0x8E, 0xEB, 0x3E); - #define CGID_IExplorerToolbar IID_IExplorerToolbar #define SID_IExplorerToolbar IID_IExplorerToolbar #define SID_ITargetFrame2 IID_ITargetFrame2 #define SID_IWebBrowserApp IID_IWebBrowserApp #define CGID_IDeskBand IID_IDeskBand #define CGID_MenuBand CLSID_MenuBand -#define SID_STravelLogCursor IID_ITravelLogStg -#define SID_IBandSite IID_IBandSite +#define SID_STravelLogCursor IID_ITravelLogStg +#define SID_IBandSite IID_IBandSite #define SID_IFolderView IID_IFolderView #define SID_IShellBrowser IID_IShellBrowser Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Sun Jul 7 07:19:35 2013 @@ -1765,7 +1765,7 @@ HRESULT GetExtension( [out] LPSTR pszExtension, [in] int cchExtension); -} +} /***************************************************************************** @@ -1796,7 +1796,7 @@ HRESULT GetExtension( [out] LPWSTR pszExtension, [in] int cchExtension); -} +} /***************************************************************************** * IRunnableTask interface @@ -2281,7 +2281,7 @@ ] interface IShellMenuCallback : IUnknown { - HRESULT CallbackSM( + HRESULT CallbackSM( [in, out] LPSMDATA psmd, [in] UINT uMsg, [in] WPARAM wParam, @@ -2317,48 +2317,48 @@ ] interface IShellMenu : IUnknown { - HRESULT Initialize( + HRESULT Initialize( [in] IShellMenuCallback *psmc, [in] UINT uId, [in] UINT uIdAncestor, [in] DWORD dwFlags); - - HRESULT GetMenuInfo( + + HRESULT GetMenuInfo( [out] IShellMenuCallback **ppsmc, [out] UINT *puId, [out] UINT *puIdAncestor, [out] DWORD *pdwFlags); - - HRESULT SetShellFolder( + + HRESULT SetShellFolder( [in] IShellFolder *psf, [in] LPCITEMIDLIST pidlFolder, [in] HKEY hKey, [in] DWORD dwFlags); - - HRESULT GetShellFolder( + + HRESULT GetShellFolder( [out] DWORD *pdwFlags, [out] LPITEMIDLIST *ppidl, [in] REFIID riid, [out] void **ppv); - - HRESULT SetMenu( + + HRESULT SetMenu( [in] HMENU hmenu, [in] HWND hwnd, [in] DWORD dwFlags); - - HRESULT GetMenu( + + HRESULT GetMenu( [out] HMENU *phmenu, [out] HWND *phwnd, [out] DWORD *pdwFlags); - - HRESULT InvalidateItem( + + HRESULT InvalidateItem( [in] LPSMDATA psmd, [in] DWORD dwFlags); - - HRESULT GetState( + + HRESULT GetState( [out] LPSMDATA psmd); - - HRESULT SetMenuToolbar( + + HRESULT SetMenuToolbar( [in] IUnknown *punk, [in] DWORD dwFlags); } @@ -2970,12 +2970,12 @@ ] interface ITrackShellMenu : IShellMenu { - HRESULT SetObscured( + HRESULT SetObscured( [in] HWND hwndTB, [in] IUnknown *punkBand, DWORD dwSMSetFlags); - HRESULT Popup( + HRESULT Popup( [in] HWND hwnd, [in] POINTL *ppt, [in] RECTL *prcExclude, @@ -4485,4 +4485,11 @@ coclass DestinationList { interface ICustomDestinationList; } -} + + [ + uuid(9ac9fbe1-e0a2-4ad6-b4ee-e212013ea917) + ] + coclass ShellItem { + interface IShellItem2; + } +} Modified: trunk/reactos/lib/sdk/uuid/otherguids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/otherguids.c?… ============================================================================== --- trunk/reactos/lib/sdk/uuid/otherguids.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/otherguids.c [iso-8859-1] Sun Jul 7 07:19:35 2013 @@ -29,7 +29,6 @@ DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); DEFINE_GUID(CLSID_TF_LangBarMgr, 0xebb08c45,0x6c4a,0x4fdc,0xae,0x53,0x4e,0xb8,0xc4,0xc7,0xdb,0x8e); DEFINE_GUID(CLSID_TF_DisplayAttributeMgr, 0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53); -DEFINE_GUID(CLSID_TaskbarList, 0x56fdf344,0xfd6d,0x11d0,0x95,0x8a,0x00,0x60,0x97,0xc9,0xa0,0x90); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43); @@ -51,6 +50,4 @@ DEFINE_GUID(CLSID_StdPicture, 0x0BE35204, 0x8F91, 0x11CE, 0x9D,0xE3, 0x00,0xAA,0x00,0x4B,0xB8,0x51); DEFINE_GUID(CLSID_StdFont, 0x0BE35203, 0x8F91, 0x11CE, 0x9D,0xE3, 0x00,0xAA,0x00,0x4B,0xB8,0x51); -DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); - DEFINE_GUID(SID_VariantConversion, 0x1f101481,0xbccd,0x11d0,0x93,0x36,0x00,0xa0,0xc9,0xd,0xca,0xa9);

11 years, 2 months

[hbelusca] 59437: Revert revision r59381 since it fails to detect VS2010 (and I suppose the other ones, then). Indeed with VS2010, checking for the string content " 16." instead of "16." makes vers...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jul 7 00:23:34 2013 New Revision: 59437 URL: http://svn.reactos.org/svn/reactos?rev=59437&view=rev Log: Revert revision r59381 since it fails to detect VS2010 (and I suppose the other ones, then). Indeed with VS2010, checking for the string content " 16." instead of "16." makes version checking fail. After checking with a hex editor what was the character preceding the number "1" of the "16." part of the version string returned by cl.exe, I saw that it wasn't a space as thought by the author, but the character of code 0xA0 ... Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59437&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sun Jul 7 00:23:34 2013 @@ -57,10 +57,10 @@ cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm - cl 2>&1 | find " 14." > NUL && set BUILD_ENVIRONMENT=VS8 - cl 2>&1 | find " 15." > NUL && set BUILD_ENVIRONMENT=VS9 - cl 2>&1 | find " 16." > NUL && set BUILD_ENVIRONMENT=VS10 - cl 2>&1 | find " 17." > NUL && set BUILD_ENVIRONMENT=VS11 + cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8 + cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9 + cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10 + cl 2>&1 | find "17." > NUL && set BUILD_ENVIRONMENT=VS11 if not defined BUILD_ENVIRONMENT ( echo Error: Visual Studio version too old or version detection failed. exit /b

11 years, 2 months

[hbelusca] 59436: [KERNEL32] Forgot to add those files in the previous commit r59435: We now store only console handles and not console pointers themselves.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 6 19:57:38 2013 New Revision: 59436 URL: http://svn.reactos.org/svn/reactos?rev=59436&view=rev Log: [KERNEL32] Forgot to add those files in the previous commit r59435: We now store only console handles and not console pointers themselves. Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c trunk/reactos/dll/win32/kernel32/client/console/init.c trunk/reactos/include/reactos/subsys/win/conmsg.h Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Sat Jul 6 19:57:38 2013 @@ -960,7 +960,7 @@ InitConsoleInfo(AllocConsoleRequest->ConsoleStartInfo, &Parameters->ImagePathName); - AllocConsoleRequest->Console = NULL; + AllocConsoleRequest->ConsoleHandle = NULL; AllocConsoleRequest->CtrlDispatcher = ConsoleControlDispatcher; AllocConsoleRequest->PropDispatcher = PropDialogHandler; @@ -977,7 +977,7 @@ return FALSE; } - Parameters->ConsoleHandle = AllocConsoleRequest->Console; + Parameters->ConsoleHandle = AllocConsoleRequest->ConsoleHandle; SetStdHandle(STD_INPUT_HANDLE , AllocConsoleRequest->InputHandle ); SetStdHandle(STD_OUTPUT_HANDLE, AllocConsoleRequest->OutputHandle); SetStdHandle(STD_ERROR_HANDLE , AllocConsoleRequest->ErrorHandle ); @@ -2174,7 +2174,7 @@ return FALSE; } - Parameters->ConsoleHandle = AttachConsoleRequest->Console; + Parameters->ConsoleHandle = AttachConsoleRequest->ConsoleHandle; SetStdHandle(STD_INPUT_HANDLE , AttachConsoleRequest->InputHandle ); SetStdHandle(STD_OUTPUT_HANDLE, AttachConsoleRequest->OutputHandle); SetStdHandle(STD_ERROR_HANDLE , AttachConsoleRequest->ErrorHandle ); Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] Sat Jul 6 19:57:38 2013 @@ -245,7 +245,7 @@ } /* Now use the proper console handle */ - ConnectInfo.Console = Parameters->ConsoleHandle; + ConnectInfo.ConsoleHandle = Parameters->ConsoleHandle; /* Initialize the Console Ctrl Handler */ InitConsoleCtrlHandling(); @@ -290,7 +290,7 @@ if (!ConnectInfo.ConsoleNeeded) return TRUE; /* We got the handles, let's set them */ - if ((Parameters->ConsoleHandle = ConnectInfo.Console)) + if ((Parameters->ConsoleHandle = ConnectInfo.ConsoleHandle)) { /* If we already had some, don't use the new ones */ if (!Parameters->StandardInput) Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sat Jul 6 19:57:38 2013 @@ -133,7 +133,7 @@ /* Adapted from CONSOLE_ALLOCCONSOLE */ CONSOLE_START_INFO ConsoleStartInfo; - HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCONSOLE + HANDLE ConsoleHandle; HANDLE InputHandle; HANDLE OutputHandle; HANDLE ErrorHandle; @@ -182,7 +182,7 @@ { PCONSOLE_START_INFO ConsoleStartInfo; - HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCONSOLE + HANDLE ConsoleHandle; HANDLE InputHandle; HANDLE OutputHandle; HANDLE ErrorHandle; @@ -194,7 +194,7 @@ typedef struct { DWORD ProcessId; // If ProcessId == ATTACH_PARENT_PROCESS == -1, then attach the current process to its parent process console. - HANDLE Console; // ConsoleHandle // On ReactOS, it is a PCONSOLE + HANDLE ConsoleHandle; HANDLE InputHandle; HANDLE OutputHandle; HANDLE ErrorHandle;

11 years, 2 months

[hbelusca] 59435: [CONSRV] - Use a handle table for storing consoles. Now checking validity of console handles is done in O(1) instead of O(n) as before. I will see later on whether it would be goo...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 6 19:47:53 2013 New Revision: 59435 URL: http://svn.reactos.org/svn/reactos?rev=59435&view=rev Log: [CONSRV] - Use a handle table for storing consoles. Now checking validity of console handles is done in O(1) instead of O(n) as before. I will see later on whether it would be good to have both a handle table and a linked list (which is removed here) for storing them (when condrv will be a real console driver, handles to consoles will be obtained as you would obtain usual handles to devices, etc... so that consoles will be internally stored in a linked list again). - Add a "dummy" frontend to have the possibility to adopt default actions when no frontend is attached to a console, and to always have a valid virtual table for them. Added: trunk/reactos/win32ss/user/consrv/condrv/dummyfrontend.c (with props) Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt trunk/reactos/win32ss/user/consrv/condrv/console.c trunk/reactos/win32ss/user/consrv/console.c trunk/reactos/win32ss/user/consrv/console.h trunk/reactos/win32ss/user/consrv/consrv.h trunk/reactos/win32ss/user/consrv/handle.c trunk/reactos/win32ss/user/consrv/include/conio.h trunk/reactos/win32ss/user/consrv/include/console.h trunk/reactos/win32ss/user/consrv/init.c trunk/reactos/win32ss/user/consrv/procinit.h Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/consrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/CMakeLists.txt [iso-8859-1] Sat Jul 6 19:47:53 2013 @@ -21,6 +21,7 @@ condrv/coninput.c condrv/conoutput.c condrv/console.c + condrv/dummyfrontend.c condrv/graphics.c condrv/text.c frontends/input.c Modified: trunk/reactos/win32ss/user/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/condrv/console.c [iso-8859-1] Sat Jul 6 19:47:53 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Console Server DLL + * PROJECT: ReactOS Console Driver DLL * FILE: win32ss/user/consrv/condrv/console.c * PURPOSE: Console Management Functions * PROGRAMMERS: Gé van Geldorp @@ -34,7 +34,8 @@ /* GLOBALS ********************************************************************/ -static LIST_ENTRY ConsoleList; /* The list of all the allocated consoles */ +static ULONG ConsoleListSize; +static PCONSOLE* ConsoleList; /* The list of all the allocated consoles */ static RTL_RESOURCE ListLock; #define ConDrvLockConsoleListExclusive() \ @@ -47,7 +48,7 @@ RtlReleaseResource(&ListLock) // Adapted from reactos/lib/rtl/unicode.c, RtlCreateUnicodeString line 2180 -BOOLEAN +static BOOLEAN ConsoleCreateUnicodeString(IN OUT PUNICODE_STRING UniDest, IN PCWSTR Source) { @@ -65,7 +66,7 @@ } // Adapted from reactos/lib/rtl/unicode.c, RtlFreeUnicodeString line 431 -VOID +static VOID ConsoleFreeUnicodeString(IN PUNICODE_STRING UnicodeString) { if (UnicodeString->Buffer) @@ -74,6 +75,129 @@ RtlZeroMemory(UnicodeString, sizeof(UNICODE_STRING)); } } + + +static NTSTATUS +InsertConsole(OUT PHANDLE Handle, + IN PCONSOLE Console) +{ +#define CONSOLE_HANDLES_INCREMENT 2 * 3 + + NTSTATUS Status = STATUS_SUCCESS; + ULONG i = 0; + PCONSOLE* Block; + + ASSERT( (ConsoleList == NULL && ConsoleListSize == 0) || + (ConsoleList != NULL && ConsoleListSize != 0) ); + + /* All went right, so add the console to the list */ + ConDrvLockConsoleListExclusive(); + DPRINT1("Insert in the list\n"); + + if (ConsoleList) + { + for (i = 0; i < ConsoleListSize; i++) + { + if (ConsoleList[i] == NULL) break; + } + } + + if (i >= ConsoleListSize) + { + DPRINT1("Creation of a new handles table\n"); + /* Allocate a new handles table */ + Block = ConsoleAllocHeap(HEAP_ZERO_MEMORY, + (ConsoleListSize + + CONSOLE_HANDLES_INCREMENT) * sizeof(PCONSOLE)); + if (Block == NULL) + { + Status = STATUS_UNSUCCESSFUL; + goto Quit; + } + + /* If we previously had a handles table, free it and use the new one */ + if (ConsoleList) + { + /* Copy the handles from the old table to the new one */ + RtlCopyMemory(Block, + ConsoleList, + ConsoleListSize * sizeof(PCONSOLE)); + ConsoleFreeHeap(ConsoleList); + } + ConsoleList = Block; + ConsoleListSize += CONSOLE_HANDLES_INCREMENT; + } + + ConsoleList[i] = Console; + *Handle = ULongToHandle((i << 2) | 0x3); + +Quit: + /* Unlock the console list and return status */ + ConDrvUnlockConsoleList(); + return Status; +} + +/* Unused */ +#if 0 +static NTSTATUS +RemoveConsoleByHandle(IN HANDLE Handle) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG Index = HandleToULong(Handle) >> 2; + PCONSOLE Console; + + ASSERT( (ConsoleList == NULL && ConsoleListSize == 0) || + (ConsoleList != NULL && ConsoleListSize != 0) ); + + /* Remove the console from the list */ + ConDrvLockConsoleListExclusive(); + + if (Index >= ConsoleListSize || + (Console = ConsoleList[Index]) == NULL) + { + Status = STATUS_INVALID_HANDLE; + goto Quit; + } + + ConsoleList[Index] = NULL; + +Quit: + /* Unlock the console list and return status */ + ConDrvUnlockConsoleList(); + return Status; +} +#endif + +static NTSTATUS +RemoveConsoleByPointer(IN PCONSOLE Console) +{ + ULONG i = 0; + + if (!Console) return STATUS_INVALID_PARAMETER; + + ASSERT( (ConsoleList == NULL && ConsoleListSize == 0) || + (ConsoleList != NULL && ConsoleListSize != 0) ); + + /* Remove the console from the list */ + ConDrvLockConsoleListExclusive(); + + if (ConsoleList) + { + for (i = 0; i < ConsoleListSize; i++) + { + if (ConsoleList[i] == Console) ConsoleList[i] = NULL; + } + } + + /* Unlock the console list */ + ConDrvUnlockConsoleList(); + + return STATUS_SUCCESS; +} + + +/* For resetting the frontend - defined in dummyfrontend.c */ +VOID ResetFrontEnd(IN PCONSOLE Console); /* PRIVATE FUNCTIONS **********************************************************/ @@ -170,28 +294,6 @@ */ BOOLEAN NTAPI -ConDrvValidateConsolePointer(IN PCONSOLE Console) -{ - PLIST_ENTRY ConsoleEntry; - PCONSOLE CurrentConsole = NULL; - - if (!Console) return FALSE; - - /* The console list must be locked */ - // ASSERT(Console_list_locked); - - ConsoleEntry = ConsoleList.Flink; - while (ConsoleEntry != &ConsoleList) - { - CurrentConsole = CONTAINING_RECORD(ConsoleEntry, CONSOLE, Entry); - ConsoleEntry = ConsoleEntry->Flink; - if (CurrentConsole == Console) return TRUE; - } - - return FALSE; -} - -BOOLEAN NTAPI ConDrvValidateConsoleState(IN PCONSOLE Console, IN CONSOLE_STATE ExpectedState) { @@ -231,13 +333,18 @@ } BOOLEAN NTAPI -ConDrvValidateConsole(IN PCONSOLE Console, +ConDrvValidateConsole(OUT PCONSOLE* Console, + IN HANDLE ConsoleHandle, IN CONSOLE_STATE ExpectedState, IN BOOLEAN LockConsole) { BOOLEAN RetVal = FALSE; + ULONG Index = HandleToULong(ConsoleHandle) >> 2; + PCONSOLE ValidatedConsole; + if (!Console) return FALSE; + *Console = NULL; /* * Forbid creation or deletion of consoles when @@ -245,27 +352,46 @@ */ ConDrvLockConsoleListShared(); - if (ConDrvValidateConsolePointer(Console)) - { - RetVal = ConDrvValidateConsoleUnsafe(Console, - ExpectedState, - LockConsole); - } + if (Index >= ConsoleListSize || + (ValidatedConsole = ConsoleList[Index]) == NULL) + { + /* Unlock the console list */ + ConDrvUnlockConsoleList(); + + return FALSE; + } + + ValidatedConsole = ConsoleList[Index]; /* Unlock the console list and return */ ConDrvUnlockConsoleList(); + + RetVal = ConDrvValidateConsoleUnsafe(ValidatedConsole, + ExpectedState, + LockConsole); + if (RetVal) *Console = ValidatedConsole; + return RetVal; } NTSTATUS NTAPI -ConDrvGrabConsole(IN PCONSOLE Console, - IN BOOLEAN LockConsole) +ConDrvGetConsole(OUT PCONSOLE* Console, + IN HANDLE ConsoleHandle, + IN BOOLEAN LockConsole) { NTSTATUS Status = STATUS_INVALID_HANDLE; - - if (ConDrvValidateConsole(Console, CONSOLE_RUNNING, LockConsole)) - { - InterlockedIncrement(&Console->ReferenceCount); + PCONSOLE GrabConsole; + + if (Console == NULL) return STATUS_INVALID_PARAMETER; + *Console = NULL; + + if (ConDrvValidateConsole(&GrabConsole, + ConsoleHandle, + CONSOLE_RUNNING, + LockConsole)) + { + InterlockedIncrement(&GrabConsole->ReferenceCount); + *Console = GrabConsole; Status = STATUS_SUCCESS; } @@ -309,15 +435,16 @@ DPRINT("CONSRV: ConDrvInitConsoleSupport()\n"); /* Initialize the console list and its lock */ - InitializeListHead(&ConsoleList); + ConsoleListSize = 0; + ConsoleList = NULL; RtlInitializeResource(&ListLock); /* Should call LoadKeyboardLayout */ } - NTSTATUS NTAPI -ConDrvInitConsole(OUT PCONSOLE* NewConsole, +ConDrvInitConsole(OUT PHANDLE NewConsoleHandle, + OUT PCONSOLE* NewConsole, IN PCONSOLE_INFO ConsoleInfo, IN ULONG ConsoleLeaderProcessId) { @@ -325,13 +452,15 @@ SECURITY_ATTRIBUTES SecurityAttributes; // CONSOLE_INFO CapturedConsoleInfo; TEXTMODE_BUFFER_INFO ScreenBufferInfo; + HANDLE ConsoleHandle; PCONSOLE Console; PCONSOLE_SCREEN_BUFFER NewBuffer; // WCHAR DefaultTitle[128]; - if (NewConsole == NULL || ConsoleInfo == NULL) + if (NewConsoleHandle == NULL || NewConsole == NULL || ConsoleInfo == NULL) return STATUS_INVALID_PARAMETER; - + + *NewConsoleHandle = NULL; *NewConsole = NULL; /* @@ -409,7 +538,9 @@ Console->ReferenceCount = 0; InitializeCriticalSection(&Console->Lock); InitializeListHead(&Console->ProcessList); - RtlZeroMemory(&Console->TermIFace, sizeof(Console->TermIFace)); + + /* Initialize the frontend interface */ + ResetFrontEnd(Console); memcpy(Console->Colors, ConsoleInfo->Colors, sizeof(ConsoleInfo->Colors)); Console->ConsoleSize = ConsoleInfo->ConsoleSize; @@ -511,9 +642,13 @@ DPRINT("Console initialized\n"); /* All went right, so add the console to the list */ - ConDrvLockConsoleListExclusive(); - DPRINT("Insert in the list\n"); - InsertTailList(&ConsoleList, &Console->Entry); + Status = InsertConsole(&ConsoleHandle, Console); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ConDrvDeleteConsole(Console); + return Status; + } /* The initialization is finished */ DPRINT("Change state\n"); @@ -522,11 +657,9 @@ /* Unlock the console */ // LeaveCriticalSection(&Console->Lock); - /* Unlock the console list */ - ConDrvUnlockConsoleList(); - /* Return the newly created console to the caller and a success code too */ - *NewConsole = Console; + *NewConsoleHandle = ConsoleHandle; + *NewConsole = Console; return STATUS_SUCCESS; } @@ -557,7 +690,7 @@ /* We failed, detach the frontend from the console */ FrontEnd->Console = NULL; // For the caller - RtlZeroMemory(&Console->TermIFace, sizeof(Console->TermIFace)); + ResetFrontEnd(Console); return Status; } @@ -581,8 +714,11 @@ /* Deinitialize the frontend BEFORE detaching it from the console */ Console->TermIFace.Vtbl->DeinitFrontEnd(&Console->TermIFace/*, Console*/); - /* Detach the frontend from the console */ - RtlZeroMemory(&Console->TermIFace, sizeof(Console->TermIFace)); + /* + * Detach the frontend from the console: + * reinitialize the frontend interface. + */ + ResetFrontEnd(Console); DPRINT("Terminal FrontEnd unregistered\n"); return STATUS_SUCCESS; @@ -599,19 +735,12 @@ */ ConDrvLockConsoleListExclusive(); - /* Check the existence of the console, and if it's ok, continue */ - if (!ConDrvValidateConsolePointer(Console)) - { - /* Unlock the console list and return */ - ConDrvUnlockConsoleList(); - return; - } - - /* - * If the console is already being destroyed - * (thus not running), just return. - */ - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) + /* + * If the console is already being destroyed, i.e. not running + * or finishing to be initialized, just return. + */ + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE) && + !ConDrvValidateConsoleUnsafe(Console, CONSOLE_INITIALIZING, TRUE)) { /* Unlock the console list and return */ ConDrvUnlockConsoleList(); @@ -651,29 +780,21 @@ ConDrvLockConsoleListExclusive(); - /* Re-check the existence of the console, and if it's ok, continue */ - if (!ConDrvValidateConsolePointer(Console)) - { - /* Unlock the console list and return */ + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_TERMINATING, TRUE)) + { ConDrvUnlockConsoleList(); return; } - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_TERMINATING, TRUE)) - { - ConDrvUnlockConsoleList(); - return; - } - /* We are now in destruction */ Console->State = CONSOLE_IN_DESTRUCTION; - /* Remove the console from the list */ - RemoveEntryList(&Console->Entry); - /* We really delete the console. Reset the count to be sure. */ Console->ReferenceCount = 0; + /* Remove the console from the list */ + RemoveConsoleByPointer(Console); + /* Discard all entries in the input event queue */ PurgeInputBuffer(Console); @@ -683,6 +804,7 @@ HistoryDeleteBuffers(Console); ConioDeleteScreenBuffer(Console->ActiveBuffer); + Console->ActiveBuffer = NULL; if (!IsListEmpty(&Console->BufferList)) { DPRINT1("BUG: screen buffer list not empty\n"); @@ -709,7 +831,7 @@ } -/* PUBLIC SERVER APIS *********************************************************/ +/* PUBLIC DRIVER APIS *********************************************************/ NTSTATUS NTAPI ConDrvGetConsoleMode(IN PCONSOLE Console, @@ -953,7 +1075,7 @@ PCONSOLE_PROCESS_DATA current; /* If the console is already being destroyed, just return */ - if (!ConDrvValidateConsole(Console, CONSOLE_RUNNING, FALSE)) + if (!ConDrvValidateConsoleState(Console, CONSOLE_RUNNING)) return STATUS_UNSUCCESSFUL; /* Added: trunk/reactos/win32ss/user/consrv/condrv/dummyfrontend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/condrv/dummyfrontend.c (added) +++ trunk/reactos/win32ss/user/consrv/condrv/dummyfrontend.c [iso-8859-1] Sat Jul 6 19:47:53 2013 @@ -0,0 +1,185 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/condrv/dummyfrontend.c + * PURPOSE: Dummy Terminal Front-End used when no frontend + * is attached to the specified console. + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#include "consrv.h" +#include "include/conio.h" + + +/* DUMMY FRONTEND INTERFACE ***************************************************/ + +static NTSTATUS NTAPI +DummyInitFrontEnd(IN OUT PFRONTEND This, + IN PCONSOLE Console) +{ + /* Load some settings ?? */ + return STATUS_SUCCESS; +} + +static VOID NTAPI +DummyDeinitFrontEnd(IN OUT PFRONTEND This) +{ + /* Free some settings ?? */ +} + +static VOID NTAPI +DummyDrawRegion(IN OUT PFRONTEND This, + SMALL_RECT* Region) +{ +} + +static VOID NTAPI +DummyWriteStream(IN OUT PFRONTEND This, + SMALL_RECT* Region, + SHORT CursorStartX, + SHORT CursorStartY, + UINT ScrolledLines, + PWCHAR Buffer, + UINT Length) +{ +} + +static BOOL NTAPI +DummySetCursorInfo(IN OUT PFRONTEND This, + PCONSOLE_SCREEN_BUFFER Buff) +{ + return TRUE; +} + +static BOOL NTAPI +DummySetScreenInfo(IN OUT PFRONTEND This, + PCONSOLE_SCREEN_BUFFER Buff, + SHORT OldCursorX, + SHORT OldCursorY) +{ + return TRUE; +} + +static VOID NTAPI +DummyResizeTerminal(IN OUT PFRONTEND This) +{ +} + +static BOOL NTAPI +DummyProcessKeyCallback(IN OUT PFRONTEND This, + MSG* msg, + BYTE KeyStateMenu, + DWORD ShiftState, + UINT VirtualKeyCode, + BOOL Down) +{ + return FALSE; +} + +static VOID NTAPI +DummyRefreshInternalInfo(IN OUT PFRONTEND This) +{ +} + +static VOID NTAPI +DummyChangeTitle(IN OUT PFRONTEND This) +{ +} + +static BOOL NTAPI +DummyChangeIcon(IN OUT PFRONTEND This, + HICON hWindowIcon) +{ + return TRUE; +} + +static HWND NTAPI +DummyGetConsoleWindowHandle(IN OUT PFRONTEND This) +{ + return NULL; +} + +static VOID NTAPI +DummyGetLargestConsoleWindowSize(IN OUT PFRONTEND This, + PCOORD pSize) +{ +} + +static ULONG NTAPI +DummyGetDisplayMode(IN OUT PFRONTEND This) +{ + return 0; +} + +static BOOL NTAPI +DummySetDisplayMode(IN OUT PFRONTEND This, + ULONG NewMode) +{ + return TRUE; +} + +static INT NTAPI +DummyShowMouseCursor(IN OUT PFRONTEND This, + BOOL Show) +{ + return 0; +} + +static BOOL NTAPI +DummySetMouseCursor(IN OUT PFRONTEND This, + HCURSOR hCursor) +{ + return TRUE; +} + +static HMENU NTAPI +DummyMenuControl(IN OUT PFRONTEND This, + UINT cmdIdLow, + UINT cmdIdHigh) +{ + return NULL; +} + +static BOOL NTAPI +DummySetMenuClose(IN OUT PFRONTEND This, + BOOL Enable) +{ + return TRUE; +} + +static FRONTEND_VTBL DummyVtbl = +{ + DummyInitFrontEnd, + DummyDeinitFrontEnd, + DummyDrawRegion, + DummyWriteStream, + DummySetCursorInfo, + DummySetScreenInfo, + DummyResizeTerminal, + DummyProcessKeyCallback, + DummyRefreshInternalInfo, + DummyChangeTitle, + DummyChangeIcon, + DummyGetConsoleWindowHandle, + DummyGetLargestConsoleWindowSize, + DummyGetDisplayMode, + DummySetDisplayMode, + DummyShowMouseCursor, + DummySetMouseCursor, + DummyMenuControl, + DummySetMenuClose, +}; + +VOID +ResetFrontEnd(IN PCONSOLE Console) +{ + if (!Console) return; + + /* Reinitialize the frontend interface */ + RtlZeroMemory(&Console->TermIFace, sizeof(Console->TermIFace)); + Console->TermIFace.Vtbl = &DummyVtbl; +} + +/* EOF */ Propchange: trunk/reactos/win32ss/user/consrv/condrv/dummyfrontend.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consol… ============================================================================== --- trunk/reactos/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/console.c [iso-8859-1] Sat Jul 6 19:47:53 2013 @@ -147,9 +147,8 @@ *Console = NULL; // RtlEnterCriticalSection(&ProcessData->HandleTableLock); - ProcessConsole = ProcessData->Console; - - Status = ConDrvGrabConsole(ProcessConsole, LockConsole); + + Status = ConDrvGetConsole(&ProcessConsole, ProcessData->ConsoleHandle, LockConsole); if (NT_SUCCESS(Status)) *Console = ProcessConsole; // RtlLeaveCriticalSection(&ProcessData->HandleTableLock); @@ -166,11 +165,13 @@ NTSTATUS WINAPI -ConSrvInitConsole(OUT PCONSOLE* NewConsole, +ConSrvInitConsole(OUT PHANDLE NewConsoleHandle, + OUT PCONSOLE* NewConsole, IN OUT PCONSOLE_START_INFO ConsoleStartInfo, IN ULONG ConsoleLeaderProcessId) { NTSTATUS Status; + HANDLE ConsoleHandle; PCONSOLE Console; CONSOLE_INFO ConsoleInfo; SIZE_T Length = 0; @@ -266,7 +267,10 @@ ConsoleInfo.CodePage = GetOEMCP(); /******************************************************************************/ - Status = ConDrvInitConsole(&Console, &ConsoleInfo, ConsoleLeaderProcessId); + Status = ConDrvInitConsole(&ConsoleHandle, + &Console, + &ConsoleInfo, + ConsoleLeaderProcessId); if (!NT_SUCCESS(Status)) { DPRINT1("Creating a new console failed, Status = 0x%08lx\n", Status); @@ -288,7 +292,8 @@ DPRINT("FrontEnd registered\n"); /* Return the newly created console to the caller and a success code too */ - *NewConsole = Console; + *NewConsoleHandle = ConsoleHandle; + *NewConsole = Console; return STATUS_SUCCESS; } @@ -311,7 +316,7 @@ PCSR_PROCESS CsrProcess = CsrGetClientThread()->Process; PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); - if (ProcessData->Console != NULL) + if (ProcessData->ConsoleHandle != NULL) { DPRINT1("Process already has a console\n"); return STATUS_ACCESS_DENIED; @@ -337,16 +342,12 @@ return Status; } - /* Return it to the caller */ - AllocConsoleRequest->Console = ProcessData->Console; - - /* Input Wait Handle */ + /* Return the console handle and the input wait handle to the caller */ + AllocConsoleRequest->ConsoleHandle = ProcessData->ConsoleHandle; AllocConsoleRequest->InputWaitHandle = ProcessData->ConsoleEvent; - /* Set the Property Dialog Handler */ + /* Set the Property-Dialog and Control-Dispatcher handlers */ ProcessData->PropDispatcher = AllocConsoleRequest->PropDispatcher; - - /* Set the Ctrl Dispatcher */ ProcessData->CtrlDispatcher = AllocConsoleRequest->CtrlDispatcher; return STATUS_SUCCESS; @@ -363,7 +364,7 @@ TargetProcessData = ConsoleGetPerProcessData(TargetProcess); - if (TargetProcessData->Console != NULL) + if (TargetProcessData->ConsoleHandle != NULL) { DPRINT1("Process already has a console\n"); return STATUS_ACCESS_DENIED; @@ -396,7 +397,7 @@ SourceProcessData = ConsoleGetPerProcessData(SourceProcess); - if (SourceProcessData->Console == NULL) + if (SourceProcessData->ConsoleHandle == NULL) { Status = STATUS_INVALID_HANDLE; goto Quit; @@ -407,7 +408,7 @@ * if any, otherwise return an error. */ Status = ConSrvInheritConsole(TargetProcessData, - SourceProcessData->Console, + SourceProcessData->ConsoleHandle, TRUE, &AttachConsoleRequest->InputHandle, &AttachConsoleRequest->OutputHandle, @@ -418,16 +419,12 @@ goto Quit; } - /* Return it to the caller */ - AttachConsoleRequest->Console = TargetProcessData->Console; - - /* Input Wait Handle */ + /* Return the console handle and the input wait handle to the caller */ + AttachConsoleRequest->ConsoleHandle = TargetProcessData->ConsoleHandle; AttachConsoleRequest->InputWaitHandle = TargetProcessData->ConsoleEvent; - /* Set the Property Dialog Handler */ + /* Set the Property-Dialog and Control-Dispatcher handlers */ TargetProcessData->PropDispatcher = AttachConsoleRequest->PropDispatcher; - - /* Set the Ctrl Dispatcher */ TargetProcessData->CtrlDispatcher = AttachConsoleRequest->CtrlDispatcher; Status = STATUS_SUCCESS; Modified: trunk/reactos/win32ss/user/consrv/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consol… ============================================================================== --- trunk/reactos/win32ss/user/consrv/console.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/console.h [iso-8859-1] Sat Jul 6 19:47:53 2013 @@ -8,11 +8,12 @@ #pragma once -VOID NTAPI -ConDrvInitConsoleSupport(VOID); +// FIXME: Fix compilation +struct _CONSOLE; NTSTATUS WINAPI -ConSrvInitConsole(OUT struct _CONSOLE** /* PCONSOLE* */ NewConsole, +ConSrvInitConsole(OUT PHANDLE NewConsoleHandle, + OUT struct _CONSOLE** /* PCONSOLE* */ NewConsole, IN OUT PCONSOLE_START_INFO ConsoleStartInfo, IN ULONG ConsoleLeaderProcessId); VOID WINAPI ConSrvDeleteConsole(struct _CONSOLE* /* PCONSOLE */ Console); @@ -23,29 +24,4 @@ VOID FASTCALL ConSrvReleaseConsole(struct _CONSOLE* /* PCONSOLE */ Console, BOOL WasConsoleLocked); -/******************************************************************************/ - -NTSTATUS NTAPI -ConDrvGrabConsole(IN struct _CONSOLE* /* PCONSOLE */ Console, - IN BOOLEAN LockConsole); -VOID NTAPI -ConDrvReleaseConsole(IN struct _CONSOLE* /* PCONSOLE */ Console, - IN BOOLEAN WasConsoleLocked); - -typedef struct _FRONTEND FRONTEND, *PFRONTEND; -typedef struct _CONSOLE_INFO CONSOLE_INFO, *PCONSOLE_INFO; - -NTSTATUS NTAPI -ConDrvInitConsole(OUT struct _CONSOLE** /* PCONSOLE* */ NewConsole, - // IN OUT PCONSOLE_START_INFO ConsoleStartInfo, - IN PCONSOLE_INFO ConsoleInfo, - IN ULONG ConsoleLeaderProcessId); -NTSTATUS NTAPI -ConDrvRegisterFrontEnd(IN struct _CONSOLE* /* PCONSOLE */ Console, - IN PFRONTEND FrontEnd); -NTSTATUS NTAPI -ConDrvDeregisterFrontEnd(IN struct _CONSOLE* /* PCONSOLE */ Console); -VOID NTAPI -ConDrvDeleteConsole(IN struct _CONSOLE* /* PCONSOLE */ Console); - /* EOF */ Modified: trunk/reactos/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/consrv.h [iso-8859-1] Sat Jul 6 19:47:53 2013 @@ -60,8 +60,9 @@ LIST_ENTRY ConsoleLink; PCSR_PROCESS Process; // Process owning this structure. HANDLE ConsoleEvent; - struct _CONSOLE* /* PCONSOLE */ Console; - struct _CONSOLE* /* PCONSOLE */ ParentConsole; + + HANDLE ConsoleHandle; + HANDLE ParentConsoleHandle; BOOL ConsoleApp; // TRUE if it is a CUI app, FALSE otherwise. Modified: trunk/reactos/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/handle… ============================================================================== --- trunk/reactos/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/handle.c [iso-8859-1] Sat Jul 6 19:47:53 2013 @@ -135,6 +135,7 @@ static NTSTATUS ConSrvInitHandlesTable(IN OUT PCONSOLE_PROCESS_DATA ProcessData, + IN PCONSOLE Console, OUT PHANDLE pInputHandle, OUT PHANDLE pOutputHandle, OUT PHANDLE pErrorHandle) @@ -157,7 +158,7 @@ /* Insert the Input handle */ Status = ConSrvInsertObject(ProcessData, &InputHandle, - &ProcessData->Console->InputBuffer.Header, + &Console->InputBuffer.Header, GENERIC_READ | GENERIC_WRITE, TRUE, FILE_SHARE_READ | FILE_SHARE_WRITE); @@ -172,7 +173,7 @@ /* Insert the Output handle */ Status = ConSrvInsertObject(ProcessData, &OutputHandle, - &ProcessData->Console->ActiveBuffer->Header, + &Console->ActiveBuffer->Header, GENERIC_READ | GENERIC_WRITE, TRUE, FILE_SHARE_READ | FILE_SHARE_WRITE); @@ -187,7 +188,7 @@ /* Insert the Error handle */ Status = ConSrvInsertObject(ProcessData, &ErrorHandle, - &ProcessData->Console->ActiveBuffer->Header, + &Console->ActiveBuffer->Header, GENERIC_READ | GENERIC_WRITE, TRUE, FILE_SHARE_READ | FILE_SHARE_WRITE); @@ -270,12 +271,12 @@ ULONG i; /* - * ProcessData->Console is NULL (and the assertion fails) when + * ProcessData->ConsoleHandle is NULL (and the assertion fails) when * ConSrvFreeHandlesTable is called in ConSrvConnect during the * allocation of a new console. */ - // ASSERT(ProcessData->Console); - if (ProcessData->Console != NULL) + // ASSERT(ProcessData->ConsoleHandle); + if (ProcessData->ConsoleHandle != NULL) { /* Close all the console handles */ for (i = 0; i < ProcessData->HandleTableSize; i++) @@ -380,22 +381,22 @@ ConSrvRemoveObject(PCONSOLE_PROCESS_DATA ProcessData, HANDLE Handle) { - ULONG_PTR h = (ULONG_PTR)Handle >> 2; + ULONG Index = HandleToULong(Handle) >> 2; PCONSOLE_IO_OBJECT Object; RtlEnterCriticalSection(&ProcessData->HandleTableLock); ASSERT(ProcessData->HandleTable); - if (h >= ProcessData->HandleTableSize || - (Object = ProcessData->HandleTable[h].Object) == NULL) + if (Index >= ProcessData->HandleTableSize || + (Object = ProcessData->HandleTable[Index].Object) == NULL) { RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_INVALID_HANDLE; } - ASSERT(ProcessData->Console); - ConSrvCloseHandleEntry(&ProcessData->HandleTable[h]); + ASSERT(ProcessData->ConsoleHandle); + ConSrvCloseHandleEntry(&ProcessData->HandleTable[Index]); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_SUCCESS; @@ -411,9 +412,11 @@ BOOL LockConsole, CONSOLE_IO_OBJECT_TYPE Type) { - ULONG_PTR h = (ULONG_PTR)Handle >> 2; + // NTSTATUS Status; + ULONG Index = HandleToULong(Handle) >> 2; PCONSOLE_IO_HANDLE HandleEntry = NULL; PCONSOLE_IO_OBJECT ObjectEntry = NULL; + // PCONSOLE ObjectConsole; ASSERT(Object); if (Entry) *Entry = NULL; @@ -423,9 +426,9 @@ RtlEnterCriticalSection(&ProcessData->HandleTableLock); if ( IsConsoleHandle(Handle) && - h < ProcessData->HandleTableSize ) - { - HandleEntry = &ProcessData->HandleTable[h]; + Index < ProcessData->HandleTableSize ) + { + HandleEntry = &ProcessData->HandleTable[Index]; ObjectEntry = HandleEntry->Object; } @@ -444,7 +447,9 @@ RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - if (ConDrvValidateConsole(ObjectEntry->Console, CONSOLE_RUNNING, LockConsole)) + // Status = ConDrvGetConsole(&ObjectConsole, ProcessData->ConsoleHandle, LockConsole); + // if (NT_SUCCESS(Status)) + if (ConDrvValidateConsoleUnsafe(ObjectEntry->Console, CONSOLE_RUNNING, LockConsole)) { _InterlockedIncrement(&ObjectEntry->Console->ReferenceCount); @@ -479,6 +484,8 @@ PCONSOLE_START_INFO ConsoleStartInfo) { NTSTATUS Status = STATUS_SUCCESS; + HANDLE ConsoleHandle; + PCONSOLE Console; /* * We are about to create a new console. However when ConSrvNewProcess @@ -493,7 +500,8 @@ ConSrvFreeHandlesTable(ProcessData); /* Initialize a new Console owned by this process */ - Status = ConSrvInitConsole(&ProcessData->Console, + Status = ConSrvInitConsole(&ConsoleHandle, + &Console, ConsoleStartInfo, HandleToUlong(ProcessData->Process->ClientId.UniqueProcess)); if (!NT_SUCCESS(Status)) @@ -502,22 +510,26 @@ return Status; } + /* Assign the new console handle */ + ProcessData->ConsoleHandle = ConsoleHandle; + /* Initialize the handles table */ Status = ConSrvInitHandlesTable(ProcessData, + Console, pInputHandle, pOutputHandle, pErrorHandle); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to initialize the handles table\n"); - ConSrvDeleteConsole(ProcessData->Console); - ProcessData->Console = NULL; + ConSrvDeleteConsole(Console); + ProcessData->ConsoleHandle = NULL; return Status; } /* Duplicate the Input Event */ Status = NtDuplicateObject(NtCurrentProcess(), - ProcessData->Console->InputBuffer.ActiveEvent, + Console->InputBuffer.ActiveEvent, ProcessData->Process->ProcessHandle, &ProcessData->ConsoleEvent, EVENT_ALL_ACCESS, 0, 0); @@ -525,19 +537,19 @@ { DPRINT1("NtDuplicateObject() failed: %lu\n", Status); ConSrvFreeHandlesTable(ProcessData); - ConSrvDeleteConsole(ProcessData->Console); - ProcessData->Console = NULL; + ConSrvDeleteConsole(Console); + ProcessData->ConsoleHandle = NULL; return Status; } /* Insert the process into the processes list of the console */ - InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ConsoleLink); + InsertHeadList(&Console->ProcessList, &ProcessData->ConsoleLink); /* Add a reference count because the process is tied to the console */ - _InterlockedIncrement(&ProcessData->Console->ReferenceCount); + _InterlockedIncrement(&Console->ReferenceCount); /* Update the internal info of the terminal */ - ConioRefreshInternalInfo(ProcessData->Console); + ConioRefreshInternalInfo(Console); return STATUS_SUCCESS; } @@ -545,23 +557,26 @@ NTSTATUS FASTCALL ConSrvInheritConsole(PCONSOLE_PROCESS_DATA ProcessData, - PCONSOLE Console, + HANDLE ConsoleHandle, BOOL CreateNewHandlesTable, PHANDLE pInputHandle, PHANDLE pOutputHandle, PHANDLE pErrorHandle) { NTSTATUS Status = STATUS_SUCCESS; + PCONSOLE Console; /* Validate and lock the console */ - if (!ConDrvValidateConsole(Console, CONSOLE_RUNNING, TRUE)) + if (!ConDrvValidateConsole(&Console, + ConsoleHandle, + CONSOLE_RUNNING, TRUE)) { // FIXME: Find another status code return STATUS_UNSUCCESSFUL; } /* Inherit the console */ - ProcessData->Console = Console; + ProcessData->ConsoleHandle = ConsoleHandle; if (CreateNewHandlesTable) { @@ -579,20 +594,21 @@ /* Initialize the handles table */ Status = ConSrvInitHandlesTable(ProcessData, + Console, pInputHandle, pOutputHandle, pErrorHandle); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to initialize the handles table\n"); - ProcessData->Console = NULL; + ProcessData->ConsoleHandle = NULL; goto Quit; } } /* Duplicate the Input Event */ Status = NtDuplicateObject(NtCurrentProcess(), - ProcessData->Console->InputBuffer.ActiveEvent, + Console->InputBuffer.ActiveEvent, ProcessData->Process->ProcessHandle, &ProcessData->ConsoleEvent, EVENT_ALL_ACCESS, 0, 0); @@ -600,18 +616,18 @@ { DPRINT1("NtDuplicateObject() failed: %lu\n", Status); ConSrvFreeHandlesTable(ProcessData); // NOTE: Always free the handles table. - ProcessData->Console = NULL; + ProcessData->ConsoleHandle = NULL; goto Quit; } /* Insert the process into the processes list of the console */ - InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ConsoleLink); + InsertHeadList(&Console->ProcessList, &ProcessData->ConsoleLink); /* Add a reference count because the process is tied to the console */ - _InterlockedIncrement(&ProcessData->Console->ReferenceCount); + _InterlockedIncrement(&Console->ReferenceCount); /* Update the internal info of the terminal */ - ConioRefreshInternalInfo(ProcessData->Console); + ConioRefreshInternalInfo(Console); Status = STATUS_SUCCESS; @@ -625,14 +641,16 @@ FASTCALL ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData) { - PCONSOLE Console = ProcessData->Console; + PCONSOLE Console; DPRINT("ConSrvRemoveConsole\n"); // RtlEnterCriticalSection(&ProcessData->HandleTableLock); /* Validate and lock the console */ - if (ConDrvValidateConsole(Console, CONSOLE_RUNNING, TRUE)) + if (ConDrvValidateConsole(&Console, + ProcessData->ConsoleHandle, + CONSOLE_RUNNING, TRUE)) { DPRINT("ConSrvRemoveConsole - Locking OK\n"); @@ -640,7 +658,7 @@ ConSrvFreeHandlesTable(ProcessData); /* Detach the process from the console */ - ProcessData->Console = NULL; + ProcessData->ConsoleHandle = NULL; /* Remove ourselves from the console's list of processes */ RemoveEntryList(&ProcessData->ConsoleLink); @@ -650,7 +668,7 @@ /* Release the console */ DPRINT("ConSrvRemoveConsole - Decrement Console->ReferenceCount = %lu\n", Console->ReferenceCount); - ConSrvReleaseConsole(Console, TRUE); + ConDrvReleaseConsole(Console, TRUE); //CloseHandle(ProcessData->ConsoleEvent); //ProcessData->ConsoleEvent = NULL; } @@ -752,7 +770,7 @@ PCONSOLE Console; HANDLE ConsoleHandle = VerifyHandleRequest->ConsoleHandle; - ULONG_PTR Index = (ULONG_PTR)ConsoleHandle >> 2; + ULONG Index = HandleToULong(ConsoleHandle) >> 2; Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) @@ -785,7 +803,7 @@ PCONSOLE Console; HANDLE ConsoleHandle = DuplicateHandleRequest->ConsoleHandle; - ULONG_PTR Index = (ULONG_PTR)ConsoleHandle >> 2; + ULONG Index = HandleToULong(ConsoleHandle) >> 2; PCONSOLE_IO_HANDLE Entry; DWORD DesiredAccess; Modified: trunk/reactos/win32ss/user/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/includ… ============================================================================== --- trunk/reactos/win32ss/user/consrv/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/include/conio.h [iso-8859-1] Sat Jul 6 19:47:53 2013 @@ -270,13 +270,12 @@ CRITICAL_SECTION Lock; CONSOLE_STATE State; /* State of the console */ - LIST_ENTRY Entry; /* Entry in the list of consoles */ LIST_ENTRY ProcessList; /* List of processes owning the console. The first one is the so-called "Console Leader Process" */ FRONTEND TermIFace; /* Frontend-specific interface */ /**************************** Input buffer and data ***************************/ - CONSOLE_INPUT_BUFFER InputBuffer; /* Input buffer of the console */ + CONSOLE_INPUT_BUFFER InputBuffer; /* Input buffer of the console */ /** Put those things in TEXTMODE_SCREEN_BUFFER ?? **/ PWCHAR LineBuffer; /* Current line being input, in line buffered mode */ Modified: trunk/reactos/win32ss/user/consrv/include/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/includ… ============================================================================== --- trunk/reactos/win32ss/user/consrv/include/console.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/include/console.h [iso-8859-1] Sat Jul 6 19:47:53 2013 @@ -8,8 +8,23 @@ #pragma once -BOOLEAN NTAPI -ConDrvValidateConsolePointer(IN PCONSOLE Console); +VOID NTAPI +ConDrvInitConsoleSupport(VOID); + +NTSTATUS NTAPI +ConDrvInitConsole(OUT PHANDLE NewConsoleHandle, + OUT PCONSOLE* NewConsole, + IN PCONSOLE_INFO ConsoleInfo, + IN ULONG ConsoleLeaderProcessId); +NTSTATUS NTAPI +ConDrvRegisterFrontEnd(IN PCONSOLE Console, + IN PFRONTEND FrontEnd); +NTSTATUS NTAPI +ConDrvDeregisterFrontEnd(IN PCONSOLE Console); +VOID NTAPI +ConDrvDeleteConsole(IN PCONSOLE Console); + + BOOLEAN NTAPI ConDrvValidateConsoleState(IN PCONSOLE Console, @@ -21,8 +36,19 @@ IN BOOLEAN LockConsole); BOOLEAN NTAPI -ConDrvValidateConsole(IN PCONSOLE Console, +ConDrvValidateConsole(OUT PCONSOLE* Console, + IN HANDLE ConsoleHandle, IN CONSOLE_STATE ExpectedState, IN BOOLEAN LockConsole); + + +NTSTATUS NTAPI +ConDrvGetConsole(OUT PCONSOLE* Console, + IN HANDLE ConsoleHandle, + IN BOOLEAN LockConsole); +VOID NTAPI +ConDrvReleaseConsole(IN PCONSOLE Console, + IN BOOLEAN WasConsoleLocked); + /* EOF */ Modified: trunk/reactos/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/init.c… ============================================================================== --- trunk/reactos/win32ss/user/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/init.c [iso-8859-1] Sat Jul 6 19:47:53 2013 @@ -326,7 +326,7 @@ **************************************************************************/ NTSTATUS Status = STATUS_SUCCESS; - PCONSOLE_PROCESS_DATA /* SourceProcessData, */ TargetProcessData; + PCONSOLE_PROCESS_DATA TargetProcessData; /* An empty target process is invalid */ if (!TargetProcess) return STATUS_INVALID_PARAMETER; @@ -337,7 +337,7 @@ RtlZeroMemory(TargetProcessData, sizeof(*TargetProcessData)); TargetProcessData->Process = TargetProcess; TargetProcessData->ConsoleEvent = NULL; - TargetProcessData->Console = TargetProcessData->ParentConsole = NULL; + TargetProcessData->ConsoleHandle = TargetProcessData->ParentConsoleHandle = NULL; TargetProcessData->ConsoleApp = ((TargetProcess->Flags & CsrProcessIsConsoleApp) ? TRUE : FALSE); /* @@ -363,20 +363,23 @@ if (TargetProcessData->ConsoleApp /* && SourceProcessData->ConsoleApp */) { PCONSOLE_PROCESS_DATA SourceProcessData = ConsoleGetPerProcessData(SourceProcess); + PCONSOLE SourceConsole; /* Validate and lock the parent's console */ - if (ConDrvValidateConsole(SourceProcessData->Console, CONSOLE_RUNNING, TRUE)) + if (ConDrvValidateConsole(&SourceConsole, + SourceProcessData->ConsoleHandle, + CONSOLE_RUNNING, TRUE)) { /* Inherit the parent's handles table */ Status = ConSrvInheritHandlesTable(SourceProcessData, TargetProcessData); if (NT_SUCCESS(Status)) { /* Temporary save the parent's console too */ - TargetProcessData->ParentConsole = SourceProcessData->Console; + TargetProcessData->ParentConsoleHandle = SourceProcessData->ConsoleHandle; } /* Unlock the parent's console */ - LeaveCriticalSection(&SourceProcessData->Console->Lock); + LeaveCriticalSection(&SourceConsole->Lock); } } @@ -412,8 +415,8 @@ } /* If we don't have a console, then create a new one... */ - if (!ConnectInfo->Console || - ConnectInfo->Console != ProcessData->ParentConsole) + if (!ConnectInfo->ConsoleHandle || + ConnectInfo->ConsoleHandle != ProcessData->ParentConsoleHandle) { DPRINT("ConSrvConnect - Allocate a new console\n"); @@ -446,7 +449,7 @@ /* Reuse our current console */ Status = ConSrvInheritConsole(ProcessData, - ConnectInfo->Console, + ConnectInfo->ConsoleHandle, FALSE, NULL, // &ConnectInfo->InputHandle, NULL, // &ConnectInfo->OutputHandle, @@ -458,16 +461,12 @@ } } - /* Return it to the caller */ - ConnectInfo->Console = ProcessData->Console; - - /* Input Wait Handle */ + /* Return the console handle and the input wait handle to the caller */ + ConnectInfo->ConsoleHandle = ProcessData->ConsoleHandle; ConnectInfo->InputWaitHandle = ProcessData->ConsoleEvent; - /* Set the Property Dialog Handler */ + /* Set the Property-Dialog and Control-Dispatcher handlers */ ProcessData->PropDispatcher = ConnectInfo->PropDispatcher; - - /* Set the Ctrl Dispatcher */ ProcessData->CtrlDispatcher = ConnectInfo->CtrlDispatcher; return STATUS_SUCCESS; @@ -483,8 +482,8 @@ * This function is called whenever a new process (GUI or CUI) is destroyed. **************************************************************************/ - if ( ProcessData->Console != NULL || - ProcessData->HandleTable != NULL ) + if ( ProcessData->ConsoleHandle != NULL || + ProcessData->HandleTable != NULL ) { DPRINT("ConSrvDisconnect - calling ConSrvRemoveConsole\n"); ConSrvRemoveConsole(ProcessData); Modified: trunk/reactos/win32ss/user/consrv/procinit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/procin… ============================================================================== --- trunk/reactos/win32ss/user/consrv/procinit.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/procinit.h [iso-8859-1] Sat Jul 6 19:47:53 2013 @@ -14,7 +14,7 @@ PHANDLE pErrorHandle, PCONSOLE_START_INFO ConsoleStartInfo); NTSTATUS FASTCALL ConSrvInheritConsole(PCONSOLE_PROCESS_DATA ProcessData, - struct _CONSOLE* /* PCONSOLE */ Console, + HANDLE ConsoleHandle, BOOL CreateNewHandlesTable, PHANDLE pInputHandle, PHANDLE pOutputHandle,

11 years, 2 months

[hbelusca] 59434: [CONSRV] Fix copy of text in text-mode screenbuffers, in case we are copying NULL chars.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 6 16:05:39 2013 New Revision: 59434 URL: http://svn.reactos.org/svn/reactos?rev=59434&view=rev Log: [CONSRV] Fix copy of text in text-mode screenbuffers, in case we are copying NULL chars. Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/text.c Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… ============================================================================== --- trunk/reactos/win32ss/user/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/frontends/gui/text.c [iso-8859-1] Sat Jul 6 16:05:39 2013 @@ -83,7 +83,15 @@ /* Copy only the characters, leave attributes alone */ for (xPos = 0; xPos < selWidth; xPos++) { - dstPos[xPos] = ptr[xPos].Char.UnicodeChar; + /* + * Sometimes, applications can put NULL chars into the screen-buffer + * (this behaviour is allowed). Detect this and replace by a space. + * FIXME - HACK: Improve the way we're doing that (i.e., put spaces + * instead of NULLs (or even, nothing) only if it exists a non-null + * char *after* those NULLs, before the end-of-line of the selection. + * Do the same concerning spaces -- i.e. trailing spaces --). + */ + dstPos[xPos] = (ptr[xPos].Char.UnicodeChar ? ptr[xPos].Char.UnicodeChar : L' '); } dstPos += selWidth;

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2013