June 2012 - Wine-commits - list.winehq.org

Dmitry Timoshkov : windowscodecs: Add support for loading of multiple simple IFD fields.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: aedd9271b776e037d59ade2dbec8ce1ccfd705b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aedd9271b776e037d59ade2db… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 11:20:39 2012 +0900 windowscodecs: Add support for loading of multiple simple IFD fields. --- dlls/windowscodecs/metadatahandler.c | 106 ++++++++++++++++++++++++++++++---- 1 files changed, 94 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index eecbf65..5770e12 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -704,8 +704,10 @@ static int tag_to_vt(SHORT tag) static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, MetadataItem *item, BOOL native_byte_order) { - ULONG count, value; + ULONG count, value, i; SHORT type; + LARGE_INTEGER pos; + HRESULT hr; item->schema.vt = VT_EMPTY; item->id.vt = VT_UI2; @@ -724,22 +726,84 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, { case IFD_BYTE: case IFD_SBYTE: - if (count == 1) + if (count <= 4) { - item->value.u.bVal = *(const BYTE *)&entry->value; + const BYTE *data = (const BYTE *)&entry->value; + + if (count == 1) + item->value.u.bVal = data[0]; + else + { + item->value.vt |= VT_VECTOR; + item->value.u.caub.cElems = count; + item->value.u.caub.pElems = HeapAlloc(GetProcessHeap(), 0, count); + memcpy(item->value.u.caub.pElems, data, count); + } break; } - FIXME("loading multiple byte fields is not implemented\n"); + + item->value.vt |= VT_VECTOR; + item->value.u.caub.cElems = count; + item->value.u.caub.pElems = HeapAlloc(GetProcessHeap(), 0, count); + if (!item->value.u.caub.pElems) return E_OUTOFMEMORY; + + pos.QuadPart = value; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.caub.pElems); + return hr; + } + hr = IStream_Read(input, item->value.u.caub.pElems, count, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.caub.pElems); + return hr; + } break; case IFD_SHORT: case IFD_SSHORT: - if (count == 1) + if (count <= 2) { - item->value.u.uiVal = *(const SHORT *)&entry->value; - SWAP_USHORT(item->value.u.uiVal); + const SHORT *data = (const SHORT *)&entry->value; + + if (count == 1) + { + item->value.u.uiVal = data[0]; + SWAP_USHORT(item->value.u.uiVal); + } + else + { + item->value.vt |= VT_VECTOR; + item->value.u.caui.cElems = count; + item->value.u.caui.pElems = HeapAlloc(GetProcessHeap(), 0, count * 2); + memcpy(item->value.u.caui.pElems, data, count * 2); + for (i = 0; i < count; i++) + SWAP_USHORT(item->value.u.caui.pElems[i]); + } break; } - FIXME("loading multiple short fields is not implemented\n"); + + item->value.vt |= VT_VECTOR; + item->value.u.caui.cElems = count; + item->value.u.caui.pElems = HeapAlloc(GetProcessHeap(), 0, count * 2); + if (!item->value.u.caui.pElems) return E_OUTOFMEMORY; + + pos.QuadPart = value; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.caui.pElems); + return hr; + } + hr = IStream_Read(input, item->value.u.caui.pElems, count * 2, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.caui.pElems); + return hr; + } + for (i = 0; i < count; i++) + SWAP_USHORT(item->value.u.caui.pElems[i]); break; case IFD_LONG: case IFD_SLONG: @@ -749,15 +813,33 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, item->value.u.ulVal = value; break; } - FIXME("loading multiple long fields is not implemented\n"); + + item->value.vt |= VT_VECTOR; + item->value.u.caul.cElems = count; + item->value.u.caul.pElems = HeapAlloc(GetProcessHeap(), 0, count * 4); + if (!item->value.u.caul.pElems) return E_OUTOFMEMORY; + + pos.QuadPart = value; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.caul.pElems); + return hr; + } + hr = IStream_Read(input, item->value.u.caul.pElems, count * 4, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.caul.pElems); + return hr; + } + for (i = 0; i < count; i++) + SWAP_ULONG(item->value.u.caul.pElems[i]); break; case IFD_RATIONAL: case IFD_SRATIONAL: case IFD_DOUBLE: if (count == 1) { - HRESULT hr; - LARGE_INTEGER pos; struct IFD_rational rational; pos.QuadPart = value; @@ -773,7 +855,7 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, FIXME("loading multiple rational fields is not implemented\n"); break; default: - FIXME("loading field of type %d is not implemented\n", entry->type); + FIXME("loading field of type %d, count %u is not implemented\n", type, count); break; } return S_OK;

1 0

Dmitry Timoshkov : windowscodecs: Fix handling of 8-byte IFD fields.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 722cb46c052892b166bcf9d9f017b07124d05a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722cb46c052892b166bcf9d9f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 11:20:46 2012 +0900 windowscodecs: Fix handling of 8-byte IFD fields. --- dlls/windowscodecs/metadatahandler.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 5770e12..cf356de 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -649,7 +649,6 @@ HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, vo #define SWAP_ULONG(x) do { if (!native_byte_order) (x) = RtlUlongByteSwap(x); } while(0) #define SWAP_ULONGLONG(x) do { if (!native_byte_order) (x) = RtlUlonglongByteSwap(x); } while(0) -#include "pshpack2.h" struct IFD_entry { SHORT id; @@ -658,13 +657,6 @@ struct IFD_entry LONG value; }; -struct IFD_rational -{ - LONG numerator; - LONG denominator; -}; -#include "poppack.h" - #define IFD_BYTE 1 #define IFD_ASCII 2 #define IFD_SHORT 3 @@ -840,16 +832,24 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, case IFD_DOUBLE: if (count == 1) { - struct IFD_rational rational; + ULONGLONG ull; pos.QuadPart = value; hr = IStream_Seek(input, pos, SEEK_SET, NULL); if (FAILED(hr)) return hr; - hr = IStream_Read(input, &rational, sizeof(rational), NULL); + hr = IStream_Read(input, &ull, sizeof(ull), NULL); if (FAILED(hr)) return hr; - item->value.u.uhVal.QuadPart = ((LONGLONG)rational.denominator << 32) | rational.numerator; - SWAP_ULONGLONG(item->value.u.uhVal.QuadPart); + + item->value.u.uhVal.QuadPart = ull; + + if (type == IFD_DOUBLE) + SWAP_ULONGLONG(item->value.u.uhVal.QuadPart); + else + { + SWAP_ULONG(item->value.u.uhVal.u.LowPart); + SWAP_ULONG(item->value.u.uhVal.u.HighPart); + } break; } FIXME("loading multiple rational fields is not implemented\n");

1 0

Dmitry Timoshkov : windowscodecs: Add tests for more types of IFD fields.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 32f9f327b2a83ddb59ce1aaca47cf42ff619efe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f9f327b2a83ddb59ce1aaca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 11:20:53 2012 +0900 windowscodecs: Add tests for more types of IFD fields. --- dlls/windowscodecs/tests/metadata.c | 116 +++++++++++++++++++++++++++++------ 1 files changed, 97 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 3c433bd..ea0dd66 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -39,16 +39,26 @@ } \ } while (0) +#define IFD_BYTE 1 +#define IFD_ASCII 2 #define IFD_SHORT 3 #define IFD_LONG 4 #define IFD_RATIONAL 5 +#define IFD_SBYTE 6 +#define IFD_UNDEFINED 7 +#define IFD_SSHORT 8 +#define IFD_SLONG 9 +#define IFD_SRATIONAL 10 +#define IFD_FLOAT 11 +#define IFD_DOUBLE 12 +#define IFD_IFD 13 #include "pshpack2.h" struct IFD_entry { SHORT id; SHORT type; - ULONG length; + ULONG count; LONG value; }; @@ -58,26 +68,50 @@ struct IFD_rational LONG denominator; }; -static const struct +static const struct ifd_data { USHORT number_of_entries; - struct IFD_entry entry[6]; + struct IFD_entry entry[40]; ULONG next_IFD; struct IFD_rational xres; + DOUBLE double_val; + struct IFD_rational srational_val; + char string[14]; + SHORT short_val[4]; + LONG long_val[2]; + FLOAT float_val[2]; } IFD_data = { - 6, + 19, { { 0xfe, IFD_SHORT, 1, 1 }, /* NEWSUBFILETYPE */ { 0x100, IFD_LONG, 1, 222 }, /* IMAGEWIDTH */ { 0x101, IFD_LONG, 1, 333 }, /* IMAGELENGTH */ { 0x102, IFD_SHORT, 1, 24 }, /* BITSPERSAMPLE */ { 0x103, IFD_LONG, 1, 32773 }, /* COMPRESSION: packbits */ - { 0x11a, IFD_RATIONAL, 1, /* XRESOLUTION */ - sizeof(USHORT) + sizeof(struct IFD_entry) * 6 + sizeof(ULONG) } + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct ifd_data, xres) }, + { 0xf001, IFD_BYTE, 1, 0x11223344 }, + { 0xf002, IFD_BYTE, 4, 0x11223344 }, + { 0xf003, IFD_SBYTE, 1, 0x11223344 }, + { 0xf004, IFD_SSHORT, 1, 0x11223344 }, + { 0xf005, IFD_SSHORT, 2, 0x11223344 }, + { 0xf006, IFD_SLONG, 1, 0x11223344 }, + { 0xf007, IFD_FLOAT, 1, 0x11223344 }, + { 0xf008, IFD_DOUBLE, 1, FIELD_OFFSET(struct ifd_data, double_val) }, + { 0xf009, IFD_SRATIONAL, 1, FIELD_OFFSET(struct ifd_data, srational_val) }, + { 0xf00a, IFD_BYTE, 13, FIELD_OFFSET(struct ifd_data, string) }, + { 0xf00b, IFD_SSHORT, 4, FIELD_OFFSET(struct ifd_data, short_val) }, + { 0xf00c, IFD_SLONG, 2, FIELD_OFFSET(struct ifd_data, long_val) }, + { 0xf00d, IFD_FLOAT, 2, FIELD_OFFSET(struct ifd_data, float_val) }, }, 0, - { 900, 3 } + { 900, 3 }, + 1234567890.0987654321, + { 0x1a2b3c4d, 0x5a6b7c8d }, + "Hello World!", + { 0x0101, 0x0202, 0x0303, 0x0404 }, + { 0x11223344, 0x55667788 }, + { (FLOAT)1234.5678, (FLOAT)8765.4321 }, }; #include "poppack.h" @@ -349,15 +383,29 @@ static void test_metadata_IFD(void) static const struct test_data { ULONG type, id; - LONGLONG value; - } td[6] = + int count; /* if VT_VECTOR */ + LONGLONG value[13]; + } td[19] = { - { VT_UI2, 0xfe, 1 }, - { VT_UI4, 0x100, 222 }, - { VT_UI4, 0x101, 333 }, - { VT_UI2, 0x102, 24 }, - { VT_UI4, 0x103, 32773 }, - { VT_UI8, 0x11a, ((LONGLONG)3 << 32) | 900 } + { VT_UI2, 0xfe, 0, { 1 } }, + { VT_UI4, 0x100, 0, { 222 } }, + { VT_UI4, 0x101, 0, { 333 } }, + { VT_UI2, 0x102, 0, { 24 } }, + { VT_UI4, 0x103, 0, { 32773 } }, + { VT_UI8, 0x11a, 0, { ((LONGLONG)3 << 32) | 900 } }, + { VT_UI1, 0xf001, 0, { 0x44 } }, + { VT_UI1|VT_VECTOR, 0xf002, 4, { 0x44, 0x33, 0x22, 0x11 } }, + { VT_I1, 0xf003, 0, { 0x44 } }, + { VT_I2, 0xf004, 0, { 0x3344 } }, + { VT_I2|VT_VECTOR, 0xf005, 2, { 0x3344, 0x1122 } }, + { VT_I4, 0xf006, 0, { 0x11223344 } }, + { VT_R4, 0xf007, 0, { 0x11223344 } }, + { VT_R8, 0xf008, 0, { ((LONGLONG)0x41d26580 << 32) | 0xb486522c } }, + { VT_I8, 0xf009, 0, { ((LONGLONG)0x5a6b7c8d << 32) | 0x1a2b3c4d } }, + { VT_UI1|VT_VECTOR, 0xf00a, 13, { 'H','e','l','l','o',' ','W','o','r','l','d','!',0 } }, + { VT_I2|VT_VECTOR, 0xf00b, 4, { 0x0101, 0x0202, 0x0303, 0x0404 } }, + { VT_I4|VT_VECTOR, 0xf00c, 2, { 0x11223344, 0x55667788 } }, + { VT_R4|VT_VECTOR, 0xf00d, 2, { 0x449a522b, 0x4608f5ba } }, }; HRESULT hr; IWICMetadataReader *reader; @@ -386,7 +434,7 @@ static void test_metadata_IFD(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == 6, "unexpected count %u\n", count); + ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); hr = IWICMetadataReader_GetEnumerator(reader, NULL); ok(hr == E_INVALIDARG, "GetEnumerator error %#x\n", hr); @@ -402,9 +450,39 @@ static void test_metadata_IFD(void) ok(schema.vt == VT_EMPTY, "%u: unexpected vt: %u\n", i, schema.vt); ok(id.vt == VT_UI2, "%u: unexpected vt: %u\n", i, id.vt); - ok(U(id).uiVal == td[i].id, "%u: unexpected id: %#x\n", i, U(id).uiVal); - ok(value.vt == td[i].type, "%u: unexpected vt: %u\n", i, value.vt); - ok(U(value).uhVal.QuadPart == td[i].value, "%u: unexpected id: %d/%d\n", i, U(value).uhVal.u.LowPart, U(value).uhVal.u.HighPart); + ok(U(id).uiVal == td[i].id, "%u: expected id %#x, got %#x\n", i, td[i].id, U(id).uiVal); + ok(value.vt == td[i].type, "%u: expected vt %#x, got %#x\n", i, td[i].type, value.vt); + if (value.vt & VT_VECTOR) + { + ULONG j; + switch (value.vt & ~VT_VECTOR) + { + case VT_I1: + case VT_UI1: + ok(td[i].count == U(value).caub.cElems, "%u: expected cElems %d, got %d\n", i, td[i].count, U(value).caub.cElems); + for (j = 0; j < U(value).caub.cElems; j++) + ok(td[i].value[j] == U(value).caub.pElems[j], "%u: expected value[%d] %#x/%#x, got %#x\n", i, j, (ULONG)td[i].value[j], (ULONG)(td[i].value[j] >> 32), U(value).caub.pElems[j]); + break; + case VT_I2: + case VT_UI2: + ok(td[i].count == U(value).caui.cElems, "%u: expected cElems %d, got %d\n", i, td[i].count, U(value).caui.cElems); + for (j = 0; j < U(value).caui.cElems; j++) + ok(td[i].value[j] == U(value).caui.pElems[j], "%u: expected value[%d] %#x/%#x, got %#x\n", i, j, (ULONG)td[i].value[j], (ULONG)(td[i].value[j] >> 32), U(value).caui.pElems[j]); + break; + case VT_I4: + case VT_UI4: + case VT_R4: + ok(td[i].count == U(value).caul.cElems, "%u: expected cElems %d, got %d\n", i, td[i].count, U(value).caui.cElems); + for (j = 0; j < U(value).caul.cElems; j++) + ok(td[i].value[j] == U(value).caul.pElems[j], "%u: expected value[%d] %#x/%#x, got %#x\n", i, j, (ULONG)td[i].value[j], (ULONG)(td[i].value[j] >> 32), U(value).caul.pElems[j]); + break; + default: + ok(0, "%u: array of type %d is not handled\n", i, value.vt & ~VT_VECTOR); + break; + } + } + else + ok(U(value).uhVal.QuadPart == td[i].value[0], "%u: unexpected value: %d/%d\n", i, U(value).uhVal.u.LowPart, U(value).uhVal.u.HighPart); PropVariantClear(&schema); PropVariantClear(&id);

1 0

Jacek Caban : jscript: Use INFINITY macro instead of num_set_inf().
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 4a335142f9eb7be10fdc838a6ab738a073fac6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a335142f9eb7be10fdc838a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 21 10:47:19 2012 +0200 jscript: Use INFINITY macro instead of num_set_inf(). --- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 12 ------------ dlls/jscript/math.c | 4 ++-- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index c01b082..ae43285 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -1283,7 +1283,7 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - num_set_inf(&var, TRUE); + num_set_val(&var, INFINITY); hres = jsdisp_propput_name(ctx->global, InfinityW, &var, NULL/*FIXME*/); return hres; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index e27b829..571d6e1 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -435,18 +435,6 @@ static inline void num_set_val(VARIANT *v, DOUBLE d) } } -static inline void num_set_inf(VARIANT *v, BOOL positive) -{ - V_VT(v) = VT_R8; -#ifdef INFINITY - V_R8(v) = positive ? INFINITY : -INFINITY; -#else - V_UI8(v) = (ULONGLONG)0x7ff00000<<32; - if(!positive) - V_R8(v) = -V_R8(v); -#endif -} - static inline void var_set_jsdisp(VARIANT *v, jsdisp_t *jsdisp) { V_VT(v) = VT_DISPATCH; diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index d30e464..d0eab57 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -295,7 +295,7 @@ static HRESULT Math_max(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA if(!arg_cnt(dp)) { if(retv) - num_set_inf(retv, FALSE); + num_set_val(retv, -INFINITY); return S_OK; } @@ -329,7 +329,7 @@ static HRESULT Math_min(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA if(!arg_cnt(dp)) { if(retv) - num_set_inf(retv, TRUE); + num_set_val(retv, INFINITY); return S_OK; }

1 0

Jacek Caban : jscript: Make Function object invocation a special case in IDispatchEx implementation .
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 17ff7829d3f4d4a8ac3cabf2c0afb54dcb2dccbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ff7829d3f4d4a8ac3cabf2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 21 10:47:36 2012 +0200 jscript: Make Function object invocation a special case in IDispatchEx implementation. --- dlls/jscript/dispex.c | 14 ++++++++++---- dlls/jscript/function.c | 21 +++++++++++++++++++++ dlls/jscript/jscript.h | 1 + 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index dd4b081..7763512 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -391,7 +391,6 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t case PROP_BUILTIN: { DISPPARAMS params; VARIANT buf[6]; - vdisp_t vthis; if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { WARN("%s is not a constructor\n", debugstr_w(prop->name)); @@ -402,9 +401,16 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t if(FAILED(hres)) return hres; - set_jsdisp(&vthis, jsthis); - hres = prop->u.p->invoke(This->ctx, &vthis, flags, &params, retv, ei); - vdisp_release(&vthis); + if(prop->name || jsthis->builtin_info->class != JSCLASS_FUNCTION) { + vdisp_t vthis; + + set_jsdisp(&vthis, jsthis); + hres = prop->u.p->invoke(This->ctx, &vthis, flags, &params, retv, ei); + vdisp_release(&vthis); + }else { + /* Function object calls are special case */ + hres = Function_invoke(This, flags, &params, retv, ei); + } if(params.rgvarg != buf && params.rgvarg != dp->rgvarg) heap_free(params.rgvarg); return hres; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index cfd57a7..9643195 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #include "jscript.h" #include "engine.h" @@ -305,6 +307,25 @@ static HRESULT function_to_string(FunctionInstance *function, BSTR *ret) return S_OK; } +HRESULT Function_invoke(jsdisp_t *func_this, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) +{ + FunctionInstance *function; + + TRACE("\n"); + + assert(is_class(func_this, JSCLASS_FUNCTION)); + function = (FunctionInstance*)func_this; + + if(function->value_proc) + return invoke_value_proc(function->dispex.ctx, function, get_this(dp), flags, dp, retv, ei); + + if(flags == DISPATCH_CONSTRUCT) + return invoke_constructor(function->dispex.ctx, function, dp, retv, ei); + + assert(flags == DISPATCH_METHOD); + return invoke_source(function->dispex.ctx, function, get_this(dp), dp, retv, ei); +} + static HRESULT Function_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 571d6e1..f278b6a 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -225,6 +225,7 @@ VARIANT_BOOL jsdisp_is_own_prop(jsdisp_t *obj, BSTR name) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT Function_value(script_ctx_t*,vdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; +HRESULT Function_invoke(jsdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*); HRESULT throw_eval_error(script_ctx_t*,jsexcept_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_generic_error(script_ctx_t*,jsexcept_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Pass jsthis internally without using DISPPARAMS.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 1dd4cbc49110c1133270004e4a408610c3f6f066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dd4cbc49110c1133270004e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 21 10:48:10 2012 +0200 jscript: Pass jsthis internally without using DISPPARAMS. --- dlls/jscript/array.c | 2 +- dlls/jscript/dispex.c | 135 +++++++++++++++++++++++++++++++++++++---------- dlls/jscript/engine.c | 5 +- dlls/jscript/function.c | 8 ++-- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 5 +- dlls/jscript/string.c | 2 +- 7 files changed, 119 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1dd4cbc49110c11332700…

1 0

Jacek Caban : jscript: Moved DISPPARAMS conversion to InvokeEx.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 00b5ba535587e4690d551685b96585e7caf80ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b5ba535587e4690d551685b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 21 10:48:36 2012 +0200 jscript: Moved DISPPARAMS conversion to InvokeEx. --- dlls/jscript/dispex.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 86fcd85..37dc9de 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -407,18 +407,11 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t switch(prop->type) { case PROP_BUILTIN: { - DISPPARAMS params; - VARIANT buf[6]; - if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { WARN("%s is not a constructor\n", debugstr_w(prop->name)); return E_INVALIDARG; } - hres = convert_params(dp, buf, &params); - if(FAILED(hres)) - return hres; - if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { vdisp_t vthis; @@ -426,14 +419,12 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t set_disp(&vthis, jsthis); else set_jsdisp(&vthis, This); - hres = prop->u.p->invoke(This->ctx, &vthis, flags, &params, retv, ei); + hres = prop->u.p->invoke(This->ctx, &vthis, flags, dp, retv, ei); vdisp_release(&vthis); }else { /* Function object calls are special case */ - hres = Function_invoke(This, jsthis, flags, &params, retv, ei); + hres = Function_invoke(This, jsthis, flags, dp, retv, ei); } - if(params.rgvarg != buf && params.rgvarg != dp->rgvarg) - heap_free(params.rgvarg); return hres; } case PROP_PROTREF: @@ -738,9 +729,19 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc wFlags = DISPATCH_METHOD; /* fall through */ case DISPATCH_METHOD: - case DISPATCH_CONSTRUCT: - hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, pdp, pvarRes, &jsexcept, pspCaller); + case DISPATCH_CONSTRUCT: { + DISPPARAMS params; + VARIANT buf[6]; + + hres = convert_params(pdp, buf, &params); + if(FAILED(hres)) + return hres; + + hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, &params, pvarRes, &jsexcept, pspCaller); + if(params.rgvarg != buf && params.rgvarg != pdp->rgvarg) + heap_free(params.rgvarg); break; + } case DISPATCH_PROPERTYGET: hres = prop_get(This, prop, pdp, pvarRes, &jsexcept, pspCaller); break;

1 0

Piotr Caban : msvcp90: Rename num_get_char_ctor__Init function because it' s not a constructor.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 99a7b2262347af8d8d635479bee1af288894b4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a7b2262347af8d8d635479b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:24:33 2012 +0200 msvcp90: Rename num_get_char_ctor__Init function because it's not a constructor. --- dlls/msvcp90/locale.c | 8 ++++---- dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 9147092..def6a7f 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3988,8 +3988,8 @@ extern const vtable_ptr MSVCP_num_get_short_vtable; /* ?_Init@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z */ /* ?_Init@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z */ /* ?_Init@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z */ -DEFINE_THISCALL_WRAPPER(num_get_wchar_ctor__Init, 8) -void __thiscall num_get_wchar_ctor__Init(num_get *this, const _Locinfo *locinfo) +DEFINE_THISCALL_WRAPPER(num_get_wchar__Init, 8) +void __thiscall num_get_wchar__Init(num_get *this, const _Locinfo *locinfo) { FIXME("(%p %p) stub\n", this, locinfo); } @@ -4402,8 +4402,8 @@ extern const vtable_ptr MSVCP_num_get_char_vtable; /* ?_Init@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z */ /* ?_Init@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z */ -DEFINE_THISCALL_WRAPPER(num_get_char_ctor__Init, 8) -void __thiscall num_get_char_ctor__Init(num_get *this, const _Locinfo *locinfo) +DEFINE_THISCALL_WRAPPER(num_get_char__Init, 8) +void __thiscall num_get_char__Init(num_get *this, const _Locinfo *locinfo) { FIXME("(%p %p) stub\n", this, locinfo); } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index cd46d9b..62fa495 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2494,12 +2494,12 @@ @ stub -arch=win64 ?_Init@?$money_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z @ stub -arch=win32 ?_Init@?$money_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z @ stub -arch=win64 ?_Init@?$money_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z -@ thiscall -arch=win32 ?_Init@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z(ptr ptr) num_get_char_ctor__Init -@ cdecl -arch=win64 ?_Init@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z(ptr ptr) num_get_char_ctor__Init -@ thiscall -arch=win32 ?_Init@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar_ctor__Init -@ cdecl -arch=win64 ?_Init@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar_ctor__Init -@ thiscall -arch=win32 ?_Init@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar_ctor__Init -@ cdecl -arch=win64 ?_Init@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar_ctor__Init +@ thiscall -arch=win32 ?_Init@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z(ptr ptr) num_get_char__Init +@ cdecl -arch=win64 ?_Init@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z(ptr ptr) num_get_char__Init +@ thiscall -arch=win32 ?_Init@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar__Init +@ cdecl -arch=win64 ?_Init@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar__Init +@ thiscall -arch=win32 ?_Init@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar__Init +@ cdecl -arch=win64 ?_Init@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar__Init @ stub -arch=win32 ?_Init@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z @ stub -arch=win64 ?_Init@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z @ stub -arch=win32 ?_Init@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z

1 0

Piotr Caban : msvcp90: Separate num_get::get(long double) and num_get::get( double) functions.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 95ec1f07fcc43b75ec2979056f3c05ee7ba7f09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ec1f07fcc43b75ec2979056… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:25:09 2012 +0200 msvcp90: Separate num_get::get(long double) and num_get::get(double) functions. --- dlls/msvcp90/locale.c | 20 ++++++++++++++++++-- dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95ec1f07fcc43b75ec297…

1 0

Piotr Caban : msvcp90: Define ios_base structure globally.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 05a70c3d19a7fc4b4da13abebf6c98f0895d7ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a70c3d19a7fc4b4da13abeb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:25:23 2012 +0200 msvcp90: Define ios_base structure globally. --- dlls/msvcp90/ios.c | 86 ---------------------------------------------- dlls/msvcp90/locale.c | 89 +++++++++++++++++++++++------------------------ dlls/msvcp90/msvcp90.h | 87 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05a70c3d19a7fc4b4da13…

1 0