notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libretro: pass required arg to VirtualProtect
[picodrive.git]
/
platform
/
libretro
/
libretro.c
diff --git
a/platform/libretro/libretro.c
b/platform/libretro/libretro.c
index
99f0f3b
..
42d30c2
100644
(file)
--- a/
platform/libretro/libretro.c
+++ b/
platform/libretro/libretro.c
@@
-451,7
+451,8
@@
int plat_mem_set_exec(void *ptr, size_t size)
{
int ret = -1;
#ifdef _WIN32
{
int ret = -1;
#ifdef _WIN32
- ret = VirtualProtect(ptr, size, PAGE_EXECUTE_READWRITE, 0);
+ DWORD oldProtect = 0;
+ ret = VirtualProtect(ptr, size, PAGE_EXECUTE_READWRITE, &oldProtect);
if (ret == 0 && log_cb)
log_cb(RETRO_LOG_ERROR, "VirtualProtect(%p, %d) failed: %d\n", ptr, (int)size,
GetLastError());
if (ret == 0 && log_cb)
log_cb(RETRO_LOG_ERROR, "VirtualProtect(%p, %d) failed: %d\n", ptr, (int)size,
GetLastError());
@@
-1088,9
+1089,9
@@
bool retro_load_game(const struct retro_game_info *info)
PicoLoopPrepare();
PicoLoopPrepare();
- Pico
W
riteSound = snd_write;
+ Pico
In.w
riteSound = snd_write;
memset(sndBuffer, 0, sizeof(sndBuffer));
memset(sndBuffer, 0, sizeof(sndBuffer));
- PsndOut = sndBuffer;
+ P
icoIn.
sndOut = sndBuffer;
PsndRerate(0);
return true;
PsndRerate(0);
return true;
@@
-1193,7
+1194,7
@@
static const unsigned short retro_pico_map[] = {
static void snd_write(int len)
{
static void snd_write(int len)
{
- audio_batch_cb(PsndOut, len / 4);
+ audio_batch_cb(P
icoIn.
sndOut, len / 4);
}
static enum input_device input_name_to_val(const char *name)
}
static enum input_device input_name_to_val(const char *name)
@@
-1375,7
+1376,7
@@
void retro_init(void)
#endif
PicoIn.opt |= POPT_EN_DRC;
#endif
#endif
PicoIn.opt |= POPT_EN_DRC;
#endif
- PsndRate = 44100;
+ P
icoIn.
sndRate = 44100;
PicoIn.autoRgnOrder = 0x184; // US, EU, JP
vout_width = 320;
PicoIn.autoRgnOrder = 0x184; // US, EU, JP
vout_width = 320;
@@
-1390,9
+1391,9
@@
void retro_init(void)
PicoDrawSetOutFormat(PDF_RGB555, 0);
PicoDrawSetOutBuf(vout_buf, vout_width * 2);
PicoDrawSetOutFormat(PDF_RGB555, 0);
PicoDrawSetOutBuf(vout_buf, vout_width * 2);
- //PicoMessage = plat_status_msg_busy_next;
- Pico
MCDopenTray
= disk_tray_open;
- Pico
MCDcloseTray
= disk_tray_close;
+ //Pico
In.osd
Message = plat_status_msg_busy_next;
+ Pico
In.mcdTrayOpen
= disk_tray_open;
+ Pico
In.mcdTrayClose
= disk_tray_close;
update_variables();
}
update_variables();
}