win: Work towards getting 'minidump' to compile

minidump/minidump_extensions.h

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #ifndef CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_
 #define CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_
 
-#include <dbghelp.h>
 #include <stdint.h>
-#include <winnt.h>
 
+#include "minidump/crashpad_dbghelp.h"
+#include "minidump/crashpad_winnt.h"

[scottmg, 2015/02/02 23:16:37]

Sadly, winnt.h has the same affliction as dbghelp.h. We could just hack #include
order in this one file instead in this case, as there's only one place where
winnt.h is included.

+#include "util/misc/struct_pack.h"
 #include "util/misc/uuid.h"
 
 namespace crashpad {
 
 //! \brief Minidump stream type values for MINIDUMP_DIRECTORY::StreamType. Each
 //!     stream structure has a corresponding stream type value to identify it.
 //!
 //! \sa MINIDUMP_STREAM_TYPE
 enum MinidumpStreamType : uint32_t {
   //! \brief The stream type for MINIDUMP_THREAD_LIST.
@@ skipping 30 matching lines @@
   // 0x4350 = "CP"
 
   //! \brief The stream type for MinidumpCrashpadInfo.
   kMinidumpStreamTypeCrashpadInfo = 0x43500001,
 };
 
 //! \brief A variable-length UTF-8-encoded string carried within a minidump
 //!     file.
 //!
 //! \sa MINIDUMP_STRING
-struct __attribute__((packed, aligned(4))) MinidumpUTF8String {
+PACK_AND_ALIGN_4(struct MinidumpUTF8String {
   // The field names do not conform to typical style, they match the names used
   // in MINIDUMP_STRING. This makes it easier to operate on MINIDUMP_STRING (for
   // UTF-16 strings) and MinidumpUTF8String using templates.
 
   //! \brief The length of the #Buffer field in bytes, not including the `NUL`
   //!     terminator.
   //!
   //! \note This field is interpreted as a byte count, not a count of Unicode
   //!     code points.
   uint32_t Length;
 
   //! \brief The string, encoded in UTF-8, and terminated with a `NUL` byte.
   uint8_t Buffer[0];
-};
+});
 
 //! \brief CPU type values for MINIDUMP_SYSTEM_INFO::ProcessorArchitecture.
 //!
 //! \sa \ref PROCESSOR_ARCHITECTURE_x "PROCESSOR_ARCHITECTURE_*"
 enum MinidumpCPUArchitecture : uint16_t {
   //! \brief 32-bit x86.
   //!
   //! These systems identify their CPUs generically as “x86” or “ia32”, or with
   //! more specific names such as “i386”, “i486”, “i586”, and “i686”.
   kMinidumpCPUArchitectureX86 = PROCESSOR_ARCHITECTURE_INTEL,
@@ skipping 193 matching lines @@
   //! \brief The path or file name of the `.pdb` file associated with the
   //!     module.
   //!
   //! This is a NUL-terminated string. On Windows, it will be encoded in the
   //! code page of the system that linked the module. On other operating
   //! systems, UTF-8 may be used.
   uint8_t pdb_name[1];
 };
 
 //! \brief A list of ::RVA pointers.
-struct __attribute__((packed, aligned(4))) MinidumpRVAList {
+PACK_AND_ALIGN_4(struct MinidumpRVAList {
   //! \brief The number of children present in the #children array.
   uint32_t count;
 
   //! \brief Pointers to other structures in the minidump file.
   RVA children[0];
-};
+});
 
 //! \brief A list of MINIDUMP_LOCATION_DESCRIPTOR objects.
-struct __attribute__((packed, aligned(4))) MinidumpLocationDescriptorList {
+PACK_AND_ALIGN_4(struct MinidumpLocationDescriptorList {
   //! \brief The number of children present in the #children array.
   uint32_t count;
 
   //! \brief Pointers to other structures in the minidump file.
   MINIDUMP_LOCATION_DESCRIPTOR children[0];
-};
+});
 
 //! \brief A key-value pair.
-struct __attribute__((packed, aligned(4))) MinidumpSimpleStringDictionaryEntry {
+PACK_AND_ALIGN_4(struct MinidumpSimpleStringDictionaryEntry {
   //! \brief ::RVA of a MinidumpUTF8String containing the key of a key-value
   //!     pair.
   RVA key;
 
   //! \brief ::RVA of a MinidumpUTF8String containing the value of a key-value
   //!     pair.
   RVA value;
-};
+});
 
 //! \brief A list of key-value pairs.
-struct __attribute__((packed, aligned(4))) MinidumpSimpleStringDictionary {
+PACK_AND_ALIGN_4(struct MinidumpSimpleStringDictionary {
   //! \brief The number of key-value pairs present.
   uint32_t count;
 
   //! \brief A list of MinidumpSimpleStringDictionaryEntry entries.
   MinidumpSimpleStringDictionaryEntry entries[0];
-};
+});
 
 //! \brief Additional Crashpad-specific information about a module carried
 //!     within a minidump file.
 //!
 //! This structure augments the information provided by MINIDUMP_MODULE. The
 //! minidump file must contain a module list stream
 //! (::kMinidumpStreamTypeModuleList) in order for this structure to appear.
 //!
 //! This structure is versioned. When changing this structure, leave the
 //! existing structure intact so that earlier parsers will be able to understand
 //! the fields they are aware of, and make additions at the end of the
 //! structure. Revise #kVersion and document each field’s validity based on
 //! #version, so that newer parsers will be able to determine whether the added
 //! fields are valid or not.
 //!
 //! \sa #MinidumpModuleCrashpadInfoList
-struct __attribute__((packed, aligned(4))) MinidumpModuleCrashpadInfo {
+PACK_AND_ALIGN_4(struct MinidumpModuleCrashpadInfo {
   //! \brief The structure’s currently-defined version number.
   //!
   //! \sa version
   static const uint32_t kVersion = 1;
 
   //! \brief The structure’s version number.
   //!
   //! Readers can use this field to determine which other fields in the
   //! structure are valid. Upon encountering a value greater than #kVersion, a
   //! reader should assume that the structure’s layout is compatible with the
@@ skipping 22 matching lines @@
 
   //! \brief A MinidumpSimpleStringDictionary pointing to strings interpreted as
   //!     key-value pairs. The module controls the data that appears here.
   //!
   //! These key-value pairs correspond to
   //! ModuleSnapshot::AnnotationsSimpleMap() and do not duplicate anything in
   //! #list_annotations.
   //!
   //! This field is present when #version is at least `1`.
   MINIDUMP_LOCATION_DESCRIPTOR simple_annotations;
-};
+});
 
 //! \brief Additional Crashpad-specific information about modules carried within
 //!     a minidump file.
 //!
 //! This structure augments the information provided by
 //! MINIDUMP_MODULE_LIST. The minidump file must contain a module list stream
 //! (::kMinidumpStreamTypeModuleList) in order for this structure to appear.
 //!
 //! MinidumpModuleCrashpadInfoList::count may be less than the value of
 //! MINIDUMP_MODULE_LIST::NumberOfModules because not every MINIDUMP_MODULE
 //! structure carried within the minidump file will necessarily have
 //! Crashpad-specific information provided by a MinidumpModuleCrashpadInfo
 //! structure.
 //!
 //! MinidumpModuleCrashpadInfoList::children references
 //! MinidumpModuleCrashpadInfo children indirectly through
 //! MINIDUMP_LOCATION_DESCRIPTOR pointers to allow for future growth of the
 //! MinidumpModuleCrashpadInfo structure.
 using MinidumpModuleCrashpadInfoList = MinidumpLocationDescriptorList;
 
 //! \brief Additional Crashpad-specific information carried within a minidump
 //!     file.
 //!
 //! This structure is versioned. When changing this structure, leave the
 //! existing structure intact so that earlier parsers will be able to understand
 //! the fields they are aware of, and make additions at the end of the
 //! structure. Revise #kVersion and document each field’s validity based on
 //! #version, so that newer parsers will be able to determine whether the added
 //! fields are valid or not.
-struct __attribute__((packed, aligned(4))) MinidumpCrashpadInfo {
+PACK_AND_ALIGN_4(struct MinidumpCrashpadInfo {
   //! \brief The structure’s currently-defined version number.
   //!
   //! \sa version
   static const uint32_t kVersion = 1;
 
   //! \brief The structure’s version number.
   //!
   //! Readers can use this field to determine which other fields in the
   //! structure are valid. Upon encountering a value greater than #kVersion, a
   //! reader should assume that the structure’s layout is compatible with the
   //! structure defined as having value #kVersion.
   //!
   //! Writers may produce values less than #kVersion in this field if there is
   //! no need for any fields present in later versions.
   uint32_t version;
 
   //! \brief A pointer to a #MinidumpModuleCrashpadInfoList structure.
   //!
   //! This field is present when #version is at least `1`.
   MINIDUMP_LOCATION_DESCRIPTOR module_list;
-};
+});
 
 }  // namespace crashpad
 
 #endif  // CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_