From a844189d1ac15a2bab78f8241f3c317e65975217 Mon Sep 17 00:00:00 2001
From: Ulrich Weigand <weigand@informatik.uni-erlangen.de>
Date: Thu, 24 Dec 1998 15:17:02 +0000
Subject: [PATCH] Desktop window queue handling adapted.

---
 loader/main.c | 6 +++---
 windows/win.c | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/loader/main.c b/loader/main.c
index fddf994c45c..a2f64a83236 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -221,9 +221,6 @@ BOOL32 WINAPI MAIN_UserInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvRes
     /* Initialize multimedia */
     if (!MULTIMEDIA_Init()) return FALSE;
 
-    /* Create desktop window */
-    if (!WIN_CreateDesktopWindow()) return FALSE;
-
     /* Initialize message spying */
     if (!SPY_Init()) return FALSE;
 
@@ -241,6 +238,9 @@ BOOL32 WINAPI MAIN_UserInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvRes
     queueSize = GetProfileInt32A( "windows", "DefaultQueueSize", 8 );
     if (!SetMessageQueue32( queueSize )) return FALSE;
 
+    /* Create desktop window */
+    if (!WIN_CreateDesktopWindow()) return FALSE;
+
     /* Install default USER Signal Handler */
     SetTaskSignalProc( 0, (FARPROC16)USER_SignalProc );
 
diff --git a/windows/win.c b/windows/win.c
index 3f87d5fbc12..1551a373dcf 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -25,6 +25,7 @@
 #include "dde_proc.h"
 #include "clipboard.h"
 #include "winproc.h"
+#include "task.h"
 #include "thread.h"
 #include "process.h"
 #include "debug.h"
@@ -408,7 +409,7 @@ BOOL32 WIN_CreateDesktopWindow(void)
     pWndDesktop->rectWindow.bottom = SYSMETRICS_CYSCREEN;
     pWndDesktop->rectClient        = pWndDesktop->rectWindow;
     pWndDesktop->text              = NULL;
-    pWndDesktop->hmemTaskQ         = 0; /* Desktop does not belong to a task */
+    pWndDesktop->hmemTaskQ         = GetFastQueue();
     pWndDesktop->hrgnUpdate        = 0;
     pWndDesktop->hwndLastActive    = hwndDesktop;
     pWndDesktop->dwStyle           = WS_VISIBLE | WS_CLIPCHILDREN |
@@ -550,7 +551,7 @@ static HWND32 WIN_CreateWindowEx( CREATESTRUCT32A *cs, ATOM classAtom,
     wndPtr->hwndSelf       = hwnd;
     wndPtr->hInstance      = cs->hInstance;
     wndPtr->text           = NULL;
-    wndPtr->hmemTaskQ      = GetTaskQueue(0);
+    wndPtr->hmemTaskQ      = GetFastQueue();
     wndPtr->hrgnUpdate     = 0;
     wndPtr->hwndLastActive = hwnd;
     wndPtr->dwStyle        = cs->style & ~WS_VISIBLE;
-- 
2.11.4.GIT