Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[zguo] 65623: [EVENTVWR] Display seconds for event time in event viewer. Patch by Lee Schroeder. CORE-8612

by zguo＠svn.reactos.org

Author: zguo Date: Sat Dec 13 05:07:58 2014 New Revision: 65623 URL: http://svn.reactos.org/svn/reactos?rev=65623&view=rev Log: [EVENTVWR] Display seconds for event time in event viewer. Patch by Lee Schroeder. CORE-8612 Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sat Dec 13 05:07:58 2014 @@ -646,7 +646,7 @@ GetEventUserName(pevlr, szUsername); GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, MAX_PATH); - GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, szLocalTime, MAX_PATH); + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &time, NULL, szLocalTime, MAX_PATH); GetEventType(pevlr->EventType, szEventTypeText); GetEventCategory(lpLogName, lpSourceName, pevlr, szCategory);

9 years, 9 months

[jimtabor] 65622: [User32] - Patch by Vincent Povirk : Allow EndMenu() calls from WM_ENTERMENULOOP. - Patch by Akihiro Sagawa : Don't close a popup menu when clicking a sub-menu parent item twice. ...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Dec 13 01:18:35 2014 New Revision: 65622 URL: http://svn.reactos.org/svn/reactos?rev=65622&view=rev Log: [User32] - Patch by Vincent Povirk : Allow EndMenu() calls from WM_ENTERMENULOOP. - Patch by Akihiro Sagawa : Don't close a popup menu when clicking a sub-menu parent item twice. - Move code to match wines. See CORE-8299. Modified: trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Sat Dec 13 01:18:35 2014 @@ -668,10 +668,10 @@ MenuLoadBitmaps(VOID) { /* Load system buttons bitmaps */ - if (NULL == BmpSysMenu) - { + if (BmpSysMenu == NULL) + { BmpSysMenu = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_CLOSE)); - } + } } /////////// Make gpsi OBMI via callback ////////////// /*********************************************************************** @@ -1261,7 +1261,7 @@ //ERR("MGMaxPH cyMax %d\n",lppop->cyMax); return lppop->cyMax; } - //ERR("MGMaxPH SyMax %d\n",GetSystemMetrics(SM_CYSCREEN) - GetSystemMetrics(SM_CYBORDER)); + //ERR("MGMaxPH SyMax %d\n",GetSystemMetrics(SM_CYSCREEN) - GetSystemMetrics(SM_CYBORDER)); return GetSystemMetrics(SM_CYSCREEN) - GetSystemMetrics(SM_CYBORDER); } @@ -2191,12 +2191,14 @@ lppop->iTop = item->Rect.bottom - nMaxHeight; ScrollWindow(lppop->Wnd, 0, nOldPos - lppop->iTop, &rc, &rc); MENU_DrawScrollArrows(lppop, hdc); + //ERR("Scroll Down iTop %d iMaxTop %d nMaxHeight %d\n",lppop->iTop,lppop->iMaxTop,nMaxHeight); } else if (item->Rect.top - MENU_TOP_MARGIN < lppop->iTop) { lppop->iTop = item->Rect.top - MENU_TOP_MARGIN; ScrollWindow(lppop->Wnd, 0, nOldPos - lppop->iTop, &rc, &rc); MENU_DrawScrollArrows(lppop, hdc); + //ERR("Scroll Up iTop %d iMaxTop %d nMaxHeight %d\n",lppop->iTop,lppop->iMaxTop,nMaxHeight); } MenuSetRosMenuInfo(lppop); } @@ -3015,27 +3017,27 @@ * Helper function for menu navigation routines. */ static void FASTCALL -MenuSwitchTracking(MTRACKER* Mt, PROSMENUINFO PtMenuInfo, UINT Index, UINT wFlags) +MenuSwitchTracking(MTRACKER* pmt, PROSMENUINFO PtMenuInfo, UINT Index, UINT wFlags) { ROSMENUINFO TopMenuInfo; - TRACE("%x menu=%x 0x%04x\n", Mt, PtMenuInfo->Self, Index); - - if ( MenuGetRosMenuInfo(&TopMenuInfo, Mt->TopMenu) && - Mt->TopMenu != PtMenuInfo->Self && + TRACE("%x menu=%x 0x%04x\n", pmt, PtMenuInfo->Self, Index); + + if ( MenuGetRosMenuInfo(&TopMenuInfo, pmt->TopMenu) && + pmt->TopMenu != PtMenuInfo->Self && !((PtMenuInfo->fFlags | TopMenuInfo.fFlags) & MNF_POPUP) ) { /* both are top level menus (system and menu-bar) */ - MenuHideSubPopups(Mt->OwnerWnd, &TopMenuInfo, FALSE, wFlags); - MenuSelectItem(Mt->OwnerWnd, &TopMenuInfo, NO_SELECTED_ITEM, FALSE, NULL); - Mt->TopMenu = PtMenuInfo->Self; + MenuHideSubPopups(pmt->OwnerWnd, &TopMenuInfo, FALSE, wFlags); + MenuSelectItem(pmt->OwnerWnd, &TopMenuInfo, NO_SELECTED_ITEM, FALSE, NULL); + pmt->TopMenu = PtMenuInfo->Self; } else { - MenuHideSubPopups(Mt->OwnerWnd, PtMenuInfo, FALSE, wFlags); - } - - MenuSelectItem(Mt->OwnerWnd, PtMenuInfo, Index, TRUE, NULL); + MenuHideSubPopups(pmt->OwnerWnd, PtMenuInfo, FALSE, wFlags); + } + + MenuSelectItem(pmt->OwnerWnd, PtMenuInfo, Index, TRUE, NULL); } /*********************************************************************** @@ -3049,12 +3051,12 @@ * */ static INT FASTCALL -MenuExecFocusedItem(MTRACKER *Mt, PROSMENUINFO MenuInfo, UINT Flags) +MenuExecFocusedItem(MTRACKER *pmt, PROSMENUINFO MenuInfo, UINT Flags) { ROSMENUITEMINFO ItemInfo; UINT wID; - TRACE("%p menu=%p\n", Mt, MenuInfo); + TRACE("%p menu=%p\n", pmt, MenuInfo); if (0 == MenuInfo->cItems || NO_SELECTED_ITEM == MenuInfo->iItem) { @@ -3081,19 +3083,19 @@ { if (0 != (MenuInfo->fFlags & MNF_SYSMENU)) { - PostMessageW(Mt->OwnerWnd, WM_SYSCOMMAND, ItemInfo.wID, - MAKELPARAM((SHORT) Mt->Pt.x, (SHORT) Mt->Pt.y)); + PostMessageW(pmt->OwnerWnd, WM_SYSCOMMAND, ItemInfo.wID, + MAKELPARAM((SHORT) pmt->Pt.x, (SHORT) pmt->Pt.y)); } else { ROSMENUINFO topmenuI; - BOOL ret = MenuGetRosMenuInfo(&topmenuI, Mt->TopMenu); + BOOL ret = MenuGetRosMenuInfo(&topmenuI, pmt->TopMenu); DWORD dwStyle = MenuInfo->dwStyle | (ret ? topmenuI.dwStyle : 0); if (dwStyle & MNS_NOTIFYBYPOS) - PostMessageW(Mt->OwnerWnd, WM_MENUCOMMAND, MenuInfo->iItem, (LPARAM)MenuInfo->Self); + PostMessageW(pmt->OwnerWnd, WM_MENUCOMMAND, MenuInfo->iItem, (LPARAM)MenuInfo->Self); else - PostMessageW(Mt->OwnerWnd, WM_COMMAND, ItemInfo.wID, 0); + PostMessageW(pmt->OwnerWnd, WM_COMMAND, ItemInfo.wID, 0); } } wID = ItemInfo.wID; @@ -3103,7 +3105,7 @@ } else { - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, MenuInfo, TRUE, Flags); + pmt->CurrentMenu = MenuShowSubPopup(pmt->OwnerWnd, MenuInfo, TRUE, Flags); return -2; } @@ -3116,17 +3118,17 @@ * Return TRUE if we can go on with menu tracking. */ static BOOL FASTCALL -MENU_ButtonDown(MTRACKER* Mt, HMENU PtMenu, UINT Flags) +MENU_ButtonDown(MTRACKER* pmt, HMENU hPtMenu, UINT Flags) { int Index; ROSMENUINFO MenuInfo; ROSMENUITEMINFO Item; - TRACE("%x PtMenu=%p\n", Mt, PtMenu); - - if (NULL != PtMenu) - { - if (! MenuGetRosMenuInfo(&MenuInfo, PtMenu)) + TRACE("%x PtMenu=%p\n", pmt, hPtMenu); + + if (NULL != hPtMenu) + { + if (! MenuGetRosMenuInfo(&MenuInfo, hPtMenu)) { return FALSE; } @@ -3136,10 +3138,10 @@ } else { - Index = NtUserMenuItemFromPoint(Mt->OwnerWnd, PtMenu, Mt->Pt.x, Mt->Pt.y); + Index = NtUserMenuItemFromPoint(pmt->OwnerWnd, hPtMenu, pmt->Pt.x, pmt->Pt.y); } MenuInitRosMenuItemInfo(&Item); - if (NO_SELECTED_ITEM == Index || ! MenuGetRosMenuItemInfo(PtMenu, Index, &Item)) + if (NO_SELECTED_ITEM == Index || ! MenuGetRosMenuItemInfo(hPtMenu, Index, &Item)) { MenuCleanupRosMenuItemInfo(&Item); return FALSE; @@ -3150,23 +3152,21 @@ { if (MenuInfo.iItem != Index) { - MenuSwitchTracking(Mt, &MenuInfo, Index, Flags); + MenuSwitchTracking(pmt, &MenuInfo, Index, Flags); } /* If the popup menu is not already "popped" */ - if (0 == (Item.fState & MF_MOUSESELECT)) + if (!(Item.fState & MF_MOUSESELECT)) { - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &MenuInfo, FALSE, Flags); + pmt->CurrentMenu = MenuShowSubPopup(pmt->OwnerWnd, &MenuInfo, FALSE, Flags); } + + MenuCleanupRosMenuItemInfo(&Item); + + return TRUE; } - - MenuCleanupRosMenuItemInfo(&Item); - - return TRUE; - } - - /* else the click was on the menu bar, finish the tracking */ - + /* Else the click was on the menu bar, finish the tracking */ + } return FALSE; } @@ -3179,25 +3179,25 @@ * */ static INT FASTCALL -MENU_ButtonUp(MTRACKER *Mt, HMENU PtMenu, UINT Flags) +MENU_ButtonUp(MTRACKER *pmt, HMENU hPtMenu, UINT Flags) { INT Id; ROSMENUINFO MenuInfo; ROSMENUITEMINFO ItemInfo; - TRACE("%p hmenu=%x\n", Mt, PtMenu); - - if (NULL != PtMenu) + TRACE("%p hmenu=%x\n", pmt, hPtMenu); + + if (hPtMenu) { Id = 0; - if (! MenuGetRosMenuInfo(&MenuInfo, PtMenu)) + if (! MenuGetRosMenuInfo(&MenuInfo, hPtMenu)) { return -1; } if (! IS_SYSTEM_MENU(&MenuInfo)) { - Id = NtUserMenuItemFromPoint(Mt->OwnerWnd, MenuInfo.Self, Mt->Pt.x, Mt->Pt.y); + Id = NtUserMenuItemFromPoint(pmt->OwnerWnd, MenuInfo.Self, pmt->Pt.x, pmt->Pt.y); } MenuInitRosMenuItemInfo(&ItemInfo); if (0 <= Id && MenuGetRosMenuItemInfo(MenuInfo.Self, Id, &ItemInfo) && @@ -3205,26 +3205,29 @@ { if (0 == (ItemInfo.hSubMenu)) { - INT ExecutedMenuId = MenuExecFocusedItem(Mt, &MenuInfo, Flags); + INT ExecutedMenuId = MenuExecFocusedItem( pmt, &MenuInfo, Flags); MenuCleanupRosMenuItemInfo(&ItemInfo); - return (ExecutedMenuId < 0) ? -1 : ExecutedMenuId; + if (ExecutedMenuId == -1 || ExecutedMenuId == -2) return -1; + return ExecutedMenuId; } MenuCleanupRosMenuItemInfo(&ItemInfo); - /* If we are dealing with the top-level menu */ + /* If we are dealing with the menu bar */ /* and this is a click on an already "popped" item: */ /* Stop the menu tracking and close the opened submenus */ - if (Mt->TopMenu == MenuInfo.Self && MenuInfo.TimeToHide) + if (pmt->TopMenu == MenuInfo.Self && MenuInfo.TimeToHide) { MenuCleanupRosMenuItemInfo(&ItemInfo); return 0; } } MenuCleanupRosMenuItemInfo(&ItemInfo); - MenuInfo.TimeToHide = TRUE; - MenuSetRosMenuInfo(&MenuInfo); - } - + if( GetMenu(MenuInfo.Wnd) == hPtMenu ) + { + MenuInfo.TimeToHide = TRUE; + MenuSetRosMenuInfo(&MenuInfo); + } + } return -1; } @@ -3277,7 +3280,7 @@ * Return TRUE if we can go on with menu tracking. */ static BOOL FASTCALL -MenuMouseMove(MTRACKER *Mt, HMENU PtMenu, UINT Flags) +MenuMouseMove(MTRACKER *pmt, HMENU PtMenu, UINT Flags) { INT Index; ROSMENUINFO MenuInfo; @@ -3295,7 +3298,7 @@ } else { - Index = NtUserMenuItemFromPoint(Mt->OwnerWnd, PtMenu, Mt->Pt.x, Mt->Pt.y); + Index = NtUserMenuItemFromPoint(pmt->OwnerWnd, PtMenu, pmt->Pt.x, pmt->Pt.y); } } else @@ -3305,11 +3308,11 @@ if (NO_SELECTED_ITEM == Index) { - if (Mt->CurrentMenu == MenuInfo.Self || - MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu)) + if (pmt->CurrentMenu == MenuInfo.Self || + MenuGetRosMenuInfo(&MenuInfo, pmt->CurrentMenu)) { - MenuSelectItem(Mt->OwnerWnd, &MenuInfo, NO_SELECTED_ITEM, - TRUE, Mt->TopMenu); + MenuSelectItem(pmt->OwnerWnd, &MenuInfo, NO_SELECTED_ITEM, + TRUE, pmt->TopMenu); } } else if (MenuInfo.iItem != Index) @@ -3318,9 +3321,9 @@ if (MenuGetRosMenuItemInfo(MenuInfo.Self, Index, &ItemInfo) && !(ItemInfo.fType & MF_SEPARATOR)) { - MenuSwitchTracking(Mt, &MenuInfo, Index, Flags); + MenuSwitchTracking(pmt, &MenuInfo, Index, Flags); if (!(ItemInfo.fState & (MFS_DISABLED | MFS_GRAYED))) - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &MenuInfo, FALSE, Flags); + pmt->CurrentMenu = MenuShowSubPopup(pmt->OwnerWnd, &MenuInfo, FALSE, Flags); } MenuCleanupRosMenuItemInfo(&ItemInfo); } @@ -3360,12 +3363,12 @@ * NOTE: WM_NEXTMENU documented in Win32 is a bit different. */ static LRESULT FASTCALL -MenuDoNextMenu(MTRACKER* Mt, UINT Vk, UINT wFlags) +MenuDoNextMenu(MTRACKER* pmt, UINT Vk, UINT wFlags) { ROSMENUINFO TopMenuInfo; ROSMENUINFO MenuInfo; - if (! MenuGetRosMenuInfo(&TopMenuInfo, Mt->TopMenu)) + if (! MenuGetRosMenuInfo(&TopMenuInfo, pmt->TopMenu)) { return (LRESULT) FALSE; } @@ -3378,18 +3381,18 @@ HWND NewWnd; UINT Id = 0; - NextMenu.hmenuIn = (IS_SYSTEM_MENU(&TopMenuInfo)) ? GetSubMenu(Mt->TopMenu, 0) : Mt->TopMenu; + NextMenu.hmenuIn = (IS_SYSTEM_MENU(&TopMenuInfo)) ? GetSubMenu(pmt->TopMenu, 0) : pmt->TopMenu; NextMenu.hmenuNext = NULL; NextMenu.hwndNext = NULL; - SendMessageW(Mt->OwnerWnd, WM_NEXTMENU, Vk, (LPARAM) &NextMenu); + SendMessageW(pmt->OwnerWnd, WM_NEXTMENU, Vk, (LPARAM) &NextMenu); TRACE("%p [%p] -> %p [%p]\n", - Mt->CurrentMenu, Mt->OwnerWnd, NextMenu.hmenuNext, NextMenu.hwndNext ); + pmt->CurrentMenu, pmt->OwnerWnd, NextMenu.hmenuNext, NextMenu.hwndNext ); if (NULL == NextMenu.hmenuNext || NULL == NextMenu.hwndNext) { - DWORD Style = GetWindowLongPtrW(Mt->OwnerWnd, GWL_STYLE); - NewWnd = Mt->OwnerWnd; + DWORD Style = GetWindowLongPtrW(pmt->OwnerWnd, GWL_STYLE); + NewWnd = pmt->OwnerWnd; if (IS_SYSTEM_MENU(&TopMenuInfo)) { /* switch to the menu bar */ @@ -3449,27 +3452,27 @@ } } - if (NewMenu != Mt->TopMenu) + if (NewMenu != pmt->TopMenu) { - MenuSelectItem(Mt->OwnerWnd, &TopMenuInfo, NO_SELECTED_ITEM, + MenuSelectItem(pmt->OwnerWnd, &TopMenuInfo, NO_SELECTED_ITEM, FALSE, 0 ); - if (Mt->CurrentMenu != Mt->TopMenu) + if (pmt->CurrentMenu != pmt->TopMenu) { - MenuHideSubPopups(Mt->OwnerWnd, &TopMenuInfo, FALSE, wFlags); + MenuHideSubPopups(pmt->OwnerWnd, &TopMenuInfo, FALSE, wFlags); } } - if (NewWnd != Mt->OwnerWnd) + if (NewWnd != pmt->OwnerWnd) { - Mt->OwnerWnd = NewWnd; - NtUserxSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt->OwnerWnd); // 1 - SetCapture(Mt->OwnerWnd); // 2 + pmt->OwnerWnd = NewWnd; + NtUserxSetGUIThreadHandle(MSQ_STATE_MENUOWNER, pmt->OwnerWnd); // 1 + SetCapture(pmt->OwnerWnd); // 2 } - Mt->TopMenu = Mt->CurrentMenu = NewMenu; /* all subpopups are hidden */ - if (MenuGetRosMenuInfo(&TopMenuInfo, Mt->TopMenu)) + pmt->TopMenu = pmt->CurrentMenu = NewMenu; /* all subpopups are hidden */ + if (MenuGetRosMenuInfo(&TopMenuInfo, pmt->TopMenu)) { - MenuSelectItem(Mt->OwnerWnd, &TopMenuInfo, Id, TRUE, 0); + MenuSelectItem(pmt->OwnerWnd, &TopMenuInfo, Id, TRUE, 0); } return TRUE; @@ -3485,14 +3488,14 @@ * going to hide it anyway. */ static BOOL FASTCALL -MenuSuspendPopup(MTRACKER* Mt, UINT uMsg) +MenuSuspendPopup(MTRACKER* pmt, UINT uMsg) { MSG msg; - msg.hwnd = Mt->OwnerWnd; + msg.hwnd = pmt->OwnerWnd; PeekMessageW( &msg, 0, uMsg, uMsg, PM_NOYIELD | PM_REMOVE); // ported incorrectly since 8317 GvG - //Mt->TrackFlags |= TF_SKIPREMOVE; // This sends TrackMenu into a loop with arrow keys!!!! + //pmt->TrackFlags |= TF_SKIPREMOVE; // This sends TrackMenu into a loop with arrow keys!!!! switch( uMsg ) { @@ -3505,14 +3508,14 @@ if( msg.message == WM_KEYDOWN && (msg.wParam == VK_LEFT || msg.wParam == VK_RIGHT)) { - Mt->TrackFlags |= TF_SUSPENDPOPUP; + pmt->TrackFlags |= TF_SUSPENDPOPUP; return TRUE; } } break; } /* failures go through this */ - Mt->TrackFlags &= ~TF_SUSPENDPOPUP; + pmt->TrackFlags &= ~TF_SUSPENDPOPUP; return FALSE; } @@ -3522,21 +3525,21 @@ * Handle a VK_ESCAPE key event in a menu. */ static BOOL FASTCALL -MenuKeyEscape(MTRACKER *Mt, UINT Flags) +MenuKeyEscape(MTRACKER *pmt, UINT Flags) { BOOL EndMenu = TRUE; ROSMENUINFO MenuInfo; HMENU MenuTmp, MenuPrev; - if (Mt->CurrentMenu != Mt->TopMenu) - { - if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu) + if (pmt->CurrentMenu != pmt->TopMenu) + { + if (MenuGetRosMenuInfo(&MenuInfo, pmt->CurrentMenu) && 0 != (MenuInfo.fFlags & MNF_POPUP)) { - MenuPrev = MenuTmp = Mt->TopMenu; + MenuPrev = MenuTmp = pmt->TopMenu; /* close topmost popup */ - while (MenuTmp != Mt->CurrentMenu) + while (MenuTmp != pmt->CurrentMenu) { MenuPrev = MenuTmp; MenuTmp = MENU_GetSubPopup(MenuPrev); @@ -3544,9 +3547,9 @@ if (MenuGetRosMenuInfo(&MenuInfo, MenuPrev)) { - MenuHideSubPopups(Mt->OwnerWnd, &MenuInfo, TRUE, Flags); + MenuHideSubPopups(pmt->OwnerWnd, &MenuInfo, TRUE, Flags); } - Mt->CurrentMenu = MenuPrev; + pmt->CurrentMenu = MenuPrev; EndMenu = FALSE; } } @@ -3560,7 +3563,7 @@ * Handle a VK_LEFT key event in a menu. */ static void FASTCALL -MenuKeyLeft(MTRACKER* Mt, UINT Flags) +MenuKeyLeft(MTRACKER* pmt, UINT Flags) { ROSMENUINFO MenuInfo; ROSMENUINFO TopMenuInfo; @@ -3568,20 +3571,20 @@ HMENU MenuTmp, MenuPrev; UINT PrevCol; - MenuPrev = MenuTmp = Mt->TopMenu; + MenuPrev = MenuTmp = pmt->TopMenu; /* Try to move 1 column left (if possible) */ - if ( (PrevCol = MENU_GetStartOfPrevColumn(Mt->CurrentMenu)) != NO_SELECTED_ITEM) - { - if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu)) + if ( (PrevCol = MENU_GetStartOfPrevColumn(pmt->CurrentMenu)) != NO_SELECTED_ITEM) + { + if (MenuGetRosMenuInfo(&MenuInfo, pmt->CurrentMenu)) { - MenuSelectItem(Mt->OwnerWnd, &MenuInfo, PrevCol, TRUE, 0); + MenuSelectItem(pmt->OwnerWnd, &MenuInfo, PrevCol, TRUE, 0); } return; } /* close topmost popup */ - while (MenuTmp != Mt->CurrentMenu) + while (MenuTmp != pmt->CurrentMenu) { MenuPrev = MenuTmp; MenuTmp = MENU_GetSubPopup(MenuPrev); @@ -3591,31 +3594,31 @@ { return; } - MenuHideSubPopups(Mt->OwnerWnd, &PrevMenuInfo, TRUE, Flags); - Mt->CurrentMenu = MenuPrev; - - if (! MenuGetRosMenuInfo(&TopMenuInfo, Mt->TopMenu)) + MenuHideSubPopups(pmt->OwnerWnd, &PrevMenuInfo, TRUE, Flags); + pmt->CurrentMenu = MenuPrev; + + if (! MenuGetRosMenuInfo(&TopMenuInfo, pmt->TopMenu)) { return; } - if ((MenuPrev == Mt->TopMenu) && !(TopMenuInfo.fFlags & MNF_POPUP)) + if ((MenuPrev == pmt->TopMenu) && !(TopMenuInfo.fFlags & MNF_POPUP)) { /* move menu bar selection if no more popups are left */ - if (!MenuDoNextMenu(Mt, VK_LEFT, Flags)) + if (!MenuDoNextMenu(pmt, VK_LEFT, Flags)) { - MenuMoveSelection(Mt->OwnerWnd, &TopMenuInfo, ITEM_PREV); + MenuMoveSelection(pmt->OwnerWnd, &TopMenuInfo, ITEM_PREV); } - if (MenuPrev != MenuTmp || Mt->TrackFlags & TF_SUSPENDPOPUP) + if (MenuPrev != MenuTmp || pmt->TrackFlags & TF_SUSPENDPOPUP) { /* A sublevel menu was displayed - display the next one * unless there is another displacement coming up */ - if (! MenuSuspendPopup(Mt, WM_KEYDOWN) - && MenuGetRosMenuInfo(&TopMenuInfo, Mt->TopMenu)) + if (! MenuSuspendPopup(pmt, WM_KEYDOWN) + && MenuGetRosMenuInfo(&TopMenuInfo, pmt->TopMenu)) { - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &TopMenuInfo, + pmt->CurrentMenu = MenuShowSubPopup(pmt->OwnerWnd, &TopMenuInfo, TRUE, Flags); } } @@ -3627,7 +3630,7 @@ * * Handle a VK_RIGHT key event in a menu. */ -static void FASTCALL MenuKeyRight(MTRACKER *Mt, UINT Flags) +static void FASTCALL MenuKeyRight(MTRACKER *pmt, UINT Flags) { HMENU hmenutmp; ROSMENUINFO MenuInfo; @@ -3635,40 +3638,40 @@ UINT NextCol; TRACE("MenuKeyRight called, cur %p, top %p.\n", - Mt->CurrentMenu, Mt->TopMenu); - - if (! MenuGetRosMenuInfo(&MenuInfo, Mt->TopMenu)) return; - if ((MenuInfo.fFlags & MNF_POPUP) || (Mt->CurrentMenu != Mt->TopMenu)) + pmt->CurrentMenu, pmt->TopMenu); + + if (! MenuGetRosMenuInfo(&MenuInfo, pmt->TopMenu)) return; + if ((MenuInfo.fFlags & MNF_POPUP) || (pmt->CurrentMenu != pmt->TopMenu)) { /* If already displaying a popup, try to display sub-popup */ - hmenutmp = Mt->CurrentMenu; - if (MenuGetRosMenuInfo(&CurrentMenuInfo, Mt->CurrentMenu)) - { - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &CurrentMenuInfo, TRUE, Flags); + hmenutmp = pmt->CurrentMenu; + if (MenuGetRosMenuInfo(&CurrentMenuInfo, pmt->CurrentMenu)) + { + pmt->CurrentMenu = MenuShowSubPopup(pmt->OwnerWnd, &CurrentMenuInfo, TRUE, Flags); } /* if subpopup was displayed then we are done */ - if (hmenutmp != Mt->CurrentMenu) return; + if (hmenutmp != pmt->CurrentMenu) return; } /* Check to see if there's another column */ - if ( (NextCol = MENU_GetStartOfNextColumn(Mt->CurrentMenu)) != NO_SELECTED_ITEM) + if ( (NextCol = MENU_GetStartOfNextColumn(pmt->CurrentMenu)) != NO_SELECTED_ITEM) { TRACE("Going to %d.\n", NextCol); - if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu)) + if (MenuGetRosMenuInfo(&MenuInfo, pmt->CurrentMenu)) { - MenuSelectItem(Mt->OwnerWnd, &MenuInfo, NextCol, TRUE, 0); + MenuSelectItem(pmt->OwnerWnd, &MenuInfo, NextCol, TRUE, 0); } return; } if (!(MenuInfo.fFlags & MNF_POPUP)) /* menu bar tracking */ { - if (Mt->CurrentMenu != Mt->TopMenu) + if (pmt->CurrentMenu != pmt->TopMenu) { - MenuHideSubPopups(Mt->OwnerWnd, &MenuInfo, FALSE, Flags); - hmenutmp = Mt->CurrentMenu = Mt->TopMenu; + MenuHideSubPopups(pmt->OwnerWnd, &MenuInfo, FALSE, Flags); + hmenutmp = pmt->CurrentMenu = pmt->TopMenu; } else { @@ -3676,15 +3679,15 @@ } /* try to move to the next item */ - if ( !MenuDoNextMenu(Mt, VK_RIGHT, Flags)) - MenuMoveSelection(Mt->OwnerWnd, &MenuInfo, ITEM_NEXT); - - if ( hmenutmp || Mt->TrackFlags & TF_SUSPENDPOPUP ) + if ( !MenuDoNextMenu(pmt, VK_RIGHT, Flags)) + MenuMoveSelection(pmt->OwnerWnd, &MenuInfo, ITEM_NEXT); + + if ( hmenutmp || pmt->TrackFlags & TF_SUSPENDPOPUP ) { - if (! MenuSuspendPopup(Mt, WM_KEYDOWN) - && MenuGetRosMenuInfo(&MenuInfo, Mt->TopMenu)) + if (! MenuSuspendPopup(pmt, WM_KEYDOWN) + && MenuGetRosMenuInfo(&MenuInfo, pmt->TopMenu)) { - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &MenuInfo, + pmt->CurrentMenu = MenuShowSubPopup(pmt->OwnerWnd, &MenuInfo, TRUE, Flags); } } @@ -4051,13 +4054,15 @@ TRACE("hwnd=%p hmenu=%p\n", hWnd, hMenu); + if (!MenuGetRosMenuInfo(&MenuInfo, hMenu)) return FALSE; + HideCaret(0); /* This makes the menus of applications built with Delphi work. * It also enables menus to be displayed in more than one window, * but there are some bugs left that need to be fixed in this case. */ - if (!bPopup && (MenuGetRosMenuInfo(&MenuInfo, hMenu))) + if (!bPopup) { MenuInfo.Wnd = hWnd; MenuSetRosMenuInfo(&MenuInfo); @@ -4393,6 +4398,12 @@ /* Other menu items having MFS_DEFAULT are not converted to normal items */ pmii_out->fState = pmii_in->fState & MENUITEMINFO_STATE_MASK; + + if (pmii_out->fMask & MIIM_SUBMENU) + { + if ((pmii_out->hSubMenu != NULL) && !IsMenu(pmii_out->hSubMenu)) + return FALSE; + } return TRUE; }

9 years, 9 months

[zguo] 65621: [DESK.CPL] Modify font enumeration code to deal with failure to read the registry key. Also change the registry key being queried to match the one used on Windows. Patch by Ricardo Ha...

by zguo＠svn.reactos.org

Author: zguo Date: Fri Dec 12 22:07:29 2014 New Revision: 65621 URL: http://svn.reactos.org/svn/reactos?rev=65621&view=rev Log: [DESK.CPL] Modify font enumeration code to deal with failure to read the registry key. Also change the registry key being queried to match the one used on Windows. Patch by Ricardo Hanke. CORE-8203 Modified: trunk/reactos/dll/cpl/desk/general.c Modified: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/general.c [iso-8859-1] Fri Dec 12 22:07:29 2014 @@ -26,8 +26,21 @@ { if (SetupFindFirstLine(hInf, _T("Font Sizes"), NULL, &Context)) { - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontDPI"), + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\Software\\Fonts"), 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + dwSize = MAX_PATH; + dwType = REG_DWORD; + + if (!RegQueryValueEx(hKey, _T("LogPixels"), NULL, + &dwType, (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS) + { + dwValue = 0; + } + + RegCloseKey(hKey); + } + for (;;) { TCHAR Buffer[LINE_LEN]; @@ -41,23 +54,17 @@ if (i != CB_ERR) SendMessage(hFontSize, CB_SETITEMDATA, (WPARAM)i, (LPARAM)ci); - dwSize = MAX_PATH; - dwType = REG_DWORD; - - if (RegQueryValueEx(hKey, _T("LogPixels"), NULL, - &dwType, (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS) + if ((int)dwValue == ci) { - if ((int)dwValue == ci) - { - SendMessage(hFontSize, CB_SETCURSEL, (WPARAM)i, 0); - SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_CUSTOM), Desc); - } + SendMessage(hFontSize, CB_SETCURSEL, (WPARAM)i, 0); + SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_CUSTOM), Desc); } + else + SendMessage(hFontSize, CB_SETCURSEL, 0, 0); } if (!SetupFindNextLine(&Context, &Context)) { - RegCloseKey(hKey); break; } }

9 years, 9 months

[zguo] 65620: [SHIMGV] Fix display window calculation. Patch by Ricardo Hanke. CORE-7656

by zguo＠svn.reactos.org

Author: zguo Date: Fri Dec 12 21:15:17 2014 New Revision: 65620 URL: http://svn.reactos.org/svn/reactos?rev=65620&view=rev Log: [SHIMGV] Fix display window calculation. Patch by Ricardo Hanke. CORE-7656 Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Fri Dec 12 21:15:17 2014 @@ -646,8 +646,8 @@ { RECT rc; SendMessage(hToolBar, TB_AUTOSIZE, 0, 0); - SendMessage(hToolBar, TB_GETITEMRECT, 1, (LPARAM)&rc); - MoveWindow(hDispWnd, 1, 1, LOWORD(lParam)-1, HIWORD(lParam)-rc.bottom, TRUE); + GetWindowRect(hToolBar, &rc); + MoveWindow(hDispWnd, 1, 1, LOWORD(lParam) - 1, HIWORD(lParam) - (rc.bottom - rc.top) - 1, TRUE); return 0L; } case WM_DESTROY:

9 years, 9 months

[jimtabor] 65619: [Win32k] - Fix double click on application icons. See CORE-3269.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 12 20:28:20 2014 New Revision: 65619 URL: http://svn.reactos.org/svn/reactos?rev=65619&view=rev Log: [Win32k] - Fix double click on application icons. See CORE-3269. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Fri Dec 12 20:28:20 2014 @@ -1488,7 +1488,7 @@ if (hittest != HTCLIENT) { message += WM_NCMOUSEMOVE - WM_MOUSEMOVE; - msg->wParam = hittest; + msg->wParam = hittest; // Caution! This might break wParam check in DblClk. } else { @@ -1522,7 +1522,8 @@ { if ((msg->message == clk_msg.message) && (msg->hwnd == clk_msg.hwnd) && - (msg->wParam == clk_msg.wParam) && + // Only worry about XButton wParam. + (msg->message != WM_XBUTTONDOWN || GET_XBUTTON_WPARAM(msg->wParam) == GET_XBUTTON_WPARAM(clk_msg.wParam)) && ((msg->time - clk_msg.time) < (ULONG)gspv.iDblClickTime) && (abs(msg->pt.x - clk_msg.pt.x) < UserGetSystemMetrics(SM_CXDOUBLECLK)/2) && (abs(msg->pt.y - clk_msg.pt.y) < UserGetSystemMetrics(SM_CYDOUBLECLK)/2)) Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Fri Dec 12 20:28:20 2014 @@ -3830,6 +3830,7 @@ /* Else, end menu tracking */ fRemove = MENU_ButtonDown(&mt, hmenu, wFlags); fEndMenu = !fRemove; + if (msg.message == WM_LBUTTONDBLCLK) fEndMenu = TRUE; // Must exit or loop forever! break; case WM_RBUTTONUP:

9 years, 9 months

[dquintana] 65618: [EXPLORER] * Followup to t65603. Fixes the start menu themeing regression (when running explorer in windows 2003). CORE-8898 #resolve

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri Dec 12 16:28:46 2014 New Revision: 65618 URL: http://svn.reactos.org/svn/reactos?rev=65618&view=rev Log: [EXPLORER] * Followup to t65603. Fixes the start menu themeing regression (when running explorer in windows 2003). CORE-8898 #resolve Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Fri Dec 12 16:28:46 2014 @@ -69,7 +69,6 @@ HIMAGELIST m_ImageList; SIZE m_Size; HFONT m_Font; - HBITMAP m_Bitmap; public: CStartButton(CMessageMap *pObject, DWORD dwMsgMapID) @@ -84,9 +83,6 @@ if (m_Font != NULL) DeleteObject(m_Font); - - if (m_Bitmap != NULL) - DeleteObject(m_Bitmap); } HFONT GetFont() @@ -99,26 +95,26 @@ return m_Size; } - VOID UpdateSize() + VOID UpdateSize(IN HBITMAP hbmStart = NULL) { SIZE Size = { 0, 0 }; if (m_ImageList == NULL || - !SendMessage(BCM_GETIDEALSIZE, 0, (LPARAM) &Size)) + !SendMessageW(BCM_GETIDEALSIZE, 0, (LPARAM) &Size)) { Size.cx = GetSystemMetrics(SM_CXEDGE); Size.cy = GetSystemMetrics(SM_CYEDGE); - if (m_Bitmap == NULL) - { - m_Bitmap = (HBITMAP) SendMessage(BM_GETIMAGE, IMAGE_BITMAP, 0); - } - - if (m_Bitmap != NULL) + if (hbmStart == NULL) + { + hbmStart = (HBITMAP) SendMessageW(BM_GETIMAGE, IMAGE_BITMAP, 0); + } + + if (hbmStart != NULL) { BITMAP bmp; - if (GetObject(m_Bitmap, sizeof(bmp), &bmp) != 0) + if (GetObject(hbmStart, sizeof(bmp), &bmp) != 0) { Size.cx += bmp.bmWidth; Size.cy += max(bmp.bmHeight, GetSystemMetrics(SM_CYCAPTION)); @@ -160,28 +156,27 @@ IconSize.cy, LR_SHARED | LR_DEFAULTCOLOR); - if (hIconStart != NULL) - { - m_ImageList = ImageList_Create(IconSize.cx, - IconSize.cy, - ILC_COLOR32 | ILC_MASK, - 1, - 1); - if (m_ImageList != NULL) - { - int s = ImageList_ReplaceIcon(m_ImageList, -1, hIconStart); - if (s >= 0) - { - return TRUE; - } - - /* Failed to add the icon! */ - ImageList_Destroy(m_ImageList); - m_ImageList = NULL; - } - } - - return FALSE; + if (hIconStart == NULL) + return FALSE; + + m_ImageList = ImageList_Create(IconSize.cx, + IconSize.cy, + ILC_COLOR32 | ILC_MASK, + 1, 1); + if (m_ImageList == NULL) + return FALSE; + + int s = ImageList_ReplaceIcon(m_ImageList, -1, hIconStart); + if (s < 0) + { + /* Failed to add the icon! */ + ImageList_Destroy(m_ImageList); + m_ImageList = NULL; + + return FALSE; + } + + return TRUE; } HBITMAP CreateBitmap() @@ -314,41 +309,43 @@ SendMessage(WM_SETFONT, (WPARAM) m_Font, FALSE); - BUTTON_IMAGELIST bil; - - /* Try to set the start button image. this requires the Common - Controls 6.0 to be present (XP and later) */ - bil.himl = m_ImageList; - bil.margin.left = bil.margin.right = 1; - bil.margin.top = bil.margin.bottom = 1; - bil.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; - - if (SendMessage(BCM_SETIMAGELIST, 0, (LPARAM) &bil)) - { - /* We're using the image list, remove the BS_BITMAP style and - don't center it horizontally */ - SetWindowStyle(m_hWnd, BS_BITMAP | BS_RIGHT, 0); - } - else - { + if (CreateImageList()) + { + BUTTON_IMAGELIST bil; + + /* Try to set the start button image. this requires the Common + Controls 6.0 to be present (XP and later) */ + bil.himl = m_ImageList; + bil.margin.left = bil.margin.right = 1; + bil.margin.top = bil.margin.bottom = 1; + bil.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; + + if (SendMessageW(BCM_SETIMAGELIST, 0, (LPARAM) &bil)) + { + /* We're using the image list, remove the BS_BITMAP style and + don't center it horizontally */ + SetWindowStyle(m_hWnd, BS_BITMAP | BS_RIGHT, 0); + + UpdateSize(); + return; + } + /* Fall back to the deprecated method on older systems that don't support Common Controls 6.0 */ ImageList_Destroy(m_ImageList); m_ImageList = NULL; - - HBITMAP hbmOld; - - m_Bitmap = CreateBitmap(); - if (m_Bitmap != NULL) - { - hbmOld = (HBITMAP) SendMessage(BM_SETIMAGE, IMAGE_BITMAP, (LPARAM) m_Bitmap); - - if (hbmOld != NULL) - DeleteObject(hbmOld); - } - } - - UpdateSize(); + } + + HBITMAP hbmStart = CreateBitmap(); + if (hbmStart != NULL) + { + UpdateSize(hbmStart); + + HBITMAP hbmOld = (HBITMAP) SendMessageW(BM_SETIMAGE, IMAGE_BITMAP, (LPARAM) hbmStart); + + if (hbmOld != NULL) + DeleteObject(hbmOld); + } } }; @@ -1538,8 +1535,7 @@ CheckTrayWndPosition(); /* Align all controls on the tray window */ - AlignControls( - NULL); + AlignControls(NULL); InitShellServices(&(m_ShellServices));

9 years, 9 months

[akhaldi] 65617: [USER32] We're not using any debugging routines here.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 12 13:23:45 2014 New Revision: 65617 URL: http://svn.reactos.org/svn/reactos?rev=65617&view=rev Log: [USER32] We're not using any debugging routines here. Modified: trunk/reactos/win32ss/user/user32/misc/rtlstr.c Modified: trunk/reactos/win32ss/user/user32/misc/rtlstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/r… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/rtlstr.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/rtlstr.c [iso-8859-1] Fri Dec 12 13:23:45 2014 @@ -10,10 +10,6 @@ /* INCLUDES ******************************************************************/ #include <user32.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(user32); /* FUNCTIONS *****************************************************************/ VOID

9 years, 9 months

[akhaldi] 65616: [CRT] Explicitly mark strncpy and wcsncpy as __cdecl.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 12 13:20:14 2014 New Revision: 65616 URL: http://svn.reactos.org/svn/reactos?rev=65616&view=rev Log: [CRT] Explicitly mark strncpy and wcsncpy as __cdecl. Modified: trunk/reactos/include/crt/string.h Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Fri Dec 12 13:20:14 2014 @@ -357,6 +357,7 @@ _In_opt_ _locale_t _Locale); char* + __cdecl strncpy( char *_Dest, const char *_Source, @@ -707,6 +708,7 @@ _CRTIMP _CRT_INSECURE_DEPRECATE(wcsncpy_s) wchar_t* + __cdecl wcsncpy( wchar_t *_Dest, const wchar_t *_Source,

9 years, 9 months

[akhaldi] 65615: [W32KDLL_APITESTS] Properly handle ASM files. Also use set_module_type() instead of manually setting the entry point.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 12 13:17:16 2014 New Revision: 65615 URL: http://svn.reactos.org/svn/reactos?rev=65615&view=rev Log: [W32KDLL_APITESTS] Properly handle ASM files. Also use set_module_type() instead of manually setting the entry point. Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt [iso-8859-1] Fri Dec 12 13:17:16 2014 @@ -1,9 +1,10 @@ spec2def(w32kdll_2k3sp2.dll w32kdll_2k3sp2.spec ADD_IMPORTLIB) +add_asm_files(w32kdll_2k3sp2_asm sys-stubs.S) add_library(w32kdll_2k3sp2 SHARED main.c - sys-stubs.S + ${w32kdll_2k3sp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_2k3sp2.def) set_module_type(w32kdll_2k3sp2 module) Modified: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt [iso-8859-1] Fri Dec 12 13:17:16 2014 @@ -1,10 +1,11 @@ spec2def(w32kdll_2ksp4.dll w32kdll_2ksp4.spec) +add_asm_files(w32kdll_2ksp4_asm w32kdll_2ksp4.S) add_library(w32kdll_2ksp4 SHARED main.c - w32kdll_2ksp4.S + ${w32kdll_2ksp4_asm} ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_2ksp4.def) -set_entrypoint(w32kdll_2ksp4 0) +set_module_type(w32kdll_2ksp4 module) add_dependencies(w32kdll_2ksp4 psdk) Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt [iso-8859-1] Fri Dec 12 13:17:16 2014 @@ -1,9 +1,10 @@ spec2def(w32kdll_ros.dll w32kdll_ros.spec ADD_IMPORTLIB) +add_asm_files(w32kdll_ros_asm sys-stubs.S) add_library(w32kdll_ros SHARED main.c - sys-stubs.S + ${w32kdll_ros_asm} ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_ros.def) set_module_type(w32kdll_ros module) Modified: trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt [iso-8859-1] Fri Dec 12 13:17:16 2014 @@ -1,10 +1,11 @@ spec2def(w32kdll_vista.spec w32kdll_vista.spec ADD_IMPORTLIB) +add_asm_files(w32kdll_vista_asm w32kdll_vista.S) add_library(w32kdll_vista SHARED main.c - w32kdll_vista.S + ${w32kdll_vista_asm} ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_vista.def) -set_entrypoint(w32kdll_vista 0) -add_dependencies(w32kdll_vista psdk ) +set_module_type(w32kdll_vista module) +add_dependencies(w32kdll_vista psdk) Modified: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt [iso-8859-1] Fri Dec 12 13:17:16 2014 @@ -1,9 +1,10 @@ spec2def(w32kdll_xpsp2.dll w32kdll_xpsp2.spec ADD_IMPORTLIB) +add_asm_files(w32kdll_xpsp2_asm sys-stubs.S) add_library(w32kdll_xpsp2 SHARED main.c - sys-stubs.S + ${w32kdll_xpsp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_xpsp2.def) set_module_type(w32kdll_xpsp2 module)

9 years, 9 months

[akhaldi] 65614: [SHIMGVW] Fix DLL stubs, intended to fix a crash on Windows. Patch by Ricardo Hanke. CORE-8073 #resolve #comment Committed in r65614. Thanks!

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 12 13:08:59 2014 New Revision: 65614 URL: http://svn.reactos.org/svn/reactos?rev=65614&view=rev Log: [SHIMGVW] Fix DLL stubs, intended to fix a crash on Windows. Patch by Ricardo Hanke. CORE-8073 #resolve #comment Committed in r65614. Thanks! Added: trunk/reactos/dll/win32/shimgvw/comsup.c (with props) trunk/reactos/dll/win32/shimgvw/comsup.h (with props) Modified: trunk/reactos/dll/win32/shimgvw/CMakeLists.txt trunk/reactos/dll/win32/shimgvw/shimgvw.spec Modified: trunk/reactos/dll/win32/shimgvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1] Fri Dec 12 13:08:59 2014 @@ -3,6 +3,7 @@ list(APPEND SOURCE shimgvw.c + comsup.c shimgvw.rc ${CMAKE_CURRENT_BINARY_DIR}/shimgvw_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shimgvw.def) Added: trunk/reactos/dll/win32/shimgvw/comsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/comsup.c… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/comsup.c (added) +++ trunk/reactos/dll/win32/shimgvw/comsup.c [iso-8859-1] Fri Dec 12 13:08:59 2014 @@ -0,0 +1,58 @@ +#define INITGUID + +#include <windef.h> +#include <comsup.h> + +LONG LockCount; +LONG ObjectCount; + + +VOID +DllInitServer(VOID) +{ + ObjectCount = 0; + LockCount = 0; +} + + +STDAPI +DllRegisterServer(VOID) +{ + /* Always return S_OK, since there is currently nothing that can go wrong */ + return S_OK; +} + + +STDAPI +DllUnregisterServer(VOID) +{ + /* Always return S_OK, since there is currently nothing that can go wrong */ + return S_OK; +} + + +STDAPI +DllCanUnloadNow(VOID) +{ + if ((ObjectCount != 0) || (LockCount != 0)) + { + return S_FALSE; + } + else + { + return S_OK; + } +} + + +STDAPI +DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + HRESULT hr; + + /* There are no classes to export, so always return CLASS_E_CLASSNOTAVAILABLE*/ + *ppv = NULL; + hr = CLASS_E_CLASSNOTAVAILABLE; + + return hr; +} Propchange: trunk/reactos/dll/win32/shimgvw/comsup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/comsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/comsup.h… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/comsup.h (added) +++ trunk/reactos/dll/win32/shimgvw/comsup.h [iso-8859-1] Fri Dec 12 13:08:59 2014 @@ -0,0 +1,4 @@ +extern LONG LockCount; +extern LONG ObjectCount; + +VOID DllInitServer(VOID); Propchange: trunk/reactos/dll/win32/shimgvw/comsup.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] Fri Dec 12 13:08:59 2014 @@ -7,8 +7,8 @@ @ stdcall ImageView_PrintToW(ptr ptr wstr long) @ stdcall imageview_fullscreenW(ptr ptr wstr long) ImageView_FullscreenW @ stub ConvertDIBSECTIONToThumbnail -@ stub -private DllCanUnloadNow -@ stub -private DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub -private DllInstall -@ stub -private DllRegisterServer -@ stub -private DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

9 years, 9 months

← Newer
1
...
28
29
30
31
32
33
34
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2014