publish changes
This commit is contained in:
parent
afc5064a7b
commit
ac2c6ac843
1605 changed files with 3354 additions and 3354 deletions
|
@ -18,7 +18,7 @@
|
|||
|
||||
|
||||
|
||||
// set windows version early so that we can deduce dependencies from SDK version
|
||||
// set arch version early so that we can deduce dependencies from SDK version
|
||||
|
||||
#if MPT_OS_WINDOWS
|
||||
|
||||
|
@ -505,7 +505,7 @@
|
|||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
|
||||
// windows.h excludes
|
||||
// arch.h excludes
|
||||
#define NOMEMMGR // GMEM_*, LMEM_*, GHND, LHND, associated routines
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX // Macros min(a,b) and max(a,b)
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#ifdef MODPLUG_TRACKER
|
||||
#if MPT_OS_WINDOWS
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <WinIoCtl.h>
|
||||
#include <io.h>
|
||||
#endif // MPT_OS_WINDOWS
|
||||
|
@ -521,9 +521,9 @@ OnDiskFileWrapper::OnDiskFileWrapper(FileCursor &file, const mpt::PathString &fi
|
|||
|
||||
HANDLE hFile = NULL;
|
||||
#if MPT_OS_WINDOWS_WINRT
|
||||
hFile = mpt::windows::CheckFileHANDLE(CreateFile2(tempName.AsNative().c_str(), GENERIC_WRITE, FILE_SHARE_READ, CREATE_ALWAYS, NULL));
|
||||
hFile = mpt::arch::CheckFileHANDLE(CreateFile2(tempName.AsNative().c_str(), GENERIC_WRITE, FILE_SHARE_READ, CREATE_ALWAYS, NULL));
|
||||
#else
|
||||
hFile = mpt::windows::CheckFileHANDLE(CreateFile(tempName.AsNative().c_str(), GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_TEMPORARY, NULL));
|
||||
hFile = mpt::arch::CheckFileHANDLE(CreateFile(tempName.AsNative().c_str(), GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_TEMPORARY, NULL));
|
||||
#endif
|
||||
while(!file.EndOfFile())
|
||||
{
|
||||
|
@ -536,7 +536,7 @@ OnDiskFileWrapper::OnDiskFileWrapper(FileCursor &file, const mpt::PathString &fi
|
|||
DWORD chunkDone = 0;
|
||||
try
|
||||
{
|
||||
mpt::windows::CheckBOOL(WriteFile(hFile, view.data() + written, chunkSize, &chunkDone, NULL));
|
||||
mpt::arch::CheckBOOL(WriteFile(hFile, view.data() + written, chunkSize, &chunkDone, NULL));
|
||||
} catch(...)
|
||||
{
|
||||
CloseHandle(hFile);
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
#ifdef MODPLUG_TRACKER
|
||||
#if MPT_OS_WINDOWS
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#endif // MPT_OS_WINDOWS
|
||||
#endif // MODPLUG_TRACKER
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include "mptRandom.h"
|
||||
|
||||
#if MPT_OS_WINDOWS
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#if defined(MODPLUG_TRACKER)
|
||||
#include <shlwapi.h>
|
||||
#endif
|
||||
|
|
|
@ -155,7 +155,7 @@ public:
|
|||
// Return the same path string with a different (or appended) extension (including "."), e.g. "foo.bar",".txt" -> "foo.txt" or "C:\OpenMPT\foo",".txt" -> "C:\OpenMPT\foo.txt"
|
||||
PathString ReplaceExt(const mpt::PathString &newExt) const;
|
||||
|
||||
// Removes special characters from a filename component and replaces them with a safe replacement character ("_" on windows).
|
||||
// Removes special characters from a filename component and replaces them with a safe replacement character ("_" on arch).
|
||||
// Returns the result.
|
||||
// Note that this also removes path component separators, so this should only be used on single-component PathString objects.
|
||||
PathString SanitizeComponent() const;
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#endif // MODPLUG_TRACKER
|
||||
|
||||
#if MPT_OS_WINDOWS
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#endif // MPT_OS_WINDOWS
|
||||
|
||||
|
||||
|
@ -61,7 +61,7 @@ List of string types
|
|||
reason to do so.
|
||||
|
||||
* std::wstring (OpenMPT)
|
||||
UTF16 (on windows) or UTF32 (otherwise). Do not use unless there is an
|
||||
UTF16 (on arch) or UTF32 (otherwise). Do not use unless there is an
|
||||
obvious reason to do so.
|
||||
|
||||
* mpt::lstring (OpenMPT)
|
||||
|
@ -289,7 +289,7 @@ APIs only available in WCHAR variants, or use mpt::winstring and
|
|||
mpt::WinStringBuf helpers otherwise.
|
||||
Specify TCHAR string literals with _T("foo") in mptrack/, and with TEXT("foo")
|
||||
in common/ or sounddev/. _T() requires <tchar.h> which is specific to the MSVC
|
||||
runtime and not portable across compilers. TEXT() is from <windows.h>. We use
|
||||
runtime and not portable across compilers. TEXT() is from <arch.h>. We use
|
||||
_T() in mptrack/ only because it is shorter.
|
||||
|
||||
|
||||
|
@ -367,7 +367,7 @@ static Tdststring EncodeImpl(Charset charset, const mpt::widestring &src)
|
|||
case Charset::CP437: return mpt::encode<Tdststring>(mpt::common_encoding::cp437, src); break;
|
||||
case Charset::CP437AMS: return mpt::encode<Tdststring>(CharsetTableCP437AMS, src); break;
|
||||
case Charset::CP437AMS2: return mpt::encode<Tdststring>(CharsetTableCP437AMS2, src); break;
|
||||
case Charset::Windows1252: return mpt::encode<Tdststring>(mpt::common_encoding::windows1252, src); break;
|
||||
case Charset::Windows1252: return mpt::encode<Tdststring>(mpt::common_encoding::arch1252, src); break;
|
||||
case Charset::Amiga: return mpt::encode<Tdststring>(mpt::common_encoding::amiga, src); break;
|
||||
case Charset::RISC_OS: return mpt::encode<Tdststring>(mpt::common_encoding::riscos, src); break;
|
||||
case Charset::ISO8859_1_no_C1: return mpt::encode<Tdststring>(mpt::common_encoding::iso8859_1_no_c1, src); break;
|
||||
|
@ -397,7 +397,7 @@ static mpt::widestring DecodeImpl(Charset charset, const Tsrcstring &src)
|
|||
case Charset::CP437: return mpt::decode<Tsrcstring>(mpt::common_encoding::cp437, src); break;
|
||||
case Charset::CP437AMS: return mpt::decode<Tsrcstring>(CharsetTableCP437AMS, src); break;
|
||||
case Charset::CP437AMS2: return mpt::decode<Tsrcstring>(CharsetTableCP437AMS2, src); break;
|
||||
case Charset::Windows1252: return mpt::decode<Tsrcstring>(mpt::common_encoding::windows1252, src); break;
|
||||
case Charset::Windows1252: return mpt::decode<Tsrcstring>(mpt::common_encoding::arch1252, src); break;
|
||||
case Charset::Amiga: return mpt::decode<Tsrcstring>(mpt::common_encoding::amiga, src); break;
|
||||
case Charset::RISC_OS: return mpt::decode<Tsrcstring>(mpt::common_encoding::riscos, src); break;
|
||||
case Charset::ISO8859_1_no_C1: return mpt::decode<Tsrcstring>(mpt::common_encoding::iso8859_1_no_c1, src); break;
|
||||
|
|
|
@ -74,7 +74,7 @@ enum class Charset {
|
|||
Amiga_no_C1,
|
||||
|
||||
#if defined(MPT_ENABLE_CHARSET_LOCALE)
|
||||
Locale, // CP_ACP on windows, current C locale otherwise
|
||||
Locale, // CP_ACP on arch, current C locale otherwise
|
||||
#endif // MPT_ENABLE_CHARSET_LOCALE
|
||||
|
||||
};
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include <time.h>
|
||||
|
||||
#if MPT_OS_WINDOWS
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#if defined(MODPLUG_TRACKER)
|
||||
#include <mmsystem.h>
|
||||
#endif
|
||||
|
|
|
@ -43,8 +43,8 @@
|
|||
|
||||
#if MPT_OS_WINDOWS
|
||||
|
||||
#include <windows.h>
|
||||
#include <windowsx.h>
|
||||
#include <arch.h>
|
||||
#include <archx.h>
|
||||
#include <shlwapi.h>
|
||||
#include <mmsystem.h>
|
||||
|
||||
|
@ -64,7 +64,7 @@
|
|||
#include "mpt/check/mfc.hpp"
|
||||
#endif
|
||||
#if MPT_OS_WINDOWS
|
||||
#include "mpt/check/windows.hpp"
|
||||
#include "mpt/check/arch.hpp"
|
||||
#endif
|
||||
#include "mpt/exception_text/exception_text.hpp"
|
||||
#include "mpt/out_of_memory/out_of_memory.hpp"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue