Browse Source

Remove more legacy savegame code

This code was only active in versions prior to 1.08
pull/551/head
Anders Jenbo 6 years ago
parent
commit
7f699dbad2
  1. 22
      Source/mpqapi.cpp
  2. 3
      Source/mpqapi.h
  3. 2
      Source/pfile.cpp
  4. 6
      SourceS/miniwin/misc.h
  5. 7
      SourceS/miniwin/misc_macro.h
  6. 12
      SourceX/miniwin/misc.cpp
  7. 17
      SourceX/miniwin/misc_io.cpp
  8. 4
      defs.h

22
Source/mpqapi.cpp

@ -15,21 +15,6 @@ _BLOCKENTRY *sgpBlockTbl;
HANDLE sghArchive = INVALID_HANDLE_VALUE; HANDLE sghArchive = INVALID_HANDLE_VALUE;
BOOL mpqapi_set_hidden(const char *pszArchive, BOOL hidden)
{
DWORD dwFileAttributes;
DWORD dwFileAttributesToSet;
dwFileAttributes = GetFileAttributes(pszArchive);
if (dwFileAttributes == INVALID_FILE_ATTRIBUTES)
return GetLastError() == ERROR_FILE_NOT_FOUND;
dwFileAttributesToSet = hidden ? FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN : 0;
if (dwFileAttributes == dwFileAttributesToSet)
return TRUE;
else
return SetFileAttributes(pszArchive, dwFileAttributesToSet);
}
void mpqapi_remove_hash_entry(const char *pszName) void mpqapi_remove_hash_entry(const char *pszName)
{ {
_HASHENTRY *pHashTbl; _HASHENTRY *pHashTbl;
@ -324,7 +309,7 @@ BOOL mpqapi_has_file(const char *pszName)
return FetchHandle(pszName) != -1; return FetchHandle(pszName) != -1;
} }
BOOL OpenMPQ(const char *pszArchive, BOOL hidden, DWORD dwChar) BOOL OpenMPQ(const char *pszArchive, DWORD dwChar)
{ {
DWORD dwFlagsAndAttributes; DWORD dwFlagsAndAttributes;
DWORD key; DWORD key;
@ -332,13 +317,10 @@ BOOL OpenMPQ(const char *pszArchive, BOOL hidden, DWORD dwChar)
_FILEHEADER fhdr; _FILEHEADER fhdr;
InitHash(); InitHash();
if (!mpqapi_set_hidden(pszArchive, hidden)) {
return FALSE;
}
dwFlagsAndAttributes = gbMaxPlayers > 1 ? FILE_FLAG_WRITE_THROUGH : 0; dwFlagsAndAttributes = gbMaxPlayers > 1 ? FILE_FLAG_WRITE_THROUGH : 0;
sghArchive = CreateFile(pszArchive, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, dwFlagsAndAttributes, NULL); sghArchive = CreateFile(pszArchive, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, dwFlagsAndAttributes, NULL);
if (sghArchive == INVALID_HANDLE_VALUE) { if (sghArchive == INVALID_HANDLE_VALUE) {
sghArchive = CreateFile(pszArchive, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, dwFlagsAndAttributes | (hidden ? FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN : 0), NULL); sghArchive = CreateFile(pszArchive, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, dwFlagsAndAttributes, NULL);
if (sghArchive == INVALID_HANDLE_VALUE) if (sghArchive == INVALID_HANDLE_VALUE)
return FALSE; return FALSE;
save_archive_modified = TRUE; save_archive_modified = TRUE;

3
Source/mpqapi.h

@ -6,7 +6,6 @@ extern char mpq_buf[4096];
extern BOOL save_archive_modified; extern BOOL save_archive_modified;
extern BOOLEAN save_archive_open; extern BOOLEAN save_archive_open;
BOOL mpqapi_set_hidden(const char *pszArchive, BOOL hidden);
void mpqapi_store_creation_time(const char *pszArchive, DWORD dwChar); void mpqapi_store_creation_time(const char *pszArchive, DWORD dwChar);
BOOL mpqapi_reg_load_modification_time(char *dst, int size); BOOL mpqapi_reg_load_modification_time(char *dst, int size);
void mpqapi_xor_buf(char *pbData); void mpqapi_xor_buf(char *pbData);
@ -24,7 +23,7 @@ BOOL mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, DWORD d
int mpqapi_find_free_block(int size, int *block_size); int mpqapi_find_free_block(int size, int *block_size);
void mpqapi_rename(char *pszOld, char *pszNew); void mpqapi_rename(char *pszOld, char *pszNew);
BOOL mpqapi_has_file(const char *pszName); BOOL mpqapi_has_file(const char *pszName);
BOOL OpenMPQ(const char *pszArchive, BOOL hidden, DWORD dwChar); BOOL OpenMPQ(const char *pszArchive, DWORD dwChar);
BOOL ParseMPQHeader(_FILEHEADER *pHdr, DWORD *pdwNextFileStart); BOOL ParseMPQHeader(_FILEHEADER *pHdr, DWORD *pdwNextFileStart);
void CloseMPQ(const char *pszArchive, BOOL bFree, DWORD dwChar); void CloseMPQ(const char *pszArchive, BOOL bFree, DWORD dwChar);
void mpqapi_store_modified_time(const char *pszArchive, DWORD dwChar); void mpqapi_store_modified_time(const char *pszArchive, DWORD dwChar);

2
Source/pfile.cpp

@ -62,7 +62,7 @@ BOOL pfile_open_archive(BOOL update, DWORD save_num)
char FileName[MAX_PATH]; char FileName[MAX_PATH];
pfile_get_save_path(FileName, sizeof(FileName), save_num); pfile_get_save_path(FileName, sizeof(FileName), save_num);
if (OpenMPQ(FileName, FALSE, save_num)) if (OpenMPQ(FileName, save_num))
return TRUE; return TRUE;
return FALSE; return FALSE;

6
SourceS/miniwin/misc.h

@ -176,9 +176,6 @@ typedef struct _LIST_ENTRY {
DWORD GetTickCount(); DWORD GetTickCount();
DWORD GetLastError();
void SetLastError(DWORD dwErrCode);
WINBOOL CloseHandle(HANDLE hObject); WINBOOL CloseHandle(HANDLE hObject);
HANDLE CreateEventA(LPSECURITY_ATTRIBUTES lpEventAttributes, WINBOOL bManualReset, WINBOOL bInitialState, HANDLE CreateEventA(LPSECURITY_ATTRIBUTES lpEventAttributes, WINBOOL bManualReset, WINBOOL bInitialState,
@ -319,8 +316,6 @@ WINBOOL WriteFile(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, L
LPOVERLAPPED lpOverlapped); LPOVERLAPPED lpOverlapped);
DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod); DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod);
WINBOOL SetEndOfFile(HANDLE hFile); WINBOOL SetEndOfFile(HANDLE hFile);
DWORD GetFileAttributesA(LPCSTR lpFileName);
WINBOOL SetFileAttributesA(LPCSTR lpFileName, DWORD dwFileAttributes);
HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition,
DWORD dwFlagsAndAttributes, HANDLE hTemplateFile); DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
@ -435,7 +430,6 @@ constexpr auto DVL_GENERIC_WRITE = 0x40000000L;
constexpr auto DVL_OPEN_EXISTING = 3; constexpr auto DVL_OPEN_EXISTING = 3;
constexpr auto DVL_FILE_BEGIN = 0; constexpr auto DVL_FILE_BEGIN = 0;
constexpr auto DVL_FILE_CURRENT = 1; constexpr auto DVL_FILE_CURRENT = 1;
constexpr auto DVL_ERROR_FILE_NOT_FOUND = 2;
constexpr auto DVL_WM_QUIT = 0x0012; constexpr auto DVL_WM_QUIT = 0x0012;
constexpr auto DVL_INFINITE = 0xFFFFFFFF; constexpr auto DVL_INFINITE = 0xFFFFFFFF;

7
SourceS/miniwin/misc_macro.h

@ -49,13 +49,8 @@
#define GENERIC_WRITE DVL_GENERIC_WRITE #define GENERIC_WRITE DVL_GENERIC_WRITE
#define OPEN_EXISTING DVL_OPEN_EXISTING #define OPEN_EXISTING DVL_OPEN_EXISTING
#define OPEN_ALWAYS 4 #define OPEN_ALWAYS 4
#define ERROR_FILE_NOT_FOUND DVL_ERROR_FILE_NOT_FOUND
#define ERROR_SUCCESS DVL_ERROR_SUCCESS #define ERROR_SUCCESS DVL_ERROR_SUCCESS
#define FILE_ATTRIBUTE_NORMAL 128 #define FILE_ATTRIBUTE_NORMAL 128
#define FILE_ATTRIBUTE_HIDDEN 0x00000002
#define FILE_ATTRIBUTE_SYSTEM 0x00000004
#define FILE_ATTRIBUTE_DIRECTORY 0x00000010
#define FILE_SHARE_READ 1
#define OFS_MAXPATHNAME DVL_OFS_MAXPATHNAME #define OFS_MAXPATHNAME DVL_OFS_MAXPATHNAME
@ -92,8 +87,6 @@
#define KEY_WRITE 0x20006 #define KEY_WRITE 0x20006
#define REG_SZ 1 #define REG_SZ 1
#define GetFileAttributes GetFileAttributesA
#define SetFileAttributes SetFileAttributesA
#define CreateFile CreateFileA #define CreateFile CreateFileA
#define DeleteFile DeleteFileA #define DeleteFile DeleteFileA

12
SourceX/miniwin/misc.cpp

@ -23,18 +23,6 @@
namespace dvl { namespace dvl {
DWORD last_error;
DWORD GetLastError()
{
return last_error;
}
void SetLastError(DWORD dwErrCode)
{
last_error = dwErrCode;
}
int wsprintfA(LPSTR dest, LPCSTR format, ...) int wsprintfA(LPSTR dest, LPCSTR format, ...)
{ {
va_list args; va_list args;

17
SourceX/miniwin/misc_io.cpp

@ -106,23 +106,6 @@ WINBOOL SetEndOfFile(HANDLE hFile)
return true; return true;
} }
DWORD GetFileAttributesA(LPCSTR lpFileName)
{
char name[DVL_MAX_PATH];
TranslateFileName(name, sizeof(name), lpFileName);
std::ifstream filestream(name, std::ios::binary);
if (filestream.fail()) {
SetLastError(DVL_ERROR_FILE_NOT_FOUND);
return (DWORD)-1;
}
return 0x80;
}
WINBOOL SetFileAttributesA(LPCSTR lpFileName, DWORD dwFileAttributes)
{
return true;
}
void ShowOutOfDiskError() void ShowOutOfDiskError()
{ {
char *text = "Failed to save, please free some disk space and try again."; char *text = "Failed to save, please free some disk space and try again.";

4
defs.h

@ -165,10 +165,6 @@
#define ERR_DLG(title, text) ErrDlg(title, text, __FILE__, __LINE__) #define ERR_DLG(title, text) ErrDlg(title, text, __FILE__, __LINE__)
#ifndef INVALID_FILE_ATTRIBUTES
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#endif
// To apply to certain functions which have local variables aligned by 1 for unknown yet reason // To apply to certain functions which have local variables aligned by 1 for unknown yet reason
#if (_MSC_VER == 1200) #if (_MSC_VER == 1200)
#define ALIGN_BY_1 __declspec(align(1)) #define ALIGN_BY_1 __declspec(align(1))

Loading…
Cancel
Save