Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

2 files changed, 32 insertions, 17 deletions

diff --git a/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp b/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp
index 862b088d..b0ad0cb9 100644
--- a/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp
+++ b/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/StubBld/VBoxStubBld.h b/src/VBox/Installer/win/StubBld/VBoxStubBld.h
index 67005674..49919f9b 100644
--- a/src/VBox/Installer/win/StubBld/VBoxStubBld.h
+++ b/src/VBox/Installer/win/StubBld/VBoxStubBld.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -15,37 +15,52 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
 
-#pragma once
+#ifndef ___VBoxStubBld_h___
+#define ___VBoxStubBld_h___
 
 #define VBOXSTUB_MAX_PACKAGES 128
 
-typedef struct
+typedef struct VBOXSTUBPKGHEADER
 {
-    char szMagic[9];
-    DWORD dwVersion;
-    BYTE byCntPkgs;
+    /** Some magic string not defined by this header? Turns out it's a write only
+     *  field... */
+    char    szMagic[9];
+    /* Inbetween szMagic and dwVersion there are 3 bytes of implicit padding. */
+    /** Some version number not defined by this header? Also write only field.
+     *  Should be a uint32_t, not DWORD. */
+    DWORD   dwVersion;
+    /** Number of packages following the header. byte is prefixed 'b', not 'by'!
+     *  Use uint8_t instead of BYTE. */
+    BYTE    byCntPkgs;
+    /* There are 3 bytes of implicit padding here. */
+} VBOXSTUBPKGHEADER;
+typedef VBOXSTUBPKGHEADER *PVBOXSTUBPKGHEADER;
 
-} VBOXSTUBPKGHEADER, *PVBOXSTUBPKGHEADER;
-
-enum VBOXSTUBPKGARCH
+typedef enum VBOXSTUBPKGARCH
 {
     VBOXSTUBPKGARCH_ALL = 0,
-    VBOXSTUBPKGARCH_X86 = 1,
-    VBOXSTUBPKGARCH_AMD64 = 2
-};
+    VBOXSTUBPKGARCH_X86,
+    VBOXSTUBPKGARCH_AMD64
+} VBOXSTUBPKGARCH;
 
-typedef struct
+typedef struct VBOXSTUBPKG
 {
     BYTE byArch;
+    /** Probably the name of the PE resource or something, read the source to
+     *  find out for sure.  Don't use _MAX_PATH, define your own max lengths! */
     char szResourceName[_MAX_PATH];
     char szFileName[_MAX_PATH];
-} VBOXSTUBPKG, *PVBOXSTUBPKG;
+} VBOXSTUBPKG;
+typedef VBOXSTUBPKG *PVBOXSTUBPKG;
 
 /* Only for construction. */
+/* Since it's only used by VBoxStubBld.cpp, why not just keep it there? */
 
-typedef struct
+typedef struct VBOXSTUBBUILDPKG
 {
     char szSourcePath[_MAX_PATH];
     BYTE byArch;
-} VBOXSTUBBUILDPKG, *PVBOXSTUBBUILDPKG;
+} VBOXSTUBBUILDPKG;
+typedef VBOXSTUBBUILDPKG *PVBOXSTUBBUILDPKG;
 
+#endif