Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 62544: [KERNEL32]: Fix parameter usage in RtlAcquirePrivilege.
by hbelusca＠svn.reactos.org 22 Mar '14

22 Mar '14

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 */

1 0

[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 22 Mar '14

22 Mar '14

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;

1 0

[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 22 Mar '14

22 Mar '14

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;

1 0

[tfaber] 62541: [COM_APITEST] - Verify interfaces against HKLM\Software\Classes\Interface
by tfaber＠svn.reactos.org 21 Mar '14

21 Mar '14

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 },

1 0

[tfaber] 62540: [COM_APITEST] - Add MergedFolder and AugmentedShellFolder classes/interfaces
by tfaber＠svn.reactos.org 21 Mar '14

21 Mar '14

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), {

1 0

[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 21 Mar '14

21 Mar '14

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; }

1 0

[tfaber] 62538: [PSDK] - Fix GCC version of FIELD_OFFSET in ntdef.h
by tfaber＠svn.reactos.org 21 Mar '14

21 Mar '14

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 */

1 0

[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 20 Mar '14

20 Mar '14

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:

1 0

[jimtabor] 62536: [Usp10] - Sync to Wine 1.7.14.
by jimtabor＠svn.reactos.org 20 Mar '14

20 Mar '14

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);

1 0

[jimtabor] 62535: [Usp10] - Sync to Wine 1.7.14.
by jimtabor＠svn.reactos.org 20 Mar '14

20 Mar '14

Author: jimtabor Date: Thu Mar 20 02:07:55 2014 New Revision: 62535 URL: http://svn.reactos.org/svn/reactos?rev=62535&view=rev Log: [Usp10] - Sync to Wine 1.7.14. Modified: trunk/reactos/dll/win32/usp10/bidi.c trunk/reactos/dll/win32/usp10/indicsyllable.c trunk/reactos/dll/win32/usp10/linebreak.c trunk/reactos/dll/win32/usp10/shaping.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] Thu Mar 20 02:07:55 2014 @@ -41,12 +41,16 @@ * has been modified. */ +#include <windef.h> + +#include <wine/list.h> + #include "usp10_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(bidi); #define ASSERT(x) do { if (!(x)) FIXME("assert failed: %s\n", #x); } while(0) -#define MAX_LEVEL 61 +#define MAX_DEPTH 125 /* HELPER FUNCTIONS AND DECLARATIONS */ @@ -64,7 +68,7 @@ enum directions { /* input types */ - /* ON MUST be zero, code relies on ON = N = 0 */ + /* ON MUST be zero, code relies on ON = NI = 0 */ ON = 0, /* Other Neutral */ L, /* Left Letter */ R, /* Right Letter */ @@ -91,11 +95,52 @@ LRE, PDF, + LRI, /* Isolate formatting characters new with 6.3 */ + RLI, + FSI, + PDI, + /* resolved types, also resolved directions */ - N = ON, /* alias, where ON, WS and S are treated the same */ + NI = ON, /* alias, where ON, WS, S and Isolates are treated the same */ }; +static const char debug_type[][4] = +{ + "ON", /* Other Neutral */ + "L", /* Left Letter */ + "R", /* Right Letter */ + "AN", /* Arabic Number */ + "EN", /* European Number */ + "AL", /* Arabic Letter (Right-to-left) */ + "NSM", /* Non-spacing Mark */ + "CS", /* Common Separator */ + "ES", /* European Separator */ + "ET", /* European Terminator (post/prefix e.g. $ and %) */ + "BN", /* Boundary neutral (type of RLE etc after explicit levels) */ + "S", /* Segment Separator (TAB) // used only in L1 */ + "WS", /* White space // used only in L1 */ + "B", /* Paragraph Separator (aka as PS) */ + "RLO", /* these are used only in X1-X9 */ + "RLE", + "LRO", + "LRE", + "PDF", + "LRI", /* Isolate formatting characters new with 6.3 */ + "RLI", + "FSI", + "PDI", +}; + /* HELPER FUNCTIONS */ + +static inline void dump_types(const char* header, WORD *types, int start, int end) +{ + int i; + TRACE("%s:",header); + for (i = start; i< end; i++) + TRACE(" %s",debug_type[types[i]]); + TRACE("\n"); +} /* Convert the libwine information to the direction enum */ static void classify(LPCWSTR lpString, WORD *chartype, DWORD uCount, const SCRIPT_CONTROL *c) @@ -132,7 +177,7 @@ switch (lpString[i]) { case '-': - case '+': chartype[i] = N; break; + case '+': chartype[i] = NI; break; case '/': chartype[i] = CS; break; } break; @@ -144,20 +189,13 @@ case 0x202C: chartype[i] = PDF; break; case 0x202D: chartype[i] = LRO; break; case 0x202E: chartype[i] = RLO; break; + case 0x2066: chartype[i] = LRI; break; + case 0x2067: chartype[i] = RLI; break; + case 0x2068: chartype[i] = FSI; break; + case 0x2069: chartype[i] = PDI; break; } break; } - } -} - -/* Set a run of cval values at locations all prior to, but not including */ -/* iStart, to the new value nval. */ -static void SetDeferredRun(WORD *pval, int cval, int iStart, int nval) -{ - int i = iStart - 1; - for (; i >= iStart - cval; i--) - { - pval[i] = nval; } } @@ -197,233 +235,269 @@ the outermost call. The nesting counter counts the recursion depth and not the embedding level. ------------------------------------------------------------------------*/ - -static int resolveExplicit(int level, int dir, WORD *pcls, WORD *plevel, int cch, int nNest) -{ - /* always called with a valid nesting level - nesting levels are != embedding levels */ - int nLastValid = nNest; - int ich = 0; - - /* check input values */ - ASSERT(nNest >= 0 && level >= 0 && level <= MAX_LEVEL); - - /* process the text */ - for (; ich < cch; ich++) - { - WORD cls = pcls[ich]; - switch (cls) - { - case LRO: - case LRE: - nNest++; - if (GreaterEven(level) <= MAX_LEVEL - (cls == LRO ? 2 : 0)) - { - plevel[ich] = GreaterEven(level); - pcls[ich] = BN; - ich += resolveExplicit(plevel[ich], (cls == LRE ? N : L), - &pcls[ich+1], &plevel[ich+1], - cch - (ich+1), nNest); - nNest--; - continue; - } - cls = pcls[ich] = BN; - break; - - case RLO: - case RLE: - nNest++; - if (GreaterOdd(level) <= MAX_LEVEL - (cls == RLO ? 2 : 0)) - { - plevel[ich] = GreaterOdd(level); - pcls[ich] = BN; - ich += resolveExplicit(plevel[ich], (cls == RLE ? N : R), - &pcls[ich+1], &plevel[ich+1], - cch - (ich+1), nNest); - nNest--; - continue; - } - cls = pcls[ich] = BN; - break; - - case PDF: - cls = pcls[ich] = BN; - if (nNest) - { - if (nLastValid < nNest) - { - nNest--; +typedef struct tagStackItem { + int level; + int override; + BOOL isolate; +} StackItem; + +#define push_stack(l,o,i) \ + do { stack_top--; \ + stack[stack_top].level = l; \ + stack[stack_top].override = o; \ + stack[stack_top].isolate = i;} while(0) + +#define pop_stack() do { stack_top++; } while(0) + +#define valid_level(x) (x <= MAX_DEPTH && overflow_isolate_count == 0 && overflow_embedding_count == 0) + +static void resolveExplicit(int level, WORD *pclass, WORD *poutLevel, int count) +{ + /* X1 */ + int overflow_isolate_count = 0; + int overflow_embedding_count = 0; + int valid_isolate_count = 0; + int i; + + StackItem stack[MAX_DEPTH+2]; + int stack_top = MAX_DEPTH+1; + + stack[stack_top].level = level; + stack[stack_top].override = NI; + stack[stack_top].isolate = FALSE; + + for (i = 0; i < count; i++) + { + /* X2 */ + if (pclass[i] == RLE) + { + int least_odd = GreaterOdd(stack[stack_top].level); + poutLevel[i] = stack[stack_top].level; + if (valid_level(least_odd)) + push_stack(least_odd, NI, FALSE); + else if (overflow_isolate_count == 0) + overflow_embedding_count++; + } + /* X3 */ + else if (pclass[i] == LRE) + { + int least_even = GreaterEven(stack[stack_top].level); + poutLevel[i] = stack[stack_top].level; + if (valid_level(least_even)) + push_stack(least_even, NI, FALSE); + else if (overflow_isolate_count == 0) + overflow_embedding_count++; + } + /* X4 */ + else if (pclass[i] == RLO) + { + int least_odd = GreaterOdd(stack[stack_top].level); + poutLevel[i] = stack[stack_top].level; + if (valid_level(least_odd)) + push_stack(least_odd, R, FALSE); + else if (overflow_isolate_count == 0) + overflow_embedding_count++; + } + /* X5 */ + else if (pclass[i] == LRO) + { + int least_even = GreaterEven(stack[stack_top].level); + poutLevel[i] = stack[stack_top].level; + if (valid_level(least_even)) + push_stack(least_even, L, FALSE); + else if (overflow_isolate_count == 0) + overflow_embedding_count++; + } + /* X5a */ + else if (pclass[i] == RLI) + { + int least_odd = GreaterOdd(stack[stack_top].level); + poutLevel[i] = stack[stack_top].level; + if (valid_level(least_odd)) + { + valid_isolate_count++; + push_stack(least_odd, NI, TRUE); + } + else + overflow_isolate_count++; + } + /* X5b */ + else if (pclass[i] == LRI) + { + int least_even = GreaterEven(stack[stack_top].level); + poutLevel[i] = stack[stack_top].level; + if (valid_level(least_even)) + { + valid_isolate_count++; + push_stack(least_even, NI, TRUE); + } + else + overflow_isolate_count++; + } + /* X5c */ + else if (pclass[i] == FSI) + { + int j; + int new_level = 0; + int skipping = 0; + poutLevel[i] = stack[stack_top].level; + for (j = i+1; j < count; j++) + { + if (pclass[j] == LRI || pclass[j] == RLI || pclass[j] == FSI) + { + skipping++; + continue; + } + else if (pclass[j] == PDI) + { + if (skipping) + skipping --; + else + break; + continue; + } + + if (skipping) continue; + + if (pclass[j] == L) + { + new_level = 0; + break; + } + else if (pclass[j] == R || pclass[j] == AL) + { + new_level = 1; + break; + } + } + if (odd(new_level)) + { + int least_odd = GreaterOdd(stack[stack_top].level); + if (valid_level(least_odd)) + { + valid_isolate_count++; + push_stack(least_odd, NI, TRUE); } else - { - cch = ich; /* break the loop, but complete body */ - } - } - } - - /* Apply the override */ - if (dir != N) - { - cls = dir; - } - plevel[ich] = level; - if (pcls[ich] != BN) - pcls[ich] = cls; - } - - return ich; -} - -/* RESOLVE WEAK TYPES */ - -enum states /* possible states */ -{ - xa, /* Arabic letter */ - xr, /* right letter */ - xl, /* left letter */ - - ao, /* Arabic lett. foll by ON */ - ro, /* right lett. foll by ON */ - lo, /* left lett. foll by ON */ - - rt, /* ET following R */ - lt, /* ET following L */ - - cn, /* EN, AN following AL */ - ra, /* Arabic number foll R */ - re, /* European number foll R */ - la, /* Arabic number foll L */ - le, /* European number foll L */ - - ac, /* CS following cn */ - rc, /* CS following ra */ - rs, /* CS,ES following re */ - lc, /* CS following la */ - ls, /* CS,ES following le */ - - ret, /* ET following re */ - let, /* ET following le */ -} ; - -static const int stateWeak[][10] = -{ - /* N, L, R, AN, EN, AL,NSM, CS, ES, ET */ -/*xa*/ { ao, xl, xr, cn, cn, xa, xa, ao, ao, ao }, /* Arabic letter */ -/*xr*/ { ro, xl, xr, ra, re, xa, xr, ro, ro, rt }, /* right letter */ -/*xl*/ { lo, xl, xr, la, le, xa, xl, lo, lo, lt }, /* left letter */ - -/*ao*/ { ao, xl, xr, cn, cn, xa, ao, ao, ao, ao }, /* Arabic lett. foll by ON*/ -/*ro*/ { ro, xl, xr, ra, re, xa, ro, ro, ro, rt }, /* right lett. foll by ON */ -/*lo*/ { lo, xl, xr, la, le, xa, lo, lo, lo, lt }, /* left lett. foll by ON */ - -/*rt*/ { ro, xl, xr, ra, re, xa, rt, ro, ro, rt }, /* ET following R */ -/*lt*/ { lo, xl, xr, la, le, xa, lt, lo, lo, lt }, /* ET following L */ - -/*cn*/ { ao, xl, xr, cn, cn, xa, cn, ac, ao, ao }, /* EN, AN following AL */ -/*ra*/ { ro, xl, xr, ra, re, xa, ra, rc, ro, rt }, /* Arabic number foll R */ -/*re*/ { ro, xl, xr, ra, re, xa, re, rs, rs,ret }, /* European number foll R */ -/*la*/ { lo, xl, xr, la, le, xa, la, lc, lo, lt }, /* Arabic number foll L */ -/*le*/ { lo, xl, xr, la, le, xa, le, ls, ls,let }, /* European number foll L */ - -/*ac*/ { ao, xl, xr, cn, cn, xa, ao, ao, ao, ao }, /* CS following cn */ -/*rc*/ { ro, xl, xr, ra, re, xa, ro, ro, ro, rt }, /* CS following ra */ -/*rs*/ { ro, xl, xr, ra, re, xa, ro, ro, ro, rt }, /* CS,ES following re */ -/*lc*/ { lo, xl, xr, la, le, xa, lo, lo, lo, lt }, /* CS following la */ -/*ls*/ { lo, xl, xr, la, le, xa, lo, lo, lo, lt }, /* CS,ES following le */ - -/*ret*/{ ro, xl, xr, ra, re, xa,ret, ro, ro,ret }, /* ET following re */ -/*let*/{ lo, xl, xr, la, le, xa,let, lo, lo,let }, /* ET following le */ -}; - -enum actions /* possible actions */ -{ - /* primitives */ - IX = 0x100, /* increment */ - XX = 0xF, /* no-op */ - - /* actions */ - xxx = (XX << 4) + XX, /* no-op */ - xIx = IX + xxx, /* increment run */ - xxN = (XX << 4) + ON, /* set current to N */ - xxE = (XX << 4) + EN, /* set current to EN */ - xxA = (XX << 4) + AN, /* set current to AN */ - xxR = (XX << 4) + R, /* set current to R */ - xxL = (XX << 4) + L, /* set current to L */ - Nxx = (ON << 4) + 0xF, /* set run to neutral */ - Axx = (AN << 4) + 0xF, /* set run to AN */ - ExE = (EN << 4) + EN, /* set run to EN, set current to EN */ - NIx = (ON << 4) + 0xF + IX, /* set run to N, increment */ - NxN = (ON << 4) + ON, /* set run to N, set current to N */ - NxR = (ON << 4) + R, /* set run to N, set current to R */ - NxE = (ON << 4) + EN, /* set run to N, set current to EN */ - - AxA = (AN << 4) + AN, /* set run to AN, set current to AN */ - NxL = (ON << 4) + L, /* set run to N, set current to L */ - LxL = (L << 4) + L, /* set run to L, set current to L */ -} ; - -static const int actionWeak[][10] = -{ - /* N, L, R, AN, EN, AL, NSM, CS, ES, ET */ -/*xa*/ { xxx, xxx, xxx, xxx, xxA, xxR, xxR, xxN, xxN, xxN }, /* Arabic letter */ -/*xr*/ { xxx, xxx, xxx, xxx, xxE, xxR, xxR, xxN, xxN, xIx }, /* right letter */ -/*xl*/ { xxx, xxx, xxx, xxx, xxL, xxR, xxL, xxN, xxN, xIx }, /* left letter */ - -/*ao*/ { xxx, xxx, xxx, xxx, xxA, xxR, xxN, xxN, xxN, xxN }, /* Arabic lett. foll by ON */ -/*ro*/ { xxx, xxx, xxx, xxx, xxE, xxR, xxN, xxN, xxN, xIx }, /* right lett. foll by ON */ -/*lo*/ { xxx, xxx, xxx, xxx, xxL, xxR, xxN, xxN, xxN, xIx }, /* left lett. foll by ON */ - -/*rt*/ { Nxx, Nxx, Nxx, Nxx, ExE, NxR, xIx, NxN, NxN, xIx }, /* ET following R */ -/*lt*/ { Nxx, Nxx, Nxx, Nxx, LxL, NxR, xIx, NxN, NxN, xIx }, /* ET following L */ - -/*cn*/ { xxx, xxx, xxx, xxx, xxA, xxR, xxA, xIx, xxN, xxN }, /* EN, AN following AL */ -/*ra*/ { xxx, xxx, xxx, xxx, xxE, xxR, xxA, xIx, xxN, xIx }, /* Arabic number foll R */ -/*re*/ { xxx, xxx, xxx, xxx, xxE, xxR, xxE, xIx, xIx, xxE }, /* European number foll R */ -/*la*/ { xxx, xxx, xxx, xxx, xxL, xxR, xxA, xIx, xxN, xIx }, /* Arabic number foll L */ -/*le*/ { xxx, xxx, xxx, xxx, xxL, xxR, xxL, xIx, xIx, xxL }, /* European number foll L */ - -/*ac*/ { Nxx, Nxx, Nxx, Axx, AxA, NxR, NxN, NxN, NxN, NxN }, /* CS following cn */ -/*rc*/ { Nxx, Nxx, Nxx, Axx, NxE, NxR, NxN, NxN, NxN, NIx }, /* CS following ra */ -/*rs*/ { Nxx, Nxx, Nxx, Nxx, ExE, NxR, NxN, NxN, NxN, NIx }, /* CS,ES following re */ -/*lc*/ { Nxx, Nxx, Nxx, Axx, NxL, NxR, NxN, NxN, NxN, NIx }, /* CS following la */ -/*ls*/ { Nxx, Nxx, Nxx, Nxx, LxL, NxR, NxN, NxN, NxN, NIx }, /* CS,ES following le */ - -/*ret*/{ xxx, xxx, xxx, xxx, xxE, xxR, xxE, xxN, xxN, xxE }, /* ET following re */ -/*let*/{ xxx, xxx, xxx, xxx, xxL, xxR, xxL, xxN, xxN, xxL }, /* ET following le */ -}; - -static int GetDeferredType(int action) -{ - return (action >> 4) & 0xF; -} - -static int GetResolvedType(int action) -{ - return action & 0xF; -} - -/* Note on action table: - - States can be of two kinds: - - Immediate Resolution State, where each input token - is resolved as soon as it is seen. These states have - only single action codes (xxN) or the no-op (xxx) - for static input tokens. - - Deferred Resolution State, where input tokens either - either extend the run (xIx) or resolve its Type (e.g. Nxx). - - Input classes are of three kinds - - Static Input Token, where the class of the token remains - unchanged on output (AN, L, N, R) - - Replaced Input Token, where the class of the token is - always replaced on output (AL, BN, NSM, CS, ES, ET) - - Conditional Input Token, where the class of the token is - changed on output in some, but not all, cases (EN) - - Where tokens are subject to change, a double action - (e.g. NxA, or NxN) is _required_ after deferred states, - resolving both the deferred state and changing the current token. -*/ + overflow_isolate_count++; + } + else + { + int least_even = GreaterEven(stack[stack_top].level); + if (valid_level(least_even)) + { + valid_isolate_count++; + push_stack(least_even, NI, TRUE); + } + else + overflow_isolate_count++; + } + } + /* X6 */ + else if (pclass[i] != B && pclass[i] != BN && pclass[i] != PDI && pclass[i] != PDF) + { + poutLevel[i] = stack[stack_top].level; + if (stack[stack_top].override != NI) + pclass[i] = stack[stack_top].override; + } + /* X6a */ + else if (pclass[i] == PDI) + { + if (overflow_isolate_count) overflow_isolate_count--; + else if (!valid_isolate_count) {/* do nothing */} + else + { + overflow_embedding_count = 0; + while (!stack[stack_top].isolate) pop_stack(); + pop_stack(); + valid_isolate_count --; + } + poutLevel[i] = stack[stack_top].level; + } + /* X7 */ + else if (pclass[i] == PDF) + { + poutLevel[i] = stack[stack_top].level; + if (overflow_isolate_count) {/* do nothing */} + else if (overflow_embedding_count) overflow_embedding_count--; + else if (!stack[stack_top].isolate && stack_top < (MAX_DEPTH+1)) + pop_stack(); + } + /* X8: Nothing */ + } + /* X9: Based on 5.2 Retaining Explicit Formatting Characters */ + for (i = 0; i < count ; i++) + if (pclass[i] == RLE || pclass[i] == LRE || pclass[i] == RLO || pclass[i] == LRO || pclass[i] == PDF) + pclass[i] = BN; +} + +static inline int previousValidChar(const WORD *pcls, int index, int back_fence) +{ + if (index == -1 || index == back_fence) return index; + index --; + while (index > back_fence && pcls[index] == BN) index --; + return index; +} + +static inline int nextValidChar(const WORD *pcls, int index, int front_fence) +{ + if (index == front_fence) return index; + index ++; + while (index < front_fence && pcls[index] == BN) index ++; + return index; +} + +typedef struct tagRun +{ + int start; + int end; + WORD e; +} Run; + +typedef struct tagIsolatedRun +{ + struct list entry; + int length; + WORD sos; + WORD eos; + WORD e; + + WORD *ppcls[1]; +} IsolatedRun; + +static inline int iso_nextValidChar(IsolatedRun *iso_run, int index) +{ + if (index >= (iso_run->length-1)) return -1; + index ++; + while (index < iso_run->length && *iso_run->ppcls[index] == BN) index++; + if (index == iso_run->length) return -1; + return index; +} + +static inline int iso_previousValidChar(IsolatedRun *iso_run, int index) +{ + + if (index <= 0) return -1; + index --; + while (index > -1 && *iso_run->ppcls[index] == BN) index--; + return index; +} + +static inline int iso_previousChar(IsolatedRun *iso_run, int index) +{ + if (index <= 0) return -1; + return index --; +} + +static inline void iso_dump_types(const char* header, IsolatedRun *iso_run) +{ + int i; + TRACE("%s:",header); + TRACE("[ "); + for (i = 0; i < iso_run->length; i++) + TRACE(" %s",debug_type[*iso_run->ppcls[i]]); + TRACE(" ]\n"); +} /*------------------------------------------------------------------------ Function: resolveWeak @@ -440,178 +514,142 @@ Note: On input only these directional classes are expected AL, HL, R, L, ON, BN, NSM, AN, EN, ES, ET, CS, ------------------------------------------------------------------------*/ -static void resolveWeak(int baselevel, WORD *pcls, WORD *plevel, int cch) -{ - int state = odd(baselevel) ? xr : xl; - int cls; - - int level = baselevel; - int action, clsRun, clsNew; - int cchRun = 0; - int ich = 0; - - for (; ich < cch; ich++) - { - /* ignore boundary neutrals */ - if (pcls[ich] == BN) - { - /* must flatten levels unless at a level change; */ - plevel[ich] = level; - - /* lookahead for level changes */ - if (ich + 1 == cch && level != baselevel) - { - /* have to fixup last BN before end of the loop, since - * its fix-upped value will be needed below the assert */ - pcls[ich] = EmbeddingDirection(level); - } - else if (ich + 1 < cch && level != plevel[ich+1] && pcls[ich+1] != BN) - { - /* fixup LAST BN in front / after a level run to make - * it act like the SOR/EOR in rule X10 */ - int newlevel = plevel[ich+1]; - if (level > newlevel) { - newlevel = level; - } - plevel[ich] = newlevel; - - /* must match assigned level */ - pcls[ich] = EmbeddingDirection(newlevel); - level = plevel[ich+1]; - } + +static void resolveWeak(IsolatedRun * iso_run) +{ + int i; + + /* W1 */ + for (i=0; i < iso_run->length; i++) + { + if (*iso_run->ppcls[i] == NSM) + { + int j = iso_previousValidChar(iso_run, i); + if (j == -1) + *iso_run->ppcls[i] = iso_run->sos; + else if (*iso_run->ppcls[j] >= LRI) + *iso_run->ppcls[i] = ON; else - { - /* don't interrupt runs */ - if (cchRun) - { - cchRun++; - } - continue; - } - } - - ASSERT(pcls[ich] <= BN); - cls = pcls[ich]; - - action = actionWeak[state][cls]; - - /* resolve the directionality for deferred runs */ - clsRun = GetDeferredType(action); - if (clsRun != XX) - { - SetDeferredRun(pcls, cchRun, ich, clsRun); - cchRun = 0; - } - - /* resolve the directionality class at the current location */ - clsNew = GetResolvedType(action); - if (clsNew != XX) - pcls[ich] = clsNew; - - /* increment a deferred run */ - if (IX & action) - cchRun++; - - state = stateWeak[state][cls]; - } - - /* resolve any deferred runs - * use the direction of the current level to emulate PDF */ - cls = EmbeddingDirection(level); - - /* resolve the directionality for deferred runs */ - clsRun = GetDeferredType(actionWeak[state][cls]); - if (clsRun != XX) - SetDeferredRun(pcls, cchRun, ich, clsRun); -} - -/* RESOLVE NEUTRAL TYPES */ - -/* action values */ -enum neutralactions -{ - /* action to resolve previous input */ - nL = L, /* resolve EN to L */ - En = 3 << 4, /* resolve neutrals run to embedding level direction */ - Rn = R << 4, /* resolve neutrals run to strong right */ - Ln = L << 4, /* resolved neutrals run to strong left */ - In = (1<<8), /* increment count of deferred neutrals */ - LnL = (1<<4)+L, /* set run and EN to L */ -}; - -static int GetDeferredNeutrals(int action, int level) -{ - action = (action >> 4) & 0xF; - if (action == (En >> 4)) - return EmbeddingDirection(level); - else - return action; -} - -static int GetResolvedNeutrals(int action) -{ - action = action & 0xF; - if (action == In) - return 0; - else - return action; -} - -/* state values */ -enum resolvestates -{ - /* new temporary class */ - r, /* R and characters resolved to R */ - l, /* L and characters resolved to L */ - rn, /* N preceded by right */ - ln, /* N preceded by left */ - a, /* AN preceded by left (the abbreviation 'la' is used up above) */ - na, /* N preceded by a */ -} ; - - -/*------------------------------------------------------------------------ - Notes: - - By rule W7, whenever a EN is 'dominated' by an L (including start of - run with embedding direction = L) it is resolved to, and further treated - as L. - - This leads to the need for 'a' and 'na' states. -------------------------------------------------------------------------*/ - -static const int actionNeutrals[][5] = -{ -/* N, L, R, AN, EN = cls */ - { In, 0, 0, 0, 0 }, /* r right */ - { In, 0, 0, 0, L }, /* l left */ - - { In, En, Rn, Rn, Rn }, /* rn N preceded by right */ - { In, Ln, En, En, LnL}, /* ln N preceded by left */ - - { In, 0, 0, 0, L }, /* a AN preceded by left */ - { In, En, Rn, Rn, En }, /* na N preceded by a */ -} ; - -static const int stateNeutrals[][5] = -{ -/* N, L, R, AN, EN */ - { rn, l, r, r, r }, /* r right */ - { ln, l, r, a, l }, /* l left */ - - { rn, l, r, r, r }, /* rn N preceded by right */ - { ln, l, r, a, l }, /* ln N preceded by left */ - - { na, l, r, a, l }, /* a AN preceded by left */ - { na, l, r, a, l }, /* na N preceded by la */ -} ; + *iso_run->ppcls[i] = *iso_run->ppcls[j]; + } + } + + /* W2 */ + for (i = 0; i < iso_run->length; i++) + { + if (*iso_run->ppcls[i] == EN) + { + int j = iso_previousValidChar(iso_run, i); + while (j > -1) + { + if (*iso_run->ppcls[j] == R || *iso_run->ppcls[j] == L || *iso_run->ppcls[j] == AL) + { + if (*iso_run->ppcls[j] == AL) + *iso_run->ppcls[i] = AN; + break; + } + j = iso_previousValidChar(iso_run, j); + } + } + } + + /* W3 */ + for (i = 0; i < iso_run->length; i++) + { + if (*iso_run->ppcls[i] == AL) + *iso_run->ppcls[i] = R; + } + + /* W4 */ + for (i = 0; i < iso_run->length; i++) + { + if (*iso_run->ppcls[i] == ES) + { + int b = iso_previousValidChar(iso_run, i); + int f = iso_nextValidChar(iso_run, i); + + if (b > -1 && f > -1 && *iso_run->ppcls[b] == EN && *iso_run->ppcls[f] == EN) + *iso_run->ppcls[i] = EN; + } + else if (*iso_run->ppcls[i] == CS) + { + int b = iso_previousValidChar(iso_run, i); + int f = iso_nextValidChar(iso_run, i); + + if (b > -1 && f > -1 && *iso_run->ppcls[b] == EN && *iso_run->ppcls[f] == EN) + *iso_run->ppcls[i] = EN; + else if (b > -1 && f > -1 && *iso_run->ppcls[b] == AN && *iso_run->ppcls[f] == AN) + *iso_run->ppcls[i] = AN; + } + } + + /* W5 */ + for (i = 0; i < iso_run->length; i++) + { + if (*iso_run->ppcls[i] == ET) + { + int j; + for (j = i-1 ; j > -1; j--) + { + if (*iso_run->ppcls[j] == BN) continue; + if (*iso_run->ppcls[j] == ET) continue; + else if (*iso_run->ppcls[j] == EN) *iso_run->ppcls[i] = EN; + else break; + } + if (*iso_run->ppcls[i] == ET) + { + for (j = i+1; j < iso_run->length; j++) + { + if (*iso_run->ppcls[j] == BN) continue; + if (*iso_run->ppcls[j] == ET) continue; + else if (*iso_run->ppcls[j] == EN) *iso_run->ppcls[i] = EN; + else break; + } + } + } + } + + /* W6 */ + for (i = 0; i < iso_run->length; i++) + { + if (*iso_run->ppcls[i] == ET || *iso_run->ppcls[i] == ES || *iso_run->ppcls[i] == CS || *iso_run->ppcls[i] == ON) + { + int b = i-1; + int f = i+1; + if (b > -1 && *iso_run->ppcls[b] == BN) + *iso_run->ppcls[b] = ON; + if (f < iso_run->length && *iso_run->ppcls[f] == BN) + *iso_run->ppcls[f] = ON; + + *iso_run->ppcls[i] = ON; + } + } + + /* W7 */ + for (i = 0; i < iso_run->length; i++) + { + if (*iso_run->ppcls[i] == EN) + { + int j; + for (j = iso_previousValidChar(iso_run, i); j > -1; j = iso_previousValidChar(iso_run, j)) + if (*iso_run->ppcls[j] == R || *iso_run->ppcls[j] == L) + { + if (*iso_run->ppcls[j] == L) + *iso_run->ppcls[i] = L; + break; + } + if (iso_run->sos == L && j == -1) + *iso_run->ppcls[i] = L; + } + } +} /*------------------------------------------------------------------------ Function: resolveNeutrals Resolves the directionality of neutral character types. - Implements rules W7, N1 and N2 of the Unicode Bidi Algorithm. + Implements rules N1 and N2 of the Unicode Bidi Algorithm. Input: Array of embedding levels Character count @@ -620,69 +658,94 @@ In/Out: Array of directional classes Note: On input only these directional classes are expected - R, L, N, AN, EN and BN + R, L, NI, AN, EN and BN W8 resolves a number of ENs to L ------------------------------------------------------------------------*/ -static void resolveNeutrals(int baselevel, WORD *pcls, const WORD *plevel, int cch) -{ - /* the state at the start of text depends on the base level */ - int state = odd(baselevel) ? r : l; - int cls; - - int cchRun = 0; - int level = baselevel; - - int action, clsRun, clsNew; - int ich = 0; - for (; ich < cch; ich++) - { - /* ignore boundary neutrals */ - if (pcls[ich] == BN) - { - /* include in the count for a deferred run */ - if (cchRun) - cchRun++; - - /* skip any further processing */ - continue; - } - - ASSERT(pcls[ich] < 5); /* "Only N, L, R, AN, EN are allowed" */ - cls = pcls[ich]; - - action = actionNeutrals[state][cls]; - - /* resolve the directionality for deferred runs */ - clsRun = GetDeferredNeutrals(action, level); - if (clsRun != N) - { - SetDeferredRun(pcls, cchRun, ich, clsRun); - cchRun = 0; - } - - /* resolve the directionality class at the current location */ - clsNew = GetResolvedNeutrals(action); - if (clsNew != N) - pcls[ich] = clsNew; - - if (In & action) - cchRun++; - - state = stateNeutrals[state][cls]; - level = plevel[ich]; - } - - /* resolve any deferred runs */ - cls = EmbeddingDirection(level); /* eor has type of current level */ - - /* resolve the directionality for deferred runs */ - clsRun = GetDeferredNeutrals(actionNeutrals[state][cls], level); - if (clsRun != N) - SetDeferredRun(pcls, cchRun, ich, clsRun); -} - -/* RESOLVE IMPLICIT */ +static void resolveNeutrals(IsolatedRun *iso_run) +{ + int i; + + /* Translate isolates into NI */ + for (i = 0; i < iso_run->length; i++) + { + if (*iso_run->ppcls[i] >= LRI) + *iso_run->ppcls[i] = NI; + + switch(*iso_run->ppcls[i]) + { + case B: + case S: + case WS: *iso_run->ppcls[i] = NI; + } + + ASSERT(*iso_run->ppcls[i] < 5 || *iso_run->ppcls[i] == BN); /* "Only NI, L, R, AN, EN and BN are allowed" */ + } + + /* N0: Skipping bracketed pairs for now */ + + /* N1 */ + for (i = 0; i < iso_run->length; i++) + { + WORD l,r; + + if (*iso_run->ppcls[i] == NI) + { + int j; + int b = iso_previousValidChar(iso_run, i); + + if (b == -1) + { + l = iso_run->sos; + b = 0; + } + else + { + if (*iso_run->ppcls[b] == R || *iso_run->ppcls[b] == AN || *iso_run->ppcls[b] == EN) + l = R; + else if (*iso_run->ppcls[b] == L) + l = L; + else /* No string type */ + continue; + } + j = iso_nextValidChar(iso_run, i); + while (j > -1 && *iso_run->ppcls[j] == NI) j = iso_nextValidChar(iso_run, j); + + if (j == -1) + { + r = iso_run->eos; + j = iso_run->length; + } + else if (*iso_run->ppcls[j] == R || *iso_run->ppcls[j] == AN || *iso_run->ppcls[j] == EN) + r = R; + else if (*iso_run->ppcls[j] == L) + r = L; + else /* No string type */ + continue; + + if (r == l) + { + for (b = i; b < j && b < iso_run->length; b++) + *iso_run->ppcls[b] = r; + } + } + } + + /* N2 */ + for (i = 0; i < iso_run->length; i++) + { + if (*iso_run->ppcls[i] == NI) + { + int b = i-1; + int f = i+1; + *iso_run->ppcls[i] = EmbeddingDirection(iso_run->e); + if (b > -1 && *iso_run->ppcls[b] == BN) + *iso_run->ppcls[b] = EmbeddingDirection(iso_run->e); + if (f < iso_run->length && *iso_run->ppcls[f] == BN) + *iso_run->ppcls[f] = EmbeddingDirection(iso_run->e); + } + } +} /*------------------------------------------------------------------------ Function: resolveImplicit @@ -700,29 +763,178 @@ Accepted subset of direction classes R, L, AN, EN ------------------------------------------------------------------------*/ -static const WORD addLevel[][4] = -{ - /* L, R, AN, EN */ -/* even */ { 0, 1, 2, 2, }, -/* odd */ { 1, 0, 1, 1, } - -}; - -static void resolveImplicit(const WORD * pcls, WORD *plevel, int cch) -{ - int ich = 0; - for (; ich < cch; ich++) - { - /* cannot resolve bn here, since some bn were resolved to strong - * types in resolveWeak. To remove these we need the original - * types, which are available again in resolveWhiteSpace */ - if (pcls[ich] == BN) - { +static void resolveImplicit(const WORD * pcls, WORD *plevel, int sos, int eos) +{ + int i; + + /* I1/2 */ + for (i = sos; i <= eos; i++) + { + if (pcls[i] == BN) continue; - } - ASSERT(pcls[ich] > 0); /* "No Neutrals allowed to survive here." */ - ASSERT(pcls[ich] < 5); /* "Out of range." */ - plevel[ich] += addLevel[odd(plevel[ich])][pcls[ich] - 1]; + + ASSERT(pcls[i] > 0); /* "No Neutrals allowed to survive here." */ + ASSERT(pcls[i] < 5); /* "Out of range." */ + + if (odd(plevel[i]) && (pcls[i] == L || pcls[i] == EN || pcls [i] == AN)) + plevel[i]++; + else if (!odd(plevel[i]) && pcls[i] == R) + plevel[i]++; + else if (!odd(plevel[i]) && (pcls[i] == EN || pcls [i] == AN)) + plevel[i]+=2; + } +} + +static void resolveResolved(unsigned baselevel, const WORD * pcls, WORD *plevel, int sos, int eos) +{ + int i; + + /* L1 */ + for (i = sos; i <= eos; i++) + { + if (pcls[i] == B || pcls[i] == S) + { + int j = i -1; + while (i > sos && j >= sos && + (pcls[j] == WS || pcls[j] == FSI || pcls[j] == LRI || pcls[j] == RLI || + pcls[j] == PDI || pcls[j] == LRE || pcls[j] == RLE || pcls[j] == LRO || + pcls[j] == RLO || pcls[j] == PDF || pcls[j] == BN)) + plevel[j--] = baselevel; + plevel[i] = baselevel; + } + if (i == eos && + (pcls[i] == WS || pcls[i] == FSI || pcls[i] == LRI || pcls[i] == RLI || + pcls[i] == PDI || pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || + pcls[i] == RLO || pcls[i] == PDF || pcls[i] == BN )) + { + int j = i; + while (j >= sos && (pcls[j] == WS || pcls[j] == FSI || pcls[j] == LRI || pcls[j] == RLI || + pcls[j] == PDI || pcls[j] == LRE || pcls[j] == RLE || pcls[j] == LRO || + pcls[j] == RLO || pcls[j] == PDF || pcls[j] == BN)) + plevel[j--] = baselevel; + } + } +} + +static void computeIsolatingRunsSet(unsigned baselevel, WORD *pcls, WORD *pLevel, int uCount, struct list *set) +{ + int run_start, run_end, i; + Run runs[uCount]; + int run_count = 0; + IsolatedRun *current_isolated; + + list_init(set); + + /* Build Runs */ + run_start = 0; + while (run_start < uCount) + { + run_end = nextValidChar(pcls, run_start, uCount); + while (run_end < uCount && pLevel[run_end] == pLevel[run_start]) run_end = nextValidChar(pcls, run_end, uCount); + run_end --; + runs[run_count].start = run_start; + runs[run_count].end = run_end; + runs[run_count].e = pLevel[run_start]; + run_start = nextValidChar(pcls, run_end, uCount); + run_count++; + } + + /* Build Isolating Runs */ + i = 0; + while (i < run_count) + { + int k = i; + if (runs[k].start >= 0) + { + int type_fence, real_end; + int j; + current_isolated = HeapAlloc(GetProcessHeap(), 0, sizeof(IsolatedRun) + sizeof(WORD*)*uCount); + + run_start = runs[k].start; + current_isolated->e = runs[k].e; + current_isolated->length = (runs[k].end - runs[k].start)+1; + + for (j = 0; j < current_isolated->length; j++) + current_isolated->ppcls[j] = &pcls[runs[k].start+j]; + + run_end = runs[k].end; + + TRACE("{ [%i -- %i]",run_start, run_end); + + if (pcls[run_end] == BN) + run_end = previousValidChar(pcls, run_end, runs[k].start); + + while (run_end < uCount && (pcls[run_end] == RLI || pcls[run_end] == LRI || pcls[run_end] == FSI)) + { + j = k+1; +search: + while (j < run_count && pcls[runs[j].start] != PDI) j++; + if (j < run_count && runs[i].e != runs[j].e) + { + j++; + goto search; + } + + if (j != run_count) + { + int m; + int l = current_isolated->length; + + current_isolated->length += (runs[j].end - runs[j].start)+1; + for (m = 0; l < current_isolated->length; l++, m++) + current_isolated->ppcls[l] = &pcls[runs[j].start+m]; + + TRACE("[%i -- %i]",runs[j].start, runs[j].end); + + run_end = runs[j].end; + if (pcls[run_end] == BN) + run_end = previousValidChar(pcls, run_end, runs[i].start); + runs[j].start = -1; + k = j; + } + else + { + run_end = uCount; + break; + } + } + + type_fence = previousValidChar(pcls, run_start, -1); + + if (type_fence == -1) + current_isolated->sos = (baselevel > pLevel[run_start])?baselevel:pLevel[run_start]; + else + current_isolated->sos = (pLevel[type_fence] > pLevel[run_start])?pLevel[type_fence]:pLevel[run_start]; + + current_isolated->sos = EmbeddingDirection(current_isolated->sos); + + if (run_end == uCount) + current_isolated->eos = current_isolated->sos; + else + { + /* eos could be an BN */ + if ( pcls[run_end] == BN ) + { + real_end = previousValidChar(pcls, run_end, run_start-1); + if (real_end < run_start) + real_end = run_start; + } + else + real_end = run_end; + + type_fence = nextValidChar(pcls, run_end, uCount); + if (type_fence == uCount) + current_isolated->eos = (baselevel > pLevel[real_end])?baselevel:pLevel[real_end]; + else + current_isolated->eos = (pLevel[type_fence] > pLevel[real_end])?pLevel[type_fence]:pLevel[real_end]; + + current_isolated->eos = EmbeddingDirection(current_isolated->eos); + } + + list_add_tail(set, &current_isolated->entry); + TRACE(" } level %i {%s <--> %s}\n",current_isolated->e, debug_type[current_isolated->sos], debug_type[current_isolated->eos]); + } + i++; } } @@ -739,7 +951,9 @@ { WORD *chartype; unsigned baselevel = 0; - INT j; + struct list IsolatingRuns; + IsolatedRun *iso_run, *next; + TRACE("%s, %d\n", debugstr_wn(lpString, uCount), uCount); chartype = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WORD)); @@ -752,28 +966,38 @@ baselevel = s->uBidiLevel; classify(lpString, chartype, uCount, c); - - for (j = 0; j < uCount; ++j) - switch(chartype[j]) - { - case B: - case S: - case WS: - case ON: chartype[j] = N; - default: continue; - } + if (TRACE_ON(bidi)) dump_types("Start ", chartype, 0, uCount); /* resolve explicit */ - resolveExplicit(baselevel, N, chartype, lpOutLevels, uCount, 0); - - /* resolve weak */ - resolveWeak(baselevel, chartype, lpOutLevels, uCount); - - /* resolve neutrals */ - resolveNeutrals(baselevel, chartype, lpOutLevels, uCount); - + resolveExplicit(baselevel, chartype, lpOutLevels, uCount); + if (TRACE_ON(bidi)) dump_types("After Explicit", chartype, 0, uCount); + + /* X10/BD13: Computer Isolating runs */ + computeIsolatingRunsSet(baselevel, chartype, lpOutLevels, uCount, &IsolatingRuns); + + LIST_FOR_EACH_ENTRY_SAFE(iso_run, next, &IsolatingRuns, IsolatedRun, entry) + { + if (TRACE_ON(bidi)) iso_dump_types("Run", iso_run); + + /* resolve weak */ + resolveWeak(iso_run); + if (TRACE_ON(bidi)) iso_dump_types("After Weak", iso_run); + + /* resolve neutrals */ + resolveNeutrals(iso_run); + if (TRACE_ON(bidi)) iso_dump_types("After Neutrals", iso_run); + + list_remove(&iso_run->entry); + HeapFree(GetProcessHeap(),0,iso_run); + } + + if (TRACE_ON(bidi)) dump_types("Before Implicit", chartype, 0, uCount); /* resolveImplicit */ - resolveImplicit(chartype, lpOutLevels, uCount); + resolveImplicit(chartype, lpOutLevels, 0, uCount-1); + + /* resolveResolvedLevels*/ + classify(lpString, chartype, uCount, c); + resolveResolved(baselevel, chartype, lpOutLevels, 0, uCount-1); HeapFree(GetProcessHeap(), 0, chartype); return TRUE; Modified: trunk/reactos/dll/win32/usp10/indicsyllable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indicsylla… ============================================================================== --- trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] Thu Mar 20 02:07:55 2014 @@ -1,6 +1,6 @@ /* Unicode Indic Syllabic Category */ -/* generated from http://www.unicode.org/Public/6.2.0/ucd/IndicSyllabicCategory.txt */ -/* and from http://www.unicode.org/Public/6.2.0/ucd/IndicMatraCategory.txt */ +/* generated from http://www.unicode.org/Public/6.3.0/ucd/IndicSyllabicCategory.txt */ +/* and from http://www.unicode.org/Public/6.3.0/ucd/IndicMatraCategory.txt */ /* DO NOT EDIT!! */ //#include "wine/unicode.h" Modified: trunk/reactos/dll/win32/usp10/linebreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/linebreak.… ============================================================================== --- trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] Thu Mar 20 02:07:55 2014 @@ -1,10 +1,10 @@ /* Unicode Line Break Properties */ -/* generated from http://www.unicode.org/Public/6.2.0/ucd/LineBreak.txt */ +/* generated from http://www.unicode.org/Public/6.3.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ //#include "wine/unicode.h" -const unsigned short wine_linebreak_table[7056] = +const unsigned short wine_linebreak_table[7072] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, @@ -101,87 +101,87 @@ 0x05b0, 0x10d0, 0x05b0, 0x05b0, 0x10d0, 0x10e0, 0x05b0, 0x10f0, 0x05b0, 0x05b0, 0x05b0, 0x1100, 0x1100, 0x1110, 0x05b0, 0x1120, 0x1130, 0x1140, 0x1150, 0x1160, 0x1170, 0x1180, 0x1190, 0x11a0, - 0x11b0, 0x0ce0, 0x11c0, 0x11d0, 0x0870, 0x0580, 0x0580, 0x11e0, - 0x11f0, 0x1200, 0x1210, 0x05b0, 0x05b0, 0x1220, 0x1230, 0x1240, - 0x1250, 0x1240, 0x05b0, 0x05b0, 0x05b0, 0x1260, 0x05b0, 0x05b0, - 0x1270, 0x1280, 0x1290, 0x12a0, 0x12b0, 0x12c0, 0x12d0, 0x05b0, - 0x12e0, 0x12f0, 0x1300, 0x1310, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x1320, 0x1330, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1340, - 0x05b0, 0x05b0, 0x1350, 0x0870, 0x1360, 0x0870, 0x1370, 0x1370, - 0x1370, 0x1370, 0x1370, 0x1370, 0x1370, 0x1370, 0x1370, 0x1380, - 0x1370, 0x1370, 0x1370, 0x1370, 0x1230, 0x1370, 0x1370, 0x1390, - 0x1370, 0x13a0, 0x13b0, 0x13c0, 0x13d0, 0x13e0, 0x13f0, 0x05b0, - 0x1400, 0x1410, 0x05b0, 0x1420, 0x1430, 0x05b0, 0x1440, 0x1450, - 0x05b0, 0x1460, 0x05b0, 0x1470, 0x1480, 0x1490, 0x14a0, 0x14b0, - 0x14c0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x14d0, 0x14e0, 0x14f0, - 0x1370, 0x1500, 0x05b0, 0x05b0, 0x1510, 0x05b0, 0x1520, 0x05b0, + 0x11b0, 0x0ce0, 0x11c0, 0x11d0, 0x11e0, 0x0580, 0x0580, 0x11f0, + 0x1200, 0x1210, 0x1220, 0x05b0, 0x05b0, 0x1230, 0x1240, 0x1250, + 0x1260, 0x1250, 0x05b0, 0x05b0, 0x05b0, 0x1270, 0x05b0, 0x05b0, + 0x1280, 0x1290, 0x12a0, 0x12b0, 0x12c0, 0x12d0, 0x12e0, 0x05b0, + 0x12f0, 0x1300, 0x1310, 0x1320, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x1330, 0x1340, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1350, + 0x05b0, 0x05b0, 0x1360, 0x0870, 0x1370, 0x0870, 0x1380, 0x1380, + 0x1380, 0x1380, 0x1380, 0x1380, 0x1380, 0x1380, 0x1380, 0x1390, + 0x1380, 0x1380, 0x1380, 0x1380, 0x1240, 0x1380, 0x1380, 0x13a0, + 0x1380, 0x13b0, 0x13c0, 0x13d0, 0x13e0, 0x13f0, 0x1400, 0x05b0, + 0x1410, 0x1420, 0x05b0, 0x1430, 0x1440, 0x05b0, 0x1450, 0x1460, + 0x05b0, 0x1470, 0x05b0, 0x1480, 0x1490, 0x14a0, 0x14b0, 0x14c0, + 0x14d0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x14e0, 0x14f0, 0x1500, + 0x1380, 0x1510, 0x05b0, 0x05b0, 0x1520, 0x05b0, 0x1530, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x1530, 0x1540, 0x05b0, 0x05b0, 0x05b0, 0x1550, 0x05b0, 0x1560, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0ce0, 0x1570, 0x0870, 0x0870, + 0x1540, 0x1550, 0x05b0, 0x05b0, 0x05b0, 0x1560, 0x05b0, 0x1570, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0ce0, 0x1580, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x05b0, 0x05b0, 0x0850, 0x05b0, 0x05b0, 0x0850, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1580, 0x1590, - 0x05b0, 0x05b0, 0x0d70, 0x05b0, 0x05b0, 0x05b0, 0x15a0, 0x15b0, - 0x05b0, 0x1350, 0x15c0, 0x15c0, 0x15c0, 0x15c0, 0x0580, 0x0580, - 0x15d0, 0x15e0, 0x15f0, 0x1600, 0x0870, 0x0870, 0x0870, 0x0870, - 0x1610, 0x1620, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1340, - 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, - 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1630, 0x0870, 0x1640, - 0x1650, 0x1660, 0x1670, 0x1680, 0x1690, 0x1610, 0x16a0, 0x1610, - 0x16b0, 0x16c0, 0x16d0, 0x1610, 0x16a0, 0x1610, 0x16b0, 0x16e0, - 0x16f0, 0x1610, 0x1700, 0x1710, 0x1610, 0x1610, 0x1610, 0x1610, - 0x1720, 0x1610, 0x1610, 0x1730, 0x1610, 0x1610, 0x1340, 0x1740, - 0x1610, 0x1720, 0x1610, 0x1610, 0x1750, 0x1610, 0x1610, 0x1610, - 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1720, - 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, - 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, - 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, - 0x1610, 0x1610, 0x1610, 0x1610, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x1610, 0x1760, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, - 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, - 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, 0x1610, - 0x1770, 0x1610, 0x1610, 0x1610, 0x1780, 0x05b0, 0x05b0, 0x1070, - 0x1790, 0x05b0, 0x17a0, 0x0870, 0x05b0, 0x05b0, 0x1580, 0x17b0, - 0x05b0, 0x17c0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x17d0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1590, 0x15a0, + 0x05b0, 0x05b0, 0x0d70, 0x05b0, 0x05b0, 0x05b0, 0x15b0, 0x15c0, + 0x05b0, 0x1360, 0x15d0, 0x15d0, 0x15d0, 0x15d0, 0x0580, 0x0580, + 0x15e0, 0x15f0, 0x1600, 0x1610, 0x0870, 0x0870, 0x0870, 0x0870, + 0x1620, 0x1630, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1350, + 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, + 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1640, 0x0870, 0x1650, + 0x1660, 0x1670, 0x1680, 0x1690, 0x16a0, 0x1620, 0x16b0, 0x1620, + 0x16c0, 0x16d0, 0x16e0, 0x1620, 0x16b0, 0x1620, 0x16c0, 0x16f0, + 0x1700, 0x1620, 0x1710, 0x1720, 0x1620, 0x1620, 0x1620, 0x1620, + 0x1730, 0x1620, 0x1620, 0x1740, 0x1620, 0x1620, 0x1350, 0x1750, + 0x1620, 0x1730, 0x1620, 0x1620, 0x1760, 0x1620, 0x1620, 0x1620, + 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1730, + 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, + 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, + 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, + 0x1620, 0x1620, 0x1620, 0x1620, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x1620, 0x1770, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, + 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, + 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, 0x1620, + 0x1780, 0x1620, 0x1620, 0x1620, 0x1790, 0x05b0, 0x05b0, 0x1070, + 0x17a0, 0x05b0, 0x17b0, 0x0870, 0x05b0, 0x05b0, 0x1590, 0x17c0, + 0x05b0, 0x17d0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x17e0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x0850, 0x17e0, 0x1360, 0x0870, 0x0870, 0x0870, 0x0870, 0x0b10, - 0x17f0, 0x05b0, 0x1800, 0x1810, 0x05b0, 0x05b0, 0x05b0, 0x1820, - 0x1830, 0x05b0, 0x05b0, 0x0fd0, 0x1840, 0x0ee0, 0x0580, 0x1850, - 0x07c0, 0x05b0, 0x1860, 0x05b0, 0x1870, 0x1880, 0x0d80, 0x1890, - 0x08b0, 0x05b0, 0x05b0, 0x18a0, 0x18b0, 0x18c0, 0x0870, 0x0870, - 0x05b0, 0x05b0, 0x18d0, 0x10b0, 0x18e0, 0x18f0, 0x0c10, 0x0f60, - 0x0c10, 0x0c10, 0x0c10, 0x0c10, 0x1900, 0x1910, 0x0770, 0x1920, - 0x1930, 0x1940, 0x15c0, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, - 0x0870, 0x0870, 0x0870, 0x0870, 0x05b0, 0x05b0, 0x1950, 0x0ee0, - 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, - 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, - 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, - 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, - 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, - 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, - 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, - 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, - 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, - 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, - 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, - 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, - 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, - 0x1980, 0x1960, 0x1970, 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, - 0x1980, 0x1990, 0x1980, 0x19a0, 0x1980, 0x1960, 0x1970, 0x1980, - 0x1990, 0x1980, 0x19b0, 0x0d90, 0x19c0, 0x0db0, 0x0db0, 0x19d0, - 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, - 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, + 0x0850, 0x17f0, 0x1370, 0x0870, 0x0870, 0x0870, 0x0870, 0x0b10, + 0x1800, 0x05b0, 0x1810, 0x1820, 0x05b0, 0x05b0, 0x05b0, 0x1830, + 0x1840, 0x05b0, 0x05b0, 0x0fd0, 0x1850, 0x0ee0, 0x0580, 0x1860, + 0x07c0, 0x05b0, 0x1870, 0x05b0, 0x1880, 0x1890, 0x0d80, 0x18a0, + 0x08b0, 0x05b0, 0x05b0, 0x18b0, 0x18c0, 0x18d0, 0x0870, 0x0870, + 0x05b0, 0x05b0, 0x18e0, 0x10b0, 0x18f0, 0x1900, 0x0c10, 0x0f60, + 0x0c10, 0x0c10, 0x0c10, 0x0c10, 0x1910, 0x1920, 0x0770, 0x1930, + 0x1940, 0x1950, 0x15d0, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, + 0x0870, 0x0870, 0x0870, 0x0870, 0x05b0, 0x05b0, 0x1960, 0x0ee0, + 0x1970, 0x1980, 0x1990, 0x19a0, 0x1990, 0x19b0, 0x1990, 0x1970, + 0x1980, 0x1990, 0x19a0, 0x1990, 0x19b0, 0x1990, 0x1970, 0x1980, + 0x1990, 0x19a0, 0x1990, 0x19b0, 0x1990, 0x1970, 0x1980, 0x1990, + 0x19a0, 0x1990, 0x19b0, 0x1990, 0x1970, 0x1980, 0x1990, 0x19a0, + 0x1990, 0x19b0, 0x1990, 0x1970, 0x1980, 0x1990, 0x19a0, 0x1990, + 0x19b0, 0x1990, 0x1970, 0x1980, 0x1990, 0x19a0, 0x1990, 0x19b0, + 0x1990, 0x1970, 0x1980, 0x1990, 0x19a0, 0x1990, 0x19b0, 0x1990, + 0x1970, 0x1980, 0x1990, 0x19a0, 0x1990, 0x19b0, 0x1990, 0x1970, + 0x1980, 0x1990, 0x19a0, 0x1990, 0x19b0, 0x1990, 0x1970, 0x1980, + 0x1990, 0x19a0, 0x1990, 0x19b0, 0x1990, 0x1970, 0x1980, 0x1990, + 0x19a0, 0x1990, 0x19b0, 0x1990, 0x1970, 0x1980, 0x1990, 0x19a0, + 0x1990, 0x19b0, 0x1990, 0x1970, 0x1980, 0x1990, 0x19a0, 0x1990, + 0x19b0, 0x1990, 0x1970, 0x1980, 0x1990, 0x19a0, 0x1990, 0x19b0, + 0x1990, 0x1970, 0x1980, 0x1990, 0x19a0, 0x1990, 0x19b0, 0x1990, + 0x1990, 0x19a0, 0x1990, 0x19b0, 0x1990, 0x1970, 0x1980, 0x1990, + 0x19a0, 0x1990, 0x19c0, 0x0d90, 0x19d0, 0x0db0, 0x0db0, 0x19e0, + 0x19f0, 0x19f0, 0x19f0, 0x19f0, 0x19f0, 0x19f0, 0x19f0, 0x19f0, + 0x19f0, 0x19f0, 0x19f0, 0x19f0, 0x19f0, 0x19f0, 0x19f0, 0x19f0, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, - 0x1350, 0x19f0, 0x1a00, 0x1a10, 0x1a20, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1a30, 0x1a40, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x1a50, 0x0870, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x1a60, 0x05b0, 0x05b0, 0x06b0, 0x0870, 0x0870, 0x1a70, - 0x0580, 0x1a80, 0x10b0, 0x1a90, 0x1aa0, 0x1ab0, 0x1ac0, 0x1100, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1ad0, - 0x1ae0, 0x1af0, 0x1610, 0x1b00, 0x1610, 0x1b10, 0x1b20, 0x1b30, - 0x05b0, 0x1b40, 0x05b0, 0x0850, 0x1b50, 0x1b60, 0x1b70, 0x1b80, + 0x1360, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1a40, 0x1a50, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x1a60, 0x0870, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x1a70, 0x05b0, 0x05b0, 0x06b0, 0x0870, 0x0870, 0x1a80, + 0x0580, 0x1a90, 0x10b0, 0x1aa0, 0x1ab0, 0x1ac0, 0x1ad0, 0x1100, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1ae0, + 0x1af0, 0x1b00, 0x1620, 0x1b10, 0x1620, 0x1b20, 0x1b30, 0x1b40, + 0x05b0, 0x1b50, 0x05b0, 0x0850, 0x1b60, 0x1b70, 0x1b80, 0x1b90, /* values */ 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0003, 0x0001, 0x0001, 0x0002, 0x0004, 0x0004, @@ -246,7 +246,7 @@ 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001b, 0x001b, 0x001b, 0x0019, 0x0019, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0017, 0x0011, 0x0011, 0x0017, 0x0017, + 0x0004, 0x0004, 0x0004, 0x0017, 0x0004, 0x0011, 0x0017, 0x0017, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, @@ -571,8 +571,8 @@ 0x0016, 0x0016, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x001d, 0x0022, 0x0022, 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x0022, - 0x000b, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x000b, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, 0x0011, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x0024, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, @@ -580,7 +580,9 @@ 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001b, 0x001a, - 0x001a, 0x001a, 0x001a, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, + 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, + 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, 0x0024, 0x001d, 0x001d, @@ -723,13 +725,13 @@ 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, - 0x001e, 0x0013, 0x0013, 0x001e, 0x001e, 0x0016, 0x001e, 0x001e, + 0x0022, 0x0013, 0x0013, 0x001e, 0x001e, 0x0016, 0x001e, 0x001e, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x001e, 0x001e, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0016, 0x0012, 0x0013, 0x0013, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0004, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0016, 0x0016, 0x001e, 0x001e, 0x001e, 0x0011, 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, Modified: trunk/reactos/dll/win32/usp10/shaping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shaping.c?… ============================================================================== --- trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] Thu Mar 20 02:07:55 2014 @@ -1,10 +1,10 @@ /* Unicode Arabic shaping */ -/* generated from http://www.unicode.org/Public/6.2.0/ucd/ArabicShaping.txt */ +/* generated from http://www.unicode.org/Public/6.3.0/ucd/ArabicShaping.txt */ /* DO NOT EDIT!! */ //#include "wine/unicode.h" -const unsigned short wine_shaping_table[2752] = +const unsigned short wine_shaping_table[2800] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, @@ -76,42 +76,42 @@ 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0820, 0x0340, 0x0820, 0x0340, 0x0610, 0x0340, 0x0610, 0x0340, 0x0340, 0x0340, 0x0830, 0x0840, 0x0850, 0x0340, 0x0340, - 0x0860, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0870, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0880, 0x0890, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x08a0, 0x0340, 0x0340, 0x0340, 0x08b0, 0x08c0, 0x08d0, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x08e0, 0x0340, 0x0340, 0x08f0, 0x06b0, 0x0340, 0x0900, 0x08e0, - 0x0910, 0x0340, 0x0920, 0x0340, 0x0340, 0x0340, 0x0930, 0x0910, - 0x0340, 0x0340, 0x0940, 0x0950, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0960, 0x0970, 0x0980, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0360, 0x0990, 0x0940, - 0x09a0, 0x0340, 0x09b0, 0x0340, 0x0340, 0x0340, 0x09c0, 0x0340, + 0x0860, 0x0340, 0x0530, 0x0530, 0x0530, 0x0530, 0x0530, 0x0870, + 0x0880, 0x0530, 0x0890, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x08a0, 0x08b0, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x08c0, 0x0340, 0x0340, 0x0340, 0x08d0, 0x08e0, 0x08f0, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0900, 0x0340, 0x0340, 0x0910, 0x06b0, 0x0340, 0x0920, 0x0900, + 0x0930, 0x0340, 0x0940, 0x0340, 0x0340, 0x0340, 0x0950, 0x0930, + 0x0340, 0x0340, 0x0960, 0x0970, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0980, 0x0990, 0x09a0, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0360, 0x09b0, 0x0960, + 0x09c0, 0x0340, 0x09d0, 0x0340, 0x0340, 0x0340, 0x09e0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0360, 0x0510, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0910, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0930, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0360, - 0x0340, 0x0340, 0x09d0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x09e0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x09f0, - 0x0340, 0x0490, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0910, - 0x0a00, 0x0340, 0x06f0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0980, 0x0340, 0x0360, 0x0910, - 0x0340, 0x0340, 0x0a10, 0x0340, 0x0a20, 0x0910, 0x0340, 0x0340, - 0x05d0, 0x0340, 0x0340, 0x0a30, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0a40, 0x0a50, 0x0a60, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0a70, 0x0620, 0x0340, 0x0a80, 0x06a0, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0a90, 0x0340, - 0x0340, 0x0aa0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0360, 0x0340, 0x0990, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x09f0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0a00, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0a10, + 0x0340, 0x0490, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0930, + 0x0a20, 0x0340, 0x06f0, 0x0340, 0x0530, 0x0530, 0x0530, 0x0a30, + 0x0340, 0x0340, 0x0340, 0x0340, 0x09a0, 0x0340, 0x0360, 0x0930, + 0x0340, 0x0340, 0x0a40, 0x0340, 0x0a50, 0x0930, 0x0340, 0x0340, + 0x05d0, 0x0340, 0x0340, 0x0a60, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0a70, 0x0a80, 0x0a90, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0aa0, 0x0620, 0x0340, 0x0ab0, 0x06a0, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0ac0, 0x0340, + 0x0340, 0x0ad0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0360, 0x0340, 0x09b0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0ab0, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0ae0, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -128,7 +128,7 @@ 0x0000, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0104, 0x0000, 0x0202, 0x0202, 0x0302, 0x0202, 0x0104, 0x0202, 0x0404, 0x0502, 0x0404, 0x0404, 0x0604, 0x0604, 0x0604, 0x0702, 0x0702, 0x0802, 0x0802, 0x0904, 0x0904, 0x0a04, 0x0a04, 0x0b04, @@ -277,16 +277,20 @@ 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0004, + 0x0000, 0x0000, 0x0005, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0001, 0x0004, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, @@ -331,6 +335,8 @@ 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0004, 0x0004, 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Thu Mar 20 02:07:55 2014 @@ -1381,7 +1381,7 @@ else { BOOL inNumber = FALSE; - static WCHAR math_punc[] = {'#','$','%','+',',','-','.','/',':',0x2212, 0x2044, 0x00a0,0}; + static const WCHAR math_punc[] = {'#','$','%','+',',','-','.','/',':',0x2212, 0x2044, 0x00a0,0}; strength = heap_alloc_zero(cInChars * sizeof(WORD)); if (!strength) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Mar 20 02:07:55 2014 @@ -195,7 +195,7 @@ reactos/dll/win32/updspapi # Synced to Wine-1.7.1 reactos/dll/win32/url # Synced to Wine-1.7.1 reactos/dll/win32/urlmon # Synced to Wine-1.7.1 -reactos/dll/win32/usp10 # Synced to Wine-1.7.1 +reactos/dll/win32/usp10 # Synced to Wine-1.7.14 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to Wine-1.7.1 reactos/dll/win32/version # Synced to Wine-1.7.1

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs