Changeset 62785 in vbox for trunk/src/VBox

Timestamp:

Aug 1, 2016 6:56:28 AM (8 years ago)

Author:

vboxsync

Message:

HostServices: warnings

File:

• trunk/src/VBox/HostServices/auth/winlogon/winlogon.cpp (modified) (9 diffs)

trunk/src/VBox/HostServices/auth/winlogon/winlogon.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * VirtualBox External Authentication Library:
- * Windows Logon Authentication.
+ * VirtualBox External Authentication Library - Windows Logon Authentication.
  */
 
@@ -21 +20 @@
 
 #include <iprt/win/windows.h>
-
 #include <VBox/VBoxAuth.h>
+#include <iprt/cdefs.h>
 
 #ifdef AUTH_DEBUG
-#include <stdio.h>
+# include <stdio.h>
 
 static void dprintfw(const WCHAR *fmt, ...)
@@ -40 +39 @@
    va_end(va);
 }
-#define DBGAUTH(a) dprintfw a
+# define DBGAUTH(a) dprintfw a
 #else
-#define DBGAUTH(a)
+# define DBGAUTH(a)
 #endif
 
-static WCHAR swszEmpty[] = { L"" };
+static WCHAR g_wszEmpty[] = { L"" };
 
 static void freeWideChar(WCHAR *pwszString)
 {
-    if (pwszString && pwszString != &swszEmpty[0])
+    if (pwszString && pwszString != &g_wszEmpty[0])
     {
         size_t cb = (wcslen(pwszString) + 1) * sizeof(WCHAR);
@@ -63 +62 @@
      */
     if (!pszString || *pszString == 0)
-        return &swszEmpty[0];
+        return &g_wszEmpty[0];
 
     /*
@@ -98 +97 @@
 }
 
+/* Prototype it to make sure we've got the right prototype. */
 extern "C"
 #if defined(_MSC_VER)
 __declspec(dllexport)
 #endif
-AuthResult AUTHCALL AuthEntry (const char *szCaller,
-                               PAUTHUUID pUuid,
-                               AuthGuestJudgement guestJudgement,
-                               const char *szUser,
-                               const char *szPassword,
-                               const char *szDomain,
-                               int fLogon,
-                               unsigned clientId)
+FNAUTHENTRY3 AuthEntry;
+
+/**
+ * @callback_method_impl{FNAUTHENTRY3}
+ */
+extern "C"
+AuthResult AUTHCALL AuthEntry(const char *pszCaller,
+                              PAUTHUUID pUuid,
+                              AuthGuestJudgement guestJudgement,
+                              const char *pszUser,
+                              const char *pszPassword,
+                              const char *pszDomain,
+                              int fLogon,
+                              unsigned clientId)
 {
+    RT_NOREF4(pszCaller, pUuid, guestJudgement, clientId);
     if (!fLogon)
     {
@@ -117 +124 @@
     }
 
-    LPWSTR lpwszUsername = utf8ToWideChar(szUser);
-    LPWSTR lpwszDomain   = utf8ToWideChar(szDomain);
-    LPWSTR lpwszPassword = utf8ToWideChar(szPassword);
+    LPWSTR pwszUsername = utf8ToWideChar(pszUser);
+    LPWSTR pwszDomain   = utf8ToWideChar(pszDomain);
+    LPWSTR pwszPassword = utf8ToWideChar(pszPassword);
 
     DBGAUTH((L"u[%ls], d[%ls], p[%ls]\n", lpwszUsername, lpwszDomain, lpwszPassword));
@@ -125 +132 @@
     AuthResult result = AuthResultAccessDenied;
 
-    if (lpwszUsername && lpwszDomain && lpwszPassword)
+    if (pwszUsername && pwszDomain && pwszPassword)
     {
         /* LOGON32_LOGON_INTERACTIVE is intended for users who will be interactively using the computer,
@@ -135 +142 @@
         HANDLE hToken;
 
-        BOOL fSuccess = LogonUserW(lpwszUsername,
-                                   lpwszDomain,
-                                   lpwszPassword,
+        BOOL fSuccess = LogonUserW(pwszUsername,
+                                   pwszDomain,
+                                   pwszPassword,
                                    dwLogonType,
                                    dwLogonProvider,
@@ -156 +163 @@
     }
 
-    freeWideChar(lpwszUsername);
-    freeWideChar(lpwszDomain);
-    freeWideChar(lpwszPassword);
+    freeWideChar(pwszUsername);
+    freeWideChar(pwszDomain);
+    freeWideChar(pwszPassword);
 
     return result;
 }
 
-/* Verify the function prototype. */
-static PAUTHENTRY3 gpfnAuthEntry = AuthEntry;