More fixes for menus and combo boxes.

CMakeLists.txt

@@ -8,6 +8,7 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
 find_program(WIDL_EXECUTABLE widl REQUIRED)
 find_program(MINGW_C_COMPILER x86_64-w64-mingw32-gcc REQUIRED)
+find_program(MINGW32_C_COMPILER i686-w64-mingw32-gcc REQUIRED)
 
 # A PE hook DLL can be loaded into ordinary Wine applications without any
 # GLib dependencies. Keep it alongside the Winelib helper.
@@ -21,6 +22,19 @@ add_custom_command(OUTPUT "${menu_hook}"
     VERBATIM)
 add_custom_target(wine-access-menu ALL DEPENDS "${menu_hook}")
 
+set(menu_hook32 "${CMAKE_CURRENT_BINARY_DIR}/wine-access-menu32.dll")
+set(menu_host32 "${CMAKE_CURRENT_BINARY_DIR}/wine-access-menu-host32.exe")
+add_custom_command(OUTPUT "${menu_hook32}" "${menu_host32}"
+    COMMAND "${MINGW32_C_COMPILER}" -std=c11 -O2 -Wall -Wextra -shared
+            -static-libgcc -Wl,--kill-at -DWINE_ACCESS_MENU_ONLY -o "${menu_hook32}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/menu_hook.c" -luser32
+    COMMAND "${MINGW32_C_COMPILER}" -std=c11 -O2 -Wall -Wextra -mwindows
+            -static-libgcc -o "${menu_host32}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/menu_host32.c" -luser32
+    DEPENDS menu_hook.c menu_bridge.h menu_host32.c
+    VERBATIM)
+add_custom_target(wine-access-menu32 ALL DEPENDS "${menu_hook32}" "${menu_host32}")
+
 set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
 set(generated_header "${generated_dir}/nvdaController.h")
 set(generated_server "${generated_dir}/nvdaController_s.c")
@@ -34,7 +48,7 @@ add_custom_command(
     VERBATIM)
 
 add_executable(cthulhu-wine-access main.cpp list_view.cpp native_items.cpp "${generated_server}")
-add_dependencies(cthulhu-wine-access wine-access-menu)
+add_dependencies(cthulhu-wine-access wine-access-menu wine-access-menu32)
 target_compile_features(cthulhu-wine-access PRIVATE cxx_std_20)
 target_include_directories(cthulhu-wine-access PRIVATE "${generated_dir}")
 target_link_libraries(cthulhu-wine-access PRIVATE
@@ -62,4 +76,6 @@ install(PROGRAMS
 install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/cthulhu-wine-access.exe.so"
     "${menu_hook}"
+    "${menu_hook32}"
+    "${menu_host32}"
     DESTINATION "${WINE_ACCESS_INSTALL_DIR}")