Win32 capture/apply: Simplify opening existing files

[wimlib] / include / wimlib / win32_common.h

diff --git a/include/wimlib/win32_common.h b/include/wimlib/win32_common.h
index ce23f1960c87c75f5110c3309a8230d219b7bf7d..499dad4faae0062543b5a3fa2614b770ec9b853f 100644 (file)
--- a/include/wimlib/win32_common.h
+++ b/include/wimlib/win32_common.h
@@ -9,26 +9,20 @@
 #include "wimlib/types.h"
 #include "wimlib/win32.h"
 
+extern void
+set_errno_from_GetLastError(void);
 
-#ifdef ENABLE_ERROR_MESSAGES
 extern void
-win32_error(DWORD err_code);
-#else
-static inline void
-win32_error(DWORD err_code)
-{
-}
-#endif
+set_errno_from_win32_error(DWORD err);
 
+#ifdef WITH_NTDLL
 extern void
-set_errno_from_GetLastError(void);
+set_errno_from_nt_status(DWORD status);
+#endif
 
 extern bool
 win32_path_is_root_of_drive(const wchar_t *path);
 
-extern int
-win32_error_to_errno(DWORD err_code);
-
 extern int
 win32_get_vol_flags(const wchar_t *path, unsigned *vol_flags_ret,
                    bool *supports_SetFileShortName_ret);
@@ -36,9 +30,6 @@ win32_get_vol_flags(const wchar_t *path, unsigned *vol_flags_ret,
 extern HANDLE
 win32_open_existing_file(const wchar_t *path, DWORD dwDesiredAccess);
 
-extern HANDLE
-win32_open_file_data_only(const wchar_t *path);
-
 /* Vista and later */
 extern HANDLE (WINAPI *win32func_FindFirstStreamW)(LPCWSTR lpFileName,
                                                   STREAM_INFO_LEVELS InfoLevel,