gwh/emu48android-linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
dgis 2019-01-03 21:38:43 +00:00
parent 66eb8feba2
commit 5e9b52c60d
3 changed files with 15 additions and 11 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

@ -2312,11 +2312,11 @@ void draw() {
} }
void buttonDown(int x, int y) { void buttonDown(int x, int y) {
OnLButtonDown(0, x, y); OnLButtonDown(MK_LBUTTON, x, y);
} }
void buttonUp(int x, int y) { void buttonUp(int x, int y) {
OnLButtonUp(0, x, y); OnLButtonUp(MK_LBUTTON, x, y);
} }
void keyDown(int virtKey) { void keyDown(int virtKey) {

4
app/src/main/cpp/core/files.c
View file

@ -1698,9 +1698,9 @@ static HPALETTE CreateBIPalette(BITMAPINFOHEADER CONST *lpbi)
// create a logical color palette. // create a logical color palette.
for (i = 0; i < pPal->palNumEntries; i++) for (i = 0; i < pPal->palNumEntries; i++)
{ {
pPal->palPalEntry[i].peRed = pRgb[i].rgbRed; pPal->palPalEntry[i].peRed = pRgb[i].rgbBlue;
pPal->palPalEntry[i].peGreen = pRgb[i].rgbGreen; pPal->palPalEntry[i].peGreen = pRgb[i].rgbGreen;
pPal->palPalEntry[i].peBlue = pRgb[i].rgbBlue; pPal->palPalEntry[i].peBlue = pRgb[i].rgbRed;
pPal->palPalEntry[i].peFlags = 0; pPal->palPalEntry[i].peFlags = 0;
} }
hpal = CreatePalette(pPal); hpal = CreatePalette(pPal);

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

@ -656,6 +656,10 @@ LRESULT SendMessage(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) {
} }
BOOL PostMessage(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { BOOL PostMessage(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) {
//TODO //TODO
if(hWnd == 0 && Msg == WM_COMMAND) {
int menuCommand = (wParam & 0xffff);
LOGD("Menu Item %d", menuCommand);
}
return NULL; return NULL;
} }
@ -1495,13 +1499,13 @@ void timerCallback(int timerId) {
timerEvents[timerId].fptc((UINT) (timerId + 1), 0, (DWORD) timerEvents[timerId].dwUser, 0, 0); timerEvents[timerId].fptc((UINT) (timerId + 1), 0, (DWORD) timerEvents[timerId].dwUser, 0, 0);
if(timerEvents[timerId].fuEvent == TIME_ONESHOT) { if(timerEvents[timerId].fuEvent == TIME_ONESHOT) {
LOGD("timerCallback remove timer uTimerID [%d]", timerId + 1); //LOGD("timerCallback remove timer uTimerID [%d]", timerId + 1);
deleteTimeEvent((UINT) (timerId + 1)); deleteTimeEvent((UINT) (timerId + 1));
} }
} }
} }
MMRESULT timeSetEvent(UINT uDelay, UINT uResolution, LPTIMECALLBACK fptc, DWORD_PTR dwUser, UINT fuEvent) { MMRESULT timeSetEvent(UINT uDelay, UINT uResolution, LPTIMECALLBACK fptc, DWORD_PTR dwUser, UINT fuEvent) {
LOGD("timeSetEvent(uDelay: %d, fuEvent: %d)", uDelay, fuEvent); //LOGD("timeSetEvent(uDelay: %d, fuEvent: %d)", uDelay, fuEvent);
// Find a timer id // Find a timer id
int timerId = -1; int timerId = -1;
@ -1512,7 +1516,7 @@ MMRESULT timeSetEvent(UINT uDelay, UINT uResolution, LPTIMECALLBACK fptc, DWORD_
} }
} }
if(timerId == -1) { if(timerId == -1) {
LOGD("timeSetEvent() ERROR: No more timer available"); //LOGD("timeSetEvent() ERROR: No more timer available");
return NULL; return NULL;
} }
timerEvents[timerId].timerId = timerId; timerEvents[timerId].timerId = timerId;
@ -1528,7 +1532,7 @@ MMRESULT timeSetEvent(UINT uDelay, UINT uResolution, LPTIMECALLBACK fptc, DWORD_
sev.sigev_notify_attributes = NULL; sev.sigev_notify_attributes = NULL;
timer_t * timer = &(timerEvents[timerId].timer); timer_t * timer = &(timerEvents[timerId].timer);
if (timer_create(CLOCK_REALTIME, &sev, timer) == -1) { if (timer_create(CLOCK_REALTIME, &sev, timer) == -1) {
LOGD("timeSetEvent() ERROR in timer_create"); //LOGD("timeSetEvent() ERROR in timer_create");
return NULL; return NULL;
} }
@ -1545,15 +1549,15 @@ MMRESULT timeSetEvent(UINT uDelay, UINT uResolution, LPTIMECALLBACK fptc, DWORD_
} }
if (timer_settime(timerEvents[timerId].timer, 0, &its, NULL) == -1) { if (timer_settime(timerEvents[timerId].timer, 0, &its, NULL) == -1) {
timer_delete(timerEvents[timerId].timer); timer_delete(timerEvents[timerId].timer);
LOGD("timeSetEvent() ERROR in timer_settime"); //LOGD("timeSetEvent() ERROR in timer_settime");
return NULL; return NULL;
} }
timerEvents[timerId].valid = TRUE; timerEvents[timerId].valid = TRUE;
LOGD("timeSetEvent() -> timerId+1: [%d]", timerId + 1); //LOGD("timeSetEvent() -> timerId+1: [%d]", timerId + 1);
return (MMRESULT) (timerId + 1); // No error return (MMRESULT) (timerId + 1); // No error
} }
MMRESULT timeKillEvent(UINT uTimerID) { MMRESULT timeKillEvent(UINT uTimerID) {
LOGD("timeKillEvent(uTimerID: [%d])", uTimerID); //LOGD("timeKillEvent(uTimerID: [%d])", uTimerID);
deleteTimeEvent(uTimerID); deleteTimeEvent(uTimerID);
return 0; //No error return 0; //No error
} }