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

Piotr Caban : msvcp90: Added num_put<char>::put(double) implementation.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: 27f9052440ac2468f77ee935f2da33b296018693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f9052440ac2468f77ee935f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:27:50 2012 +0200 msvcp90: Added num_put<char>::put(double) implementation. --- dlls/msvcp90/locale.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcp90/msvcp90.h | 2 +- include/msvcrt/stdio.h | 1 + 3 files changed, 107 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2e48c79..88f02e3 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5458,8 +5458,32 @@ ostreambuf_iterator_char* __cdecl num_put_char__Rep(const num_put *this, ostream /* ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADDH(a)Z */ char* __cdecl num_put_char__Ffmt(const num_put *this, char *fmt, char spec, int fmtfl) { - FIXME("(%p %p %d %d) stub\n", this, fmt, spec, fmtfl); - return NULL; + int type = fmtfl & FMTFLAG_floatfield; + char *p = fmt; + + TRACE("(%p %p %d %d)\n", this, fmt, spec, fmtfl); + + *p++ = '%'; + if(fmtfl & FMTFLAG_showpos) + *p++ = '+'; + if(fmtfl & FMTFLAG_showbase) + *p++ = '#'; + *p++ = '.'; + *p++ = '*'; + if(spec) + *p++ = spec; + + if(type == FMTFLAG_fixed) + *p++ = 'f'; + else if(type == FMTFLAG_scientific) + *p++ = (fmtfl & FMTFLAG_uppercase) ? 'E' : 'e'; + else if(type == (FMTFLAG_fixed|FMTFLAG_scientific)) + *p++ = (fmtfl & FMTFLAG_uppercase) ? 'A' : 'a'; + else + *p++ = (fmtfl & FMTFLAG_uppercase) ? 'G' : 'g'; + + *p++ = '\0'; + return fmt; } /* ?_Fput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DPBDIIII(a)Z */ @@ -5473,6 +5497,67 @@ ostreambuf_iterator_char* __cdecl num_put_char__Fput(const num_put *this, ostrea return NULL; } +/* TODO: This function should be removed when num_put_char__Fput is implemented */ +static ostreambuf_iterator_char* num_put_char_fput(const num_put *this, ostreambuf_iterator_char *ret, + ostreambuf_iterator_char dest, ios_base *base, char fill, char *buf, MSVCP_size_t count) +{ + numpunct_char *numpunct = numpunct_char_use_facet(base->loc); + basic_string_char grouping_bstr; + const char *grouping; + char *p, sep = *localeconv()->decimal_point; + int cur_group = 0, group_size = 0; + int adjustfield = base->fmtfl & FMTFLAG_adjustfield; + MSVCP_size_t pad; + + TRACE("(%p %p %p %d %s %ld)\n", this, ret, base, fill, buf, count); + + /* Change decimal point */ + for(p=buf; p<buf+count; p++) { + if(*p == sep) { + *p = numpunct_char_decimal_point(numpunct); + break; + } + } + p--; + + /* Add separators to number */ + numpunct_char_grouping(numpunct, &grouping_bstr); + grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + + for(; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { + group_size++; + if(group_size == grouping[cur_group]) { + group_size = 0; + if(grouping[cur_group+1]) + cur_group++; + + memmove(p+1, p, buf+count-p); + *p = sep; + count++; + } + } + MSVCP_basic_string_char_dtor(&grouping_bstr); + + /* Display number with padding */ + if(count >= base->wide) + pad = 0; + else + pad = base->wide-count; + base->wide = 0; + + if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) { + num_put_char__Putc(this, &dest, dest, buf, 1); + buf++; + } + if(adjustfield != FMTFLAG_left) { + num_put_char__Rep(this, ret, dest, fill, pad); + pad = 0; + } + num_put_char__Putc(this, &dest, dest, buf, count); + return num_put_char__Rep(this, ret, dest, fill, pad); +} + /* ?_Ifmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADPBDH(a)Z */ /* ?_Ifmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADPEBDH(a)Z */ char* __cdecl num_put_char__Ifmt(const num_put *this, char *fmt, const char *spec, int fmtfl) @@ -5629,8 +5714,24 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_double, 32) ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, double v) { - FIXME("(%p %p %p %d %lf) stub\n", this, ret, base, fill, v); - return NULL; + char *tmp; + char fmt[8]; /* strlen("%+#.*lg")+1 */ + int size; + + TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); + + num_put_char__Ffmt(this, fmt, '\0', base->fmtfl); + size = _scprintf(fmt, base->prec, v); + + /* TODO: don't use dynamic allocation */ + tmp = MSVCRT_operator_new(size*2); + if(!tmp) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v)); + MSVCRT_operator_delete(tmp); + return ret; } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DN(a)Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index edb3efa..cc7a2aa 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -417,7 +417,7 @@ typedef enum { FMTFLAG_stdio = 0x8000, FMTFLAG_adjustfield = FMTFLAG_left|FMTFLAG_right|FMTFLAG_internal, FMTFLAG_basefield = FMTFLAG_dec|FMTFLAG_oct|FMTFLAG_hex, - FMTFLAG_floadfield = FMTFLAG_scientific|FMTFLAG_fixed, + FMTFLAG_floatfield = FMTFLAG_scientific|FMTFLAG_fixed, FMTFLAG_mask = 0xffff } IOSB_fmtflags; diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index e2c1669..80439ee 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -167,6 +167,7 @@ void __cdecl setbuf(FILE*,char*); int __cdecl setvbuf(FILE*,char*,int,size_t); int __cdecl sprintf(char*,const char*,...); int __cdecl sprintf_s(char*,size_t,const char*,...); +int __cdecl _scprintf(const char *, ...); int __cdecl sscanf(const char*,const char*,...); int __cdecl sscanf_s(const char*,const char*,...); FILE* __cdecl tmpfile(void);

1 0

Piotr Caban : msvcp90: Added num_put<char>::put(integral number).
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: feccc21044837e6d913f6384c893c1961334f775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feccc21044837e6d913f6384c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:27:02 2012 +0200 msvcp90: Added num_put<char>::put(integral number). --- dlls/msvcp90/locale.c | 120 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 106 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index fc85426..eabdef8 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5477,8 +5477,30 @@ ostreambuf_iterator_char* __cdecl num_put_char__Fput(const num_put *this, ostrea /* ?_Ifmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADPEBDH(a)Z */ char* __cdecl num_put_char__Ifmt(const num_put *this, char *fmt, const char *spec, int fmtfl) { - FIXME("(%p %p %p %d) stub\n", this, fmt, spec, fmtfl); - return NULL; + int base = fmtfl & FMTFLAG_basefield; + char *p = fmt; + + TRACE("(%p %p %p %d)\n", this, fmt, spec, fmtfl); + + *p++ = '%'; + if(fmtfl & FMTFLAG_showpos) + *p++ = '+'; + if(fmtfl & FMTFLAG_showbase) + *p++ = '#'; + + *p++ = *spec++; + if(*spec == 'l') + *p++ = *spec++; + + if(base == FMTFLAG_oct) + *p++ = 'o'; + else if(base == FMTFLAG_hex) + *p++ = (fmtfl & FMTFLAG_uppercase) ? 'X' : 'x'; + else + *p++ = *spec; + + *p++ = '\0'; + return fmt; } /* ?_Iput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DPADI(a)Z */ @@ -5486,8 +5508,55 @@ char* __cdecl num_put_char__Ifmt(const num_put *this, char *fmt, const char *spe ostreambuf_iterator_char* __cdecl num_put_char__Iput(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, char *buf, MSVCP_size_t count) { - FIXME("(%p %p %p %d %p %ld) stub\n", this, ret, base, fill, buf, count); - return NULL; + numpunct_char *numpunct = numpunct_char_use_facet(base->loc); + basic_string_char grouping_bstr; + const char *grouping; + char *p, sep; + int cur_group = 0, group_size = 0; + int adjustfield = base->fmtfl & FMTFLAG_adjustfield; + MSVCP_size_t pad; + + TRACE("(%p %p %p %d %s %ld)\n", this, ret, base, fill, buf, count); + + /* Add separators to number */ + numpunct_char_grouping(numpunct, &grouping_bstr); + grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + + for(p=buf+count-1; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { + group_size++; + if(group_size == grouping[cur_group]) { + group_size = 0; + if(grouping[cur_group+1]) + cur_group++; + + memmove(p+1, p, buf+count-p); + *p = sep; + count++; + } + } + MSVCP_basic_string_char_dtor(&grouping_bstr); + + /* Display number with padding */ + if(count >= base->wide) + pad = 0; + else + pad = base->wide-count; + base->wide = 0; + + if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) { + num_put_char__Putc(this, &dest, dest, buf, 1); + buf++; + }else if((adjustfield & FMTFLAG_internal) && (buf[1]=='x' || buf[1]=='X')) { + num_put_char__Putc(this, &dest, dest, buf, 2); + buf += 2; + } + if(adjustfield != FMTFLAG_left) { + num_put_char__Rep(this, ret, dest, fill, pad); + pad = 0; + } + num_put_char__Putc(this, &dest, dest, buf, count); + return num_put_char__Rep(this, ret, dest, fill, pad); } /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DJ(a)Z */ @@ -5499,8 +5568,13 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_long, 28) ostreambuf_iterator_char* __thiscall num_put_char_do_put_long(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, LONG v) { - FIXME("(%p %p %p %d %d) stub\n", this, ret, base, fill, v); - return NULL; + char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char fmt[7]; /* strlen("%+#lld")+1 */ + + TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + + return num_put_char__Iput(this, ret, dest, base, fill, tmp, + sprintf(tmp, num_put_char__Ifmt(this, fmt, "ld", base->fmtfl), v)); } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DJ(a)Z */ @@ -5522,8 +5596,13 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_ulong, 28) ostreambuf_iterator_char* __thiscall num_put_char_do_put_ulong(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, ULONG v) { - FIXME("(%p %p %p %d %d) stub\n", this, ret, base, fill, v); - return NULL; + char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char fmt[7]; /* strlen("%+#lld")+1 */ + + TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + + return num_put_char__Iput(this, ret, dest, base, fill, tmp, + sprintf(tmp, num_put_char__Ifmt(this, fmt, "lu", base->fmtfl), v)); } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DK(a)Z */ @@ -5583,8 +5662,11 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_ptr, 28) ostreambuf_iterator_char* __thiscall num_put_char_do_put_ptr(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, const void *v) { - FIXME("(%p %p %p %d %p) stub\n", this, ret, base, fill, v); - return NULL; + char tmp[17]; /* 8(16^8==2^64)*2(separators beetwen every digit) + 1 */ + + TRACE("(%p %p %p %d %p)\n", this, ret, base, fill, v); + + return num_put_char__Iput(this, ret, dest, base, fill, tmp, sprintf(tmp, "%p", v)); } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DPBX(a)Z */ @@ -5606,8 +5688,13 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_int64, 32) ostreambuf_iterator_char* __thiscall num_put_char_do_put_int64(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, __int64 v) { - FIXME("(%p %p %p %d) stub\n", this, ret, base, fill); - return NULL; + char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char fmt[7]; /* strlen("%+#lld")+1 */ + + TRACE("(%p %p %p %d)\n", this, ret, base, fill); + + return num_put_char__Iput(this, ret, dest, base, fill, tmp, + sprintf(tmp, num_put_char__Ifmt(this, fmt, "lld", base->fmtfl), v)); } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@D_J(a)Z */ @@ -5629,8 +5716,13 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_uint64, 32) ostreambuf_iterator_char* __thiscall num_put_char_do_put_uint64(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, unsigned __int64 v) { - FIXME("(%p %p %p %d) stub\n", this, ret, base, fill); - return NULL; + char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char fmt[7]; /* strlen("%+#lld")+1 */ + + TRACE("(%p %p %p %d)\n", this, ret, base, fill); + + return num_put_char__Iput(this, ret, dest, base, fill, tmp, + sprintf(tmp, num_put_char__Ifmt(this, fmt, "llu", base->fmtfl), v)); } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@D_K(a)Z */

1 0

Dmitry Timoshkov : windowscodecs: Add a test for endianness support in IFD metadata reader.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 4d974f072effa485d29c1cf4e4a17850e8fe6d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d974f072effa485d29c1cf4e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 11:21:19 2012 +0900 windowscodecs: Add a test for endianness support in IFD metadata reader. --- dlls/windowscodecs/tests/metadata.c | 284 +++++++++++++++++++++++++++-------- 1 files changed, 219 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d974f072effa485d29c1…

1 0

Dmitry Timoshkov : windowscodecs: Add support for IFD_ASCII field type.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: f3347de57410ba547ead0affa2d6d5288e4c119e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3347de57410ba547ead0affa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 11:20:59 2012 +0900 windowscodecs: Add support for IFD_ASCII field type. --- dlls/windowscodecs/metadatahandler.c | 27 +++++++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 23 +++++++++++++++++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index cf356de..bd96944 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -854,6 +854,33 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, } FIXME("loading multiple rational fields is not implemented\n"); break; + case IFD_ASCII: + item->value.u.pszVal = HeapAlloc(GetProcessHeap(), 0, count + 1); + if (!item->value.u.pszVal) return E_OUTOFMEMORY; + + if (count <= 4) + { + const char *data = (const char *)&entry->value; + memcpy(item->value.u.pszVal, data, count); + item->value.u.pszVal[count] = 0; + break; + } + + pos.QuadPart = value; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.pszVal); + return hr; + } + hr = IStream_Read(input, item->value.u.pszVal, count, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.pszVal); + return hr; + } + item->value.u.pszVal[count] = 0; + break; default: FIXME("loading field of type %d, count %u is not implemented\n", type, count); break; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index ea0dd66..63605d4 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -82,7 +82,7 @@ static const struct ifd_data FLOAT float_val[2]; } IFD_data = { - 19, + 21, { { 0xfe, IFD_SHORT, 1, 1 }, /* NEWSUBFILETYPE */ { 0x100, IFD_LONG, 1, 222 }, /* IMAGEWIDTH */ @@ -103,6 +103,8 @@ static const struct ifd_data { 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) }, + { 0xf00e, IFD_ASCII, 13, FIELD_OFFSET(struct ifd_data, string) }, + { 0xf00f, IFD_ASCII, 4, 'a' | 'b' << 8 | 'c' << 16 | 'd' << 24 }, }, 0, { 900, 3 }, @@ -385,7 +387,8 @@ static void test_metadata_IFD(void) ULONG type, id; int count; /* if VT_VECTOR */ LONGLONG value[13]; - } td[19] = + const char *string; + } td[21] = { { VT_UI2, 0xfe, 0, { 1 } }, { VT_UI4, 0x100, 0, { 222 } }, @@ -406,6 +409,8 @@ static void test_metadata_IFD(void) { 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 } }, + { VT_LPSTR, 0xf00e, 12, { 0 }, "Hello World!" }, + { VT_LPSTR, 0xf00f, 4, { 0 }, "abcd" }, }; HRESULT hr; IWICMetadataReader *reader; @@ -476,11 +481,25 @@ static void test_metadata_IFD(void) 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; + case VT_LPSTR: + ok(td[i].count == U(value).calpstr.cElems, "%u: expected cElems %d, got %d\n", i, td[i].count, U(value).caub.cElems); + for (j = 0; j < U(value).calpstr.cElems; j++) + trace("%u: %s\n", j, U(value).calpstr.pElems[j]); + /* fall through to not handled message */ default: ok(0, "%u: array of type %d is not handled\n", i, value.vt & ~VT_VECTOR); break; } } + else if (value.vt == VT_LPSTR) + { + ok(td[i].count == strlen(U(value).pszVal) || + broken(td[i].count == strlen(U(value).pszVal) + 1), /* before Win7 */ + "%u: expected count %d, got %d\n", i, td[i].count, lstrlenA(U(value).pszVal)); + if (td[i].count == strlen(U(value).pszVal)) + ok(!strcmp(td[i].string, U(value).pszVal), + "%u: expected %s, got %s\n", i, td[i].string, U(value).pszVal); + } 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);

1 0

Dmitry Timoshkov : windowscodecs: Add support for IFD_UNDEFINED field type.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: e4af117c061b74104f40414713cc9a6785856327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4af117c061b74104f4041471… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 11:21:06 2012 +0900 windowscodecs: Add support for IFD_UNDEFINED field type. --- dlls/windowscodecs/metadatahandler.c | 27 +++++++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 13 +++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index bd96944..f3b8d38 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -881,6 +881,33 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, } item->value.u.pszVal[count] = 0; break; + case IFD_UNDEFINED: + item->value.u.blob.pBlobData = HeapAlloc(GetProcessHeap(), 0, count); + if (!item->value.u.blob.pBlobData) return E_OUTOFMEMORY; + + item->value.u.blob.cbSize = count; + + if (count <= 4) + { + const char *data = (const char *)&entry->value; + memcpy(item->value.u.blob.pBlobData, data, count); + break; + } + + pos.QuadPart = value; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.blob.pBlobData); + return hr; + } + hr = IStream_Read(input, item->value.u.blob.pBlobData, count, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.blob.pBlobData); + return hr; + } + break; default: FIXME("loading field of type %d, count %u is not implemented\n", type, count); break; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 63605d4..b144ea9 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -82,7 +82,7 @@ static const struct ifd_data FLOAT float_val[2]; } IFD_data = { - 21, + 23, { { 0xfe, IFD_SHORT, 1, 1 }, /* NEWSUBFILETYPE */ { 0x100, IFD_LONG, 1, 222 }, /* IMAGEWIDTH */ @@ -105,6 +105,8 @@ static const struct ifd_data { 0xf00d, IFD_FLOAT, 2, FIELD_OFFSET(struct ifd_data, float_val) }, { 0xf00e, IFD_ASCII, 13, FIELD_OFFSET(struct ifd_data, string) }, { 0xf00f, IFD_ASCII, 4, 'a' | 'b' << 8 | 'c' << 16 | 'd' << 24 }, + { 0xf010, IFD_UNDEFINED, 13, FIELD_OFFSET(struct ifd_data, string) }, + { 0xf011, IFD_UNDEFINED, 4, 'a' | 'b' << 8 | 'c' << 16 | 'd' << 24 }, }, 0, { 900, 3 }, @@ -388,7 +390,7 @@ static void test_metadata_IFD(void) int count; /* if VT_VECTOR */ LONGLONG value[13]; const char *string; - } td[21] = + } td[23] = { { VT_UI2, 0xfe, 0, { 1 } }, { VT_UI4, 0x100, 0, { 222 } }, @@ -411,6 +413,8 @@ static void test_metadata_IFD(void) { VT_R4|VT_VECTOR, 0xf00d, 2, { 0x449a522b, 0x4608f5ba } }, { VT_LPSTR, 0xf00e, 12, { 0 }, "Hello World!" }, { VT_LPSTR, 0xf00f, 4, { 0 }, "abcd" }, + { VT_BLOB, 0xf010, 13, { 0 }, "Hello World!" }, + { VT_BLOB, 0xf011, 4, { 0 }, "abcd" }, }; HRESULT hr; IWICMetadataReader *reader; @@ -500,6 +504,11 @@ static void test_metadata_IFD(void) ok(!strcmp(td[i].string, U(value).pszVal), "%u: expected %s, got %s\n", i, td[i].string, U(value).pszVal); } + else if (value.vt == VT_BLOB) + { + ok(td[i].count == U(value).blob.cbSize, "%u: expected count %d, got %d\n", i, td[i].count, U(value).blob.cbSize); + ok(!memcmp(td[i].string, U(value).blob.pBlobData, td[i].count), "%u: expected %s, got %s\n", i, td[i].string, U(value).blob.pBlobData); + } 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);

1 0

Dmitry Timoshkov : windowscodecs: Add support for loading of multiple 8-byte IFD fields.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 4c7f6f68b9c5a94879d22f264926478aa1194341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7f6f68b9c5a94879d22f264… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 11:21:26 2012 +0900 windowscodecs: Add support for loading of multiple 8-byte IFD fields. --- dlls/windowscodecs/metadatahandler.c | 32 +++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/metadata.c | 11 +++++++++-- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 83b5c88..a3eea1f 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -865,7 +865,37 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, } break; } - FIXME("loading multiple rational fields is not implemented\n"); + else + { + item->value.vt |= VT_VECTOR; + item->value.u.cauh.cElems = count; + item->value.u.cauh.pElems = HeapAlloc(GetProcessHeap(), 0, count * 8); + if (!item->value.u.cauh.pElems) return E_OUTOFMEMORY; + + pos.QuadPart = value; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.cauh.pElems); + return hr; + } + hr = IStream_Read(input, item->value.u.cauh.pElems, count * 8, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.cauh.pElems); + return hr; + } + for (i = 0; i < count; i++) + { + if (type == IFD_DOUBLE) + SWAP_ULONGLONG(item->value.u.cauh.pElems[i].QuadPart); + else + { + SWAP_ULONG(item->value.u.cauh.pElems[i].u.LowPart); + SWAP_ULONG(item->value.u.cauh.pElems[i].u.HighPart); + } + } + } break; case IFD_ASCII: item->value.u.pszVal = HeapAlloc(GetProcessHeap(), 0, count + 1); diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index f821513..76fd241 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -81,9 +81,10 @@ static const struct ifd_data SHORT short_val[4]; LONG long_val[2]; FLOAT float_val[2]; + struct IFD_rational rational[3]; } IFD_data = { - 27, + 28, { { 0xfe, IFD_SHORT, 1, 1 }, /* NEWSUBFILETYPE */ { 0x100, IFD_LONG, 1, 222 }, /* IMAGEWIDTH */ @@ -112,6 +113,7 @@ static const struct ifd_data { 0xf013, IFD_SHORT, 0, 0x11223344 }, { 0xf014, IFD_LONG, 0, 0x11223344 }, { 0xf015, IFD_FLOAT, 0, 0x11223344 }, + { 0xf016, IFD_SRATIONAL, 3, FIELD_OFFSET(struct ifd_data, rational) }, }, 0, { 900, 3 }, @@ -121,6 +123,7 @@ static const struct ifd_data { 0x0101, 0x0202, 0x0303, 0x0404 }, { 0x11223344, 0x55667788 }, { (FLOAT)1234.5678, (FLOAT)8765.4321 }, + { { 0x01020304, 0x05060708 }, { 0x10203040, 0x50607080 }, { 0x11223344, 0x55667788 } }, }; #include "poppack.h" @@ -603,7 +606,7 @@ static void compare_ifd_metadata(IWICMetadataReader *reader, const struct test_d static void test_metadata_IFD(void) { - static const struct test_data td[27] = + static const struct test_data td[28] = { { VT_UI2, 0xfe, 0, { 1 } }, { VT_UI4, 0x100, 0, { 222 } }, @@ -632,6 +635,10 @@ static void test_metadata_IFD(void) { VT_UI2, 0xf013, 0, { 0x3344 } }, { VT_UI4, 0xf014, 0, { 0x11223344 } }, { VT_R4, 0xf015, 0, { 0x11223344 } }, + { VT_I8|VT_VECTOR, 0xf016, 3, + { ((LONGLONG)0x05060708 << 32) | 0x01020304, + ((LONGLONG)0x50607080 << 32) | 0x10203040, + ((LONGLONG)0x55667788 << 32) | 0x11223344 } }, }; HRESULT hr; IWICMetadataReader *reader;

1 0

Dmitry Timoshkov : windowscodecs: Handle IFD fields with count 0 same way as with count 1.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: b8d58650282bb3aa66515eab5ba11e16c14b95a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d58650282bb3aa66515eab5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 11:21:13 2012 +0900 windowscodecs: Handle IFD fields with count 0 same way as with count 1. --- dlls/windowscodecs/metadatahandler.c | 20 ++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 12 ++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index f3b8d38..83b5c88 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -718,6 +718,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, { case IFD_BYTE: case IFD_SBYTE: + if (!count) count = 1; + if (count <= 4) { const BYTE *data = (const BYTE *)&entry->value; @@ -755,6 +757,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, break; case IFD_SHORT: case IFD_SSHORT: + if (!count) count = 1; + if (count <= 2) { const SHORT *data = (const SHORT *)&entry->value; @@ -800,6 +804,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, case IFD_LONG: case IFD_SLONG: case IFD_FLOAT: + if (!count) count = 1; + if (count == 1) { item->value.u.ulVal = value; @@ -830,6 +836,13 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, case IFD_RATIONAL: case IFD_SRATIONAL: case IFD_DOUBLE: + if (!count) + { + FIXME("IFD field type %d, count 0\n", type); + item->value.vt = VT_EMPTY; + break; + } + if (count == 1) { ULONGLONG ull; @@ -882,6 +895,13 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, item->value.u.pszVal[count] = 0; break; case IFD_UNDEFINED: + if (!count) + { + FIXME("IFD field type %d, count 0\n", type); + item->value.vt = VT_EMPTY; + break; + } + item->value.u.blob.pBlobData = HeapAlloc(GetProcessHeap(), 0, count); if (!item->value.u.blob.pBlobData) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index b144ea9..1936550 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -82,7 +82,7 @@ static const struct ifd_data FLOAT float_val[2]; } IFD_data = { - 23, + 27, { { 0xfe, IFD_SHORT, 1, 1 }, /* NEWSUBFILETYPE */ { 0x100, IFD_LONG, 1, 222 }, /* IMAGEWIDTH */ @@ -107,6 +107,10 @@ static const struct ifd_data { 0xf00f, IFD_ASCII, 4, 'a' | 'b' << 8 | 'c' << 16 | 'd' << 24 }, { 0xf010, IFD_UNDEFINED, 13, FIELD_OFFSET(struct ifd_data, string) }, { 0xf011, IFD_UNDEFINED, 4, 'a' | 'b' << 8 | 'c' << 16 | 'd' << 24 }, + { 0xf012, IFD_BYTE, 0, 0x11223344 }, + { 0xf013, IFD_SHORT, 0, 0x11223344 }, + { 0xf014, IFD_LONG, 0, 0x11223344 }, + { 0xf015, IFD_FLOAT, 0, 0x11223344 }, }, 0, { 900, 3 }, @@ -390,7 +394,7 @@ static void test_metadata_IFD(void) int count; /* if VT_VECTOR */ LONGLONG value[13]; const char *string; - } td[23] = + } td[27] = { { VT_UI2, 0xfe, 0, { 1 } }, { VT_UI4, 0x100, 0, { 222 } }, @@ -415,6 +419,10 @@ static void test_metadata_IFD(void) { VT_LPSTR, 0xf00f, 4, { 0 }, "abcd" }, { VT_BLOB, 0xf010, 13, { 0 }, "Hello World!" }, { VT_BLOB, 0xf011, 4, { 0 }, "abcd" }, + { VT_UI1, 0xf012, 0, { 0x44 } }, + { VT_UI2, 0xf013, 0, { 0x3344 } }, + { VT_UI4, 0xf014, 0, { 0x11223344 } }, + { VT_R4, 0xf015, 0, { 0x11223344 } }, }; HRESULT hr; IWICMetadataReader *reader;

1 0

Dmitry Timoshkov : windowscodecs: Add tests for more types of IFD fields.
by Alexandre Julliard June 21, 2012

June 21, 2012

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

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in d3d_device7_EnumTextureFormats().
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 339ef6c2522dafaedce036f72172176bbf4850c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=339ef6c2522dafaedce036f72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 21 19:35:34 2012 +0200 ddraw: Use wined3d_get_adapter_display_mode() in d3d_device7_EnumTextureFormats(). --- dlls/ddraw/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c79c6aa..aa16757 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1068,8 +1068,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, wined3d_mutex_lock(); memset(&mode, 0, sizeof(mode)); - hr = wined3d_device_get_display_mode(device->ddraw->wined3d_device, 0, &mode); - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_display_mode(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) { wined3d_mutex_unlock(); WARN("Cannot get the current adapter format\n");

1 0

Huw Davies : wineps: Always update the default devmode.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 87292bb39640f8b39c51a5cec7d240ed34997f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87292bb39640f8b39c51a5cec… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 21 12:59:01 2012 +0100 wineps: Always update the default devmode. --- dlls/wineps.drv/init.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 4beb45a..07d52d2 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -630,8 +630,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) dm.dmPublic.u1.s1.dmPaperSize = papersize; PSDRV_MergeDevmodes(pi->Devmode, &dm, pi); } - - set_devmode( hPrinter, pi->Devmode ); } if(pi->ppd->DefaultPageSize) { /* We'll let the ppd override the devmode */ @@ -672,6 +670,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->Devmode->dmPublic.dmDuplex = DMDUP_SIMPLEX; } + set_devmode( hPrinter, pi->Devmode ); + pi->FontSubTable = load_font_sub_table( hPrinter, &pi->FontSubTableSize ); LIST_FOR_EACH_ENTRY( font, &pi->ppd->InstalledFonts, FONTNAME, entry )

1 0