May 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : winebrowser: Don't output debug traces by default.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 103249ecabc5f15e4fc8b4f74221a3b2ee35395b URL: http://source.winehq.org/git/wine.git/?a=commit;h=103249ecabc5f15e4fc8b4f74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 1 14:00:43 2007 +0200 winebrowser: Don't output debug traces by default. --- programs/winebrowser/main.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index fa4f0c9..6e8b8c8 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -45,6 +45,9 @@ #include <stdio.h> #include <stdlib.h> #include <errno.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winebrowser); typedef LPSTR (*wine_get_unix_file_name_t)(LPCWSTR unixname); @@ -61,8 +64,8 @@ static int launch_app( char *candidates, const char *argv1 ) argv_new[1] = argv1; argv_new[2] = NULL; - fprintf( stderr, "Considering: %s\n", app ); - fprintf( stderr, "argv[1]: %s\n", argv1 ); + WINE_TRACE( "Considering: %s\n", app ); + WINE_TRACE( "argv[1]: %s\n", argv1 ); spawnvp( _P_OVERLAY, app, argv_new ); /* only returns on error */ app = strtok( NULL, "," ); /* grab the next app */ @@ -173,8 +176,7 @@ int main(int argc, char *argv[]) if (wine_get_unix_file_name_ptr == NULL) { - fprintf( stderr, - "winebrowser: cannot get the address of 'wine_get_unix_file_name'\n" ); + WINE_ERR( "cannot get the address of 'wine_get_unix_file_name'\n" ); } else {

1 0

Detlef Riekenberg : localui: Implement AddPortUI.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 8f1559775c16e6501c96ab3146ae78db40eb15b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1559775c16e6501c96ab314… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 30 15:02:34 2007 +0200 localui: Implement AddPortUI. --- dlls/localui/localui.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/localui/localui.h | 7 ++ dlls/localui/localui.rc | 1 + dlls/localui/ui_En.rc | 14 +++ 4 files changed, 232 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f1559775c16e6501c96a…

1 0

James Hawkins : msi: Add tests that show that costing is run in both the UI and Execute sequences .
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: d8586e164f7892c480db3a1427b4ec6a6be98c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8586e164f7892c480db3a142… Author: James Hawkins <truiken(a)gmail.com> Date: Tue May 1 03:18:59 2007 -0500 msi: Add tests that show that costing is run in both the UI and Execute sequences. --- dlls/msi/tests/install.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 5b7050f..b1cb4b8 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -355,6 +355,33 @@ static const CHAR ci2_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersio "File\tFile\n" "augustus\taugustus\taugustus\t500\t\t\t8192\t1"; +static const CHAR spf_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "SetFolderProp\t51\tMSITESTDIR\t[ProgramFilesFolder]\\msitest\\added\t\n"; + +static const CHAR spf_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostFinalize\t\t1000\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "SetFolderProp\t\t950\n" + "InstallFiles\t\t4000\n" + "InstallServices\t\t5000\n" + "InstallFinalize\t\t6600\n" + "InstallInitialize\t\t1500\n" + "InstallValidate\t\t1400\n" + "LaunchConditions\t\t100"; + +static const CHAR spf_install_ui_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallUISequence\tAction\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "ExecuteAction\t\t1100\n"; + typedef struct _msi_table { const CHAR *filename; @@ -515,6 +542,20 @@ static const msi_table ci2_tables[] = ADD_TABLE(property), }; +static const msi_table spf_tables[] = +{ + ADD_TABLE(ci_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(spf_install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), + ADD_TABLE(spf_custom_action), + ADD_TABLE(spf_install_ui_seq), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -1425,6 +1466,30 @@ static void test_concurrentinstall(void) DeleteFile(msifile); } +static void test_setpropertyfolder(void) +{ + UINT r; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\maximus", 500); + + create_database(msifile, spf_tables, sizeof(spf_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + delete_pf("msitest\\maximus", TRUE); /* FIXME: remove when the tests pass */ + todo_wine + { + ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); + } + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -1454,6 +1519,7 @@ START_TEST(install) test_setdirproperty(); test_cabisextracted(); test_concurrentinstall(); + test_setpropertyfolder(); SetCurrentDirectoryA(prev_path); }

1 0

James Hawkins : msi: Reset the folder' s resolved target before setting the target in CostFinalize.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: baad888766850ad390079a3abdf561517b61ef33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baad888766850ad390079a3ab… Author: James Hawkins <truiken(a)gmail.com> Date: Tue May 1 03:19:50 2007 -0500 msi: Reset the folder's resolved target before setting the target in CostFinalize. --- dlls/msi/action.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7ee0518..804a1e5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1918,9 +1918,17 @@ static UINT ITERATE_CostFinalizeDirectories(MSIRECORD *row, LPVOID param) MSIPACKAGE *package = (MSIPACKAGE*)param; LPCWSTR name; LPWSTR path; + MSIFOLDER *f; name = MSI_RecordGetString(row,1); + f = get_loaded_folder(package, name); + if (!f) return ERROR_SUCCESS; + + /* reset the ResolvedTarget */ + msi_free(f->ResolvedTarget); + f->ResolvedTarget = NULL; + /* This helper function now does ALL the work */ TRACE("Dir %s ...\n",debugstr_w(name)); path = resolve_folder(package,name,FALSE,TRUE,TRUE,NULL);

1 0

Dan Hipschman : widl: Get rid of the typeref_t structure, simplify code.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 1ecbb01617909b0ed149448afc5c8c81e75acb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ecbb01617909b0ed149448af… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Apr 30 18:31:27 2007 -0700 widl: Get rid of the typeref_t structure, simplify code. --- tools/widl/header.c | 4 +- tools/widl/parser.y | 101 +++++++++++++----------------------------------- tools/widl/typegen.c | 4 +- tools/widl/widltypes.h | 8 +--- 4 files changed, 32 insertions(+), 85 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index b7fd983..faeadfb 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -397,13 +397,13 @@ void write_expr(FILE *h, const expr_t *e, int brackets) break; case EXPR_CAST: fprintf(h, "("); - write_type(h, e->u.tref->ref, NULL, e->u.tref->name); + write_type(h, e->u.tref, NULL, e->u.tref->name); fprintf(h, ")"); write_expr(h, e->ref, 1); break; case EXPR_SIZEOF: fprintf(h, "sizeof("); - write_type(h, e->u.tref->ref, NULL, e->u.tref->name); + write_type(h, e->u.tref, NULL, e->u.tref->name); fprintf(h, ")"); break; case EXPR_SHL: diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b757c5c..fc916d4 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -72,17 +72,14 @@ static attr_t *make_attrp(enum attr_type type, void *val); static expr_t *make_expr(enum expr_type type); static expr_t *make_exprl(enum expr_type type, long val); static expr_t *make_exprs(enum expr_type type, char *val); -static expr_t *make_exprt(enum expr_type type, typeref_t *tref, expr_t *expr); +static expr_t *make_exprt(enum expr_type type, type_t *tref, expr_t *expr); static expr_t *make_expr1(enum expr_type type, expr_t *expr); static expr_t *make_expr2(enum expr_type type, expr_t *exp1, expr_t *exp2); static expr_t *make_expr3(enum expr_type type, expr_t *expr1, expr_t *expr2, expr_t *expr3); static type_t *make_type(unsigned char type, type_t *ref); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static array_dims_t *append_array(array_dims_t *list, expr_t *expr); -static typeref_t *make_tref(char *name, type_t *ref); -static typeref_t *uniq_tref(typeref_t *ref); -static type_t *type_ref(typeref_t *ref); -static void set_type(var_t *v, typeref_t *ref, array_dims_t *arr); +static void set_type(var_t *v, type_t *type, array_dims_t *arr); static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface); static ifref_t *make_ifref(type_t *iface); static var_list_t *append_var(var_list_t *list, var_t *var); @@ -90,7 +87,7 @@ static var_t *make_var(char *name); static func_list_t *append_func(func_list_t *list, func_t *func); static func_t *make_func(var_t *def, var_list_t *args); static type_t *make_class(char *name); -static type_t *make_safearray(typeref_t *tref); +static type_t *make_safearray(type_t *type); static type_t *make_builtin(char *name); static type_t *make_int(int sign); @@ -128,7 +125,6 @@ static void check_arg(var_t *arg); expr_list_t *expr_list; array_dims_t *array_dims; type_t *type; - typeref_t *tref; var_t *var; var_list_t *var_list; func_t *func; @@ -234,9 +230,9 @@ static void check_arg(var_t *arg); %type <type> module modulehdr moduledef %type <type> base_type int_std %type <type> enumdef structdef uniondef +%type <type> type %type <ifref> coclass_int %type <ifref_list> gbl_statements coclass_ints -%type <tref> type %type <var> arg field s_field case enum constdef externdef %type <var_list> m_args no_args args fields cases enums enum_list pident_list dispint_props %type <var> m_ident t_ident ident p_ident pident @@ -457,13 +453,13 @@ attribute: { $$ = NULL; } | tSOURCE { $$ = make_attr(ATTR_SOURCE); } | tSTRING { $$ = make_attr(ATTR_STRING); } | tSWITCHIS '(' expr ')' { $$ = make_attrp(ATTR_SWITCHIS, $3); } - | tSWITCHTYPE '(' type ')' { $$ = make_attrp(ATTR_SWITCHTYPE, type_ref($3)); } - | tTRANSMITAS '(' type ')' { $$ = make_attrp(ATTR_TRANSMITAS, type_ref($3)); } + | tSWITCHTYPE '(' type ')' { $$ = make_attrp(ATTR_SWITCHTYPE, $3); } + | tTRANSMITAS '(' type ')' { $$ = make_attrp(ATTR_TRANSMITAS, $3); } | tUUID '(' aUUID ')' { $$ = make_attrp(ATTR_UUID, $3); } | tV1ENUM { $$ = make_attr(ATTR_V1ENUM); } | tVARARG { $$ = make_attr(ATTR_VARARG); } | tVERSION '(' version ')' { $$ = make_attrv(ATTR_VERSION, $3); } - | tWIREMARSHAL '(' type ')' { $$ = make_attrp(ATTR_WIREMARSHAL, type_ref($3)); } + | tWIREMARSHAL '(' type ')' { $$ = make_attrp(ATTR_WIREMARSHAL, $3); } | pointer_type { $$ = make_attrv(ATTR_POINTERTYPE, $1); } ; @@ -823,20 +819,20 @@ structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, ts } ; -type: tVOID { $$ = make_tref(NULL, duptype(find_type("void", 0), 1)); } - | aKNOWNTYPE { $$ = make_tref($1, find_type($1, 0)); } - | base_type { $$ = make_tref(NULL, $1); } - | tCONST type { $$ = uniq_tref($2); $$->ref->is_const = TRUE; } - | enumdef { $$ = make_tref(NULL, $1); } - | tENUM aIDENTIFIER { $$ = make_tref(NULL, find_type2($2, tsENUM)); } - | structdef { $$ = make_tref(NULL, $1); } - | tSTRUCT aIDENTIFIER { $$ = make_tref(NULL, get_type(RPC_FC_STRUCT, $2, tsSTRUCT)); } - | uniondef { $$ = make_tref(NULL, $1); } - | tUNION aIDENTIFIER { $$ = make_tref(NULL, find_type2($2, tsUNION)); } - | tSAFEARRAY '(' type ')' { $$ = make_tref(NULL, make_safearray($3)); } +type: tVOID { $$ = duptype(find_type("void", 0), 1); } + | aKNOWNTYPE { $$ = find_type($1, 0); } + | base_type { $$ = $1; } + | tCONST type { $$ = duptype($2, 1); $$->is_const = TRUE; } + | enumdef { $$ = $1; } + | tENUM aIDENTIFIER { $$ = find_type2($2, tsENUM); } + | structdef { $$ = $1; } + | tSTRUCT aIDENTIFIER { $$ = get_type(RPC_FC_STRUCT, $2, tsSTRUCT); } + | uniondef { $$ = $1; } + | tUNION aIDENTIFIER { $$ = find_type2($2, tsUNION); } + | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } ; -typedef: tTYPEDEF m_attributes type pident_list { reg_typedefs(type_ref($3), $4, $2); +typedef: tTYPEDEF m_attributes type pident_list { reg_typedefs($3, $4, $2); process_typedefs($4); } ; @@ -1014,7 +1010,7 @@ static expr_t *make_exprs(enum expr_type type, char *val) return e; } -static expr_t *make_exprt(enum expr_type type, typeref_t *tref, expr_t *expr) +static expr_t *make_exprt(enum expr_type type, type_t *tref, expr_t *expr) { expr_t *e; e = xmalloc(sizeof(expr_t)); @@ -1024,7 +1020,7 @@ static expr_t *make_exprt(enum expr_type type, typeref_t *tref, expr_t *expr) e->is_const = FALSE; /* check for cast of constant expression */ if (type == EXPR_SIZEOF) { - switch (tref->ref->type) { + switch (tref->type) { case RPC_FC_BYTE: case RPC_FC_CHAR: case RPC_FC_SMALL: @@ -1199,49 +1195,9 @@ static type_t *make_type(unsigned char type, type_t *ref) return t; } -static typeref_t *make_tref(char *name, type_t *ref) +static void set_type(var_t *v, type_t *type, array_dims_t *arr) { - typeref_t *t = xmalloc(sizeof(typeref_t)); - t->name = name; - t->ref = ref; - t->uniq = ref ? 0 : 1; - return t; -} - -static typeref_t *uniq_tref(typeref_t *ref) -{ - typeref_t *t = ref; - type_t *tp; - if (t->uniq) return t; - - if (t->name) - { - tp = duptype(t->ref, 0); - tp->name = t->name; - } - else - tp = duptype(t->ref, 1); - - t->name = NULL; - t->ref = tp; - t->uniq = 1; - return t; -} - -static type_t *type_ref(typeref_t *ref) -{ - type_t *t = ref->ref; - free(ref->name); - free(ref); - return t; -} - -static void set_type(var_t *v, typeref_t *ref, array_dims_t *arr) -{ - v->type = ref->ref; - v->tname = ref->name; - ref->name = NULL; - free(ref); + v->type = type; v->array = arr; } @@ -1321,17 +1277,14 @@ static type_t *make_class(char *name) return c; } -static type_t *make_safearray(typeref_t *tref) +static type_t *make_safearray(type_t *type) { - const type_t *sa_orig = find_type("SAFEARRAY", 0); - type_t *sa = make_type(sa_orig->type, sa_orig->ref); + type_t *sa = duptype(find_type("SAFEARRAY", 0), 1); type_t *ptr; - if (sa_orig->name) - sa->name = strdup(sa_orig->name); - sa->ref = type_ref(tref); + sa->ref = type; ptr = make_type(RPC_FC_FP, sa); - ptr->name = strdup("SAFEARRAY"); + ptr->name = xstrdup("SAFEARRAY"); return ptr; } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d63c49a..b35a7d5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2214,13 +2214,13 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, break; case EXPR_CAST: fprintf(h, "("); - write_type(h, e->u.tref->ref, NULL, e->u.tref->name); + write_type(h, e->u.tref, NULL, e->u.tref->name); fprintf(h, ")"); write_struct_expr(h, e->ref, 1, fields, structvar); break; case EXPR_SIZEOF: fprintf(h, "sizeof("); - write_type(h, e->u.tref->ref, NULL, e->u.tref->name); + write_type(h, e->u.tref, NULL, e->u.tref->name); fprintf(h, ")"); break; case EXPR_SHL: diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 29ebd5e..8cb1320 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -186,7 +186,7 @@ struct _expr_t { long lval; const char *sval; const expr_t *ext; - const typeref_t *tref; + type_t *tref; } u; const expr_t *ext2; int is_const; @@ -210,12 +210,6 @@ struct _type_t { int typelib_idx; }; -struct _typeref_t { - char *name; - type_t *ref; - int uniq; -}; - struct _var_t { char *name; int ptr_level;

1 0

Dan Hipschman : widl: Get rid of the tname field of var_t, simplify code.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: d676d3be5fce72d35cb9eb7063ace424f3bcf78e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d676d3be5fce72d35cb9eb706… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Apr 30 18:32:33 2007 -0700 widl: Get rid of the tname field of var_t, simplify code. --- tools/widl/client.c | 4 ++-- tools/widl/header.c | 31 +++++++++++++++---------------- tools/widl/header.h | 2 +- tools/widl/parser.y | 7 +++---- tools/widl/proxy.c | 4 ++-- tools/widl/typegen.c | 16 ++++++++-------- tools/widl/typelib.c | 7 ++++--- tools/widl/widltypes.h | 1 - tools/widl/write_msft.c | 3 ++- 9 files changed, 37 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d676d3be5fce72d35cb9e…

1 0

Misha Koshelev : msi: Expand IDL file to contain some OLE automation interface functions.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: bb55acb57753c91b720f6fba99961c9ab3edf54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb55acb57753c91b720f6fba9… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Apr 30 20:53:49 2007 -0500 msi: Expand IDL file to contain some OLE automation interface functions. --- dlls/msi/automation.c | 1 + dlls/msi/msiserver.idl | 93 ++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msiserver_dispids.h | 36 ++++++++++++++++ 3 files changed, 130 insertions(+), 0 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 8714906..229978e 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -33,6 +33,7 @@ #include "wine/unicode.h" #include "msiserver.h" +#include "msiserver_dispids.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 9966d90..4d6c00b 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msiserver_dispids.h" import "unknwn.idl"; import "wtypes.idl"; import "objidl.idl"; @@ -42,6 +43,10 @@ library WindowsInstaller { properties: methods: + [id(DISPID_INSTALLER_OPENPACKAGE)] + Session* OpenPackage( + [in] VARIANT Path, + [in, optional, defaultvalue(0)] long OptionalOption); } [ uuid(000C1093-0000-0000-C000-000000000046) ] @@ -49,6 +54,12 @@ library WindowsInstaller { properties: methods: + [id(DISPID_RECORD_STRINGDATA), propget] + BSTR StringData([in] long FieldNumber); + [id(DISPID_RECORD_STRINGDATA), propput] + void StringData( + [in] long FieldNumber, + [in] BSTR rhs); } [ uuid(000C1095-0000-0000-C000-000000000046) ] @@ -84,6 +95,12 @@ library WindowsInstaller { properties: methods: + [id(DISPID_VIEW_EXECUTE)] + void Execute([in, optional, defaultvalue(0)] Record *OptionalRecord); + [id(DISPID_VIEW_FETCH)] + Record* Fetch(); + [id(DISPID_VIEW_CLOSE)] + void Close(); } [ uuid(000C109D-0000-0000-C000-000000000046) ] @@ -91,13 +108,89 @@ library WindowsInstaller { properties: methods: + [id(DISPID_DATABASE_OPENVIEW)] + View* OpenView([in] BSTR QueryString); } + typedef enum { + msiDoActionStatusNoAction = 0, + msiDoActionStatusSuccess = 1, + msiDoActionStatusUserExit = 2, + msiDoActionStatusFailure = 3, + msiDoActionStatusSuspend = 4, + msiDoActionStatusFinished = 5, + msiDoActionStatusWrongState = 6, + msiDoActionStatusBadActionData = 7 + } MsiDoActionStatus; + + typedef enum { + msiRunModeAdmin = 0, + msiRunModeAdvertise = 1, + msiRunModeMaintenance = 2, + msiRunModeRollbackEnabled = 3, + msiRunModeLogEnabled = 4, + msiRunModeOperations = 5, + msiRunModeRebootAtEnd = 6, + msiRunModeRebootNow = 7, + msiRunModeCabinet = 8, + msiRunModeSourceShortNames = 9, + msiRunModeTargetShortNames = 10, + msiRunModeWindows9x = 12, + msiRunModeZawEnabled = 13, + msiRunModeScheduled = 16, + msiRunModeRollback = 17, + msiRunModeCommit = 18 + } MsiRunMode; + + typedef enum { + msiInstallStateNotUsed = -7, + msiInstallStateBadConfig = -6, + msiInstallStateIncomplete = -5, + msiInstallStateSourceAbsent = -4, + msiInstallStateInvalidArg = -2, + msiInstallStateUnknown = -1, + msiInstallStateBroken = 0, + msiInstallStateAdvertised = 1, + msiInstallStateRemoved = 1, + msiInstallStateAbsent = 2, + msiInstallStateLocal = 3, + msiInstallStateSource = 4, + msiInstallStateDefault = 5 + } MsiInstallState; + [ uuid(000C109E-0000-0000-C000-000000000046) ] dispinterface Session { properties: methods: + [id(DISPID_SESSION_PROPERTY), propget] + BSTR Property([in] BSTR PropertyName); + [id(DISPID_SESSION_PROPERTY), propput] + void Property( + [in] BSTR PropertyName, + [in] BSTR rhs); + [id(DISPID_SESSION_LANGUAGE), propget] + long Language(); + [id(DISPID_SESSION_MODE), propget] + VARIANT_BOOL Mode([in] MsiRunMode runMode); + [id(DISPID_SESSION_MODE), propput] + void Mode( + [in] MsiRunMode runMode, + [in] VARIANT_BOOL rhs); + [id(DISPID_SESSION_DATABASE), propget] + Database* Database(); + [id(DISPID_SESSION_DOACTION)] + MsiDoActionStatus DoAction([in] BSTR ActionString); + [id(DISPID_SESSION_FEATURECURRENTSTATE), propget] + MsiInstallState FeatureCurrentState([in] BSTR FeatureName); + [id(DISPID_SESSION_FEATUREREQUESTSTATE), propget] + MsiInstallState FeatureRequestState([in] BSTR FeatureName); + [id(DISPID_SESSION_FEATUREREQUESTSTATE), propput] + void FeatureRequestState( + [in] BSTR FeatureName, + [in] MsiInstallState rhs); + [id(DISPID_SESSION_SETINSTALLLEVEL)] + void SetInstallLevel([in] long InstallLevel); } [ uuid(000C109F-0000-0000-C000-000000000046) ] diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h new file mode 100644 index 0000000..1c7a17f --- /dev/null +++ b/dlls/msi/msiserver_dispids.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2007 Misha Koshelev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define DISPID_INSTALLER_OPENPACKAGE 2 + +#define DISPID_RECORD_STRINGDATA 1 + +#define DISPID_VIEW_EXECUTE 1 +#define DISPID_VIEW_FETCH 2 +#define DISPID_VIEW_CLOSE 4 + +#define DISPID_DATABASE_OPENVIEW 3 + +#define DISPID_SESSION_PROPERTY 2 +#define DISPID_SESSION_LANGUAGE 3 +#define DISPID_SESSION_MODE 4 +#define DISPID_SESSION_DATABASE 5 +#define DISPID_SESSION_DOACTION 8 +#define DISPID_SESSION_FEATURECURRENTSTATE 13 +#define DISPID_SESSION_FEATUREREQUESTSTATE 14 +#define DISPID_SESSION_SETINSTALLLEVEL 19

1 0

Misha Koshelev : msi: Merge OLE automation conformance tests.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: d1c4588625ed59145460274bbaaee0f42c88679f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c4588625ed59145460274bb… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Apr 30 20:53:26 2007 -0500 msi: Merge OLE automation conformance tests. --- dlls/msi/tests/Makefile.in | 1 - dlls/msi/tests/automation.c | 164 +++++++++++++++++++++++++++++++- dlls/msi/tests/iface.c | 225 ------------------------------------------- 3 files changed, 163 insertions(+), 227 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1c4588625ed591454602…

1 0

Misha Koshelev : msi: Add base class for OLE automation objects.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 26c16313d9a7b9993f76d796d1afe25f8556dd23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c16313d9a7b9993f76d796d… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Apr 30 20:53:43 2007 -0500 msi: Add base class for OLE automation objects. --- .gitignore | 2 + dlls/msi/Makefile.in | 3 + dlls/msi/automation.c | 471 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 476 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26c16313d9a7b9993f76d…

1 0

Andrey Turkin : shlwapi: Implement IConnectionPoint_SimpleInvoke.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: b63e9a78289baec5b73f6ed327c13febefd5c3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b63e9a78289baec5b73f6ed32… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Apr 30 23:11:47 2007 +0400 shlwapi: Implement IConnectionPoint_SimpleInvoke. --- dlls/shlwapi/ordinal.c | 58 +++++++++++++++++++++++++++++++++++++++----- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index dd38eda..f480482 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2856,17 +2856,61 @@ HRESULT WINAPI SHPackDispParams(LPVOID w, LPVOID x, LPVOID y, LPVOID z) } /************************************************************************* + * SHLWAPI_InvokeByIID + * + * This helper function calls IDispatch::Invoke for each sink + * which implements given iid or IDispatch. + * + */ +static HRESULT SHLWAPI_InvokeByIID( + IConnectionPoint* iCP, + REFIID iid, + DISPID dispId, + DISPPARAMS* dispParams) +{ + IEnumConnections *enumerator; + CONNECTDATA rgcd; + + HRESULT result = IConnectionPoint_EnumConnections(iCP, &enumerator); + if (FAILED(result)) + return result; + + while(IEnumConnections_Next(enumerator, 1, &rgcd, NULL)==S_OK) + { + IDispatch *dispIface; + if (SUCCEEDED(IUnknown_QueryInterface(rgcd.pUnk, iid, (LPVOID*)&dispIface)) || + SUCCEEDED(IUnknown_QueryInterface(rgcd.pUnk, &IID_IDispatch, (LPVOID*)&dispIface))) + { + IDispatch_Invoke(dispIface, dispId, &IID_NULL, 0, DISPATCH_METHOD, dispParams, NULL, NULL, NULL); + IDispatch_Release(dispIface); + } + } + + IEnumConnections_Release(enumerator); + + return S_OK; +} + +/************************************************************************* * @ [SHLWAPI.284] * - * _IConnectionPoint_SimpleInvoke + * IConnectionPoint_SimpleInvoke */ -DWORD WINAPI IConnectionPoint_SimpleInvoke( - LPVOID x, - LPVOID y, - LPVOID z) +HRESULT WINAPI IConnectionPoint_SimpleInvoke( + IConnectionPoint* iCP, + DISPID dispId, + DISPPARAMS* dispParams) { - FIXME("(%p %p %p) stub\n",x,y,z); - return 0; + IID iid; + HRESULT result; + + TRACE("(%p)->(0x%x %p)\n",iCP,dispId,dispParams); + + result = IConnectionPoint_GetConnectionInterface(iCP, &iid); + if (SUCCEEDED(result)) + result = SHLWAPI_InvokeByIID(iCP, &iid, dispId, dispParams); + + return result; } /************************************************************************* diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index c1cebdd..cca778d 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -281,7 +281,7 @@ 281 stdcall -noname SHPackDispParamsV(ptr ptr ptr ptr) 282 stdcall -noname SHPackDispParams(ptr ptr ptr ptr) 283 stub -noname IConnectionPoint_InvokeWithCancel -284 stdcall -noname IConnectionPoint_SimpleInvoke(ptr ptr ptr) +284 stdcall -noname IConnectionPoint_SimpleInvoke(ptr long ptr) 285 stdcall -noname IConnectionPoint_OnChanged(ptr long) 286 stub -noname IUnknown_CPContainerInvokeParam 287 stdcall -noname IUnknown_CPContainerOnChanged(ptr long)

1 0