From: Toni Wilen Date: Sat, 3 Feb 2018 15:41:19 +0000 (+0200) Subject: 3610b1 X-Git-Tag: 4000~205 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=9ac69014d2551ed167f58a984090c37d127b098f;p=francis%2Fwinuae.git 3610b1 --- diff --git a/gencpu.cpp b/gencpu.cpp index 5f1bcda1..10eff2f6 100644 --- a/gencpu.cpp +++ b/gencpu.cpp @@ -2387,17 +2387,15 @@ static void genmovemle_ce (uae_u16 opcode) printf ("\tuae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff;\n"); printf ("\twhile (dmask) {\n"); printf ("\t\t%s (srca, m68k_dreg (regs, movem_index1[dmask]) >> 16);\n", dstw); - printf ("\t\tsrca += %d;\n", size / 2); - printf ("\t\t%s (srca, m68k_dreg (regs, movem_index1[dmask]));\n", dstw); - printf ("\t\tsrca += %d;\n", size / 2); + printf ("\t\t%s (srca + 2, m68k_dreg (regs, movem_index1[dmask]));\n", dstw); + printf ("\t\tsrca += %d;\n", size); printf ("\t\tdmask = movem_next[dmask];\n"); addcycles000_nonce("\t\t", 8); printf ("\t}\n"); printf ("\twhile (amask) {\n"); printf ("\t\t%s (srca, m68k_areg (regs, movem_index1[amask]) >> 16);\n", dstw); - printf ("\t\tsrca += %d;\n", size / 2); - printf ("\t\t%s (srca , m68k_areg (regs, movem_index1[amask]));\n", dstw); - printf ("\t\tsrca += %d;\n", size / 2); + printf ("\t\t%s (srca + 2, m68k_areg (regs, movem_index1[amask]));\n", dstw); + printf ("\t\tsrca += %d;\n", size); printf ("\t\tamask = movem_next[amask];\n"); addcycles000_nonce("\t\t", 8); printf ("\t}\n"); diff --git a/include/options.h b/include/options.h index cd785f49..18c60b85 100644 --- a/include/options.h +++ b/include/options.h @@ -16,7 +16,7 @@ #define UAEMAJOR 3 #define UAEMINOR 6 -#define UAESUBREV 0 +#define UAESUBREV 1 typedef enum { KBD_LANG_US, KBD_LANG_DK, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES } KbdLang; diff --git a/od-win32/direct3d11.cpp b/od-win32/direct3d11.cpp index 77ab361c..cab1aa72 100644 --- a/od-win32/direct3d11.cpp +++ b/od-win32/direct3d11.cpp @@ -265,6 +265,11 @@ struct d3d11struct struct shaderdata11 shaders[MAX_SHADERS]; ID3DX11EffectTechnique *technique; ID3DX11EffectPass *effectpass; + +#ifndef NDEBUG + ID3D11InfoQueue *m_debugInfoQueue; + ID3D11Debug *m_debug; +#endif }; #define NUMVERTICES 8 @@ -1319,6 +1324,7 @@ pass2: } if (rendertarget) { + d3d->m_deviceContext->OMSetRenderTargets(1, &lpRenderTarget, NULL); } @@ -3275,14 +3281,14 @@ static int xxD3D11_init2(HWND ahwnd, int w_w, int w_h, int t_w, int t_h, int dep } #ifndef NDEBUG - ID3D11InfoQueue* m_debugInfoQueue = 0; - d3d->m_device->QueryInterface(IID_ID3D11InfoQueue, (void**)&m_debugInfoQueue); - if (0 && m_debugInfoQueue) + d3d->m_device->QueryInterface(IID_ID3D11InfoQueue, (void**)&d3d->m_debugInfoQueue); + if (0 && d3d->m_debugInfoQueue) { - m_debugInfoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_CORRUPTION, TRUE); - m_debugInfoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_ERROR, TRUE); - m_debugInfoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_WARNING, TRUE); + d3d->m_debugInfoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_CORRUPTION, TRUE); + d3d->m_debugInfoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_ERROR, TRUE); + d3d->m_debugInfoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_WARNING, TRUE); } + d3d->m_device->QueryInterface(IID_ID3D11Debug, (void**)&d3d->m_debug); #endif ComPtr dxgiDevice; @@ -3525,6 +3531,17 @@ static void xD3D11_free(bool immediate) d3d->outputAdapter = NULL; } +#ifndef NDEBUG + if (d3d->m_debugInfoQueue) { + d3d->m_debugInfoQueue->Release(); + d3d->m_debugInfoQueue = NULL; + } + if (d3d->m_debug) { + d3d->m_debug->Release(); + d3d->m_debug = NULL; + } +#endif + d3d->device_errors = 0; changed_prefs.leds_on_screen &= ~STATUSLINE_TARGET; diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 194bc844..be3d7244 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -1200,12 +1200,12 @@ BEGIN CONTROL "",IDC_P96MEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,88,31,103,20 EDITTEXT IDC_P96RAM,201,34,40,12,ES_CENTER | ES_READONLY CONTROL "Match host and RTG color depth if possible",IDC_RTG_MATCH_DEPTH, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,54,212,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,54,177,10 CONTROL "Scale if smaller than display size setting",IDC_RTG_SCALE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,67,212,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,67,175,10 CONTROL "Always scale in windowed mode",IDC_RTG_SCALE_ALLOW, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,80,212,10 - CONTROL "Always center",IDC_RTG_CENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,93,212,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,80,170,10 + CONTROL "Always center",IDC_RTG_CENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,93,169,10 CONTROL "Hardware vertical blank interrupt",IDC_RTG_VBINTERRUPT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,106,157,10 CONTROL "Hardware sprite emulation",IDC_RTG_HWSPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,106,148,10 @@ -1370,8 +1370,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,0 - PRODUCTVERSION 3,6,0,0 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1387,12 +1387,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "3.6.0.0" + VALUE "FileVersion", "3.6.1.0" VALUE "InternalName", "WinUAE" VALUE "LegalCopyright", "© 1996-2018 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "3.6.0.0" + VALUE "ProductVersion", "3.6.1.0" END END BLOCK "VarFileInfo" @@ -1623,7 +1623,6 @@ BEGIN IDD_HARDDRIVE, DIALOG BEGIN RIGHTMARGIN, 396 - BOTTOMMARGIN, 195 END IDD_MISC2, DIALOG @@ -1809,7 +1808,7 @@ BEGIN IDS_SELECTFILESYSROOT "Please select the root directory of the file system..." IDS_DEFAULTMIDIOUT "Default MIDI-Out Device" IDS_CONTRIBUTORS1 "Bernd Schmidt - The Grand-Master\nSam Jordan - Custom-chip, floppy-DMA, etc.\nMathias Ortmann - Original WinUAE Main Guy, BSD Socket support\nBrian King - Picasso96 Support, Integrated GUI for WinUAE, previous WinUAE Main Guy\nToni Wilen - Core updates, WinUAE Main Guy\nGustavo Goedert/Peter Remmers/Michael Sontheimer/Tomi Hakala/Tim Gunn/Nemo Pohle - DOS Port Stuff\nSamuel Devulder/Olaf Barthel/Sam Jordan - Amiga Ports\nKrister Bergman - XFree86 and OS/2 Port\nA. Blanchard/Ernesto Corvi - MacOS Port\nChristian Bauer - BeOS Port\nIan Stephenson - NextStep Port\nPeter Teichmann - Acorn/RiscOS Port\nStefan Reinauer - ZorroII/III AutoConfig, Serial Support\nChristian Schmitt/Chris Hames - Serial Support\nHerman ten Brugge - 68020/68881 Emulation Code\nTauno Taipaleenmaki - Various UAE-Control/UAE-Library Support\nBrett Eden/Tim Gunn/Paolo Besser/Nemo Pohle - Various Docs and Web-Sites\nGeorg Veichtlbauer - Help File coordinator, German GUI\nFulvio Leonardi - Italian translator for WinUAE\n" - IDS_CONTRIBUTORS2 "Arnljot Arntsen, Bill Panagouleas, Cloanto - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser - Postscript printing emulation idea and testing.\nPéter Tóth /Balázs Rátkai/Iván Herczeg/András Arató - Hungarian translation.\nKarsten Bock, Gavin Fance, Dirk Trowe and Christian Schindler - Freezer cartridge hardware support.\nMikko Nieminen - Demo compatibility testing.\nArabuusimiehet - [This information is on a need-to-know basis]" + IDS_CONTRIBUTORS2 "Arnljot Arntsen, Bill Panagouleas, Cloanto, Zak Jennings - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser - Postscript printing emulation idea and testing.\nPéter Tóth /Balázs Rátkai/Iván Herczeg/András Arató - Hungarian translation.\nKarsten Bock, Gavin Fance, Dirk Trowe and Christian Schindler - Freezer cartridge hardware support.\nMikko Nieminen - Demo compatibility testing.\nArabuusimiehet - [This information is on a need-to-know basis]" IDS_INVALIDPRTPORT "The printer you have in this configuration is not valid on this machine.\n" IDS_RESTOREUSS "Restore a WinUAE snapshot file" IDS_USS "WinUAE snapshot files" diff --git a/od-win32/sysconfig.h b/od-win32/sysconfig.h index f3acc0ef..584f1daa 100644 --- a/od-win32/sysconfig.h +++ b/od-win32/sysconfig.h @@ -13,7 +13,6 @@ #define DRIVESOUND #define GFXFILTER #define X86_MSVC_ASSEMBLY -#define X86_MSVC_ASSEMBLY_MEMACCESS #define OPTIMIZED_FLAGS #ifndef __i386__ #define __i386__ @@ -134,7 +133,7 @@ #define A_WRP #ifndef PATH_MAX -#define PATH_MAX 256 +#define PATH_MAX MAX_DPATH #endif #define UAE_RAND_MAX RAND_MAX diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp index fd13aa0d..9a2522c0 100644 --- a/od-win32/win32.cpp +++ b/od-win32/win32.cpp @@ -1581,6 +1581,18 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam, unsetminimized(); dx_check(); return 0; + case WM_EXITSIZEMOVE: + if (wParam == SC_MOVE) { + if (D3D_resize) { + if (isfullscreen() > 0 && wParam == SIZE_RESTORED) { + write_log(_T("WM_EXITSIZEMOVE restored\n")); + D3D_resize(1); + } + write_log(_T("WM_EXITSIZEMOVE\n")); + D3D_resize(0); + } + } + return 0; case WM_SIZE: //write_log (_T("WM_SIZE %d\n"), wParam); if (hStatusWnd) @@ -1589,14 +1601,6 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam, setminimized(); winuae_inactive(hWnd, minimized); } - if (D3D_resize) { - if (isfullscreen() > 0 && wParam == SIZE_RESTORED) { - write_log(_T("WM_SIZE restored\n")); - D3D_resize(1); - } - write_log(_T("WM_SIZE\n")); - D3D_resize(0); - } return 0; case WM_ACTIVATE: //write_log (_T("active %d\n"), LOWORD(wParam)); diff --git a/od-win32/win32.h b/od-win32/win32.h index b7a96433..2aa95052 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -15,17 +15,17 @@ #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100) #define GETBDD(x) ((x) % 100) -#define WINUAEPUBLICBETA 0 +#define WINUAEPUBLICBETA 1 #define LANG_DLL 1 #define LANG_DLL_FULL_VERSION_MATCH 1 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("") +#define WINUAEBETA _T("1") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2018, 1, 17) +#define WINUAEDATE MAKEBD(2018, 2, 3) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index 85077239..f4a649fc 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -2232,7 +2232,7 @@ void gui_display (int shortcut) here++; gui_active++; - if (isfullscreen() > 0 && currprefs.gfx_api == 0) + if (isfullscreen() > 0 && currprefs.gfx_api != 1) screenshot_prepare(); flipgui(1); @@ -16052,7 +16052,7 @@ static INT_PTR CALLBACK GamePortsDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LP WIN32GUI_LoadUIString (IDS_JOYMODE_JOYSTICK_CD32, tmp, MAX_DPATH); SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp); WIN32GUI_LoadUIString (IDS_JOYMODE_LIGHTPEN, tmp, MAX_DPATH); - SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp); + SendDlgItemMessage(hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp); } inputdevice_updateconfig (NULL, &workprefs);