Windows: improved error messages

[wimlib] / include / wimlib / win32_common.h

diff --git a/include/wimlib/win32_common.h b/include/wimlib/win32_common.h
index 2921caaa2796b4c85a4220f7a32f00b6d5d69f95..f27a2d71be285a634185de1d0ba263a73656e370 100644 (file)
--- a/include/wimlib/win32_common.h
+++ b/include/wimlib/win32_common.h
@@ -1,26 +1,22 @@
 #ifndef _WIMLIB_WIN32_COMMON_H
 #define _WIMLIB_WIN32_COMMON_H
 
+#include <ntstatus.h>
 #include <windows.h>
+#include <winternl.h>
+
 #ifdef ERROR
 #  undef ERROR
 #endif
-
 #include "wimlib/types.h"
 #include "wimlib/win32.h"
 
-#include <ntstatus.h>
-#include <winternl.h>
-
 extern void
 set_errno_from_GetLastError(void);
 
 extern void
 set_errno_from_win32_error(DWORD err);
 
-extern void
-set_errno_from_nt_status(NTSTATUS status);
-
 /* ntdll functions  */
 
 extern NTSTATUS (WINAPI *func_NtCreateFile)(PHANDLE FileHandle,
@@ -143,19 +139,33 @@ extern NTSTATUS (WINAPI *func_RtlDosPathNameToNtPathName_U_WithStatus)
 extern NTSTATUS (WINAPI *func_RtlCreateSystemVolumeInformationFolder)
                        (PCUNICODE_STRING VolumeRootPath);
 
+#define FSCTL_SET_PERSISTENT_VOLUME_STATE 0x90238
+
+#define PERSISTENT_VOLUME_STATE_SHORT_NAME_CREATION_DISABLED 0x00000001
 
-extern bool
-windows_version_is_at_least(unsigned major, unsigned minor);
+typedef struct _FILE_FS_PERSISTENT_VOLUME_INFORMATION {
+       ULONG VolumeFlags;
+       ULONG FlagMask;
+       ULONG Version;
+       ULONG Reserved;
+} FILE_FS_PERSISTENT_VOLUME_INFORMATION, *PFILE_FS_PERSISTENT_VOLUME_INFORMATION;
 
-#define running_on_windows_xp_or_later() \
-                       windows_version_is_at_least(5, 1)
+extern int
+win32_path_to_nt_path(const wchar_t *win32_path, UNICODE_STRING *nt_path);
 
-#define running_on_windows_vista_or_later() \
-                       windows_version_is_at_least(6, 0)
+extern int
+win32_get_drive_path(const wchar_t *file_path, wchar_t drive_path[7]);
 
-#define running_on_windows_7_or_later() \
-                       windows_version_is_at_least(6, 1)
+extern void
+win32_warning(DWORD err, const wchar_t *format, ...) _cold_attribute;
 
+extern void
+win32_error(DWORD err, const wchar_t *format, ...) _cold_attribute;
 
+extern void
+winnt_warning(NTSTATUS status, const wchar_t *format, ...) _cold_attribute;
+
+extern void
+winnt_error(NTSTATUS status, const wchar_t *format, ...) _cold_attribute;
 
 #endif /* _WIMLIB_WIN32_COMMON_H */