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

Timestamp:

Aug 6, 2016 3:04:26 PM (9 years ago)

Author:

vboxsync

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

109703

Message:

VBoxGuestInstallHelper.cpp: @todo r=bird: fix the optimistically incorrect MZ/PE parsing. Fixed warnings.

File:

• trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp (modified) (12 diffs)

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

@@ -24 +24 @@
 #include <tchar.h>
 #include <strsafe.h>
+#pragma warning(push)
+#pragma warning(disable: 4995) /* warning C4995: 'lstrcpyA': name was marked as #pragma deprecated */
 #include "exdll.h"
+#pragma warning(pop)
 
 #include <iprt/err.h>
@@ -221 +224 @@
  * @param   stacktop            Pointer to a pointer to the current stack.
  */
-VBOXINSTALLHELPER_EXPORT DisableWFP(HWND hwndParent, int string_size,
-                                    TCHAR *variables, stack_t **stacktop)
-{
+VBOXINSTALLHELPER_EXPORT DisableWFP(HWND hwndParent, int string_size, TCHAR *variables, stack_t **stacktop)
+{
+    NOREF(hwndParent);
     EXDLL_INIT();
 
@@ -252 +255 @@
             if (SUCCEEDED(hr))
             {
-                if (g_pfnSfcFileException(0, pwszFile, -1) != 0)
+                if (g_pfnSfcFileException(0, pwszFile, UINT32_MAX) != 0)
                     hr = HRESULT_FROM_WIN32(GetLastError());
                 vboxChar2WCharFree(pwszFile);
@@ -274 +277 @@
  * @param   stacktop            Pointer to a pointer to the current stack.
  */
-VBOXINSTALLHELPER_EXPORT FileGetArchitecture(HWND hwndParent, int string_size,
-                                             TCHAR *variables, stack_t **stacktop)
-{
+VBOXINSTALLHELPER_EXPORT FileGetArchitecture(HWND hwndParent, int string_size, TCHAR *variables, stack_t **stacktop)
+{
+    NOREF(hwndParent);
     EXDLL_INIT();
 
@@ -290 +293 @@
             hr = __HRESULT_FROM_WIN32(ERROR_FILE_INVALID);
 
-            BYTE byOffsetPE; /* Absolute offset of PE signature. */
+            BYTE offPeHdr = 0; /* Absolute offset of PE signature. */
 
             /* Do some basic validation. */
@@ -302 +305 @@
                 {
                     /* Read actual offset of PE signature. */
-                    if (fread(&byOffsetPE, sizeof(BYTE), 1, pFh) == 1)
+/** @todo r=bird: You've obviously no clue about the structure you're messing with here.  The field is NOT a BYTE
+ * field but a int32_t/uint32_t!  The MZ header is defined as IMAGE_DOS_HEADER by windows.h (well, winnt.h), and the
+ * field you're accessing is e_lfanew.  Please rewrite this hack to use the structures!  (Also, the MZ structure is
+ * OPTIONAL, just in case you didn't know.)  */
+#ifdef DEBUG_andy
+# error "Fix this"
+#endif
+                    if (fread(&offPeHdr, sizeof(BYTE), 1, pFh) == 1)
                     {
                         /* ... and seek to it. */
-                        if (!fseek(pFh, byOffsetPE, SEEK_SET))
+                        if (!fseek(pFh, offPeHdr, SEEK_SET))
                         {
                             /* Validate PE signature. */
@@ -321 +331 @@
             if (SUCCEEDED(hr))
             {
-                BYTE byOffsetCOFF = byOffsetPE + 0x4; /* Skip PE signature. */
+                BYTE offFileHeaderMachineField = offPeHdr + 0x4; /* Skip PE signature. */
 
                 /** @todo When we need to do more stuff here, we probably should
@@ -329 +339 @@
                 /* Jump to machine type (first entry, 2 bytes):
                  * Use absolute PE offset retrieved above. */
-                if (!fseek(pFh, byOffsetCOFF, SEEK_SET))
+                if (!fseek(pFh, offFileHeaderMachineField, SEEK_SET))
                 {
                     WORD wMachineType;
@@ -376 +386 @@
  * @param   stacktop            Pointer to a pointer to the current stack.
  */
-VBOXINSTALLHELPER_EXPORT FileGetVendor(HWND hwndParent, int string_size,
-                                       TCHAR *variables, stack_t **stacktop)
-{
+VBOXINSTALLHELPER_EXPORT FileGetVendor(HWND hwndParent, int string_size, TCHAR *variables, stack_t **stacktop)
+{
+    NOREF(hwndParent);
     EXDLL_INIT();
 
@@ -402 +412 @@
 
                         TCHAR szQuery[MAX_PATH];
+#pragma warning(suppress:4995) /* warning C4995: '_sntprintf': name was marked as #pragma deprecated */
                         _sntprintf(szQuery, sizeof(szQuery), _T("StringFileInfo\\%04X%04X\\CompanyName"),
                                    wCodePage,wLanguageID);
@@ -438 +449 @@
  * @param   stacktop            Pointer to a pointer to the current stack.
  */
-VBOXINSTALLHELPER_EXPORT VBoxTrayShowBallonMsg(HWND hwndParent, int string_size,
-                                               TCHAR *variables, stack_t **stacktop)
-{
+VBOXINSTALLHELPER_EXPORT VBoxTrayShowBallonMsg(HWND hwndParent, int string_size, TCHAR *variables, stack_t **stacktop)
+{
+    NOREF(hwndParent);
     EXDLL_INIT();
 
@@ -505 +516 @@
 }
 
-BOOL WINAPI DllMain(HANDLE hInst, ULONG uReason, LPVOID lpReserved)
-{
+BOOL WINAPI DllMain(HANDLE hInst, ULONG uReason, LPVOID pReserved)
+{
+    RT_NOREF(uReason, pReserved);
     g_hInstance = (HINSTANCE)hInst;
     return TRUE;