include: Use stream to denote MSF stream/file.

include/wine/mscvpdb.h

@@ -43,30 +43,29 @@
  *
  * Regarding PDB files:
  * -------------------
- * They are implemented as a set of internal files (as a small file
- * system). The file is split into blocks, an internal file is made
- * of a set of blocks. Internal files are accessed through
- * numbers. For example,
- * 1/ is the ROOT (basic information on the file)
- * 2/ is the Symbol information (global symbols, local variables...)
- * 3/ is the Type internal file (each the symbols can have type
+ * They are implemented as a set of internal streams (as a small file
+ * system). The file is split into blocks, an internal stream is made of a set
+ * of blocks, that can be non continuous. The table of contents gives the set of
+ * blocks for a given stream.
+ * Some internal streams are accessed through numbers. For example,
+ * #1 is the ROOT (basic information on the file)
+ * #2 is the Symbol information (global symbols, local variables...)
+ * #3 is the Type internal stream (each the symbols can have type
  * information associated with it).
  *
  * Over the years, three formats existed for the PDB:
- * - ?? was rather linked to 16 bit code (our support shall be rather
- *   bad)
- * - JG: it's the signature embedded in the file header. This format
- *   has been used in MSVC 2.0 => 5.0.
- * - DS: it's the signature embedded in the file header. It's the
- *   current format supported my MS.
+ * - ?? was rather linked to 16 bit code (our support shall be rather bad)
+ * - JG: it's the signature embedded in the file header. This format has been
+ *   used in MSVC 2.0 => 5.0.
+ * - DS: it's the signature embedded in the file header. It's the current format
+ *   supported my MS.
  *
- * Types internal stream
+ * Types internal stream (aka TPI)
  * ---------------------
- * Types (from the Type internal file) have existed in three flavors
- * (note that those flavors came as historical evolution, but there
- * isn't a one to one link between types evolution and PDB formats'
- * evolutions:
- * - the first flavor (suffixed by V1 in this file), where the types
+ * Types (from the Type internal stream) have existed in three flavors (note
+ * that those flavors came as historical evolution, but there isn't a one to one
+ * link between types evolution and PDB formats' evolutions:
+ * - the first flavor (suffixed by V1 in mscvpdb.h), where the types
  *   and subtypes are 16 bit entities; and where strings are in Pascal
  *   format (first char is their length and are not 0 terminated)
  * - the second flavor (suffixed by V2) differs from first flavor with
@@ -2376,7 +2375,7 @@ struct startend
  * ======================================== */
 
 
-struct PDB_FILE
+struct PDB_JG_STREAM
 {
     unsigned int        size;
     unsigned int        unknown;
@@ -2389,7 +2388,7 @@ struct PDB_JG_HEADER
     unsigned int        block_size;
     unsigned short      free_list_block;
     unsigned short      total_alloc;
-    struct PDB_FILE     toc;
+    struct PDB_JG_STREAM toc;
     unsigned short      toc_block[1];
 };
 
@@ -2406,14 +2405,14 @@ struct PDB_DS_HEADER
 
 struct PDB_JG_TOC
 {
-    unsigned int        num_files;
-    struct PDB_FILE     file[1];
+    unsigned int        num_streams;
+    struct PDB_JG_STREAM streams[1];
 };
 
 struct PDB_DS_TOC
 {
-    unsigned int        num_files;
-    unsigned int        file_size[1];
+    unsigned int        num_streams;
+    unsigned int        stream_size[1];
 };
 
 struct PDB_JG_ROOT
@@ -2441,7 +2440,7 @@ typedef struct _PDB_TYPES_OLD
     unsigned short first_index;
     unsigned short last_index;
     unsigned int   type_size;
-    unsigned short hash_file;
+    unsigned short hash_stream;
     unsigned short pad;
 } PDB_TYPES_OLD, *PPDB_TYPES_OLD;
 
@@ -2452,7 +2451,7 @@ typedef struct _PDB_TYPES
     unsigned int   first_index;
     unsigned int   last_index;
     unsigned int   type_size;
-    unsigned short hash_file;
+    unsigned short hash_stream;
     unsigned short pad;
     unsigned int   hash_value_size;
     unsigned int   hash_num_buckets;
@@ -2493,7 +2492,7 @@ typedef struct _PDB_SYMBOL_FILE
     unsigned int     unknown1;
     PDB_SYMBOL_RANGE range;
     unsigned short   flag;
-    unsigned short   file;
+    unsigned short   stream;
     unsigned int     symbol_size;
     unsigned int     lineno_size;
     unsigned int     lineno2_size;
@@ -2507,7 +2506,7 @@ typedef struct _PDB_SYMBOL_FILE_EX
     unsigned int        unknown1;
     PDB_SYMBOL_RANGE_EX range;
     unsigned short      flag;
-    unsigned short      file;
+    unsigned short      stream;
     unsigned int        symbol_size;
     unsigned int        lineno_size;
     unsigned int        lineno2_size;
@@ -2535,9 +2534,9 @@ typedef struct _PDB_SYMBOL_IMPORT
 
 typedef struct _PDB_SYMBOLS_OLD
 {
-    unsigned short global_hash_file;
-    unsigned short public_file;
-    unsigned short gsym_file;
+    unsigned short global_hash_stream;
+    unsigned short public_stream;
+    unsigned short gsym_stream;
     unsigned short pad;
     unsigned int   module_size;
     unsigned int   offset_size;
@@ -2550,11 +2549,11 @@ typedef struct _PDB_SYMBOLS
     unsigned int   signature;
     unsigned int   version;
     unsigned int   age;
-    unsigned short global_hash_file;
+    unsigned short global_hash_stream;
     unsigned short flags;
-    unsigned short public_file;
+    unsigned short public_stream;
     unsigned short bldVer;
-    unsigned short gsym_file;
+    unsigned short gsym_stream;
     unsigned short rbldVer;
     unsigned int   module_size;
     unsigned int   offset_size;