headers: allow GetComputerName/SetVolumeLabel in winstore builds https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-getcomputernamea https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-getcomputernamew https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-setvolumelabela https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-setvolumelabelw Signed-off-by: Liu Hao <lh_mouse@126.com>
diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h index 95a9693..f25642d 100644 --- a/mingw-w64-headers/include/winbase.h +++ b/mingw-w64-headers/include/winbase.h
@@ -2230,8 +2230,6 @@ WINBASEAPI WINBOOL WINAPI SetFileBandwidthReservation (HANDLE hFile, DWORD nPeriodMilliseconds, DWORD nBytesPerPeriod, WINBOOL bDiscardable, LPDWORD lpTransferSize, LPDWORD lpNumOutstandingRequests); WINBASEAPI WINBOOL WINAPI GetFileBandwidthReservation (HANDLE hFile, LPDWORD lpPeriodMilliseconds, LPDWORD lpBytesPerPeriod, LPBOOL pDiscardable, LPDWORD lpTransferSize, LPDWORD lpNumOutstandingRequests); #endif - WINBASEAPI WINBOOL WINAPI SetVolumeLabelA (LPCSTR lpRootPathName, LPCSTR lpVolumeName); - WINBASEAPI WINBOOL WINAPI SetVolumeLabelW (LPCWSTR lpRootPathName, LPCWSTR lpVolumeName); WINBASEAPI VOID WINAPI SetFileApisToOEM (VOID); WINBASEAPI VOID WINAPI SetFileApisToANSI (VOID); WINBASEAPI WINBOOL WINAPI AreFileApisANSI (VOID); @@ -2260,7 +2258,6 @@ #endif #define GetNamedPipeHandleState __MINGW_NAME_AW(GetNamedPipeHandleState) -#define SetVolumeLabel __MINGW_NAME_AW(SetVolumeLabel) #define ClearEventLog __MINGW_NAME_AW(ClearEventLog) #define BackupEventLog __MINGW_NAME_AW(BackupEventLog) #define OpenEventLog __MINGW_NAME_AW(OpenEventLog) @@ -2414,8 +2411,6 @@ #define MAX_COMPUTERNAME_LENGTH 15 - WINBASEAPI WINBOOL WINAPI GetComputerNameA (LPSTR lpBuffer, LPDWORD nSize); - WINBASEAPI WINBOOL WINAPI GetComputerNameW (LPWSTR lpBuffer, LPDWORD nSize); WINBASEAPI WINBOOL WINAPI SetComputerNameA (LPCSTR lpComputerName); WINBASEAPI WINBOOL WINAPI SetComputerNameW (LPCWSTR lpComputerName); WINBASEAPI WINBOOL WINAPI SetComputerNameExA (COMPUTER_NAME_FORMAT NameType, LPCTSTR lpBuffer); @@ -2428,7 +2423,6 @@ #define SetComputerNameEx SetComputerNameExA #endif -#define GetComputerName __MINGW_NAME_AW(GetComputerName) #define SetComputerName __MINGW_NAME_AW(SetComputerName) #define DnsHostnameToComputerName __MINGW_NAME_AW(DnsHostnameToComputerName) #define GetUserName __MINGW_NAME_AW(GetUserName) @@ -2528,6 +2522,15 @@ #define VerifyVersionInfo __MINGW_NAME_AW(VerifyVersionInfo) #endif +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) + WINBASEAPI WINBOOL WINAPI SetVolumeLabelA (LPCSTR lpRootPathName, LPCSTR lpVolumeName); + WINBASEAPI WINBOOL WINAPI SetVolumeLabelW (LPCWSTR lpRootPathName, LPCWSTR lpVolumeName); +#define SetVolumeLabel __MINGW_NAME_AW(SetVolumeLabel) + WINBASEAPI WINBOOL WINAPI GetComputerNameA (LPSTR lpBuffer, LPDWORD nSize); + WINBASEAPI WINBOOL WINAPI GetComputerNameW (LPWSTR lpBuffer, LPDWORD nSize); +#define GetComputerName __MINGW_NAME_AW(GetComputerName) +#endif + #include <winerror.h> #include <timezoneapi.h>