wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Alexandre Julliard : Wine release 1.9.9
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: website Branch: master Commit: 4c109a2b3decf963e78da1a0f5adcadf5e9e6679 URL: http://source.winehq.org/git/website.git/?a=commit;h=4c109a2b3decf963e78da1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 30 01:06:08 2016 +0900 Wine release 1.9.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016043001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016043001.xml b/news/en/2016043001.xml new file mode 100644 index 0000000..5b3f144 --- /dev/null +++ b/news/en/2016043001.xml @@ -0,0 +1,16 @@ +<news> +<date>April 30, 2016</date> +<title>Wine 1.9.9 Released</title> +<body> + The Wine development release 1.9.9 is now available. + <a href="{$root}/announce/1.9.9">What's new</a> in this release: +<ul> + <li>More work towards the WineD3D command stream.</li> + <li>Service proxies in WebServices.</li> + <li>Query support in the builtin reg.exe utility.</li> + <li>Improved support for long URLs in WinInet.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.9.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.9.9 : Alexandre Julliard : Release 1.9.9
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: refs/tags/wine-1.9.9 Tag: ed9d390efa7ca45d2d4e944aa96ea11575aece7a URL: http://source.winehq.org/git/wine.git/?a=tag;h=ed9d390efa7ca45d2d4e944aa96e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 30 01:04:00 2016 +0900 Release 1.9.9

1 0

Alexandre Julliard : Release 1.9.9.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 5e6f35ffbd8795da71c6fd6cb8adc84bf8a36504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6f35ffbd8795da71c6fd6cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 30 01:04:00 2016 +0900 Release 1.9.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 796 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 451 insertions(+), 367 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e6f35ffbd8795da71c6f…

1 0

Michael Stefaniuc : comctl32: Use SetRect() instead of open coding it.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 903ea191222efcaedf0334242a925b392b7b9487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903ea191222efcaedf0334242… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 29 15:58:29 2016 +0200 comctl32: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/animate.c | 5 +---- dlls/comctl32/comboex.c | 7 ++----- dlls/comctl32/datetime.c | 5 +---- dlls/comctl32/listview.c | 22 +++++++--------------- dlls/comctl32/progress.c | 32 ++++++-------------------------- dlls/comctl32/propsheet.c | 23 ++++------------------- dlls/comctl32/syslink.c | 5 +---- dlls/comctl32/tab.c | 3 +-- dlls/comctl32/toolbar.c | 4 +--- dlls/comctl32/trackbar.c | 12 ++++-------- 10 files changed, 28 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=903ea191222efcaedf033…

1 0

Nikolay Sivov : comctl32/tests: Remove some casts we don't need.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 22bfbfe9fc907bdb67cbcf9c1fee0a7596d91f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22bfbfe9fc907bdb67cbcf9c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 29 14:30:30 2016 +0300 comctl32/tests: Remove some casts we don't need. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 10e7d0e..ed5d9f9 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2236,8 +2236,9 @@ static void test_multiselect(void) HWND hwnd; INT r; - int i,j,item_count,selected_count; + int i, j; static const int items=5; + DWORD item_count; BYTE kstate[256]; select_task task; LONG_PTR style; @@ -2255,10 +2256,11 @@ static void test_multiselect(void) for (i = 0; i < items; i++) insert_item(hwnd, 0); - item_count = (int)SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); + item_count = SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); expect(items, item_count); for (i = 0; i < 4; i++) { + DWORD selected_count; LVITEMA item; task = task_list[i]; @@ -2291,9 +2293,11 @@ static void test_multiselect(void) expect(0,r); } - selected_count = (int)SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + selected_count = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); - ok((task.result == -1 ? item_count : task.result) == selected_count, "Failed multiple selection %s. There should be %d selected items (is %d)\n", task.descr, item_count, selected_count); + ok((task.result == -1 ? item_count : task.result) == selected_count, + "Failed multiple selection %s. There should be %d selected items (is %d)\n", + task.descr, item_count, selected_count); /* Set SHIFT key released */ GetKeyboardState(kstate); @@ -2307,7 +2311,7 @@ static void test_multiselect(void) for (i=0;i<items;i++) { insert_item(hwnd, 0); } - item_count = (int)SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); + item_count = SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); expect(items,item_count); /* try with NULL pointer */

1 0

Michael Müller : quartz: Recognize MPEG2 program streams.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: f5754b3d9a44f01f4962b978df8c5e75eb2d548b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5754b3d9a44f01f4962b978d… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 28 21:57:00 2016 +0200 quartz: Recognize MPEG2 program streams. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/regsvr.c | 5 +++++ dlls/quartz/tests/avisplitter.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index b0f1e9a..196e064 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -818,6 +818,11 @@ static struct regsvr_mediatype_parsing const mediatype_parsing_list[] = { "0, 10, FFFFFF00000080808080, 494433000000000000", NULL } }, + { &MEDIATYPE_Stream, + &MEDIASUBTYPE_MPEG2_PROGRAM, + { "0, 5, FFFFFFFFC0, 000001BA40", + NULL } + }, { &MEDIATYPE_Stream, &MEDIASUBTYPE_QTMovie, { "4, 4, , 6d646174", diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 83415c2..aa938c1 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -206,6 +206,12 @@ static void test_filesourcefilter(void) &MEDIASUBTYPE_MPEG1Audio, }, { + "MPEG2 Program", + "\x00\x00\x01\xBA\x40", + 5, + &MEDIASUBTYPE_MPEG2_PROGRAM, + }, + { "WAVE", "\x52\x49\x46\x46xxxx\x57\x41\x56\x45", 12,

1 0

Sebastian Lackner : quartz: Add check for NULL pointer in FileSource_Load.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: b28a8a31572ad3f322374df07e8194bebb423076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28a8a31572ad3f322374df07… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 28 21:56:50 2016 +0200 quartz: Add check for NULL pointer in FileSource_Load. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 3 +++ dlls/quartz/tests/avisplitter.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 1a2af44..f0f85fd 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -613,6 +613,9 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi TRACE("(%s, %p)\n", debugstr_w(pszFileName), pmt); + if (!pszFileName) + return E_POINTER; + /* open file */ /* FIXME: check the sharing values that native uses */ hFile = CreateFileW(pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index fe1069d..83415c2 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -252,7 +252,6 @@ static void test_filesourcefilter(void) ok(olepath == NULL, "expected NULL, got %p\n", olepath); hr = IFileSourceFilter_Load(filesource, NULL, NULL); - todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %08x\n", hr); hr = IFileSourceFilter_Load(filesource, path, NULL);

1 0

Sebastian Lackner : quartz/tests: Add initial tests for IFileSourceFilter interface.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 610d6b454031f105032d7ceda3735a8d8cca57de URL: http://source.winehq.org/git/wine.git/?a=commit;h=610d6b454031f105032d7ceda… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 29 11:05:35 2016 +0200 quartz/tests: Add initial tests for IFileSourceFilter interface. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplitter.c | 118 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 2fa7f91..fe1069d 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -169,6 +169,123 @@ static void test_basefilter(void) IBaseFilter_Release(base); } +static void test_filesourcefilter(void) +{ + static const WCHAR prefix[] = {'w','i','n',0}; + static const struct + { + const char *label; + const char *data; + DWORD size; + const GUID *subtype; + } + tests[] = + { + { + "AVI", + "\x52\x49\x46\x46xxxx\x41\x56\x49\x20", + 12, + &MEDIASUBTYPE_Avi, + }, + { + "MPEG1 System", + "\x00\x00\x01\xBA\x21\x00\x01\x00\x01\x80\x00\x01\x00\x00\x01\xBB", + 16, + &MEDIASUBTYPE_MPEG1System, + }, + { + "MPEG1 Video", + "\x00\x00\x01\xB3", + 4, + &MEDIASUBTYPE_MPEG1Video, + }, + { + "MPEG1 Audio", + "\xFF\xE0", + 2, + &MEDIASUBTYPE_MPEG1Audio, + }, + { + "WAVE", + "\x52\x49\x46\x46xxxx\x57\x41\x56\x45", + 12, + &MEDIASUBTYPE_WAVE, + }, + }; + WCHAR path[MAX_PATH], temp[MAX_PATH]; + IFileSourceFilter *filesource; + DWORD ret, written; + IBaseFilter *base; + AM_MEDIA_TYPE mt; + OLECHAR *olepath; + BOOL success; + HANDLE file; + HRESULT hr; + int i; + + ret = GetTempPathW(MAX_PATH, temp); + ok(ret, "GetTempPathW failed with error %u\n", GetLastError()); + ret = GetTempFileNameW(temp, prefix, 0, path); + ok(ret, "GetTempFileNameW failed with error %u\n", GetLastError()); + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + trace("Running test for %s\n", tests[i].label); + + file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed with error %u\n", GetLastError()); + success = WriteFile(file, tests[i].data, tests[i].size, &written, NULL); + ok(success, "WriteFile failed with error %u\n", GetLastError()); + ok(written == tests[i].size, "could not write test data\n"); + CloseHandle(file); + + hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&base); + ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); + hr = IBaseFilter_QueryInterface(base, &IID_IFileSourceFilter, (void **)&filesource); + ok(hr == S_OK, "IBaseFilter_QueryInterface failed with %08x\n", hr); + + olepath = (void *)0xdeadbeef; + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(olepath == NULL, "expected NULL, got %p\n", olepath); + + hr = IFileSourceFilter_Load(filesource, NULL, NULL); + todo_wine + ok(hr == E_POINTER, "expected E_POINTER, got %08x\n", hr); + + hr = IFileSourceFilter_Load(filesource, path, NULL); + ok(hr == S_OK, "IFileSourceFilter_Load failed with %08x\n", hr); + + hr = IFileSourceFilter_GetCurFile(filesource, NULL, &mt); + ok(hr == E_POINTER, "expected E_POINTER, got %08x\n", hr); + + olepath = NULL; + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + CoTaskMemFree(olepath); + + olepath = NULL; + memset(&mt, 0x11, sizeof(mt)); + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, &mt); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(!lstrcmpW(olepath, path), + "expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(olepath)); + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Stream), + "expected MEDIATYPE_Stream, got %s\n", wine_dbgstr_guid(&mt.majortype)); + ok(IsEqualGUID(&mt.subtype, tests[i].subtype), + "expected %s, got %s\n", wine_dbgstr_guid(tests[i].subtype), wine_dbgstr_guid(&mt.subtype)); + CoTaskMemFree(olepath); + + IFileSourceFilter_Release(filesource); + IBaseFilter_Release(base); + + success = DeleteFileW(path); + ok(success, "DeleteFileW failed with error %u\n", GetLastError()); + } +} + static const WCHAR wfile[] = {'t','e','s','t','.','a','v','i',0}; static const char afile[] = "test.avi"; @@ -462,6 +579,7 @@ START_TEST(avisplitter) test_query_interface(); test_basefilter(); + test_filesourcefilter(); test_threads(); release_avisplitter();

1 0

Alex Henrie : quartz: Print This pointer before iface pointer in traces.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 2581fc7c21f64bd2742256ded9b07ac05cd4cb79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2581fc7c21f64bd2742256ded… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 27 23:12:56 2016 -0600 quartz: Print This pointer before iface pointer in traces. This matches what is done in AMFilterData_ParseFilterData and AMFilterData_CreateFilterData. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index a462fbc..6564155 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1159,7 +1159,8 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( HRESULT hr; TRACE("(%p/%p)->(%p, %x, %s, %s, %s, %s, %s, %s, %s) stub!\n", - iface,This, + This, + iface, ppEnum, dwMerit, bInputNeeded ? "true" : "false",

1 0

Alex Henrie : quartz/tests: Print the correct function name when tests fail.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 74425e6b04ab4fb64218ddfb541adfee5651bf4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=74425e6b04ab4fb64218ddfb5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 27 23:12:55 2016 -0600 quartz/tests: Print the correct function name when tests fail. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtermapper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index fe23a72..11b7d39 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -593,7 +593,7 @@ static void test_aggregate_filter_mapper(void) ok(pmapper != &unk_outer.IUnknown_iface, "pmapper = %p, expected not %p\n", pmapper, &unk_outer.IUnknown_iface); hr = IUnknown_QueryInterface(pmapper, &IID_IUnknown, (void **)&punk); - ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk); @@ -603,7 +603,7 @@ static void test_aggregate_filter_mapper(void) unk_outer.Release_called = 0; hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper, (void **)&punk); - ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk); @@ -613,7 +613,7 @@ static void test_aggregate_filter_mapper(void) unk_outer.Release_called = 0; hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper2, (void **)&punk); - ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk); @@ -623,7 +623,7 @@ static void test_aggregate_filter_mapper(void) unk_outer.Release_called = 0; hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper3, (void **)&punk); - ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk);

1 0

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 April 2016