Miroirs/emu48android
1
0
Fork 0
mirror of https://github.com/dgis/emu48android synced 2024-12-26 09:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
dgis 2018-11-26 22:56:15 +00:00
parent 7ec3193649
commit 81b3024034
4 changed files with 124 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/cpp/android-emu48.c
View file

@ -2069,6 +2069,10 @@ BOOL emu48Start()
GetCurrentDirectory(ARRAYSIZEOF(szCurrentDirectory),szCurrentDirectory);
ReadSettings();
_tcscpy(szCurrentDirectory, "");
_tcscpy(szRomDirectory, "assets/calculators/");
// running an instance of me?
// if (bSingleInstance && (hWnd = FindWindow(MAKEINTATOM(classAtom),NULL)) != NULL)
// {

10
app/src/main/cpp/pch.h
View file

@ -7,8 +7,6 @@
#define _CRTDBG_MAP_ALLOC
#define _WINSOCK_DEPRECATED_NO_WARNINGS
#include "win32-layer.h"
//#include <winsock2.h>
//#include <windows.h>
//#include <tchar.h>
@ -24,6 +22,14 @@
//#include <conio.h>
//#include <crtdbg.h>
#include <android/log.h>
#define LOG_TAG "NDK_NativeEmu48"
#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))
#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))
#include "win32-layer.h"
#if !defined VERIFY
#if defined _DEBUG
#define VERIFY(f) _ASSERT(f)

129
app/src/main/cpp/win32-layer.c
View file

@ -4,12 +4,14 @@
#include <errno.h>
#include <sys/mman.h>
#include <pthread.h>
#include <android/asset_manager.h>
#include <android/asset_manager_jni.h>
#include "resource.h"
HANDLE hWnd;
LPTSTR szTitle;
LPTSTR szCurrentDirectorySet = NULL;
const TCHAR * assetsPrefix = _T("assets/"),
assetsPrefixLength = 7;
AAssetManager * assetManager;
DWORD GetCurrentDirectory(DWORD nBufferLength, LPTSTR lpBuffer) {
@ -24,30 +26,42 @@ BOOL SetCurrentDirectory(LPCTSTR path)
if(path == NULL)
return FALSE;
if(_tcsncmp(path, assetsPrefix, assetsPrefixLength / sizeof(TCHAR)) == 0)
szCurrentDirectorySet = path + assetsPrefixLength;
else
szCurrentDirectorySet = NULL;
return chdir(path);
}
AAssetManager * assetManager;
HANDLE CreateFile(LPCTSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPVOID lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, LPVOID hTemplateFile)
{
if(strncmp(lpFileName, "assets/", 7) == 0) {
AAsset* asset = AAssetManager_open(assetManager, "calculators/real48sx.kml", AASSET_MODE_STREAMING);
char buf[BUFSIZ];
int nb_read = 0;
nb_read = AAsset_read(asset, buf, BUFSIZ);
AAsset_close(asset);
if(szCurrentDirectorySet || _tcsncmp(lpFileName, assetsPrefix, assetsPrefixLength / sizeof(TCHAR)) == 0) {
TCHAR szFileName[MAX_PATH];
AAsset * asset = NULL;
szFileName[0] = _T('\0');
if(szCurrentDirectorySet) {
_tcscpy(szFileName, szCurrentDirectorySet);
_tcscat(szFileName, lpFileName);
asset = AAssetManager_open(assetManager, szFileName, AASSET_MODE_STREAMING);
} else {
asset = AAssetManager_open(assetManager, lpFileName + assetsPrefixLength, AASSET_MODE_STREAMING);
}
if(asset) {
HANDLE handle = malloc(sizeof(_HANDLE));
handle->handleType = HANDLE_TYPE_FILE_ASSET;
handle->fileAsset = asset;
// char buf[BUFSIZ];
// int nb_read = 0;
// nb_read = AAsset_read(asset, buf, BUFSIZ);
// AAsset_close(asset);
// }
// AAssetDir* assetDir = AAssetManager_openDir(assetManager, "");
// const char* filename = (const char*)NULL;
// while ((filename = AAssetDir_getNextFileName(assetDir)) != NULL) {
// AAssetDir_close(assetDir);
HANDLE handle = malloc(sizeof(_HANDLE));
handle->handleType = HANDLE_TYPE_FILE;
//handle->fileDescriptor = fd;
handle->fileIsAsset = TRUE;
return handle;
return handle;
}
} else {
int flags = O_RDWR;
@ -88,7 +102,6 @@ HANDLE CreateFile(LPCTSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
HANDLE handle = malloc(sizeof(_HANDLE));
handle->handleType = HANDLE_TYPE_FILE;
handle->fileDescriptor = fd;
handle->fileIsAsset = FALSE;
return handle;
}
}
@ -96,13 +109,20 @@ HANDLE CreateFile(LPCTSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
}
BOOL ReadFile(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped) {
DWORD readByteCount = read(hFile->fileDescriptor, lpBuffer, nNumberOfBytesToRead);
DWORD readByteCount = 0;
if(hFile->handleType == HANDLE_TYPE_FILE) {
readByteCount = read(hFile->fileDescriptor, lpBuffer, nNumberOfBytesToRead);
} else if(hFile->handleType == HANDLE_TYPE_FILE_ASSET) {
readByteCount = AAsset_read(hFile->fileAsset, lpBuffer, nNumberOfBytesToRead);
}
if(lpNumberOfBytesRead)
*lpNumberOfBytesRead = readByteCount;
return readByteCount >= 0;
}
BOOL WriteFile(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite,LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped) {
if(hFile->handleType == HANDLE_TYPE_FILE_ASSET)
return FALSE;
size_t writenByteCount = write(hFile->fileDescriptor, lpBuffer, nNumberOfBytesToWrite);
if(lpNumberOfBytesWritten)
*lpNumberOfBytesWritten = writenByteCount;
@ -117,21 +137,34 @@ DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveH
moveMode = SEEK_CUR;
else if(dwMoveMethod == FILE_END)
moveMode = SEEK_END;
int seekResult = lseek(hFile->fileDescriptor, lDistanceToMove, moveMode);
int seekResult = -1;
if(hFile->handleType == HANDLE_TYPE_FILE) {
seekResult = lseek(hFile->fileDescriptor, lDistanceToMove, moveMode);
} else if(hFile->handleType == HANDLE_TYPE_FILE_ASSET) {
seekResult = AAsset_seek64(hFile->fileAsset, lDistanceToMove, moveMode);
}
return seekResult < 0 ? INVALID_SET_FILE_POINTER : seekResult;
}
BOOL SetEndOfFile(HANDLE hFile) {
if(hFile->handleType == HANDLE_TYPE_FILE_ASSET)
return FALSE;
off_t currentPosition = lseek(hFile->fileDescriptor, 0, SEEK_CUR);
int truncateResult = ftruncate(hFile->fileDescriptor, currentPosition);
return truncateResult == 0;
}
DWORD GetFileSize(HANDLE hFile, LPDWORD lpFileSizeHigh) {
off_t currentPosition = lseek(hFile->fileDescriptor, 0, SEEK_CUR);
off_t fileLength = lseek(hFile->fileDescriptor, 0, SEEK_END) + 1;
lseek(hFile->fileDescriptor, currentPosition, SEEK_SET);
return fileLength;
if(lpFileSizeHigh)
*lpFileSizeHigh = 0;
if(hFile->handleType == HANDLE_TYPE_FILE) {
off_t currentPosition = lseek(hFile->fileDescriptor, 0, SEEK_CUR);
off_t fileLength = lseek(hFile->fileDescriptor, 0, SEEK_END) + 1;
lseek(hFile->fileDescriptor, currentPosition, SEEK_SET);
return fileLength;
} else if(hFile->handleType == HANDLE_TYPE_FILE_ASSET) {
return AAsset_getLength64(hFile->fileAsset);
}
}
//** https://www.ibm.com/developerworks/systems/library/es-MigratingWin32toLinux.html
@ -139,8 +172,13 @@ DWORD GetFileSize(HANDLE hFile, LPDWORD lpFileSizeHigh) {
//https://www.ibm.com/developerworks/systems/library/es-win32linux-sem.html
HANDLE CreateFileMapping(HANDLE hFile, LPSECURITY_ATTRIBUTES lpFileMappingAttributes, DWORD flProtect, DWORD dwMaximumSizeHigh, DWORD dwMaximumSizeLow, LPCSTR lpName) {
HANDLE handle = malloc(sizeof(_HANDLE));
handle->handleType = HANDLE_TYPE_FILE_MAPPING;
handle->fileDescriptor = hFile->fileDescriptor;
if(hFile->handleType == HANDLE_TYPE_FILE) {
handle->handleType = HANDLE_TYPE_FILE_MAPPING;
handle->fileDescriptor = hFile->fileDescriptor;
} else if(hFile->handleType == HANDLE_TYPE_FILE_ASSET) {
handle->handleType = HANDLE_TYPE_FILE_MAPPING_ASSET;
handle->fileAsset = hFile->fileAsset;
}
handle->fileMappingSize = (dwMaximumSizeHigh << 32) & dwMaximumSizeLow;
handle->fileMappingAddress = NULL;
return handle;
@ -148,18 +186,28 @@ HANDLE CreateFileMapping(HANDLE hFile, LPSECURITY_ATTRIBUTES lpFileMappingAttrib
//https://msdn.microsoft.com/en-us/library/Aa366761(v=VS.85).aspx
LPVOID MapViewOfFile(HANDLE hFileMappingObject, DWORD dwDesiredAccess, DWORD dwFileOffsetHigh, DWORD dwFileOffsetLow, SIZE_T dwNumberOfBytesToMap) {
int prot = PROT_NONE;
if(dwDesiredAccess & FILE_MAP_READ)
prot |= PROT_READ;
if(dwDesiredAccess & FILE_MAP_WRITE)
prot |= PROT_WRITE;
off_t __offset = (dwFileOffsetHigh << 32) & dwFileOffsetLow;
hFileMappingObject->fileMappingAddress = mmap(NULL, hFileMappingObject->fileMappingSize, prot, MAP_PRIVATE, hFileMappingObject->fileDescriptor, __offset);
return hFileMappingObject->fileMappingAddress;
off_t offset = (dwFileOffsetHigh << 32) & dwFileOffsetLow;
if(hFileMappingObject->handleType == HANDLE_TYPE_FILE_MAPPING) {
int prot = PROT_NONE;
if (dwDesiredAccess & FILE_MAP_READ)
prot |= PROT_READ;
if (dwDesiredAccess & FILE_MAP_WRITE)
prot |= PROT_WRITE;
hFileMappingObject->fileMappingAddress = mmap(NULL, hFileMappingObject->fileMappingSize,
prot, MAP_PRIVATE,
hFileMappingObject->fileDescriptor, offset);
return hFileMappingObject->fileMappingAddress;
} else if(hFileMappingObject->handleType == HANDLE_TYPE_FILE_MAPPING_ASSET) {
if (dwDesiredAccess & FILE_MAP_WRITE)
return NULL;
return AAsset_getBuffer(hFileMappingObject->fileAsset) + offset;
}
return NULL;
}
// https://msdn.microsoft.com/en-us/library/aa366882(v=vs.85).aspx
BOOL UnmapViewOfFile(LPCVOID lpBaseAddress) {
//TODO for HANDLE_TYPE_FILE_MAPPING/HANDLE_TYPE_FILE_MAPPING_ASSET
int result = munmap(lpBaseAddress, -1);
return result == 0;
}
@ -756,6 +804,9 @@ UINT GetDlgItemTextA(HWND hDlg, int nIDDlgItem, LPSTR lpString,int cchMax) {
return 0;
}
BOOL SetDlgItemText(HWND hDlg, int nIDDlgItem, LPCSTR lpString) {
if(nIDDlgItem == IDC_KMLLOG) {
LOGD("KML log:\r\n%s", lpString);
}
//TODO
return 0;
}
@ -771,10 +822,10 @@ BOOL EndDialog(HWND hDlg, INT_PTR nResult) {
//TODO
return 0;
}
INT_PTR DialogBoxParam(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam) {
//TODO
return NULL;
}
//INT_PTR DialogBoxParam(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam) {
// //TODO
// return NULL;
//}
HANDLE FindFirstFileA(LPCSTR lpFileName, LPWIN32_FIND_DATAA lpFindFileData) {
//TODO
return INVALID_HANDLE_VALUE;
@ -800,10 +851,14 @@ PIDLIST_ABSOLUTE SHBrowseForFolderA(LPBROWSEINFOA lpbi) {
return NULL;
}
extern TCHAR szCurrentKml[MAX_PATH];
//extern TCHAR szLog[MAX_PATH];
INT_PTR DialogBoxParamA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam) {
//TODO
if(lpTemplateName == MAKEINTRESOURCE(IDD_CHOOSEKML)) {
lstrcpy(szCurrentKml, "assets/calculators/real48sx.kml");
} else if(lpTemplateName == MAKEINTRESOURCE(IDD_KMLLOG)) {
//LOGD(szLog);
lpDialogFunc(NULL, WM_INITDIALOG, 0, 0);
}
return NULL;
}

27
app/src/main/cpp/win32-layer.h
View file

@ -3,6 +3,7 @@
#include <wchar.h>
#include <stdio.h>
#include <string.h>
#include <android/asset_manager.h>
#ifndef __OBJC__
typedef signed char BOOL; // deliberately same type as defined in objc
@ -52,7 +53,9 @@ typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;
enum HANDLE_TYPE {
HANDLE_TYPE_FILE = 1,
HANDLE_TYPE_FILE_ASSET,
HANDLE_TYPE_FILE_MAPPING,
HANDLE_TYPE_FILE_MAPPING_ASSET,
HANDLE_TYPE_EVENT,
HANDLE_TYPE_THREAD,
};
@ -60,7 +63,8 @@ typedef struct {
int handleType;
int fileDescriptor;
BOOL fileIsAsset;
AAsset* fileAsset;
size_t fileMappingSize;
void* fileMappingAddress;
@ -748,7 +752,13 @@ extern BOOL CheckDlgButton(HWND hDlg, int nIDButton, UINT uCheck);
extern UINT IsDlgButtonChecked(HWND hDlg, int nIDButton);
extern BOOL EndDialog(HWND hDlg, INT_PTR nResult);
typedef INT_PTR (CALLBACK* DLGPROC)(HWND, UINT, WPARAM, LPARAM);
extern INT_PTR DialogBoxParam(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam);
//extern INT_PTR DialogBoxParam(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam);
extern INT_PTR DialogBoxParamA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam);
#define DialogBoxA(hInstance, lpTemplate, hWndParent, lpDialogFunc) \
DialogBoxParamA(hInstance, lpTemplate, hWndParent, lpDialogFunc, 0L)
#define DialogBox DialogBoxA
#define DialogBoxParam DialogBoxParamA
#define MAKEINTRESOURCE(i) ((LPSTR)((ULONG_PTR)((WORD)(i))))
typedef struct _FILETIME {
DWORD dwLowDateTime;
@ -823,11 +833,6 @@ HRESULT SHGetMalloc(IMalloc **ppMalloc); // CoGetMalloc(MEMCTX_TASK,ppMalloc)
#define PIDLIST_ABSOLUTE LPITEMIDLIST
extern PIDLIST_ABSOLUTE SHBrowseForFolderA(LPBROWSEINFOA lpbi);
#define SHBrowseForFolder SHBrowseForFolderA
extern INT_PTR DialogBoxParamA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam);
#define DialogBoxA(hInstance, lpTemplate, hWndParent, lpDialogFunc) \
DialogBoxParamA(hInstance, lpTemplate, hWndParent, lpDialogFunc, 0L)
#define DialogBox DialogBoxA
#define LANG_NEUTRAL 0x00
#define SUBLANG_NEUTRAL 0x00
#define PRIMARYLANGID(lgid) ((WORD )(lgid) & 0x3ff)
@ -867,6 +872,10 @@ extern int lstrcmp(LPCWSTR lpString1, LPCWSTR lpString2);
extern int lstrcmpi(LPCWSTR lpString1, LPCWSTR lpString2);
#define _tcstoul wcstoul
#define _tcsncmp wcsncmp
#define _tcslen wcslen
#define _tcscpy wcscpy
#define _tcscat wcscat
#else
@ -884,6 +893,10 @@ extern int lstrcmp(LPCSTR lpString1, LPCSTR lpString2);
#define _tcsncmp strncmp
extern int lstrcmpi(LPCSTR lpString1, LPCSTR lpString2);
#define _tcstoul strtoul
#define _tcsncmp strncmp
#define _tcslen strlen
#define _tcscpy strcpy
#define _tcscat strcat
#endif // !UNICODE