Changeset 37422 in vbox

Timestamp:

Jun 12, 2011 6:31:16 PM (14 years ago)

Author:

vboxsync

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

72221

Message:

VBoxTray.cpp: Tabs and some minor cleanups.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (12 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
  * VBoxTray - Guest Additions Tray Application
@@ -41 +42 @@
 
 /*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
+static int vboxTrayCreateTrayIcon(void);
+static LRESULT CALLBACK vboxToolWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+
+/* Global message handler prototypes. */
+static int vboxTrayGlMsgTaskbarCreated(WPARAM lParam, LPARAM wParam);
+/*static int vboxTrayGlMsgShowBalloonMsg(WPARAM lParam, LPARAM wParam);*/
+
+
+/*******************************************************************************
 *   Global Variables                                                           *
 *******************************************************************************/
@@ -53 +65 @@
 DWORD                 gMajorVersion;
 
-/* Global message handler prototypes. */
-int vboxTrayGlMsgTaskbarCreated(WPARAM lParam, LPARAM wParam);
-int vboxTrayGlMsgShowBalloonMsg(WPARAM lParam, LPARAM wParam);
-
-/* Prototypes */
-int vboxTrayCreateTrayIcon(void);
-VOID DisplayChangeThread(void *dummy);
-LRESULT CALLBACK VBoxToolWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-
 
 /* The service table. */
@@ -332 +335 @@
 }
 
-static int vboxTrayOpenBaseDriver()
+static int vboxTrayOpenBaseDriver(void)
 {
     /* Open VBox guest driver. */
@@ -351 +354 @@
 }
 
-static void vboxTrayCloseBaseDriver()
+static void vboxTrayCloseBaseDriver(void)
 {
     if (ghVBoxDriver)
@@ -360 +363 @@
 }
 
-static void vboxTrayDestroyToolWindow()
+static void vboxTrayDestroyToolWindow(void)
 {
     if (ghwndToolWindow)
@@ -374 +377 @@
 }
 
-static int vboxTrayCreateToolWindow()
+static int vboxTrayCreateToolWindow(void)
 {
     DWORD dwErr = ERROR_SUCCESS;
@@ -381 +384 @@
     WNDCLASS windowClass = {0};
     windowClass.style         = CS_NOCLOSE;
-    windowClass.lpfnWndProc   = (WNDPROC)VBoxToolWndProc;
+    windowClass.lpfnWndProc   = (WNDPROC)vboxToolWndProc;
     windowClass.hInstance     = ghInstance;
     windowClass.hCursor       = LoadCursor(NULL, IDC_ARROW);
@@ -422 +425 @@
 }
 
-static int vboxTraySetupSeamless()
+static int vboxTraySetupSeamless(void)
 {
     OSVERSIONINFO info;
@@ -519 +522 @@
 static void vboxTrayShutdownSeamless(void)
 {
-        if (ghSeamlessNotifyEvent)
-        {
+    if (ghSeamlessNotifyEvent)
+    {
         CloseHandle(ghSeamlessNotifyEvent);
-            ghSeamlessNotifyEvent = NULL;
-        }
+        ghSeamlessNotifyEvent = NULL;
+    }
 }
 
@@ -731 +734 @@
  * Window procedure for our tool window
  */
-LRESULT CALLBACK VBoxToolWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK vboxToolWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)
@@ -815 +818 @@
     return DefWindowProc(hWnd, uMsg, wParam, lParam);
 }
+