September 2006 - Wine-Commits

Mike McCormack : msi: Use a binary search to find sql keywords.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: f9042ec9e8436f5b1614e6e9c518a8b7cd192d3d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9042ec9e8436f5b1614e6e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 30 20:07:44 2006 +0900 msi: Use a binary search to find sql keywords. --- dlls/msi/tokenize.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index fe13983..37c6b4a 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -39,6 +39,8 @@ struct Keyword { int tokenType; /* The token value for this keyword */ }; +#define MAX_TOKEN_LEN 11 + static const WCHAR ABORT_W[] = { 'A','B','O','R','T',0 }; static const WCHAR AFTER_W[] = { 'A','F','T','E','R',0 }; static const WCHAR ALTER_W[] = { 'A','L','T','E','R',0 }; @@ -264,20 +266,33 @@ static const Keyword aKeywordTable[] = { #define KEYWORD_COUNT ( sizeof aKeywordTable/sizeof (Keyword) ) /* +** Comparison function for binary search. +*/ +static int compKeyword(const void *m1, const void *m2){ + const Keyword *k1 = m1, *k2 = m2; + + return strcmpiW( k1->zName, k2->zName ); +} + +/* ** This function looks up an identifier to determine if it is a ** keyword. If it is a keyword, the token code of that keyword is ** returned. If the input is not a keyword, TK_ID is returned. */ static int sqliteKeywordCode(const WCHAR *z, int n){ - UINT i; + WCHAR str[MAX_TOKEN_LEN+1]; + Keyword key, *r; - for(i=0; i<KEYWORD_COUNT; i++) - { - if(strncmpiW(z, aKeywordTable[i].zName, n)) - continue; - if(lstrlenW(aKeywordTable[i].zName) == n ) - return aKeywordTable[i].tokenType; - } + if( n>MAX_TOKEN_LEN ) + return TK_ID; + + memcpy( str, z, n*sizeof (WCHAR) ); + str[n] = 0; + key.tokenType = 0; + key.zName = str; + r = bsearch( &key, aKeywordTable, KEYWORD_COUNT, sizeof (Keyword), compKeyword ); + if( r ) + return r->tokenType; return TK_ID; }

1 0

Mike McCormack : ddraw: Make tests pass when OpenGL libraries aren' t present.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: a8ae03f2d8d577b9436e966131545e4caa4364ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8ae03f2d8d577b9436e966… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 30 12:56:32 2006 +0900 ddraw: Make tests pass when OpenGL libraries aren't present. --- dlls/ddraw/main.c | 4 +++- dlls/ddraw/tests/ddrawmodes.c | 12 +++++++++--- dlls/ddraw/tests/dsurface.c | 13 ++++++++++--- dlls/ddraw/tests/refcount.c | 2 +- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 8aab95c..bdb8b31 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -96,6 +96,8 @@ DDRAW_Create(GUID *guid, TRACE("(%s,%p,%p)\n", debugstr_guid(guid), DD, UnkOuter); + *DD = NULL; + /* We don't care about this guids. Well, there's no special guid anyway * OK, we could */ @@ -164,7 +166,7 @@ DDRAW_Create(GUID *guid, if (!hWineD3D) { ERR("Couldn't load WineD3D - OpenGL libs not present?\n"); - hr = E_NOTIMPL; + hr = DDERR_NODIRECTDRAWSUPPORT; goto err_out; } diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 8890df9..4b2bf17 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -59,12 +59,17 @@ static void createwindow(void) } -static void createdirectdraw(void) +static BOOL createdirectdraw(void) { HRESULT rc; rc = DirectDrawCreate(NULL, &lpDD, NULL); - ok(rc==DD_OK,"DirectDrawCreate returned: %lx\n",rc); + ok(rc==DD_OK || rc==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %lx\n", rc); + if (!lpDD) { + trace("DirectDrawCreateEx() failed with an error %lx\n", rc); + return FALSE; + } + return TRUE; } @@ -319,7 +324,8 @@ static void testcooperativelevels_exclus START_TEST(ddrawmodes) { createwindow(); - createdirectdraw(); + if (!createdirectdraw()) + return; enumdisplaymodes(); testdisplaymodes(); flushdisplaymodes(); diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 24555c3..192a202 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -26,15 +26,21 @@ #include "ddraw.h" static LPDIRECTDRAW lpDD = NULL; -static void CreateDirectDraw(void) +static BOOL CreateDirectDraw(void) { HRESULT rc; rc = DirectDrawCreate(NULL, &lpDD, NULL); - ok(rc==DD_OK,"DirectDrawCreate returned: %lx\n",rc); + ok(rc==DD_OK || rc==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %lx\n", rc); + if (!lpDD) { + trace("DirectDrawCreateEx() failed with an error %lx\n", rc); + return FALSE; + } rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL); ok(rc==DD_OK,"SetCooperativeLevel returned: %lx\n",rc); + + return TRUE; } @@ -250,7 +256,8 @@ static void QueryInterface(void) START_TEST(dsurface) { - CreateDirectDraw(); + if (!CreateDirectDraw()) + return; MipMapCreationTest(); SrcColorKey32BlitTest(); QueryInterface(); diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index c80c822..1e224c0 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -304,7 +304,7 @@ static void test_d3d_ifaces(void) long ref; hr = DirectDrawCreate(NULL, &DDraw1, NULL); - ok(hr == DD_OK, "DirectDrawCreate returned %08lx\n", hr); + ok(hr == DD_OK || hr==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %lx\n", hr); if(!DDraw1) { trace("DirectDrawCreate failed with %08lx\n", hr);

1 0

Robert Reif : advapi32: Fix lsa tests on windows98.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: c339d8e2723e18761ce676ece77ad0a5e9bf1af0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c339d8e2723e18761ce676e… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Aug 29 19:34:31 2006 -0400 advapi32: Fix lsa tests on windows98. --- dlls/advapi32/tests/lsa.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 78cd57f..6b90455 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -40,6 +40,7 @@ static NTSTATUS (WINAPI *pLsaClose)(LSA_ static NTSTATUS (WINAPI *pLsaFreeMemory)(PVOID); static NTSTATUS (WINAPI *pLsaOpenPolicy)(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,ACCESS_MASK,PLSA_HANDLE); static NTSTATUS (WINAPI *pLsaQueryInformationPolicy)(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*); +static BOOL (WINAPI *pConvertSidToStringSidA)(PSID pSid, LPSTR *str); static BOOL init(void) { @@ -50,8 +51,9 @@ static BOOL init(void) pLsaFreeMemory = (void*)GetProcAddress(hadvapi32, "LsaFreeMemory"); pLsaOpenPolicy = (void*)GetProcAddress(hadvapi32, "LsaOpenPolicy"); pLsaQueryInformationPolicy = (void*)GetProcAddress(hadvapi32, "LsaQueryInformationPolicy"); + pConvertSidToStringSidA = (void*)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); - if (pLsaClose && pLsaFreeMemory && pLsaOpenPolicy && pLsaQueryInformationPolicy) + if (pLsaClose && pLsaFreeMemory && pLsaOpenPolicy && pLsaQueryInformationPolicy && pConvertSidToStringSidA) return TRUE; } @@ -96,7 +98,7 @@ static void test_lsa(void) ok(primary_domain_info->Sid==0,"Sid should be NULL on the local computer\n"); if (primary_domain_info->Sid) { LPSTR strsid; - if (ConvertSidToStringSidA(primary_domain_info->Sid, &strsid)) + if (pConvertSidToStringSidA(primary_domain_info->Sid, &strsid)) { if (primary_domain_info->Name.Buffer) { LPSTR name = NULL; @@ -138,7 +140,7 @@ static void test_lsa(void) WCHAR guidstrW[64]; UINT len; guidstrW[0] = '\0'; - ConvertSidToStringSidA(dns_domain_info->Sid, &strsid); + pConvertSidToStringSidA(dns_domain_info->Sid, &strsid); StringFromGUID2(&dns_domain_info->DomainGuid, guidstrW, sizeof(guidstrW)/sizeof(WCHAR)); len = WideCharToMultiByte( CP_ACP, 0, guidstrW, -1, NULL, 0, NULL, NULL ); guidstr = LocalAlloc( 0, len );

1 0

Dan Hipschman : widl: Generate an error for "int f(void a)".
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 1687a5d1db2c0bcd3f7155c6195d500b7959010b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1687a5d1db2c0bcd3f7155c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 29 14:29:06 2006 -0700 widl: Generate an error for "int f(void a)". --- tools/widl/parser.y | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 0121bca..8cbddcd 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -106,6 +106,7 @@ static void write_iid(type_t *iface); static int compute_method_indexes(type_t *iface); static char *gen_name(void); static void process_typedefs(var_t *names); +static void check_arg(var_t *arg); #define tsENUM 1 #define tsSTRUCT 2 @@ -319,8 +320,8 @@ m_args: { $$ = NULL; } no_args: tVOID { $$ = NULL; } ; -args: arg - | args ',' arg { LINK($3, $1); $$ = $3; } +args: arg { check_arg($1); $$ = $1; } + | args ',' arg { check_arg($3); LINK($3, $1); $$ = $3; } | no_args ; @@ -1678,3 +1679,11 @@ static void process_typedefs(var_t *name names = next; } } + +static void check_arg(var_t *arg) +{ + type_t *t = arg->type; + + if (t->type == 0 && ! is_var_ptr(arg)) + yyerror("argument '%s' has void type", arg->name); +}

1 0

Dan Hipschman : widl: Print pointers more aesthetically in generated header .
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 7e79e9d4fff058d95e45ed16fe514b20b54c4884 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e79e9d4fff058d95e45ed1… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 29 14:28:05 2006 -0700 widl: Print pointers more aesthetically in generated header. --- tools/widl/header.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 5de43c0..168f4c6 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -199,6 +199,11 @@ static void write_enums(FILE *h, var_t * fprintf(h, "\n"); } +int needs_space_after(type_t *t) +{ + return t->kind == TKIND_ALIAS || ! is_ptr(t); +} + void write_type(FILE *h, type_t *t, const var_t *v, const char *n) { int c; @@ -259,7 +264,7 @@ void write_type(FILE *h, type_t *t, cons case RPC_FC_FP: case RPC_FC_OP: if (t->ref) write_type(h, t->ref, NULL, t->name); - fprintf(h, "*"); + fprintf(h, "%s*", needs_space_after(t->ref) ? " " : ""); break; default: fprintf(h, "%s", t->name); @@ -338,7 +343,7 @@ void write_typedef(type_t *type) { fprintf(header, "typedef "); write_type(header, type->orig, NULL, NULL); - fprintf(header, " %s;\n", type->name); + fprintf(header, "%s%s;\n", needs_space_after(type->orig) ? " " : "", type->name); } void write_expr(FILE *h, const expr_t *e, int brackets) @@ -585,7 +590,8 @@ void write_args(FILE *h, var_t *arg, con } else { - fprintf(h, " "); + if (needs_space_after(arg->type)) + fprintf(h, " "); write_name(h, arg); } write_array(h, arg->array, 0);

1 0

Dan Hipschman : widl: Add an is_ptr function.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 929a75989594cbc5e47772b36d89def30a5546e7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=929a75989594cbc5e47772b… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 29 14:27:27 2006 -0700 widl: Add an is_ptr function. --- tools/widl/client.c | 2 +- tools/widl/parser.y | 2 +- tools/widl/proxy.c | 20 +++----------------- tools/widl/typelib.c | 11 +++++++++++ tools/widl/widltypes.h | 3 ++- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 64cf8c5..a0b0f25 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -91,7 +91,7 @@ static void check_pointers(const func_t while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - if (is_pointer(var) && cant_be_null(var)) + if (is_var_ptr(var) && cant_be_null(var)) { print_client("if (!%s)\n", var->name); print_client("{\n"); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 08937d2..0121bca 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1342,7 +1342,7 @@ static type_t *reg_typedefs(type_t *type } cur = alias(cur, names->name); cur->attrs = attrs; - if (cur->ref) + if (is_ptr(cur)) cur->type = get_pointer_type(cur); reg_type(cur, cur->name, 0); } diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 2c4fa10..cb2b2a9 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -128,23 +128,9 @@ static void clear_output_vars( var_t *ar } } -int is_pointer(var_t *arg) +int is_var_ptr(var_t *v) { - if (arg->ptr_level) - return 1; - - switch (ref_type(arg->type)) - { - case RPC_FC_RP: - case RPC_FC_C_CSTRING: - case RPC_FC_C_WSTRING: - case RPC_FC_FP: - case RPC_FC_OP: - case RPC_FC_UP: - return 1; - } - - return 0; + return v->ptr_level || is_ptr(v->type); } int cant_be_null(var_t *v) @@ -213,7 +199,7 @@ static void proxy_check_pointers( var_t { END_OF_LIST(arg); while (arg) { - if (is_pointer(arg) && cant_be_null(arg)) { + if (is_var_ptr(arg) && cant_be_null(arg)) { print_proxy( "if(!%s)\n", arg->name ); indent++; print_proxy( "RpcRaiseException(RPC_X_NULL_REF_POINTER);\n"); diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index b91ca28..adf9870 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -73,6 +73,17 @@ type_t *alias(type_t *t, const char *nam return a; } +int is_ptr(type_t *t) +{ + unsigned char c = t->type; + return c == RPC_FC_RP + || c == RPC_FC_UP + || c == RPC_FC_FP + || c == RPC_FC_OP + || c == RPC_FC_C_CSTRING + || c == RPC_FC_C_WSTRING; +} + /* List of oleauto types that should be recognized by name. * (most of) these seem to be intrinsic types in mktyplib. */ diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 1c919ce..54c67e2 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -297,7 +297,8 @@ type_t *alias(type_t *t, const char *nam /* Get the actual type field for a type (chase down typedef references). */ unsigned char ref_type(const type_t *type); -int is_pointer(var_t *v); +int is_ptr(type_t *t); +int is_var_ptr(var_t *v); int cant_be_null(var_t *v); #endif

1 0

Dan Hipschman : widl: Factor the entry_t structure.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: aadc90b2668ea641d4ed7dfba2b9f24f125f73b1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aadc90b2668ea641d4ed7df… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 29 14:26:43 2006 -0700 widl: Factor the entry_t structure. --- tools/widl/parser.y | 18 ++++++----- tools/widl/typelib.c | 74 ++--------------------------------------------- tools/widl/typelib.h | 7 +--- tools/widl/widltypes.h | 10 +----- tools/widl/write_msft.c | 17 ++++++----- 5 files changed, 23 insertions(+), 103 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 352837e..08937d2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -253,24 +253,24 @@ gbl_statements: { $$ = NULL; } if (!parse_only && do_header) write_coclass_forward($2); } | gbl_statements coclassdef { $$ = $1; - add_coclass($2); + add_typelib_entry($2); reg_type($2, $2->name, 0); if (!parse_only && do_header) write_coclass_forward($2); } - | gbl_statements moduledef { $$ = $1; add_module($2); } + | gbl_statements moduledef { $$ = $1; add_typelib_entry($2); } | gbl_statements librarydef { $$ = $1; } | gbl_statements statement { $$ = $1; } ; imp_statements: {} - | imp_statements interfacedec { if (!parse_only) add_interface($2); } - | imp_statements interfacedef { if (!parse_only) add_interface($2); } + | imp_statements interfacedec { if (!parse_only) add_typelib_entry($2); } + | imp_statements interfacedef { if (!parse_only) add_typelib_entry($2); } | imp_statements coclass ';' { reg_type($2, $2->name, 0); if (!parse_only && do_header) write_coclass_forward($2); } - | imp_statements coclassdef { if (!parse_only) add_coclass($2); + | imp_statements coclassdef { if (!parse_only) add_typelib_entry($2); reg_type($2, $2->name, 0); if (!parse_only && do_header) write_coclass_forward($2); } - | imp_statements moduledef { if (!parse_only) add_module($2); } + | imp_statements moduledef { if (!parse_only) add_typelib_entry($2); } | imp_statements statement {} | imp_statements importlib {} ; @@ -501,7 +501,7 @@ enumdef: tENUM t_ident '{' enums '}' { $$->fields = $4; $$->defined = TRUE; if(in_typelib) - add_enum($$); + add_typelib_entry($$); } ; @@ -808,7 +808,7 @@ structdef: tSTRUCT t_ident '{' fields '} $$->fields = $4; $$->defined = TRUE; if(in_typelib) - add_struct($$); + add_typelib_entry($$); } ; @@ -1672,7 +1672,7 @@ static void process_typedefs(var_t *name if (! parse_only && do_header) write_typedef(type); if (in_typelib && type->attrs) - add_typedef(type); + add_typelib_entry(type); free(names); names = next; diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 3717f8a..b91ca28 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -234,86 +234,18 @@ void end_typelib(void) return; } -void add_interface(type_t *iface) +void add_typelib_entry(type_t *t) { typelib_entry_t *entry; if (!typelib) return; - chat("add interface: %s\n", iface->name); + chat("add kind %i: %s\n", t->kind, t->name); entry = xmalloc(sizeof(*entry)); - entry->kind = TKIND_INTERFACE; - entry->u.interface = iface; + entry->type = t; LINK(entry, typelib->entry); typelib->entry = entry; } -void add_coclass(type_t *cls) -{ - typelib_entry_t *entry; - - if (!typelib) return; - - chat("add coclass: %s\n", cls->name); - - entry = xmalloc(sizeof(*entry)); - entry->kind = TKIND_COCLASS; - entry->u.class = cls; - LINK(entry, typelib->entry); - typelib->entry = entry; -} - -void add_module(type_t *module) -{ - typelib_entry_t *entry; - if (!typelib) return; - - chat("add module: %s\n", module->name); - entry = xmalloc(sizeof(*entry)); - entry->kind = TKIND_MODULE; - entry->u.module = module; - LINK(entry, typelib->entry); - typelib->entry = entry; -} - -void add_struct(type_t *structure) -{ - typelib_entry_t *entry; - if (!typelib) return; - - chat("add struct: %s\n", structure->name); - entry = xmalloc(sizeof(*entry)); - entry->kind = TKIND_RECORD; - entry->u.structure = structure; - LINK(entry, typelib->entry); - typelib->entry = entry; -} - -void add_enum(type_t *enumeration) -{ - typelib_entry_t *entry; - if (!typelib) return; - - chat("add enum: %s\n", enumeration->name); - entry = xmalloc(sizeof(*entry)); - entry->kind = TKIND_ENUM; - entry->u.enumeration = enumeration; - LINK(entry, typelib->entry); - typelib->entry = entry; -} - -void add_typedef(type_t *tdef) -{ - typelib_entry_t *entry; - if (!typelib) return; - - chat("add typedef: %s\n", tdef->name); - entry = xmalloc(sizeof(*entry)); - entry->kind = TKIND_ALIAS; - entry->u.tdef = tdef; - LINK(entry, typelib->entry); - typelib->entry = entry; -} - static void tlb_read(int fd, void *buf, size_t count) { if(read(fd, buf, count) < count) diff --git a/tools/widl/typelib.h b/tools/widl/typelib.h index 688f611..78825ad 100644 --- a/tools/widl/typelib.h +++ b/tools/widl/typelib.h @@ -24,12 +24,7 @@ #define __WIDL_TYPELIB_H extern int in_typelib; extern void start_typelib(char *name, attr_t *attrs); extern void end_typelib(void); -extern void add_interface(type_t *iface); -extern void add_coclass(type_t *cls); -extern void add_module(type_t *module); -extern void add_struct(type_t *structure); -extern void add_enum(type_t *enumeration); -extern void add_typedef(type_t *tdef); +extern void add_typelib_entry(type_t *t); extern void add_importlib(const char *name); /* Copied from wtypes.h. Not included directly because that would create a diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index e75db75..1c919ce 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -253,15 +253,7 @@ struct _ifref_t { }; struct _typelib_entry_t { - enum type_kind kind; - union { - type_t *class; - type_t *interface; - type_t *module; - type_t *structure; - type_t *enumeration; - type_t *tdef; - } u; + type_t *type; DECL_LINK(typelib_entry_t); }; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 6530483..0530214 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2180,33 +2180,34 @@ static void add_module_typeinfo(msft_typ static void add_entry(msft_typelib_t *typelib, typelib_entry_t *entry) { - switch(entry->kind) { + switch(entry->type->kind) { case TKIND_INTERFACE: - add_interface_typeinfo(typelib, entry->u.interface); + case TKIND_DISPATCH: + add_interface_typeinfo(typelib, entry->type); break; case TKIND_RECORD: - add_structure_typeinfo(typelib, entry->u.structure); + add_structure_typeinfo(typelib, entry->type); break; case TKIND_ENUM: - add_enum_typeinfo(typelib, entry->u.enumeration); + add_enum_typeinfo(typelib, entry->type); break; case TKIND_ALIAS: - add_typedef_typeinfo(typelib, entry->u.tdef); + add_typedef_typeinfo(typelib, entry->type); break; case TKIND_COCLASS: - add_coclass_typeinfo(typelib, entry->u.class); + add_coclass_typeinfo(typelib, entry->type); break; case TKIND_MODULE: - add_module_typeinfo(typelib, entry->u.module); + add_module_typeinfo(typelib, entry->type); break; default: - error("add_entry: unhandled type %d\n", entry->kind); + error("add_entry: unhandled type %d\n", entry->type->kind); break; } }

1 0

Dan Hipschman : widl: Use type_t for typedefs, not var_t. Simplify representation.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: c117a20cdb5ffbe04fd334bd7139fdb9dd60978a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c117a20cdb5ffbe04fd334b… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 29 14:26:03 2006 -0700 widl: Use type_t for typedefs, not var_t. Simplify representation. --- tools/widl/header.c | 45 ++++++------------------ tools/widl/header.h | 2 + tools/widl/parser.y | 88 +++++++++++++++++++++++++++++++---------------- tools/widl/typelib.c | 16 ++++----- tools/widl/typelib.h | 2 + tools/widl/widltypes.h | 2 + tools/widl/write_msft.c | 19 +++++----- 7 files changed, 90 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c117a20cdb5ffbe04fd…

1 0

Dan Hipschman : widl: Generate names for tagless structs, unions and enums.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 59cfad37aab59d307383f828d1ca79275efad453 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=59cfad37aab59d307383f82… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 29 14:25:19 2006 -0700 widl: Generate names for tagless structs, unions and enums. --- tools/widl/parser.y | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ead02cb..d70cc04 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -104,6 +104,7 @@ static void write_diid(type_t *iface); static void write_iid(type_t *iface); static int compute_method_indexes(type_t *iface); +static char *gen_name(void); #define tsENUM 1 #define tsSTRUCT 2 @@ -824,9 +825,19 @@ type: tVOID { $$ = make_tref(NULL, ; typedef: tTYPEDEF m_attributes type pident_list { typeref_t *tref = uniq_tref($3); + type_t *t; $4->tname = tref->name; tref->name = NULL; $$ = type_ref(tref); + t = $$->ref; + if ((t->kind == TKIND_ENUM || t->kind == TKIND_RECORD + || t->kind == TKIND_UNION) && ! t->name && ! parse_only) + { + attr_t *a = make_attr(ATTR_PUBLIC); + LINK(a, $2); + $2 = a; + t->name = gen_name(); + } $$->attrs = $2; if (!parse_only && do_header) write_typedef($$, $4); @@ -1614,3 +1625,28 @@ static int compute_method_indexes(type_t return idx; } + +static char *gen_name(void) +{ + static const char format[] = "__WIDL_%s_generated_name_%08lX"; + static unsigned long n = 0; + static const char *file_id; + static size_t size; + char *name; + + if (! file_id) + { + char *dst = dup_basename(input_name, ".idl"); + file_id = dst; + + for (; *dst; ++dst) + if (! isalnum((unsigned char) *dst)) + *dst = '_'; + + size = sizeof format - 7 + strlen(file_id) + 8; + } + + name = xmalloc(size); + sprintf(name, format, file_id, n++); + return name; +}

1 0

Robert Shearman : rpcrt4: Make the reference counting in the standard proxy thread-safe.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: ada61620de93a6e75ac499224ddbb23e20c88333 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ada61620de93a6e75ac4992… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Aug 29 21:16:44 2006 +0100 rpcrt4: Make the reference counting in the standard proxy thread-safe. --- dlls/rpcrt4/cproxy.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 70f0556..280dbe1 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -44,7 +44,7 @@ struct StublessThunk; typedef struct { const IRpcProxyBufferVtbl *lpVtbl; LPVOID *PVtbl; - DWORD RefCount; + LONG RefCount; const MIDL_STUBLESS_PROXY_INFO *stubless; const IID* piid; LPUNKNOWN pUnkOuter; @@ -222,13 +222,13 @@ static HRESULT WINAPI StdProxy_QueryInte if (IsEqualGUID(&IID_IUnknown,riid) || IsEqualGUID(This->piid,riid)) { *obj = &This->PVtbl; - This->RefCount++; + InterlockedIncrement(&This->RefCount); return S_OK; } if (IsEqualGUID(&IID_IRpcProxyBuffer,riid)) { *obj = &This->lpVtbl; - This->RefCount++; + InterlockedIncrement(&This->RefCount); return S_OK; } @@ -240,19 +240,19 @@ static ULONG WINAPI StdProxy_AddRef(LPRP ICOM_THIS_MULTI(StdProxyImpl,lpVtbl,iface); TRACE("(%p)->AddRef()\n",This); - return ++(This->RefCount); + return InterlockedIncrement(&This->RefCount); } static ULONG WINAPI StdProxy_Release(LPRPCPROXYBUFFER iface) { + ULONG refs; ICOM_THIS_MULTI(StdProxyImpl,lpVtbl,iface); TRACE("(%p)->Release()\n",This); - if (!--(This->RefCount)) { + refs = InterlockedDecrement(&This->RefCount); + if (!refs) StdProxy_Destruct((LPRPCPROXYBUFFER)&This->lpVtbl); - return 0; - } - return This->RefCount; + return refs; } static HRESULT WINAPI StdProxy_Connect(LPRPCPROXYBUFFER iface,

1 0