Index: /trunk/doc/manual/user_ChangeLogImpl.xml
===================================================================
--- /trunk/doc/manual/user_ChangeLogImpl.xml	(revision 38839)
+++ /trunk/doc/manual/user_ChangeLogImpl.xml	(revision 38840)
@@ -20,5 +20,5 @@
 
       <listitem>
-        <para>dummy</para>
+        <para>Windows guests: fixed guest hangs when switching back from fullscreen text mode apps (bug #9636)</para>
       </listitem>
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriver.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriver.cpp	(revision 38839)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriver.cpp	(revision 38840)
@@ -789,5 +789,4 @@
 {
     PVBOXDISPDEV pDev = (PVBOXDISPDEV) dhpdev;
-    DWORD dwrc;
     int rc;
     LOGF_ENTER();
@@ -846,16 +845,14 @@
 
         /* Associate back GDI bitmap residing in our framebuffer memory with GDI's handle to our device */
-        dwrc = EngAssociateSurface((HSURF)pDev->surface.hBitmap, pDev->hDevGDI, 0);
-        if (dwrc != NO_ERROR)
-        {
-            WARN(("EngAssociateSurface on bitmap failed with %#x", dwrc));
+        if (!EngAssociateSurface((HSURF)pDev->surface.hBitmap, pDev->hDevGDI, 0))
+        {
+            WARN(("EngAssociateSurface on bitmap failed"));
             return FALSE;
         }
 
         /* Associate device managed surface with GDI's handle to our device */
-        dwrc = EngAssociateSurface(pDev->surface.hSurface, pDev->hDevGDI, pDev->flDrawingHooks);
-        if (dwrc != NO_ERROR)
-        {
-            WARN(("EngAssociateSurface on surface failed with %#x", dwrc));
+        if (!EngAssociateSurface(pDev->surface.hSurface, pDev->hDevGDI, pDev->flDrawingHooks))
+        {
+            WARN(("EngAssociateSurface on surface failed"));
             return FALSE;
         }
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriverDDraw.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriverDDraw.cpp	(revision 38839)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriverDDraw.cpp	(revision 38840)
@@ -243,11 +243,9 @@
          * (required for VBVA and VRDP).
          */
-        DWORD dwrc;
         SURFOBJ *pso;
 
-        dwrc = EngAssociateSurface((HSURF)hBitmap, pDev->hDevGDI, pDev->flDrawingHooks);
-        if (dwrc!=NO_ERROR)
-        {
-            VBOX_WARN_WINERR(dwrc);
+        if (!EngAssociateSurface((HSURF)hBitmap, pDev->hDevGDI, pDev->flDrawingHooks))
+        {
+            WARN(("EngAssociateSurface failed"));
             EngDeleteSurface((HSURF)hBitmap);
             return NULL;