February 2010 - Wine-commits

Vitaly Perov : setupapi: Add stub for SetupLogFile{A,W}.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: c7d4b0c69fb8de9a2344c7d9d4bcda6e3feef094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d4b0c69fb8de9a2344c7d9d… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Fri Feb 5 19:46:02 2010 +0300 setupapi: Add stub for SetupLogFile{A,W}. --- dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/stubs.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index bcf88f4..51a5c2e 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -456,8 +456,8 @@ @ stdcall SetupIterateCabinetW(wstr long ptr ptr) @ stub SetupLogErrorA @ stdcall SetupLogErrorW(wstr long) -@ stub SetupLogFileA -@ stub SetupLogFileW +@ stdcall SetupLogFileA(ptr str str str long str str str long) +@ stdcall SetupLogFileW(ptr wstr wstr wstr long wstr wstr wstr long) @ stdcall SetupOpenAppendInfFileA(str long ptr) @ stdcall SetupOpenAppendInfFileW(wstr long ptr) @ stdcall SetupOpenFileQueue() diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 3496c6b..f8e99e0 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -348,3 +348,48 @@ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) FIXME("%u %p 0x%08x: stub\n", index, class, flags); return CR_NO_SUCH_VALUE; } + +/*********************************************************************** + * SetupLogFileW (SETUPAPI.@) + */ +BOOL WINAPI SetupLogFileW( + HSPFILELOG FileLogHandle, + PCWSTR LogSectionName, + PCWSTR SourceFileName, + PCWSTR TargetFileName, + DWORD Checksum, + PCWSTR DiskTagfile, + PCWSTR DiskDescription, + PCWSTR OtherInfo, + DWORD Flags ) +{ + FIXME("(%p, %p, '%s', '%s', %d, %p, %p, %p, %d): stub\n", FileLogHandle, + debugstr_w(LogSectionName), debugstr_w(SourceFileName), + debugstr_w(TargetFileName), Checksum, debugstr_w(DiskTagfile), + debugstr_w(DiskDescription), debugstr_w(OtherInfo), Flags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * SetupLogFileA (SETUPAPI.@) + */ +BOOL WINAPI SetupLogFileA( + HSPFILELOG FileLogHandle, + PCSTR LogSectionName, + PCSTR SourceFileName, + PCSTR TargetFileName, + DWORD Checksum, + PCSTR DiskTagfile, + PCSTR DiskDescription, + PCSTR OtherInfo, + DWORD Flags ) +{ + FIXME("(%p, %p, '%s', '%s', %d, %p, %p, %p, %d): stub\n", FileLogHandle, + LogSectionName, SourceFileName, TargetFileName, Checksum, DiskTagfile, + DiskDescription, OtherInfo, Flags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Vincent Povirk : winemenubuilder: Use a custom error function.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 7f8279e1277f4495c1ab8fd624c73581ec1da2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8279e1277f4495c1ab8fd62… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 5 12:14:18 2010 -0600 winemenubuilder: Use a custom error function. --- programs/winemenubuilder/winemenubuilder.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e14fe81..62165f6 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -188,8 +188,10 @@ static void *libpng_handle; MAKE_FUNCPTR(png_create_info_struct); MAKE_FUNCPTR(png_create_write_struct); MAKE_FUNCPTR(png_destroy_write_struct); +MAKE_FUNCPTR(png_get_error_ptr); MAKE_FUNCPTR(png_init_io); MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_error_fn); MAKE_FUNCPTR(png_set_text); MAKE_FUNCPTR(png_set_IHDR); MAKE_FUNCPTR(png_write_end); @@ -209,8 +211,10 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_create_info_struct); LOAD_FUNCPTR(png_create_write_struct); LOAD_FUNCPTR(png_destroy_write_struct); + LOAD_FUNCPTR(png_get_error_ptr); LOAD_FUNCPTR(png_init_io); LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_error_fn); LOAD_FUNCPTR(png_set_IHDR); LOAD_FUNCPTR(png_set_text); LOAD_FUNCPTR(png_write_end); @@ -221,6 +225,23 @@ static void *load_libpng(void) return libpng_handle; } +static void user_error_fn(png_structp png_ptr, png_const_charp error_message) +{ + jmp_buf *pjmpbuf; + + /* This uses setjmp/longjmp just like the default. We can't use the + * default because there's no way to access the jmp buffer in the png_struct + * that works in 1.2 and 1.4 and allows us to dynamically load libpng. */ + WINE_ERR("PNG error: %s\n", wine_dbgstr_an(error_message, -1)); + pjmpbuf = ppng_get_error_ptr(png_ptr); + longjmp(*pjmpbuf, 1); +} + +static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message) +{ + WINE_WARN("PNG warning: %s\n", wine_dbgstr_an(warning_message, -1)); +} + static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, LPCWSTR commentW) { static const char comment_key[] = "Created from"; @@ -234,6 +255,7 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, int nWidth = pIcon->bmiHeader.biWidth; int nHeight = pIcon->bmiHeader.biHeight; int nBpp = pIcon->bmiHeader.biBitCount; + jmp_buf jmpbuf; switch (nBpp) { @@ -306,12 +328,12 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, !(info_ptr = ppng_create_info_struct(png_ptr))) goto error; - if (setjmp(png_jmpbuf(png_ptr))) + if (setjmp(jmpbuf)) { /* All future errors jump here */ - WINE_ERR("png error\n"); goto error; } + ppng_set_error_fn(png_ptr, &jmpbuf, user_error_fn, user_warning_fn); ppng_init_io(png_ptr, fp); ppng_set_IHDR(png_ptr, info_ptr, nWidth, nHeight, 8,

1 0

Alistair Leslie-Hughes : dbghelp: Add basic support for PVOID64.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: d02040d98a7e689dcaf26dc2c9fbc112e523f7c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02040d98a7e689dcaf26dc2c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 3 12:41:51 2010 +1100 dbghelp: Add basic support for PVOID64. --- dlls/dbghelp/msc.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index b7adabd..ee394cd 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -95,7 +95,7 @@ static void dump(const void* ptr, unsigned len) * Process CodeView type information. */ -#define MAX_BUILTIN_TYPES 0x0480 +#define MAX_BUILTIN_TYPES 0x0604 #define FIRST_DEFINABLE_TYPE 0x1000 static struct symt* cv_basic_types[MAX_BUILTIN_TYPES]; @@ -113,6 +113,7 @@ static struct cv_defined_module*cv_current_module; static void codeview_init_basic_types(struct module* module) { + struct symt_udt* udt; /* * These are the common builtin types that are used by VC++. */ @@ -169,6 +170,12 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_32PINT8] = &symt_new_pointer(module, cv_basic_types[T_INT8])->symt; cv_basic_types[T_32PUINT8] = &symt_new_pointer(module, cv_basic_types[T_UINT8])->symt; cv_basic_types[T_32PHRESULT]= &symt_new_pointer(module, cv_basic_types[T_HRESULT])->symt; + + /* The .pdb file can refer to 64 bit pointers values even on 32 bits applications. */ + udt = symt_new_udt(module, "PVOID64", 8, UdtStruct); + symt_add_udt_element(module, udt, "ptr64_low", cv_basic_types[T_LONG], 0, 32); + symt_add_udt_element(module, udt, "ptr64_high", cv_basic_types[T_LONG], 32, 32); + cv_basic_types[0x603]= &udt->symt; } static int leaf_as_variant(VARIANT* v, const unsigned short int* leaf)

1 0

Jacek Caban : jscript: Don't try to create property in jsdisp_call_name.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: bf17483a195493bb5016ef604b91be04c8a9d5da URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf17483a195493bb5016ef604… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 5 23:14:35 2010 +0100 jscript: Don't try to create property in jsdisp_call_name. --- dlls/jscript/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 492623e..19fdd56 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -878,7 +878,7 @@ HRESULT jsdisp_call_name(DispatchEx *disp, const WCHAR *name, WORD flags, DISPPA dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(disp, name, TRUE, &prop); + hres = find_prop_name_prot(disp, name, FALSE, &prop); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Moved property creation out of find_prop_name_prot.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 10c99b5735e4a868f076036b2cf08e704741a5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c99b5735e4a868f076036b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 5 23:15:07 2010 +0100 jscript: Moved property creation out of find_prop_name_prot. --- dlls/jscript/dispex.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 19fdd56..f2c22a9 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -160,7 +160,7 @@ static HRESULT find_prop_name(DispatchEx *This, const WCHAR *name, dispex_prop_t return S_OK; } -static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, BOOL alloc, dispex_prop_t **ret) +static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, dispex_prop_t **ret) { dispex_prop_t *prop; HRESULT hres; @@ -174,7 +174,7 @@ static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, BOOL all } if(This->prototype) { - hres = find_prop_name_prot(This->prototype, name, FALSE, &prop); + hres = find_prop_name_prot(This->prototype, name, &prop); if(FAILED(hres)) return hres; if(prop) { @@ -186,17 +186,27 @@ static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, BOOL all } } - if(alloc) { + *ret = prop; + return S_OK; +} + +static HRESULT ensure_prop_name(DispatchEx *This, const WCHAR *name, DWORD create_flags, dispex_prop_t **ret) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name_prot(This, name, &prop); + if(SUCCEEDED(hres) && !prop) { TRACE("creating prop %s\n", debugstr_w(name)); - prop = alloc_prop(This, name, PROP_VARIANT, PROPF_ENUM); + prop = alloc_prop(This, name, PROP_VARIANT, create_flags); if(!prop) return E_OUTOFMEMORY; VariantInit(&prop->u.var); } *ret = prop; - return S_OK; + return hres; } static HRESULT set_this(DISPPARAMS *dp, DISPPARAMS *olddp, IDispatch *jsthis) @@ -789,7 +799,7 @@ HRESULT init_dispex_from_constr(DispatchEx *dispex, script_ctx_t *ctx, const bui static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; - hres = find_prop_name_prot(constr, prototypeW, FALSE, &prop); + hres = find_prop_name_prot(constr, prototypeW, &prop); if(SUCCEEDED(hres) && prop) { jsexcept_t jsexcept; VARIANT var; @@ -831,7 +841,10 @@ HRESULT jsdisp_get_id(DispatchEx *jsdisp, const WCHAR *name, DWORD flags, DISPID dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(jsdisp, name, (flags&fdexNameEnsure) != 0, &prop); + if(flags & fdexNameEnsure) + hres = ensure_prop_name(jsdisp, name, PROPF_ENUM, &prop); + else + hres = find_prop_name_prot(jsdisp, name, &prop); if(FAILED(hres)) return hres; @@ -878,7 +891,7 @@ HRESULT jsdisp_call_name(DispatchEx *disp, const WCHAR *name, WORD flags, DISPPA dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(disp, name, FALSE, &prop); + hres = find_prop_name_prot(disp, name, &prop); if(FAILED(hres)) return hres; @@ -933,7 +946,7 @@ HRESULT jsdisp_propput_name(DispatchEx *obj, const WCHAR *name, VARIANT *val, js dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(obj, name, TRUE, &prop); + hres = ensure_prop_name(obj, name, PROPF_ENUM, &prop); if(FAILED(hres)) return hres; @@ -992,7 +1005,7 @@ HRESULT jsdisp_propget_name(DispatchEx *obj, const WCHAR *name, VARIANT *var, js dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(obj, name, FALSE, &prop); + hres = find_prop_name_prot(obj, name, &prop); if(FAILED(hres)) return hres; @@ -1014,7 +1027,7 @@ HRESULT jsdisp_get_idx(DispatchEx *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, sprintfW(name, formatW, idx); - hres = find_prop_name_prot(obj, name, FALSE, &prop); + hres = find_prop_name_prot(obj, name, &prop); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Get value as VARIANT in prop_put.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 10c9931051158c7506c73b2c0162230db6e327b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c9931051158c7506c73b2c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 5 23:15:46 2010 +0100 jscript: Get value as VARIANT in prop_put. --- dlls/jscript/dispex.c | 71 +++++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 35 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f2c22a9..c67fc41 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -350,19 +350,19 @@ static HRESULT prop_get(DispatchEx *This, dispex_prop_t *prop, DISPPARAMS *dp, return hres; } -static HRESULT prop_put(DispatchEx *This, dispex_prop_t *prop, DISPPARAMS *dp, +static HRESULT prop_put(DispatchEx *This, dispex_prop_t *prop, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) { - DWORD i; HRESULT hres; switch(prop->type) { case PROP_BUILTIN: if(!(prop->flags & PROPF_METHOD)) { + DISPPARAMS dp = {val, NULL, 1, 0}; vdisp_t vthis; set_jsdisp(&vthis, This); - hres = prop->u.p->invoke(This->ctx, &vthis, DISPATCH_PROPERTYPUT, dp, NULL, ei, caller); + hres = prop->u.p->invoke(This->ctx, &vthis, DISPATCH_PROPERTYPUT, &dp, NULL, ei, caller); vdisp_release(&vthis); return hres; } @@ -379,24 +379,14 @@ static HRESULT prop_put(DispatchEx *This, dispex_prop_t *prop, DISPPARAMS *dp, return E_FAIL; } - for(i=0; i < dp->cNamedArgs; i++) { - if(dp->rgdispidNamedArgs[i] == DISPID_PROPERTYPUT) - break; - } - - if(i == dp->cNamedArgs) { - TRACE("no value to set\n"); - return DISP_E_PARAMNOTOPTIONAL; - } - - hres = VariantCopy(&prop->u.var, dp->rgvarg+i); + hres = VariantCopy(&prop->u.var, val); if(FAILED(hres)) return hres; if(This->builtin_info->on_put) This->builtin_info->on_put(This, prop->name); - TRACE("%s = %s\n", debugstr_w(prop->name), debugstr_variant(dp->rgvarg+i)); + TRACE("%s = %s\n", debugstr_w(prop->name), debugstr_variant(val)); return S_OK; } @@ -589,9 +579,22 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_PROPERTYGET: hres = prop_get(This, prop, pdp, pvarRes, &jsexcept, pspCaller); break; - case DISPATCH_PROPERTYPUT: - hres = prop_put(This, prop, pdp, &jsexcept, pspCaller); + case DISPATCH_PROPERTYPUT: { + DWORD i; + + for(i=0; i < pdp->cNamedArgs; i++) { + if(pdp->rgdispidNamedArgs[i] == DISPID_PROPERTYPUT) + break; + } + + if(i == pdp->cNamedArgs) { + TRACE("no value to set\n"); + return DISP_E_PARAMNOTOPTIONAL; + } + + hres = prop_put(This, prop, pdp->rgvarg+i, &jsexcept, pspCaller); break; + } default: FIXME("Unimplemented flags %x\n", wFlags); return E_INVALIDARG; @@ -941,8 +944,6 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS HRESULT jsdisp_propput_name(DispatchEx *obj, const WCHAR *name, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) { - DISPID named_arg = DISPID_PROPERTYPUT; - DISPPARAMS dp = {val, &named_arg, 1, 1}; dispex_prop_t *prop; HRESULT hres; @@ -950,7 +951,7 @@ HRESULT jsdisp_propput_name(DispatchEx *obj, const WCHAR *name, VARIANT *val, js if(FAILED(hres)) return hres; - return prop_put(obj, prop, &dp, ei, caller); + return prop_put(obj, prop, val, ei, caller); } HRESULT jsdisp_propput_idx(DispatchEx *obj, DWORD idx, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) @@ -965,9 +966,6 @@ HRESULT jsdisp_propput_idx(DispatchEx *obj, DWORD idx, VARIANT *val, jsexcept_t HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) { - DISPID dispid = DISPID_PROPERTYPUT; - DISPPARAMS dp = {val, &dispid, 1, 1}; - IDispatchEx *dispex; DispatchEx *jsdisp; HRESULT hres; @@ -977,25 +975,28 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val prop = get_prop(jsdisp, id); if(prop) - hres = prop_put(jsdisp, prop, &dp, ei, caller); + hres = prop_put(jsdisp, prop, val, ei, caller); else hres = DISP_E_MEMBERNOTFOUND; jsdisp_release(jsdisp); - return hres; - } - - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(FAILED(hres)) { - ULONG err = 0; + }else { + DISPID dispid = DISPID_PROPERTYPUT; + DISPPARAMS dp = {val, &dispid, 1, 1}; + IDispatchEx *dispex; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei->ei, caller); + IDispatchEx_Release(dispex); + }else { + ULONG err = 0; - TRACE("using IDispatch\n"); - return IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei->ei, &err); + TRACE("using IDispatch\n"); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei->ei, &err); + } } - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei->ei, caller); - - IDispatchEx_Release(dispex); return hres; }

1 0

Jacek Caban : jscript: Avoid unnecessary prototype lookup.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 75ab8e2027379f952ddd8ee67497942323fa6c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ab8e2027379f952ddd8ee67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 5 23:17:06 2010 +0100 jscript: Avoid unnecessary prototype lookup. --- dlls/jscript/dispex.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index c67fc41..c420f54 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -190,12 +190,15 @@ static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, dispex_p return S_OK; } -static HRESULT ensure_prop_name(DispatchEx *This, const WCHAR *name, DWORD create_flags, dispex_prop_t **ret) +static HRESULT ensure_prop_name(DispatchEx *This, const WCHAR *name, BOOL search_prot, DWORD create_flags, dispex_prop_t **ret) { dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(This, name, &prop); + if(search_prot) + hres = find_prop_name_prot(This, name, &prop); + else + hres = find_prop_name(This, name, &prop); if(SUCCEEDED(hres) && !prop) { TRACE("creating prop %s\n", debugstr_w(name)); @@ -845,7 +848,7 @@ HRESULT jsdisp_get_id(DispatchEx *jsdisp, const WCHAR *name, DWORD flags, DISPID HRESULT hres; if(flags & fdexNameEnsure) - hres = ensure_prop_name(jsdisp, name, PROPF_ENUM, &prop); + hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUM, &prop); else hres = find_prop_name_prot(jsdisp, name, &prop); if(FAILED(hres)) @@ -947,7 +950,7 @@ HRESULT jsdisp_propput_name(DispatchEx *obj, const WCHAR *name, VARIANT *val, js dispex_prop_t *prop; HRESULT hres; - hres = ensure_prop_name(obj, name, PROPF_ENUM, &prop); + hres = ensure_prop_name(obj, name, FALSE, PROPF_ENUM, &prop); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Added support for constructor property.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 9fd4f4a44a5704a839103bfed7e03b1206d31086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd4f4a44a5704a839103bfed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 5 23:17:35 2010 +0100 jscript: Added support for constructor property. --- dlls/jscript/dispex.c | 17 +++++++++++++++++ dlls/jscript/tests/lang.js | 5 +++++ dlls/jscript/tests/regexp.js | 1 + 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index c420f54..6894eae 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -803,6 +803,7 @@ HRESULT init_dispex_from_constr(DispatchEx *dispex, script_ctx_t *ctx, const bui dispex_prop_t *prop; HRESULT hres; + static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r'}; static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; hres = find_prop_name_prot(constr, prototypeW, &prop); @@ -827,6 +828,22 @@ HRESULT init_dispex_from_constr(DispatchEx *dispex, script_ctx_t *ctx, const bui if(prot) jsdisp_release(prot); + if(FAILED(hres)) + return hres; + + hres = ensure_prop_name(dispex, constructorW, FALSE, 0, &prop); + if(SUCCEEDED(hres)) { + jsexcept_t jsexcept; + VARIANT var; + + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(constr); + memset(&jsexcept, 0, sizeof(jsexcept)); + hres = prop_put(dispex, prop, &var, &jsexcept, NULL/*FIXME*/); + } + if(FAILED(hres)) + jsdisp_release(dispex); + return hres; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index d91b1f2..495762e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -116,6 +116,7 @@ ok(tmp === 1, "tmp = " + tmp); var obj1 = new Object(); ok(typeof(obj1) === "object", "typeof(obj1) is not object"); +ok(obj1.constructor === Object, "unexpected obj1.constructor"); obj1.test = true; obj1.func = function () { ok(this === obj1, "this is not obj1"); @@ -144,6 +145,7 @@ testConstr1.prototype.pvar = 1; var obj2 = new testConstr1(true); ok(typeof(obj2) === "object", "typeof(obj2) is not object"); +ok(obj2.constructor === testConstr1, "unexpected obj2.constructor"); ok(obj2.pvar === 1, "obj2.pvar is not 1"); testConstr1.prototype.pvar = 2; @@ -209,6 +211,7 @@ if(false) { var obj3 = { prop1: 1, prop2: typeof(false) }; ok(obj3.prop1 === 1, "obj3.prop1 is not 1"); ok(obj3.prop2 === "boolean", "obj3.prop2 is not \"boolean\""); +ok(obj3.constructor === Object, "unexpected obj3.constructor"); { var blockVar = 1; @@ -422,8 +425,10 @@ ok(+"3e3" === 3000, "+'3e3' !== 3000"); tmp = new Number(1); ok(+tmp === 1, "+(new Number(1)) = " + (+tmp)); +ok(tmp.constructor === Number, "unexpected tmp.constructor"); tmp = new String("1"); ok(+tmp === 1, "+(new String('1')) = " + (+tmp)); +ok(tmp.constructor === String, "unexpected tmp.constructor"); ok("" + 0 === "0", "\"\" + 0 !== \"0\""); ok("" + 123 === "123", "\"\" + 123 !== \"123\""); diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index d09d787..fac1112 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -100,6 +100,7 @@ m = "abcabc".match(re = /ca/); ok(typeof(m) === "object", "typeof m is not object"); ok(m.length === 1, "m.length is not 1"); ok(m["0"] === "ca", "m[0] is not \"ca\""); +ok(m.constructor === Array, "unexpected m.constructor"); ok(re.lastIndex === 4, "re.lastIndex = " + re.lastIndex); m = "abcabc".match(/ab/);

1 0

Alexandre Julliard : Wine release 1.1.38
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: website Branch: master Commit: a9ef6bd5e5b5d9399c37674922e00562c134f016 URL: http://source.winehq.org/git/website.git/?a=commit;h=a9ef6bd5e5b5d9399c3767… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 18:38:24 2010 +0100 Wine release 1.1.38 --- news/en/2010020501.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2010020501.xml b/news/en/2010020501.xml new file mode 100644 index 0000000..4f6c19e --- /dev/null +++ b/news/en/2010020501.xml @@ -0,0 +1,18 @@ +<news> +<date>February 5, 2010</date> +<title>Wine 1.1.38 Released</title> +<body> + The Wine development release 1.1.38 is now available. + <a href="{$root}/announce/1.1.38">What's new</a> in this release: +<ul> + <li>Better support for memory allocations debugging.</li> + <li>Improved MIDI support.</li> + <li>A wide range of Direct3D fixes.</li> + <li>OLEDB fixes (should fix Clipart in Office).</li> + <li>Improved debugger support on x86-64.</li> + <li>Many MSI fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.38.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : configure: Avoid incorrectly cleaning up symlink targets when running in the source dir .
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: master Commit: 9acf1d18ce8904830f19c5987e4324b8dc81f6db URL: http://source.winehq.org/git/wine.git/?a=commit;h=9acf1d18ce8904830f19c5987… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 17:24:12 2010 +0100 configure: Avoid incorrectly cleaning up symlink targets when running in the source dir. --- aclocal.m4 | 2 +- configure | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 3240435..357edf8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -147,7 +147,7 @@ dnl dnl Usage: WINE_CONFIG_SYMLINK(name,target) dnl AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl -ALL_SYMLINKS="$ALL_SYMLINKS \\ +m4_if([$2],,[test "$srcdir" = "." || ])ALL_SYMLINKS="$ALL_SYMLINKS \\ $1"]) dnl **** Create a make rules file from config.status **** diff --git a/configure b/configure index f60272d..ab9c17b 100755 --- a/configure +++ b/configure @@ -13686,19 +13686,19 @@ ac_config_commands="$ac_config_commands include/stamp-h" ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" -ALL_SYMLINKS="$ALL_SYMLINKS \\ +test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\ dlls/wineps.drv/generic.ppd" ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" -ALL_SYMLINKS="$ALL_SYMLINKS \\ +test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\ fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" -ALL_SYMLINKS="$ALL_SYMLINKS \\ +test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\ fonts/symbol.ttf" ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" -ALL_SYMLINKS="$ALL_SYMLINKS \\ +test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\ fonts/tahoma.ttf" ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" -ALL_SYMLINKS="$ALL_SYMLINKS \\ +test "$srcdir" = "." || ALL_SYMLINKS="$ALL_SYMLINKS \\ fonts/tahomabd.ttf" ac_config_links="$ac_config_links wine:tools/winewrapper" ALL_SYMLINKS="$ALL_SYMLINKS \\

1 0