[Mingw-w64-public] [PATCH 27/37] headers: allow some sysinfoapi.h functions in winstore builds

[Steve Lhomme]

https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getsystemdirectorya
https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getsystemdirectoryw
https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getlogicalprocessorinformation
https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getlogicalprocessorinformationex
https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-enumsystemfirmwaretables
https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getsystemfirmwaretable
https://docs.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-sysinfo-l1-2-0dll
---
 mingw-w64-headers/include/sysinfoapi.h | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/mingw-w64-headers/include/sysinfoapi.h 
b/mingw-w64-headers/include/sysinfoapi.h
index b40465a7..dfacf629 100644
--- a/mingw-w64-headers/include/sysinfoapi.h
+++ b/mingw-w64-headers/include/sysinfoapi.h
@@ -83,8 +83,6 @@ extern "C" {
 
   WINBASEAPI WINBOOL WINAPI SetLocalTime (CONST SYSTEMTIME *lpSystemTime);
   WINBASEAPI WINBOOL WINAPI GetSystemTimeAdjustment (PDWORD lpTimeAdjustment, 
PDWORD lpTimeIncrement, PBOOL lpTimeAdjustmentDisabled);
-  WINBASEAPI UINT WINAPI GetSystemDirectoryA (LPSTR lpBuffer, UINT uSize);
-  WINBASEAPI UINT WINAPI GetSystemDirectoryW (LPWSTR lpBuffer, UINT uSize);
   WINBASEAPI UINT WINAPI GetWindowsDirectoryA (LPSTR lpBuffer, UINT uSize);
   WINBASEAPI UINT WINAPI GetWindowsDirectoryW (LPWSTR lpBuffer, UINT uSize);
   WINBASEAPI UINT WINAPI GetSystemWindowsDirectoryA (LPSTR lpBuffer, UINT 
uSize);
@@ -93,15 +91,8 @@ extern "C" {
   WINBASEAPI WINBOOL WINAPI GetComputerNameExW (COMPUTER_NAME_FORMAT NameType, 
LPWSTR lpBuffer, LPDWORD nSize);
   WINBASEAPI WINBOOL WINAPI SetComputerNameExW (COMPUTER_NAME_FORMAT NameType, 
LPCWSTR lpBuffer);
   WINBASEAPI WINBOOL WINAPI SetSystemTime (CONST SYSTEMTIME *lpSystemTime);
-  WINBASEAPI WINBOOL WINAPI GetLogicalProcessorInformation 
(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION Buffer, PDWORD ReturnedLength);
   NTSYSAPI ULONGLONG NTAPI VerSetConditionMask (ULONGLONG ConditionMask, ULONG 
TypeMask, UCHAR Condition);
-  WINBASEAPI UINT WINAPI EnumSystemFirmwareTables (DWORD 
FirmwareTableProviderSignature, PVOID pFirmwareTableEnumBuffer, DWORD 
BufferSize);
-  WINBASEAPI UINT WINAPI GetSystemFirmwareTable (DWORD 
FirmwareTableProviderSignature, DWORD FirmwareTableID, PVOID 
pFirmwareTableBuffer, DWORD BufferSize);
-#if _WIN32_WINNT >= 0x0600
-  WINBASEAPI WINBOOL WINAPI GetProductInfo (DWORD dwOSMajorVersion, DWORD 
dwOSMinorVersion, DWORD dwSpMajorVersion, DWORD dwSpMinorVersion, PDWORD 
pdwReturnedProductType);
-#endif
 #if _WIN32_WINNT >= 0x0601
-  WINBASEAPI WINBOOL WINAPI GetLogicalProcessorInformationEx 
(LOGICAL_PROCESSOR_RELATIONSHIP RelationshipType, 
PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX Buffer, PDWORD ReturnedLength);
   WINBASEAPI WINBOOL WINAPI GetOsSafeBootMode (PDWORD Flags);
 #endif
 
@@ -118,6 +109,20 @@ extern "C" {
   WINBASEAPI DWORD WINAPI GetTickCount (VOID);
 #endif
 
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)
+  WINBASEAPI UINT WINAPI GetSystemDirectoryA (LPSTR lpBuffer, UINT uSize);
+  WINBASEAPI UINT WINAPI GetSystemDirectoryW (LPWSTR lpBuffer, UINT uSize);
+  WINBASEAPI WINBOOL WINAPI GetLogicalProcessorInformation 
(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION Buffer, PDWORD ReturnedLength);
+  WINBASEAPI UINT WINAPI EnumSystemFirmwareTables (DWORD 
FirmwareTableProviderSignature, PVOID pFirmwareTableEnumBuffer, DWORD 
BufferSize);
+  WINBASEAPI UINT WINAPI GetSystemFirmwareTable (DWORD 
FirmwareTableProviderSignature, DWORD FirmwareTableID, PVOID 
pFirmwareTableBuffer, DWORD BufferSize);
+#if _WIN32_WINNT >= 0x0600
+  WINBASEAPI WINBOOL WINAPI GetProductInfo (DWORD dwOSMajorVersion, DWORD 
dwOSMinorVersion, DWORD dwSpMajorVersion, DWORD dwSpMinorVersion, PDWORD 
pdwReturnedProductType);
+#endif
+#if _WIN32_WINNT >= 0x0601
+  WINBASEAPI WINBOOL WINAPI GetLogicalProcessorInformationEx 
(LOGICAL_PROCESSOR_RELATIONSHIP RelationshipType, 
PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX Buffer, PDWORD ReturnedLength);
+#endif
+#endif
+
 #ifdef __cplusplus
 }
 #endif
-- 
2.17.1



_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public