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

Thomas Faber : wintrust/tests: Fix build with MSVC.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: e68d5b93ffa6b6948f71d5f0a8ece67c7c0ab42e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68d5b93ffa6b6948f71d5f0a… Author: Thomas Faber <thfabba(a)gmx.de> Date: Fri Jun 22 10:28:16 2012 +0200 wintrust/tests: Fix build with MSVC. --- dlls/wintrust/tests/softpub.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 0987f9c..3c23464 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -568,7 +568,7 @@ struct Imports { } ibn; char dllname[0x10]; }; -#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks[0])) +#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks)) static struct _PeImage { IMAGE_DOS_HEADER dos_header; @@ -582,9 +582,9 @@ static struct _PeImage { char __alignment3[FILE_TOTAL-FILE_IDATA-sizeof(struct Imports)]; } bin = { /* dos header */ - {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, 0, 0, {}, FILE_PE_START}, + {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0}, 0, 0, {0}, FILE_PE_START}, /* alignment before PE header */ - {}, + {0}, /* nt headers */ {IMAGE_NT_SIGNATURE, /* basic headers - 3 sections, no symbols, EXE file */ @@ -611,7 +611,7 @@ static struct _PeImage { 0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE} }, /* alignment before first section */ - {}, + {0}, /* .text section */ { 0x31, 0xC0, /* xor eax, eax */ @@ -634,7 +634,7 @@ static struct _PeImage { "KERNEL32.DLL" }, /* final alignment */ - {} + {0} }; #include <poppack.h>

1 0

Detlef Riekenberg : shell32/tests: Ignore case when comparing filenames.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: a8643ccc85345267f9e3731bdc48ac18bdd69f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8643ccc85345267f9e3731bd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 22 05:07:32 2012 +0200 shell32/tests: Ignore case when comparing filenames. --- dlls/shell32/tests/shelldispatch.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 307e0fc..9d8d70b 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -140,7 +140,7 @@ static void test_namespace(void) p = path + lstrlenW(path); while (path < p && *(p - 1) != '\\') p--; - ok(!lstrcmpW(title, p), "expected %s, got %s\n", + ok(!lstrcmpiW(title, p), "expected %s, got %s\n", wine_dbgstr_w(p), wine_dbgstr_w(title)); } else skip("skipping Folder::get_Title test\n"); @@ -157,7 +157,7 @@ static void test_namespace(void) r = FolderItem_get_Path(item, &item_path); ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r); if (pSHGetFolderPathW) - ok(!lstrcmpW(item_path, path), "expected %s, got %s\n", + ok(!lstrcmpiW(item_path, path), "expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(item_path)); SysFreeString(item_path); FolderItem_Release(item);

1 0

Dmitry Timoshkov : windowscodecs: Add support for IFD_ASCII field type.
by Alexandre Julliard 21 Jun '12

21 Jun '12

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 21 Jun '12

21 Jun '12

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: Handle IFD fields with count 0 same way as with count 1.
by Alexandre Julliard 21 Jun '12

21 Jun '12

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 a test for endianness support in IFD metadata reader.
by Alexandre Julliard 21 Jun '12

21 Jun '12

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 loading of multiple 8-byte IFD fields.
by Alexandre Julliard 21 Jun '12

21 Jun '12

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

Piotr Caban : msvcp90: Added istream>>(base type) implementation.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 1c7f54bfa64d7e9fbbabad0be17f7008ee4a7041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7f54bfa64d7e9fbbabad0be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:27:21 2012 +0200 msvcp90: Added istream>>(base type) implementation. --- dlls/msvcp90/ios.c | 279 +++++++++++++++++++++++++++++++++++++++++------- dlls/msvcp90/locale.c | 38 +++++-- dlls/msvcp90/msvcp90.h | 36 ++++++ 3 files changed, 302 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c7f54bfa64d7e9fbbaba…

1 0

Michael Stefaniuc : avifil32: Drop the 'register' storage-class specifier.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: a2a8a613bed03ae7b5aa42e407f360e807f7235a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a8a613bed03ae7b5aa42e40… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 21 13:17:51 2012 +0200 avifil32: Drop the 'register' storage-class specifier. --- dlls/avifil32/acmstream.c | 2 +- dlls/avifil32/getframe.c | 2 +- dlls/avifil32/tmpfile.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 50e868b..845ea16 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -224,7 +224,7 @@ static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, /* check for swapped parameters */ if ((LPVOID)lParam1 != NULL && ((LPAVICOMPRESSOPTIONS)lParam1)->fccType == streamtypeAUDIO) { - register LPARAM tmp = lParam1; + LPARAM tmp = lParam1; lParam1 = lParam2; lParam2 = tmp; diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index 547f340..c5b2bd4 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -430,7 +430,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, } if (lpBits == NULL) { - register DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); + DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 3bdd50a..62d283b 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -258,7 +258,7 @@ PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) tmpFile->fInfo.dwSuggestedBufferSize = sInfo.dwSuggestedBufferSize; { - register DWORD tmp; + DWORD tmp; tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength), tmpFile->fInfo.dwScale, tmpFile->fInfo.dwRate * 1000);

1 0

Huw Davies : wineps: Add the ability to override the ppd file' s default pagesize and duplex settings.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 5b71f7bbbcde36955e0d2f0d49c66cce09f9bb4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b71f7bbbcde36955e0d2f0d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 21 12:59:00 2012 +0100 wineps: Add the ability to override the ppd file's default pagesize and duplex settings. --- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/ppd.c | 32 +++++++++++++++++++++++++++++--- dlls/wineps.drv/psdrv.h | 2 +- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 64a3c74..4beb45a 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -612,7 +612,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) ppd_filename = get_ppd_filename( hPrinter ); if (!ppd_filename) goto fail; - pi->ppd = PSDRV_ParsePPD( ppd_filename ); + pi->ppd = PSDRV_ParsePPD( ppd_filename, hPrinter ); if (!pi->ppd) { WARN( "Couldn't parse PPD file '%s'\n", ppd_filename ); diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index dc598e8..1cba1b8 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -611,18 +611,36 @@ static BOOL PSDRV_AddSlot(PPD *ppd, LPCSTR szName, LPCSTR szFullName, return TRUE; } +static char *get_ppd_override( HANDLE printer, const char *value ) +{ + DWORD err, type, needed; + char *data; + + err = GetPrinterDataExA( printer, "PPD Overrides", value, &type, NULL, 0, &needed ); + if (err != ERROR_MORE_DATA || type != REG_SZ || needed == 0) return NULL; + + data = HeapAlloc( PSDRV_Heap, 0, needed ); + if (data) + { + GetPrinterDataExA( printer, "PPD Overrides", value, &type, (BYTE*)data, needed, &needed ); + TRACE( "got override %s: %s\n", value, data ); + } + return data; +} + /*********************************************************************** * * PSDRV_ParsePPD * * */ -PPD *PSDRV_ParsePPD(char *fname) +PPD *PSDRV_ParsePPD( char *fname, HANDLE printer ) { FILE *fp; PPD *ppd; PPDTuple tuple; char *default_pagesize = NULL, *default_duplex = NULL; + char *def_pagesize_override = NULL, *def_duplex_override = NULL; PAGESIZE *page, *page_cursor2; TRACE("file '%s'\n", fname); @@ -944,7 +962,10 @@ PPD *PSDRV_ParsePPD(char *fname) } ppd->DefaultPageSize = NULL; - if (default_pagesize) + def_pagesize_override = get_ppd_override( printer, "DefaultPageSize" ); + if (def_pagesize_override) + ppd->DefaultPageSize = get_pagesize( ppd, def_pagesize_override, FALSE ); + if (!ppd->DefaultPageSize && default_pagesize) ppd->DefaultPageSize = get_pagesize( ppd, default_pagesize, FALSE ); if (!ppd->DefaultPageSize) @@ -955,10 +976,14 @@ PPD *PSDRV_ParsePPD(char *fname) } TRACE( "DefaultPageSize: %s\n", ppd->DefaultPageSize ? ppd->DefaultPageSize->Name : "<not set>" ); + HeapFree( PSDRV_Heap, 0, def_pagesize_override ); HeapFree( PSDRV_Heap, 0, default_pagesize ); ppd->DefaultDuplex = NULL; - if (default_duplex) + def_duplex_override = get_ppd_override( printer, "DefaultDuplex" ); + if (def_duplex_override) + ppd->DefaultDuplex = get_duplex( ppd, def_duplex_override ); + if (!ppd->DefaultDuplex && default_duplex) ppd->DefaultDuplex = get_duplex( ppd, default_duplex ); if (!ppd->DefaultDuplex) @@ -969,6 +994,7 @@ PPD *PSDRV_ParsePPD(char *fname) } TRACE( "DefaultDuplex: %s\n", ppd->DefaultDuplex ? ppd->DefaultDuplex->Name : "<not set>" ); + HeapFree( PSDRV_Heap, 0, def_duplex_override ); HeapFree( PSDRV_Heap, 0, default_duplex ); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 309cfee..42ace2d 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -458,7 +458,7 @@ extern BOOL PSDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern void PSDRV_MergeDevmodes(PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *pi) DECLSPEC_HIDDEN; extern BOOL PSDRV_GetFontMetrics(void) DECLSPEC_HIDDEN; -extern PPD *PSDRV_ParsePPD(char *fname) DECLSPEC_HIDDEN; +extern PPD *PSDRV_ParsePPD(char *fname, HANDLE printer) DECLSPEC_HIDDEN; extern PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) DECLSPEC_HIDDEN; extern const AFM *PSDRV_FindAFMinList(FONTFAMILY *head, LPCSTR name) DECLSPEC_HIDDEN; extern BOOL PSDRV_AddAFMtoList(FONTFAMILY **head, const AFM *afm,

1 0