Merge branch 'main' into win-arm64-msvc

Author: qurious-pixel

.gdbinit

@@ -0,0 +1,47 @@
+python
+
+import gdb
+import re
+
+
+class BetypePrinter:
+    PATTERN = re.compile("^betype<.*>$")
+
+    def __init__(self, obj):
+        self._obj = obj
+
+    def to_string(self):
+        underlying = self._obj["m_value"]
+        reversed_bytes = bytes(reversed(underlying.bytes))
+        return gdb.Value(reversed_bytes, underlying.type)
+
+class MemptrPrinter:
+    PATTERN = re.compile("^MEMPTR<.*>$")
+
+    def __init__(self, obj):
+        self._ptr_type = obj.type.strip_typedefs().unqualified().template_argument(0).pointer()
+        self._guest_address = obj["m_value"].cast(gdb.lookup_type("uint32"))
+
+    def ptr(self):
+        if self._guest_address == 0:
+            return gdb.Value(0, self._ptr_type)
+        base_addr = gdb.parse_and_eval('memory_base', global_context=True)
+        return (self._guest_address + base_addr).reinterpret_cast(self._ptr_type)
+
+    def children(self):
+        return [("raw", self.ptr())]
+
+    def to_string(self):
+        return self._guest_address.format_string(format="x")
+
+def lookup(val):
+    tag = val.type.strip_typedefs().unqualified().tag
+    if tag is None:
+        return None
+    printers = [BetypePrinter, MemptrPrinter]
+    for printer in printers:
+        if printer.PATTERN.match(tag):
+            return printer(val)
+    return None
+
+gdb.pretty_printers.append(lookup)

CMakeLists.txt

@@ -51,8 +51,8 @@ if (ENABLE_VCPKG)
 	# CONFIG option
 	set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
 	if (WIN32)
-		message(STATUS "CPU Arch is: $ENV{PROCESSOR_ARCHITECTURE}")  
-		if($ENV{PROCESSOR_ARCHITECTURE} MATCHES "x86_64|amd64|AMD64")
+		message(STATUS "CPU Arch is: $ENV{CEMU_ARCHITECTURE}")  
+		if($ENV{CEMU_ARCHITECTURE} MATCHES "x86_64|amd64|AMD64")
 			set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "" FORCE)
 			set(VCPKG_HOST_TRIPLET "x64-windows-static" CACHE STRING "" FORCE)
         else()
@@ -169,7 +169,7 @@ find_package(ZLIB REQUIRED)
 find_package(zstd MODULE REQUIRED) # MODULE so that zstd::zstd is available
 find_package(OpenSSL COMPONENTS Crypto SSL REQUIRED)
 find_package(glm REQUIRED)
-find_package(fmt 9 REQUIRED)
+find_package(fmt 12.1 REQUIRED)
 find_package(PNG REQUIRED)
 
 if(ENABLE_SDL)

README.md

@@ -50,5 +50,17 @@ If coding isn't your thing, testing games and making detailed bug reports or upd
 
 Questions about Cemu's software architecture can also be answered on Discord (or through the Matrix bridge).
 
+#### AI generated contributions:
+
+We ask that all code submitted is written and understood by a human. You can use AI for planning, designing, reviewing and for asking questions about the codebase, but the code itself needs to be written by you. As a small exception you can use intellisense-style AI code autocompletion for pure boilerplate code as long as it's only a small part of your submission. To further clarify, when we ask for "human written" that excludes letting an AI write the code and then paraphrasing it. In other words, we are asking for human effort.
+
+Why this policy exists:
+
+We have relatively low reviewing capacity and requiring human-written code increases the quality and trustworthyness of submitted pull requests. There are also general concerns with AI usage in emulation:
+- LLMs tend to make up solutions that work on the surface but are generally not accurate in the emulation sense
+- There is evidence that LLMs have been trained on leaked proprietary SDKs and we cannot verify the origin of the knowledge. This is especially a problem for core emulation logic
+
+Please keep these points in mind when contributing to Cemu. Contributions that do not follow this policy may be rejected.
+
 ## License
 Cemu is licensed under [Mozilla Public License 2.0](/LICENSE.txt). Exempt from this are all files in the dependencies directory for which the licenses of the original code apply as well as some individual files in the src folder, as specified in those file headers respectively.

dependencies/ih264d/common/armv8/ih264_weighted_bi_pred_av8.s

@@ -142,6 +142,9 @@ ih264_weighted_bi_pred_luma_av8:
     sxtw      x4, w4
     sxtw      x5, w5
     stp       x19, x20, [sp, #-16]!
+    add       w6, w6, #1                //w6  = log_WD + 1
+    neg       w10, w6                   //w10 = -(log_WD + 1)
+    dup       v0.8h, w10                //Q0  = -(log_WD + 1) (32-bit)
 #ifndef __APPLE__
     ldr       w8, [sp, #80]             //Load wt2 in w8
     ldr       w9, [sp, #88]             //Load ofst1 in w9
@@ -155,9 +158,6 @@ ih264_weighted_bi_pred_luma_av8:
     ldr       w11,  [sp, #92]           //Load ht in w11
     ldr       w12,  [sp, #96]           //Load wd in w12
 #endif
-    add       w6, w6, #1                //w6  = log_WD + 1
-    neg       w10, w6                   //w10 = -(log_WD + 1)
-    dup       v0.8h, w10                //Q0  = -(log_WD + 1) (32-bit)
     add       w9, w9, #1                //w9 = ofst1 + 1
     add       w9, w9, w10               //w9 = ofst1 + ofst2 + 1
     mov       v2.s[0], w7

dist/windows/Cemu.manifest

@@ -2,7 +2,7 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
     <dependency>
         <dependentAssembly>
-            <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
+            <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
         </dependentAssembly>
     </dependency>
     <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges>

src/Cafe/CafeSystem.cpp

@@ -499,21 +499,43 @@ namespace CafeSystem
 	std::string GetWindowsNamedVersion(uint32& buildNumber)
 	{
 		char productName[256];
+		char buildNumberStr[32];
+		char featureVersion[32];
 		HKEY hKey;
 		DWORD dwType = REG_SZ;
 		DWORD dwSize = sizeof(productName);
+		buildNumber = 0;
+		featureVersion[0] = '\0';
 		if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
 		{
 			if (RegQueryValueExA(hKey, "ProductName", NULL, &dwType, (LPBYTE)productName, &dwSize) != ERROR_SUCCESS)
 				strcpy(productName, "Windows");
+			dwType = REG_SZ;
+			dwSize = sizeof(buildNumberStr);
+			if (RegQueryValueExA(hKey, "CurrentBuildNumber", NULL, &dwType, (LPBYTE)buildNumberStr, &dwSize) == ERROR_SUCCESS)
+				buildNumber = (uint32)atoi(buildNumberStr);
+			dwType = REG_SZ;
+			dwSize = sizeof(featureVersion);
+			if (RegQueryValueExA(hKey, "DisplayVersion", NULL, &dwType, (LPBYTE)featureVersion, &dwSize) != ERROR_SUCCESS)
+			{
+				dwType = REG_SZ;
+				dwSize = sizeof(featureVersion);
+				if (RegQueryValueExA(hKey, "ReleaseId", NULL, &dwType, (LPBYTE)featureVersion, &dwSize) != ERROR_SUCCESS)
+					featureVersion[0] = '\0';
+			}
 			RegCloseKey(hKey);
 		}
-		OSVERSIONINFO osvi;
-		ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
-		osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-		GetVersionEx(&osvi);
-		buildNumber = osvi.dwBuildNumber;
-		return std::string(productName);
+		std::string result(productName);
+		// ProductName still reads as "Windows 10" on Windows 11. Find and replace with "Windows 11" based on build number.
+		if (buildNumber >= 22000)
+		{
+			size_t pos = result.find("Windows 10");
+			if (pos != std::string::npos)
+				result.replace(pos, 10, "Windows 11");
+		}
+		if (featureVersion[0] != '\0')
+			result += fmt::format(" {}", featureVersion);
+		return result;
 	}
 	#endif
 
@@ -950,19 +972,30 @@ namespace CafeSystem
 	{
 		if (sLaunchModeIsStandalone)
 			return CosCapabilityBits::All;
+
+		CosCapabilityBits resultMask = static_cast<CosCapabilityBits>(0);
+		for (const auto& pack : GraphicPack2::GetActiveGraphicPacks())
+		{
+			for (const auto& permissionOverrides : pack->GetPermissionOverrides()) 
+			{
+				if (permissionOverrides.first == group)
+					resultMask |= static_cast<CosCapabilityBits>(permissionOverrides.second);
+			}
+		}
+
 		auto& update = sGameInfo_ForegroundTitle.GetUpdate();
 		if (update.IsValid())
 		{
 			ParsedCosXml* cosXml = update.GetCosInfo();
 			if (cosXml)
-				return cosXml->GetCapabilityBits(group);
+				return cosXml->GetCapabilityBits(group) | resultMask;
 		}
 		auto& base = sGameInfo_ForegroundTitle.GetBase();
 		if(base.IsValid())
 		{
 			ParsedCosXml* cosXml = base.GetCosInfo();
 			if (cosXml)
-				return cosXml->GetCapabilityBits(group);
+				return cosXml->GetCapabilityBits(group) | resultMask;
 		}
 		return CosCapabilityBits::All;
 	}

src/Cafe/GraphicPack/GraphicPack2.cpp

@@ -451,6 +451,39 @@ GraphicPack2::GraphicPack2(fs::path rulesPath, IniParser& rules)
 				}
 			}
 		}
+		else if (boost::iequals(currentSectionName, "Permissions")) 
+		{
+			std::array<std::pair<std::string_view, CosCapabilityGroup>, 15> permissionTable
+			{{
+				{"BSP",  CosCapabilityGroup::BSP},
+				{"DK",   CosCapabilityGroup::DK},
+				{"USB",  CosCapabilityGroup::USB},
+				{"UHS",  CosCapabilityGroup::UHS},
+				{"FS",   CosCapabilityGroup::FS},
+				{"MCP",  CosCapabilityGroup::MCP},
+				{"NIM",  CosCapabilityGroup::NIM},
+				{"ACT",  CosCapabilityGroup::ACT},
+				{"FPD",  CosCapabilityGroup::FPD},
+				{"BOSS", CosCapabilityGroup::BOSS},
+				{"ACP",  CosCapabilityGroup::ACP},
+				{"PDM",  CosCapabilityGroup::PDM},
+				{"AC",   CosCapabilityGroup::AC},
+				{"NDM",  CosCapabilityGroup::NDM},
+				{"NSEC", CosCapabilityGroup::NSEC}
+			}};
+
+			for (const auto& [name, group] : permissionTable)
+			{
+				const auto permissionOption = rules.FindOption(name);
+				if (permissionOption)
+				{
+					cemuLog_log(LogType::Force, "Graphic pack \"{}\": has permission mask {} for {}", GetNormalizedPathString(), *permissionOption, name);
+					uint64 permissionMask = ConvertString<uint64>(*permissionOption, 16);
+					m_permissions.push_back({group, permissionMask});
+				}
+
+			}
+		}
 	}
 
 	if (m_version >= 5)

src/Cafe/GraphicPack/GraphicPack2.h

@@ -2,6 +2,7 @@
 
 #include "util/helpers/helpers.h"
 #include "Cemu/ExpressionParser/ExpressionParser.h"
+#include "Cafe/TitleList/TitleInfo.h"
 #include "Cafe/HW/Latte/Renderer/RendererOuputShader.h"
 #include "util/helpers/Serializer.h"
 #include "Cafe/OS/RPL/rpl.h"
@@ -147,6 +148,9 @@ class GraphicPack2
 
 	[[nodiscard]] const std::vector<PresetPtr>& GetPresets() const { return m_presets; }
 	[[nodiscard]] std::unordered_map<std::string, std::vector<PresetPtr>> GetCategorizedPresets(std::vector<std::string>& order) const;
+	
+	// permissions
+	const std::vector<std::pair<CosCapabilityGroup, uint64>>& GetPermissionOverrides() { return m_permissions; }
 
 	// shaders
 	void LoadShaders();
@@ -264,6 +268,9 @@ class GraphicPack2
 
 	// ram mappings
 	std::vector<std::pair<MPTR, MPTR>> m_ramMappings;
+	
+	// permissions
+	std::vector<std::pair<CosCapabilityGroup, uint64>> m_permissions;
 
 	// patches
 	void LoadPatchFiles(); // loads Cemuhook or Cemu patches