[EXPLORER_NEW]

[reactos.git] / base / shell / explorer-new / traywnd.c

diff --git a/base/shell/explorer-new/traywnd.c b/base/shell/explorer-new/traywnd.c
index df2d16a..3cd2f77 100644 (file)
--- a/base/shell/explorer-new/traywnd.c
+++ b/base/shell/explorer-new/traywnd.c
@@ -1023,6 +1023,8 @@ ITrayWindowImpl_TrackCtxMenu(IN OUT ITrayWindowImpl *This,
                               cmdId,
                               pcmContext,
                               Context);
+
+        DestroyMenu(hPopup);
     }
 
     return cmdId;
@@ -2199,7 +2201,8 @@ static void PopupStartMenu(IN ITrayWindowImpl *This)
     }
 }
 
-static void ProcessMouseTracking(ITrayWindowImpl * This)
+static void
+ProcessMouseTracking(ITrayWindowImpl * This)
 {
     RECT rcCurrent;
     POINT pt;
@@ -2249,9 +2252,9 @@ static void ProcessMouseTracking(ITrayWindowImpl * This)
     }
 }
 
-static void ProcessAutoHide(ITrayWindowImpl * This)
+static void
+ProcessAutoHide(ITrayWindowImpl * This)
 {
-    BOOL ret;
     RECT rc = This->rcTrayWnd[This->Position];
     INT w = This->TraySize.cx - GetSystemMetrics(SM_CXBORDER) * 2 - 1;
     INT h = This->TraySize.cy - GetSystemMetrics(SM_CYBORDER) * 2 - 1;
@@ -2446,8 +2449,7 @@ TrayWndProc(IN HWND hwnd,
             case WM_ERASEBKGND:
                 if (!This->TaskbarTheme)
                     goto DefHandler;
-                return ITrayWindowImpl_DrawBackground(This,
-                                                      (HDC)wParam);
+                return ITrayWindowImpl_DrawBackground(This, (HDC)wParam);
             case WM_CTLCOLORBTN:
                 SetBkMode((HDC)wParam, TRANSPARENT);
                 return (LRESULT)GetStockObject(HOLLOW_BRUSH);
@@ -2886,9 +2888,13 @@ HandleTrayContextMenu:
                     break;
 
                 if (IsWindowVisible(hwndStartMenu))
-                    SetWindowPos(hwndStartMenu, 0,0,0,0,0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);
+                {
+                    IMenuPopup_OnSelect(This->StartMenuPopup, MPOS_CANCELLEVEL);
+                }
                 else
+                {
                     SendMessage(This->hWnd, WM_COMMAND, MAKEWPARAM(BN_CLICKED, IDC_STARTBTN), (LPARAM)This->hwndStart);
+                }
 
                 break;
             }
@@ -2922,7 +2928,7 @@ HandleTrayContextMenu:
                         {
                             /* TODO: Implement properly */
 
-                            LPCWSTR strSite = L"http://www.reactos.org/";
+                            LPCWSTR strSite = L"https://www.reactos.org/";
 
                             /* TODO: Make localizable */
                             LPCWSTR strCaption = L"Sorry";