Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c	(revision 33749)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c	(revision 33750)
@@ -1599,11 +1599,11 @@
         IWineD3DSwapChain *swapchain = NULL;
         if (target && SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) {
-            context_validate(current_context, (IWineD3DSwapChainImpl*)swapchain);
+            context_validate(context, (IWineD3DSwapChainImpl*)swapchain);
             IWineD3DSwapChain_Release(swapchain);
         }
         else {
                                                                                                     /* tmp work-around */
-            context_validate(current_context,
-                    NULL //(IWineD3DSwapChainImpl*)current_context->device->swapchains[current_context->device->NumberOfSwapChains-1]
+            context_validate(context,
+                    NULL //(IWineD3DSwapChainImpl*)context->device->swapchains[context->device->NumberOfSwapChains-1]
                                                                                 );
         }
Index: /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h	(revision 33749)
+++ /trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h	(revision 33750)
@@ -208,5 +208,5 @@
     /** Array containing HGCM client IDs associated with this session.
      * This will be automatically disconnected when the session is closed. */
-    uint32_t volatile           aHGCMClientIds[8];
+    uint32_t volatile           aHGCMClientIds[64];
 #endif
     /** The last consumed VMMDEV_EVENT_MOUSE_POSITION_CHANGED sequence number.
Index: /trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h
===================================================================
--- /trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h	(revision 33749)
+++ /trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h	(revision 33750)
@@ -29,5 +29,5 @@
 
 #define CR_MAX_WINDOWS 100
-#define CR_MAX_CLIENTS 20
+#define CR_MAX_CLIENTS 64
 
 /*@todo must match MaxGuestMonitors from SchemaDefs.h*/
Index: /trunk/src/VBox/GuestHost/OpenGL/util/error.c
===================================================================
--- /trunk/src/VBox/GuestHost/OpenGL/util/error.c	(revision 33749)
+++ /trunk/src/VBox/GuestHost/OpenGL/util/error.c	(revision 33750)
@@ -197,5 +197,5 @@
 #ifdef WINDOWS
     }
-#if !defined(DEBUG_leo) && !defined(DEBUG_ll158262)
+#if !defined(DEBUG_leo) && !defined(DEBUG_ll158262) && !(defined(DEBUG_misha) && defined(IN_GUEST))
     if (crGetenv( "CR_DEBUG_ON_ERROR" ) != NULL)
 #endif