July 2015 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : ntdll: Cache contents of IMAGE_TLS_DIRECTORY instead of saving a directory pointer.
by Alexandre Julliard July 15, 2015

July 15, 2015

Module: wine Branch: master Commit: 21c37248135f6379e6af7aa3ec29997314e5c52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c37248135f6379e6af7aa3e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 14 16:36:12 2015 +0800 ntdll: Cache contents of IMAGE_TLS_DIRECTORY instead of saving a directory pointer. --- dlls/ntdll/loader.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 921bf57..bef0ab1 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -94,7 +94,7 @@ static struct builtin_load_info *builtin_load_info = &default_load_info; static HANDLE main_exe_file; static UINT tls_module_count; /* number of modules with TLS directory */ -static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */ +static IMAGE_TLS_DIRECTORY *tls_dirs; /* array of TLS directories */ LIST_ENTRY tls_links = { &tls_links, &tls_links }; static RTL_CRITICAL_SECTION loader_section; @@ -772,7 +772,12 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod ) size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; if (!size && !dir->SizeOfZeroFill && !dir->AddressOfCallBacks) return -1; - for (i = 0; i < tls_module_count; i++) if (!tls_dirs[i]) break; + for (i = 0; i < tls_module_count; i++) + { + if (!tls_dirs[i].StartAddressOfRawData && !tls_dirs[i].EndAddressOfRawData && + !tls_dirs[i].SizeOfZeroFill && !tls_dirs[i].AddressOfCallBacks) + break; + } TRACE( "module %p data %p-%p zerofill %u index %p callback %p flags %x -> slot %u\n", mod->BaseAddress, (void *)dir->StartAddressOfRawData, (void *)dir->EndAddressOfRawData, dir->SizeOfZeroFill, @@ -824,7 +829,7 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod ) } *(DWORD *)dir->AddressOfIndex = i; - tls_dirs[i] = dir; + tls_dirs[i] = *dir; return i; } @@ -841,7 +846,7 @@ static void free_tls_slot( LDR_MODULE *mod ) if (mod->TlsIndex == -1) return; assert( i < tls_module_count ); - tls_dirs[i] = NULL; + memset( &tls_dirs[i], 0, sizeof(tls_dirs[i]) ); } @@ -987,7 +992,7 @@ static NTSTATUS alloc_thread_tls(void) for (i = 0; i < tls_module_count; i++) { - const IMAGE_TLS_DIRECTORY *dir = tls_dirs[i]; + const IMAGE_TLS_DIRECTORY *dir = &tls_dirs[i]; if (!dir) continue; size = dir->EndAddressOfRawData - dir->StartAddressOfRawData;

1 0

Sebastian Lackner : vcomp: Implement omp_get_max_threads and omp_set_num_threads.
by Alexandre Julliard July 15, 2015

July 15, 2015

Module: wine Branch: master Commit: 4dea3e071d8de2742862009e021bce7504f92646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dea3e071d8de2742862009e0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 14 21:39:33 2015 +0200 vcomp: Implement omp_get_max_threads and omp_set_num_threads. --- dlls/vcomp/main.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index ab2a372..5a50486 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,6 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +static int vcomp_max_threads; +static int vcomp_num_threads; + int CDECL omp_get_dynamic(void) { TRACE("stub\n"); @@ -37,8 +40,8 @@ int CDECL omp_get_dynamic(void) int CDECL omp_get_max_threads(void) { - TRACE("stub\n"); - return 1; + TRACE("()\n"); + return vcomp_max_threads; } int CDECL omp_get_nested(void) @@ -83,7 +86,9 @@ void CDECL omp_set_nested(int nested) void CDECL omp_set_num_threads(int num_threads) { - TRACE("(%d): stub\n", num_threads); + TRACE("(%d)\n", num_threads); + if (num_threads >= 1) + vcomp_num_threads = num_threads; } void CDECL _vcomp_barrier(void) @@ -107,17 +112,25 @@ void CDECL _vcomp_single_end(void) TRACE("stub\n"); } -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %d, %p)\n", instance, reason, reserved); - switch (fdwReason) + switch (reason) { case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); + { + SYSTEM_INFO sysinfo; + DisableThreadLibraryCalls(instance); + + GetSystemInfo(&sysinfo); + vcomp_max_threads = sysinfo.dwNumberOfProcessors; + vcomp_num_threads = sysinfo.dwNumberOfProcessors; break; + } } return TRUE;

1 0

Michael Müller : aclocal.m4: Search for otool using AC_CHECK_TOOL.
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: 2bb9ece0e981c8f55714da4483b08cb38b4b5d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb9ece0e981c8f55714da448… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 13 21:29:24 2015 +0200 aclocal.m4: Search for otool using AC_CHECK_TOOL. --- aclocal.m4 | 3 +- configure | 155 ++++++++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 126 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2bb9ece0e981c8f55714d…

1 0

Dmitry Timoshkov : windowscodecs: Don' t fail to decode GIF if an image has been already loaded.
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: d1fde625a352b67b06a1ae176bcde3ca62459972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1fde625a352b67b06a1ae176… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 17:09:40 2015 +0800 windowscodecs: Don't fail to decode GIF if an image has been already loaded. --- dlls/windowscodecs/tests/gifformat.c | 9 --------- dlls/windowscodecs/ungif.c | 9 +++++++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 85ffc8f..53b4e47 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -459,43 +459,34 @@ static void test_truncated_gif(void) stream = create_stream(gif_with_trailer_2, sizeof(gif_with_trailer_2)); if (!stream) return; hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); -todo_wine ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); -if (hr != S_OK) goto skip_1; hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), "wrong container format %s\n", wine_dbgstr_guid(&format)); IWICBitmapDecoder_Release(decoder); -skip_1: IStream_Release(stream); stream = create_stream(gif_without_trailer_1, sizeof(gif_without_trailer_1)); if (!stream) return; hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); -todo_wine ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); -if (hr != S_OK) goto skip_2; hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), "wrong container format %s\n", wine_dbgstr_guid(&format)); IWICBitmapDecoder_Release(decoder); -skip_2: IStream_Release(stream); stream = create_stream(gif_without_trailer_2, sizeof(gif_without_trailer_2)); if (!stream) return; hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); -todo_wine ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); -if (hr != S_OK) goto skip_3; hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), "wrong container format %s\n", wine_dbgstr_guid(&format)); IWICBitmapDecoder_Release(decoder); -skip_3: IStream_Release(stream); } diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 427b32f..b413ff0 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -53,8 +53,10 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" - #include "ungif.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); static void *ungif_alloc( size_t sz ) { @@ -491,7 +493,10 @@ DGifGetLine(GifFileType * GifFile, * image until empty block (size 0) detected. We use GetCodeNext. */ do if (DGifGetCodeNext(GifFile, &Dummy) == GIF_ERROR) - return GIF_ERROR; + { + WARN("GIF is not properly terminated\n"); + break; + } while (Dummy != NULL) ; } return GIF_OK;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: 35ec7abe3248bdf766c2305c74ed62c5543a1a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ec7abe3248bdf766c2305c7… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Jul 14 16:37:14 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/po/lt.po b/po/lt.po index 38ae021..6a2e351 100644 --- a/po/lt.po +++ b/po/lt.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: 2015-05-21 20:22+0300\n" +"PO-Revision-Date: 2015-07-14 16:31+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -13512,16 +13512,12 @@ msgid "Command history" msgstr "Komandų istorija" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Buferio dydis" +msgstr "&Buferio dydis:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "&Šalinti vienodas" +msgstr "&Šalinti dublikatus" #: wineconsole.rc:74 msgid "Popup menu" @@ -13536,22 +13532,16 @@ msgid "S&hift" msgstr "S&hift" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "Už&daryti pultą" +msgstr "Pultas" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Greitas redagavimas" +msgstr "&Greitas redagavimas" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "&Eksperto režimas" +msgstr "Į&terpimo režimas" #: wineconsole.rc:88 msgid "&Font"

1 0

Nikolay Sivov : dwrite: Make sure explicit levels are always initialized ( Valgrind).
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: 0b64f24030531f5f56115c77d4da273bd365fb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b64f24030531f5f56115c77d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 10:55:23 2015 +0300 dwrite: Make sure explicit levels are always initialized (Valgrind). --- dlls/dwrite/bidi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 69eae5a..273d100 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -445,8 +445,9 @@ static void bidi_resolve_explicit(UINT8 baselevel, UINT8 *classes, UINT8 *levels pop_stack(); break; - /* X8: Nothing */ + /* X8 */ default: + levels[i] = baselevel; break; } }

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: 6dad3f2121d938de594940fd8281349fc8a6e78e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dad3f2121d938de594940fd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 13 19:46:13 2015 +0300 po: Update Russian translation. --- po/ru.po | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/po/ru.po b/po/ru.po index ab59f71..8fe9987 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2186,8 +2186,8 @@ msgstr "" "сертификатов.\n" "\n" "Сертификаты позволяют идентифицировать вас или компьютер, с которым " -"устанавливается связь.Также они используются для подтверждения подлинности и " -"подписывания сообщений. Хранилище сертификатов представляет собой набор " +"устанавливается связь. Также они используются для подтверждения подлинности " +"и подписывания сообщений. Хранилище сертификатов представляет собой набор " "сертификатов, списков отзыва сертификатов и списков доверенных " "сертификатов.\n" "\n" @@ -2324,8 +2324,8 @@ msgstr "" "файл.\n" "\n" "Сертификаты позволяют идентифицировать вас или компьютер, с которым " -"устанавливается связь.Также они используются для подтверждения подлинности и " -"подписывания сообщений. Хранилище сертификатов представляет собой набор " +"устанавливается связь. Также они используются для подтверждения подлинности " +"и подписывания сообщений. Хранилище сертификатов представляет собой набор " "сертификатов, списков отзыва сертификатов и списков доверенных " "сертификатов.\n" "\n" @@ -9072,7 +9072,7 @@ msgid "" "Cannot set the current wave device for play back because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"Невозможно использовать текущее устройство для воспроизведения, т.к. оно " +"Невозможно использовать текущее устройство для воспроизведения, так как оно " "занято. Подождите, пока устройство освободится, и попробуйте заново." #: winmm.rc:114 @@ -9080,7 +9080,7 @@ msgid "" "All wave devices that can record files in the current format are in use. " "Wait until a wave device is free, and then try again." msgstr "" -"Невозможно использовать текущее устройство для записи, т.к. оно занято. " +"Невозможно использовать текущее устройство для записи, так как оно занято. " "Подождите, пока устройство освободится, и попробуйте заново." #: winmm.rc:115 @@ -9088,7 +9088,7 @@ msgid "" "Cannot set the current wave device for recording because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"Невозможно использовать текущее устройство для воспроизведения, т.к. оно " +"Невозможно использовать текущее устройство для воспроизведения, так как оно " "занято. Подождите, пока устройство освободится, и попробуйте заново." #: winmm.rc:116 @@ -9741,7 +9741,6 @@ msgstr "" "другой.\n" #: cmd.rc:142 -#, fuzzy msgid "" "PATH displays or changes the cmd search path.\n" "\n" @@ -9755,12 +9754,12 @@ msgid "" msgstr "" "PATH отображает или изменяет маршрут поиска в cmd.\n" "\n" -"Команда PATH отображает текущую установку пути поиска исполняемых файлов\n" -"(первоначально это значение задаётся в вашем файле wine.conf). Для\n" -"изменения значения вызовите PATH с новым значением.\n" +"Команда PATH отображает текущее значение PATH (начальное значение\n" +"задаётся в реестре). Для изменения значения вызовите PATH с новым\n" +"значением.\n" "\n" -"Так же возможно изменять значение PATH, используя значение переменной\n" -"окружения PATH, например:\n" +"Также возможно изменить значение PATH, используя переменную окружения\n" +"PATH, например:\n" "PATH %PATH%;c:\\temp\n" #: cmd.rc:148 @@ -13501,16 +13500,12 @@ msgid "Command history" msgstr "История команд" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Зона буфера" +msgstr "Р&азмер буфера:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "&Удалять повторяющиеся" +msgstr "&Удалять повторы" #: wineconsole.rc:74 msgid "Popup menu" @@ -13525,22 +13520,16 @@ msgid "S&hift" msgstr "S&hift" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Закрывать консоль" +msgstr "Консоль" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Быстрое редактирование" +msgstr "&Быстрое редактирование" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "&Режим эксперта" +msgstr "&Режим вставки" #: wineconsole.rc:88 msgid "&Font"

1 0

Dmitry Timoshkov : windowscodecs/tests: Add some tests for loading truncated GIF images.
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: 51a3bc2d9d42bcf0065e95a1795c69c427f02ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a3bc2d9d42bcf0065e95a17… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 17:09:30 2015 +0800 windowscodecs/tests: Add some tests for loading truncated GIF images. --- dlls/windowscodecs/gifformat.c | 8 ++- dlls/windowscodecs/tests/gifformat.c | 106 +++++++++++++++++++++++++++++++++-- 2 files changed, 108 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 3a82c09..d134515 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1055,10 +1055,13 @@ static ULONG WINAPI GifDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { - IStream_Release(This->stream); + if (This->stream) + { + IStream_Release(This->stream); + DGifCloseFile(This->gif); + } This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - DGifCloseFile(This->gif); HeapFree(GetProcessHeap(), 0, This); } @@ -1435,6 +1438,7 @@ HRESULT GifDecoder_CreateInstance(REFIID iid, void** ppv) This->IWICBitmapDecoder_iface.lpVtbl = &GifDecoder_Vtbl; This->IWICMetadataBlockReader_iface.lpVtbl = &GifDecoder_BlockVtbl; + This->stream = NULL; This->ref = 1; This->initialized = FALSE; This->gif = NULL; diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 5b4cd8bc..85ffc8f 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -80,15 +80,12 @@ static const char gif_frame_sizes[] = { static IWICImagingFactory *factory; -static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) +static IStream *create_stream(const void *image_data, UINT image_size) { HGLOBAL hmem; BYTE *data; HRESULT hr; - IWICBitmapDecoder *decoder = NULL; IStream *stream; - GUID format; - LONG refcount; hmem = GlobalAlloc(0, image_size); data = GlobalLock(hmem); @@ -98,6 +95,20 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + return stream; +} + +static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IStream *stream; + GUID format; + LONG refcount; + + stream = create_stream(image_data, image_size); + if (!stream) return NULL; + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); @@ -402,6 +413,92 @@ static void test_gif_frame_sizes(void) IWICBitmapDecoder_Release(decoder); } +static const char gif_with_trailer_1[] = { +/* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x80,0x00,0x00, +/* palette */0xff,0xff,0xff,0xff,0xff,0xff, +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +/* image data */0x02,0x02,0x44,0x01,0x00,0x3b +}; +static const char gif_with_trailer_2[] = { +/* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x00,0x00,0x00, +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +/* image data */0x02,0x02,0x44,0x3b +}; +static const char gif_without_trailer_1[] = { +/* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x80,0x00,0x00, +/* palette */0xff,0xff,0xff,0xff,0xff,0xff, +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +/* image data */0x02,0x02,0x44,0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef +}; + +static const char gif_without_trailer_2[] = { +/* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x00,0x00,0x00, +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +/* image data */0x02,0x02,0x44,0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef +}; + +static void test_truncated_gif(void) +{ + HRESULT hr; + IStream *stream; + IWICBitmapDecoder *decoder; + GUID format; + + stream = create_stream(gif_with_trailer_1, sizeof(gif_with_trailer_1)); + if (!stream) return; + + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), + "wrong container format %s\n", wine_dbgstr_guid(&format)); + IWICBitmapDecoder_Release(decoder); + IStream_Release(stream); + + stream = create_stream(gif_with_trailer_2, sizeof(gif_with_trailer_2)); + if (!stream) return; + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); +todo_wine + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); +if (hr != S_OK) goto skip_1; + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), + "wrong container format %s\n", wine_dbgstr_guid(&format)); + IWICBitmapDecoder_Release(decoder); +skip_1: + IStream_Release(stream); + + stream = create_stream(gif_without_trailer_1, sizeof(gif_without_trailer_1)); + if (!stream) return; + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); +todo_wine + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); +if (hr != S_OK) goto skip_2; + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), + "wrong container format %s\n", wine_dbgstr_guid(&format)); + IWICBitmapDecoder_Release(decoder); +skip_2: + IStream_Release(stream); + + stream = create_stream(gif_without_trailer_2, sizeof(gif_without_trailer_2)); + if (!stream) return; + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); +todo_wine + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); +if (hr != S_OK) goto skip_3; + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), + "wrong container format %s\n", wine_dbgstr_guid(&format)); + IWICBitmapDecoder_Release(decoder); +skip_3: + IStream_Release(stream); +} + START_TEST(gifformat) { HRESULT hr; @@ -428,6 +525,7 @@ START_TEST(gifformat) test_global_gif_palette_2frames(); test_local_gif_palette(); test_gif_frame_sizes(); + test_truncated_gif(); IWICImagingFactory_Release(factory); }

1 0

Henri Verbeet : d2d1: Introduce a separate function to construct pixel shader constant buffers for brushes.
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: 3bb382aabbbb6cc95df05ef359a6fce4124754f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb382aabbbb6cc95df05ef35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:41 2015 +0200 d2d1: Introduce a separate function to construct pixel shader constant buffers for brushes. --- dlls/d2d1/brush.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 14 ++++++++ dlls/d2d1/render_target.c | 72 ++------------------------------------- 3 files changed, 103 insertions(+), 70 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index edce7a2..762d201 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -709,6 +709,93 @@ static D3D10_TEXTURE_ADDRESS_MODE texture_addres_mode_from_extend_mode(D2D1_EXTE } } +HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, + ID3D10Buffer **ps_cb) +{ + D3D10_SUBRESOURCE_DATA buffer_data; + D3D10_BUFFER_DESC buffer_desc; + struct + { + float _11, _21, _31, pad0; + float _12, _22, _32, pad1; + } transform; + D2D1_COLOR_F color; + HRESULT hr; + + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + buffer_data.SysMemPitch = 0; + buffer_data.SysMemSlicePitch = 0; + + if (brush->type == D2D_BRUSH_TYPE_SOLID) + { + color = brush->u.solid.color; + color.a *= brush->opacity; + + buffer_desc.ByteWidth = sizeof(color); + buffer_data.pSysMem = &color; + } + else if (brush->type == D2D_BRUSH_TYPE_BITMAP) + { + struct d2d_bitmap *bitmap = brush->u.bitmap.bitmap; + D2D_MATRIX_3X2_F w, b; + float dpi_scale, d; + + /* Scale for dpi. */ + w = render_target->drawing_state.transform; + dpi_scale = render_target->dpi_x / 96.0f; + w._11 *= dpi_scale; + w._21 *= dpi_scale; + w._31 *= dpi_scale; + dpi_scale = render_target->dpi_y / 96.0f; + w._12 *= dpi_scale; + w._22 *= dpi_scale; + w._32 *= dpi_scale; + + /* Scale for bitmap size and dpi. */ + b = brush->transform; + dpi_scale = bitmap->pixel_size.width * (bitmap->dpi_x / 96.0f); + b._11 *= dpi_scale; + b._21 *= dpi_scale; + dpi_scale = bitmap->pixel_size.height * (bitmap->dpi_y / 96.0f); + b._12 *= dpi_scale; + b._22 *= dpi_scale; + + d2d_matrix_multiply(&b, &w); + + /* Invert the matrix. (Because the matrix is applied to the sampling + * coordinates. I.e., to scale the bitmap by 2 we need to divide the + * coordinates by 2.) */ + d = b._11 * b._22 - b._21 * b._12; + if (d != 0.0f) + { + transform._11 = b._22 / d; + transform._21 = -b._21 / d; + transform._31 = (b._21 * b._32 - b._31 * b._22) / d; + transform._12 = -b._12 / d; + transform._22 = b._11 / d; + transform._32 = -(b._11 * b._32 - b._31 * b._12) / d; + } + transform.pad1 = brush->opacity; + + buffer_desc.ByteWidth = sizeof(transform); + buffer_data.pSysMem = &transform; + } + else + { + FIXME("Unhandled brush type %#x.\n", brush->type); + return E_NOTIMPL; + } + + if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, ps_cb))) + ERR("Failed to create constant buffer, hr %#x.\n", hr); + + return hr; +} + void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target) { static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 91ebd9f..2e9f741 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -142,6 +142,8 @@ HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_tar ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) DECLSPEC_HIDDEN; void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target) DECLSPEC_HIDDEN; +HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, + ID3D10Buffer **ps_cb) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; struct d2d_stroke_style @@ -233,4 +235,16 @@ struct d2d_geometry void d2d_path_geometry_init(struct d2d_geometry *geometry) DECLSPEC_HIDDEN; HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, const D2D1_RECT_F *rect) DECLSPEC_HIDDEN; +static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) +{ + D2D_MATRIX_3X2_F tmp = *a; + + a->_11 = tmp._11 * b->_11 + tmp._12 * b->_21; + a->_12 = tmp._11 * b->_12 + tmp._12 * b->_22; + a->_21 = tmp._21 * b->_11 + tmp._22 * b->_21; + a->_22 = tmp._21 * b->_12 + tmp._22 * b->_22; + a->_31 = tmp._31 * b->_11 + tmp._32 * b->_21 + b->_31; + a->_32 = tmp._31 * b->_12 + tmp._32 * b->_22 + b->_32; +} + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index fa98b5b..01b484e 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -32,18 +32,6 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; -static void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) -{ - D2D_MATRIX_3X2_F tmp = *a; - - a->_11 = tmp._11 * b->_11 + tmp._12 * b->_21; - a->_12 = tmp._11 * b->_12 + tmp._12 * b->_22; - a->_21 = tmp._21 * b->_11 + tmp._22 * b->_21; - a->_22 = tmp._21 * b->_12 + tmp._22 * b->_22; - a->_31 = tmp._31 * b->_11 + tmp._32 * b->_21 + b->_31; - a->_32 = tmp._31 * b->_12 + tmp._32 * b->_22 + b->_32; -} - static void d2d_point_set(D2D1_POINT_2F *dst, float x, float y) { dst->x = x; @@ -550,7 +538,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; ID3D10Buffer *vs_cb, *ps_cb; - D2D1_COLOR_F color; float tmp_x, tmp_y; HRESULT hr; struct @@ -609,64 +596,9 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar return; } - if (brush_impl->type == D2D_BRUSH_TYPE_BITMAP) - { - struct d2d_bitmap *bitmap = brush_impl->u.bitmap.bitmap; - D2D_MATRIX_3X2_F w, b; - float dpi_scale, d; - - /* Scale for dpi. */ - w = render_target->drawing_state.transform; - dpi_scale = render_target->dpi_x / 96.0f; - w._11 *= dpi_scale; - w._21 *= dpi_scale; - w._31 *= dpi_scale; - dpi_scale = render_target->dpi_y / 96.0f; - w._12 *= dpi_scale; - w._22 *= dpi_scale; - w._32 *= dpi_scale; - - /* Scale for bitmap size and dpi. */ - b = brush_impl->transform; - dpi_scale = bitmap->pixel_size.width * (bitmap->dpi_x / 96.0f); - b._11 *= dpi_scale; - b._21 *= dpi_scale; - dpi_scale = bitmap->pixel_size.height * (bitmap->dpi_y / 96.0f); - b._12 *= dpi_scale; - b._22 *= dpi_scale; - - d2d_matrix_multiply(&b, &w); - - /* Invert the matrix. (Because the matrix is applied to the sampling - * coordinates. I.e., to scale the bitmap by 2 we need to divide the - * coordinates by 2.) */ - d = b._11 * b._22 - b._21 * b._12; - if (d != 0.0f) - { - transform._11 = b._22 / d; - transform._21 = -b._21 / d; - transform._31 = (b._21 * b._32 - b._31 * b._22) / d; - transform._12 = -b._12 / d; - transform._22 = b._11 / d; - transform._32 = -(b._11 * b._32 - b._31 * b._12) / d; - } - transform.pad1 = brush_impl->opacity; - - buffer_desc.ByteWidth = sizeof(transform); - buffer_data.pSysMem = &transform; - } - else - { - color = brush_impl->u.solid.color; - color.a *= brush_impl->opacity; - - buffer_desc.ByteWidth = sizeof(color); - buffer_data.pSysMem = &color; - } - - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ps_cb))) + if (FAILED(hr = d2d_brush_get_ps_cb(brush_impl, render_target, &ps_cb))) { - WARN("Failed to create constant buffer, hr %#x.\n", hr); + WARN("Failed to get ps constant buffer, hr %#x.\n", hr); ID3D10Buffer_Release(vs_cb); return; }

1 0

Henri Verbeet : d2d1: Also bind the pixel shader and blend state in d2d_brush_bind_resources().
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: 1f4e37659c5d7e713d605696d8bb64a25c97aea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4e37659c5d7e713d605696d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:40 2015 +0200 d2d1: Also bind the pixel shader and blend state in d2d_brush_bind_resources(). --- dlls/d2d1/brush.c | 16 ++++++++++++++-- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/render_target.c | 20 ++++++-------------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index cd5476a..edce7a2 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -709,12 +709,20 @@ static D3D10_TEXTURE_ADDRESS_MODE texture_addres_mode_from_extend_mode(D2D1_EXTE } } -void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) +void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target) { + static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + ID3D10Device *device = render_target->device; HRESULT hr; - if (brush->type == D2D_BRUSH_TYPE_BITMAP) + ID3D10Device_OMSetBlendState(device, render_target->bs, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + if (brush->type == D2D_BRUSH_TYPE_SOLID) { + ID3D10Device_PSSetShader(device, render_target->rect_solid_ps); + } + else if (brush->type == D2D_BRUSH_TYPE_BITMAP) + { + ID3D10Device_PSSetShader(device, render_target->rect_bitmap_ps); ID3D10Device_PSSetShaderResources(device, 0, 1, &brush->u.bitmap.bitmap->view); if (!brush->u.bitmap.sampler_state) { @@ -743,4 +751,8 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) } ID3D10Device_PSSetSamplers(device, 0, 1, &brush->u.bitmap.sampler_state); } + else + { + FIXME("Unhandled brush type %#x.\n", brush->type); + } } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 8ddee9e..91ebd9f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -141,7 +141,7 @@ void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget * HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) DECLSPEC_HIDDEN; -void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) DECLSPEC_HIDDEN; +void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; struct d2d_stroke_style diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index b7ca78c..fa98b5b 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -140,13 +140,12 @@ static void d2d_clip_stack_pop(struct d2d_clip_stack *stack) } static void d2d_draw(struct d2d_d3d_render_target *render_target, ID3D10Buffer *vs_cb, - ID3D10PixelShader *ps, ID3D10Buffer *ps_cb, struct d2d_brush *brush) + ID3D10Buffer *ps_cb, struct d2d_brush *brush) { ID3D10Device *device = render_target->device; unsigned int offset; D3D10_VIEWPORT vp; HRESULT hr; - static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; vp.TopLeftX = 0; vp.TopLeftY = 0; @@ -171,7 +170,6 @@ static void d2d_draw(struct d2d_d3d_render_target *render_target, ID3D10Buffer * ID3D10Device_VSSetConstantBuffers(device, 0, 1, &vs_cb); ID3D10Device_VSSetShader(device, render_target->vs); ID3D10Device_PSSetConstantBuffers(device, 0, 1, &ps_cb); - ID3D10Device_PSSetShader(device, ps); ID3D10Device_RSSetViewports(device, 1, &vp); if (render_target->clip_stack.count) { @@ -188,10 +186,9 @@ static void d2d_draw(struct d2d_d3d_render_target *render_target, ID3D10Buffer * } ID3D10Device_OMSetRenderTargets(device, 1, &render_target->view, NULL); if (brush) - { - ID3D10Device_OMSetBlendState(device, render_target->bs, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); - d2d_brush_bind_resources(brush, device); - } + d2d_brush_bind_resources(brush, render_target); + else + ID3D10Device_PSSetShader(device, render_target->rect_solid_ps); ID3D10Device_Draw(device, 4, 0); @@ -553,7 +550,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; ID3D10Buffer *vs_cb, *ps_cb; - ID3D10PixelShader *ps; D2D1_COLOR_F color; float tmp_x, tmp_y; HRESULT hr; @@ -619,8 +615,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar D2D_MATRIX_3X2_F w, b; float dpi_scale, d; - ps = render_target->rect_bitmap_ps; - /* Scale for dpi. */ w = render_target->drawing_state.transform; dpi_scale = render_target->dpi_x / 96.0f; @@ -663,8 +657,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar } else { - ps = render_target->rect_solid_ps; - color = brush_impl->u.solid.color; color.a *= brush_impl->opacity; @@ -679,7 +671,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar return; } - d2d_draw(render_target, vs_cb, ps, ps_cb, brush_impl); + d2d_draw(render_target, vs_cb, ps_cb, brush_impl); ID3D10Buffer_Release(ps_cb); ID3D10Buffer_Release(vs_cb); @@ -1145,7 +1137,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa return; } - d2d_draw(render_target, vs_cb, render_target->rect_solid_ps, ps_cb, NULL); + d2d_draw(render_target, vs_cb, ps_cb, NULL); ID3D10Buffer_Release(ps_cb); ID3D10Buffer_Release(vs_cb);

1 0