Make sure configuration is saved when a snapshot is loaded.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
parent
ad1b6774ae
commit
86ad2130a9
10 changed files with 39 additions and 6 deletions
|
@ -1,7 +1,6 @@
|
||||||
include(FindPkgConfig)
|
include(FindPkgConfig)
|
||||||
|
|
||||||
add_library(appleii SHARED
|
add_library(appleii SHARED
|
||||||
|
|
||||||
SoundCore.cpp
|
SoundCore.cpp
|
||||||
AY8910.cpp
|
AY8910.cpp
|
||||||
Mockingboard.cpp
|
Mockingboard.cpp
|
||||||
|
@ -32,6 +31,8 @@ add_library(appleii SHARED
|
||||||
SaveState.cpp # uses g_CardMgr in m_ConfigNew (reverse order)
|
SaveState.cpp # uses g_CardMgr in m_ConfigNew (reverse order)
|
||||||
Riff.cpp
|
Riff.cpp
|
||||||
|
|
||||||
|
Configuration/PropertySheetHelper.cpp
|
||||||
|
|
||||||
linux/windows/memory.cpp
|
linux/windows/memory.cpp
|
||||||
linux/windows/handles.cpp
|
linux/windows/handles.cpp
|
||||||
linux/windows/files.cpp
|
linux/windows/files.cpp
|
||||||
|
|
|
@ -2,9 +2,12 @@
|
||||||
|
|
||||||
#include "Common.h"
|
#include "Common.h"
|
||||||
#include "Configuration/IPropertySheet.h"
|
#include "Configuration/IPropertySheet.h"
|
||||||
|
#include "Configuration/PropertySheetHelper.h"
|
||||||
|
|
||||||
void IPropertySheet::ApplyNewConfig(CConfigNeedingRestart const&, CConfigNeedingRestart const&)
|
void IPropertySheet::ApplyNewConfig(CConfigNeedingRestart const & newConfig, CConfigNeedingRestart const & oldConfig)
|
||||||
{
|
{
|
||||||
|
CPropertySheetHelper helper;
|
||||||
|
helper.ApplyNewConfig(newConfig, oldConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT IPropertySheet::GetTheFreezesF8Rom(void)
|
UINT IPropertySheet::GetTheFreezesF8Rom(void)
|
||||||
|
@ -15,3 +18,7 @@ UINT IPropertySheet::GetTheFreezesF8Rom(void)
|
||||||
void IPropertySheet::ConfigSaveApple2Type(eApple2Type apple2Type)
|
void IPropertySheet::ConfigSaveApple2Type(eApple2Type apple2Type)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void IPropertySheet::SetTheFreezesF8Rom(UINT uValue)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
|
@ -154,3 +154,8 @@ BOOL GetOpenFileName(LPOPENFILENAME lpofn)
|
||||||
{
|
{
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOL GetSaveFileName(LPOPENFILENAME lpofn)
|
||||||
|
{
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@ typedef struct tagOFN {
|
||||||
LPCTSTR lpstrTitle;
|
LPCTSTR lpstrTitle;
|
||||||
DWORD Flags;
|
DWORD Flags;
|
||||||
WORD nFileExtension;
|
WORD nFileExtension;
|
||||||
|
WORD nFileOffset;
|
||||||
} OPENFILENAME, *LPOPENFILENAME;
|
} OPENFILENAME, *LPOPENFILENAME;
|
||||||
|
|
||||||
#define FILE_BEGIN SEEK_SET
|
#define FILE_BEGIN SEEK_SET
|
||||||
|
@ -57,6 +58,7 @@ BOOL DeleteFile(LPCTSTR lpFileName);
|
||||||
DWORD GetFileAttributes(const char * filename);
|
DWORD GetFileAttributes(const char * filename);
|
||||||
DWORD GetFullPathName(const char* filename, DWORD, char *, char **);
|
DWORD GetFullPathName(const char* filename, DWORD, char *, char **);
|
||||||
BOOL GetOpenFileName(LPOPENFILENAME lpofn);
|
BOOL GetOpenFileName(LPOPENFILENAME lpofn);
|
||||||
|
BOOL GetSaveFileName(LPOPENFILENAME lpofn);
|
||||||
|
|
||||||
HANDLE CreateFile(LPCTSTR lpFileName,
|
HANDLE CreateFile(LPCTSTR lpFileName,
|
||||||
DWORD dwDesiredAccess,
|
DWORD dwDesiredAccess,
|
||||||
|
|
|
@ -15,8 +15,8 @@ typedef HANDLE HGLOBAL;
|
||||||
typedef void * HWD;
|
typedef void * HWD;
|
||||||
typedef void * HDC;
|
typedef void * HDC;
|
||||||
typedef void * HINSTANCE;
|
typedef void * HINSTANCE;
|
||||||
typedef void * LPARAM;
|
typedef LONG_PTR LPARAM;
|
||||||
typedef void * WPARAM;
|
typedef UINT_PTR WPARAM;
|
||||||
typedef void * SOCKET;
|
typedef void * SOCKET;
|
||||||
typedef void * CRITICAL_SECTION;
|
typedef void * CRITICAL_SECTION;
|
||||||
typedef void * LPDIRECTDRAW;
|
typedef void * LPDIRECTDRAW;
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#define INVALID_SOCKET (SOCKET)(~0)
|
#define INVALID_SOCKET (SOCKET)(~0)
|
||||||
|
|
||||||
#define MB_OK 0x00000000
|
#define MB_OK 0x00000000
|
||||||
|
#define MB_OKCANCEL 0x00000001
|
||||||
#define MB_ICONEXCLAMATION 0x00000030
|
#define MB_ICONEXCLAMATION 0x00000030
|
||||||
#define MB_YESNO 0x00000004
|
#define MB_YESNO 0x00000004
|
||||||
#define MB_YESNOCANCEL 0x00000003
|
#define MB_YESNOCANCEL 0x00000003
|
||||||
|
|
|
@ -16,6 +16,7 @@ void strcpy_s(char * dest, size_t size, const char * source);
|
||||||
#define _tcsncpy strncpy
|
#define _tcsncpy strncpy
|
||||||
#define _tcslen strlen
|
#define _tcslen strlen
|
||||||
#define _tcscmp strcmp
|
#define _tcscmp strcmp
|
||||||
|
#define _tcsicmp _stricmp
|
||||||
#define _stricmp strcasecmp
|
#define _stricmp strcasecmp
|
||||||
#define _tcschr strchr
|
#define _tcschr strchr
|
||||||
#define _tcsstr strstr
|
#define _tcsstr strstr
|
||||||
|
|
|
@ -202,8 +202,8 @@ typedef unsigned char TBYTE , *PTBYTE ;
|
||||||
#define _tmain main
|
#define _tmain main
|
||||||
|
|
||||||
typedef void * HWND;
|
typedef void * HWND;
|
||||||
typedef void * LPARAM;
|
typedef LONG_PTR LPARAM;
|
||||||
typedef void * WPARAM;
|
typedef UINT_PTR WPARAM;
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,3 +24,13 @@ BOOL KillTimer(HWND hWnd, UINT uIDEvent)
|
||||||
{
|
{
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HWND WINAPI GetDlgItem(HWND,INT)
|
||||||
|
{
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
LRESULT WINAPI SendMessage(HWND,UINT,WPARAM,LPARAM)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
|
@ -5,6 +5,10 @@
|
||||||
typedef void * HCURSOR;
|
typedef void * HCURSOR;
|
||||||
|
|
||||||
#define IDC_WAIT "IDC_WAIT"
|
#define IDC_WAIT "IDC_WAIT"
|
||||||
|
#define CB_ERR (-1)
|
||||||
|
#define CB_ADDSTRING 0x0143
|
||||||
|
#define CB_RESETCONTENT 0x014b
|
||||||
|
#define CB_SETCURSEL 0x014e
|
||||||
|
|
||||||
HCURSOR LoadCursor(HINSTANCE hInstance, LPCSTR lpCursorName);
|
HCURSOR LoadCursor(HINSTANCE hInstance, LPCSTR lpCursorName);
|
||||||
HCURSOR SetCursor(HCURSOR hCursor);
|
HCURSOR SetCursor(HCURSOR hCursor);
|
||||||
|
@ -13,3 +17,5 @@ typedef VOID (CALLBACK *TIMERPROC)(HWND,UINT,UINT_PTR,DWORD);
|
||||||
|
|
||||||
UINT_PTR SetTimer(HWND,UINT_PTR,UINT,TIMERPROC);
|
UINT_PTR SetTimer(HWND,UINT_PTR,UINT,TIMERPROC);
|
||||||
BOOL KillTimer(HWND hWnd, UINT uIDEvent);
|
BOOL KillTimer(HWND hWnd, UINT uIDEvent);
|
||||||
|
HWND WINAPI GetDlgItem(HWND,INT);
|
||||||
|
LRESULT WINAPI SendMessage(HWND,UINT,WPARAM,LPARAM);
|
||||||
|
|
Loading…
Add table
Reference in a new issue