November 2016 - Wine-Commits

Huw Davies : wintrust/tests: Initialize the pSigState member to prevent Windows 8 and 10 from crashing.
by Alexandre Julliard Nov. 28, 2016

Nov. 28, 2016

Module: wine Branch: master Commit: efd063f5c569fe704a29f247ad53e4226872e704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd063f5c569fe704a29f247a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 28 13:10:11 2016 +0000 wintrust/tests: Initialize the pSigState member to prevent Windows 8 and 10 from crashing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 3bb615e..9ac15e1 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -300,6 +300,7 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { HRESULT ret; CRYPT_PROVIDER_DATA data = { 0 }; + CRYPT_PROVIDER_SIGSTATE sig_state = { 0 }; WINTRUST_DATA wintrust_data = { 0 }; WINTRUST_CERT_INFO certInfo = { sizeof(WINTRUST_CERT_INFO), 0 }; WINTRUST_FILE_INFO fileInfo = { sizeof(WINTRUST_FILE_INFO), 0 }; @@ -313,6 +314,7 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) /* Crashes ret = funcs->pfnObjectTrust(NULL); */ + data.pSigState = &sig_state; data.pWintrustData = &wintrust_data; data.padwTrustStepErrors = funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); @@ -541,6 +543,7 @@ static const BYTE selfSignedCert[] = { static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { CRYPT_PROVIDER_DATA data = { 0 }; + CRYPT_PROVIDER_SIGSTATE sig_state = { 0 }; CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; HRESULT ret; BOOL b; @@ -551,6 +554,7 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) return; } + data.pSigState = &sig_state; data.padwTrustStepErrors = funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); if (!data.padwTrustStepErrors)

1 0

Nikolay Sivov : wincodecs: Trigger conversion to target format in WriteSource().
by Alexandre Julliard Nov. 28, 2016

Nov. 28, 2016

Module: wine Branch: master Commit: 62830143d107be38342c27cfb45f30f0fe6d2d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62830143d107be38342c27cfb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 02:43:37 2016 +0300 wincodecs: Trigger conversion to target format in WriteSource(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/main.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 442976f..3bed565 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -122,30 +122,20 @@ HRESULT configure_write_source(IWICBitmapFrameEncode *iface, const WICPixelFormatGUID *format, INT width, INT height, double xres, double yres) { - HRESULT hr=S_OK; - WICPixelFormatGUID src_format, dst_format; + HRESULT hr = S_OK; if (width == 0 || height == 0) return WINCODEC_ERR_WRONGSTATE; - hr = IWICBitmapSource_GetPixelFormat(source, &src_format); - if (FAILED(hr)) return hr; - if (!format) { - dst_format = src_format; + WICPixelFormatGUID src_format; - hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &dst_format); + hr = IWICBitmapSource_GetPixelFormat(source, &src_format); if (FAILED(hr)) return hr; - format = &dst_format; - } - - if (!IsEqualGUID(&src_format, format)) - { - /* FIXME: should use WICConvertBitmapSource to convert */ - ERR("format %s unsupported\n", debugstr_guid(&src_format)); - return E_FAIL; + hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &src_format); + if (FAILED(hr)) return hr; } if (xres == 0.0 || yres == 0.0) @@ -164,6 +154,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, const WICPixelFormatGUID *format, UINT bpp, INT width, INT height) { + IWICBitmapSource *converted_source; HRESULT hr=S_OK; WICRect rc; UINT stride; @@ -184,12 +175,23 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, if (prc->Width != width || prc->Height <= 0) return E_INVALIDARG; + hr = WICConvertBitmapSource(format, source, &converted_source); + if (FAILED(hr)) + { + ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr); + return hr; + } + stride = (bpp * width + 7)/8; pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); - if (!pixeldata) return E_OUTOFMEMORY; + if (!pixeldata) + { + IWICBitmapSource_Release(converted_source); + return E_OUTOFMEMORY; + } - hr = IWICBitmapSource_CopyPixels(source, prc, stride, + hr = IWICBitmapSource_CopyPixels(converted_source, prc, stride, stride*prc->Height, pixeldata); if (SUCCEEDED(hr)) @@ -199,6 +201,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, } HeapFree(GetProcessHeap(), 0, pixeldata); + IWICBitmapSource_Release(converted_source); return hr; }

1 0

Jeremy Newman : cleanup and bootstrapify
by Jeremy Newman Nov. 28, 2016

Nov. 28, 2016

Module: appdb Branch: master Commit: 48307f36d1bf58997027da4fe206e8ef2e63723f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=48307f36d1bf58997027da4f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 28 12:01:37 2016 -0600 cleanup and bootstrapify --- viewbugs.php | 116 +++++++++++++++++++++++++---------------------------------- 1 file changed, 49 insertions(+), 67 deletions(-) diff --git a/viewbugs.php b/viewbugs.php index 517dd35..f9646da 100644 --- a/viewbugs.php +++ b/viewbugs.php @@ -4,87 +4,69 @@ * * Mandatory parameters: * - iBugId, bug identifier - * - * TODO: - * - replace the check is_numeric($aClean['iBugId']) with an is_empty check when filtering is in place */ // application environment require("path.php"); require(BASE."include/incl.php"); -/* code to View versions affected by a Bug */ +apidb_header("Applications Affected by Bug #{$aClean['iBugId']}"); -if(!is_numeric($aClean['iBugId'])) - util_show_error_page_and_exit("Something went wrong with the bug ID"); +echo '<h1 class="whq-app-title">Applications Affected by Bug #'.$aClean['iBugId'].'</h1>',"\n"; - apidb_header("Applications affected by Bug #".$aClean['iBugId']); - echo '<form method=post action="viewbugs.php?iBugId='.$aClean['iBugId'].'">',"\n"; +echo '<form method=post action="viewbugs.php?iBugId='.$aClean['iBugId'].'">',"\n"; +echo '<input type="text" name="iBugId" value="'.$aClean['iBugId'].'" class="form-control form-control-inline" size="10">',"\n"; +echo '<button type="submit" class="btn btn-default">Search</button>',"\n"; +echo '</form>',"\n"; - echo '<table width=100% border=0 cellpadding=3 cellspacing=1>',"\n"; - echo '<tr class=color4>',"\n"; - echo ' <td width=80>Application Name</td>',"\n"; - echo ' <td>Description</td>',"\n"; - echo ' <td width=80>version</td>',"\n"; - echo ' <td>Downloads</td>',"\n"; - echo '</tr>',"\n"; - - - $hResult = query_parameters("SELECT appFamily.description as appDescription, - appFamily.appName as appName, - appVersion.*, buglinks.versionId as versionId - FROM appFamily, appVersion, buglinks - WHERE appFamily.appId = appVersion.appId - and buglinks.versionId = appVersion.versionId - AND buglinks.bug_id = '?' - ORDER BY versionName", $aClean['iBugId']); - $c = 0; +$hResult = query_parameters("SELECT appFamily.description as appDescription, + appFamily.appName as appName, + appVersion.*, buglinks.versionId as versionId + FROM appFamily, appVersion, buglinks + WHERE appFamily.appId = appVersion.appId + and buglinks.versionId = appVersion.versionId + AND buglinks.bug_id = '?' + ORDER BY versionName", $aClean['iBugId']); - if($hResult) +if(query_num_rows($hResult)) +{ + echo '<table class="whq-table whq-table-full">',"\n"; + echo '<thead><tr>',"\n"; + echo ' <td width="30%">Application Name</td>',"\n"; + echo ' <td width="50%">Description</td>',"\n"; + echo ' <td>version</td>',"\n"; + echo ' <td>Downloads</td>',"\n"; + echo '</tr></thead><tbody>',"\n"; + while($oRow = query_fetch_object($hResult)) { - while($oRow = query_fetch_object($hResult)) + $oApp = new application($oRow->appId); + $oVersion = new version($oRow->versionId); + $sDownloadUrls = ""; + if($hDownloadUrls = appData::getData($oRow->versionId, "downloadurl")) { - $oApp = new application($oRow->appId); - $oVersion = new version($oRow->versionId); - $sDownloadUrls = ""; - if($hDownloadUrls = appData::getData($oRow->versionId, "downloadurl")) - { - while($oDownloadUrl = query_fetch_object($hDownloadUrls)) - $sDownloadUrls .= "<a href=\"$oDownloadUrl->url\">". - "$oDownloadUrl->description</a><br>"; - } - - // set row color - $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; - echo '<tr class='.$bgcolor.'>',"\n"; - echo ' <td>',"\n"; - echo " ".$oApp->objectMakeLink()."\n"; - echo ' </td>',"\n"; - echo ' <td>'.$oRow->appDescription.'</td>',"\n"; - echo ' <td>',"\n"; - echo " ".$oVersion->objectMakeLink()."\n"; - echo ' </td>',"\n"; - echo " <td>$sDownloadUrls</td>\n"; - echo '</tr>',"\n"; + while($oDownloadUrl = query_fetch_object($hDownloadUrls)) + $sDownloadUrls .= "<a href=\"$oDownloadUrl->url\">". + "$oDownloadUrl->description</a><br>"; } - } - - // allow users to search for other apps - echo '<tr class=color2>',"\n"; - echo ' <td align=center colspan=5> </td>',"\n"; - echo '</tr>',"\n"; - echo '<tr class=color4>',"\n"; - echo ' <td colspan=4 >  Bug #</td>',"\n"; - echo '</tr>',"\n"; - - echo '<tr class=color3>',"\n"; - echo ' <td align=center>',"\n"; - echo ' <input type="text" name="iBugId" value="'.$aClean['iBugId'].'" size="8"></td>',"\n"; - echo ' <td colspan=3><input type="submit" name="sSub" value="Search"></td>',"\n"; - echo '</tr>',"\n"; + echo '<tr>',"\n"; + echo ' <td>',"\n"; + echo " ".$oApp->objectMakeLink()."\n"; + echo ' </td>',"\n"; + echo ' <td>'.$oRow->appDescription.'</td>',"\n"; + echo ' <td>',"\n"; + echo " ".$oVersion->objectMakeLink()."\n"; + echo ' </td>',"\n"; + echo " <td>$sDownloadUrls</td>\n"; + echo '</tr>',"\n"; + } + echo '</tbody></table>',"\n"; +} +else +{ + echo html_note("No Applications Found for Bug #{$aClean['iBugId']}","","","warning"); +} - echo '</table>',"\n"; - apidb_footer(); +apidb_footer(); ?>

1 0

Jeremy Newman : change the appdb var to what the appdb expects
by Jeremy Newman Nov. 28, 2016

Nov. 28, 2016

Module: bugzilla Branch: master Commit: 4560fdd4faae9563569a5148da899cec01813aef URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4560fdd4faae9563569a5… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 28 11:46:23 2016 -0600 change the appdb var to what the appdb expects --- template/en/default/bug/edit.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 6738394..5685dc3 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -231,7 +231,7 @@ <b>AppDB</b>: </td> <td> - <a href="//appdb.winehq.org/viewbugs.php?bug_id=[% bug.bug_id FILTER html %]">Show + <a href="//appdb.winehq.org/viewbugs.php?iBugId=[% bug.bug_id FILTER html %]">Show Apps affected by this bug</a> </td> </tr>

1 0

Austin English : include/version.php: fix tpyo/whitespace error
by Jeremy Newman Nov. 28, 2016

Nov. 28, 2016

Module: appdb Branch: master Commit: 122daacfd99d9f0aa42e21644f6bc39ea99af934 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=122daacfd99d9f0aa42e2164… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Nov 26 22:33:25 2016 -0600 include/version.php: fix tpyo/whitespace error Supersedes https://source.winehq.org/patches/data/128008 This patch fixes the typo as 128008 did, but also the grammatical error (and a misspaced curly bracket in the same function). Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/version.php b/include/version.php index 60b14df..e918a9c 100644 --- a/include/version.php +++ b/include/version.php @@ -1124,7 +1124,7 @@ EOT; // show the test results table if($oTest) - { + { if($oTest->iTestingId) { echo $oTest->ShowVersionsTestingTable($this->objectMakeUrl()."&iTestingId=", 5); @@ -1173,7 +1173,7 @@ EOT; else { echo html_note('<i class="fa fa-exclamation-circle"></i> <b>Comments Disabled</b><br><br> '. - 'Comments for this application have be disabled becuase there are no maintainers.', + 'Comments for this application have been disabled because there are no maintainers.', "","","warning"); } }

1 0

Alexandre Julliard : Wine release 1.9.24
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: website Branch: master Commit: 7454d80b21bc103a181ff4265c5b417986613c0d URL: http://source.winehq.org/git/website.git/?a=commit;h=7454d80b21bc103a181ff4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 25 21:19:29 2016 +0100 Wine release 1.9.24 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016112501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2016112501.xml b/news/en/2016112501.xml new file mode 100644 index 0000000..75ff655 --- /dev/null +++ b/news/en/2016112501.xml @@ -0,0 +1,15 @@ +<news> +<date>November 25, 2016</date> +<title>Wine 1.9.24 Released</title> +<body> +<p> The Wine development release 1.9.24 is now available.</p> +<p> <a href="{$root}/announce/1.9.24">What's new</a> in this release: +<ul> + <li>Support for unordered access views in Direct3D.</li> + <li>Many fixes in the regression tests.</li> + <li>Some more improvements in HID support.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.24.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>. +</p></body></news>

1 0

Nikolay Sivov : quartz: Use wine_dbgstr_longlong() to trace REFERENCE_TIME.
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: master Commit: 5cdb0b5842abb520f581521ad1ccab320b9cb962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdb0b5842abb520f581521ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 25 12:18:43 2016 +0300 quartz: Use wine_dbgstr_longlong() to trace REFERENCE_TIME. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 2 +- dlls/quartz/filtergraph.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 1024bd0..ed7e5ee 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -536,7 +536,7 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("(%x%08x)\n", (ULONG)(tStart >> 32), (ULONG)tStart); + TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); This->filter.state = State_Running; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 88af2f6..faf6e51 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5299,8 +5299,7 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME tStart IFilterGraphImpl *This = impl_from_IMediaFilter(iface); if (tStart) - FIXME("Run called with non-null tStart: %x%08x\n", - (int)(tStart>>32), (int)tStart); + FIXME("Run called with non-null tStart: %s\n", wine_dbgstr_longlong(tStart)); return MediaControl_Run(&This->IMediaControl_iface); }

1 0

Michael Stefaniuc : mshtml: Avoid a cast from a COM object to an interface.
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: master Commit: d8f6e3ef7c858f5ef902f3b60aaca5047a171b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f6e3ef7c858f5ef902f3b60… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 24 10:55:16 2016 +0100 mshtml: Avoid a cast from a COM object to an interface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index f8463d2..5a806c4 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -725,7 +725,7 @@ static nsresult NSAPI nsChannel_GetURI(nsIHttpChannel *iface, nsIURI **aURI) TRACE("(%p)->(%p)\n", This, aURI); nsIFileURL_AddRef(&This->uri->nsIFileURL_iface); - *aURI = (nsIURI*)This->uri; + *aURI = (nsIURI*)&This->uri->nsIFileURL_iface; return NS_OK; }

1 0

Huw Davies : ntdll/tests: The fpu exception offset is broken on 32-bit Windows 8 too.
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: master Commit: 8d8507808e2c8b16eb87e5988a883612f4a359be URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8507808e2c8b16eb87e5988… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 25 10:12:15 2016 +0000 ntdll/tests: The fpu exception offset is broken on 32-bit Windows 8 too. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0040fdb..3abec1b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1259,7 +1259,7 @@ static void test_fpu_exceptions(void) ok(info.exception_code == EXCEPTION_FLT_STACK_CHECK, "Got exception code %#x, expected EXCEPTION_FLT_STACK_CHECK\n", info.exception_code); ok(info.exception_offset == 0x19 || - broken( is_wow64 && info.exception_offset == info.eip_offset ), + broken( info.exception_offset == info.eip_offset ), "Got exception offset %#x, expected 0x19\n", info.exception_offset); ok(info.eip_offset == 0x1b, "Got EIP offset %#x, expected 0x1b\n", info.eip_offset); @@ -1268,7 +1268,7 @@ static void test_fpu_exceptions(void) ok(info.exception_code == EXCEPTION_FLT_DIVIDE_BY_ZERO, "Got exception code %#x, expected EXCEPTION_FLT_DIVIDE_BY_ZERO\n", info.exception_code); ok(info.exception_offset == 0x17 || - broken( is_wow64 && info.exception_offset == info.eip_offset ), + broken( info.exception_offset == info.eip_offset ), "Got exception offset %#x, expected 0x17\n", info.exception_offset); ok(info.eip_offset == 0x19, "Got EIP offset %#x, expected 0x19\n", info.eip_offset); }

1 0

Nikolay Sivov : strmbase: Remove some of casts to interface pointers.
by Alexandre Julliard Nov. 25, 2016

Nov. 25, 2016

Module: wine Branch: master Commit: 875b8a6d4aa13c59d3f3f58d2dda876c107fcdb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875b8a6d4aa13c59d3f3f58d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 25 12:10:47 2016 +0300 strmbase: Remove some of casts to interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 2 +- dlls/strmbase/pospass.c | 12 ++++++------ dlls/strmbase/renderer.c | 6 ++++-- dlls/strmbase/transform.c | 3 ++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 0c1b7cc..48f2497 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -1210,7 +1210,7 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size if (SUCCEEDED(InputPin_Init(InputPin_Vtbl, pPinInfo, vtbl, pCritSec, allocator, pPinImpl))) { - *ppPin = (IPin *)pPinImpl; + *ppPin = &pPinImpl->pin.IPin_iface; return S_OK; } diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index 42900c6..45eb234 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -152,9 +152,9 @@ static HRESULT SeekOuter_QueryInterface(PassThruImpl *This, REFIID riid, LPVOID { HRESULT hr; - IUnknown_AddRef((IUnknown *)&(This->IUnknown_inner)); - hr = IUnknown_QueryInterface((IUnknown *)&(This->IUnknown_inner), riid, ppv); - IUnknown_Release((IUnknown *)&(This->IUnknown_inner)); + IUnknown_AddRef(&This->IUnknown_inner); + hr = IUnknown_QueryInterface(&This->IUnknown_inner, riid, ppv); + IUnknown_Release(&This->IUnknown_inner); This->bAggregatable = TRUE; return hr; } @@ -163,21 +163,21 @@ static HRESULT SeekOuter_QueryInterface(PassThruImpl *This, REFIID riid, LPVOID return E_NOINTERFACE; } - return IUnknown_QueryInterface((IUnknown *)&(This->IUnknown_inner), riid, ppv); + return IUnknown_QueryInterface(&This->IUnknown_inner, riid, ppv); } static ULONG SeekOuter_AddRef(PassThruImpl *This) { if (This->outer_unk && This->bUnkOuterValid) return IUnknown_AddRef(This->outer_unk); - return IUnknown_AddRef((IUnknown *)&(This->IUnknown_inner)); + return IUnknown_AddRef(&This->IUnknown_inner); } static ULONG SeekOuter_Release(PassThruImpl *This) { if (This->outer_unk && This->bUnkOuterValid) return IUnknown_Release(This->outer_unk); - return IUnknown_Release((IUnknown *)&(This->IUnknown_inner)); + return IUnknown_Release(&This->IUnknown_inner); } static HRESULT WINAPI SeekingPassThru_QueryInterface(ISeekingPassThru *iface, REFIID riid, LPVOID *ppvObj) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index fa2545b..366e6d6 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -238,7 +238,8 @@ static const BaseInputPinFuncTable input_BaseInputFuncTable = { }; -HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtbl, IUnknown *pUnkOuter, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseRendererFuncTable* pBaseFuncsTable) +HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtbl, IUnknown *pUnkOuter, const CLSID *pClsid, + DWORD_PTR DebugInfo, const BaseRendererFuncTable* pBaseFuncsTable) { PIN_INFO piInput; HRESULT hr; @@ -257,7 +258,8 @@ HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtb if (SUCCEEDED(hr)) { - hr = CreatePosPassThru(pUnkOuter ? pUnkOuter: (IUnknown*)This, TRUE, &This->pInputPin->pin.IPin_iface, &This->pPosition); + hr = CreatePosPassThru(pUnkOuter ? pUnkOuter: (IUnknown *)&This->filter.IBaseFilter_iface, TRUE, + &This->pInputPin->pin.IPin_iface, &This->pPosition); if (FAILED(hr)) return hr; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 65b6052..accb4f1 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -241,7 +241,8 @@ static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* p { ISeekingPassThru *passthru; pTransformFilter->seekthru_unk = NULL; - hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)pTransformFilter, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&pTransformFilter->seekthru_unk); + hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown *)&pTransformFilter->filter.IBaseFilter_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&pTransformFilter->seekthru_unk); if (SUCCEEDED(hr)) { IUnknown_QueryInterface(pTransformFilter->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru);

1 0