refactor: handle HandleMenuMsg properly for onecommander compat

Author: std-microblock

.gitignore

@@ -3,4 +3,5 @@ compile_commands.json
 .xmake
 .cache
 build_info.h
-/test
+/test
+Xenos.log

scripts/inject_onecommander.xpr64

@@ -1,5 +1,5 @@
 <XenosConfig>
-	<imagePath>D:\breeze-shell\build\windows\x64\releasedbg\shell.dll</imagePath>
+	<imagePath>E:\breeze-shell\build\windows\x64\releasedbg\shell.dll</imagePath>
 	<manualMapFlags>0</manualMapFlags>
 	<procName>OneCommander.exe</procName>
 	<hijack>0</hijack>

src/shell/contextmenu/contextmenu.cc

@@ -132,11 +132,18 @@ std::vector<std::string> extract_hotkeys(const std::string &name) {
     return keys;
 }
 
-menu menu::construct_with_hmenu(HMENU hMenu, HWND hWnd, bool is_top) {
+menu menu::construct_with_hmenu(
+    HMENU hMenu, HWND hWnd, bool is_top,
+    std::function<void(int, WPARAM, LPARAM)> HandleMenuMsg) {
     menu m;
 
-    SendMessageW(hWnd, WM_INITMENUPOPUP, reinterpret_cast<WPARAM>(hMenu),
-                 0xFFFFFFFF);
+    if (!HandleMenuMsg)
+        HandleMenuMsg = [=](int message, WPARAM wParam, LPARAM lParam) {
+            SendMessageW(hWnd, message, wParam, lParam);
+        };
+
+    HandleMenuMsg(WM_INITMENUPOPUP, reinterpret_cast<WPARAM>(hMenu),
+                  0xFFFFFFFF);
     for (int i = 0; i < GetMenuItemCount(hMenu); i++) {
         menu_item item;
         wchar_t buffer[256];
@@ -169,13 +176,14 @@ menu menu::construct_with_hmenu(HMENU hMenu, HWND hWnd, bool is_top) {
         }
 
         if (info.hSubMenu) {
-            PostMessageW(hWnd, WM_INITMENUPOPUP,
-                         reinterpret_cast<WPARAM>(info.hSubMenu), 0xFFFFFFFF);
             auto main_thread_id = GetCurrentThreadId();
             item.submenu = [=](std::shared_ptr<menu_widget> mw) {
                 auto task = [&]() {
-                    mw->init_from_data(
-                        menu::construct_with_hmenu(info.hSubMenu, hWnd, false));
+                    HandleMenuMsg(WM_INITMENUPOPUP,
+                                  reinterpret_cast<WPARAM>(info.hSubMenu),
+                                  0xFFFFFFFF);
+                    mw->init_from_data(menu::construct_with_hmenu(
+                        info.hSubMenu, hWnd, false, HandleMenuMsg));
                 };
                 if (main_thread_id == GetCurrentThreadId())
                     task();

src/shell/contextmenu/contextmenu.h

@@ -18,8 +18,13 @@ struct menu {
     void *parent_window = nullptr;
     bool is_top_level = false;
 
-    static menu construct_with_hmenu(HMENU hMenu, HWND hWnd,
-                                     bool is_top = true);
+    static menu
+    construct_with_hmenu(HMENU hMenu, HWND hWnd, bool is_top = true,
+                         // This is for handling submenus; messages are required
+                         // to be forwarded to IContextMenu2::HandleMenuMsg for
+                         // submenus and owner-draw menus to work properly
+                         std::function<void(int, WPARAM, LPARAM)>
+                             HandleMenuMsg = {});
 };
 
 std::optional<int>

src/shell/contextmenu/hooks.cc

@@ -31,8 +31,7 @@ mb_shell::track_popup_menu(mb_shell::menu menu, int x, int y,
             set_thread_name("breeze::context_menu_renderer");
             perf_counter perf("mb_shell::track_popup_menu");
 
-            bool shift_pressed =
-                (GetKeyState(VK_SHIFT) & 0x8000) != 0;
+            bool shift_pressed = (GetKeyState(VK_SHIFT) & 0x8000) != 0;
 
             auto menu_render = menu_render::create(x, y, menu, run_js);
             menu_render.rt->last_time = menu_render.rt->clock.now();
@@ -78,7 +77,6 @@ mb_shell::track_popup_menu(mb_shell::menu menu, int x, int y,
     qjs::wait_with_msgloop([&]() { selected_menu_future.wait(); });
 
     auto selected_menu = selected_menu_future.get();
-    mb_shell::context_menu_hooks::block_js_reload.fetch_sub(1);
 
     return selected_menu;
 }
@@ -112,7 +110,7 @@ void mb_shell::context_menu_hooks::install_common_hook() {
             PostMessageW(hWnd, WM_COMMAND, *selected_menu, 0);
             PostMessageW(hWnd, WM_NULL, 0, 0);
         }
-
+        mb_shell::context_menu_hooks::block_js_reload.fetch_sub(1);
         return (int32_t)selected_menu.value_or(0);
     });
 }
@@ -224,40 +222,46 @@ void mb_shell::context_menu_hooks::install_SHCreateDefaultContextMenu_hook() {
             auto res = SHCreateDefaultContextMenu(def, riid, ppv);
             SHCreateDefaultContextMenuHook->install();
 
-            IContextMenu *pdcm = (IContextMenu *)*ppv;
+            IContextMenu *pdcm = (IContextMenu *)(*ppv);
             if (SUCCEEDED(res) && pdcm) {
-                IContextMenu2 *pcm2 = NULL;
-
-                int pcmType = 0;
-                UpgradeContextMenu(pdcm, reinterpret_cast<void **>(&pcm2),
-                                   &pcmType);
-
-                IContextMenu *pCM(pcm2);
+                CComPtr<IContextMenu> pCM(pdcm);
 
                 HMENU hmenu = CreatePopupMenu();
                 pCM->QueryContextMenu(hmenu, 0, 1, 0x7FFF,
                                       CMF_EXPLORE | CMF_CANRENAME);
 
-                POINT pt;
-                GetCursorPos(&pt);
-
-                int res = TrackPopupMenuEx(
-                    hmenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD,
-                    pt.x, pt.y, def->hwnd, NULL);
-
-                if (res > 0) {
-                    CMINVOKECOMMANDINFOEX ici = {};
-                    ici.cbSize = sizeof(CMINVOKECOMMANDINFOEX);
-                    ici.hwnd = def->hwnd;
-                    ici.fMask = 0x100000; /* CMIC_MASK_UNICODE */
-                    ici.lpVerb = MAKEINTRESOURCEA(res - 1);
-                    ici.lpVerbW = MAKEINTRESOURCEW(res - 1);
-                    ici.nShow = SW_SHOWNORMAL;
+                CComPtr<IContextMenu2> pCM2 = NULL;
+                if (SUCCEEDED(pCM->QueryInterface(&pCM2))) {
+                    POINT pt;
+                    GetCursorPos(&pt);
+                    auto hwndOwner = def->hwnd;
+                    entry::main_window_loop_hook.install(hwndOwner);
+                    block_js_reload.fetch_add(1);
+                    perf_counter perf("TrackPopupMenuEx");
+                    menu menu = menu::construct_with_hmenu(
+                        hmenu, hwndOwner, true,
+                        [=](int message, WPARAM wParam, LPARAM lParam) {
+                            pCM2->HandleMenuMsg(message, wParam, lParam);
+                        });
+                    perf.end("construct_with_hmenu");
+
+                    auto selected_menu = track_popup_menu(menu, pt.x, pt.y);
+                    mb_shell::context_menu_hooks::block_js_reload.fetch_sub(1);
+
+                    if (selected_menu) {
+                        CMINVOKECOMMANDINFOEX ici = {};
+                        ici.cbSize = sizeof(CMINVOKECOMMANDINFOEX);
+                        ici.hwnd = hwndOwner;
+                        ici.fMask = 0x100000; /* CMIC_MASK_UNICODE */
+                        ici.lpVerb = MAKEINTRESOURCEA(*selected_menu - 1);
+                        ici.lpVerbW = MAKEINTRESOURCEW(*selected_menu - 1);
+                        ici.nShow = SW_SHOWNORMAL;
+
+                        pCM->InvokeCommand((LPCMINVOKECOMMANDINFO)&ici);
+                    }
 
-                    pCM->InvokeCommand((LPCMINVOKECOMMANDINFO)&ici);
+                    close_next_create_window_exw_window = true;
                 }
-
-                close_next_create_window_exw_window = true;
             }
 
             return res;

xmake.lua

@@ -18,7 +18,7 @@ includes("dependencies/breeze-ui.lua")
 
 set_runtimes("MT")
 add_requires("breeze-glfw", {alias = "glfw"})
-add_requires("blook 3524a931af49be471840e5312fb0c18e888706fd", "glad",
+add_requires("blook dd51b45ad765274a0b5394b70d9982c948e26c74", "glad",
     "reflect-cpp", "wintoast v1.3.1", "cpptrace v0.8.3", "breeze-ui")
 
 if has_config("asan") then