joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 20:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

OpenCow: dynamic calls to win95+ function

Browse Source
This commit is contained in:
crazii 2023-11-30 16:50:32 +08:00
parent f0bd7f05f2
commit a4617ea14f
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vs/opencow/Makefile.mingw
View File

@ -5,7 +5,7 @@
#endif #endif
ifeq ($(strip $(CXXFLAGS)),) ifeq ($(strip $(CXXFLAGS)),)
CXXFLAGS = -mwin32 -march=pentium3 CXXFLAGS = -mwin32 -march=pentium
endif endif
CXXFLAGS := -DSTATIC_OPENCOW -D_WIN32_WINDOWS=0x0400 -fno-exceptions -std=gnu++14 -O2 $(CXXFLAGS) CXXFLAGS := -DSTATIC_OPENCOW -D_WIN32_WINDOWS=0x0400 -fno-exceptions -std=gnu++14 -O2 $(CXXFLAGS)

41
vs/opencow/src/kernel32.cpp
View File

@ -40,6 +40,7 @@
#include <windows.h> #include <windows.h>
#include <mbstring.h> #include <mbstring.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "SystemVersion.h"
#include "MbcsBuffer.h" #include "MbcsBuffer.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -570,16 +571,31 @@ OCOW_GetCPInfo(
return ::GetCPInfo(CodePage, lpCPInfo); return ::GetCPInfo(CodePage, lpCPInfo);
} }
typedef BOOL (WINAPI *fpGetCPInfoExA)(INT,INT,LPCPINFOEXA);
static fpGetCPInfoExA pGetCPInfoExA;
//TODO: MSLU adds support for CP_UTF7 and CP_UTF8 //TODO: MSLU adds support for CP_UTF7 and CP_UTF8
#if defined(_WIN32_WINDOWS) && _WIN32_WINDOWS >= 0x0410
OCOW_DEF(BOOL, GetCPInfoExW,( OCOW_DEF(BOOL, GetCPInfoExW,(
IN UINT CodePage, IN UINT CodePage,
IN DWORD dwFlags, IN DWORD dwFlags,
OUT LPCPINFOEXW lpCPInfoEx OUT LPCPINFOEXW lpCPInfoEx
)) ))
{ {
if(g_nPlatform <= MZ_PLATFORM_95 || (g_nPlatform > MZ_PLATFORM_ME && g_nPlatform < MZ_PLATFORM_2K))
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
CPINFOEXA cpInfoA; CPINFOEXA cpInfoA;
BOOL bSuccess = ::GetCPInfoExA(CodePage, dwFlags, &cpInfoA); if(!pGetCPInfoExA)
pGetCPInfoExA = (fpGetCPInfoExA) ::GetProcAddress(
::GetModuleHandleA("kernel32.dll"), "GetCPInfoExA");
if (!pGetCPInfoExA) {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
BOOL bSuccess = pGetCPInfoExA(CodePage, dwFlags, &cpInfoA);
if (!bSuccess) if (!bSuccess)
return FALSE; return FALSE;
@ -592,7 +608,6 @@ OCOW_DEF(BOOL, GetCPInfoExW,(
return TRUE; return TRUE;
} }
#endif
// GetCalendarInfoW // GetCalendarInfoW
@ -796,6 +811,9 @@ static void TimetToFileTime(time_t t, LPFILETIME pft)
pft->dwHighDateTime = time_value.HighPart; pft->dwHighDateTime = time_value.HighPart;
} }
typedef BOOL (WINAPI *fpGetFileAttributesExA)(LPCSTR,GET_FILEEX_INFO_LEVELS,LPVOID);
static fpGetFileAttributesExA pGetFileAttributesExA;
OCOW_DEF(BOOL, GetFileAttributesExW,( OCOW_DEF(BOOL, GetFileAttributesExW,(
IN LPCWSTR lpFileName, IN LPCWSTR lpFileName,
IN GET_FILEEX_INFO_LEVELS fInfoLevelId, IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
@ -805,9 +823,19 @@ OCOW_DEF(BOOL, GetFileAttributesExW,(
CMbcsBuffer mbcsFileName; CMbcsBuffer mbcsFileName;
if (!mbcsFileName.FromUnicode(lpFileName)) if (!mbcsFileName.FromUnicode(lpFileName))
return INVALID_FILE_ATTRIBUTES; return INVALID_FILE_ATTRIBUTES;
#if defined(_WIN32_WINDOWS) && _WIN32_WINDOWS >= 0x0410
return ::GetFileAttributesExA(mbcsFileName, fInfoLevelId, lpFileInformation); if((g_nPlatform > MZ_PLATFORM_95 && g_nPlatform <= MZ_PLATFORM_ME) || g_nPlatform >= MZ_PLATFORM_2K)
#else {
if(!pGetFileAttributesExA)
pGetFileAttributesExA = (fpGetFileAttributesExA) ::GetProcAddress(
::GetModuleHandleA("kernel32.dll"), "GetFileAttributesExA");
if (!pGetFileAttributesExA) {
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
return pGetFileAttributesExA(mbcsFileName, fInfoLevelId, lpFileInformation);
}
if(lpFileInformation == NULL) if(lpFileInformation == NULL)
{ {
::SetLastError(ERROR_INVALID_PARAMETER); ::SetLastError(ERROR_INVALID_PARAMETER);
@ -836,7 +864,6 @@ OCOW_DEF(BOOL, GetFileAttributesExW,(
if(lpData->dwFileAttributes == 0 && (st.st_mode&_S_IFREG)) if(lpData->dwFileAttributes == 0 && (st.st_mode&_S_IFREG))
lpData->dwFileAttributes |= FILE_ATTRIBUTE_NORMAL; lpData->dwFileAttributes |= FILE_ATTRIBUTE_NORMAL;
return TRUE; return TRUE;
#endif
} }
OCOW_DEF(DWORD, GetFileAttributesW,( OCOW_DEF(DWORD, GetFileAttributesW,(

2
vs/opencow/src/opencow.cpp
View File

@ -136,6 +136,8 @@ DllMain(
return TRUE; return TRUE;
} }
#else
static BOOL g_bPlatformInited = InitializeSystemVersion();
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// API // API