January 2019 - Wine-Commits

Sven Baars : mstask/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard Jan. 14, 2019

Jan. 14, 2019

Module: wine Branch: master Commit: 80b572e8b25390ab99b4578f5a032d7521ddc2f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80b572e8b25390ab99b4578f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Jan 13 15:01:16 2019 +0100 mstask/tests: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task.c | 1 + dlls/mstask/tests/task_scheduler.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 4e8386a..6195194 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -760,6 +760,7 @@ static void test_workitem_data(void) ok(count == sizeof(hello), "got %u\n", count); ok(data != NULL, "got NULL\n"); ok(!memcmp(data, hello, sizeof(hello)), "data mismatch\n"); + CoTaskMemFree(data); hr = ITask_SetWorkItemData(task, 0, NULL); ok(hr == S_OK, "got %#x\n", hr); diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index f610225..5abee75 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -329,11 +329,13 @@ static void test_save_task_curfile(ITask *task) hr = IPersistFile_Save(pfile, NULL, TRUE); ok(hr == S_OK, "Save error %#x\n", hr); + CoTaskMemFree(curfile); curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); ok(hr == S_OK, "GetCurFile error %#x\n", hr); ok(curfile && curfile[0] , "curfile should not be NULL\n"); + CoTaskMemFree(curfile); IPersistFile_Release(pfile); } @@ -454,18 +456,21 @@ static void test_task_storage(void) curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task2_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task3, (IScheduledWorkItem *)task); ok(hr == S_OK, "AddWorkItem error %#x\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task3_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); ok(hr == S_OK, "AddWorkItem error %#x\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr);

1 0

Sven Baars : shell32/tests: Fix a typo.
by Alexandre Julliard Jan. 14, 2019

Jan. 14, 2019

Module: wine Branch: master Commit: 5b87378bbd072a3fc31a741f1f07c31c4d165b9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b87378bbd072a3fc31a741f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Jan 12 21:38:41 2019 +0100 shell32/tests: Fix a typo. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index bac64e5..38b56f0 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1882,7 +1882,7 @@ if (0) { /* crashes */ path2 = NULL; hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_SIMPLE_IDLIST, NULL, &path2); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); - ok(path != NULL, "expected path != NULL\n"); + ok(path2 != NULL, "expected path != NULL\n"); ok(!lstrcmpiW(path, path2), "expected equal paths: %s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(path2)); CoTaskMemFree(path2);

1 0

Matteo Bruni : wined3d: Set proper GL internal format for sRGB formats.
by Alexandre Julliard Jan. 14, 2019

Jan. 14, 2019

Module: wine Branch: master Commit: 41e35425a8f045b2c421999f020932ed339909fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e35425a8f045b2c421999f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 11 00:25:12 2019 +0100 wined3d: Set proper GL internal format for sRGB formats. The idea was to defer that part to check_fbo_compat() for the FBO ORM but, it turns out, there are formats like DXTn that aren't generally FBO-attachable but still support sRGB. Fixes 9fc3444d6ed8ad0e124a77d2faf1e2cc6639f40f (it's a partial revert, in fact). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f8da256..dd70d3f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3053,8 +3053,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, if (!(format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) format->srgb_internal = format->internal; - else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) format->internal = format->srgb_internal; } } @@ -3076,8 +3075,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, format->srgb_internal = format->internal; format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } - else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) { format->internal = format->srgb_internal; }

1 0

Sven Baars : shell32/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard Jan. 14, 2019

Jan. 14, 2019

Module: wine Branch: master Commit: cfc7bd7460c00b3fe548e3805398336bc969b1be URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfc7bd7460c00b3fe548e380… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Jan 14 13:45:54 2019 +0100 shell32/tests: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 4f81214..4ef124c 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -786,7 +786,10 @@ static void test_custom_source(void) SendMessageW(hwnd_edit, WM_CHAR, 'x', 1); dispatch_messages(); ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); + IAutoCompleteDropDown_Release(acdropdown); + IAutoComplete2_Release(autocomplete); + IUnknown_Release(enumerator); test_prefix_filtering(hwnd_edit);

1 0

James Larrowe : winebuild: Fix a segmentation fault.
by Alexandre Julliard Jan. 14, 2019

Jan. 14, 2019

Module: wine Branch: master Commit: f97636bc494bef29073ed441e27ca8bd1f89c178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f97636bc494bef29073ed441… Author: James Larrowe <larrowe.semaj11(a)gmail.com> Date: Sat Jan 12 17:01:08 2019 -0500 winebuild: Fix a segmentation fault. When 'winebuild' is called with no arguments, the make_c_identifier function is passed a null pointer, which is dereferenced and causes a segmentation fault. Signed-off-by: James Larrowe <larrowe.semaj11(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 70f381c..b2f5c95 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -164,7 +164,7 @@ static void init_dll_name( DLLSPEC *spec ) spec->dll_name = xstrdup( spec->file_name ); if ((p = strrchr( spec->dll_name, '.' ))) *p = 0; } - spec->c_name = make_c_identifier( spec->dll_name ); + if (spec->dll_name) spec->c_name = make_c_identifier( spec->dll_name ); } /* set the dll subsystem */

1 0

Francois Gouget : po: Fuzzy an Arabic translation with a format mismatch.
by Alexandre Julliard Jan. 14, 2019

Jan. 14, 2019

Module: wine Branch: master Commit: 5132b45df50a5ea44af8dedff0ce5ec88b066b9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5132b45df50a5ea44af8dedf… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 14 09:16:22 2019 +0100 po: Fuzzy an Arabic translation with a format mismatch. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 1 + 1 file changed, 1 insertion(+) diff --git a/po/ar.po b/po/ar.po index 53b82de..9f44d18 100644 --- a/po/ar.po +++ b/po/ar.po @@ -14324,6 +14324,7 @@ msgid "Close message sent to top-level windows of process with PID %1!u!.\n" msgstr "رسالة الإغلاق أرسلت إلى مستوى عال من مهام وندوز و معرفها %1!u!.\n" #: taskkill.rc:37 +#, fuzzy msgid "" "Close message sent to top-level windows of process \"%1\" with PID %2!u!.\n" msgstr "رسالة الإغلاق أرسلت إلى مستوى عال من مهام وندوز و معرفها %2!u!.\n"

1 0

Francois Gouget : msi/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Jan. 14, 2019

Jan. 14, 2019

Module: wine Branch: master Commit: ad735ca1f329b9419aaaf59bda4e3c936f9d92f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad735ca1f329b9419aaaf59b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 14 09:20:10 2019 +0100 msi/tests: Add a trailing '\n' to an ok() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 1267db3..9f847ce 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -14213,7 +14213,7 @@ static void test_setpropertyfolder(void) ok(delete_pf("msitest\\maximus", TRUE), "file not installed\n"); ok(delete_pf("msitest", FALSE), "directory not created\n"); - ok(DeleteFileA("c:\\parent\\child\\Shortcut.lnk"), "file not installed"); + ok(DeleteFileA("c:\\parent\\child\\Shortcut.lnk"), "file not installed\n"); ok(RemoveDirectoryA("c:\\parent\\child"), "directory not created\n"); ok(RemoveDirectoryA("c:\\parent"), "directory not created\n");

1 0

Francois Gouget : po: Fix a format mismatch in a Russian translation.
by Alexandre Julliard Jan. 14, 2019

Jan. 14, 2019

Module: wine Branch: master Commit: 39620552ea76bb154dafbd190964dd01a453b399 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39620552ea76bb154dafbd19… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 14 09:11:47 2019 +0100 po: Fix a format mismatch in a Russian translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ru.po b/po/ru.po index a30a946..7084267 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13103,7 +13103,7 @@ msgstr "Вы точно хотите удалить параметр реест #: reg.rc:55 msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Вы точно хотите удалить все параметры реестра из «%s»?" +msgstr "Вы точно хотите удалить все параметры реестра из «%1»?" #: reg.rc:56 msgid "Are you sure you want to delete the registry key '%1'?"

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Jan. 14, 2019

Jan. 14, 2019

Module: wine Branch: master Commit: 38d0c4feba2a64bb929fde4d20b49c4285fa1efb URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d0c4feba2a64bb929fde4d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jan 14 19:22:15 2019 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index cc91a66..1ba61a0 100644 --- a/po/ja.po +++ b/po/ja.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: 2018-12-17 20:09+0900\n" +"PO-Revision-Date: 2019-01-14 19:01+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -13359,7 +13359,7 @@ msgstr "(不明 %d)" #: regedit.rc:247 msgid "Unable to modify the selected registry value." -msgstr "選択したレジストリキー '%1' を変更できません。" +msgstr "選択したレジストリキーを変更できません。" #: regedit.rc:248 msgid "Unable to create a new registry key."

1 0

Józef Kucia : wined3d: Execute all CS commands before setting palette entries.
by Alexandre Julliard Jan. 14, 2019

Jan. 14, 2019

Module: wine Branch: master Commit: 77f40d05817236966390def672e6ebbd4b45bf53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f40d05817236966390def6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 12 12:23:18 2019 +0100 wined3d: Execute all CS commands before setting palette entries. This is not the most performant solution. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44796 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/palette.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 2436100..d78a364 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -98,6 +98,8 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, palette, flags, start, count, entries); TRACE("Palette flags: %#x.\n", palette->flags); + wined3d_cs_finish(palette->device->cs, WINED3D_CS_QUEUE_DEFAULT); + if (palette->flags & WINED3D_PALETTE_8BIT_ENTRIES) { const BYTE *entry = (const BYTE *)entries;

1 0