Eric Pouech : include: Be consistent in naming regarding MSF's block.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 71abef09065c33c13cbd30b0f3369ab59cab1747
URL:    https://gitlab.winehq.org/wine/wine/-/commit/71abef09065c33c13cbd30b0f3369ab...

Author: Eric Pouech <eric.pouech(a)gmail.com>
Date:   Tue Jan 31 17:28:59 2023 +0100

include: Be consistent in naming regarding MSF's block.

No longer calling it sometimes 'page'.

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---

 dlls/dbghelp/msc.c     |  2 +-
 include/wine/mscvpdb.h |  4 ++--
 tools/winedump/pdb.c   | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c
index 9debc34e77c..1b998ab5e36 100644
--- a/dlls/dbghelp/msc.c
+++ b/dlls/dbghelp/msc.c
@@ -3555,7 +3555,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info*
         struct PDB_DS_ROOT*         root;
 
         pdb_file->u.ds.toc =
-            pdb_ds_read(pdb, (const UINT*)((const char*)pdb + pdb->toc_page * pdb->block_size),
+            pdb_ds_read(pdb, (const UINT*)((const char*)pdb + pdb->toc_block * pdb->block_size),
                         pdb->toc_size);
         root = pdb_read_ds_file(pdb, pdb_file->u.ds.toc, 1);
         if (!root)
diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h
index 90adc3ee465..7e3af84034f 100644
--- a/include/wine/mscvpdb.h
+++ b/include/wine/mscvpdb.h
@@ -2398,10 +2398,10 @@ struct PDB_DS_HEADER
     char                signature[32];
     unsigned int        block_size;
     unsigned int        unknown1;
-    unsigned int        num_pages;
+    unsigned int        num_blocks;
     unsigned int        toc_size;
     unsigned int        unknown2;
-    unsigned int        toc_page;
+    unsigned int        toc_block;
 };
 
 struct PDB_JG_TOC
diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c
index ab844fd8555..0060d9d48be 100644
--- a/tools/winedump/pdb.c
+++ b/tools/winedump/pdb.c
@@ -1120,7 +1120,7 @@ static BOOL pdb_ds_init(struct pdb_reader* reader)
     if (!reader->u.ds.header) return FALSE;
     reader->read_file = pdb_ds_read_file;
     reader->u.ds.toc = pdb_ds_read(reader->u.ds.header,
-                                   (const UINT *)((const char*)reader->u.ds.header + reader->u.ds.header->toc_page * reader->u.ds.header->block_size),
+                                   (const UINT *)((const char*)reader->u.ds.header + reader->u.ds.header->toc_block * reader->u.ds.header->block_size),
                                    reader->u.ds.header->toc_size);
     memset(reader->file_used, 0, sizeof(reader->file_used));
     return TRUE;
@@ -1137,20 +1137,20 @@ static void pdb_ds_dump(void)
            "\tsignature:        %.*s\n"
            "\tblock_size:       %08x\n"
            "\tunknown1:         %08x\n"
-           "\tnum_pages:        %08x\n"
+           "\tnum_blocks:       %08x\n"
            "\ttoc_size:         %08x\n"
            "\tunknown2:         %08x\n"
-           "\ttoc_page:         %08x\n",
+           "\ttoc_block:        %08x\n",
            (int)sizeof(pdb7) - 1, reader.u.ds.header->signature,
            reader.u.ds.header->block_size,
            reader.u.ds.header->unknown1,
-           reader.u.ds.header->num_pages,
+           reader.u.ds.header->num_blocks,
            reader.u.ds.header->toc_size,
            reader.u.ds.header->unknown2,
-           reader.u.ds.header->toc_page);
+           reader.u.ds.header->toc_block);
 
     /* files with static indexes:
-     *  0: JG says old toc pages
+     *  0: JG says old toc blocks
      *  1: root structure
      *  2: types
      *  3: modules