wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Dmitry Timoshkov : windowscodecs: Check IFD structure when loading metadata .
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 7cf036a471e5a170a8a0d9f3ca4d718bf31c4d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf036a471e5a170a8a0d9f3c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 13 18:31:09 2012 +0900 windowscodecs: Check IFD structure when loading metadata. --- dlls/windowscodecs/metadatahandler.c | 33 +++++++++++++++++++++++++++++++++ include/wincodec.idl | 1 + 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index d2eb8b3..6433136 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -733,6 +733,39 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, return hr; } + /* limit number of IFDs to 4096 to avoid infinite loop */ + for (i = 0; i < 4096; i++) + { + ULONG next_ifd_offset; + LARGE_INTEGER pos; + USHORT next_ifd_count; + + hr = IStream_Read(input, &next_ifd_offset, sizeof(next_ifd_offset), NULL); + if (FAILED(hr)) break; + + SWAP_ULONG(next_ifd_offset); + if (!next_ifd_offset) break; + + pos.QuadPart = next_ifd_offset; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) break; + + hr = IStream_Read(input, &next_ifd_count, sizeof(next_ifd_count), NULL); + if (FAILED(hr)) break; + + SWAP_USHORT(next_ifd_count); + + pos.QuadPart = next_ifd_count * sizeof(*entry); + hr = IStream_Seek(input, pos, SEEK_CUR, NULL); + if (FAILED(hr)) break; + } + + if (FAILED(hr) || i == 4096) + { + HeapFree(GetProcessHeap(), 0, entry); + return WINCODEC_ERR_BADMETADATAHEADER; + } + result = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*result)); if (!result) { diff --git a/include/wincodec.idl b/include/wincodec.idl index c587ff4..82f419c 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -206,6 +206,7 @@ cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50") cpp_quote("#define WINCODEC_ERR_FRAMEMISSING 0x88982f62") +cpp_quote("#define WINCODEC_ERR_BADMETADATAHEADER 0x88982f63") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c")

1 0

Dmitry Timoshkov : windowscodecs: Add support for WICPersistOptionsLittleEndian/ WICPersistOptionsBigEndian in the IFD metadata reader.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 5f22fdb86fc6b79a09a35384fa177eb1209a41e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f22fdb86fc6b79a09a35384f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 13 18:31:02 2012 +0900 windowscodecs: Add support for WICPersistOptionsLittleEndian/WICPersistOptionsBigEndian in the IFD metadata reader. --- dlls/windowscodecs/metadatahandler.c | 51 ++++++++++++++++++++++++++------- 1 files changed, 40 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 20785b4..d2eb8b3 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -1,5 +1,6 @@ /* * Copyright 2012 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "objbase.h" #include "wincodec.h" #include "wincodecsdk.h" @@ -599,12 +601,16 @@ HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, vo return MetadataReader_Create(&UnknownMetadataReader_Vtbl, pUnkOuter, iid, ppv); } +#define SWAP_USHORT(x) do { if (!native_byte_order) (x) = RtlUshortByteSwap(x); } while(0) +#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; SHORT type; - ULONG length; + ULONG count; LONG value; }; @@ -629,47 +635,60 @@ struct IFD_rational #define IFD_DOUBLE 12 #define IFD_IFD 13 -static HRESULT load_IFD_entry(IStream *input, struct IFD_entry *entry, MetadataItem *item) +static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, + MetadataItem *item, BOOL native_byte_order) { + ULONG count, value; + SHORT type; + item->schema.vt = VT_EMPTY; item->id.vt = VT_UI2; item->id.u.uiVal = entry->id; + SWAP_USHORT(item->id.u.uiVal); - switch (entry->type) + count = entry->count; + SWAP_ULONG(count); + type = entry->type; + SWAP_USHORT(type); + value = entry->value; + SWAP_ULONG(value); + + switch (type) { case IFD_SHORT: - if (entry->length == 1) + if (count == 1) { item->value.vt = VT_UI2; - item->value.u.uiVal = entry->value; + item->value.u.uiVal = value; break; } FIXME("loading multiple short fields is not implemented\n"); break; case IFD_LONG: - if (entry->length == 1) + if (count == 1) { item->value.vt = VT_UI4; - item->value.u.ulVal = entry->value; + item->value.u.ulVal = value; break; } FIXME("loading multiple long fields is not implemented\n"); break; case IFD_RATIONAL: - if (entry->length == 1) + if (count == 1) { HRESULT hr; LARGE_INTEGER pos; struct IFD_rational rational; - pos.QuadPart = entry->value; + pos.QuadPart = value; hr = IStream_Seek(input, pos, SEEK_SET, NULL); if (FAILED(hr)) return hr; item->value.vt = VT_UI8; - hr = IStream_Read(input, &rational , sizeof(rational), NULL); + hr = IStream_Read(input, &rational, sizeof(rational), NULL); if (FAILED(hr)) return hr; item->value.u.uhVal.QuadPart = ((LONGLONG)rational.denominator << 32) | rational.numerator; + SWAP_ULONGLONG(item->value.u.uhVal.QuadPart); break; } FIXME("loading multiple rational fields is not implemented\n"); @@ -688,12 +707,22 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, MetadataItem *result; USHORT count, i; struct IFD_entry *entry; + BOOL native_byte_order = TRUE; TRACE("\n"); +#ifdef WORDS_BIGENDIAN + if (persist_options & WICPersistOptionsLittleEndian) +#else + if (persist_options & WICPersistOptionsBigEndian) +#endif + native_byte_order = FALSE; + hr = IStream_Read(input, &count, sizeof(count), NULL); if (FAILED(hr)) return hr; + SWAP_USHORT(count); + entry = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*entry)); if (!entry) return E_OUTOFMEMORY; @@ -713,7 +742,7 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, for (i = 0; i < count; i++) { - hr = load_IFD_entry(input, &entry[i], &result[i]); + hr = load_IFD_entry(input, &entry[i], &result[i], native_byte_order); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, entry);

1 0

Dmitry Timoshkov : windowscodecs: Implement partial loading of IFD metadata .
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: ec43788803648ad689274cb44be5c9434d5f7322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec43788803648ad689274cb44… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 13 18:30:54 2012 +0900 windowscodecs: Implement partial loading of IFD metadata. --- dlls/windowscodecs/metadatahandler.c | 127 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/metadata.c | 1 - 2 files changed, 124 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index a4dc174..20785b4 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -19,6 +19,7 @@ #include "config.h" #include <stdarg.h> +#include <stdio.h> #define COBJMACROS #define NONAMELESSUNION @@ -598,13 +599,133 @@ HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, vo return MetadataReader_Create(&UnknownMetadataReader_Vtbl, pUnkOuter, iid, ppv); } +#include "pshpack2.h" +struct IFD_entry +{ + SHORT id; + SHORT type; + ULONG length; + LONG value; +}; + +struct IFD_rational +{ + LONG numerator; + LONG denominator; +}; +#include "poppack.h" + +#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 + +static HRESULT load_IFD_entry(IStream *input, struct IFD_entry *entry, MetadataItem *item) +{ + item->schema.vt = VT_EMPTY; + item->id.vt = VT_UI2; + item->id.u.uiVal = entry->id; + + switch (entry->type) + { + case IFD_SHORT: + if (entry->length == 1) + { + item->value.vt = VT_UI2; + item->value.u.uiVal = entry->value; + break; + } + FIXME("loading multiple short fields is not implemented\n"); + break; + case IFD_LONG: + if (entry->length == 1) + { + item->value.vt = VT_UI4; + item->value.u.ulVal = entry->value; + break; + } + FIXME("loading multiple long fields is not implemented\n"); + break; + case IFD_RATIONAL: + if (entry->length == 1) + { + HRESULT hr; + LARGE_INTEGER pos; + struct IFD_rational rational; + + pos.QuadPart = entry->value; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) return hr; + + item->value.vt = VT_UI8; + hr = IStream_Read(input, &rational , sizeof(rational), NULL); + if (FAILED(hr)) return hr; + item->value.u.uhVal.QuadPart = ((LONGLONG)rational.denominator << 32) | rational.numerator; + break; + } + FIXME("loading multiple rational fields is not implemented\n"); + break; + default: + FIXME("loading field of type %d is not implemented\n", entry->type); + break; + } + return S_OK; +} + static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, DWORD persist_options, MetadataItem **items, DWORD *item_count) { - FIXME("stub\n"); + HRESULT hr; + MetadataItem *result; + USHORT count, i; + struct IFD_entry *entry; + + TRACE("\n"); + + hr = IStream_Read(input, &count, sizeof(count), NULL); + if (FAILED(hr)) return hr; + + entry = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*entry)); + if (!entry) return E_OUTOFMEMORY; - *items = NULL; - *item_count = 0; + hr = IStream_Read(input, entry, count * sizeof(*entry), NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, entry); + return hr; + } + + result = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*result)); + if (!result) + { + HeapFree(GetProcessHeap(), 0, entry); + return E_OUTOFMEMORY; + } + + for (i = 0; i < count; i++) + { + hr = load_IFD_entry(input, &entry[i], &result[i]); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, entry); + HeapFree(GetProcessHeap(), 0, result); + return hr; + } + } + + HeapFree(GetProcessHeap(), 0, entry); + + *items = result; + *item_count = count; return S_OK; } diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 6b25963..cf00f1f 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -386,7 +386,6 @@ static void test_metadata_IFD(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); -todo_wine ok(count == 6, "unexpected count %u\n", count); hr = IWICMetadataReader_GetEnumerator(reader, NULL);

1 0

Dmitry Timoshkov : windowscodecs: Add a test to show that metadata reader may not rewind the stream after loading the data .
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 17a64c4450f4fdb24279278894b1922cdba727af URL: http://source.winehq.org/git/wine.git/?a=commit;h=17a64c4450f4fdb2427927889… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 13 18:30:46 2012 +0900 windowscodecs: Add a test to show that metadata reader may not rewind the stream after loading the data. --- dlls/windowscodecs/tests/metadata.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index a4f9ad1..6b25963 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -142,6 +142,8 @@ static void load_stream(IUnknown *reader, const char *data, int data_size) HRESULT hr; IWICPersistStream *persist; IStream *stream; + LARGE_INTEGER pos; + ULARGE_INTEGER cur_pos; stream = create_stream(data, data_size); if (!stream) @@ -158,6 +160,13 @@ static void load_stream(IUnknown *reader, const char *data, int data_size) IWICPersistStream_Release(persist); } + pos.QuadPart = 0; + hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + /* IFD metadata reader doesn't rewind the stream to the start */ + ok(cur_pos.QuadPart == 0 || cur_pos.QuadPart <= data_size, + "current stream pos is at %x/%x, data size %x\n", cur_pos.u.LowPart, cur_pos.u.HighPart, data_size); + IStream_Release(stream); }

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 3b89ffa2ae5158b165b69bd8b2968a40ebbd6a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b89ffa2ae5158b165b69bd8b… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Jun 14 15:56:50 2012 +0200 po: Update Polish translation. --- po/pl.po | 95 +++++++++++++------------------------------------------------- 1 files changed, 20 insertions(+), 75 deletions(-) diff --git a/po/pl.po b/po/pl.po index 4783d7e..abbb6f9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-03-31 07:45+0200\n" +"PO-Revision-Date: 2012-06-14 15:46+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: Polish\n" @@ -163,21 +163,10 @@ msgid "Cancel" msgstr "Anuluj" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Instalator Wine Gecko" +msgstr "Instalator Wine Mono" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -186,12 +175,11 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Nie znaleziono paczki Gecko potrzebnej do prawidłowego działania aplikacji " -"zawierających kod HTML. Wine może automatycznie pobrać i zainstalować tą " -"paczkę dla ciebie.\n" +"Nie znaleziono paczki Mono potrzebnej do prawidłowego działania aplikacji ." +"NET. Wine może automatycznie pobrać i zainstalować tą paczkę dla ciebie.\n" "\n" "Uwaga: Lepiej jednak użyć paczki z twojej dystrybucji. Po szczegóły zajrzyj " -"na <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " +"na <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Mono</a> " "po szczegóły." #: appwiz.rc:28 @@ -3456,59 +3444,51 @@ msgstr "Najwyższy" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "Joysticki" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" -msgstr "&Wyłącz bibliotekę" +msgstr "Wyłą&cz " #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" -msgstr "&Udostępnij" +msgstr "&Włącz" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "Rozłączono" +msgstr "Podłączony" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "&Wyłącz bibliotekę" +msgstr "Wyłączony" #: joy.rc:46 msgid "Test Joystick" -msgstr "" +msgstr "Testuj Joystick" #: joy.rc:50 msgid "Buttons" -msgstr "" +msgstr "Przyciski" #: joy.rc:51 msgid "X,Y" -msgstr "" +msgstr "X,Y" #: joy.rc:52 msgid "Rx,Ry" -msgstr "" +msgstr "Rx,Ry" #: joy.rc:53 msgid "Z, Rz" -msgstr "" +msgstr "Z, Rz" #: joy.rc:58 msgid "Test Force Feedback" -msgstr "" +msgstr "Testuj odczucie siły zwrotnej" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "Utwórz kontrolkę" +msgstr "Kontrolery gier" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -3639,16 +3619,12 @@ msgid "URI to be decoded is incorrect" msgstr "URI do dekodowania jest niepoprawny" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "Wartość typu wyliczeniowego poza zakresem.\n" +msgstr "Ilość cyfr znaczących jest poza zakresem" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Indeks dolny poza zakresem" +msgstr "Precyzja jest poza poza zakresem" #: jscript.rc:59 msgid "Array length must be a finite positive integer" @@ -6753,37 +6729,6 @@ msgid "insert disk %s" msgstr "włóż dysk '%s'" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n" @@ -6815,7 +6760,7 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" +"Instalator Windows %s\n" "\n" "Użycie:\n" "polecenie msiexec {wymagany parametr} [opcjonalny parametr]\n"

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 82efcba58e82a4afb68786a7152275e8898d921a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82efcba58e82a4afb68786a71… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jun 14 00:55:47 2012 +0200 po: Update German translation. --- po/de.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/po/de.po b/po/de.po index 5db2648..4859bee 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-06 01:03+0200\n" +"PO-Revision-Date: 2012-06-13 22:52+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -3435,11 +3435,11 @@ msgstr "Joysticks" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" -msgstr "&Ausschalten" +msgstr "&Deaktivieren" #: joy.rc:37 msgid "&Enable" -msgstr "&Einschalten" +msgstr "&Aktivieren" #: joy.rc:38 msgid "Connected" @@ -3447,7 +3447,7 @@ msgstr "Verbunden" #: joy.rc:40 msgid "Disabled" -msgstr "Ausgeschaltet" +msgstr "Deaktiviert" #: joy.rc:46 msgid "Test Joystick" @@ -3455,19 +3455,19 @@ msgstr "Joystick testen" #: joy.rc:50 msgid "Buttons" -msgstr "" +msgstr "Tasten" #: joy.rc:51 msgid "X,Y" -msgstr "" +msgstr "X,Y" #: joy.rc:52 msgid "Rx,Ry" -msgstr "" +msgstr "Rx,Ry" #: joy.rc:53 msgid "Z, Rz" -msgstr "" +msgstr "Z, Rz" #: joy.rc:58 msgid "Test Force Feedback" @@ -3475,7 +3475,7 @@ msgstr "Force Feedback testen" #: joy.rc:28 msgid "Game Controllers" -msgstr "Spielsteuerungsgeräte" +msgstr "Gamecontroller" #: jscript.rc:25 msgid "Error converting object to primitive type"

1 0

Piotr Caban : msvcrt/tests: Fix Portuguese locale test on NT4.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 7ac3c8700c677e700a8079a49cc1a8606a09912d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac3c8700c677e700a8079a49… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 11:35:31 2012 +0200 msvcrt/tests: Fix Portuguese locale test on NT4. --- dlls/msvcrt/tests/locale.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 638a3d2..225cbb9 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -475,7 +475,8 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "portuguese"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Portuguese_Brazil.1252"), "ret = %s\n", ret); + ok(!strcmp(ret, "Portuguese_Brazil.1252") + || broken(!strcmp(ret, "Portuguese_Portugal.1252")) /* NT4 */, "ret = %s\n", ret); ret = setlocale(LC_ALL, "portuguese-brazil"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");

1 0

Nozomi Kodama : d3dx9_36: Implementation of D3DXQuaternionSquadSetup.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: ed7c28353dd9bdf2b49cba6ddae09f0dde6fb5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7c28353dd9bdf2b49cba6dd… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Thu Jun 14 10:37:04 2012 +0800 d3dx9_36: Implementation of D3DXQuaternionSquadSetup. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 67 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 42 +++++++++++++++++++++++++++ include/d3dx9math.h | 1 + 4 files changed, 111 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 20a8abf..d8fcaa4 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -252,7 +252,7 @@ @ stdcall D3DXQuaternionRotationYawPitchRoll(ptr float float float) @ stdcall D3DXQuaternionSlerp(ptr ptr ptr float) @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) -@ stub D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) @ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 5c6530a..499d368 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1366,6 +1366,73 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATE return pout; } +static D3DXQUATERNION add_diff(CONST D3DXQUATERNION *q1, CONST D3DXQUATERNION *q2, CONST FLOAT add) +{ + D3DXQUATERNION temp; + + temp.x = q1->x + add * q2->x; + temp.y = q1->y + add * q2->y; + temp.z = q1->z + add * q2->z; + temp.w = q1->w + add * q2->w; + + return temp; +} + +void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbout, D3DXQUATERNION *pcout, CONST D3DXQUATERNION *pq0, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3) +{ + D3DXQUATERNION q, temp1, temp2, temp3, zero; + + TRACE("(%p, %p, %p, %p, %p, %p, %p)\n", paout, pbout, pcout, pq0, pq1, pq2, pq3); + + zero.x = 0.0f; + zero.y = 0.0f; + zero.z = 0.0f; + zero.w = 0.0f; + + if ( D3DXQuaternionDot(pq0, pq1) < 0.0f ) + temp2 = add_diff(&zero, pq0, -1.0f); + else + temp2 = *pq0; + + if ( D3DXQuaternionDot(pq1, pq2) < 0.0f ) + *pcout = add_diff(&zero, pq2, -1.0f); + else + *pcout = *pq2; + + if ( D3DXQuaternionDot(pcout, pq3) < 0.0f ) + temp3 = add_diff(&zero, pq3, -1.0f); + else + temp3 = *pq3; + + D3DXQuaternionInverse(&temp1, pq1); + D3DXQuaternionMultiply(&temp2, &temp1, &temp2); + D3DXQuaternionLn(&temp2, &temp2); + D3DXQuaternionMultiply(&q, &temp1, pcout); + D3DXQuaternionLn(&q, &q); + temp1 = add_diff(&temp2, &q, 1.0f); + temp1.x *= -0.25f; + temp1.y *= -0.25f; + temp1.z *= -0.25f; + temp1.w *= -0.25f; + D3DXQuaternionExp(&temp1, &temp1); + D3DXQuaternionMultiply(paout, pq1, &temp1); + + D3DXQuaternionInverse(&temp1, pcout); + D3DXQuaternionMultiply(&temp2, &temp1, pq1); + D3DXQuaternionLn(&temp2, &temp2); + D3DXQuaternionMultiply(&q, &temp1, &temp3); + D3DXQuaternionLn(&q, &q); + temp1 = add_diff(&temp2, &q, 1.0f); + temp1.x *= -0.25f; + temp1.y *= -0.25f; + temp1.z *= -0.25f; + temp1.w *= -0.25f; + D3DXQuaternionExp(&temp1, &temp1); + D3DXQuaternionMultiply(pbout, pcout, &temp1); + + return; +} + void WINAPI D3DXQuaternionToAxisAngle(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle) { paxis->x = pq->x; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c93044d..e732691 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -940,6 +940,48 @@ static void D3DXQuaternionTest(void) D3DXQuaternionSquad(&gotquat,&q,&r,&t,&u,scale); expect_vec4(expectedquat,gotquat); +/*_______________D3DXQuaternionSquadSetup___________________*/ + r.x = 1.0f, r.y = 2.0f; r.z = 4.0f; r.w = 10.0f; + s.x = -3.0f; s.y = 4.0f; s.z = -5.0f; s.w = 7.0; + t.x = -1111.0f, t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; + u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; + D3DXQuaternionSquadSetup(&gotquat,&Nq,&Nq1,&r,&s,&t,&u); + expectedquat.x = 7.121285f; expectedquat.y = 2.159964f; expectedquat.z = -3.855094f; expectedquat.w = 5.362844f; + expect_vec4(expectedquat,gotquat); + expectedquat.x = -1113.492920f; expectedquat.y = 82.679260f; expectedquat.z = -6.696645f; expectedquat.w = -4.090050f; + expect_vec4(expectedquat,Nq); + expectedquat.x = -1111.0f; expectedquat.y = 111.0f; expectedquat.z = -11.0f; expectedquat.w = 1.0f; + expect_vec4(expectedquat,Nq1); + r.x = 0.2f; r.y = 0.3f; r.z = 1.3f; r.w = -0.6f; + s.x = -3.0f; s.y =-2.0f; s.z = 4.0f; s.w = 0.2f; + t.x = 0.4f; t.y = 8.3f; t.z = -3.1f; t.w = -2.7f; + u.x = 1.1f; u.y = -0.7f; u.z = 9.2f; u.w = 0.0f; + D3DXQuaternionSquadSetup(&gotquat,&Nq,&Nq1,&r,&s,&u,&t); + expectedquat.x = -4.139569f; expectedquat.y = -2.469115f; expectedquat.z = 2.364477f; expectedquat.w = 0.465494f; + expect_vec4(expectedquat,gotquat); + expectedquat.x = 2.342533f; expectedquat.y = 2.365127f; expectedquat.z = 8.628538f; expectedquat.w = -0.898356f; + expect_vec4(expectedquat,Nq); + expectedquat.x = 1.1f; expectedquat.y = -0.7f; expectedquat.z = 9.2f; expectedquat.w = 0.0f; + expect_vec4(expectedquat,Nq1); + D3DXQuaternionSquadSetup(&gotquat,&Nq,&Nq1,&r,&s,&t,&u); + expectedquat.x = -3.754567f; expectedquat.y = -0.586085f; expectedquat.z = 3.815818f; expectedquat.w = -0.198150f; + expect_vec4(expectedquat,gotquat); + expectedquat.x = 0.140773f; expectedquat.y = -8.737090f; expectedquat.z = -0.516593f; expectedquat.w = 3.053942f; + expect_vec4(expectedquat,Nq); + expectedquat.x = -0.4f; expectedquat.y = -8.3f; expectedquat.z = 3.1f; expectedquat.w = 2.7f; + expect_vec4(expectedquat,Nq1); + r.x = -1.0f; r.y = 0.0f; r.z = 0.0f; r.w = 0.0f; + s.x = 1.0f; s.y =0.0f; s.z = 0.0f; s.w = 0.0f; + t.x = 1.0f; t.y = 0.0f; t.z = 0.0f; t.w = 0.0f; + u.x = -1.0f; u.y = 0.0f; u.z = 0.0f; u.w = 0.0f; + D3DXQuaternionSquadSetup(&gotquat,&Nq,&Nq1,&r,&s,&t,&u); + expectedquat.x = 1.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; + expect_vec4(expectedquat,gotquat); + expectedquat.x = 1.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; + expect_vec4(expectedquat,Nq); + expectedquat.x = 1.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; + expect_vec4(expectedquat,Nq1); + /*_______________D3DXQuaternionToAxisAngle__________________*/ Nq.x = 1.0f/22.0f; Nq.y = 2.0f/22.0f; Nq.z = 4.0f/22.0f; Nq.w = 10.0f/22.0f; expectedvec.x = 1.0f/22.0f; expectedvec.y = 2.0f/22.0f; expectedvec.z = 4.0f/22.0f; diff --git a/include/d3dx9math.h b/include/d3dx9math.h index c31b652..a1fd70a 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -337,6 +337,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *pout, FLOAT yaw, FLOAT pitch, FLOAT roll); D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t); D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, CONST D3DXQUATERNION *pq4, FLOAT t); +void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbout, D3DXQUATERNION *pcout, CONST D3DXQUATERNION *pq0, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3); void WINAPI D3DXQuaternionToAxisAngle(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle); D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g);

1 0

Dmitry Timoshkov : gdiplus: Accept wider range of fonts.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: ac38e69a92a443759cc8fb3291c50dce3bc5a83c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac38e69a92a443759cc8fb329… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 14 14:12:40 2012 +0900 gdiplus: Accept wider range of fonts. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 51733f4..f4b75ef 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -644,7 +644,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { - if (type != TRUETYPE_FONTTYPE) + if (type & RASTER_FONTTYPE) return 1; *(LOGFONTW *)lParam = *elf;

1 0

Vincent Povirk : gdiplus: Check for NULL image in GdipImageRotateFlip.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: b5ef70c5836b33a9d469c71e20bff516eed45b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ef70c5836b33a9d469c71e2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 13 13:39:35 2012 -0500 gdiplus: Check for NULL image in GdipImageRotateFlip. --- dlls/gdiplus/image.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ce04c72..dd4dcea 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3889,6 +3889,9 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) TRACE("(%p, %u)\n", image, type); + if (!image) + return InvalidParameter; + rotate_90 = type&1; flip_x = (type&6) == 2 || (type&6) == 4; flip_y = (type&3) == 1 || (type&3) == 2;

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012