Changeset 107099 in vbox

Timestamp:

Nov 22, 2024 1:44:29 AM (8 weeks ago)

Author:

vboxsync

Message:

IPRT: Adding RTArchValToString and RTSystemGetNativeArch for detecting win.amd64 binaries running in an emulator in win.arm64 and suchlike. jiraref:VBP-1466

Location:

trunk

Files:

• include/iprt/arch.h (added)
• include/iprt/mangling.h (modified) (2 diffs)
• include/iprt/system.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (9 diffs)
• src/VBox/Runtime/common/misc/RTArchValToString.cpp (added)
• src/VBox/Runtime/r3/generic/RTSystemGetNativeArch-r3-generic.cpp (added)
• src/VBox/Runtime/r3/nt/fs-nt.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/win/RTSystemGetNativeArch-win.cpp (added)

trunk/include/iprt/mangling.h

@@ -425 +425 @@
 # define RTAcpiTblUuidAppend                            RT_MANGLER(RTAcpiTblUuidAppend)
 # define RTAcpiTblUuidAppendFromStr                     RT_MANGLER(RTAcpiTblUuidAppendFromStr)
+# define RTArchValToString                              RT_MANGLER(RTArchValToString)
 # define RTAssertAreQuiet                               RT_MANGLER(RTAssertAreQuiet)
 # define RTAssertMayPanic                               RT_MANGLER(RTAssertMayPanic)
@@ -2510 +2511 @@
 # define RTSymlinkRead                                  RT_MANGLER(RTSymlinkRead)
 # define RTSymlinkReadA                                 RT_MANGLER(RTSymlinkReadA)
+# define RTSystemGetNativeArch                          RT_MANGLER(RTSystemGetNativeArch)
 # define RTSystemGetPageSize                            RT_MANGLER(RTSystemGetPageSize)
 # define RTSystemGetPageOffsetMask                      RT_MANGLER(RTSystemGetPageOffsetMask)

trunk/include/iprt/system.h

@@ -192 +192 @@
  */
 RTDECL(size_t) RTSystemPageAlignSize(size_t cb);
+
+
+/**
+ * Get the architecture the OS is actually running on.
+ *
+ * This bypasses WoW64, Rosetta(2), and similar application compatibility
+ * emulators.
+ *
+ * @returns RT_ARCH_VAL_XXX
+ *
+ * @sa      RTArchValToString
+ */
+RTDECL(uint32_t) RTSystemGetNativeArch(void);
 
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -585 +585 @@
         common/log/RTLogCreateEx.cpp \
         common/math/bignum.cpp \
+        common/misc/RTArchValToString.cpp \
         common/misc/RTAssertMsg1Weak.cpp \
         common/misc/RTAssertMsg2.cpp \
@@ -1088 +1089 @@
         r3/win/RTLocaleQueryNormalizedBaseLocaleName-win.cpp \
         r3/win/RTLocaleQueryUserCountryCode-win.cpp \
+        r3/win/RTSystemGetNativeArch-win.cpp \
         r3/win/RTSystemQueryOSInfo-win.cpp \
         r3/win/RTSystemShutdown-win.cpp \
@@ -1172 +1174 @@
         r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
+        r3/generic/RTSystemGetNativeArch-r3-generic.cpp \
         r3/generic/dirrel-r3-generic.cpp \
         r3/posix/allocex-r3-posix.cpp \
@@ -1319 +1322 @@
         r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
+        r3/generic/RTSystemGetNativeArch-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
         r3/generic/dirrel-r3-generic.cpp \
@@ -1409 +1413 @@
         r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
+        r3/generic/RTSystemGetNativeArch-r3-generic.cpp \
         r3/generic/dirrel-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
@@ -1512 +1517 @@
         r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
+        r3/generic/RTSystemGetNativeArch-r3-generic.cpp \
         r3/generic/dirrel-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
@@ -1596 +1602 @@
         r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
+        r3/generic/RTSystemGetNativeArch-r3-generic.cpp \
         r3/generic/dirrel-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
@@ -1672 +1679 @@
         r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
+        r3/generic/RTSystemGetNativeArch-r3-generic.cpp \
         r3/generic/dirrel-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
@@ -1784 +1792 @@
         r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
         r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
+        r3/generic/RTSystemGetNativeArch-r3-generic.cpp \
         r3/generic/RTTimeZoneGetCurrent-generic.cpp \
         r3/generic/dirrel-r3-generic.cpp \

trunk/src/VBox/Runtime/r3/nt/fs-nt.cpp

@@ -185 +185 @@
 
                 /* figure the remote stuff */
-                pProperties->fRemote          = RT_BOOL(FsDevInfo.Characteristics & FILE_REMOTE_DEVICE);
+                pProperties->fRemote          = (FsDevInfo.Characteristics & FILE_REMOTE_DEVICE)
+                                             || FsDevInfo.DeviceType == FILE_DEVICE_NETWORK
+                                             || FsDevInfo.DeviceType == FILE_DEVICE_NETWORK_FILE_SYSTEM;
             }
             else