April 2016 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 1.9.9
by Alexandre Julliard April 29, 2016

April 29, 2016

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

Alexandre Julliard : Release 1.9.9.
by Alexandre Julliard April 29, 2016

April 29, 2016

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

Tag wine-1.9.9 : Alexandre Julliard : Release 1.9.9
by Alexandre Julliard April 29, 2016

April 29, 2016

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 : ntdll: Properly check the NtQueryDirectoryFile return status.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 9fef5dc839051ebda5bd93acfc8d5107a9a49de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fef5dc839051ebda5bd93acf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 29 23:14:23 2016 +0900 ntdll: Properly check the NtQueryDirectoryFile return status. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 4aa1a72..d26a5c4 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2694,9 +2694,8 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) ai->version.major, ai->version.minor, lang ); RtlInitUnicodeString( &lookup_us, lookup ); - NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), - FileBothDirectoryInformation, FALSE, &lookup_us, TRUE ); - if (io.u.Status == STATUS_SUCCESS) + if (!NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), + FileBothDirectoryInformation, FALSE, &lookup_us, TRUE )) { ULONG min_build = ai->version.build, min_revision = ai->version.revision; FILE_BOTH_DIR_INFORMATION *dir_info; @@ -2709,9 +2708,9 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) { if (data_pos >= data_len) { - NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), - FileBothDirectoryInformation, FALSE, &lookup_us, FALSE ); - if (io.u.Status != STATUS_SUCCESS) break; + if (NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer), + FileBothDirectoryInformation, FALSE, &lookup_us, FALSE )) + break; data_len = io.Information; data_pos = 0; }

1 0

Sebastian Lackner : user32/tests: Add additional test for window station name.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: f5b8eb497764018f5e4a592c6358e5122d1f11cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5b8eb497764018f5e4a592c6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 25 23:25:33 2016 +0200 user32/tests: Add additional test for window station name. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index e49420b..94be4c9 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -114,6 +114,8 @@ static void test_handles(void) DWORD id, flags, le; ATOM atom; char buffer[20]; + DWORD size; + BOOL ret; /* win stations */ @@ -215,6 +217,12 @@ static void test_handles(void) w2 = CreateWindowStationA( "", 0, WINSTA_ALL_ACCESS, NULL ); ok( w2 != 0, "create station failed err %u\n", GetLastError() ); + memset( buffer, 0, sizeof(buffer) ); + ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size ); + ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() ); + todo_wine ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected window station name '%s'\n", buffer ); + todo_wine ok( buffer[strlen(buffer) - 1] == '$', "unexpected window station name '%s'\n", buffer ); + SetLastError( 0xdeadbeef ); w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); todo_wine

1 0

Piotr Caban : gdi32/enhmfdrv: Don't update document bounds in Arc/Chord/ Pie within a path.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: c36f3653295110f5d4f92a3db7be10f322448c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36f3653295110f5d4f92a3db… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:48:18 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in Arc/Chord/Pie within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 4 +++- dlls/gdi32/tests/metafile.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index a5918a9..19cc423 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -87,6 +87,7 @@ static BOOL EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend, DWORD iType ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; INT temp, xCentre, yCentre, i; double angleStart, angleEnd; double xinterStart, yinterStart, xinterEnd, yinterEnd; @@ -178,7 +179,8 @@ EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, } if(!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - EMFDRV_UpdateBBox( dev, &bounds ); + if(!physDev->path) + EMFDRV_UpdateBBox( dev, &bounds ); return TRUE; } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b71249f..f8ced6e 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3583,16 +3583,16 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe6, 0xff, 0xff, 0xff, 0xe6, 0xff, 0xff, 0xff, + 0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xf8, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x70, 0x01, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x80, 0x07, 0x00, 0x00, 0xd3, 0x03, 0x00, 0x00, - 0xfc, 0x01, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0x3e, 0x04, 0x00, 0x00, + 0x40, 0x01, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, - 0xd3, 0xf3, 0x03, 0x00, 0x3b, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x04, 0x00, + 0x80, 0xa9, 0x03, 0x00, 0x3b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, @@ -3606,7 +3606,22 @@ static const unsigned char EMF_PATH_BITS[] = 0x32, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, - 0x13, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x13, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, + 0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, + 0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, + 0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, + 0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, + 0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, + 0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 @@ -3635,10 +3650,13 @@ static void test_emf_GetPath(void) ret = LineTo(hdcMetafile, 50, 50); ok( ret, "LineTo error %d.\n", GetLastError()); Rectangle(hdcMetafile, 10, 10, 20, 20); + Arc(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); + Chord(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); + Pie(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 9, "GetPath returned %d.\n", size); + todo_wine ok( size == 40, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Piotr Caban : gdi32/enhmfdrv: Don' t update document bounds in LineTo within a path.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: c019c68b451fae067d7348efd362817ba5a0fe47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c019c68b451fae067d7348efd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:43 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in LineTo within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 0484ebf..a5918a9 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -53,6 +53,7 @@ BOOL EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y) */ BOOL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; POINT pt; EMRLINETO emr; RECTL bounds; @@ -72,7 +73,8 @@ BOOL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) bounds.right = max(x, pt.x); bounds.bottom = max(y, pt.y); - EMFDRV_UpdateBBox( dev, &bounds ); + if(!physDev->path) + EMFDRV_UpdateBBox( dev, &bounds ); return TRUE; }

1 0

Michael Müller : quartz: Recognize MPEG2 program streams.
by Alexandre Julliard April 29, 2016

April 29, 2016

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

April 29, 2016

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

Alex Henrie : qedit: Return E_POINTER from Timeline_QueryInterface if ppv is NULL.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 501de13b6cab4743baf33680e812613f5fb21f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=501de13b6cab4743baf33680e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Apr 28 08:08:00 2016 -0600 qedit: Return E_POINTER from Timeline_QueryInterface if ppv is NULL. 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/qedit/tests/timeline.c | 9 ++++++++- dlls/qedit/timeline.c | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index 2d37010..40cf774 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -29,7 +29,7 @@ static void test_timeline(void) HRESULT hr; IAMTimeline *timeline = NULL; IAMTimeline *timeline2 = (IAMTimeline *)0xdeadbeef; - IAMTimelineObj *obj; + IAMTimelineObj *obj = (IAMTimelineObj *)0xdeadbeef; IAMTimelineObj obj_iface; TIMELINE_MAJOR_TYPE type; @@ -37,6 +37,13 @@ static void test_timeline(void) ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "CoCreateInstance failed: %08x\n", hr); if (!timeline) return; + hr = IAMTimeline_QueryInterface(timeline, &IID_IAMTimelineObj, NULL); + ok(hr == E_POINTER, "Expected E_POINTER got %08x\n", hr); + + hr = IAMTimeline_QueryInterface(timeline, &IID_IAMTimelineObj, (void **)&obj); + ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE got %08x\n", hr); + ok(!obj, "Expected NULL got %p\n", obj); + hr = IAMTimeline_CreateEmptyNode(timeline, NULL, 0); ok(hr == E_POINTER, "Expected E_POINTER got %08x\n", hr); diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c index 8c6ac5b..8293c8f 100644 --- a/dlls/qedit/timeline.c +++ b/dlls/qedit/timeline.c @@ -70,6 +70,9 @@ static HRESULT WINAPI Timeline_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + if (!ppv) + return E_POINTER; + *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IUnknown_inner;

1 0