Changeset 26998 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 3, 2010 4:33:06 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

58306

Message:

FE/Qt4: New running VM core: win build fix #3.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (6 diffs)
• UIMachineView.h (modified) (1 diff)
• UISession.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -47 +47 @@
 #ifdef Q_WS_PM
 # include "QIHotKeyEdit.h"
-#endif
+#endif /* defined (Q_WS_PM) */
 
 #ifdef Q_WS_WIN
@@ -55 +55 @@
 #undef HIBYTE
 #include <windows.h>
-#endif
+static UIMachineView *gView = 0;
+static HHOOK gKbdHook = 0;
+#endif /* defined (Q_WS_WIN) */
 
 #ifdef Q_WS_X11
@@ -74 +76 @@
 # endif
 # include "XKeyboard.h"
-#endif
-
-#if defined (Q_WS_MAC)
+#endif /* defined (Q_WS_X11) */
+
+#ifdef Q_WS_MAC
 # include "DockIconPreview.h"
 # include "DarwinKeyboard.h"
@@ -645 +647 @@
         UnhookWindowsHookEx(gKbdHook);
     gView = 0;
-    if (m_alphaCursor)
-        DestroyIcon(m_alphaCursor);
 #endif
 
@@ -1784 +1784 @@
 #if defined(Q_WS_WIN32)
 
-static HHOOK gKbdHook = NULL;
-static UIMachineView *gView = 0;
 LRESULT CALLBACK UIMachineView::lowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
 {
@@ -2296 +2294 @@
 #endif
 
-void UIMachineView::fixModifierState(int *piCodes, uint *puCount)
+void UIMachineView::fixModifierState(LONG *piCodes, uint *puCount)
 {
     /* Synchronize the views of the host and the guest to the modifier keys.

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -207 +207 @@
 
     /* Private helpers: */
-    void fixModifierState(int *piCodes, uint *puCount);
+    void fixModifierState(LONG *piCodes, uint *puCount);
     QPoint viewportToContents(const QPoint &vp) const;
     void scrollBy(int dx, int dy);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -571 +571 @@
     /* Unregister console callback: */
     session().GetConsole().UnregisterCallback(m_callback);
+
+#if defined(Q_WS_WIN)
+    /* Destroy alpha cursor: */
+    if (m_alphaCursor)
+        DestroyIcon(m_alphaCursor);
+#endif
 }