2310

diff --git a/memory.cpp b/memory.cpp
index a180c68688d7544e5b35f4dd1bd96035f9e1249e..0a2a49a07dbf888f79c04b288143e230432b9531 100644 (file)
--- a/memory.cpp
+++ b/memory.cpp
@@ -6,7 +6,7 @@
 * (c) 1995 Bernd Schmidt
 */
 
-#define DEBUG_STUPID 0
+#define DEBUG_STUPID 1
 
 #include "sysconfig.h"
 #include "sysdeps.h"

diff --git a/od-win32/WinUAE_Install.nsi b/od-win32/WinUAE_Install.nsi
index da47c0edf8453d87a6fdf107beec22eda690fbe8..0960625f3d4b04e353c4ea4e676bce0df4370bcb 100644 (file)
--- a/od-win32/WinUAE_Install.nsi
+++ b/od-win32/WinUAE_Install.nsi
@@ -1,5 +1,5 @@
 !define PRODUCT_NAME "WinUAE"
-!define PRODUCT_VERSION "2.3.0"
+!define PRODUCT_VERSION "2.3.1"
 !define PRODUCT_PUBLISHER "Arabuusimiehet"
 !define PRODUCT_WEB_SITE "http://www.winuae.net/"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\winuae.exe"

diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc
index 25b33779355d51d31a55527737bd4620192723aa..4065e05a80ba5a94152d9a51fe62c8cedb169cfa 100644 (file)
--- a/od-win32/resources/winuae_minimal.rc
+++ b/od-win32/resources/winuae_minimal.rc
@@ -121,7 +121,7 @@ BEGIN
     EDITTEXT        IDC_XSIZE,59,48,48,12,ES_NUMBER
     EDITTEXT        IDC_YSIZE,114,48,47,12,ES_NUMBER
     GROUPBOX        "Settings",IDC_SETTINGSTEXT,12,73,199,137
-    CONTROL         "Blacker than black",IDC_BLACKER_THAN_BLACK,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,19,125,92,10
+    CONTROL         "Blacker than black",IDC_BLACKER_THAN_BLACK,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,17,125,92,10
     LTEXT           "Refresh:",IDC_REFRESHTEXT,18,173,28,8
     CONTROL         "Slider1",IDC_FRAMERATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,168,75,20
     EDITTEXT        IDC_RATETEXT,124,172,77,12,ES_CENTER | ES_READONLY
@@ -138,7 +138,7 @@ BEGIN
     CONTROL         "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,188,127,20
     EDITTEXT        IDC_RATE2TEXT,175,192,26,12,ES_CENTER | ES_READONLY
     COMBOBOX        IDC_RESOLUTIONDEPTH,134,27,46,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Filtered low resolution",IDC_LORES_SMOOTHED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,118,125,89,10
+    CONTROL         "Filtered low resolution",IDC_LORES_SMOOTHED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,125,89,10
     COMBOBOX        IDC_SCREENMODE_NATIVE,100,85,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_SCREENMODE_RTG,100,103,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Native mode:",IDC_STATIC,19,85,59,15,SS_CENTERIMAGE
@@ -146,10 +146,11 @@ BEGIN
     PUSHBUTTON      "Reset to defaults",IDC_DA_RESET,212,218,73,14
     RTEXT           "Resolution:",IDC_STATIC,27,152,59,15,SS_CENTERIMAGE
     COMBOBOX        IDC_LORES,100,152,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Remove interlace artifacts",IDC_FLICKERFIXER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,139,99,10
+    CONTROL         "Remove interlace artifacts",IDC_FLICKERFIXER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,139,99,10
     RTEXT           "Windowed:",IDC_STATIC,17,46,40,15,SS_CENTERIMAGE
     RTEXT           "Fullscreen:",IDC_STATIC,17,19,40,15,SS_CENTERIMAGE
     COMBOBOX        IDC_DISPLAY_BUFFERCNT,187,47,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Resolution autoswitch",IDC_AUTORESOLUTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,139,89,10
 END
 
 IDD_MEMORY DIALOGEX 0, 0, 300, 182
@@ -480,32 +481,27 @@ IDD_MISC1 DIALOGEX 0, 0, 300, 237
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Miscellaneous Options",IDC_STATIC,8,2,290,136
+    GROUPBOX        "Miscellaneous Options",IDC_STATIC,4,2,293,165
     CONTROL         "Untrap = middle button",IDC_JULIAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,19,110,10
     CONTROL         "Show GUI on startup",IDC_SHOWGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,43,109,10
-    CONTROL         "Native OSD",IDC_SHOWLEDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,95,76,10
+    CONTROL         "Native on-screen display",IDC_SHOWLEDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,139,109,10
     CONTROL         "Don't show taskbar button",IDC_NOTASKBARBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,67,109,10
     CONTROL         "Use CTRL-F11 to quit",IDC_CTRLF11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,55,110,10
-    GROUPBOX        "Keyboard LEDs",IDC_STATIC,7,140,85,94
-    COMBOBOX        IDC_KBLED1,22,154,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_KBLED2,22,173,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_KBLED3,22,193,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Logging",IDC_STATIC,97,140,202,25
-    CONTROL         "Create log file",IDC_CREATELOGFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,151,72,10
-    CONTROL         "Illegal memory accesses",IDC_ILLEGAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,151,95,10
-    GROUPBOX        "State Files",IDC_STATIC,98,167,201,68
-    PUSHBUTTON      "Load state...",IDC_DOLOADSTATE,105,180,49,14
-    PUSHBUTTON      "Save state...",IDC_DOSAVESTATE,105,208,49,14
-    CONTROL         "Enable state recording",IDC_STATE_CAPTURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,182,88,10
-    RTEXT           "Recording rate (seconds):",IDC_STATIC,157,199,86,10,SS_CENTERIMAGE | WS_TABSTOP
-    COMBOBOX        IDC_STATE_RATE,248,197,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Recording buffer (MB):",IDC_STATIC,160,219,83,10,SS_CENTERIMAGE | WS_TABSTOP
-    COMBOBOX        IDC_STATE_BUFFERSIZE,248,217,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Keyboard LEDs",IDC_STATIC,3,207,294,29
+    COMBOBOX        IDC_KBLED1,10,218,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_KBLED2,78,218,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_KBLED3,145,218,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Logging",IDC_STATIC,4,167,151,38
+    CONTROL         "Create log file",IDC_CREATELOGFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,176,72,10
+    CONTROL         "Illegal memory accesses",IDC_ILLEGAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,188,95,10
+    GROUPBOX        "State Files",IDC_STATIC,162,167,135,38
+    PUSHBUTTON      "Load state...",IDC_DOLOADSTATE,175,182,49,14
+    PUSHBUTTON      "Save state...",IDC_DOSAVESTATE,235,182,49,14
     CONTROL         "Always on top",IDC_ALWAYSONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,79,110,10
-    CONTROL         "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,216,64,10
+    CONTROL         "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,217,219,64,10
     COMBOBOX        IDC_SCSIMODE,213,26,80,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_LANGUAGE,153,117,122,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Language",IDC_STATIC,138,107,154,27
+    COMBOBOX        IDC_LANGUAGE,153,144,122,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Language",IDC_STATIC,138,134,154,27
     CONTROL         "Disable screensaver",IDC_POWERSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,91,109,10
     COMBOBOX        IDC_DD_SURFACETYPE,213,78,79,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "DirectDraw display buffer:",IDC_STATIC,112,79,97,10,SS_CENTERIMAGE
@@ -513,12 +509,13 @@ BEGIN
     CONTROL         "Synchronize clock",IDC_CLOCKSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,103,111,10
     CONTROL         "Faster RTG [] Enables less accurate custom chipset emulation mode when Picasso96 is enabled.",IDC_FASTERRTG,
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,19,115,111,10
-    CONTROL         "RTG OSD",IDC_SHOWLEDSRTG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,227,95,63,10
+    CONTROL         "RTG on-screen display",IDC_SHOWLEDSRTG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,151,109,10
     RTEXT           "Graphics API:",IDC_STATIC,130,62,79,10,SS_CENTERIMAGE
     COMBOBOX        IDC_DXMODE,213,60,79,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Minimize when focus is lost",IDC_FOCUSMINIMIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,31,110,10
     RTEXT           "Windowed style:",IDC_STATIC,128,45,81,10,SS_CENTERIMAGE
     COMBOBOX        IDC_WINDOWEDMODE,213,43,79,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Clipboard sharing",IDC_CLIPBOARDSHARE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,127,111,10
 END
 
 IDD_HARDFILE DIALOGEX 0, 0, 299, 249
@@ -686,11 +683,11 @@ BEGIN
     CONTROL         "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,159,107,10
 END
 
-IDD_AVIOUTPUT DIALOGEX 0, 0, 288, 217
+IDD_AVIOUTPUT DIALOGEX 0, 0, 288, 236
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Output Properties",IDC_STATIC,5,0,274,126
+    GROUPBOX        "Output Properties",IDC_STATIC,5,0,274,115
     EDITTEXT        IDC_AVIOUTPUT_FILETEXT,15,15,226,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_CLIENTEDGE
     PUSHBUTTON      "...",IDC_AVIOUTPUT_FILE,249,15,19,12
     CONTROL         "Audio",IDC_AVIOUTPUT_AUDIO,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT | WS_TABSTOP,15,33,39,14
@@ -698,23 +695,28 @@ BEGIN
     CONTROL         "Video",IDC_AVIOUTPUT_VIDEO,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT | WS_TABSTOP,15,50,39,14
     CONTROL         "",IDC_AVIOUTPUT_VIDEO_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,59,51,209,13
     CONTROL         "Disable frame rate limit",IDC_AVIOUTPUT_FRAMELIMITER,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,71,122,10
-    CONTROL         "AVI output enabled",IDC_AVIOUTPUT_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,15,103,108,14
-    PUSHBUTTON      "Save screenshot",IDC_SCREENSHOT,16,141,77,14
-    GROUPBOX        "Ripper",IDC_STATIC,5,127,274,49
-    PUSHBUTTON      "Pro Wizard 1.62",IDC_PROWIZARD,192,141,77,14,WS_DISABLED
-    CONTROL         "Sample ripper",IDC_SAMPLERIPPER_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,192,159,77,14
-    GROUPBOX        "Input Recorder",IDC_STATIC,5,178,274,33
-    CONTROL         "Record",IDC_INPREC_RECORD,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,192,190,77,14
-    CONTROL         "Playback",IDC_INPREC_PLAY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,16,190,77,14
-    CONTROL         "Alt. playback mode",IDC_INPREC_PLAYMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,103,192,78,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,69,122,10
+    CONTROL         "AVI output enabled",IDC_AVIOUTPUT_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,15,94,108,14
+    PUSHBUTTON      "Save screenshot",IDC_SCREENSHOT,16,129,77,14
+    GROUPBOX        "Ripper",IDC_STATIC,5,115,274,49
+    PUSHBUTTON      "Pro Wizard 1.62",IDC_PROWIZARD,192,129,77,14,WS_DISABLED
+    CONTROL         "Sample ripper",IDC_SAMPLERIPPER_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,192,146,77,14
+    GROUPBOX        "Re-recorder",IDC_STATIC,5,165,274,70
+    CONTROL         "Play recording",IDC_STATEREC_PLAY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,15,177,77,14
     CONTROL         "Disable sound output",IDC_AVIOUTPUT_NOSOUNDOUTPUT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,88,123,10
-    CONTROL         "Disable sound sync",IDC_AVIOUTPUT_NOSOUNDSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,147,88,120,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,81,123,10
+    CONTROL         "Disable sound sync",IDC_AVIOUTPUT_NOSOUNDSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,147,81,120,10
     CONTROL         "Capture before filtering",IDC_AVIOUTPUT_ORIGINALSIZE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,147,71,120,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,147,69,120,10
     CONTROL         "Take screenshot before filtering",IDC_SCREENSHOT_ORIGINALSIZE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,160,162,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,148,162,10
+    RTEXT           "Recording rate (seconds):",IDC_STATIC,12,218,86,10,SS_CENTERIMAGE | WS_TABSTOP
+    COMBOBOX        IDC_STATEREC_RATE,103,216,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Recording buffers:",IDC_STATIC,148,218,75,10,SS_CENTERIMAGE | WS_TABSTOP
+    COMBOBOX        IDC_STATEREC_BUFFERSIZE,229,216,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Re-recording enabled",IDC_STATEREC_RECORD,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,160,177,108,14
+    PUSHBUTTON      "Save recording",IDC_STATEREC_SAVE,160,195,108,14
+    CONTROL         "Automatic replay",IDC_STATEREC_AUTOPLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,200,129,10
 END
 
 IDD_INPUT DIALOGEX 0, 0, 300, 242
@@ -1058,8 +1060,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,0,0
- PRODUCTVERSION 2,3,0,0
+ FILEVERSION 2,3,1,0
+ PRODUCTVERSION 2,3,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1075,12 +1077,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "2.3.0.0"
+            VALUE "FileVersion", "2.3.1.0"
             VALUE "InternalName", "WinUAE"
-            VALUE "LegalCopyright", "© 1996-2010 under the GNU Public License (GPL)"
+            VALUE "LegalCopyright", "© 1996-2011 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "2.3.0.0"
+            VALUE "ProductVersion", "2.3.1.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -1175,7 +1177,6 @@ BEGIN
         END
     END
 END
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -1240,6 +1241,10 @@ BEGIN
     BEGIN
     END
 
+    IDD_AVIOUTPUT, DIALOG
+    BEGIN
+    END
+
     IDD_INPUT, DIALOG
     BEGIN
     END
@@ -1624,7 +1629,7 @@ BEGIN
     IDS_TABLET_BOTH_CURSORS "Show both cursors"
     IDS_TABLET_NATIVE_CURSOR "Show native cursor only"
     IDS_TABLET_HOST_CURSOR  "Show host cursor only"
-    IDS_AUTOSCALE_DISABLED  "No Autoscaling"
+    IDS_AUTOSCALE_DISABLED  "No scaling"
     IDS_AUTOSCALE_SCALING   "Automatic scaling"
     IDS_AUTOSCALE_RESIZE    "Automatic resize"
     IDS_PRINTER_ASCII       "ASCII-Only"
@@ -1651,6 +1656,13 @@ BEGIN
     IDS_AUTOSCALE_TV        "Fullscreen (TV)"
 END
 
+STRINGTABLE
+BEGIN
+    IDS_JOYMODE_GAMEPAD     "Gamepad"
+    IDS_AUTOSCALE_DEFAULT   "Default"
+    IDS_AUTOSCALE_MANUAL    "Manual"
+END
+
 #endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/od-win32/serial_win32.cpp b/od-win32/serial_win32.cpp
index 7588bb19afb333d06d9de67190a86eb4f82a1f26..ea60d07d2e960986c62f297c6987e5f2085dd906 100644 (file)
--- a/od-win32/serial_win32.cpp
+++ b/od-win32/serial_win32.cpp
@@ -27,7 +27,7 @@
 
 #include "od-win32/parser.h"
 
-#define SERIALLOGGING 0
+#define SERIALLOGGING 1
 #define SERIALDEBUG 0 /* 0, 1, 2 3 */
 #define SERIALHSDEBUG 0
 #define MODEMTEST   0 /* 0 or 1 */

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 54c01422c852f2555cb9f859eaf06a4213cbad27..fb0a247c3f3ff6d64960c1f67fa3862677af3669 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,11 +15,11 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 1
+#define WINUAEPUBLICBETA 0
 #define LANG_DLL 1
 
-#define WINUAEBETA L"13"
-#define WINUAEDATE MAKEBD(2011, 2, 23)
+#define WINUAEBETA L""
+#define WINUAEDATE MAKEBD(2011, 2, 26)
 #define WINUAEEXTRA L""
 #define WINUAEREV L""