From: Eric Pouech epouech@codeweavers.com
Signed-off-by: Eric Pouech epouech@codeweavers.com --- dlls/dbghelp/msc.c | 4 +- include/wine/mscvpdb.h | 96 +++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index b14af240302..546b9d83d74 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3296,12 +3296,12 @@ static void pdb_convert_symbol_file(const PDB_SYMBOLS* symbols, sfile->symbol_size = sym_file->symbol_size; sfile->lineno_size = sym_file->lineno_size; sfile->lineno2_size = sym_file->lineno2_size; - *size = sizeof(PDB_SYMBOL_FILE) - 1; + *size = sizeof(PDB_SYMBOL_FILE); } else { memcpy(sfile, image, sizeof(PDB_SYMBOL_FILE_EX)); - *size = sizeof(PDB_SYMBOL_FILE_EX) - 1; + *size = sizeof(PDB_SYMBOL_FILE_EX); } }
diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 08353f11811..72626a23a2d 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -104,7 +104,7 @@ struct p_string { unsigned char namelen; - char name[1]; + char name[]; };
typedef unsigned short cv_typ16_t; @@ -327,7 +327,7 @@ union codeview_type cv_property_t property; cv_typ_t type; cv_typ_t fieldlist; - char name[1]; + char name[]; } enumeration_v3;
struct @@ -387,7 +387,7 @@ union codeview_type unsigned short int id; /* LF_FUNC_ID */ cv_itemid_t scopeId; cv_typ_t type; - char name[1]; + char name[]; } func_id_v3;
struct @@ -396,7 +396,7 @@ union codeview_type unsigned short int id; /* LF_MFUNC_ID */ cv_typ_t parentType; cv_typ_t type; - char name[1]; + char name[]; } mfunc_id_v3;
struct @@ -404,7 +404,7 @@ union codeview_type unsigned short int len; unsigned short int id; /* LF_STRING_ID */ cv_itemid_t strid; - char name[1]; + char name[]; } string_id_v3;
struct @@ -431,7 +431,7 @@ union codeview_type unsigned short int len; unsigned short int id; /* LF_BUILDINFO */ unsigned short count; - cv_itemid_t arg[1]; + cv_itemid_t arg[]; } buildinfo_v3;
}; @@ -448,7 +448,7 @@ union codeview_reftype { unsigned short int len; unsigned short int id; - unsigned char list[1]; + unsigned char list[]; } fieldlist;
struct @@ -474,7 +474,7 @@ union codeview_reftype unsigned short int len; unsigned short int id; unsigned short num; - cv_typ16_t args[1]; + cv_typ16_t args[]; } arglist_v1;
struct @@ -482,7 +482,7 @@ union codeview_reftype unsigned short int len; unsigned short int id; unsigned num; - cv_typ_t args[1]; + cv_typ_t args[]; } arglist_v2;
struct @@ -490,7 +490,7 @@ union codeview_reftype unsigned short int len; unsigned short int id; unsigned short num; - cv_typ16_t drvdcls[1]; + cv_typ16_t drvdcls[]; } derived_v1;
struct @@ -498,7 +498,7 @@ union codeview_reftype unsigned short int len; unsigned short int id; unsigned num; - cv_typ_t drvdcls[1]; + cv_typ_t drvdcls[]; } derived_v2;
struct @@ -509,7 +509,7 @@ union codeview_reftype cv_typ_t baseVftable; unsigned offsetInObjectLayout; unsigned cbstr; - char names[1]; /* array of len 0-terminated strings (size of cbstr in char:s) */ + char names[]; /* array of len 0-terminated strings (size of cbstr in char:s) */ } vftable_v3; };
@@ -600,7 +600,7 @@ union codeview_fieldtype unsigned short int id; short int _pad0; cv_typ_t type; - char name[1]; + char name[]; } friendfcn_v3;
struct @@ -658,7 +658,7 @@ union codeview_fieldtype unsigned short int id; short int attribute; cv_typ_t type; - char name[1]; + char name[]; } stmember_v3;
struct @@ -682,7 +682,7 @@ union codeview_fieldtype unsigned short int id; short int count; cv_typ_t mlist; - char name[1]; + char name[]; } method_v3;
struct @@ -705,7 +705,7 @@ union codeview_fieldtype unsigned short int id; short int _pad0; cv_typ_t type; - char name[1]; + char name[]; } nesttype_v3;
struct @@ -755,7 +755,7 @@ union codeview_fieldtype unsigned short int id; short int attribute; cv_typ_t type; - char name[1]; + char name[]; } onemethod_v3;
struct @@ -782,7 +782,7 @@ union codeview_fieldtype short int attribute; cv_typ_t type; unsigned int vtab_offset; - char name[1]; + char name[]; } onemethod_virt_v3;
struct @@ -1426,7 +1426,7 @@ union codeview_symbol cv_typ_t symtype; unsigned int offset; unsigned short segment; - char name[1]; + char name[]; } data_v3;
struct @@ -1454,7 +1454,7 @@ union codeview_symbol unsigned short segment; unsigned short thunk_len; unsigned char thtype; - char name[1]; + char name[]; } thunk_v3;
struct @@ -1505,7 +1505,7 @@ union codeview_symbol unsigned int offset; unsigned short segment; unsigned char flags; - char name[1]; + char name[]; } proc_v3;
struct @@ -1535,7 +1535,7 @@ union codeview_symbol unsigned int pubsymflags; unsigned int offset; unsigned short segment; - char name[1]; + char name[]; } public_v3;
struct @@ -1562,7 +1562,7 @@ union codeview_symbol unsigned short int id; /* Always S_BPREL32 */ int offset; /* Stack offset relative to BP */ cv_typ_t symtype; - char name[1]; + char name[]; } stack_v3;
struct @@ -1572,7 +1572,7 @@ union codeview_symbol int offset; /* Stack offset relative to BP */ cv_typ_t symtype; unsigned short reg; - char name[1]; + char name[]; } regrel_v3;
struct @@ -1601,7 +1601,7 @@ union codeview_symbol unsigned short int id; /* Always S_REGISTER */ cv_typ_t type; /* check whether type & reg are correct */ unsigned short reg; - char name[1]; + char name[]; /* don't handle register tracking */ } register_v3;
@@ -1626,7 +1626,7 @@ union codeview_symbol unsigned int length; unsigned int offset; unsigned short segment; - char name[1]; + char name[]; } block_v3;
struct @@ -1658,7 +1658,7 @@ union codeview_symbol unsigned int offset; unsigned short segment; unsigned char flags; - char name[1]; + char name[]; } label_v3;
struct @@ -1715,7 +1715,7 @@ union codeview_symbol unsigned short int len; unsigned short int id; cv_typ_t type; - char name[1]; + char name[]; } udt_v3;
struct @@ -1731,7 +1731,7 @@ union codeview_symbol unsigned short int len; unsigned short int id; unsigned signature; - char name[1]; + char name[]; } objname_v3;
struct @@ -1783,7 +1783,7 @@ union codeview_symbol unsigned short be_major; unsigned short be_minor; unsigned short be_build; - char name[1]; + char name[]; } compile2_v3;
struct @@ -1804,7 +1804,7 @@ union codeview_symbol unsigned short be_minor; unsigned short be_build; unsigned short be_qfe; - char name[1]; + char name[]; } compile3_v3;
struct @@ -1834,7 +1834,7 @@ union codeview_symbol cv_typ_t symtype; unsigned int offset; unsigned short segment; - char name[1]; + char name[]; } thread_v3;
struct @@ -1844,7 +1844,7 @@ union codeview_symbol unsigned int sumName; unsigned int ibSym; unsigned short imod; - char name[1]; + char name[]; } refsym2_v3;
struct @@ -1892,7 +1892,7 @@ union codeview_symbol unsigned short int id; cv_typ_t symtype; struct cv_local_varflag varflags; - char name[1]; + char name[]; } local_v3;
struct @@ -2021,7 +2021,7 @@ union codeview_symbol cv_typ_t typind; unsigned int modOffset; struct cv_local_varflag varflags; - char name[1]; + char name[]; } file_static_v3;
struct @@ -2035,7 +2035,7 @@ union codeview_symbol { unsigned short int len; unsigned short int id; - char name[1]; + char name[]; } unamespace_v3;
struct @@ -2059,7 +2059,7 @@ union codeview_symbol unsigned int off; unsigned short int seg; unsigned short int csz; /* number of bytes in following array */ - char rgsz[1]; /* array of null terminated strings (bounded by csz) */ + char rgsz[]; /* array of null terminated strings (bounded by csz) */ } annotation_v3;
struct @@ -2389,7 +2389,7 @@ struct PDB_JG_HEADER unsigned short free_list_block; unsigned short total_alloc; struct PDB_JG_STREAM toc; - unsigned short toc_block[1]; + unsigned short toc_block[]; };
struct PDB_DS_HEADER @@ -2406,13 +2406,13 @@ struct PDB_DS_HEADER struct PDB_JG_TOC { unsigned int num_streams; - struct PDB_JG_STREAM streams[1]; + struct PDB_JG_STREAM streams[]; };
struct PDB_DS_TOC { unsigned int num_streams; - unsigned int stream_size[1]; + unsigned int stream_size[]; };
struct PDB_JG_ROOT @@ -2421,7 +2421,7 @@ struct PDB_JG_ROOT unsigned int TimeDateStamp; unsigned int Age; unsigned int cbNames; - char names[1]; + char names[]; };
struct PDB_DS_ROOT @@ -2431,7 +2431,7 @@ struct PDB_DS_ROOT unsigned int Age; GUID guid; unsigned int cbNames; - char names[1]; + char names[]; };
typedef struct _PDB_TYPES_OLD @@ -2498,7 +2498,7 @@ typedef struct _PDB_SYMBOL_FILE unsigned int lineno2_size; unsigned int nSrcFiles; unsigned int attribute; - char filename[1]; + char filename[]; } PDB_SYMBOL_FILE, *PPDB_SYMBOL_FILE;
typedef struct _PDB_SYMBOL_FILE_EX @@ -2513,14 +2513,14 @@ typedef struct _PDB_SYMBOL_FILE_EX unsigned int nSrcFiles; unsigned int attribute; unsigned int reserved[2]; - char filename[1]; + char filename[]; } PDB_SYMBOL_FILE_EX, *PPDB_SYMBOL_FILE_EX;
typedef struct _PDB_SYMBOL_SOURCE { unsigned short nModules; unsigned short nSrcFiles; - unsigned short table[1]; + unsigned short table[]; } PDB_SYMBOL_SOURCE, *PPDB_SYMBOL_SOURCE;
typedef struct _PDB_SYMBOL_IMPORT @@ -2529,7 +2529,7 @@ typedef struct _PDB_SYMBOL_IMPORT unsigned int unknown2; unsigned int TimeDateStamp; unsigned int Age; - char filename[1]; + char filename[]; } PDB_SYMBOL_IMPORT, *PPDB_SYMBOL_IMPORT;
typedef struct _PDB_SYMBOLS_OLD @@ -2683,7 +2683,7 @@ typedef struct OMFSignatureRSDS char Signature[4]; GUID guid; unsigned int age; - char name[1]; + char name[]; } OMFSignatureRSDS;
typedef struct _CODEVIEW_PDB_DATA @@ -2692,7 +2692,7 @@ typedef struct _CODEVIEW_PDB_DATA int filepos; unsigned int timestamp; unsigned int age; - char name[1]; + char name[]; } CODEVIEW_PDB_DATA, *PCODEVIEW_PDB_DATA;
typedef struct OMFDirHeader