system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-03 01:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

widl: Create library block index right after the CompObj one.

Browse source 
Otherwise Wine's oleaut32 refuses to load a typelib.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
This commit is contained in:
Dmitry Timoshkov 2016-01-20 13:26:49 +08:00 committed by Alexandre Julliard
parent 62223ed995
commit 918425bbe9
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
tools/widl/write_sltg.c
View file

@ -354,28 +354,37 @@ static void init_library(struct sltg_typelib *sltg)
}
}
static void add_block(struct sltg_typelib *sltg, void *data, int length, const char *name)
static void add_block_index(struct sltg_typelib *sltg, void *data, int length, int index)
{
chat("add_block: %p,%d,\"%s\"\n", data, length, name);
sltg->blocks = xrealloc(sltg->blocks, sizeof(sltg->blocks[0]) * (sltg->block_count + 1));
sltg->blocks[sltg->block_count].length = length;
sltg->blocks[sltg->block_count].data = data;
sltg->blocks[sltg->block_count].index_string = add_index(&sltg->index, name);
sltg->blocks[sltg->block_count].index_string = index;
sltg->block_count++;
}
static void add_library_block(struct sltg_typelib *typelib)
static void add_block(struct sltg_typelib *sltg, void *data, int size, const char *name)
{
struct sltg_block *block = xmalloc(sizeof(*block));
int index;
chat("add_block: %p,%d,\"%s\"\n", data, size, name);
index = add_index(&sltg->index, name);
add_block_index(sltg, data, size, index);
}
static void *create_library_block(struct sltg_typelib *typelib, int *size, int *index)
{
void *block;
short *p;
int size;
size = sizeof(short) * 9 + sizeof(int) * 3 + sizeof(GUID);
if (typelib->library.helpstring) size += strlen(typelib->library.helpstring);
if (typelib->library.helpfile) size += strlen(typelib->library.helpfile);
*size = sizeof(short) * 9 + sizeof(int) * 3 + sizeof(GUID);
if (typelib->library.helpstring) *size += strlen(typelib->library.helpstring);
if (typelib->library.helpfile) *size += strlen(typelib->library.helpfile);
block = xmalloc(size);
block = xmalloc(*size);
p = block;
*p++ = 0x51cc; /* magic */
*p++ = 3; /* res02 */
@ -408,7 +417,9 @@ static void add_library_block(struct sltg_typelib *typelib)
p += 2;
*(GUID *)p = typelib->library.uuid;
add_block(typelib, block, size, "dir");
*index = add_index(&typelib->index, "dir");
return block;
}
static const char *new_index_name(void)
@ -1687,6 +1698,8 @@ int create_sltg_typelib(typelib_t *typelib)
{
struct sltg_typelib sltg;
const statement_t *stmt;
void *library_block;
int library_block_size, library_block_index;
if (pointer_size != 4)
error("Only 32-bit platform is supported\n");
@ -1703,12 +1716,14 @@ int create_sltg_typelib(typelib_t *typelib)
init_name_table(&sltg.name_table);
init_library(&sltg);
add_library_block(&sltg);
library_block = create_library_block(&sltg, &library_block_size, &library_block_index);
if (typelib->stmts)
LIST_FOR_EACH_ENTRY(stmt, typelib->stmts, const statement_t, entry)
add_statement(&sltg, stmt);
add_block_index(&sltg, library_block, library_block_size, library_block_index);
save_all_changes(&sltg);
return 1;