Changeset 63101 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Aug 6, 2016 3:53:20 PM (8 years ago)

Author:

vboxsync

Message:

GA/NT/VBoxTray: warnings

File:

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

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

@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_GUEST_DND
 #include <iprt/win/windows.h>
 #include "VBoxTray.h"
@@ -37 +43 @@
 #include <iprt/cpp/mtlist.h>
 
-#ifdef LOG_GROUP
-# undef LOG_GROUP
-#endif
-#define LOG_GROUP LOG_GROUP_GUEST_DND
 #include <VBox/log.h>
 
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 /* Enable this define to see the proxy window(s) when debugging
  * their behavior. Don't have this enabled in release builds! */
@@ -55 +61 @@
 #define WM_VBOXTRAY_DND_MESSAGE       WM_APP + 401
 
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
 /** Function pointer for SendInput(). This only is available starting
  *  at NT4 SP3+. */
@@ -60 +70 @@
 typedef BOOL (WINAPI* PFNENUMDISPLAYMONITORS)(HDC, LPCRECT, MONITORENUMPROC, LPARAM);
 
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 /** Static pointer to SendInput() function. */
-static PFNSENDINPUT s_pfnSendInput = NULL;
-static PFNENUMDISPLAYMONITORS s_pfnEnumDisplayMonitors = NULL;
-
+static PFNSENDINPUT             g_pfnSendInput = NULL;
+static PFNENUMDISPLAYMONITORS   g_pfnEnumDisplayMonitors = NULL;
+
+static VBOXDNDCONTEXT           g_Ctx = { 0 };
+
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
 static LRESULT CALLBACK vboxDnDWndProcInstance(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 static LRESULT CALLBACK vboxDnDWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-static VBOXDNDCONTEXT g_Ctx = { 0 };
+
+
 
 VBoxDnDWnd::VBoxDnDWnd(void)
@@ -340 +361 @@
  */
 /* static */
-BOOL CALLBACK VBoxDnDWnd::MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor,
-                                          LPRECT lprcMonitor, LPARAM lParam)
-{
+BOOL CALLBACK VBoxDnDWnd::MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM lParam)
+{
+    RT_NOREF(hMonitor, hdcMonitor);
     LPRECT pRect = (LPRECT)lParam;
     AssertPtrReturn(pRect, FALSE);
@@ -1189 +1210 @@
 
         /** @todo Multi-monitor setups? */
+#if 0 /* unused */
         int iScreenX = GetSystemMetrics(SM_CXSCREEN) - 1;
         int iScreenY = GetSystemMetrics(SM_CYSCREEN) - 1;
-
+#endif
+
+        /** @todo What the family are these statics doing there?!?  */
         static LONG px = p.x;
         if (px <= 0)
@@ -1407 +1431 @@
     if (hDC)
     {
-        fRc = s_pfnEnumDisplayMonitors
+        fRc = g_pfnEnumDisplayMonitors
             /* EnumDisplayMonitors is not available on NT4. */
-            ? s_pfnEnumDisplayMonitors(hDC, NULL, VBoxDnDWnd::MonitorEnumProc, (LPARAM)&r):
+            ? g_pfnEnumDisplayMonitors(hDC, NULL, VBoxDnDWnd::MonitorEnumProc, (LPARAM)&r):
               FALSE;
 
@@ -1491 +1515 @@
 
     int rc;
-    if (s_pfnSendInput(1 /* Number of inputs */,
+    if (g_pfnSendInput(1 /* Number of inputs */,
                        Input, sizeof(INPUT)))
     {
@@ -1532 +1556 @@
     Input[0].type       = INPUT_MOUSE;
     Input[0].mi.dwFlags = MOUSEEVENTF_LEFTUP;
-    if (!s_pfnSendInput(1, Input, sizeof(INPUT)))
+    if (!g_pfnSendInput(1, Input, sizeof(INPUT)))
     {
         DWORD dwErr = GetLastError();
@@ -1656 +1680 @@
     if (RT_SUCCESS(rc))
     {
-        s_pfnSendInput = (PFNSENDINPUT)
+        g_pfnSendInput = (PFNSENDINPUT)
             RTLdrGetSystemSymbol("User32.dll", "SendInput");
-        fSupportedOS = !RT_BOOL(s_pfnSendInput == NULL);
-        s_pfnEnumDisplayMonitors = (PFNENUMDISPLAYMONITORS)
+        fSupportedOS = !RT_BOOL(g_pfnSendInput == NULL);
+        g_pfnEnumDisplayMonitors = (PFNENUMDISPLAYMONITORS)
             RTLdrGetSystemSymbol("User32.dll", "EnumDisplayMonitors");
         /* g_pfnEnumDisplayMonitors is optional. */
@@ -1755 +1779 @@
 DECLCALLBACK(int) VBoxDnDWorker(void *pInstance, bool volatile *pfShutdown)
 {
+    RT_NOREF(pfShutdown); /** @todo r=bird: Why isn't pfShutdown used by VBoxDnDWorker? */
+#ifdef DEBUG_andy
+# error "Why isn't pfShutdown used by VBoxDnDWorker?"
+#endif
     AssertPtr(pInstance);
     LogFlowFunc(("pInstance=%p\n", pInstance));