From 95507719941b3d119111020512b277cdc8a31cc2 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 24 Jun 2017 11:58:25 -0700 Subject: [PATCH] Core: Windows buildfix. --- Core/FileLoaders/LocalFileLoader.cpp | 7 +++++-- Core/FileLoaders/LocalFileLoader.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Core/FileLoaders/LocalFileLoader.cpp b/Core/FileLoaders/LocalFileLoader.cpp index 992e30e1b8..a06e79b825 100644 --- a/Core/FileLoaders/LocalFileLoader.cpp +++ b/Core/FileLoaders/LocalFileLoader.cpp @@ -15,12 +15,15 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include "ppsspp_config.h" #include "util/text/utf8.h" #include "file/file_util.h" #include "Common/FileUtil.h" #include "Core/FileLoaders/LocalFileLoader.h" -#ifndef _WIN32 +#ifdef _WIN32 +#include "Common/CommonWindows.h" +#else #include #endif @@ -107,7 +110,7 @@ size_t LocalFileLoader::ReadAt(s64 absolutePos, size_t bytes, size_t count, void OVERLAPPED offset = { 0 }; offset.Offset = (DWORD)(absolutePos & 0xffffffff); offset.OffsetHigh = (DWORD)((absolutePos & 0xffffffff00000000) >> 32); - auto result = ReadFile(handle_, data, bytes * count, &read, &offset); + auto result = ReadFile(handle_, data, (DWORD)(bytes * count), &read, &offset); return result == TRUE ? (size_t)read / bytes : -1; #endif } diff --git a/Core/FileLoaders/LocalFileLoader.h b/Core/FileLoaders/LocalFileLoader.h index 345f0604f3..d5203656ea 100644 --- a/Core/FileLoaders/LocalFileLoader.h +++ b/Core/FileLoaders/LocalFileLoader.h @@ -20,7 +20,7 @@ #include "Common/CommonTypes.h" #include "Core/Loaders.h" #ifdef _WIN32 -#include "Common/CommonWindows.h" +typedef void *HANDLE; #endif class LocalFileLoader : public FileLoader {