September 2006 - Wine-commits

Paul Vriens : wintrust: Implementation of WintrustAddActionID.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 3747f223377e47b56fcd4547cd549a4c41c455fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3747f223377e47b56fcd454… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Aug 31 16:37:19 2006 +0200 wintrust: Implementation of WintrustAddActionID. --- dlls/wintrust/register.c | 110 +++++++++++++++++++++++++++++++++++++++- dlls/wintrust/tests/register.c | 54 +++++++------------- include/wintrust.h | 1 3 files changed, 125 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3747f223377e47b56fc…

1 0

Dan Hipschman : widl: Handle more pointer types in get_struct_type.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 180ede5bfee6502a1950405d4cc17fe4941cf57c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=180ede5bfee6502a1950405… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Sep 1 16:34:14 2006 -0700 widl: Handle more pointer types in get_struct_type. --- tools/widl/parser.y | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4ceb6a2..12767c7 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1473,8 +1473,10 @@ static int get_struct_type(var_t *field) case RPC_FC_ENUM32: break; + case RPC_FC_RP: case RPC_FC_UP: case RPC_FC_FP: + case RPC_FC_OP: has_pointer = 1; break; case RPC_FC_CARRAY:

1 0

Dan Hipschman : widl: Sanity check string and pointer attrs. Don' t assign string as type.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: a407da47751912ff7ea4adad2e915c6357d0eb1a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a407da47751912ff7ea4ada… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Sep 1 16:35:49 2006 -0700 widl: Sanity check string and pointer attrs. Don't assign string as type. --- tools/widl/parser.y | 54 ++++++++++++++++++++++++++------------------------ tools/widl/proxy.c | 24 +++++++++++++++++----- tools/widl/typelib.c | 4 +--- 3 files changed, 47 insertions(+), 35 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 12767c7..63e4c6d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1285,29 +1285,26 @@ static type_t *reg_type(type_t *type, co return type; } -/* determine pointer type from attrs */ -static unsigned char get_pointer_type( type_t *type ) -{ - int t; - if (is_attr( type->attrs, ATTR_STRING )) - { - switch( type->ref->type ) - { - case RPC_FC_CHAR: - return RPC_FC_C_CSTRING; - case RPC_FC_WCHAR: - return RPC_FC_C_WSTRING; - } - } - t = get_attrv( type->attrs, ATTR_POINTERTYPE ); - if (t) return t; - return RPC_FC_FP; -} - static type_t *reg_typedefs(type_t *type, var_t *names, attr_t *attrs) { type_t *ptr = type; int ptrc = 0; + int is_str = is_attr(attrs, ATTR_STRING); + unsigned char ptr_type = get_attrv(attrs, ATTR_POINTERTYPE); + + if (is_str) + { + type_t *t = type; + unsigned char c; + + while (is_ptr(t)) + t = t->ref; + + c = t->type; + if (c != RPC_FC_CHAR && c != RPC_FC_BYTE && c != RPC_FC_WCHAR) + yyerror("'%s': [string] attribute is only valid on 'char', 'byte', or 'wchar_t' pointers and arrays", + names->name); + } /* We must generate names for tagless enum, struct or union. Typedef-ing a tagless enum, struct or union means we want the typedef @@ -1343,8 +1340,18 @@ static type_t *reg_typedefs(type_t *type } cur = alias(cur, names->name); cur->attrs = attrs; - if (is_ptr(cur)) - cur->type = get_pointer_type(cur); + if (ptr_type) + { + if (is_ptr(cur)) + cur->type = ptr_type; + else + yyerror("'%s': pointer attribute applied to non-pointer type", + cur->name); + } + else if (is_str && ! is_ptr(cur)) + yyerror("'%s': [string] attribute applied to non-pointer type", + cur->name); + reg_type(cur, cur->name, 0); } names = next; @@ -1485,11 +1492,6 @@ static int get_struct_type(var_t *field) yyerror("field '%s' deriving from a conformant array must be the last field in the structure", field->name); break; - case RPC_FC_C_CSTRING: - case RPC_FC_C_WSTRING: - has_conformance = 1; - has_variance = 1; - break; /* * Propagate member attributes diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 2022663..8d4d467 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -224,6 +224,12 @@ static void marshall_size_arg( var_t *ar return; } + if (is_string_type(arg->attrs, arg->ptr_level, arg->array)) + { + print_proxy("NdrConformantStringBufferSize( &_StubMsg, (unsigned char*)s, ", arg->name); + fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d] );\n", index); + } + switch( type->type ) { case RPC_FC_BYTE: @@ -249,8 +255,6 @@ static void marshall_size_arg( var_t *ar fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d] );\n", index ); break; - case RPC_FC_C_CSTRING: - case RPC_FC_C_WSTRING: case RPC_FC_CARRAY: print_proxy( "NdrConformantArrayBufferSize( &_StubMsg, (unsigned char*)%s, ", arg->name ); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index ); @@ -323,6 +327,12 @@ static void marshall_copy_arg( var_t *ar return; } + if (is_string_type(arg->attrs, arg->ptr_level, arg->array)) + { + print_proxy("NdrConformantStringMarshall( &_StubMsg, (unsigned char*)s, ", arg->name); + fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d] );\n", index); + } + switch( type->type ) { case RPC_FC_BYTE: @@ -348,8 +358,6 @@ static void marshall_copy_arg( var_t *ar fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index ); break; - case RPC_FC_C_CSTRING: - case RPC_FC_C_WSTRING: case RPC_FC_CARRAY: break; @@ -429,6 +437,12 @@ static void unmarshall_copy_arg( var_t * return; } + if (is_string_type(arg->attrs, arg->ptr_level, arg->array)) + { + print_proxy("NdrConformantStringUnmarshall( &_StubMsg, (unsigned char**)&s, ", arg->name); + fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], 0 );\n", index); + } + switch( type->type ) { case RPC_FC_BYTE: @@ -453,8 +467,6 @@ static void unmarshall_copy_arg( var_t * fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], 0);\n", index ); break; - case RPC_FC_C_CSTRING: - case RPC_FC_C_WSTRING: case RPC_FC_CARRAY: print_proxy( "NdrConformantArrayUnmarshall( &_StubMsg, (unsigned char**)&%s, ", arg->name ); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], 0);\n", index ); diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index adf9870..ae5cca8 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -79,9 +79,7 @@ int is_ptr(type_t *t) 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; + || c == RPC_FC_OP; } /* List of oleauto types that should be recognized by name.

1 0

Dan Hipschman : widl: Remove checks for typedefs that always fail.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 88820263c6ed440a0dcadefb6b1dd2316c20404a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88820263c6ed440a0dcadef… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Aug 29 17:19:21 2006 -0700 widl: Remove checks for typedefs that always fail. --- tools/widl/parser.y | 6 +---- tools/widl/proxy.c | 19 +++++------------ tools/widl/server.c | 2 -- tools/widl/typegen.c | 53 +++++++----------------------------------------- tools/widl/widltypes.h | 2 -- 5 files changed, 14 insertions(+), 68 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8cbddcd..4ceb6a2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1291,7 +1291,7 @@ static unsigned char get_pointer_type( t int t; if (is_attr( type->attrs, ATTR_STRING )) { - switch( ref_type( type ) ) + switch( type->ref->type ) { case RPC_FC_CHAR: return RPC_FC_C_CSTRING; @@ -1419,10 +1419,6 @@ static int get_struct_type(var_t *field) { type_t *t = field->type; - /* get the base type */ - while( (t->type == 0) && t->ref ) - t = t->ref; - if (field->ptr_level > 0) { has_pointer = 1; diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index cb2b2a9..2022663 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -65,15 +65,6 @@ static int print_proxy( const char *form return r; } - -static type_t *get_base_type( var_t *arg ) -{ - type_t *t = arg->type; - while( (t->type == 0) && t->ref ) - t = t->ref; - return t; -} - static void write_stubdescproto(void) { print_proxy( "extern const MIDL_STUB_DESC Object_StubDesc;\n"); @@ -212,7 +203,7 @@ static void proxy_check_pointers( var_t static void marshall_size_arg( var_t *arg ) { int index = 0; - const type_t *type = get_base_type(arg); + const type_t *type = arg->type; expr_t *expr; expr = get_attrp( arg->attrs, ATTR_SIZEIS ); @@ -311,7 +302,7 @@ static void proxy_gen_marshall_size( var static void marshall_copy_arg( var_t *arg ) { int index = 0; - type_t *type = get_base_type(arg); + type_t *type = arg->type; expr_t *expr; expr = get_attrp( arg->attrs, ATTR_SIZEIS ); @@ -420,7 +411,7 @@ static void gen_marshall( var_t *arg ) static void unmarshall_copy_arg( var_t *arg ) { int index = 0; - type_t *type = get_base_type(arg); + type_t *type = arg->type; expr_t *expr; expr = get_attrp( arg->attrs, ATTR_SIZEIS ); @@ -529,7 +520,7 @@ static void free_variable( var_t *arg ) return; } - type = get_base_type(arg); + type = arg->type; switch( type->type ) { case RPC_FC_BYTE: @@ -703,7 +694,7 @@ static void stub_unmarshall( var_t *arg fprintf(proxy,"\n"); } else if (is_attr(arg->attrs, ATTR_OUT)) { - type_t *type = get_base_type(arg); + type_t *type = arg->type; switch( type->type ) { case RPC_FC_STRUCT: diff --git a/tools/widl/server.c b/tools/widl/server.c index 9f6c5ac..630e414 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -157,8 +157,6 @@ static void assign_out_args(const func_t { unsigned int size; type_t *type = var->type; - while (type->type == 0 && type->ref) - type = type->ref; fprintf(server, " = NdrAllocate(&_StubMsg, "); write_expr(server, size_is, 1); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 523556f..b46f0b1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -159,11 +159,6 @@ void write_formatstringsdecl(FILE *f, in print_file(f, indent, "\n"); } -static inline int type_has_ref(const type_t *type) -{ - return (type->type == 0 && type->ref); -} - static inline int is_base_type(unsigned char type) { switch (type) @@ -192,14 +187,6 @@ static inline int is_base_type(unsigned } } -unsigned char ref_type(const type_t *type) -{ - while (type_has_ref(type)) - type = type->ref; - - return type->type; -} - static size_t write_procformatstring_var(FILE *file, int indent, const var_t *var, int is_return, unsigned int *type_offset) { @@ -212,9 +199,6 @@ static size_t write_procformatstring_var if (!is_in && !is_out) is_in = TRUE; - if (ptr_level == 0 && type_has_ref(type)) - type = type->ref; - if (ptr_level == 0 && !var->array && is_base_type(type->type)) { if (is_return) @@ -454,7 +438,7 @@ static size_t write_conf_or_var_desc(FIL correlation_type = RPC_FC_TOP_LEVEL_CONFORMANCE; } - correlation_variable_type = ref_type(correlation_variable); + correlation_variable_type = correlation_variable->type; switch (correlation_variable_type) { @@ -570,9 +554,6 @@ static size_t type_memsize(const type_t if (ptr_level) return sizeof(void *); - if (type_has_ref(t)) - return type_memsize(t->ref, 0 /* FIXME */, NULL); - switch (t->type) { case RPC_FC_BYTE: @@ -651,10 +632,6 @@ static int write_pointers(FILE *file, co return 1; } - /* FIXME: search through all refs for pointers too */ - while(type_has_ref(type)) - type = type->ref; - switch (type->type) { /* note: don't descend into complex structures or unions since these @@ -753,7 +730,7 @@ static size_t write_string_tfs(FILE *fil if (!get_attrp(attrs, ATTR_SIZEIS)) flags |= RPC_FC_P_SIMPLEPOINTER; - rtype = ref_type(type); + rtype = type->type; if ((rtype != RPC_FC_BYTE) && (rtype != RPC_FC_CHAR) && (rtype != RPC_FC_WCHAR)) { @@ -1040,7 +1017,7 @@ static size_t write_struct_members(FILE while (NEXT_LINK(field)) field = NEXT_LINK(field); for (; field; field = PREV_LINK(field)) { - unsigned char rtype = ref_type(field->type); + unsigned char rtype = field->type->type; if (is_base_type(rtype)) { @@ -1324,14 +1301,6 @@ static size_t write_typeformatstring_var if (ptr_level == 0) { - /* follow reference if the type has one */ - if (type_has_ref(type)) - { - type = type->ref; - /* FIXME: get new ptr_level from type */ - continue; - } - /* basic types don't need a type format string */ if (is_base_type(type->type)) return 0; @@ -1356,7 +1325,7 @@ static size_t write_typeformatstring_var error("write_typeformatstring_var: Unsupported type 0x%x for variable %s\n", type->type, var->name); } } - else if (ptr_level == 1 && !type_has_ref(type)) + else if (ptr_level == 1) { size_t start_offset = *typeformat_offset; int in_attr = is_attr(var->attrs, ATTR_IN); @@ -1473,7 +1442,7 @@ static unsigned int get_required_buffer_ const char *name, unsigned int *alignment) { *alignment = 0; - if (ptr_level == 0 && !array && !type_has_ref(type)) + if (ptr_level == 0 && !array) { switch (type->type) { @@ -1525,8 +1494,6 @@ static unsigned int get_required_buffer_ return 0; } } - if (ptr_level == 0 && type_has_ref(type)) - return get_required_buffer_size_type(type->ref, 0 /* FIXME */, array, name, alignment); return 0; } @@ -1547,8 +1514,6 @@ unsigned int get_required_buffer_size(co if (out_attr && var->ptr_level > 0) { type_t *type = var->type; - while (type->type == 0 && type->ref) - type = type->ref; if (type->type == RPC_FC_STRUCT) { @@ -1570,11 +1535,9 @@ unsigned int get_required_buffer_size(co { if ((!out_attr || in_attr) && !has_size && !is_attr(var->attrs, ATTR_STRING) && !var->array) { - if (var->ptr_level > 0 || (var->ptr_level == 0 && type_has_ref(var->type))) + if (var->ptr_level > 0) { type_t *type = var->type; - while (type->type == 0 && type->ref) - type = type->ref; if (is_base_type(type->type)) { @@ -1650,7 +1613,7 @@ void print_phase_basetype(FILE *file, in if (phase != PHASE_MARSHAL && phase != PHASE_UNMARSHAL) return; - rtype = ref_type(type); + rtype = type->type; switch (rtype) { @@ -1781,7 +1744,7 @@ void write_remoting_arguments(FILE *file break; } - rtype = ref_type(type); + rtype = type->type; if (is_string_type(var->attrs, var->ptr_level, var->array)) { diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 54c67e2..6d51b51 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -295,8 +295,6 @@ void init_types(void); type_t *duptype(type_t *t, int dupname); type_t *alias(type_t *t, const char *name); -/* Get the actual type field for a type (chase down typedef references). */ -unsigned char ref_type(const type_t *type); int is_ptr(type_t *t); int is_var_ptr(var_t *v); int cant_be_null(var_t *v);

1 0

James Hawkins : advpack: Add the regsvr action to the SetupInstallFromInfSection call.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: a39913fa1199ff2bf1c2c7602ce688eea2295483 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a39913fa1199ff2bf1c2c76… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 29 15:12:39 2006 -0700 advpack: Add the regsvr action to the SetupInstallFromInfSection call. --- dlls/advpack/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 5dd61fd..8f356ba 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -327,7 +327,7 @@ static HRESULT spapi_install(ADVInfo *in SetupTermDefaultQueueCallback(context); ret = SetupInstallFromInfSectionW(NULL, info->hinf, info->install_sec, - SPINST_INIFILES | SPINST_REGISTRY, + SPINST_INIFILES | SPINST_REGISTRY | SPINST_REGSVR, HKEY_LOCAL_MACHINE, NULL, 0, NULL, NULL, NULL, NULL); if (!ret)

1 0

James Hawkins : advpack: Get the proper working directory in install_init.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: f5acc51f2c495e32305a72de30fea82fd6f19379 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f5acc51f2c495e32305a72d… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 29 15:12:22 2006 -0700 advpack: Get the proper working directory in install_init. --- dlls/advpack/install.c | 96 ++++++++++++++++++++++++++++++++++-------- dlls/advpack/tests/install.c | 12 +---- 2 files changed, 80 insertions(+), 28 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 2398b75..5dd61fd 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -50,6 +50,7 @@ #define ADV_FAILURE 1 typedef struct _ADVInfo { HINF hinf; + LPWSTR inf_path; LPWSTR inf_filename; LPWSTR install_sec; LPWSTR working_dir; @@ -372,24 +373,80 @@ static HRESULT adv_install(ADVInfo *info return hr; } +/* determines the proper working directory for the INF file */ +static HRESULT get_working_dir(ADVInfo *info, LPCWSTR inf_filename, LPCWSTR working_dir) +{ + WCHAR path[MAX_PATH]; + LPCWSTR ptr; + DWORD len; + + static const WCHAR backslash[] = {'\\',0}; + static const WCHAR inf_dir[] = {'\\','I','N','F',0}; + + if ((ptr = strrchrW(inf_filename, '\\'))) + { + len = ptr - inf_filename + 1; + ptr = inf_filename; + } + else if (working_dir && *working_dir) + { + len = lstrlenW(working_dir) + 1; + ptr = working_dir; + } + else + { + GetCurrentDirectoryW(MAX_PATH, path); + lstrcatW(path, backslash); + lstrcatW(path, inf_filename); + + /* check if the INF file is in the current directory */ + if (GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) + { + GetCurrentDirectoryW(MAX_PATH, path); + } + else + { + /* default to the windows\inf directory if all else fails */ + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, inf_dir); + } + + len = lstrlenW(path) + 1; + ptr = path; + } + + info->working_dir = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!info->working_dir) + return E_OUTOFMEMORY; + + lstrcpynW(info->working_dir, ptr, len); + + return S_OK; +} + /* loads the INF file and performs checks on it */ HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, LPCWSTR working_dir, DWORD flags, ADVInfo *info) { DWORD len; - LPCWSTR ptr; + HRESULT hr; + LPCWSTR ptr, path; + static const WCHAR backslash[] = {'\\',0}; static const WCHAR default_install[] = { 'D','e','f','a','u','l','t','I','n','s','t','a','l','l',0 }; - len = lstrlenW(inf_filename); + if (!(ptr = strrchrW(inf_filename, '\\'))) + ptr = inf_filename; + + len = lstrlenW(ptr); info->inf_filename = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); if (!info->inf_filename) return E_OUTOFMEMORY; - lstrcpyW(info->inf_filename, inf_filename); + lstrcpyW(info->inf_filename, ptr); /* FIXME: determine the proper platform to install (NTx86, etc) */ if (!install_sec || !*install_sec) @@ -409,26 +466,26 @@ HRESULT install_init(LPCWSTR inf_filenam lstrcpyW(info->install_sec, ptr); - /* FIXME: need to get the real working directory */ - if (!working_dir || !*working_dir) - { - ptr = strrchrW(info->inf_filename, '\\'); - len = ptr - info->inf_filename + 1; - ptr = info->inf_filename; - } - else - { - len = lstrlenW(working_dir) + 1; - ptr = working_dir; - } + hr = get_working_dir(info, inf_filename, working_dir); + if (FAILED(hr)) + return hr; - info->working_dir = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!info->working_dir) + len = lstrlenW(info->working_dir) + lstrlenW(info->inf_filename) + 2; + info->inf_path = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!info->inf_path) return E_OUTOFMEMORY; - lstrcpynW(info->working_dir, ptr, len); + lstrcpyW(info->inf_path, info->working_dir); + lstrcatW(info->inf_path, backslash); + lstrcatW(info->inf_path, info->inf_filename); + + /* RunSetupCommand opens unmodifed filename parameter */ + if (flags & RSC_FLAG_INF) + path = inf_filename; + else + path = info->inf_path; - info->hinf = SetupOpenInfFileW(info->inf_filename, NULL, INF_STYLE_WIN4, NULL); + info->hinf = SetupOpenInfFileW(path, NULL, INF_STYLE_WIN4, NULL); if (info->hinf == INVALID_HANDLE_VALUE) return ADV_HRESULT(GetLastError()); @@ -448,6 +505,7 @@ void install_release(ADVInfo *info) if (info->hinf && info->hinf != INVALID_HANDLE_VALUE) SetupCloseInfFile(info->hinf); + HeapFree(GetProcessHeap(), 0, info->inf_path); HeapFree(GetProcessHeap(), 0, info->inf_filename); HeapFree(GetProcessHeap(), 0, info->install_sec); HeapFree(GetProcessHeap(), 0, info->working_dir); diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 291c92a..c25b87f 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -170,11 +170,8 @@ static void test_RunSetupCommand() /* try only the INF filename, empty working dir */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", "", "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - todo_wine - { - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %ld\n", hr); - } + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %ld\n", hr); DeleteFileA("one\\test.inf"); RemoveDirectoryA("one"); @@ -224,10 +221,7 @@ static void test_LaunchINFSection() /* try just the INF filename */ hr = pLaunchINFSection(NULL, NULL, file, 0); - todo_wine - { - ok(hr == 0, "Expected 0, got %ld\n", hr); - } + ok(hr == 0, "Expected 0, got %ld\n", hr); DeleteFileA("test.inf"); }

1 0

Huw Davies : rpcrt4: Tidy up CStdStubBuffer_AddRef,Release.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: dffd3e5034079febfb07855caa693ac03f316e27 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dffd3e5034079febfb07855… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 30 15:16:29 2006 +0100 rpcrt4: Tidy up CStdStubBuffer_AddRef,Release. --- dlls/rpcrt4/cstub.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 259956a..38a8a29 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -105,23 +105,26 @@ ULONG WINAPI CStdStubBuffer_AddRef(LPRPC { CStdStubBuffer *This = (CStdStubBuffer *)iface; TRACE("(%p)->AddRef()\n",This); - return ++(This->RefCount); + return InterlockedIncrement(&This->RefCount); } ULONG WINAPI NdrCStdStubBuffer_Release(LPRPCSTUBBUFFER iface, LPPSFACTORYBUFFER pPSF) { CStdStubBuffer *This = (CStdStubBuffer *)iface; + ULONG refs; + TRACE("(%p)->Release()\n",This); - if (!--(This->RefCount)) { + refs = InterlockedDecrement(&This->RefCount); + if (!refs) + { IRpcStubBuffer_Disconnect(iface); if(This->pPSFactory) IPSFactoryBuffer_Release(This->pPSFactory); HeapFree(GetProcessHeap(),0,This); - return 0; } - return This->RefCount; + return refs; } ULONG WINAPI NdrCStdStubBuffer2_Release(LPRPCSTUBBUFFER iface,

1 0

Huw Davies : rpcrt4: Tidy up CStdStubBuffer_QueryInterface.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 86aa95fd2bd9064f08a6fe3074cfca6b56d85158 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86aa95fd2bd9064f08a6fe3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 30 14:57:20 2006 +0100 rpcrt4: Tidy up CStdStubBuffer_QueryInterface. --- dlls/rpcrt4/cstub.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 38a8a29..2deb2b1 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -92,12 +92,14 @@ HRESULT WINAPI CStdStubBuffer_QueryInter CStdStubBuffer *This = (CStdStubBuffer *)iface; TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(riid),obj); - if (IsEqualGUID(&IID_IUnknown,riid) || - IsEqualGUID(&IID_IRpcStubBuffer,riid)) { - *obj = This; - This->RefCount++; + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IRpcStubBuffer, riid)) + { + IUnknown_AddRef(iface); + *obj = iface; return S_OK; } + *obj = NULL; return E_NOINTERFACE; }

1 0

Huw Davies : rpcrt4: Tests on NdrCStdStubBuffer_Release to show that we shouldn' t call Disconnect.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 9b91307677494e1f7d58a0b485eb058938c8151c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9b91307677494e1f7d58a0b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 30 17:20:17 2006 +0100 rpcrt4: Tests on NdrCStdStubBuffer_Release to show that we shouldn't call Disconnect. Also call IPSFactoryBuffer_Release on the 2nd arg, rather than on This->pPSFactory. --- dlls/rpcrt4/cstub.c | 6 ++++-- dlls/rpcrt4/tests/cstub.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 2deb2b1..b33363b 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -121,9 +121,11 @@ ULONG WINAPI NdrCStdStubBuffer_Release(L refs = InterlockedDecrement(&This->RefCount); if (!refs) { + /* test_Release shows that native doesn't call Disconnect here. + We'll leave it in for the time being. */ IRpcStubBuffer_Disconnect(iface); - if(This->pPSFactory) - IPSFactoryBuffer_Release(This->pPSFactory); + + IPSFactoryBuffer_Release(pPSF); HeapFree(GetProcessHeap(),0,This); } return refs; diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 733acc4..7039943 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -765,6 +765,51 @@ static void test_Disconnect(IPSFactoryBu ok(cstd_stub->pvServerObject == NULL, "pvServerObject %p\n", cstd_stub->pvServerObject); } + +static int release_test_psfacbuf_release_called; +static ULONG WINAPI release_test_pretend_psfacbuf_release(IUnknown *pUnk) +{ + release_test_psfacbuf_release_called++; + return 1; +} + +static IUnknownVtbl release_test_pretend_psfacbuf_vtbl = +{ + NULL, + NULL, + release_test_pretend_psfacbuf_release +}; + +static void test_Release(IPSFactoryBuffer *ppsf) +{ + LONG facbuf_refs; + IUnknownVtbl *orig_vtbl = &connect_test_orig_vtbl; + IUnknown *obj = (IUnknown*)&orig_vtbl; + IUnknownVtbl *pretend_psfacbuf_vtbl = &release_test_pretend_psfacbuf_vtbl; + IUnknown *pretend_psfacbuf = (IUnknown *)&pretend_psfacbuf_vtbl; + IRpcStubBuffer *pstub = create_stub(ppsf, &IID_if1, obj, S_OK); + CStdStubBuffer *cstd_stub = (CStdStubBuffer*)pstub; + + facbuf_refs = PSFactoryBuffer.RefCount; + + /* This shows that NdrCStdStubBuffer_Release doesn't call Disconnect */ + ok(cstd_stub->RefCount == 1, "ref count %ld\n", cstd_stub->RefCount); + connect_test_orig_release_called = 0; + IRpcStubBuffer_Release(pstub); +todo_wine { + ok(connect_test_orig_release_called == 0, "release called %d\n", connect_test_orig_release_called); +} + ok(PSFactoryBuffer.RefCount == facbuf_refs - 1, "factory buffer refs %ld orig %ld\n", PSFactoryBuffer.RefCount, facbuf_refs); + + /* This shows that NdrCStdStubBuffer_Release calls Release on its 2nd arg, rather than on This->pPSFactory + (which are usually the same and indeed it's odd that _Release requires this 2nd arg). */ + pstub = create_stub(ppsf, &IID_if1, obj, S_OK); + ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %ld orig %ld\n", PSFactoryBuffer.RefCount, facbuf_refs); + NdrCStdStubBuffer_Release(pstub, (IPSFactoryBuffer*)pretend_psfacbuf); + ok(release_test_psfacbuf_release_called == 1, "pretend_psfacbuf_release called %d\n", release_test_psfacbuf_release_called); + ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %ld orig %ld\n", PSFactoryBuffer.RefCount, facbuf_refs); +} + START_TEST( cstub ) { IPSFactoryBuffer *ppsf; @@ -776,6 +821,7 @@ START_TEST( cstub ) test_CreateStub(ppsf); test_Connect(ppsf); test_Disconnect(ppsf); + test_Release(ppsf); OleUninitialize(); }

1 0

Mike McCormack : msi: Use a binary search to find sql keywords.
by Alexandre Julliard 07 Sep '06

07 Sep '06

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