January 2019 - Wine-commits

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 14 Jan '19

14 Jan '19

Module: wine Branch: master Commit: 35bdd1bb15c4aa5b55ed9dffe94a30bef1eb0f5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=35bdd1bb15c4aa5b55ed9dff… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sat Jan 12 05:21:47 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 208 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 106 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35bdd1bb15c4aa5b55ed…

1 0

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

14 Jan '19

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

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

14 Jan '19

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

Sven Baars : shell32/tests: Fix a typo.
by Alexandre Julliard 14 Jan '19

14 Jan '19

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

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

14 Jan '19

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 : oleaut32/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard 14 Jan '19

14 Jan '19

Module: wine Branch: master Commit: 0794ab840073781079a328ad77faac8544ed71f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0794ab840073781079a328ad… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Jan 13 23:53:20 2019 +0100 oleaut32/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/oleaut32/tests/tmarshal.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 0b6776b..4b03d5a 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -38,6 +38,7 @@ static inline void release_iface_(unsigned int line, void *iface) { ULONG ref = IUnknown_Release((IUnknown *)iface); ok_(__FILE__, line)(!ref, "Got outstanding refcount %d.\n", ref); + if (ref == 1) IUnknown_Release((IUnknown *)iface); } #define release_iface(a) release_iface_(__LINE__, a) @@ -2141,8 +2142,8 @@ static void test_marshal_iface(IWidget *widget, IDispatch *disp) sfd1 = create_disp_obj(); sfd2 = create_disp_obj(); sfd3 = create_disp_obj(); - hr = IWidget_iface_in(widget, (IUnknown *)create_disp_obj(), - (IDispatch *)create_disp_obj(), create_disp_obj()); + hr = IWidget_iface_in(widget, (IUnknown *)sfd1, + (IDispatch *)sfd2, sfd3); ok(hr == S_OK, "Got hr %#x.\n", hr); release_iface(sfd1); release_iface(sfd2); @@ -2329,9 +2330,10 @@ if (hr == S_OK) { release_iface(unk_out); release_iface(unk_in_out); +} release_iface(sfd1); +todo_wine release_iface(sfd3); -} testmode = 2; unk_in = unk_out = unk_in_out = NULL; @@ -2471,22 +2473,24 @@ static void test_marshal_variant(IWidget *widget, IDispatch *disp) static void test_marshal_safearray(IWidget *widget, IDispatch *disp) { - SAFEARRAY *in, *out, *in_ptr, *in_out; + SAFEARRAY *in, *out, *out2, *in_ptr, *in_out; HRESULT hr; in = make_safearray(3); - out = make_safearray(5); + out = out2 = make_safearray(5); in_ptr = make_safearray(7); in_out = make_safearray(9); hr = IWidget_safearray(widget, in, &out, &in_ptr, &in_out); ok(hr == S_OK, "Got hr %#x.\n", hr); check_safearray(in, 3); check_safearray(out, 4); + check_safearray(out2, 5); check_safearray(in_ptr, 7); check_safearray(in_out, 6); SafeArrayDestroy(in); SafeArrayDestroy(out); + SafeArrayDestroy(out2); SafeArrayDestroy(in_ptr); SafeArrayDestroy(in_out); } @@ -2629,6 +2633,7 @@ static void test_marshal_coclass(IWidget *widget, IDispatch *disp) release_iface(out); release_iface(in_out); release_iface(&class1->ICoclass1_iface); + release_iface(&class3->ICoclass1_iface); testmode = 2; in = out = in_out = NULL;

1 0

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

14 Jan '19

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

Sven Baars : xmllite/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 14 Jan '19

14 Jan '19

Module: wine Branch: master Commit: 7f7c703eb9e93e8c930584b2a7c33336f1a1dfe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f7c703eb9e93e8c930584b2… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Jan 14 16:14:38 2019 +0100 xmllite/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 99ad168..1c6689a 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -483,6 +483,7 @@ todo_wine CHECK_OUTPUT_RAW(stream, utf16_outputW, sizeof(utf16_outputW)); IStream_Release(stream); + IUnknown_Release(output); /* Create output with meaningless code page value. */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);

1 0

James Larrowe : winebuild: Fix a segmentation fault.
by Alexandre Julliard 14 Jan '19

14 Jan '19

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

Józef Kucia : wined3d: Execute all CS commands before changing swapchain palette.
by Alexandre Julliard 14 Jan '19

14 Jan '19

Module: wine Branch: master Commit: cd2dee0f4bb7a852bfe834ab676467be785b6eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd2dee0f4bb7a852bfe834ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 12 12:23:17 2019 +0100 wined3d: Execute all CS commands before changing swapchain palette. 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/swapchain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3a7039d..f7fc05f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -299,6 +299,9 @@ HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *s void CDECL wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, struct wined3d_palette *palette) { TRACE("swapchain %p, palette %p.\n", swapchain, palette); + + wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); + swapchain->palette = palette; }

1 0