diff options
Diffstat (limited to 'src/libs/7zip/unix/CPP/include_windows')
4 files changed, 31 insertions, 12 deletions
diff --git a/src/libs/7zip/unix/CPP/include_windows/basetyps.h b/src/libs/7zip/unix/CPP/include_windows/basetyps.h index d761e74b0..2200cb7c3 100644 --- a/src/libs/7zip/unix/CPP/include_windows/basetyps.h +++ b/src/libs/7zip/unix/CPP/include_windows/basetyps.h @@ -2,16 +2,16 @@ #define _BASETYPS_H #ifdef ENV_HAVE_GCCVISIBILITYPATCH - #define DLLEXPORT __attribute__ ((visibility("default"))) - #else - #define DLLEXPORT - #endif + #define DLLEXPORT __attribute__ ((visibility("default"))) +#else + #define DLLEXPORT +#endif #ifdef __cplusplus #define STDAPI extern "C" DLLEXPORT HRESULT #else #define STDAPI extern DLLEXPORT HRESULT -#endif /* __cplusplus */ +#endif /* __cplusplus */ typedef GUID IID; typedef GUID CLSID; diff --git a/src/libs/7zip/unix/CPP/include_windows/include_windows.pri b/src/libs/7zip/unix/CPP/include_windows/include_windows.pri new file mode 100644 index 000000000..5ef72fddd --- /dev/null +++ b/src/libs/7zip/unix/CPP/include_windows/include_windows.pri @@ -0,0 +1,3 @@ +HEADERS += $$7ZIP_BASE/CPP/include_windows/basetyps.h \ + $$7ZIP_BASE/CPP/include_windows/tchar.h \ + $$7ZIP_BASE/CPP/include_windows/windows.h diff --git a/src/libs/7zip/unix/CPP/include_windows/tchar.h b/src/libs/7zip/unix/CPP/include_windows/tchar.h index 4aa1a4f8e..5e89145af 100644 --- a/src/libs/7zip/unix/CPP/include_windows/tchar.h +++ b/src/libs/7zip/unix/CPP/include_windows/tchar.h @@ -1,4 +1,4 @@ -/* +/* * tchar.h * * Unicode mapping layer for the standard C library. By including this diff --git a/src/libs/7zip/unix/CPP/include_windows/windows.h b/src/libs/7zip/unix/CPP/include_windows/windows.h index 5223e81ac..59541864c 100644 --- a/src/libs/7zip/unix/CPP/include_windows/windows.h +++ b/src/libs/7zip/unix/CPP/include_windows/windows.h @@ -33,11 +33,20 @@ #define TRUE 1 #endif -#define WINAPI +#define WINAPI #undef BOOL typedef int BOOL; + +#define CREATE_NEW 1 +#define CREATE_ALWAYS 2 +#define OPEN_EXISTING 3 +#define OPEN_ALWAYS 4 +/* #define TRUNCATE_EXISTING 5 */ + + + /* BEGIN #include <winnt.h> */ /* BEGIN <winerror.h> */ #define NO_ERROR 0L @@ -46,7 +55,11 @@ typedef int BOOL; #define ERROR_INVALID_HANDLE EBADF #define ERROR_PATH_NOT_FOUND ENOENT #define ERROR_DISK_FULL ENOSPC -#define ERROR_NO_MORE_FILES 0x100123 // FIXME +#define ERROR_NO_MORE_FILES 0x100018 // FIXME +#define ERROR_DIRECTORY 267 // FIXME + +// #define ERROR_NEGATIVE_SEEK 0x100131 // FIXME + /* see Common/WyWindows.h #define S_OK ((HRESULT)0x00000000L) @@ -86,7 +99,7 @@ typedef TCHAR *LPTSTR; * The corresponding macros _TEXT() and _T() for mapping _UNICODE strings * passed to C runtime functions are defined in mingw/tchar.h */ -#define TEXT(q) P7ZIP_TEXT(q) +#define TEXT(q) P7ZIP_TEXT(q) typedef BYTE BOOLEAN; @@ -142,11 +155,14 @@ typedef struct _SYSTEMTIME { extern "C" { #endif +BOOL WINAPI DosDateTimeToFileTime(WORD,WORD,FILETIME *); +BOOL WINAPI FileTimeToDosDateTime(CONST FILETIME *,WORD *, WORD *); BOOL WINAPI FileTimeToLocalFileTime(CONST FILETIME *,FILETIME *); -//BOOL WINAPI LocalFileTimeToFileTime(CONST FILETIME *,FILETIME *); BOOL WINAPI FileTimeToSystemTime(CONST FILETIME *,SYSTEMTIME *); +BOOL WINAPI LocalFileTimeToFileTime(CONST FILETIME *,FILETIME *); VOID WINAPI GetSystemTime(SYSTEMTIME *); BOOL WINAPI SystemTimeToFileTime(const SYSTEMTIME*,FILETIME *); +VOID WINAPI GetSystemTimeAsFileTime(FILETIME * time); DWORD WINAPI GetTickCount(VOID); @@ -162,11 +178,11 @@ DWORD WINAPI GetTickCount(VOID); #define CP_UTF8 65001 /* #include <unknwn.h> */ -#include <basetyps.h> +#include "basetyps.h" struct IEnumSTATPROPSTG; typedef struct tagSTATPROPSTG { - LPOLESTR lpwstrName; + const OLECHAR * lpwstrName; /* to avoid some warnings : LPOLESTR lpwstrName; */ PROPID propid; VARTYPE vt; } STATPROPSTG; |