Changeset 63099 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp

Timestamp:

Aug 6, 2016 3:38:51 PM (8 years ago)

Author:

vboxsync

Message:

GA/NT/VBoxTray: warnings

File:

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

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

@@ -24 +24 @@
 #include <malloc.h>
 
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #ifdef DEBUG_misha
-#define WARN(_m) do { \
+# define WARN(_m) do { \
             Assert(0); \
             Log(_m); \
         } while (0)
-#define WARN_FUNC(_m) do { \
+# define WARN_FUNC(_m) do { \
             Assert(0); \
             LogFunc(_m); \
         } while (0)
 #else
-#define WARN(_m) do { \
+# define WARN(_m) do { \
             Log(_m); \
         } while (0)
-#define WARN_FUNC(_m) do { \
+# define WARN_FUNC(_m) do { \
             LogFunc(_m); \
         } while (0)
@@ -52 +55 @@
 #endif
 
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
 typedef struct VBOXDISPIF_OP
 {
@@ -59 +66 @@
     VBOXDISPKMT_CONTEXT Context;
 } VBOXDISPIF_OP;
-
-static DWORD vboxDispIfWddmResizeDisplay(PCVBOXDISPIF const pIf, UINT Id, BOOL fEnable, DISPLAY_DEVICE * paDisplayDevices, DEVMODE *paDeviceMode, UINT devModes);
-static DWORD vboxDispIfResizePerform(PCVBOXDISPIF const pIf, UINT iChangedMode, BOOL fEnable, BOOL fExtDispSup, DISPLAY_DEVICE *paDisplayDevices, DEVMODE *paDeviceModes, UINT cDevModes);
-static DWORD vboxDispIfWddmEnableDisplaysTryingTopology(PCVBOXDISPIF const pIf, UINT cIds, UINT *pIds, BOOL fEnable);
-static DWORD vboxDispIfResizeStartedWDDMOp(VBOXDISPIF_OP *pOp);
 
 /*
@@ -89 +91 @@
 } VBOXDISPIF_WDDM_DISPCFG;
 
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+static DWORD vboxDispIfWddmResizeDisplay(PCVBOXDISPIF const pIf, UINT Id, BOOL fEnable, DISPLAY_DEVICE * paDisplayDevices,
+                                         DEVMODE *paDeviceModes, UINT devModes);
+static DWORD vboxDispIfResizePerform(PCVBOXDISPIF const pIf, UINT iChangedMode, BOOL fEnable, BOOL fExtDispSup,
+                                     DISPLAY_DEVICE *paDisplayDevices, DEVMODE *paDeviceModes, UINT cDevModes);
+static DWORD vboxDispIfWddmEnableDisplaysTryingTopology(PCVBOXDISPIF const pIf, UINT cIds, UINT *pIds, BOOL fEnable);
+static DWORD vboxDispIfResizeStartedWDDMOp(VBOXDISPIF_OP *pOp);
+
+
 static DWORD vboxDispIfWddmDcCreate(VBOXDISPIF_WDDM_DISPCFG *pCfg, UINT32 fFlags)
 {
@@ -217 +231 @@
 }
 
+#define VBOX_WDDM_DC_SEARCH_PATH_ANY (~(UINT)0)
 static int vboxDispIfWddmDcSearchPath(VBOXDISPIF_WDDM_DISPCFG *pCfg, UINT srcId, UINT trgId)
 {
     for (UINT iter = 0; iter < pCfg->cPathInfoArray; ++iter)
     {
-        if ((srcId == ~0UL || pCfg->pPathInfoArray[iter].sourceInfo.id == srcId)
-                && (trgId == ~0UL || pCfg->pPathInfoArray[iter].targetInfo.id == trgId))
+        if (   (srcId == VBOX_WDDM_DC_SEARCH_PATH_ANY || pCfg->pPathInfoArray[iter].sourceInfo.id == srcId)
+            && (trgId == VBOX_WDDM_DC_SEARCH_PATH_ANY || pCfg->pPathInfoArray[iter].targetInfo.id == trgId))
         {
             return (int)iter;
@@ -284 +299 @@
 static DWORD vboxDispIfWddmDcSettingsUpdate(VBOXDISPIF_WDDM_DISPCFG *pCfg, int idx, DEVMODE *pDeviceMode, BOOL fInvalidateSrcMode, BOOL fEnable)
 {
-    UINT Id = pCfg->pPathInfoArray[idx].sourceInfo.id;
-
     if (fInvalidateSrcMode)
         pCfg->pPathInfoArray[idx].sourceInfo.modeInfoIdx = DISPLAYCONFIG_PATH_MODE_IDX_INVALID;
@@ -445 +458 @@
         if (idx < 0)
         {
-            idx = vboxDispIfWddmDcSearchPath(pCfg, -1, i);
+            idx = vboxDispIfWddmDcSearchPath(pCfg, VBOX_WDDM_DC_SEARCH_PATH_ANY, i);
             if (idx >= 0)
             {
@@ -472 +485 @@
             {
                 WARN(("VBoxTray:(WDDM) %d %d path not supported\n", i, i));
-                idx = vboxDispIfWddmDcSearchPath(pCfg, -1, i);
+                idx = vboxDispIfWddmDcSearchPath(pCfg, VBOX_WDDM_DC_SEARCH_PATH_ANY, i);
                 if (idx < 0)
                 {
@@ -605 +618 @@
 static DWORD vboxDispIfEscapeXPDM(PCVBOXDISPIF pIf, PVBOXDISPIFESCAPE pEscape, int cbData, int iDirection)
 {
+    RT_NOREF(pIf);
     HDC  hdc = GetDC(HWND_DESKTOP);
     VOID *pvData = cbData ? VBOXDISPIFESCAPE_DATA(pEscape, VOID) : NULL;
@@ -615 +629 @@
     if (iRet > 0)
         return VINF_SUCCESS;
-    else if (iRet == 0)
+    if (iRet == 0)
         return ERROR_NOT_SUPPORTED;
     /* else */
@@ -990 +1004 @@
         if (!RegisterClassEx(&wc))
         {
-            DWORD winErr = GetLastError();
-            WARN_FUNC(("RegisterClass failed, winErr(%d)\n", winErr));
+            WARN_FUNC(("RegisterClass failed, winErr(%d)\n", GetLastError()));
             hr = E_FAIL;
         }
@@ -1014 +1027 @@
         else
         {
-            DWORD winErr = GetLastError();
-            WARN_FUNC(("CreateWindowEx failed, winErr(%d)\n", winErr));
+            WARN_FUNC(("CreateWindowEx failed, winErr(%d)\n", GetLastError()));
             hr = E_FAIL;
         }
@@ -1044 +1056 @@
 {
     PVBOXRR pMon = &g_VBoxRr;
-    HRESULT tmpHr = vboxRrWndDestroy(pMon->hWnd);
-    Assert(tmpHr == S_OK);
+    HRESULT hrTmp = vboxRrWndDestroy(pMon->hWnd);
+    Assert(hrTmp == S_OK); NOREF(hrTmp);
 
     HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(NULL);
@@ -1078 +1090 @@
         DWORD winErr = GetLastError();
         WARN_FUNC(("SetEvent failed, winErr = (%d)", winErr));
-        HRESULT tmpHr = HRESULT_FROM_WIN32(winErr);
-        Assert(tmpHr != S_OK);
+        HRESULT hrTmp = HRESULT_FROM_WIN32(winErr);
+        Assert(hrTmp != S_OK); NOREF(hrTmp);
     }
 
@@ -1133 +1145 @@
 static DWORD WINAPI vboxRrRunnerThread(void *pvUser)
 {
+    RT_NOREF(pvUser);
     HRESULT hr = vboxRrWndInit();
     Assert(hr == S_OK);
@@ -1238 +1251 @@
 static DWORD vboxDispIfWddmInit(PCVBOXDISPIF pIf)
 {
+    RT_NOREF(pIf);
     HRESULT hr = VBoxRrInit();
     if (SUCCEEDED(hr))
-    {
         return ERROR_SUCCESS;
-    }
     WARN(("VBoxTray: VBoxRrInit failed hr 0x%x\n", hr));
     return hr;
@@ -1249 +1261 @@
 static void vboxDispIfWddmTerm(PCVBOXDISPIF pIf)
 {
+    RT_NOREF(pIf);
     VBoxRrTerm();
 }
@@ -1365 +1378 @@
 DWORD vboxDispIfCancelPendingResizeWDDM(PCVBOXDISPIF const pIf)
 {
+    RT_NOREF(pIf);
     Log(("VBoxTray: cancelling pending resize\n"));
     VBoxRrRetryStop();
@@ -1512 +1526 @@
 static DWORD vboxDispIfWddmEnableDisplays(PCVBOXDISPIF const pIf, UINT cIds, UINT *pIds, BOOL fEnabled, BOOL fSetTopology, DEVMODE *pDeviceMode)
 {
+    RT_NOREF(pIf);
     VBOXDISPIF_WDDM_DISPCFG DispCfg;
 
@@ -1580 +1595 @@
         UINT Id = pChangeIds[i];
         /* re-query paths */
-        iPath = vboxDispIfWddmDcSearchPath(&DispCfg, -1, Id);
+        iPath = vboxDispIfWddmDcSearchPath(&DispCfg, VBOX_WDDM_DC_SEARCH_PATH_ANY, Id);
         if (iPath < 0)
         {
@@ -1663 +1678 @@
 }
 
-static DWORD vboxDispIfWddmResizeDisplay(PCVBOXDISPIF const pIf, UINT Id, BOOL fEnable, DISPLAY_DEVICE * paDisplayDevices, DEVMODE *paDeviceMode, UINT devModes)
-{
+static DWORD vboxDispIfWddmResizeDisplay(PCVBOXDISPIF const pIf, UINT Id, BOOL fEnable, DISPLAY_DEVICE *paDisplayDevices,
+                                         DEVMODE *paDeviceModes, UINT devModes)
+{
+    RT_NOREF(paDisplayDevices, devModes);
     VBOXDISPIF_WDDM_DISPCFG DispCfg;
     DWORD winEr;
@@ -1730 +1747 @@
     Assert(fEnable);
 
-    winEr = vboxDispIfWddmDcSettingsUpdate(&DispCfg, iPath, &paDeviceMode[Id], FALSE, fEnable);
+    winEr = vboxDispIfWddmDcSettingsUpdate(&DispCfg, iPath, &paDeviceModes[Id], FALSE, fEnable);
     if (winEr != ERROR_SUCCESS)
     {
@@ -1977 +1994 @@
 static DWORD vboxDispIfSwitchToXPDM_NT4(PVBOXDISPIF pIf)
 {
+    RT_NOREF(pIf);
     return NO_ERROR;
 }
@@ -2099 +2117 @@
 static DWORD vboxDispIfSeamlessCreateWDDM(PCVBOXDISPIF const pIf, VBOXDISPIF_SEAMLESS *pSeamless, HANDLE hEvent)
 {
+    RT_NOREF(hEvent);
     HRESULT hr = vboxDispKmtOpenAdapter(&pIf->modeData.wddm.KmtCallbacks, &pSeamless->modeData.wddm.Adapter);
     if (SUCCEEDED(hr))
     {
-#ifdef VBOX_DISPIF_WITH_OPCONTEXT
+#ifndef VBOX_DISPIF_WITH_OPCONTEXT
+        return ERROR_SUCCESS;
+#else
         hr = vboxDispKmtCreateDevice(&pSeamless->modeData.wddm.Adapter, &pSeamless->modeData.wddm.Device);
         if (SUCCEEDED(hr))
@@ -2109 +2130 @@
                     0, 0, hEvent, 0ULL);
             if (SUCCEEDED(hr))
-#endif
                 return ERROR_SUCCESS;
-#ifdef VBOX_DISPIF_WITH_OPCONTEXT
-            else
-                WARN(("VBoxTray: vboxDispKmtCreateContext failed hr 0x%x", hr));
+            WARN(("VBoxTray: vboxDispKmtCreateContext failed hr 0x%x", hr));
 
             vboxDispKmtDestroyDevice(&pSeamless->modeData.wddm.Device);
@@ -2121 +2139 @@
 
         vboxDispKmtCloseAdapter(&pSeamless->modeData.wddm.Adapter);
-#endif
+#endif /* VBOX_DISPIF_WITH_OPCONTEXT */
     }