X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32.h;h=672f08a171d231cbe8fc6446ffd0be7828b5ca39;hp=87070a4a4a5d5ec3323607dc9d44d999a4653806;hb=34c830edf813567274416e84816947d3383a6ac5;hpb=9fb3aaca115429b0af2a623bf20bfceef74f047f

diff --git a/src/win32.h b/src/win32.h
index 87070a4a..672f08a1 100644
--- a/src/win32.h
+++ b/src/win32.h
@@ -7,20 +7,20 @@
 
 extern int
 win32_build_dentry_tree(struct wim_dentry **root_ret,
-			const mbchar *root_disk_path,
+			const tchar *root_disk_path,
 			struct wim_lookup_table *lookup_table,
-			struct wim_security_data *sd,
+			struct sd_set *sd,
 			const struct capture_config *config,
 			int add_image_flags,
 			wimlib_progress_func_t progress_func,
 			void *extra_arg);
 
 extern int
-win32_read_file(const mbchar *filename, void *handle, u64 offset,
-		size_t size, void *buf);
+win32_read_file(const tchar *filename, HANDLE handle,
+		u64 offset, size_t size, void *buf);
 
 extern HANDLE
-win32_open_file_readonly(const wchar_t *path_utf16, bool data_only);
+win32_open_file_data_only(const wchar_t *path_utf16);
 
 extern void
 win32_close_file(void *handle);
@@ -36,17 +36,17 @@ extern void win32_error_last();
 #define FNM_PATHNAME 0x1
 #define FNM_NOMATCH 1
 extern int
-fnmatch(const mbchar *pattern, const mbchar *string, int flags);
+fnmatch(const tchar *pattern, const tchar *string, int flags);
 
 extern int
-win32_do_apply_dentry(const mbchar *output_path,
-		      size_t output_path_len,
+win32_do_apply_dentry(const tchar *output_path,
+		      size_t output_path_nbytes,
 		      struct wim_dentry *dentry,
 		      struct apply_args *args);
 
 extern int
-win32_do_apply_dentry_timestamps(const mbchar *output_path,
-				 size_t output_path_len,
+win32_do_apply_dentry_timestamps(const tchar *output_path,
+				 size_t output_path_nbytes,
 				 const struct wim_dentry *dentry,
 				 const struct apply_args *args);
 
@@ -56,15 +56,8 @@ fsync(int fd);
 extern unsigned
 win32_get_number_of_processors();
 
-extern mbchar *
-realpath(const mbchar *path, mbchar *resolved_path);
-
-/* Microsoft's swprintf() violates the C standard and they require programmers
- * to do this weird define to get the correct function.  */
-#define swprintf _snwprintf
-
-/* Use Microsoft's weird _mkdir() function instead of mkdir() */
-#define mkdir(name, mode) _mkdir(name)
+extern tchar *
+realpath(const tchar *path, tchar *resolved_path);
 
 typedef enum {
 	CODESET
@@ -73,4 +66,16 @@ typedef enum {
 extern char *
 nl_langinfo(nl_item item);
 
+extern int
+win32_rename_replacement(const tchar *oldpath, const tchar *newpath);
+
+extern int
+win32_truncate_replacement(const tchar *path, off_t size);
+
+extern void
+win32_global_init();
+
+extern void
+win32_global_cleanup();
+
 #endif /* _WIMLIB_WIN32_H */