Ros-diffs March 2014

ros-diffs@reactos.org

14 participants
233 discussions

[hbelusca] 62545: [ADVAPI32][SECUR32] Remove useless msvcrt importing. [WINSRV] Fix imports. CORE-7985

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 22 20:04:28 2014 New Revision: 62545 URL: http://svn.reactos.org/svn/reactos?rev=62545&view=rev Log: [ADVAPI32][SECUR32] Remove useless msvcrt importing. [WINSRV] Fix imports. CORE-7985 Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/advapi32/misc/dllmain.c trunk/reactos/dll/win32/secur32/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/CMakeLists.txt Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sat Mar 22 20:04:28 2014 @@ -55,10 +55,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.c ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c) -set_module_type(advapi32 win32dll UNICODE) +set_module_type(advapi32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB}) -add_delay_importlibs(advapi32 rpcrt4) -add_importlibs(advapi32 secur32 msvcrt kernel32 ntdll) +add_delay_importlibs(advapi32 secur32) +add_importlibs(advapi32 rpcrt4 kernel32 ntdll) add_pch(advapi32 advapi32.h SOURCE) Modified: trunk/reactos/dll/win32/advapi32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/dllmain.c [iso-8859-1] Sat Mar 22 20:04:28 2014 @@ -36,7 +36,7 @@ break; } - return TRUE; + return TRUE; } /* EOF */ Modified: trunk/reactos/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/secur32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/CMakeLists.txt [iso-8859-1] Sat Mar 22 20:04:28 2014 @@ -17,11 +17,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/secur32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/secur32.def) -set_module_type(secur32 win32dll) +set_module_type(secur32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(secur32 lsalib) -add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(secur32 advapi32 kernel32 ntdll) add_pch(secur32 precomp.h SOURCE) add_cd_file(TARGET secur32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] Sat Mar 22 20:04:28 2014 @@ -26,8 +26,8 @@ # Add win32ksys because of NtUser...() target_link_libraries(winsrv win32ksys libcntpr ${PSEH_LIB} ${CONSRV_TARGET_LINK_LIBS}) -add_delay_importlibs(winsrv advapi32 gdi32 user32 ${CONSRV_DELAY_IMPORT_LIBS}) -add_importlibs(winsrv csrsrv kernel32 ntdll ${CONSRV_IMPORT_LIBS}) +add_delay_importlibs(winsrv advapi32 ${CONSRV_DELAY_IMPORT_LIBS}) +add_importlibs(winsrv csrsrv gdi32 user32 kernel32 ntdll ${CONSRV_IMPORT_LIBS}) add_dependencies(winsrv bugcodes) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all)

10 years, 9 months

[hbelusca] 62544: [KERNEL32]: Fix parameter usage in RtlAcquirePrivilege.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 22 18:46:26 2014 New Revision: 62544 URL: http://svn.reactos.org/svn/reactos?rev=62544&view=rev Log: [KERNEL32]: Fix parameter usage in RtlAcquirePrivilege. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sat Mar 22 18:46:26 2014 @@ -3874,7 +3874,7 @@ { /* Acquire the required privilege so that the kernel won't fail the call */ PrivilegeValue = SE_LOCK_MEMORY_PRIVILEGE; - Status = RtlAcquirePrivilege(&PrivilegeValue, TRUE, FALSE, &PrivilegeState); + Status = RtlAcquirePrivilege(&PrivilegeValue, 1, 0, &PrivilegeState); if (NT_SUCCESS(Status)) { /* Remember to release it later */

10 years, 9 months

[pschweitzer] 62543: [KERNEL32] Actually, given how the calls were done later on, it appears that our dear Alex was missing a ! So fix the if condition in BasepIsRealtimeAllowed, restore the previo...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Mar 22 16:11:32 2014 New Revision: 62543 URL: http://svn.reactos.org/svn/reactos?rev=62543&view=rev Log: [KERNEL32] Actually, given how the calls were done later on, it appears that our dear Alex was missing a ! So fix the if condition in BasepIsRealtimeAllowed, restore the previous arg name, and update the doc This should fix the calls to that function. CORE-8013 #comment Should be fixed with r62543. Please retry Modified: trunk/reactos/dll/win32/kernel32/client/utils.c Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sat Mar 22 16:11:32 2014 @@ -616,14 +616,14 @@ /* * Checks if the privilege for Real-Time Priority is there * Beware about this function behavior: - * - In case CheckOnly is set to TRUE, then the function will only check + * - In case Keep is set to FALSE, then the function will only check * whether real time is allowed and won't grant the privilege. In that case * it will return TRUE if allowed, FALSE otherwise. Not a state! - * It means you don't have to release privilege when calling with TRUE. + * It means you don't have to release privilege when calling with FALSE. */ PVOID WINAPI -BasepIsRealtimeAllowed(IN BOOLEAN CheckOnly) +BasepIsRealtimeAllowed(IN BOOLEAN Keep) { ULONG Privilege = SE_INC_BASE_PRIORITY_PRIVILEGE; PVOID State; @@ -632,7 +632,7 @@ Status = RtlAcquirePrivilege(&Privilege, 1, 0, &State); if (!NT_SUCCESS(Status)) return NULL; - if (CheckOnly) + if (!Keep) { RtlReleasePrivilege(State); State = (PVOID)TRUE;

10 years, 9 months

[pschweitzer] 62542: [KERNEL32] - Rename Keep argument of BasepIsRealtimeAllowed to something more accurate. - Properly document this function usage given its specific behavior. It's badly used in ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Mar 22 15:59:41 2014 New Revision: 62542 URL: http://svn.reactos.org/svn/reactos?rev=62542&view=rev Log: [KERNEL32] - Rename Keep argument of BasepIsRealtimeAllowed to something more accurate. - Properly document this function usage given its specific behavior. It's badly used in trunk atm, fixes will come in next commit Modified: trunk/reactos/dll/win32/kernel32/client/utils.c Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sat Mar 22 15:59:41 2014 @@ -615,10 +615,15 @@ /* * Checks if the privilege for Real-Time Priority is there + * Beware about this function behavior: + * - In case CheckOnly is set to TRUE, then the function will only check + * whether real time is allowed and won't grant the privilege. In that case + * it will return TRUE if allowed, FALSE otherwise. Not a state! + * It means you don't have to release privilege when calling with TRUE. */ PVOID WINAPI -BasepIsRealtimeAllowed(IN BOOLEAN Keep) +BasepIsRealtimeAllowed(IN BOOLEAN CheckOnly) { ULONG Privilege = SE_INC_BASE_PRIORITY_PRIVILEGE; PVOID State; @@ -627,7 +632,7 @@ Status = RtlAcquirePrivilege(&Privilege, 1, 0, &State); if (!NT_SUCCESS(Status)) return NULL; - if (Keep) + if (CheckOnly) { RtlReleasePrivilege(State); State = (PVOID)TRUE;

10 years, 9 months

[tfaber] 62541: [COM_APITEST] - Verify interfaces against HKLM\Software\Classes\Interface

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 21 11:45:30 2014 New Revision: 62541 URL: http://svn.reactos.org/svn/reactos?rev=62541&view=rev Log: [COM_APITEST] - Verify interfaces against HKLM\Software\Classes\Interface Modified: trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/testlist.c Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Fri Mar 21 11:45:30 2014 @@ -22,219 +22,221 @@ { const IID *iid; PCSTR name; + PCWSTR wname; + BOOLEAN noreg; } KNOWN_INTERFACE; typedef const KNOWN_INTERFACE *PCKNOWN_INTERFACE; #undef ID_NAME -#define ID_NAME(c) { &c, #c } +#define ID_NAME(c) &c, #c, L ## #c static KNOWN_INTERFACE KnownInterfaces[] = { - ID_NAME(IID_IACList), - ID_NAME(IID_IACList2), - ID_NAME(IID_IADesktopP2), - ID_NAME(IID_IAccessible), - ID_NAME(IID_IAccessControl), - ID_NAME(IID_IAccessor), - ID_NAME(IID_IActiveDesktop), - ID_NAME(IID_IActiveDesktopP), - ID_NAME(IID_IAddressBarParser), - ID_NAME(IID_IAddressBand), - ID_NAME(IID_IAddressEditBox), - ID_NAME(IID_IAugmentedShellFolder), - ID_NAME(IID_IAugmentedShellFolder2), - ID_NAME(IID_IAutoComplete), - ID_NAME(IID_IAutoComplete2), - 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_IBrowserFrameOptions), - ID_NAME(IID_IBrowserService), - ID_NAME(IID_IBrowserService2), - ID_NAME(IID_IBrowserService3), - ID_NAME(IID_IClassFactory), - ID_NAME(IID_IClassFactory2), - ID_NAME(IID_IClassFactory3), - ID_NAME(IID_IClientSecurity), - ID_NAME(IID_IComThreadingInfo), - ID_NAME(IID_IContext), - 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_IDVGetEnum), - ID_NAME(IID_IDataObject), - ID_NAME(IID_IDefViewID), - ID_NAME(IID_IDefViewFrame), - ID_NAME(IID_IDefViewFrame3), - ID_NAME(IID_IDefViewFrameGroup), - ID_NAME(IID_IDefViewSafety), - ID_NAME(IID_IDefViewScript), - ID_NAME(IID_IDeskBand), - ID_NAME(IID_IDeskBandEx), - ID_NAME(IID_IDeskBar), - ID_NAME(IID_IDeskBarClient), - ID_NAME(IID_IDeskMovr), - 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_IEnumVARIANT), - 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_IFolderFilter), - ID_NAME(IID_IFolderFilterSite), - 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_IMultiMonitorDockingSite), - 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_ISFHelper), - 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_IShellExtInit), - ID_NAME(IID_IShellPropSheetExt), - 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_IShellNameSpace), - ID_NAME(IID_IShellService), - ID_NAME(IID_IShellView), - ID_NAME(IID_IShellView2), - ID_NAME(IID_IShellView3), - ID_NAME(IID_IShellWindows), - ID_NAME(IID_IStorage), - 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_IViewObjectEx), - ID_NAME(IID_IWinEventHandler), - - ID_NAME(IID_DFConstraint), - ID_NAME(DIID_DShellFolderViewEvents), - - ID_NAME(IID_CDefView), - 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), - - ID_NAME(CLSID_ShellDesktop) + { ID_NAME(IID_IACList), TRUE }, + { ID_NAME(IID_IACList2), TRUE }, + { ID_NAME(IID_IADesktopP2), TRUE }, + { ID_NAME(IID_IAccessible) }, + { ID_NAME(IID_IAccessControl), TRUE }, + { ID_NAME(IID_IAccessor) }, + { ID_NAME(IID_IActiveDesktop), TRUE }, + { ID_NAME(IID_IActiveDesktopP), TRUE }, + { ID_NAME(IID_IAddressBarParser), TRUE }, + { ID_NAME(IID_IAddressBand), TRUE }, + { ID_NAME(IID_IAddressEditBox), TRUE }, + { ID_NAME(IID_IAugmentedShellFolder), TRUE }, + { ID_NAME(IID_IAugmentedShellFolder2), TRUE }, + { ID_NAME(IID_IAutoComplete), TRUE }, + { ID_NAME(IID_IAutoComplete2), TRUE }, + { ID_NAME(IID_IBandNavigate), TRUE }, + { ID_NAME(IID_IBandProxy), TRUE }, + { ID_NAME(IID_IBandSite) }, + { ID_NAME(IID_IBandSiteHelper), TRUE }, + { ID_NAME(IID_IBanneredBar), TRUE }, + { ID_NAME(IID_IBindCtx) }, + { ID_NAME(IID_IBrowserFrameOptions), TRUE }, + { ID_NAME(IID_IBrowserService) }, + { ID_NAME(IID_IBrowserService2), TRUE }, + { ID_NAME(IID_IBrowserService3), TRUE }, + { ID_NAME(IID_IClassFactory) }, + { ID_NAME(IID_IClassFactory2) }, + { ID_NAME(IID_IClassFactory3), TRUE }, + { ID_NAME(IID_IClientSecurity), TRUE }, + { ID_NAME(IID_IComThreadingInfo), TRUE }, + { ID_NAME(IID_IContext), TRUE }, + { ID_NAME(IID_IContextMenu), TRUE }, + { ID_NAME(IID_IContextMenu2), TRUE }, + { ID_NAME(IID_IContextMenu3), TRUE }, + { ID_NAME(IID_IContextMenuCB), TRUE }, + { ID_NAME(IID_IContextMenuSite) }, + { ID_NAME(IID_IContinue) }, + { ID_NAME(IID_IDVGetEnum), TRUE }, + { ID_NAME(IID_IDataObject) }, + //{ ID_NAME(IID_IDefViewID) }, == DefViewFrame3 + { ID_NAME(IID_IDefViewFrame), TRUE }, + { ID_NAME(IID_IDefViewFrame3) }, + { ID_NAME(IID_IDefViewFrameGroup) }, + { ID_NAME(IID_IDefViewSafety), }, + { ID_NAME(IID_IDefViewScript), TRUE }, + { ID_NAME(IID_IDeskBand) }, + { ID_NAME(IID_IDeskBandEx) }, + { ID_NAME(IID_IDeskBar), TRUE }, + { ID_NAME(IID_IDeskBarClient), TRUE }, + { ID_NAME(IID_IDeskMovr), TRUE }, + { ID_NAME(IID_IDispatch) }, + { ID_NAME(IID_IDockingWindow) }, + { ID_NAME(IID_IDockingWindowFrame), TRUE }, + { ID_NAME(IID_IDockingWindowSite), TRUE }, + { ID_NAME(IID_IDocViewSite), TRUE }, + { ID_NAME(IID_IDragSourceHelper), TRUE }, + { ID_NAME(IID_IDropSource) }, + { ID_NAME(IID_IDropTarget) }, + { ID_NAME(IID_IDropTargetHelper), TRUE }, + { 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_IEnumVARIANT) }, + { ID_NAME(IID_IErrorLog) }, + { ID_NAME(IID_IExplorerToolbar), TRUE }, + { ID_NAME(IID_IExtractIconA), TRUE }, + { ID_NAME(IID_IExtractIconW), TRUE }, + { ID_NAME(IID_IExtractImage) }, + { ID_NAME(IID_IExtractImage2) }, + { ID_NAME(IID_IFileDialog) }, + { ID_NAME(IID_IFileDialog2), TRUE }, + { ID_NAME(IID_IFileSearchBand) }, + { ID_NAME(IID_IFolderBandPriv) }, + { ID_NAME(IID_IFolderFilter) }, + { ID_NAME(IID_IFolderFilterSite) }, + { ID_NAME(IID_IFolderView) }, + { ID_NAME(IID_IFolderView2) }, + { ID_NAME(IID_IFolderViewOC) }, + { ID_NAME(IID_IFolderViewSettings) }, + { ID_NAME(IID_IGlobalFolderSettings), TRUE }, + { ID_NAME(IID_IInitializeObject), TRUE }, + { ID_NAME(IID_IInputObject) }, + { ID_NAME(IID_IInputObjectSite) }, + { ID_NAME(IID_IInternalUnknown), TRUE }, + { ID_NAME(IID_IMarshal) }, + { ID_NAME(IID_IMenuBand), TRUE }, + { ID_NAME(IID_IMenuPopup), TRUE }, + { ID_NAME(IID_IMoniker) }, + { ID_NAME(IID_IMultiMonitorDockingSite), TRUE }, + { ID_NAME(IID_IMultiQI), TRUE }, + { ID_NAME(IID_INamespaceProxy), TRUE }, + { ID_NAME(IID_INameSpaceTreeControl), TRUE }, + { ID_NAME(IID_INSCTree), TRUE }, + { ID_NAME(IID_INSCTree2), TRUE }, + { ID_NAME(IID_IObjMgr), TRUE }, + { 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), TRUE }, + { ID_NAME(IID_IOleInPlaceSite) }, + { ID_NAME(IID_IOleInPlaceSiteEx) }, + { ID_NAME(IID_IOleInPlaceSiteWindowless), TRUE }, + { 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), TRUE }, + { ID_NAME(IID_IPropertyBag) }, + { ID_NAME(IID_IPropertyBag2) }, + { ID_NAME(IID_IQueryAssociations), TRUE }, + { ID_NAME(IID_IQueryInfo), TRUE }, + { ID_NAME(IID_IRegTreeOptions), TRUE }, + { ID_NAME(IID_IRunnableObject) }, + { ID_NAME(IID_IServerSecurity), TRUE }, + { ID_NAME(IID_IServiceProvider) }, + { ID_NAME(IID_ISFHelper), TRUE }, + { ID_NAME(IID_IShellBrowser) }, + { ID_NAME(IID_IShellBrowserService), TRUE }, + { ID_NAME(IID_IShellChangeNotify), TRUE }, + { ID_NAME(IID_IShellDesktopTray), TRUE }, + { ID_NAME(IID_IShellDispatch) }, + { ID_NAME(IID_IShellDispatch2) }, + { ID_NAME(IID_IShellDispatch3) }, + { ID_NAME(IID_IShellDispatch4) }, + { ID_NAME(IID_IShellDispatch5), TRUE }, + { ID_NAME(IID_IShellExtInit), TRUE }, + { ID_NAME(IID_IShellPropSheetExt), TRUE }, + { ID_NAME(IID_IShellIconOverlayIdentifier), TRUE }, + { ID_NAME(IID_IShellFolder) }, + { ID_NAME(IID_IShellFolder2) }, + { ID_NAME(IID_IShellFolderBand), TRUE }, + { ID_NAME(IID_IShellFolderView), TRUE }, + { ID_NAME(IID_IShellFolderViewCB), TRUE }, + { 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), TRUE }, + { ID_NAME(IID_IShellMenu2), TRUE }, + { ID_NAME(IID_IShellMenuAcc), TRUE }, + { ID_NAME(IID_IShellMenuCallback), TRUE }, + { ID_NAME(IID_IShellNameSpace) }, + { ID_NAME(IID_IShellService), TRUE }, + { ID_NAME(IID_IShellView) }, + { ID_NAME(IID_IShellView2) }, + { ID_NAME(IID_IShellView3) }, + { ID_NAME(IID_IShellWindows) }, + { ID_NAME(IID_IStorage) }, + { ID_NAME(IID_IStream) }, + { ID_NAME(IID_ISurrogate) }, + { ID_NAME(IID_ISynchronize) }, + { ID_NAME(IID_ISynchronizeContainer), TRUE }, + { ID_NAME(IID_ISynchronizeEvent), TRUE }, + { ID_NAME(IID_ISynchronizeHandle), TRUE }, + { ID_NAME(IID_ITaskbarList) }, + { ID_NAME(IID_ITaskbarList2) }, + { ID_NAME(IID_ITrackShellMenu), TRUE }, + { ID_NAME(IID_ITrayPriv), TRUE }, + { ID_NAME(IID_ITrayPriv2), TRUE }, + { ID_NAME(IID_IUnknown) }, + { ID_NAME(IID_IViewObject) }, + { ID_NAME(IID_IViewObject2) }, + { ID_NAME(IID_IViewObjectEx), TRUE }, + { ID_NAME(IID_IWinEventHandler), TRUE }, + + { ID_NAME(IID_DFConstraint), TRUE }, + { ID_NAME(DIID_DShellFolderViewEvents) }, + + { ID_NAME(IID_CDefView), TRUE }, + { 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) }, + + { ID_NAME(CLSID_ShellDesktop), TRUE } }; static const INT KnownInterfaceCount = RTL_NUMBER_OF(KnownInterfaces); @@ -345,7 +347,7 @@ 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); + ok(offset == INTF_NOT_EXPOSED, "%s: { %s0x%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 @@ -495,3 +497,76 @@ CoUninitialize(); } + +static +VOID +TestInterfaceRegistry( + _In_ PCKNOWN_INTERFACE Interfaces, + _In_ INT InterfaceCount) +{ + INT i; + HKEY hKeyInterface; + LONG result; + + result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Classes\\Interface", 0, KEY_ENUMERATE_SUB_KEYS, &hKeyInterface); + ok(result == NO_ERROR, "Failed to open interface key, error %lu\n", result); + if (!myskip(result == NO_ERROR, "No interface key\n")) + { + for (i = 0; i < InterfaceCount; i++) + { + HKEY hKey; + NTSTATUS status; + UNICODE_STRING iid; + DWORD type; + WCHAR data[100]; + DWORD dataSize; + PCKNOWN_INTERFACE iface; + PCWSTR expectedName; + + iface = &Interfaces[i]; + status = RtlStringFromGUID(iface->iid, &iid); + ok(status == STATUS_SUCCESS, "Failed to convert guid to string for %s, status %lx\n", iface->name, status); + if (myskip(NT_SUCCESS(status), "No guid string\n")) + continue; + + result = RegOpenKeyEx(hKeyInterface, iid.Buffer, 0, KEY_QUERY_VALUE, &hKey); + if (iface->noreg) + { + ok(result == ERROR_FILE_NOT_FOUND, "RegOpenKeyEx returned %lu for %s\n", result, iface->name); + } + else + { + ok(result == NO_ERROR, "Failed to open key for %s, error %lu\n", iface->name, result); + (void)myskip(result == NO_ERROR, "No key\n"); + } + RtlFreeUnicodeString(&iid); + if (result != NO_ERROR) + continue; + + dataSize = sizeof(data); + result = RegQueryValueEx(hKey, NULL, NULL, &type, (PBYTE)data, &dataSize); + ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", iface->name, result); + if (!myskip(result == NO_ERROR, "No module name\n")) + { + ok(type == REG_SZ, "type %lu for %s\n", type, iface->name); + ok(dataSize % sizeof(WCHAR) == 0, "size %lu for %s\n", dataSize, iface->name); + ok(dataSize <= sizeof(data), "size %lu for %s\n", dataSize, iface->name); + ok(data[dataSize / sizeof(WCHAR) - 1] == UNICODE_NULL, "Not null terminated for %s\n", iface->name); + expectedName = wcschr(iface->wname, L'_'); + if (expectedName) + expectedName++; + else + expectedName = iface->wname; + ok(!wcsicmp(data, expectedName), "Name is %ls, expected %ls\n", data, expectedName); + } + + RegCloseKey(hKey); + } + RegCloseKey(hKeyInterface); + } +} + +START_TEST(interfaces) +{ + TestInterfaceRegistry(KnownInterfaces, KnownInterfaceCount); +} Modified: trunk/rostests/apitests/com/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/com/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/testlist.c [iso-8859-1] Fri Mar 21 11:45:30 2014 @@ -5,6 +5,7 @@ extern void func_browseui(void); extern void func_ieframe(void); +extern void func_interfaces(void); extern void func_shdocvw(void); extern void func_shell32(void); @@ -12,6 +13,7 @@ { { "browseui", func_browseui }, { "ieframe", func_ieframe }, + { "interfaces", func_interfaces }, { "shdocvw", func_shdocvw }, { "shell32", func_shell32 },

10 years, 9 months

[tfaber] 62540: [COM_APITEST] - Add MergedFolder and AugmentedShellFolder classes/interfaces

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 21 11:23:47 2014 New Revision: 62540 URL: http://svn.reactos.org/svn/reactos?rev=62540&view=rev Log: [COM_APITEST] - Add MergedFolder and AugmentedShellFolder classes/interfaces Modified: trunk/rostests/apitests/com/browseui.c trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shell32.c Modified: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Fri Mar 21 11:23:47 2014 @@ -32,6 +32,28 @@ { 0x10, &IID_IOleCommandTarget }, { 0x14, &IID_IPersistStream }, { 0x18, &IID_IShellService }, + } + }, + { + ID_NAME(CLSID_AugmentedShellFolder), + { + { 0x0, &IID_IAugmentedShellFolder2 }, + { 0x0, &IID_IAugmentedShellFolder }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellService }, + } + }, + { + ID_NAME(CLSID_AugmentedShellFolder2), + { + { 0x0, &IID_IAugmentedShellFolder2 }, + { 0x0, &IID_IAugmentedShellFolder }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellFolder2 }, + { 0x8, &IID_IShellService }, + { 0x10, &IID_IDropTarget }, } }, { Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Fri Mar 21 11:23:47 2014 @@ -40,6 +40,8 @@ ID_NAME(IID_IAddressBarParser), ID_NAME(IID_IAddressBand), ID_NAME(IID_IAddressEditBox), + ID_NAME(IID_IAugmentedShellFolder), + ID_NAME(IID_IAugmentedShellFolder2), ID_NAME(IID_IAutoComplete), ID_NAME(IID_IAutoComplete2), ID_NAME(IID_IBandNavigate), Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Fri Mar 21 11:23:47 2014 @@ -65,6 +65,8 @@ // TODO: fix our headers... we really shouldn't need these here DEFINE_GUID(CLSID_ActiveDesktop, 0x75048700, 0xef1f, 0x11d0, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); +DEFINE_GUID(CLSID_AugmentedShellFolder, 0x91ea3f8b, 0xc99b, 0x11d0, 0x98, 0x15, 0x00, 0xc0, 0x4f, 0xd9, 0x19, 0x72); +DEFINE_GUID(CLSID_AugmentedShellFolder2, 0x6413ba2c, 0xb461, 0x11d1, 0xa1, 0x8a, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03); 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); @@ -73,6 +75,7 @@ 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_MergedFolder, 0x26fdc864, 0xbe88, 0x46e7, 0x92, 0x35, 0x03, 0x2d, 0x8e, 0xa5, 0x16, 0x2e); 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); @@ -89,6 +92,8 @@ DEFINE_GUID(IID_IActiveDesktop, 0xf490eb00, 0x1240, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); DEFINE_GUID(IID_IActiveDesktopP, 0x52502ee0, 0xec80, 0x11d0, 0x89, 0xab, 0x00, 0xc0, 0x4f, 0xc2, 0x97, 0x2d); DEFINE_GUID(IID_IAddressBarParser, 0xc9d81948, 0x443a, 0x40c7, 0x94, 0x5c, 0x5e, 0x17, 0x1b, 0x8c, 0x66, 0xb4); +DEFINE_GUID(IID_IAugmentedShellFolder, 0x91ea3f8c, 0xc99b, 0x11d0, 0x98, 0x15, 0x00, 0xc0, 0x4f, 0xd9, 0x19, 0x72); +DEFINE_GUID(IID_IAugmentedShellFolder2, 0x8db3b3f4, 0x6cfe, 0x11d1, 0x8a, 0xe9, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); DEFINE_GUID(IID_IBrowserFrameOptions, 0x10df43c8, 0x1dbe, 0x11d3, 0x8b, 0x34, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4); DEFINE_GUID(IID_IContext, 0x000001c0, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); DEFINE_GUID(IID_IDVGetEnum, 0x70f55181, 0x5fea, 0x4900, 0xb6, 0xb8, 0x73, 0x43, 0xcb, 0x0a, 0x34, 0x8c); Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Fri Mar 21 11:23:47 2014 @@ -208,6 +208,22 @@ } }, #endif + { + ID_NAME(CLSID_MergedFolder), + { + { -0x8, &IID_IShellFolder2 }, + { -0x4, &IID_IStorage }, + { 0x0, &IID_IAugmentedShellFolder2 }, + { 0x0, &IID_IAugmentedShellFolder }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellService }, + { 0xc, &IID_IPersistFolder2 }, + { 0xc, &IID_IPersistFolder }, + { 0xc, &IID_IPersist }, + { 0x10, &IID_IPersistPropertyBag }, + } + }, { ID_NAME(CLSID_MoveToMenu), {

10 years, 9 months

[dquintana] 62539: [RSHELL] * Improve behaviour when hovering and clicking on the menubar. It's still somewhat glitchy though. CORE-7586

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri Mar 21 10:13:18 2014 New Revision: 62539 URL: http://svn.reactos.org/svn/reactos?rev=62539&view=rev Log: [RSHELL] * Improve behaviour when hovering and clicking on the menubar. It's still somewhat glitchy though. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuBand.h branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Fri Mar 21 10:13:18 2014 @@ -56,6 +56,9 @@ m_site(NULL), m_psmc(NULL), m_subMenuChild(NULL), + m_subMenuParent(NULL), + m_childBand(NULL), + m_parentBand(NULL), m_hmenu(NULL), m_menuOwner(NULL), m_useBigIcons(FALSE), @@ -351,6 +354,10 @@ hr = _CallCB(SMC_INITMENU, 0, 0); if (FAILED_UNEXPECTEDLY(hr)) return hr; + } + else if (m_parentBand) + { + m_parentBand->SetClient(NULL); } if (fShow) @@ -488,6 +495,17 @@ { m_childBand = child; return S_OK; +} + +HRESULT CMenuBand::_SetParentBand(CMenuBand * parent) +{ + m_parentBand = parent; + return S_OK; +} + +HRESULT CMenuBand::_IsPopup() +{ + return m_subMenuParent ? S_OK : S_FALSE; } HRESULT STDMETHODCALLTYPE CMenuBand::SetClient(IUnknown *punkClient) Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] Fri Mar 21 10:13:18 2014 @@ -48,6 +48,7 @@ CComPtr<IMenuPopup> m_subMenuChild; CComPtr<IMenuPopup> m_subMenuParent; CComPtr<CMenuBand> m_childBand; + CComPtr<CMenuBand> m_parentBand; UINT m_uId; UINT m_uIdAncestor; @@ -180,6 +181,8 @@ HRESULT _OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude, CMenuToolbarBase * toolbar, INT item); HRESULT _DisableMouseTrack(BOOL bDisable); HRESULT _SetChildBand(CMenuBand * child); + HRESULT _SetParentBand(CMenuBand * parent); + HRESULT _IsPopup(); BOOL UseBigIcons() { Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Fri Mar 21 10:13:18 2014 @@ -188,7 +188,9 @@ return hr; if (hwnd == hWnd) - return S_OK; + { + return band->_IsPopup(); + } } return S_FALSE; @@ -232,10 +234,10 @@ if (m_currentMenu) SendMessage(m_currentFocus, WM_CANCELMODE, 0, 0); else - m_currentBand->_MenuItemHotTrack(MPOS_SELECTLEFT); + m_currentBand->_MenuItemHotTrack(MPOS_CANCELLEVEL); DbgPrint("Active popup cancelled, notifying of change...\n"); PostMessage(hwndToolbar, WM_USER_CHANGETRACKEDITEM, iHitTestResult, iHitTestResult); - return TRUE; + return FALSE; } } @@ -447,6 +449,7 @@ if (mbParent) { mbParent->_SetChildBand(mb); + mb->_SetParentBand(mbParent); } return UpdateFocus(mb); @@ -456,6 +459,11 @@ { CMenuBand * mbc; HRESULT hr; + + if (m_currentBand) + { + m_currentBand->_SetParentBand(NULL); + } HWND newFocus; hr = mb->_GetTopLevelWindow(&newFocus); Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Fri Mar 21 10:13:18 2014 @@ -1050,6 +1050,12 @@ HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { HRESULT hr; + + if (m_isTracking) + { + return S_FALSE; + } + hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -1057,7 +1063,6 @@ // in case the clicked item has a submenu, we do not need to execute the item if (hr == S_FALSE) { - DbgPrint("CMenuToolbarBase::OnCommand told us to cancel.\n"); return hr; }

10 years, 9 months

[tfaber] 62538: [PSDK] - Fix GCC version of FIELD_OFFSET in ntdef.h

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 21 07:24:03 2014 New Revision: 62538 URL: http://svn.reactos.org/svn/reactos?rev=62538&view=rev Log: [PSDK] - Fix GCC version of FIELD_OFFSET in ntdef.h Modified: trunk/reactos/include/psdk/ntdef.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Fri Mar 21 07:24:03 2014 @@ -199,7 +199,7 @@ #ifndef __GNUC__ #define FIELD_OFFSET(Type, Field) ((LONG)(LONG_PTR)&(((Type*) 0)->Field)) #else -#define FIELD_OFFSET(Type, Field) __builtin_offsetof(Type, Field) +#define FIELD_OFFSET(Type, Field) ((LONG)__builtin_offsetof(Type, Field)) #endif /* Returns the type's alignment */

10 years, 9 months

[dquintana] 62537: [RSHELL] * Improve mouse navigation of the menubar. * Fix the menus. * Fix the case for system includes (hopefully fixes). CORE-7586

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu Mar 20 15:39:25 2014 New Revision: 62537 URL: http://svn.reactos.org/svn/reactos?rev=62537&view=rev Log: [RSHELL] * Improve mouse navigation of the menubar. * Fix the menus. * Fix the case for system includes (hopefully fixes). CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuBand.h branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Thu Mar 20 15:39:25 2014 @@ -19,7 +19,7 @@ */ #include "precomp.h" #include <windowsx.h> -#include <CommonControls.h> +#include <commoncontrols.h> #include <shlwapi_undoc.h> #include "CMenuBand.h" @@ -333,13 +333,18 @@ HRESULT hr = S_OK; if (m_staticToolbar != NULL) + { hr = m_staticToolbar->ShowWindow(fShow); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } + if (m_SFToolbar != NULL) + { hr = m_SFToolbar->ShowWindow(fShow); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } if (fShow) { @@ -348,12 +353,10 @@ return hr; } - { - if (fShow) - hr = m_focusManager->PushMenu(this); - else - hr = m_focusManager->PopMenu(this); - } + if (fShow) + hr = m_focusManager->PushMenu(this); + else + hr = m_focusManager->PopMenu(this); return S_OK; } @@ -368,17 +371,6 @@ if (m_SFToolbar != NULL) return m_SFToolbar->Close(); - return S_OK; -} -HRESULT STDMETHODCALLTYPE CMenuBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::ContextSensitiveHelp(BOOL fEnterMode) -{ - UNIMPLEMENTED; return S_OK; } @@ -492,6 +484,12 @@ return S_OK; } +HRESULT CMenuBand::_SetChildBand(CMenuBand * child) +{ + m_childBand = child; + return S_OK; +} + HRESULT STDMETHODCALLTYPE CMenuBand::SetClient(IUnknown *punkClient) { if (m_subMenuChild) @@ -504,13 +502,13 @@ } HRESULT hr = punkClient->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_subMenuChild)); m_trackingPopup = m_subMenuChild != NULL; + DbgPrint("Tracking: %d\n", m_trackingPopup); return hr; } HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient) { // HACK, so I can test for a submenu in the DeskBar - //UNIMPLEMENTED; if (ppunkClient) { if (m_subMenuChild) @@ -523,15 +521,11 @@ HRESULT STDMETHODCALLTYPE CMenuBand::IsMenuMessage(MSG *pmsg) { - //UNIMPLEMENTED; - //return S_OK; return S_FALSE; - //return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CMenuBand::TranslateMenuMessage(MSG *pmsg, LRESULT *plRet) { - //UNIMPLEMENTED; return S_FALSE; } @@ -569,24 +563,6 @@ if (m_SFToolbar) return m_SFToolbar->GetShellFolder(pdwFlags, ppidl, riid, ppv); return E_FAIL; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::InvalidateItem(LPSMDATA psmd, DWORD dwFlags) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetState(LPSMDATA psmd) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::SetMenuToolbar(IUnknown *punk, DWORD dwFlags) -{ - UNIMPLEMENTED; - return S_OK; } HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) @@ -663,6 +639,8 @@ UINT flags = TPM_VERPOSANIMATION | TPM_VERTICAL | TPM_LEFTALIGN; m_trackingPopup = TRUE; + DbgPrint("Tracking: %d\n", m_trackingPopup); + m_focusManager->PushTrackedPopup(this, popup); if (m_menuOwner) { @@ -672,8 +650,10 @@ { ::TrackPopupMenuEx(popup, flags, x, y, m_topLevelWindow, &params); } + m_focusManager->PopTrackedPopup(this, popup); + m_trackingPopup = FALSE; - m_focusManager->PopTrackedPopup(this, popup); + DbgPrint("Tracking: %d\n", m_trackingPopup); return S_OK; } @@ -812,11 +792,8 @@ { if (m_hotBar && m_hotItem >= 0) { - if (m_hotBar->HasSubMenu(m_hotItem)==S_OK) - { - m_hotBar->PopupItem(m_hotItem); + if (m_hotBar->PopupItem(m_hotItem) == S_OK) return S_FALSE; - } } if (!m_subMenuParent) return S_OK; @@ -839,9 +816,14 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; } + if (m_staticToolbar) m_staticToolbar->OnPopupItemChanged(toolbar, item); if (m_SFToolbar) m_SFToolbar->OnPopupItemChanged(toolbar, item); + + m_subMenuChild = popup; m_trackingPopup = popup != NULL; + DbgPrint("Tracking: %d\n", m_trackingPopup); + if (popup) { if (m_subMenuParent) @@ -851,6 +833,7 @@ popup->Popup(pAt, pExclude, MPPF_RIGHT); } + return S_OK; } @@ -863,6 +846,36 @@ return S_OK; } +HRESULT STDMETHODCALLTYPE CMenuBand::InvalidateItem(LPSMDATA psmd, DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetState(LPSMDATA psmd) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMenuToolbar(IUnknown *punk, DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::ContextSensitiveHelp(BOOL fEnterMode) +{ + UNIMPLEMENTED; + return S_OK; +} + HRESULT STDMETHODCALLTYPE CMenuBand::GetSubMenu(THIS) { UNIMPLEMENTED; Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] Thu Mar 20 15:39:25 2014 @@ -47,6 +47,7 @@ CComPtr<IShellMenuCallback> m_psmc; CComPtr<IMenuPopup> m_subMenuChild; CComPtr<IMenuPopup> m_subMenuParent; + CComPtr<CMenuBand> m_childBand; UINT m_uId; UINT m_uIdAncestor; @@ -178,6 +179,7 @@ HRESULT _MenuItemHotTrack(DWORD changeType); HRESULT _OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude, CMenuToolbarBase * toolbar, INT item); HRESULT _DisableMouseTrack(BOOL bDisable); + HRESULT _SetChildBand(CMenuBand * child); BOOL UseBigIcons() { Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Thu Mar 20 15:39:25 2014 @@ -19,7 +19,7 @@ */ #include "precomp.h" #include <windowsx.h> -#include <CommonControls.h> +#include <commoncontrols.h> #include <shlwapi_undoc.h> #include "CMenuFocusManager.h" @@ -194,13 +194,56 @@ return S_FALSE; } -LRESULT CMenuFocusManager::MsgFilterHook(INT nCode, WPARAM wParam, LPARAM lParam) +LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg) { HWND parent; HWND child; POINT pt; int iHitTestResult; + pt = msg->pt; + + parent = WindowFromPoint(pt); + + ScreenToClient(parent, &pt); + + child = ChildWindowFromPoint(parent, pt); + + if (child != m_parentToolbar) + return TRUE; + + ScreenToClient(m_parentToolbar, &msg->pt); + + /* Don't do anything if the mouse has not been moved */ + if (msg->pt.x == m_ptPrev.x && msg->pt.y == m_ptPrev.y) + return TRUE; + + m_ptPrev = msg->pt; + + iHitTestResult = SendMessageW(m_parentToolbar, TB_HITTEST, 0, (LPARAM) &msg->pt); + + /* Make sure that iHitTestResult is one of the menu items and that it is not the current menu item */ + if (iHitTestResult >= 0) + { + HWND hwndToolbar = m_parentToolbar; + if (SendMessage(hwndToolbar, WM_USER_ISTRACKEDITEM, iHitTestResult, 0)) + { + DbgPrint("Hot item tracking detected a change...\n"); + if (m_currentMenu) + SendMessage(m_currentFocus, WM_CANCELMODE, 0, 0); + else + m_currentBand->_MenuItemHotTrack(MPOS_SELECTLEFT); + DbgPrint("Active popup cancelled, notifying of change...\n"); + PostMessage(hwndToolbar, WM_USER_CHANGETRACKEDITEM, iHitTestResult, iHitTestResult); + return TRUE; + } + } + + return TRUE; +} + +LRESULT CMenuFocusManager::MsgFilterHook(INT nCode, WPARAM wParam, LPARAM lParam) +{ if (nCode < 0) return CallNextHookEx(m_hMsgFilterHook, nCode, wParam, lParam); @@ -214,38 +257,7 @@ switch (msg->message) { case WM_MOUSEMOVE: - - pt = msg->pt; - - parent = WindowFromPoint(pt); - - ScreenToClient(parent, &pt); - - child = ChildWindowFromPoint(parent, pt); - - if (child != m_parentToolbar) - break; - - ScreenToClient(m_parentToolbar, &msg->pt); - - /* Don't do anything if the mouse has not been moved */ - if (msg->pt.x == m_ptPrev.x && msg->pt.y == m_ptPrev.y) - return TRUE; - - m_ptPrev = msg->pt; - - iHitTestResult = SendMessageW(m_parentToolbar, TB_HITTEST, 0, (LPARAM) &msg->pt); - - /* Make sure that iHitTestResult is one of the menu items and that it is not the current menu item */ - if (iHitTestResult >= 0) - { - if (SendMessage(m_parentToolbar, WM_USER_ISTRACKEDITEM, iHitTestResult, 0)) - { - SendMessage(m_currentFocus, WM_CANCELMODE, 0, 0); - PostMessage(m_parentToolbar, WM_USER_CHANGETRACKEDITEM, iHitTestResult, iHitTestResult); - return TRUE; - } - } + callNext = ProcessMouseMove(msg); break; } @@ -309,6 +321,7 @@ DisableMouseTrack(NULL, FALSE); } } + callNext = ProcessMouseMove(msg); break; case WM_SYSKEYDOWN: case WM_KEYDOWN: @@ -351,10 +364,12 @@ //SetCapture(window); if (m_currentMenu) { + DbgPrint("Entering MSGFILTER hook...\n"); m_hMsgFilterHook = SetWindowsHookEx(WH_MSGFILTER, s_MsgFilterHook, NULL, m_threadId); } else { + DbgPrint("Entering GETMESSAGE hook...\n"); m_hGetMsgHook = SetWindowsHookEx(WH_GETMESSAGE, s_GetMsgHook, NULL, m_threadId); } return S_OK; @@ -362,6 +377,7 @@ HRESULT CMenuFocusManager::RemoveHooks() { + DbgPrint("Removing all hooks...\n"); if (m_hMsgFilterHook) UnhookWindowsHookEx(m_hMsgFilterHook); if (m_hGetMsgHook) @@ -388,9 +404,14 @@ m_currentBand = newBand; m_currentMenu = popupToTrack; m_currentFocus = newFocus; - if (m_currentMenu) + m_parentToolbar = NULL; + if (popupToTrack) { m_currentBand->GetWindow(&m_parentToolbar); + } + else if (m_bandCount >= 2) + { + m_bandStack[m_bandCount - 2]->GetWindow(&m_parentToolbar); } if (oldFocus && (!newFocus || (oldMenu != popupToTrack))) @@ -425,7 +446,7 @@ if (mbParent) { - mbParent->SetClient(static_cast<IMenuPopup*>(mb)); + mbParent->_SetChildBand(mb); } return UpdateFocus(mb); @@ -466,7 +487,7 @@ if (mb) { - mb->SetClient(NULL); + mb->_SetChildBand(NULL); } return S_OK; @@ -515,10 +536,5 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - if (mb) - { - mb->SetClient(NULL); - } - return S_OK; } Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] Thu Mar 20 15:39:25 2014 @@ -44,8 +44,8 @@ HWND m_currentFocus; HMENU m_currentMenu; HWND m_parentToolbar; + HHOOK m_hMsgFilterHook; HHOOK m_hGetMsgHook; - HHOOK m_hMsgFilterHook; DWORD m_threadId; BOOL m_mouseTrackDisabled; WPARAM m_lastMoveFlags; @@ -82,6 +82,7 @@ void DisableMouseTrack(HWND enableTo, BOOL disableThis); + LRESULT ProcessMouseMove(MSG* msg); public: HRESULT PushMenu(CMenuBand * mb); HRESULT PopMenu(CMenuBand * mb); Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Thu Mar 20 15:39:25 2014 @@ -19,7 +19,7 @@ */ #include "precomp.h" #include <windowsx.h> -#include <CommonControls.h> +#include <commoncontrols.h> #include <shlwapi_undoc.h> #include "CMenuBand.h" @@ -84,8 +84,7 @@ return S_OK; case TBN_DROPDOWN: - wParam = reinterpret_cast<LPNMTOOLBAR>(hdr)->iItem; - return OnCommand(wParam, 0, theResult); + return OnCommand(reinterpret_cast<LPNMTOOLBAR>(hdr)->iItem, 0, theResult); case TBN_HOTITEMCHANGE: return OnHotItemChange(reinterpret_cast<LPNMTBHOTITEM>(hdr), theResult); @@ -99,8 +98,30 @@ case RBN_CHILDSIZE: return S_OK; + case NM_RELEASEDCAPTURE: + break; + + case NM_RDOWN: + case NM_LDOWN: + break; + + case TBN_GETDISPINFO: + break; + + case TBN_BEGINDRAG: + case TBN_ENDDRAG: + break; + + case NM_TOOLTIPSCREATED: + break; + + case TBN_GETINFOTIP: + // TODO: Get tooltip for item + break; + default: DbgPrint("WM_NOTIFY unknown code %d, %d\n", hdr->code, hdr->idFrom); + break; } return S_OK; } @@ -406,7 +427,6 @@ m_SubclassOld(hWnd, uMsg, wParam, lParam); return IsTrackedItem(wParam); case WM_USER_CHANGETRACKEDITEM: - m_isTracking = TRUE; m_SubclassOld(hWnd, uMsg, wParam, lParam); return ChangeTrackedItem(wParam); @@ -423,10 +443,7 @@ m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL, NULL, -1); - if (HasSubMenu(m_hotItem) == S_OK) - { - PopupItem(m_hotItem); - } + PopupItem(m_hotItem); } } @@ -448,17 +465,20 @@ if (m_menuBand->_OnHotItemChanged(NULL, -1) == S_FALSE) { *theResult = 1; - return S_OK; } else { - m_hotItem = -1; + m_menuBand->_OnHotItemChanged(NULL, -1); m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING); - return S_OK; - } - } - else if (m_hotItem != hot->idNew) - { + } + + return S_OK; + } + + if (m_hotItem != hot->idNew) + { + DbgPrint("Hot item is now %d\n", hot->idNew); + if (hot->dwFlags & HICF_MOUSE && m_toolbarFlags & SMINIT_VERTICAL) { @@ -467,8 +487,7 @@ SetTimer(m_hwndToolbar, TIMERID_HOTTRACK, elapsed, NULL); } - m_hotItem = hot->idNew; - m_menuBand->_OnHotItemChanged(this, m_hotItem); + m_menuBand->_OnHotItemChanged(this, hot->idNew); m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING); if (m_isTracking && !(m_toolbarFlags & SMINIT_VERTICAL)) @@ -477,13 +496,11 @@ m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL, NULL, -1); - if (HasSubMenu(m_hotItem) == S_OK) - { - PopupItem(m_hotItem); - } + PopupItem(m_hotItem); } return S_OK; } + return S_OK; } @@ -514,6 +531,7 @@ { SendMessage(m_hwndToolbar, TB_CHECKBUTTON, m_popupItem, FALSE); m_isTracking = FALSE; + DbgPrint("Is Tracking: %d\n", m_isTracking); } m_popupBar = toolbar; m_popupItem = item; @@ -542,6 +560,9 @@ if (m_hotItem != btn.idCommand) { + m_isTracking = TRUE; + DbgPrint("Is Tracking: %d\n", m_isTracking); + SendMessage(m_hwndToolbar, TB_SETHOTITEM, index, 0); } return S_OK; @@ -626,6 +647,8 @@ return hr; m_isTracking = TRUE; + DbgPrint("Is Tracking: %d\n", m_isTracking); + m_menuBand->_OnPopupSubMenu(popup, &pt, &rcl, this, uItem); return S_OK; @@ -663,10 +686,14 @@ HMENU popup = GetSubMenu(menu, index); m_isTracking = TRUE; + DbgPrint("Is Tracking: %d\n", m_isTracking); + m_menuBand->_TrackSubMenuUsingTrackPopupMenu(popup, pt.x, pt.y, rcl); SendMessage(m_hwndToolbar, TB_CHECKBUTTON, uItem, FALSE); + m_isTracking = FALSE; + DbgPrint("Is Tracking: %d\n", m_isTracking); return S_OK; } @@ -704,15 +731,17 @@ HRESULT CMenuToolbarBase::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { theResult = 0; - if (HasSubMenu(wParam) == S_OK) - { - KillTimer(m_hwndToolbar, TIMERID_HOTTRACK); - PopupItem(wParam); + + KillTimer(m_hwndToolbar, TIMERID_HOTTRACK); + + if (PopupItem(wParam) == S_OK) return S_FALSE; - } + HRESULT hr = m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + return S_OK; // filter out a possible S_FALSE from here. } @@ -866,8 +895,11 @@ HRESULT CMenuToolbarBase::GetDataFromId(INT uItem, INT* pIndex, DWORD_PTR* pData) { TBBUTTONINFO info = { 0 }; + DbgPrint("GetDataFromId %d\n", uItem); + info.cbSize = sizeof(TBBUTTONINFO); - info.dwMask = 0; + info.dwMask = TBIF_COMMAND | TBIF_LPARAM; + int index = SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info)); if (index < 0) return E_FAIL; @@ -876,41 +908,31 @@ *pIndex = index; if (pData) - { - TBBUTTON btn = { 0 }; - if (!SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn))) - return E_FAIL; - *pData = btn.dwData; - } - - return S_OK; -} - + *pData = info.lParam; + + DbgPrint("GetDataFromId ret: %d, %d, %x, %x\n", info.idCommand, index, info.lParam); + + return S_OK; +} HRESULT CMenuToolbarBase::PopupItem(INT uItem) { INT index; DWORD_PTR dwData; + GetDataFromId(uItem, &index, &dwData); + if (!(m_toolbarFlags & SMINIT_VERTICAL)) { - SendMessage(m_hwndToolbar, TB_SETHOTITEM, uItem, 0); + SendMessage(m_hwndToolbar, TB_SETHOTITEM, index, 0); SendMessage(m_hwndToolbar, TB_CHECKBUTTON, uItem, TRUE); } - GetDataFromId(uItem, &index, &dwData); + HRESULT hr = InternalHasSubMenu(uItem, index, dwData); + if (hr != S_OK) + return hr; return InternalPopupItem(uItem, index, dwData); -} - -HRESULT CMenuToolbarBase::HasSubMenu(INT uItem) -{ - INT index; - DWORD_PTR dwData; - - GetDataFromId(uItem, &index, &dwData); - - return InternalHasSubMenu(uItem, index, dwData); } CMenuStaticToolbar::CMenuStaticToolbar(CMenuBand *menuBand) : Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Thu Mar 20 15:39:25 2014 @@ -22,8 +22,8 @@ class CMenuBand; class CMenuFocusManager; -#define WM_USER_ISTRACKEDITEM (WM_USER+41) -#define WM_USER_CHANGETRACKEDITEM (WM_USER+42) +#define WM_USER_ISTRACKEDITEM (WM_APP+41) +#define WM_USER_CHANGETRACKEDITEM (WM_APP+42) class CMenuToolbarBase @@ -89,7 +89,6 @@ virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0; HRESULT PopupItem(INT uItem); - HRESULT HasSubMenu(INT uItem); HRESULT GetDataFromId(INT uItem, INT* pIndex, DWORD_PTR* pData); protected:

10 years, 9 months

[jimtabor] 62536: [Usp10] - Sync to Wine 1.7.14.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Mar 20 02:10:07 2014 New Revision: 62536 URL: http://svn.reactos.org/svn/reactos?rev=62536&view=rev Log: [Usp10] - Sync to Wine 1.7.14. Modified: trunk/rostests/winetests/usp10/testlist.c trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/testlist.… ============================================================================== --- trunk/rostests/winetests/usp10/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/testlist.c [iso-8859-1] Thu Mar 20 02:10:07 2014 @@ -1,4 +1,7 @@ -/* Automatically generated file; DO NOT EDIT!! */ +/* Automatically generated by make depend; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> #define STANDALONE #include <wine/test.h> Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… ============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Thu Mar 20 02:10:07 2014 @@ -828,10 +828,9 @@ LOGFONTA lf; } fontEnumParam; -static int CALLBACK enumFontProc( const LOGFONT *lpelfe, const TEXTMETRIC *lpntme, - DWORD FontType, LPARAM lParam) +static int CALLBACK enumFontProc( const LOGFONTA *lpelfe, const TEXTMETRICA *lpntme, DWORD FontType, LPARAM lParam ) { - NEWTEXTMETRICEX *ntme = (NEWTEXTMETRICEX*)lpntme; + NEWTEXTMETRICEXA *ntme = (NEWTEXTMETRICEXA*)lpntme; fontEnumParam *rp = (fontEnumParam*) lParam; int idx = 0; DWORD i; @@ -853,7 +852,7 @@ if (ntme->ntmFontSig.fsUsb[idx] & mask) { - memcpy(&(rp->lf),lpelfe,sizeof(LOGFONT)); + memcpy(&(rp->lf),lpelfe,sizeof(LOGFONTA)); return 0; } return 1; @@ -865,7 +864,7 @@ fontEnumParam lParam; lParam.range = range; - memset(&lParam.lf,0,sizeof(LOGFONT)); + memset(&lParam.lf,0,sizeof(LOGFONTA)); *hfont = NULL; if (recommended) @@ -884,7 +883,7 @@ if (!*hfont) { - memset(&lParam.lf,0,sizeof(LOGFONT)); + memset(&lParam.lf,0,sizeof(LOGFONTA)); lParam.lf.lfCharSet = DEFAULT_CHARSET; if (!EnumFontFamiliesExA(hdc, &lParam.lf, enumFontProc, (LPARAM)&lParam, 0) && lParam.lf.lfFaceName[0]) @@ -1812,10 +1811,10 @@ struct enum_font_data { int total; - ENUMLOGFONT elf[MAX_ENUM_FONTS]; + ENUMLOGFONTA elf[MAX_ENUM_FONTS]; }; -static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +static INT CALLBACK enum_bitmap_font_proc(const LOGFONTA *lf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { struct enum_font_data *efnd = (struct enum_font_data *)lParam; @@ -1823,7 +1822,7 @@ if (efnd->total < MAX_ENUM_FONTS) { - efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + efnd->elf[efnd->total++] = *(ENUMLOGFONTA*)lf; } else trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); @@ -1831,7 +1830,7 @@ return 1; } -static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +static INT CALLBACK enum_truetype_proc(const LOGFONTA *lf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { struct enum_font_data *efnd = (struct enum_font_data *)lParam; @@ -1839,7 +1838,7 @@ if (efnd->total < MAX_ENUM_FONTS) { - efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + efnd->elf[efnd->total++] = *(ENUMLOGFONTA*)lf; } else trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); @@ -1853,7 +1852,7 @@ SCRIPT_CACHE psc,old_psc; SCRIPT_FONTPROPERTIES sfp; HFONT font, oldfont; - LOGFONT lf; + LOGFONTA lf; struct enum_font_data efnd; TEXTMETRICA tmA; WORD gi[3]; @@ -1937,7 +1936,7 @@ for (i = 0; i < efnd.total; i++) { lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); - font = CreateFontIndirect(&lf); + font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font); sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); @@ -1978,7 +1977,7 @@ for (i = 0; i < efnd.total; i++) { lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); - font = CreateFontIndirect(&lf); + font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font); sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES);

10 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2014