February 2019 - Wine-commits

Jacek Caban : atlthunk: Implement AtlThunk functions.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 89ef868e5e25d236b3673dd6d3e7bd54013e3617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ef868e5e25d236b3673dd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 22:06:15 2019 +0100 atlthunk: Implement AtlThunk functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atlthunk/atlthunk.c | 148 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 144 insertions(+), 4 deletions(-) diff --git a/dlls/atlthunk/atlthunk.c b/dlls/atlthunk/atlthunk.c index 79d0432..cd37b75 100644 --- a/dlls/atlthunk/atlthunk.c +++ b/dlls/atlthunk/atlthunk.c @@ -22,24 +22,164 @@ WINE_DEFAULT_DEBUG_CHANNEL(atlthunk); +#if defined(__i386__) || defined(__x86_64__) + +struct AtlThunkData_t { + struct thunk_pool *pool; + WNDPROC proc; + SIZE_T arg; +}; + +/* Thunk replaces the first argument and jumps to provided proc. */ +#include "pshpack1.h" +struct thunk_code +{ +#if defined(__x86_64__) + BYTE mov_rip_rcx[3]; /* mov mov_offset(%rip), %rcx */ + DWORD mov_offset; + WORD jmp_rip; /* jmp *jmp_offset(%rip) */ + DWORD jmp_offset; +#elif defined(__i386__) + BYTE mov_data_addr_eax; /* movl data_addr, %eax */ + DWORD data_addr; + DWORD mov_eax_esp; /* movl %eax, 4(%esp) */ + WORD jmp; + DWORD jmp_addr; /* jmp *jmp_addr */ +#endif +}; +#include "poppack.h" + +#define THUNK_POOL_SIZE (4096 / sizeof(struct thunk_code)) + +struct thunk_pool +{ + struct thunk_code thunks[THUNK_POOL_SIZE]; + LONG first_free; + LONG free_count; + AtlThunkData_t data[THUNK_POOL_SIZE]; +}; + +C_ASSERT(FIELD_OFFSET(struct thunk_pool, first_free) == 4096); + +static struct thunk_pool *alloc_thunk_pool(void) +{ + struct thunk_pool *thunks; + DWORD old_protect; + unsigned i; + + if (!(thunks = VirtualAlloc(NULL, sizeof(*thunks), MEM_COMMIT, PAGE_READWRITE))) + return NULL; + + for (i = 0; i < ARRAY_SIZE(thunks->thunks); i++) + { + struct thunk_code *thunk = &thunks->thunks[i]; +#if defined(__x86_64__) + thunk->mov_rip_rcx[0] = 0x48; /* mov mov_offset(%rip), %rcx */ + thunk->mov_rip_rcx[1] = 0x8b; + thunk->mov_rip_rcx[2] = 0x0d; + thunk->mov_offset = (const BYTE *)&thunks->data[i].arg - (const BYTE *)(&thunk->mov_offset + 1); + thunk->jmp_rip = 0x25ff; /* jmp *jmp_offset(%rip) */ + thunk->jmp_offset = (const BYTE *)&thunks->data[i].proc - (const BYTE *)(&thunk->jmp_offset + 1); +#elif defined(__i386__) + thunk->mov_data_addr_eax = 0xa1; /* movl data_addr, %eax */ + thunk->data_addr = (DWORD)&thunks->data[i].arg; + thunk->mov_eax_esp = 0x04244489; /* movl %eax, 4(%esp) */ + thunk->jmp = 0x25ff; /* jmp *jmp_addr */ + thunk->jmp_addr = (DWORD)&thunks->data[i].proc; +#endif + } + VirtualProtect(thunks->thunks, FIELD_OFFSET(struct thunk_pool, first_free), PAGE_EXECUTE_READ, &old_protect); + thunks->first_free = 0; + thunks->free_count = 0; + return thunks; +} + +static struct thunk_pool *current_pool; + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + case DLL_PROCESS_DETACH: + if (reserved) break; + if (current_pool && current_pool->free_count == current_pool->first_free) + VirtualFree(current_pool, sizeof(*current_pool), MEM_RELEASE); + break; + } + return TRUE; +} + +static CRITICAL_SECTION thunk_alloc_cs; +static CRITICAL_SECTION_DEBUG thunk_alloc_cs_debug = { + 0, 0, &thunk_alloc_cs, + { &thunk_alloc_cs_debug.ProcessLocksList, + &thunk_alloc_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": thunk_alloc_cs") } +}; +static CRITICAL_SECTION thunk_alloc_cs = { &thunk_alloc_cs_debug, -1, 0, 0, 0, 0 }; + AtlThunkData_t* WINAPI AtlThunk_AllocateData(void) { - FIXME("\n"); + AtlThunkData_t *thunk = NULL; + + EnterCriticalSection(&thunk_alloc_cs); + + if (!current_pool) current_pool = alloc_thunk_pool(); + if (current_pool) + { + thunk = &current_pool->data[current_pool->first_free]; + thunk->pool = current_pool; + thunk->proc = NULL; + thunk->arg = 0; + if (++current_pool->first_free == ARRAY_SIZE(current_pool->data)) + current_pool = NULL; + } + + LeaveCriticalSection(&thunk_alloc_cs); + return thunk; +} + +WNDPROC WINAPI AtlThunk_DataToCode(AtlThunkData_t *thunk) +{ + WNDPROC code = (WNDPROC)&thunk->pool->thunks[thunk - thunk->pool->data]; + TRACE("(%p) -> %p\n", thunk, code); + return code; +} + +void WINAPI AtlThunk_FreeData(AtlThunkData_t *thunk) +{ + if (InterlockedIncrement(&thunk->pool->free_count) == ARRAY_SIZE(thunk->pool->thunks)) + VirtualFree(thunk->pool, sizeof(*thunk->pool), MEM_RELEASE); +} + +void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) +{ + thunk->proc = proc; + thunk->arg = arg; +} + +#else /* __i386__ || __x86_64__ */ + +AtlThunkData_t* WINAPI AtlThunk_AllocateData(void) +{ + FIXME("Unsupported architecture.\n"); return NULL; } WNDPROC WINAPI AtlThunk_DataToCode(AtlThunkData_t *thunk) { - FIXME("(%p)\n", thunk); return NULL; } void WINAPI AtlThunk_FreeData(AtlThunkData_t *thunk) { - FIXME("(%p)\n", thunk); } void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) { - FIXME("(%p %p %lx)\n", thunk, proc, arg); } + +#endif /* __i386__ || __x86_64__ */

1 0

Jacek Caban : atlthunk/tests: Add tests.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 2f9922903ee79b2c56c413c84e3507aa5cfb22ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f9922903ee79b2c56c413c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 22:06:22 2019 +0100 atlthunk/tests: Add tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/atlthunk/tests/Makefile.in | 6 ++++ dlls/atlthunk/tests/atlthunk.c | 62 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) diff --git a/configure b/configure index b86e260..f3739a4 100755 --- a/configure +++ b/configure @@ -19359,6 +19359,7 @@ wine_fn_config_makefile dlls/atl80 enable_atl80 wine_fn_config_makefile dlls/atl80/tests enable_tests wine_fn_config_makefile dlls/atl90 enable_atl90 wine_fn_config_makefile dlls/atlthunk enable_atlthunk +wine_fn_config_makefile dlls/atlthunk/tests enable_tests wine_fn_config_makefile dlls/atmlib enable_atmlib wine_fn_config_makefile dlls/authz enable_authz wine_fn_config_makefile dlls/avicap32 enable_avicap32 diff --git a/configure.ac b/configure.ac index da14848..f7eb42b 100644 --- a/configure.ac +++ b/configure.ac @@ -3094,6 +3094,7 @@ WINE_CONFIG_MAKEFILE(dlls/atl80) WINE_CONFIG_MAKEFILE(dlls/atl80/tests) WINE_CONFIG_MAKEFILE(dlls/atl90) WINE_CONFIG_MAKEFILE(dlls/atlthunk) +WINE_CONFIG_MAKEFILE(dlls/atlthunk/tests) WINE_CONFIG_MAKEFILE(dlls/atmlib) WINE_CONFIG_MAKEFILE(dlls/authz) WINE_CONFIG_MAKEFILE(dlls/avicap32) diff --git a/dlls/atlthunk/tests/Makefile.in b/dlls/atlthunk/tests/Makefile.in new file mode 100644 index 0000000..9da3a96 --- /dev/null +++ b/dlls/atlthunk/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = atlthunk.dll +IMPORTS = atlthunk + + +C_SRCS = \ + atlthunk.c diff --git a/dlls/atlthunk/tests/atlthunk.c b/dlls/atlthunk/tests/atlthunk.c new file mode 100644 index 0000000..b316ae1 --- /dev/null +++ b/dlls/atlthunk/tests/atlthunk.c @@ -0,0 +1,62 @@ +/* + * Copyright 2019 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include "atlthunk.h" +#include "wine/test.h" + +static LRESULT WINAPI test_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + ok(msg == 1, "msg = %u\n", msg); + ok(wparam == 2, "wparam = %lu\n", wparam); + ok(lparam == 3, "lparam = %lu\n", lparam); + return (LRESULT)hwnd | 0x1000; +} + +static void test_thunk_proc(void) +{ + AtlThunkData_t *thunks[513]; + WNDPROC thunk_proc; + LRESULT res; + int i; + + for(i=0; i < ARRAY_SIZE(thunks); i++) + { + thunks[i] = AtlThunk_AllocateData(); + ok(thunks[i] != NULL, "thunk = NULL\n"); + + AtlThunk_InitData(thunks[i], test_proc, i); + } + + for(i=0; i < ARRAY_SIZE(thunks); i++) + { + thunk_proc = AtlThunk_DataToCode(thunks[i]); + ok(thunk_proc != NULL, "thunk_proc = NULL\n"); + + res = thunk_proc((HWND)0x1234, 1, 2, 3); + ok(res == (i | 0x1000), "res = %lu\n", res); + } + + for(i=0; i < ARRAY_SIZE(thunks); i++) + AtlThunk_FreeData(thunks[i]); +} + +START_TEST(atlthunk) +{ + test_thunk_proc(); +}

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: c819640c568e79bf472fb93ffedd78ede760e685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c819640c568e79bf472fb93f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Feb 19 08:49:13 2019 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/lt.po b/po/lt.po index a585522..e2b1688 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-02-14 09:08+0300\n" +"PO-Revision-Date: 2019-02-19 08:48+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" @@ -16327,8 +16327,6 @@ msgid "Text documents (*.txt)" msgstr "Tekstiniai dokumentai (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" msgstr "Teksto unikodu dokumentai (*.txt)"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: e5437f30dea5c783ef06c723ab63cd91a6df7243 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5437f30dea5c783ef06c723… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 19 10:03:48 2019 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 50 ++++++++++++++------------------------------------ 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/po/ru.po b/po/ru.po index dd22cee..58713e0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-11 15:59+0300\n" +"PO-Revision-Date: 2019-02-19 09:59+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2\n" +"X-Generator: Poedit 2.2.1\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -9100,16 +9100,12 @@ msgid "Cape Verde Daylight Time" msgstr "" #: tzres.rc:74 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "Центральноевропейский" +msgstr "" #: tzres.rc:75 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "Центральноевропейский" +msgstr "" #: tzres.rc:140 msgid "Morocco Standard Time" @@ -9120,16 +9116,12 @@ msgid "Morocco Daylight Time" msgstr "" #: tzres.rc:72 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "Центральноевропейский" +msgstr "" #: tzres.rc:73 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "Центральноевропейский" +msgstr "" #: tzres.rc:118 msgid "Iran Standard Time" @@ -9164,10 +9156,8 @@ msgid "Mountain Daylight Time (Mexico)" msgstr "" #: tzres.rc:106 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "&Стандартная панель" +msgstr "" #: tzres.rc:107 msgid "GMT Daylight Time" @@ -9338,10 +9328,8 @@ msgid "India Daylight Time" msgstr "" #: tzres.rc:112 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "&Стандартная панель" +msgstr "" #: tzres.rc:113 msgid "GTB Daylight Time" @@ -9660,10 +9648,8 @@ msgid "Paraguay Daylight Time" msgstr "" #: tzres.rc:84 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "Дата и время" +msgstr "" #: tzres.rc:85 msgid "Dateline Daylight Time" @@ -9750,16 +9736,12 @@ msgid "Greenland Daylight Time" msgstr "" #: tzres.rc:92 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "Дата и время" +msgstr "" #: tzres.rc:93 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "Дата и время" +msgstr "" #: tzres.rc:96 msgid "Egypt Standard Time" @@ -9810,10 +9792,8 @@ msgid "E. Africa Daylight Time" msgstr "" #: tzres.rc:102 -#, fuzzy -#| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "&Стандартная панель" +msgstr "" #: tzres.rc:103 msgid "FLE Daylight Time" @@ -14790,7 +14770,7 @@ msgstr "Просмотрщик обычных метафайлов" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Метафайлы (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -16335,10 +16315,8 @@ msgid "Text documents (*.txt)" msgstr "Текстовые документы (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Документы Unicode (*.txt)" +msgstr "Текстовые документы Unicode (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)"

1 0

Hans Leidekker : msi: Don't use delay imports.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: bfd02931acd228e89e6c6ded5dd0447815f5a6a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfd02931acd228e89e6c6ded… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 19 11:34:03 2019 +0100 msi: Don't use delay imports. This avoids problems with disabling Wow64 filesystem redirection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46654 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 4434a3f..7140e5a 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -1,7 +1,6 @@ MODULE = msi.dll IMPORTLIB = msi -IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 rpcrt4 sxs -DELAYIMPORTS = odbccp32 wintrust crypt32 imagehlp mspatcha +IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 rpcrt4 sxs imagehlp mspatcha odbccp32 wintrust crypt32 EXTRAIDLFLAGS = --prefix-server=s_

1 0

Byeongsik Jeon : gdi32: Add a workaround for Freetype < 2.8.1 using v40 FT_LOAD_TARGET_MONO.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: c666a45560c3998e9cf5271d2628eb2b913d0b4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c666a45560c3998e9cf5271d… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Feb 19 10:25:41 2019 +0000 gdi32: Add a workaround for Freetype < 2.8.1 using v40 FT_LOAD_TARGET_MONO. Freetype < 2.8.1 v40 has incorrect advance widths and rendering issues. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0fc41f3..098faff 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -170,6 +170,7 @@ static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); #ifdef FT_LCD_FILTER_H static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); #endif +static FT_Error (*pFT_Property_Set)(FT_Library, const FT_String *, const FT_String *, const void *); #ifdef SONAME_LIBFONTCONFIG #include <fontconfig/fontconfig.h> @@ -4162,6 +4163,7 @@ static BOOL init_freetype(void) #ifdef FT_LCD_FILTER_H pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0); #endif + pFT_Property_Set = wine_dlsym(ft_handle, "FT_Property_Set", NULL, 0); if(pFT_Init_FreeType(&library) != 0) { ERR("Can't init FreeType library\n"); @@ -4176,6 +4178,13 @@ static BOOL init_freetype(void) ((FT_Version.minor << 8) & 0x00ff00) | ((FT_Version.patch ) & 0x0000ff); + /* In Freetype < 2.8.1 v40's FT_LOAD_TARGET_MONO has broken advance widths. */ + if (pFT_Property_Set && FT_SimpleVersion < FT_VERSION_VALUE(2, 8, 1)) + { + FT_UInt interpreter_version = 35; + pFT_Property_Set( library, "truetype", "interpreter-version", &interpreter_version ); + } + font_driver = &freetype_funcs; return TRUE;

1 0

Isira Seneviratne : wordpad: Update STRING_TEXT_FILES_UNICODE_TXT string to plural format.
by Alexandre Julliard 18 Feb '19

18 Feb '19

1 0

Dmitry Timoshkov : windowscodecs: Add support for 32bppRGB, 32bppRGBA and 32bppPRGBA to format converter.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 4cbea6a5c2a2540aeeba2bb56cbf7cfe5f7d2837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cbea6a5c2a2540aeeba2bb5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 15 10:10:44 2019 +0800 windowscodecs: Add support for 32bppRGB, 32bppRGBA and 32bppPRGBA to format converter. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 112 +++++++++++++++++++++++++++++++++++ dlls/windowscodecs/info.c | 2 + dlls/windowscodecs/regsvr.c | 36 +++++++++++ dlls/windowscodecs/tests/converter.c | 45 +++++++++++++- 4 files changed, 194 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4cbea6a5c2a2540aeeba…

1 0

Sven Baars : windowscodecs/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 13eb82922cafff26363b85c1b9b18dd965dffa55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13eb82922cafff26363b85c1… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Feb 17 11:16:21 2019 +0100 windowscodecs/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 455c6ae..b99f987 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -880,6 +880,8 @@ static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) } else tag[i].value[0] = -1; + + PropVariantClear(&value); } IWICMetadataReader_Release(reader);

1 0

Sven Baars : windowscodecs: Add missing source_bpp initialization ( Valgrind).
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 1d8882e04be101f5c7773a84d2059353ca768a1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d8882e04be101f5c7773a84… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Feb 17 11:47:55 2019 +0100 windowscodecs: Add missing source_bpp initialization (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 3d53b24..58cd04e 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -289,6 +289,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->reverse_bgr = 0; decode_info->invert_grayscale = 0; decode_info->tiled = 0; + decode_info->source_bpp = 0; ret = pTIFFGetField(tiff, TIFFTAG_PHOTOMETRIC, &photometric); if (!ret)

1 0