Changeset 63093 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 6, 2016 3:16:23 PM (9 years ago)

Author:

vboxsync

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

109707

Message:

GA/NT/VBoxGINA: warnings

Location:

trunk/src/VBox/Additions/WINNT/VBoxGINA

Files:

• Dialog.cpp (modified) (7 diffs)
• Helper.cpp (modified) (1 diff)
• VBoxGINA.cpp (modified) (3 diffs)
• testcase/tstVBoxGINA.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp

@@ -162 +162 @@
                     PCRTUTF16 pwszUser, PCRTUTF16 pwszPassword, PCRTUTF16 pwszDomain)
 {
+    RT_NOREF(hwndDlg);
     BOOL bIsFQDN = FALSE;
     wchar_t szUserFQDN[512]; /* VMMDEV_CREDENTIALS_STRLEN + 255 bytes max. for FQDN */
@@ -474 +475 @@
 int WINAPI MyWlxDialogBoxParam(HANDLE  hWlx,
                                HANDLE  hInst,
-                               LPWSTR  lpszTemplate,
+                               LPWSTR  pszTemplate,
                                HWND    hwndOwner,
                                DLGPROC dlgprc,
                                LPARAM  dwInitParam)
 {
-    VBoxGINAVerbose(0, "VBoxGINA::MyWlxDialogBoxParam: lpszTemplate=%ls\n", lpszTemplate);
+    VBoxGINAVerbose(0, "VBoxGINA::MyWlxDialogBoxParam: pszTemplate=%ls\n", pszTemplate);
 
     VBoxGINAReportStatus(VBoxGuestFacilityStatus_Active);
@@ -486 +487 @@
     // We only know MSGINA dialogs by identifiers.
     //
-    if (!HIWORD((int)(void*)lpszTemplate))
+    if (((uintptr_t)pszTemplate >> 16) == 0)
     {
         //
         // Hook appropriate dialog boxes as necessary.
         //
-        switch ((DWORD) lpszTemplate)
+        switch ((DWORD)(uintptr_t)pszTemplate)
         {
             case IDD_WLXDIAPLAYSASNOTICE_DIALOG:
@@ -502 +503 @@
                 VBoxGINAVerbose(0, "VBoxGINA::MyWlxDialogBoxParam: returning hooked SAS logged out dialog\n");
                 g_pfnWlxLoggedOutSASDlgProc = dlgprc;
-                return g_pfnWlxDialogBoxParam(hWlx, hInst, lpszTemplate, hwndOwner,
+                return g_pfnWlxDialogBoxParam(hWlx, hInst, pszTemplate, hwndOwner,
                                               MyWlxLoggedOutSASDlgProc, dwInitParam);
             }
@@ -515 +516 @@
                 VBoxGINAVerbose(0, "VBoxGINA::MyWlxDialogBoxParam: returning hooked SAS locked dialog\n");
                 g_pfnWlxLockedSASDlgProc = dlgprc;
-                return g_pfnWlxDialogBoxParam(hWlx, hInst, lpszTemplate, hwndOwner,
+                return g_pfnWlxDialogBoxParam(hWlx, hInst, pszTemplate, hwndOwner,
                                               MyWlxLockedSASDlgProc, dwInitParam);
             }
@@ -522 +523 @@
 
             default:
-                VBoxGINAVerbose(0, "VBoxGINA::MyWlxDialogBoxParam: dialog %ld not handled\n", (DWORD)lpszTemplate);
+                VBoxGINAVerbose(0, "VBoxGINA::MyWlxDialogBoxParam: dialog %p (%u) not handled\n",
+                                pszTemplate, (DWORD)(uintptr_t)pszTemplate);
                 break;
         }
@@ -528 +530 @@
 
     /* The rest will be redirected. */
-    return g_pfnWlxDialogBoxParam(hWlx, hInst, lpszTemplate,
-                                  hwndOwner, dlgprc, dwInitParam);
+    return g_pfnWlxDialogBoxParam(hWlx, hInst, pszTemplate, hwndOwner, dlgprc, dwInitParam);
 }
 

trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.cpp

@@ -145 +145 @@
 static DECLCALLBACK(int) credentialsPoller(RTTHREAD ThreadSelf, void *pvUser)
 {
+    RT_NOREF(pvUser);
     VBoxGINAVerbose(0, "VBoxGINA::credentialsPoller\n");
 

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

@@ -78 +78 @@
 BOOL WINAPI DllMain(HINSTANCE hInstance,
                     DWORD     dwReason,
-                    LPVOID    lpReserved)
-{
+                    LPVOID    pReserved)
+{
+    RT_NOREF(pReserved);
     switch (dwReason)
     {
@@ -474 +475 @@
 BOOL WINAPI WlxScreenSaverNotify(PVOID pWlxContext, BOOL *pSecure)
 {
+    RT_NOREF(pWlxContext);
     VBoxGINAVerbose(0, "VBoxGINA::WlxScreenSaverNotify, pSecure=%d\n",
                     pSecure ? *pSecure : 0);
@@ -602 +604 @@
 void WnpScreenSaverStop(PWLX_NOTIFICATION_INFO pInfo)
 {
+    RT_NOREF(pInfo);
     VBoxGINAVerbose(0, "VBoxGINA::WnpScreenSaverStop\n");
 

trunk/src/VBox/Additions/WINNT/VBoxGINA/testcase/tstVBoxGINA.cpp

@@ -1 @@
-/* $Id */
+/* $Id$ */
 /** @file
  * tstVBoxGINA.cpp - Simple testcase for invoking VBoxGINA.dll.
@@ -20 +20 @@
 #include <stdio.h>
 
-int main(int argc, TCHAR* argv[])
+int main()
 {
     DWORD dwErr;
@@ -30 +30 @@
      */
 
-    HMODULE hMod = LoadLibrary(L"VBoxGINA.dll");
+    HMODULE hMod = LoadLibraryW(L"VBoxGINA.dll");
     if (!hMod)
     {
@@ -59 +59 @@
     return dwErr == ERROR_SUCCESS ? 0 : 1;
 }
+