Merge pull request #135 from reactos/master

ROS Merge
Windivs-Devs · Mar 3, 2024 · 97d502a · 97d502a
2 parents a09c3d4 + bbbcd8e
commit 97d502a
Show file tree

Hide file tree

Showing 104 changed files with 1,927 additions and 932 deletions.
diff --git a/base/shell/cmd/cmdinput.c b/base/shell/cmd/cmdinput.c
@@ -218,8 +218,8 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
                         curx = orgx;
                         cury = orgy;
                         //bContinue=TRUE;
-                        break;
                     }
+                    break;
 
                 case _T('D'):
                     /* delete current history entry */
@@ -232,8 +232,8 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
                         ConOutPrintf (_T("%s"), str);
                         GetCursorXY (&curx, &cury);
                         //bContinue=TRUE;
-                        break;
                     }
+                    break;
 #endif /*FEATURE_HISTORY*/
 
                 case _T('M'):
@@ -251,8 +251,16 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
                         str[charcount] = _T('\0');
                         ConOutChar (_T('\n'));
                         bReturn = TRUE;
-                        break;
                     }
+                    break;
+
+                case _T('H'): /* ^H does the same as VK_BACK */
+                    if (dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))
+                    {
+                        bCharInput = FALSE;
+                        goto DoBackSpace;
+                    }
+                    break;
             }
         }
 
@@ -261,6 +269,7 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
         switch (ir.Event.KeyEvent.wVirtualKeyCode)
         {
             case VK_BACK:
+            DoBackSpace:
                 /* <BACKSPACE> - delete character to left of cursor */
                 if (current > 0 && charcount > 0)
                 {

diff --git a/base/shell/rshell/CQuickLaunchBand.h b/base/shell/rshell/CQuickLaunchBand.h
@@ -32,127 +32,96 @@ class CQuickLaunchBand :
     CQuickLaunchBand();
     virtual ~CQuickLaunchBand();
 
+    STDMETHOD(ContainsWindow)(IN HWND hWnd);
+
 // ATL construct
 
     HRESULT FinalConstruct();
 
 // IObjectWithSite
 
-    virtual STDMETHODIMP GetSite(
+    STDMETHOD(GetSite)(
         IN  REFIID riid,
-        OUT void   **ppvSite
-    );
+        OUT void   **ppvSite) override;
 
-    virtual STDMETHODIMP SetSite(
-        IN IUnknown *pUnkSite
-    );
+    STDMETHOD(SetSite)(IN IUnknown *pUnkSite) override;
 
 // IDeskBand
 
-    virtual STDMETHODIMP GetWindow(
-        OUT HWND *phwnd
-    );
+    STDMETHOD(GetWindow)(OUT HWND *phwnd) override;
 
-    virtual STDMETHODIMP ContextSensitiveHelp(
-        IN BOOL fEnterMode
-    );
+    STDMETHOD(ContextSensitiveHelp)(IN BOOL fEnterMode) override;
 
-    virtual STDMETHODIMP ShowDW(
-        IN BOOL bShow
-    );
+    STDMETHOD(ShowDW)(IN BOOL bShow) override;
 
-    virtual STDMETHODIMP CloseDW(
-        IN DWORD dwReserved
-    );
+    STDMETHOD(CloseDW)(IN DWORD dwReserved) override;
 
-    virtual STDMETHODIMP ResizeBorderDW(
+    STDMETHOD(ResizeBorderDW)(
         LPCRECT prcBorder,
         IUnknown *punkToolbarSite,
-        BOOL fReserved
-    );
+        BOOL fReserved) override;
 
-    virtual STDMETHODIMP GetBandInfo(
+    STDMETHOD(GetBandInfo)(
         IN DWORD dwBandID,
         IN DWORD dwViewMode,
-        IN OUT DESKBANDINFO *pdbi
-    );
+        IN OUT DESKBANDINFO *pdbi) override;
 
 // IPersistStream
 
-    virtual STDMETHODIMP GetClassID(
-        OUT CLSID *pClassID
-    );
+    STDMETHOD(GetClassID)(OUT CLSID *pClassID) override;
 
-    virtual STDMETHODIMP GetSizeMax(
-        OUT ULARGE_INTEGER *pcbSize
-    );
+    STDMETHOD(GetSizeMax)(OUT ULARGE_INTEGER *pcbSize) override;
 
-    virtual STDMETHODIMP IsDirty();
+    STDMETHOD(IsDirty)() override;
 
-    virtual STDMETHODIMP Load(
-        IN IStream *pStm
-    );
+    STDMETHOD(Load)(IN IStream *pStm) override;
 
-    virtual STDMETHODIMP Save(
+    STDMETHOD(Save)(
         IN IStream *pStm,
-        IN BOOL    fClearDirty
-    );
+        IN BOOL    fClearDirty) override;
 
 // IWinEventHandler
 
-    virtual STDMETHODIMP ContainsWindow(
-        IN HWND hWnd
-    );
-
-    virtual STDMETHODIMP OnWinEvent(
+    STDMETHOD(OnWinEvent)(
         HWND hWnd,
         UINT uMsg,
         WPARAM wParam,
         LPARAM lParam,
-        LRESULT *theResult
-    );
+        LRESULT *theResult) override;
 
-    virtual STDMETHODIMP IsWindowOwner(
-        HWND hWnd
-    );
+    STDMETHOD(IsWindowOwner)(HWND hWnd) override;
 
 // IOleCommandTarget
 
-    virtual STDMETHODIMP Exec(
+    STDMETHOD(Exec)(
         IN const GUID *pguidCmdGroup,
         IN DWORD nCmdID,
         IN DWORD nCmdexecopt,
         IN VARIANT *pvaIn,
-        IN OUT VARIANT *pvaOut
-    );
+        IN OUT VARIANT *pvaOut) override;
 
-    virtual STDMETHODIMP QueryStatus(
+    STDMETHOD(QueryStatus)(
         IN const GUID *pguidCmdGroup,
         IN ULONG cCmds,
         IN OUT OLECMD prgCmds[],
-        IN OUT OLECMDTEXT *pCmdText
-    );
+        IN OUT OLECMDTEXT *pCmdText) override;
 
 // IContextMenu
-    virtual STDMETHODIMP GetCommandString(
+    STDMETHOD(GetCommandString)(
         UINT_PTR idCmd,
         UINT uFlags,
         UINT *pwReserved,
         LPSTR pszName,
-        UINT cchMax
-    );
+        UINT cchMax) override;
 
-    virtual STDMETHODIMP InvokeCommand(
-        LPCMINVOKECOMMANDINFO pici
-    );
+    STDMETHOD(InvokeCommand)(LPCMINVOKECOMMANDINFO pici) override;
 
-    virtual STDMETHODIMP QueryContextMenu(
+    STDMETHOD(QueryContextMenu)(
         HMENU hmenu,
         UINT indexMenu,
         UINT idCmdFirst,
         UINT idCmdLast,
-        UINT uFlags
-    );
+        UINT uFlags) override;
 
 //*****************************************************************************************************
 
@@ -170,4 +139,4 @@ class CQuickLaunchBand :
         COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
         COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu)
     END_COM_MAP()
-};
+};