September 2008 - Wine-Commits

James Hawkins : riched20: Fix several failing test across several platforms .
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 898dd57f5d05f1b8d4d5633816970d1b5e36c2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=898dd57f5d05f1b8d4d563381… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:57:05 2008 -0500 riched20: Fix several failing test across several platforms. --- dlls/riched20/tests/editor.c | 84 +++++++++++++++++++++--------------------- 1 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=898dd57f5d05f1b8d4d56…

1 0

James Hawkins : comctl32: Fix two failing tests in win98.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 5362bfa776897fc4c2c9c16554e08b90304acb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5362bfa776897fc4c2c9c1655… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:45:03 2008 -0500 comctl32: Fix two failing tests in win98. --- dlls/comctl32/tests/monthcal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index cd9592d..ba22beb 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -69,7 +69,7 @@ static const struct message create_parent_window_seq[] = { static const struct message create_monthcal_control_seq[] = { { WM_NOTIFYFORMAT, sent|lparam, 0, NF_QUERY }, - { WM_QUERYUISTATE, sent }, + { WM_QUERYUISTATE, sent|optional }, { WM_GETFONT, sent }, { WM_PARENTNOTIFY, sent|wparam, WM_CREATE}, { 0 } @@ -77,7 +77,7 @@ static const struct message create_monthcal_control_seq[] = { static const struct message create_monthcal_multi_sel_style_seq[] = { { WM_NOTIFYFORMAT, sent|lparam, 0, NF_QUERY }, - { WM_QUERYUISTATE, sent }, + { WM_QUERYUISTATE, sent|optional }, { WM_GETFONT, sent }, { 0 } };

1 0

James Hawkins : msi: Make sure read-only source files are set writable after being copied.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 765275a306cf35f84bb2f9855440a94b117db598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=765275a306cf35f84bb2f9855… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 05:15:27 2008 -0500 msi: Make sure read-only source files are set writable after being copied. --- dlls/msi/files.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 0d9cd11..c2dcf84 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -131,13 +131,13 @@ static UINT copy_file(MSIFILE *file) BOOL ret; ret = CopyFileW(file->SourcePath, file->TargetPath, FALSE); - if (ret) - { - file->state = msifs_installed; - return ERROR_SUCCESS; - } + if (!ret) + return GetLastError(); - return GetLastError(); + SetFileAttributesW(file->TargetPath, FILE_ATTRIBUTE_NORMAL); + + file->state = msifs_installed; + return ERROR_SUCCESS; } static UINT copy_install_file(MSIFILE *file)

1 0

James Hawkins : msi: Actions should be run even if the installed state is the same as the requested state .
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 8a9ba8f73f921a244421566eaac5ece6d0f30328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9ba8f73f921a244421566ea… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:56:24 2008 -0500 msi: Actions should be run even if the installed state is the same as the requested state. --- dlls/msi/helpers.c | 3 --- dlls/msi/tests/install.c | 5 +---- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 2364536..b1d6d73 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -793,9 +793,6 @@ BOOL ACTION_VerifyComponentForAction( const MSICOMPONENT* comp, INSTALLSTATE che if (!comp) return FALSE; - if (comp->Installed == check) - return FALSE; - if (comp->ActionRequest == check) return TRUE; else diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3ff3420..adfe28e 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3511,10 +3511,7 @@ static void test_publish(void) /* complete install */ r = MsiInstallProductA(msifile, "FULL=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(pf_exists("msitest\\maximus"), "File not installed\n"); - } + ok(pf_exists("msitest\\maximus"), "File not installed\n"); ok(pf_exists("msitest"), "File not installed\n"); state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");

1 0

James Hawkins : advapi32: ERROR_IO_PENDING is returned in Vista only on success.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: f4c8a0fadd30e890529dd609bfc983d625175ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c8a0fadd30e890529dd609b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:44:07 2008 -0500 advapi32: ERROR_IO_PENDING is returned in Vista only on success. --- dlls/advapi32/tests/cred.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 1bb2545..df14439 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -97,12 +97,19 @@ static void test_CredWriteA(void) SetLastError(0xdeadbeef); ret = pCredWriteA(&new_cred, 0); - ok(!ret, "CredWrite with username without domain should have failed\n"); - ok(GetLastError() == ERROR_BAD_USERNAME || - GetLastError() == ERROR_NO_SUCH_LOGON_SESSION || /* Vista */ - broken(GetLastError() == ERROR_IO_PENDING), - "CredWrite with username without domain should return ERROR_BAD_USERNAME" - "or ERROR_NO_SUCH_LOGON_SESSION not %d\n", GetLastError()); + if (ret) + { + /* Vista */ + ok(GetLastError() == ERROR_IO_PENDING, + "Expected ERROR_IO_PENDING, got %d\n", GetLastError()); + } + else + { + ok(GetLastError() == ERROR_BAD_USERNAME || + GetLastError() == ERROR_NO_SUCH_LOGON_SESSION, /* Vista */ + "CredWrite with username without domain should return ERROR_BAD_USERNAME" + "or ERROR_NO_SUCH_LOGON_SESSION not %d\n", GetLastError()); + } new_cred.UserName = NULL; SetLastError(0xdeadbeef);

1 0

James Hawkins : crypt32: Trace the returned value on failure.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 8733ec83261cf017145676a2d72ca11f7feeb4f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8733ec83261cf017145676a2d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 00:50:23 2008 -0500 crypt32: Trace the returned value on failure. --- dlls/crypt32/tests/ctl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index d8c4a62..799e9c9 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -362,7 +362,7 @@ static void testAddCTLToStore(void) ok(!ret && (GetLastError() == CRYPT_E_EXISTS || GetLastError() == CRYPT_E_NOT_FOUND), /* win9x */ - "expected CRYPT_E_EXISTS, got %08x\n", GetLastError()); + "expected CRYPT_E_EXISTS, got %d %08x\n", ret, GetLastError()); CertCloseStore(store, 0); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,

1 0

Francois Gouget : jscript: Fix compilation with older bison.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 3b3f5118ac29c84f8c0336d6c115c9cf4fb05c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3f5118ac29c84f8c0336d6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 8 01:22:45 2008 +0200 jscript: Fix compilation with older bison. --- dlls/jscript/lex.c | 1 - dlls/jscript/parser.y | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index d482999..8ae15d3 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -23,7 +23,6 @@ #include "objsafe.h" #include "engine.h" -#define YYSTYPE #include "parser.tab.h" #include "wine/debug.h" diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index a9e2063..cc4ee7b 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -32,7 +32,7 @@ static int parser_error(const char*); static BOOL allow_auto_semicolon(parser_ctx_t*); static void program_parsed(parser_ctx_t*,source_elements_t*); -typedef struct { +typedef struct _statement_list_t { statement_t *head; statement_t *tail; } statement_list_t; @@ -42,7 +42,7 @@ static literal_t *new_null_literal(parser_ctx_t*); static literal_t *new_undefined_literal(parser_ctx_t*); static literal_t *new_boolean_literal(parser_ctx_t*,VARIANT_BOOL); -typedef struct { +typedef struct _property_list_t { prop_val_t *head; prop_val_t *tail; } property_list_t; @@ -50,7 +50,7 @@ typedef struct { static property_list_t *new_property_list(parser_ctx_t*,literal_t*,expression_t*); static property_list_t *property_list_add(parser_ctx_t*,property_list_t*,literal_t*,expression_t*); -typedef struct { +typedef struct _element_list_t { array_element_t *head; array_element_t *tail; } element_list_t; @@ -58,7 +58,7 @@ typedef struct { static element_list_t *new_element_list(parser_ctx_t*,int,expression_t*); static element_list_t *element_list_add(parser_ctx_t*,element_list_t*,int,expression_t*); -typedef struct { +typedef struct _argument_list_t { argument_t *head; argument_t *tail; } argument_list_t; @@ -66,7 +66,7 @@ typedef struct { static argument_list_t *new_argument_list(parser_ctx_t*,expression_t*); static argument_list_t *argument_list_add(parser_ctx_t*,argument_list_t*,expression_t*); -typedef struct { +typedef struct _case_list_t { case_clausule_t *head; case_clausule_t *tail; } case_list_t; @@ -77,7 +77,7 @@ static case_list_t *new_case_list(parser_ctx_t*,case_clausule_t*); static case_list_t *case_list_add(parser_ctx_t*,case_list_t*,case_clausule_t*); static case_clausule_t *new_case_block(parser_ctx_t*,case_list_t*,case_clausule_t*,case_list_t*); -typedef struct { +typedef struct _variable_list_t { variable_declaration_t *head; variable_declaration_t *tail; } variable_list_t; @@ -112,7 +112,7 @@ struct statement_list_t { statement_list_t *new_statement_list(parser_ctx_t*,statement_t*); statement_list_t *statement_list_add(statement_list_t*,statement_t*); -typedef struct { +typedef struct _parameter_list_t { parameter_t *head; parameter_t *tail; } parameter_list_t; @@ -148,20 +148,20 @@ static source_elements_t *source_elements_add_function(source_elements_t*,functi int ival; LPCWSTR wstr; literal_t *literal; - argument_list_t *argument_list; + struct _argument_list_t *argument_list; case_clausule_t *case_clausule; - case_list_t *case_list; + struct _case_list_t *case_list; catch_block_t *catch_block; - element_list_t *element_list; + struct _element_list_t *element_list; expression_t *expr; const WCHAR *identifier; function_declaration_t *function_declaration; - parameter_list_t *parameter_list; - property_list_t *property_list; + struct _parameter_list_t *parameter_list; + struct _property_list_t *property_list; source_elements_t *source_elements; statement_t *statement; - statement_list_t *statement_list; - variable_list_t *variable_list; + struct _statement_list_t *statement_list; + struct _variable_list_t *variable_list; variable_declaration_t *variable_declaration; }

1 0

Hans Leidekker : winhttp: Support asynchronous requests.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: f3346a789ea01e578b93c7d4f0fdf870f80b446d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3346a789ea01e578b93c7d4f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sun Sep 7 21:36:40 2008 +0200 winhttp: Support asynchronous requests. --- dlls/winhttp/request.c | 319 +++++++++++++++++++++++++++---------- dlls/winhttp/tests/notification.c | 34 ++++- dlls/winhttp/winhttp_private.h | 46 ++++++ 3 files changed, 312 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3346a789ea01e578b93c…

1 0

Jacek Caban : jscript: Added GetDispID implementation.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 5ac404aa9c8e3279f6ad8ef6126196e54ad5a2b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac404aa9c8e3279f6ad8ef61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 8 00:14:58 2008 +0200 jscript: Added GetDispID implementation. --- dlls/jscript/dispex.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/jscript.h | 15 +++++ 2 files changed, 160 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 674a61e..d2af5f8 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -42,6 +42,131 @@ struct _dispex_prop_t { } u; }; +static inline DISPID prop_to_id(DispatchEx *This, dispex_prop_t *prop) +{ + return prop - This->props; +} + +static const builtin_prop_t *find_builtin_prop(DispatchEx *This, const WCHAR *name) +{ + int min = 0, max, i, r; + + max = This->builtin_info->props_cnt-1; + while(min <= max) { + i = (min+max)/2; + + r = strcmpW(name, This->builtin_info->props[i].name); + if(!r) + return This->builtin_info->props + i; + + if(r < 0) + max = i-1; + else + min = i+1; + } + + return NULL; +} + +static dispex_prop_t *alloc_prop(DispatchEx *This, const WCHAR *name, prop_type_t type, DWORD flags) +{ + dispex_prop_t *ret; + + if(This->buf_size == This->prop_cnt) { + dispex_prop_t *tmp = heap_realloc(This->props, (This->buf_size<<=1)*sizeof(*This->props)); + if(!tmp) + return NULL; + This->props = tmp; + } + + ret = This->props + This->prop_cnt++; + ret->type = type; + ret->flags = flags; + ret->name = heap_strdupW(name); + if(!ret->name) + return NULL; + + return ret; +} + +static dispex_prop_t *alloc_protref(DispatchEx *This, const WCHAR *name, DWORD ref) +{ + dispex_prop_t *ret; + + ret = alloc_prop(This, name, PROP_PROTREF, 0); + if(!ret) + return NULL; + + ret->u.ref = ref; + return ret; +} + +static HRESULT find_prop_name(DispatchEx *This, const WCHAR *name, dispex_prop_t **ret) +{ + const builtin_prop_t *builtin; + dispex_prop_t *prop; + + for(prop = This->props; prop < This->props+This->prop_cnt; prop++) { + if(prop->name && !strcmpW(prop->name, name)) { + *ret = prop; + return S_OK; + } + } + + builtin = find_builtin_prop(This, name); + if(builtin) { + prop = alloc_prop(This, name, PROP_BUILTIN, builtin->flags); + if(!prop) + return E_OUTOFMEMORY; + + prop->u.p = builtin; + *ret = prop; + return S_OK; + } + + *ret = NULL; + return S_OK; +} + +static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, BOOL alloc, dispex_prop_t **ret) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name(This, name, &prop); + if(FAILED(hres)) + return hres; + if(prop) { + *ret = prop; + return S_OK; + } + + if(This->prototype) { + hres = find_prop_name_prot(This->prototype, name, FALSE, &prop); + if(FAILED(hres)) + return hres; + if(prop) { + prop = alloc_protref(This, prop->name, prop - This->prototype->props); + if(!prop) + return E_OUTOFMEMORY; + *ret = prop; + return S_OK; + } + } + + if(alloc) { + TRACE("creating prop %s\n", debugstr_w(name)); + + prop = alloc_prop(This, name, PROP_VARIANT, PROPF_ENUM); + if(!prop) + return E_OUTOFMEMORY; + VariantInit(&prop->u.var); + } + + *ret = prop; + return S_OK; +} + #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -158,8 +283,26 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); - return E_NOTIMPL; + dispex_prop_t *prop; + HRESULT hres; + + TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + + if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit)) { + FIXME("Unsupported grfdex %x\n", grfdex); + return E_NOTIMPL; + } + + hres = find_prop_name_prot(This, bstrName, (grfdex&fdexNameEnsure) != 0, &prop); + if(FAILED(hres)) + return hres; + if(prop) { + *pid = prop_to_id(This, prop); + return S_OK; + } + + TRACE("not found %s\n", debugstr_w(bstrName)); + return DISP_E_UNKNOWNNAME; } static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b4c872e..1084ec4 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -151,4 +151,19 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static inline LPWSTR heap_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = heap_alloc(size); + memcpy(ret, str, size); + } + + return ret; +} + #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl)))

1 0

Jacek Caban : jscript: Store more data in DispatchEx object.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: c23ea508a1af4f4f64ae9b33f43c2c44ac00b698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23ea508a1af4f4f64ae9b33f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 8 00:14:38 2008 +0200 jscript: Store more data in DispatchEx object. --- dlls/jscript/dispex.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/jscript.c | 2 +- dlls/jscript/jscript.h | 42 ++++++++++++++++++- 3 files changed, 137 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 3ea1ed1..674a61e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -23,6 +23,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +typedef enum { + PROP_VARIANT, + PROP_BUILTIN, + PROP_PROTREF, + PROP_DELETED +} prop_type_t; + +struct _dispex_prop_t { + WCHAR *name; + prop_type_t type; + DWORD flags; + + union { + VARIANT var; + const builtin_prop_t *p; + DWORD ref; + } u; +}; + #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -66,8 +85,20 @@ static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + dispex_prop_t *prop; + + for(prop = This->props; prop < This->props+This->prop_cnt; prop++) { + if(prop->type == PROP_VARIANT) + VariantClear(&prop->u.var); + heap_free(prop->name); + } + heap_free(This->props); script_release(This->ctx); - heap_free(This); + + if(This->builtin_info->destructor) + This->builtin_info->destructor(This); + else + heap_free(This); } return ref; @@ -201,10 +232,64 @@ static IDispatchExVtbl DispatchExVtbl = { DispatchEx_GetNameSpaceParent }; -static HRESULT init_dispex(DispatchEx *dispex, script_ctx_t *ctx) +static HRESULT jsdisp_set_prot_prop(DispatchEx *dispex, DispatchEx *prototype) +{ + VARIANT *var; + + if(!dispex->props[1].name) + return E_OUTOFMEMORY; + + dispex->props[1].type = PROP_VARIANT; + dispex->props[1].flags = 0; + + var = &dispex->props[1].u.var; + V_VT(var) = VT_DISPATCH; + V_DISPATCH(var) = (IDispatch*)_IDispatchEx_(prototype); + + return S_OK; +} + +static HRESULT init_dispex(DispatchEx *dispex, script_ctx_t *ctx, const builtin_info_t *builtin_info, DispatchEx *prototype) { + static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; + + TRACE("%p (%p)\n", dispex, prototype); + dispex->lpIDispatchExVtbl = &DispatchExVtbl; dispex->ref = 1; + dispex->builtin_info = builtin_info; + + dispex->props = heap_alloc((dispex->buf_size=4) * sizeof(dispex_prop_t)); + if(!dispex->props) + return E_OUTOFMEMORY; + + dispex->prototype = prototype; + if(prototype) + IDispatchEx_AddRef(_IDispatchEx_(prototype)); + + dispex->prop_cnt = 2; + dispex->props[0].name = NULL; + dispex->props[0].flags = 0; + if(builtin_info->value_prop.invoke) { + dispex->props[0].type = PROP_BUILTIN; + dispex->props[0].u.p = &builtin_info->value_prop; + }else { + dispex->props[0].type = PROP_DELETED; + } + + dispex->props[1].type = PROP_DELETED; + dispex->props[1].name = SysAllocString(prototypeW); + dispex->props[1].flags = 0; + + if(prototype) { + HRESULT hres; + + hres = jsdisp_set_prot_prop(dispex, prototype); + if(FAILED(hres)) { + IDispatchEx_Release(_IDispatchEx_(dispex)); + return hres; + } + } script_addref(ctx); dispex->ctx = ctx; @@ -212,7 +297,15 @@ static HRESULT init_dispex(DispatchEx *dispex, script_ctx_t *ctx) return S_OK; } -HRESULT create_dispex(script_ctx_t *ctx, DispatchEx **dispex) +static const builtin_info_t dispex_info = { + JSCLASS_NONE, + {NULL, NULL, 0}, + 0, NULL, + NULL, + NULL +}; + +HRESULT create_dispex(script_ctx_t *ctx, const builtin_info_t *builtin_info, DispatchEx *prototype, DispatchEx **dispex) { DispatchEx *ret; HRESULT hres; @@ -221,7 +314,7 @@ HRESULT create_dispex(script_ctx_t *ctx, DispatchEx **dispex) if(!ret) return E_OUTOFMEMORY; - hres = init_dispex(ret, ctx); + hres = init_dispex(ret, ctx, builtin_info ? builtin_info : &dispex_info, prototype); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 2bd9f12..f8b95c5 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -216,7 +216,7 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, return hres; } - hres = create_dispex(This->ctx, &This->ctx->script_disp); + hres = create_dispex(This->ctx, NULL, NULL, &This->ctx->script_disp); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 0fff0e8..b4c872e 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -33,23 +33,59 @@ typedef struct _script_ctx_t script_ctx_t; typedef struct _exec_ctx_t exec_ctx_t; +typedef struct _dispex_prop_t dispex_prop_t; typedef struct { EXCEPINFO ei; VARIANT var; } jsexcept_t; -typedef struct DispatchEx { +typedef struct DispatchEx DispatchEx; + +#define PROPF_ARGMASK 0x00ff +#define PROPF_METHOD 0x0100 +#define PROPF_ENUM 0x0200 +#define PROPF_CONSTR 0x0400 + +typedef enum { + JSCLASS_NONE +} jsclass_t; + +typedef HRESULT (*builtin_invoke_t)(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); + +typedef struct { + const WCHAR *name; + builtin_invoke_t invoke; + DWORD flags; +} builtin_prop_t; + +typedef struct { + jsclass_t class; + builtin_prop_t value_prop; + DWORD props_cnt; + const builtin_prop_t *props; + void (*destructor)(DispatchEx*); + void (*on_put)(DispatchEx*,const WCHAR*); +} builtin_info_t; + +struct DispatchEx { const IDispatchExVtbl *lpIDispatchExVtbl; LONG ref; + DWORD buf_size; + DWORD prop_cnt; + dispex_prop_t *props; script_ctx_t *ctx; -} DispatchEx; + + DispatchEx *prototype; + + const builtin_info_t *builtin_info; +}; #define _IDispatchEx_(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl) -HRESULT create_dispex(script_ctx_t*,DispatchEx**); +HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,DispatchEx*,DispatchEx**); struct _script_ctx_t { LONG ref;

1 0