From 556d9008fc0c5c9f66d4c160ee0ab34a55df4397 Mon Sep 17 00:00:00 2001 From: tomch Date: Sat, 31 Mar 2007 14:45:44 +0000 Subject: [PATCH] =?UTF-8?q?Minor=20fixes:=20.=20Debugger's=20'\'=20now=20f?= =?UTF-8?q?ixed=20(view=20Apple's=20screen)=20.=20Debugger's=20Ctrl-~=20no?= =?UTF-8?q?w=20fixed=20for=20UK=20keyboard=20(use=20Ctrl-=C2=AC).=20So=20f?= =?UTF-8?q?or=20both=20US=20&=20UK=20it's=20Ctrl=20&=20key=20to=20left=20o?= =?UTF-8?q?f=20numerical=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/Debug.cpp | 9 ++++----- source/SoundCore.cpp | 3 +++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/source/Debug.cpp b/source/Debug.cpp index f8b96d2d..73db3800 100644 --- a/source/Debug.cpp +++ b/source/Debug.cpp @@ -8886,7 +8886,8 @@ void DebuggerProcessKey( int keycode ) bUpdateDisplay |= DebuggerProcessCommand( true ); // copy console input to console output bUpdateDisplay |= UPDATE_CONSOLE_DISPLAY; } - else if (keycode == VK_OEM_3) // Tilde ~ + else if (( keycode == VK_OEM_3 ) || // US: Tilde ~ (key to the immediate left of numeral 1) + ( keycode == VK_OEM_8 )) // UK: Logical NOT ¬ (key to the immediate left of numeral 1) { if (KeybGetCtrlStatus()) { @@ -9176,7 +9177,7 @@ void DebuggerProcessKey( int keycode ) } // switch } - if (bUpdateDisplay) // & UPDATE_BACKGROUND) + if (bUpdateDisplay && !g_bDebuggerViewingAppleOutput) // & UPDATE_BACKGROUND) UpdateDisplay( bUpdateDisplay ); } @@ -9210,7 +9211,7 @@ void DebuggerCursorUpdate() static DWORD nBeg = GetTickCount(); // timeGetTime(); DWORD nNow = GetTickCount(); // timeGetTime(); - if (((nNow - nBeg)) >= nUpdateInternal_ms) + if (((nNow - nBeg) >= nUpdateInternal_ms) && !g_bDebuggerViewingAppleOutput) { nBeg = nNow; @@ -9232,9 +9233,7 @@ void DebuggerCursorNext() { g_bInputCursor ^= true; if (g_bInputCursor) - { ConsoleUpdateCursor( g_aInputCursor[ g_iInputCursor ] ); - } else ConsoleUpdateCursor( 0 ); // show char under cursor } diff --git a/source/SoundCore.cpp b/source/SoundCore.cpp index af767057..09af71eb 100644 --- a/source/SoundCore.cpp +++ b/source/SoundCore.cpp @@ -570,7 +570,10 @@ bool SysClk_InitTimer() { g_hSemaphore = CreateSemaphore(NULL, 0, 1, NULL); // Max count = 1 if (g_hSemaphore == NULL) + { fprintf(stderr, "Error creating semaphore\n"); + return false; + } if (CoCreateInstance(CLSID_SystemClock, NULL, CLSCTX_INPROC, IID_IReferenceClock, (LPVOID*)&g_pRefClock) != S_OK)