3 files changed, 58 insertions, 4 deletions

diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
index 2093f552ce..074d40bf4b 100644
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -5497,6 +5497,32 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
 		GetImmersiveColorFromColorSetEx = (GetImmersiveColorFromColorSetExPtr)GetProcAddress(ux_theme_lib, MAKEINTRESOURCEA(95));
 		GetImmersiveColorTypeFromName = (GetImmersiveColorTypeFromNamePtr)GetProcAddress(ux_theme_lib, MAKEINTRESOURCEA(96));
 		GetImmersiveUserColorSetPreference = (GetImmersiveUserColorSetPreferencePtr)GetProcAddress(ux_theme_lib, MAKEINTRESOURCEA(98));
+		if (os_ver.dwBuildNumber >= 17763) {
+			AllowDarkModeForAppPtr AllowDarkModeForApp = nullptr;
+			SetPreferredAppModePtr SetPreferredAppMode = nullptr;
+			FlushMenuThemesPtr FlushMenuThemes = nullptr;
+			if (os_ver.dwBuildNumber < 18362) {
+				AllowDarkModeForApp = (AllowDarkModeForAppPtr)GetProcAddress(ux_theme_lib, MAKEINTRESOURCEA(135));
+			} else {
+				SetPreferredAppMode = (SetPreferredAppModePtr)GetProcAddress(ux_theme_lib, MAKEINTRESOURCEA(135));
+				FlushMenuThemes = (FlushMenuThemesPtr)GetProcAddress(ux_theme_lib, MAKEINTRESOURCEA(136));
+			}
+			RefreshImmersiveColorPolicyStatePtr RefreshImmersiveColorPolicyState = (RefreshImmersiveColorPolicyStatePtr)GetProcAddress(ux_theme_lib, MAKEINTRESOURCEA(104));
+			if (ShouldAppsUseDarkMode) {
+				bool dark_mode = ShouldAppsUseDarkMode();
+				if (SetPreferredAppMode) {
+					SetPreferredAppMode(dark_mode ? APPMODE_ALLOWDARK : APPMODE_DEFAULT);
+				} else if (AllowDarkModeForApp) {
+					AllowDarkModeForApp(dark_mode);
+				}
+				if (RefreshImmersiveColorPolicyState) {
+					RefreshImmersiveColorPolicyState();
+				}
+				if (FlushMenuThemes) {
+					FlushMenuThemes();
+				}
+			}
+		}
 
 		ux_theme_available = ShouldAppsUseDarkMode && GetImmersiveColorFromColorSetEx && GetImmersiveColorTypeFromName && GetImmersiveUserColorSetPreference;
 		if (os_ver.dwBuildNumber >= 18363) {
diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h
index 910b9baa45..1191f22968 100644
--- a/platform/windows/display_server_windows.h
+++ b/platform/windows/display_server_windows.h
@@ -154,11 +154,23 @@ typedef UINT(WINAPI *WTInfoPtr)(UINT p_category, UINT p_index, LPVOID p_output);
 typedef BOOL(WINAPI *WTPacketPtr)(HANDLE p_ctx, UINT p_param, LPVOID p_packets);
 typedef BOOL(WINAPI *WTEnablePtr)(HANDLE p_ctx, BOOL p_enable);
 
+enum PreferredAppMode {
+	APPMODE_DEFAULT = 0,
+	APPMODE_ALLOWDARK = 1,
+	APPMODE_FORCEDARK = 2,
+	APPMODE_FORCELIGHT = 3,
+	APPMODE_MAX = 4
+};
+
 typedef bool(WINAPI *ShouldAppsUseDarkModePtr)();
 typedef DWORD(WINAPI *GetImmersiveColorFromColorSetExPtr)(UINT dwImmersiveColorSet, UINT dwImmersiveColorType, bool bIgnoreHighContrast, UINT dwHighContrastCacheMode);
 typedef int(WINAPI *GetImmersiveColorTypeFromNamePtr)(const WCHAR *name);
 typedef int(WINAPI *GetImmersiveUserColorSetPreferencePtr)(bool bForceCheckRegistry, bool bSkipCheckOnFail);
 typedef HRESULT(WINAPI *RtlGetVersionPtr)(OSVERSIONINFOW *lpVersionInformation);
+typedef bool(WINAPI *AllowDarkModeForAppPtr)(bool darkMode);
+typedef PreferredAppMode(WINAPI *SetPreferredAppModePtr)(PreferredAppMode appMode);
+typedef void(WINAPI *RefreshImmersiveColorPolicyStatePtr)();
+typedef void(WINAPI *FlushMenuThemesPtr)();
 
 // Windows Ink API
 #ifndef POINTER_STRUCTURES
diff --git a/platform/windows/native_menu_windows.cpp b/platform/windows/native_menu_windows.cpp
index 13d1cc2a67..40a08f87df 100644
--- a/platform/windows/native_menu_windows.cpp
+++ b/platform/windows/native_menu_windows.cpp
@@ -141,7 +141,7 @@ RID NativeMenuWindows::create_menu() {
 	ZeroMemory(&menu_info, sizeof(menu_info));
 	menu_info.cbSize = sizeof(menu_info);
 	menu_info.fMask = MIM_STYLE;
-	menu_info.dwStyle = MNS_NOTIFYBYPOS | MNS_MODELESS;
+	menu_info.dwStyle = MNS_NOTIFYBYPOS;
 	SetMenuInfo(md->menu, &menu_info);
 
 	RID rid = menus.make_rid(md);
@@ -189,7 +189,9 @@ void NativeMenuWindows::popup(const RID &p_rid, const Vector2i &p_position) {
 	if (md->is_rtl) {
 		flags |= TPM_LAYOUTRTL;
 	}
+	SetForegroundWindow(hwnd);
 	TrackPopupMenuEx(md->menu, flags, p_position.x, p_position.y, hwnd, nullptr);
+	PostMessage(hwnd, WM_NULL, 0, 0);
 }
 
 void NativeMenuWindows::set_interface_direction(const RID &p_rid, bool p_is_rtl) {
@@ -556,9 +558,16 @@ int NativeMenuWindows::find_item_index_with_text(const RID &p_rid, const String
 		ZeroMemory(&item, sizeof(item));
 		item.cbSize = sizeof(item);
 		item.fMask = MIIM_STRING;
+		item.dwTypeData = nullptr;
 		if (GetMenuItemInfoW(md->menu, i, true, &item)) {
-			if (String::utf16((const char16_t *)item.dwTypeData) == p_text) {
-				return i;
+			item.cch++;
+			Char16String str;
+			str.resize(item.cch);
+			item.dwTypeData = (LPWSTR)str.ptrw();
+			if (GetMenuItemInfoW(md->menu, i, true, &item)) {
+				if (String::utf16((const char16_t *)str.get_data()) == p_text) {
+					return i;
+				}
 			}
 		}
 	}
@@ -700,8 +709,15 @@ String NativeMenuWindows::get_item_text(const RID &p_rid, int p_idx) const {
 	ZeroMemory(&item, sizeof(item));
 	item.cbSize = sizeof(item);
 	item.fMask = MIIM_STRING;
+	item.dwTypeData = nullptr;
 	if (GetMenuItemInfoW(md->menu, p_idx, true, &item)) {
-		return String::utf16((const char16_t *)item.dwTypeData);
+		item.cch++;
+		Char16String str;
+		str.resize(item.cch);
+		item.dwTypeData = (LPWSTR)str.ptrw();
+		if (GetMenuItemInfoW(md->menu, p_idx, true, &item)) {
+			return String::utf16((const char16_t *)str.get_data());
+		}
 	}
 	return String();
 }