Author: gadamopoulos
Date: Sun Oct 26 17:16:19 2014
New Revision: 65020
URL: http://svn.reactos.org/svn/reactos?rev=65020&view=rev
Log:
[browseui]
- Improve CBaseBar::TranslateAcceleratorIO stub
- Returning always TRUE means that creating a basebar ended up eating all messages
- Fixes the hang that happened when we clicked on the folders button in the toolbar
Modified:
branches/shell-experiments/dll/win32/browseui/basebar.cpp
Modified: branches/shell-experiments/dll/win32/browseui/basebar.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro…
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/basebar.cpp [iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/basebar.cpp [iso-8859-1] Sun Oct 26 17:16:19 2014
@@ -296,7 +296,7 @@
HRESULT STDMETHODCALLTYPE CBaseBar::TranslateAcceleratorIO(LPMSG lpMsg)
{
// forward to contained bar
- return S_OK;
+ return S_FALSE;
}
HRESULT STDMETHODCALLTYPE CBaseBar::SetClient(IUnknown *punkClient)
Author: dquintana
Date: Sun Oct 26 17:06:58 2014
New Revision: 65019
URL: http://svn.reactos.org/svn/reactos?rev=65019&view=rev
Log:
[BROWSEUI]
* Sidebars are not implemented, but it's ok. No need to force a debug break in there.
Modified:
branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp
Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro…
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sun Oct 26 17:06:58 2014
@@ -1179,8 +1179,6 @@
VARIANT vaIn;
HRESULT hResult;
- __debugbreak();
-
hResult = GetBaseBar(vertical, (IUnknown **)&theBaseBar);
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
Author: hbelusca
Date: Sun Oct 26 16:56:14 2014
New Revision: 65018
URL: http://svn.reactos.org/svn/reactos?rev=65018&view=rev
Log:
[NTVDM]: Temporarily fix for r65015 before a proper fix.
Modified:
trunk/reactos/subsystems/ntvdm/bios/vidbios.c
Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb…
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Sun Oct 26 16:56:14 2014
@@ -2296,8 +2296,15 @@
{
BYTE Page;
COORD Resolution;
+ PVGA_REGISTERS VgaMode;
+
+ /*
+ * IBM standard modes do not clear the screen if the
+ * high bit of AL is set (EGA or higher only).
+ * See Ralf Brown: http://www.ctyme.com/intr/rb-0069.htm
+ * for more information.
+ */
BOOLEAN DoNotClear = !!(ModeNumber & 0x80);
- PVGA_REGISTERS VgaMode;
/* Retrieve the real mode number and check its validity */
ModeNumber &= 0x7F;
@@ -2308,8 +2315,13 @@
return FALSE;
}
- /* Check if this is the same mode */
- if (ModeNumber == Bda->VideoMode) return TRUE;
+ /* Check if this is the current mode */
+ if (ModeNumber == Bda->VideoMode)
+ {
+ /* Just clear the VGA memory if needed */
+ if (!DoNotClear) VgaClearMemory();
+ return TRUE;
+ }
VgaMode = VideoModes[ModeNumber];
@@ -2320,12 +2332,7 @@
VgaChangePalette(ModeNumber);
- /*
- * IBM standard modes do not clear the screen if the
- * high bit of AL is set (EGA or higher only).
- * See Ralf Brown: http://www.ctyme.com/intr/rb-0069.htm
- * for more information.
- */
+ /* Clear the VGA memory if needed */
if (!DoNotClear) VgaClearMemory();
// Bda->CrtModeControl;
Author: hbelusca
Date: Sun Oct 26 15:57:21 2014
New Revision: 65015
URL: http://svn.reactos.org/svn/reactos?rev=65015&view=rev
Log:
[NTVDM]: No need to re-change to a given video mode when it is already set. Fixes strange changes for e.g. some apps that find intelligent to switch 256 times to mode 13h (for example) before continuing to run.
Modified:
trunk/reactos/subsystems/ntvdm/bios/vidbios.c
Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb…
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Sun Oct 26 15:57:21 2014
@@ -2308,6 +2308,9 @@
return FALSE;
}
+ /* Check if this is the same mode */
+ if (ModeNumber == Bda->VideoMode) return TRUE;
+
VgaMode = VideoModes[ModeNumber];
DPRINT1("Switching to mode %02Xh %s clearing the screen; VgaMode = 0x%p\n",