Changeset 83823 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 19, 2020 1:18:53 AM (5 years ago)

Author:

vboxsync

Message:

VBoxTray: VC++ 14.1 warnings. bugref:8489

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxClipboard.cpp (modified) (1 diff)
• VBoxDnD.cpp (modified) (12 diffs)
• VBoxTray.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -26 +26 @@
 endif
 VBoxTray_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST)
-VBoxTray_DEFS     = \
-        VBOX_WITH_HGCM \
-        VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
+ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+ VBoxTray_DEFS   := VBOX_WITH_HGCM VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
+else
+ VBoxTray_DEFS   := VBOX_WITH_HGCM VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
+endif
 VBoxTray_INCS     = \
         ../include \

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

@@ -257 +257 @@
                      * Report available formats to the host. */
                     SHCLFORMATS fFormats;
-                    int rc = SharedClipboardWinGetFormats(pWinCtx, &fFormats);
+                    rc = SharedClipboardWinGetFormats(pWinCtx, &fFormats);
                     if (RT_SUCCESS(rc))
                     {

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

@@ -124 +124 @@
  * @param   pCtx    Pointer to context to use.
  */
-int VBoxDnDWnd::Initialize(PVBOXDNDCONTEXT pCtx)
-{
-    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+int VBoxDnDWnd::Initialize(PVBOXDNDCONTEXT a_pCtx)
+{
+    AssertPtrReturn(a_pCtx, VERR_INVALID_POINTER);
 
     /* Save the context. */
-    this->pCtx = pCtx;
+    this->pCtx = a_pCtx;
 
     int rc = RTSemEventCreate(&mEventSem);
@@ -146 +146 @@
             AssertRC(rc2);
 
-            if (!pCtx->fStarted) /* Did the thread fail to start? */
+            if (!a_pCtx->fStarted) /* Did the thread fail to start? */
                 rc = VERR_NOT_SUPPORTED; /* Report back DnD as not being supported. */
         }
@@ -394 +394 @@
  * The proxy window's WndProc.
  */
-LRESULT CALLBACK VBoxDnDWnd::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    switch (uMsg)
+LRESULT CALLBACK VBoxDnDWnd::WndProc(HWND a_hWnd, UINT a_uMsg, WPARAM a_wParam, LPARAM a_lParam)
+{
+    switch (a_uMsg)
     {
         case WM_CREATE:
@@ -543 +543 @@
         case WM_VBOXTRAY_DND_MESSAGE:
         {
-            PVBOXDNDEVENT pEvent = (PVBOXDNDEVENT)lParam;
+            PVBOXDNDEVENT pEvent = (PVBOXDNDEVENT)a_lParam;
             if (!pEvent)
                 break; /* No event received, bail out. */
@@ -665 +665 @@
     }
 
-    return DefWindowProc(hWnd, uMsg, wParam, lParam);
+    return DefWindowProc(a_hWnd, a_uMsg, a_wParam, a_lParam);
 }
 
@@ -802 +802 @@
  *
  * @return  IPRT status code.
- * @param   lstFormats              Supported formats offered by the host.
- * @param   dndLstActionsAllowed    Supported actions offered by the host.
- */
-int VBoxDnDWnd::OnHgEnter(const RTCList<RTCString> &lstFormats, VBOXDNDACTIONLIST dndLstActionsAllowed)
+ * @param   a_lstFormats            Supported formats offered by the host.
+ * @param   a_fDndLstActionsAllowed Supported actions offered by the host.
+ */
+int VBoxDnDWnd::OnHgEnter(const RTCList<RTCString> &a_lstFormats, VBOXDNDACTIONLIST a_fDndLstActionsAllowed)
 {
     if (mMode == GH) /* Wrong mode? Bail out. */
@@ -811 +811 @@
 
 #ifdef DEBUG
-    LogFlowThisFunc(("dndActionList=0x%x, lstFormats=%zu: ", dndLstActionsAllowed, lstFormats.size()));
-    for (size_t i = 0; i < lstFormats.size(); i++)
-        LogFlow(("'%s' ", lstFormats.at(i).c_str()));
+    LogFlowThisFunc(("dndActionList=0x%x, a_lstFormats=%zu: ", a_fDndLstActionsAllowed, a_lstFormats.size()));
+    for (size_t i = 0; i < a_lstFormats.size(); i++)
+        LogFlow(("'%s' ", a_lstFormats.at(i).c_str()));
     LogFlow(("\n"));
 #endif
@@ -828 +828 @@
     {
         /* Save all allowed actions. */
-        this->dndLstActionsAllowed = dndLstActionsAllowed;
+        this->dndLstActionsAllowed = a_fDndLstActionsAllowed;
 
         /*
@@ -843 +843 @@
 
         LogRel2(("DnD: Reported formats:\n"));
-        for (size_t i = 0; i < lstFormats.size(); i++)
+        for (size_t i = 0; i < a_lstFormats.size(); i++)
         {
             bool fSupported = false;
             for (size_t a = 0; a < this->lstFmtSup.size(); a++)
             {
-                const char *pszFormat = lstFormats.at(i).c_str();
+                const char *pszFormat = a_lstFormats.at(i).c_str();
                 LogFlowThisFunc(("\t\"%s\" <=> \"%s\"\n", this->lstFmtSup.at(a).c_str(), pszFormat));
 
@@ -854 +854 @@
                 if (fSupported)
                 {
-                    this->lstFmtActive.append(lstFormats.at(i));
+                    this->lstFmtActive.append(a_lstFormats.at(i));
 
                     /** @todo Put this into a \#define / struct. */
@@ -891 +891 @@
             }
 
-            LogRel2(("DnD: \t%s: %RTbool\n", lstFormats.at(i).c_str(), fSupported));
+            LogRel2(("DnD: \t%s: %RTbool\n", a_lstFormats.at(i).c_str(), fSupported));
         }
 
@@ -913 +913 @@
         /* Translate our drop actions into allowed Windows drop effects. */
         startupInfo.dwOKEffects = DROPEFFECT_NONE;
-        if (dndLstActionsAllowed)
-        {
-            if (dndLstActionsAllowed & VBOX_DND_ACTION_COPY)
+        if (a_fDndLstActionsAllowed)
+        {
+            if (a_fDndLstActionsAllowed & VBOX_DND_ACTION_COPY)
                 startupInfo.dwOKEffects |= DROPEFFECT_COPY;
-            if (dndLstActionsAllowed & VBOX_DND_ACTION_MOVE)
+            if (a_fDndLstActionsAllowed & VBOX_DND_ACTION_MOVE)
                 startupInfo.dwOKEffects |= DROPEFFECT_MOVE;
-            if (dndLstActionsAllowed & VBOX_DND_ACTION_LINK)
+            if (a_fDndLstActionsAllowed & VBOX_DND_ACTION_LINK)
                 startupInfo.dwOKEffects |= DROPEFFECT_LINK;
         }

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

@@ -1164 +1164 @@
                                     fTrack |= TPM_RETURNCMD | TPM_NONOTIFY;
 
-                                UINT uMsg = TrackPopupMenu(hContextMenu, fTrack, lpCursor.x, lpCursor.y, 0, hWnd, NULL);
+                                uMsg = TrackPopupMenu(hContextMenu, fTrack, lpCursor.x, lpCursor.y, 0, hWnd, NULL);
                                 if (   uMsg
                                     && fBlockWhileTracking)