Macintosh-SW
/
afp
mirror of https://github.com/ksherlock/afp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

compile with msvc.

This commit is contained in:
Kelvin Sherlock 2017-07-28 10:04:45 -04:00
parent 26b3f3b3ec
commit 88aee448b1
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -10,9 +10,13 @@ if (WIN32 OR CYGWIN OR MSYS OR MINGW)
if (NOT MSVC)
set(REMAP src/remap_os_error.c)
endif()
else()
set(XATTR srx/xattr.c)
endif()
add_library(afp src/finder_info.cpp src/resource_fork.cpp src/xattr.c ${REMAP})
add_library(afp src/finder_info.cpp src/resource_fork.cpp ${XATTR} ${REMAP})
target_include_directories(afp INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include/)
target_include_directories(afp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/afp)

16
src/finder_info.cpp
View File

@ -1,5 +1,4 @@
#include "finder_info.h"
#include "xattr.h"
#include <cstdint>
#include <cstring>
@ -21,6 +20,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include "xattr.h"
#endif
#if defined(__APPLE__)
@ -61,7 +61,7 @@ namespace {
#if defined(_WIN32)
#ifdef MSVC
#ifdef _MSC_VER
#define AFP_ERROR_FILE_NOT_FOUND ERROR_FILE_NOT_FOUND
#define remap_os_error(x) x
#else
@ -79,14 +79,14 @@ extern "C" int remap_os_error(unsigned long);
ec = std::error_code(remap_os_error(GetLastError()), std::system_category());
return x;
}
#undef CreateFile
template<class ...Args>
HANDLE CreateFileX(const std::string &s, Args... args) {
HANDLE CreateFile(const std::string &s, Args... args) {
return CreateFileA(s.c_str(), std::forward<Args>(args)...);
}
template<class ...Args>
HANDLE CreateFileX(const std::wstring &s, Args... args) {
HANDLE CreateFile(const std::wstring &s, Args... args) {
return CreateFileW(s.c_str(), std::forward<Args>(args)...);
}
@ -111,7 +111,7 @@ extern "C" int remap_os_error(unsigned long);
break;
}
return _(CreateFileX(s, access, FILE_SHARE_READ, nullptr, create, FILE_ATTRIBUTE_NORMAL, nullptr), ec);
return _(CreateFile(s, access, FILE_SHARE_READ, nullptr, create, FILE_ATTRIBUTE_NORMAL, nullptr), ec);
}
DWORD GetFileAttributesX(const std::string &path) {
@ -597,7 +597,7 @@ bool finder_info::write(const std::string &path, std::error_code &ec) {
std::string s(path);
s += ":" XATTR_FINDERINFO_NAME;
HANDLE h = _(CreateFileX(s,
HANDLE h = _(CreateFile(s,
GENERIC_WRITE,
FILE_SHARE_READ,
nullptr,
@ -622,7 +622,7 @@ bool finder_info::write(const std::wstring &path, std::error_code &ec) {
std::wstring s(path);
s += L":" XATTR_FINDERINFO_NAME;
HANDLE h = _(CreateFileX(s,
HANDLE h = _(CreateFile(s,
GENERIC_WRITE,
FILE_SHARE_READ,
nullptr,

13
src/resource_fork.cpp
View File

@ -1,5 +1,4 @@
#include "resource_fork.h"
#include "xattr.h"
#include <cstring>
@ -19,6 +18,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include "xattr.h"
#endif
#ifdef __APPLE_
@ -61,7 +61,7 @@ namespace {
#if defined(_WIN32)
#ifdef MSVC
#ifdef _MSC_VER
#define AFP_ERROR_FILE_NOT_FOUND ERROR_FILE_NOT_FOUND
#define remap_os_error(x) x
#else
@ -80,13 +80,14 @@ extern "C" int remap_os_error(unsigned long);
return x;
}
#undef CreateFile
template<class ...Args>
HANDLE CreateFileX(const std::string &s, Args... args) {
HANDLE CreateFile(const std::string &s, Args... args) {
return CreateFileA(s.c_str(), std::forward<Args>(args)...);
}
template<class ...Args>
HANDLE CreateFileX(const std::wstring &s, Args... args) {
HANDLE CreateFile(const std::wstring &s, Args... args) {
return CreateFileW(s.c_str(), std::forward<Args>(args)...);
}
@ -112,7 +113,7 @@ extern "C" int remap_os_error(unsigned long);
break;
}
HANDLE h = _(CreateFileX(s, access, FILE_SHARE_READ, nullptr, create, FILE_ATTRIBUTE_NORMAL, nullptr), ec);
HANDLE h = _(CreateFile(s, access, FILE_SHARE_READ, nullptr, create, FILE_ATTRIBUTE_NORMAL, nullptr), ec);
return h;
}
@ -280,7 +281,7 @@ namespace afp {
LARGE_INTEGER ll = { };
BOOL ok = _(GetFileSizeEx(_fd, &ll), ec);
if (ec) return 0;
return ll.QuadPart;
return static_cast<size_t>(ll.QuadPart);
}
bool resource_fork::truncate(size_t pos, std::error_code &ec) {