app/CMakeLists.txt

@@ -19,9 +19,6 @@ add_library( # Sets the name of the library.
         # Provides a relative path to your source file(s).
         #src/main/cpp/native-lib.cpp
 
-        src/main/cpp/android-layer.c
-        src/main/cpp/win32-layer.c
-
         src/main/cpp/apple.c
 #        src/main/cpp/cursor.c
 #        src/main/cpp/ddeserv.c
@@ -38,7 +35,7 @@ add_library( # Sets the name of the library.
         src/main/cpp/i28f160.c
         src/main/cpp/keyboard.c
 #        src/main/cpp/keymacro.c
-#        src/main/cpp/kml.c #-> To rewrite or TODO
+        src/main/cpp/kml.c #TODO
         src/main/cpp/lodepng.c
         src/main/cpp/lowbat.c
         src/main/cpp/mops.c
@@ -56,10 +53,82 @@ add_library( # Sets the name of the library.
         src/main/cpp/timer.c
 #        src/main/cpp/udp.c
 
-
+        src/main/cpp/win32-layer.c
+        src/main/cpp/android-layer.c
+        src/main/cpp/android-emu48.c # Emu48.c rewrite
         src/main/cpp/emu48-jni.c
 )
 
+#_makepath OK
+#bActFollowsMouse
+#bAlwaysDisplayLog
+#bAlwaysOnTop
+#bAutoSave
+#bAutoSaveOnExit
+#bClientWinMove
+#bGrayscale
+#bLoadObjectWarning
+#bMacroRealSpeed
+#bSaveDefConfirm
+#bShowMenu
+#bShowTitle
+#bSingleInstance
+#bStartupBackup
+#CheckBreakpoint
+#CreateBackupBreakpointList
+#csDbgLock
+#csIOLock
+#csKeyLock
+#csSlowLock
+#csT1Lock
+#csT2Lock
+#DisableDebugger
+#disassemble
+#disassembler_mode
+#disassembler_symb
+#DisplayChooseKml
+#dwMacroMinDelay
+#dwTColor
+#dwWakeupDelay
+#ExtCreateRegion
+#GetLineCounter
+#hEventShutdn
+#hOldPalette
+#hPalette
+#hThread
+#hWindowDC
+#InitKML
+#KeyMacroRecord
+#KillKML
+#lAppStart
+#lFreq
+#LoadBreakpointList
+#nArgc
+#nMacroTimeout
+#NotifyDebugger
+#OnToolMacroStop
+#ppArgv
+#RefreshDisp0
+#ReloadButtons
+#RestoreBackupBreakpointList
+#RGB
+#SaveBreakpointList
+#SetWindowPlacement
+#SetWindowTitle
+#StartDisplay
+#StopDisplay
+#szUdpServer
+#UpdateAnnunciators
+#UpdateContrast
+#UpdateDbgCycleCounter
+#UpdateDisplayPointers
+#UpdateMainDisplay
+#UpdateMenuDisplay
+#uWaveDevId
+#WriteToMainDisplay
+#WriteToMenuDisplay
+#wUdpPort
+
 # Searches for a specified prebuilt library and stores the path as a
 # variable. Because CMake includes system libraries in the search path by
 # default, you only need to specify the name of the public NDK library

app/src/main/cpp/win32-layer.c

@@ -639,6 +639,10 @@ int WINAPI lstrcmp(LPCWSTR lpString1, LPCWSTR lpString2) {
 int lstrcmpi(LPCWSTR lpString1, LPCWSTR lpString2) {
     return wcscasecmp(lpString1, lpString2);
 }
+void _wmakepath(wchar_t _Buffer, wchar_t const* _Drive, wchar_t const* _Dir, wchar_t const* _Filename, wchar_t const* _Ext)
+{
+}
+
 #else
 
 int WINAPI wvsprintf(LPSTR arg1, LPCSTR arg2, va_list arglist) {
@@ -659,13 +663,13 @@ int lstrcmpi(LPCSTR lpString1, LPCSTR lpString2) {
     return strcasecmp(lpString1, lpString2);
 }
 
-
+void _makepath(char _Buffer, char const* _Drive, char const* _Dir, char const* _Filename, char const* _Ext)
+{
+}
 
 #endif // !UNICODE
 
-void _wmakepath(wchar_t _Buffer, wchar_t const* _Drive, wchar_t const* _Dir, wchar_t const* _Filename, wchar_t const* _Ext)
-{
-}
+
 
 
 BOOL GetClientRect(HWND hWnd, LPRECT lpRect)

app/src/main/cpp/win32-layer.h

@@ -32,6 +32,7 @@ typedef BYTE *LPBYTE;
 typedef unsigned short WORD;
 typedef uint32_t UINT;
 typedef int32_t INT;
+typedef int INT_PTR, *PINT_PTR;
 typedef char CHAR;
 typedef void VOID;
 typedef void *LPVOID;
@@ -650,6 +651,19 @@ extern MMRESULT timeBeginPeriod(UINT uPeriod);
 extern MMRESULT timeEndPeriod(UINT uPeriod);
 extern VOID GetLocalTime(LPSYSTEMTIME lpSystemTime);
 
+
+extern BOOL EnableWindow(HWND hWnd, BOOL bEnable);
+extern HWND GetDlgItem(HWND hDlg, int nIDDlgItem);
+extern BOOL SetDlgItemText(HWND hDlg, int nIDDlgItem, LPCSTR lpString);
+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);
+#define MAKEINTRESOURCE(i) ((LPSTR)((ULONG_PTR)((WORD)(i))))
+
+
+
 #ifdef UNICODE
 
 extern int wvsprintf(LPWSTR, LPCWSTR, va_list arglist);
@@ -691,3 +705,5 @@ extern int lstrcmpi(LPCSTR lpString1, LPCSTR lpString2);
 #define __max(a,b) (((a) > (b)) ? (a) : (b))
 #define __min(a,b) (((a) < (b)) ? (a) : (b))
 
+/* device ID for wave device mapper */
+#define WAVE_MAPPER     ((UINT)-1)