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

Timestamp:

Aug 5, 2016 10:24:30 PM (8 years ago)

Author:

vboxsync

Message:

GA/NT: warnings

Location:

trunk/src/VBox/Additions/WINNT/VBoxCredProv

Files:

• VBoxCredProvCredential.cpp (modified) (5 diffs)
• VBoxCredProvCredential.h (modified) (1 diff)
• VBoxCredProvProvider.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvCredential.cpp

@@ -24 +24 @@
 # define WIN32_NO_STATUS
 #endif
-#include <intsafe.h>
+#include <iprt/win/intsafe.h>
 
 #include "VBoxCredentialProvider.h"
@@ -754 +754 @@
  * @return  HRESULT
  * @param   dwFieldID               Field to set value for.
- * @param   pcwzString              Actual value to set.
- */
-HRESULT
-VBoxCredProvCredential::SetStringValue(DWORD dwFieldID, PCWSTR pcwzString)
-{
+ * @param   pwszValue               Actual value to set.
+ */
+HRESULT
+VBoxCredProvCredential::SetStringValue(DWORD dwFieldID, PCWSTR pwszValue)
+{
+    RT_NOREF(dwFieldID, pwszValue);
 #ifdef DEBUG
     VBoxCredProvVerbose(0, "VBoxCredProvCredential::SetStringValue: dwFieldID=%ld, pcwzString=%ls\n",
-                        dwFieldID, pcwzString);
+                        dwFieldID, pwszValue);
 #endif
 
@@ -947 +948 @@
                 if (SUCCEEDED(hr))
                 {
-                    ULONG ulAuthPackage;
+                    ULONG ulAuthPackage = 0;
+/** @todo r=bird: The code flow here looks wrong.  The fact that ulAuthPackage
+ *        wasn't initialized if LsaConnectUntrusted fails, but still used and
+ *        we seemingly even succeed the operation as a whole.  Unfortunately,
+ *        the code does not have any comments what-so-family-ever to
+ *        enlighten us as to wtf (f == family) this Lsa stuff is doing and
+ *        why it appear to be kind of optional...
+ *
+ *        I'm pretty sure this code if broken.  And if it is, it's because the
+ *        stupid, stupid, code structure where you repeat state checks to avoid
+ *        hugging the right margin.  The function is too long already, so the
+ *        right way to deal with that is to split up the work into several
+ *        functions with simplier control flow.
+ */
+#pragma message("TODO: Investigate code flow around ulAuthPackage!")
+#ifdef DEBUG_andy
+# error "fix this ASAP, it's been here since the r76490 rewrite"
+#endif
 
                     HANDLE hLsa;
@@ -971 +989 @@
                         if (SUCCEEDED(hr))
                         {
-                            s = LsaLookupAuthenticationPackage(hLsa, &lsaszKerberosName,
-                                                               &ulAuthPackage);
+                            s = LsaLookupAuthenticationPackage(hLsa, &lsaszKerberosName, &ulAuthPackage);
                             if (FAILED(HRESULT_FROM_NT(s)))
                             {
@@ -1023 +1040 @@
                                      CREDENTIAL_PROVIDER_STATUS_ICON *pcpsiOptionalStatusIcon)
 {
+    RT_NOREF(ntStatus, ntSubStatus, ppwszOptionalStatusText, pcpsiOptionalStatusIcon);
     VBoxCredProvVerbose(0, "VBoxCredProvCredential::ReportResult: ntStatus=%ld, ntSubStatus=%ld\n",
                         ntStatus, ntSubStatus);

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvCredential.h

@@ -74 +74 @@
     IFACEMETHODIMP GetSubmitButtonValue(DWORD dwFieldID, DWORD *pdwAdjacentTo);
 
-    IFACEMETHODIMP SetStringValue(DWORD dwFieldID, PCWSTR pcwzString);
+    IFACEMETHODIMP SetStringValue(DWORD dwFieldID, PCWSTR pwszValue);
     IFACEMETHODIMP SetCheckboxValue(DWORD dwFieldID, BOOL fChecked);
     IFACEMETHODIMP SetComboBoxSelectedValue(DWORD dwFieldID, DWORD dwSelectedItem);

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvProvider.cpp

@@ -22 +22 @@
 #include <new> /* For bad_alloc. */
 
+#include <iprt/win/windows.h>
 #include <credentialprovider.h>