Changeset 2761 for trunk/synergy/lib/platform/CPMScreen.cpp

Timestamp:

Aug 13, 2006, 1:41:05 AM (19 years ago)

Author:

bird

Message:

Hacking and debugging.

File:

• trunk/synergy/lib/platform/CPMScreen.cpp (modified) (3 diffs)

trunk/synergy/lib/platform/CPMScreen.cpp

@@ -70 +70 @@
 {
         assert(s_screen == NULL);
-
         s_screen = this;
+    
+    // create the event queue buffer first so we know there is a message queue.
+    CPMEventQueueBuffer *eventQueue = new CPMEventQueueBuffer();
 
         // query curren thread bits.
         m_threadID = _gettid();
         m_hab = WinQueryAnchorBlock(HWND_DESKTOP);
+    //if (m_hab == NULLHANDLE) {
+        //    m_hab = WinInitialize(0);
+    //}
         m_hmq = WinQueueFromID(m_hab, getpid(), _gettid());
+    //if (m_hab != NULLHANDLE && m_hmq == NULLHANDLE) {
+    //    m_hmq = WinCreateMsgQueue(m_hab, 0);
+    //}
         if (m_hab == NULLHANDLE || m_hmq == NULLHANDLE) {
-                LOG((CLOG_CRIT "couldn't get the hab/hmq of the current thread!\n"));
+                LOG((CLOG_CRIT "couldn't get the hab(%ld)/hmq(%ld) of the current thread! %d\n", m_hab, m_hmq));
+        delete eventQueue;
+                s_screen = NULL;
                 throw XScreenOpenFailure();
         }
@@ -97 +107 @@
                 destroyWindow(m_window);
                 closeHookLibrary(m_hmodHook);
+        delete eventQueue;
                 s_screen = NULL;
                 throw;
@@ -626 +637 @@
                                                                 0, //WS_?,
                                                                 0, 0, 1, 1,
-                                                                HWND_DESKTOP,
                                                                 NULLHANDLE,
+                                                                HWND_TOP,
                                                                 0,
                                                                 this,
                                                                 NULL);
         if (hwnd == NULLHANDLE) {
-                LOG((CLOG_ERR "failed to create window: %ld", WinGetLastError(m_hab)));
+                LOG((CLOG_ERR "failed to create window: %lx", WinGetLastError(m_hab)));
                 throw XScreenOpenFailure();
         }