CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-12 06:51:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create LEGACY_WIN32 ifdef

Browse Source
This commit is contained in:
twinaphex 2017-10-16 01:51:29 +02:00
parent 4121928899
commit f8a60b2b76
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretro-common/file/file_path.c
View File

@ -87,6 +87,15 @@
#include <unistd.h> /* stat() is defined here */
#endif
/* Assume W-functions do not work below VC2005 and Xbox platforms */
#if defined(_MSC_VER) && _MSC_VER < 1400 || defined(_XBOX)
#ifndef LEGACY_WIN32
#define LEGACY_WIN32
#endif
#endif
enum stat_mode
{
IS_DIRECTORY = 0,
@ -127,8 +136,7 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
(void)path_local;
(void)file_info;
#if defined(_MSC_VER) && _MSC_VER < 1400 || defined(_XBOX)
/* assume W-functions do not work below VC2005 */
#if defined(LEGACY_WIN32)
path_local = utf8_to_local_string_alloc(path);
file_info = GetFileAttributes(path_local);

21
libretro-common/file/retro_dirent.c
View File

@ -67,10 +67,16 @@
#include <unistd.h> /* stat() is defined here */
#endif
#if defined(_MSC_VER) && _MSC_VER < 1400 || defined(_XBOX)
#ifndef LEGACY_WIN32
#define LEGACY_WIN32
#endif
#endif
struct RDIR
{
#if defined(_WIN32)
#if defined(_MSC_VER) && _MSC_VER < 1400 || defined(_XBOX)
#if defined(LEGACY_WIN32)
WIN32_FIND_DATA entry;
#else
WIN32_FIND_DATAW entry;
@ -104,19 +110,18 @@ struct RDIR *retro_opendir(const char *name)
return NULL;
#if defined(_WIN32)
(void)path_wide;
(void)path_local;
path_buf[0] = '\0';
snprintf(path_buf, sizeof(path_buf), "%s\\*", name);
#if defined(_MSC_VER) && _MSC_VER < 1400 || defined(_XBOX)
(void)path_wide;
#if defined(LEGACY_WIN32)
path_local = utf8_to_local_string_alloc(path_buf);
rdir->directory = FindFirstFile(path_local, &rdir->entry);
if (path_local)
free(path_local);
#else
(void)path_local;
path_wide = utf8_to_utf16_string_alloc(path_buf);
rdir->directory = FindFirstFileW(path_wide, &rdir->entry);
@ -155,7 +160,7 @@ int retro_readdir(struct RDIR *rdir)
{
#if defined(_WIN32)
if(rdir->next)
#if defined(_MSC_VER) && _MSC_VER < 1400 || defined(_XBOX)
#if defined(LEGACY_WIN32)
return (FindNextFile(rdir->directory, &rdir->entry) != 0);
#else
return (FindNextFileW(rdir->directory, &rdir->entry) != 0);
@ -177,7 +182,7 @@ int retro_readdir(struct RDIR *rdir)
const char *retro_dirent_get_name(struct RDIR *rdir)
{
#if defined(_WIN32)
#if defined(_MSC_VER) && _MSC_VER < 1400 || defined(_XBOX)
#if defined(LEGACY_WIN32)
char *name_local = local_to_utf8_string_alloc(rdir->entry.cFileName);
memset(rdir->entry.cFileName, 0, sizeof(rdir->entry.cFileName));
strlcpy(rdir->entry.cFileName, name_local, sizeof(rdir->entry.cFileName));