wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Nikolay Sivov : winecfg: Keep pending settings in static list.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 7179b7d0e95f88642a42a235846322e548c15161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7179b7d0e95f88642a42a2358… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 00:51:42 2016 +0300 winecfg: Keep pending settings in static list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/winecfg.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 3ed406b..dbac929 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -221,7 +221,7 @@ struct setting DWORD type; /* type of registry value. REG_SZ or REG_DWORD for now */ }; -struct list *settings; +static struct list settings = LIST_INIT(settings); static void free_setting(struct setting *setting) { @@ -258,7 +258,7 @@ WCHAR *get_reg_keyW(HKEY root, const WCHAR *path, const WCHAR *name, const WCHAR wine_dbgstr_w(name), wine_dbgstr_w(def)); /* check if it's in the list */ - LIST_FOR_EACH( cursor, settings ) + LIST_FOR_EACH( cursor, &settings ) { s = LIST_ENTRY(cursor, struct setting, entry); @@ -344,7 +344,7 @@ static void set_reg_key_ex(HKEY root, const WCHAR *path, const WCHAR *name, cons wine_dbgstr_w(name), wine_dbgstr_w(value)); /* firstly, see if we already set this setting */ - LIST_FOR_EACH( cursor, settings ) + LIST_FOR_EACH( cursor, &settings ) { struct setting *s = LIST_ENTRY(cursor, struct setting, entry); @@ -402,7 +402,7 @@ static void set_reg_key_ex(HKEY root, const WCHAR *path, const WCHAR *name, cons break; } - list_add_tail(settings, &s->entry); + list_add_tail(&settings, &s->entry); } void set_reg_key(HKEY root, const char *path, const char *name, const char *value) @@ -487,7 +487,7 @@ static WCHAR **enumerate_valuesW(HKEY root, WCHAR *path) WINE_TRACE("name=%s\n", wine_dbgstr_w(name)); /* check if this value name has been removed in the settings list */ - LIST_FOR_EACH( cursor, settings ) + LIST_FOR_EACH( cursor, &settings ) { struct setting *s = LIST_ENTRY(cursor, struct setting, entry); if (lstrcmpiW(s->path, path) != 0) continue; @@ -525,7 +525,7 @@ static WCHAR **enumerate_valuesW(HKEY root, WCHAR *path) WINE_TRACE("adding settings in list but not registry\n"); /* now we have to add the values that aren't in the registry but are in the settings list */ - LIST_FOR_EACH( cursor, settings ) + LIST_FOR_EACH( cursor, &settings ) { struct setting *setting = LIST_ENTRY(cursor, struct setting, entry); BOOL found = FALSE; @@ -670,13 +670,13 @@ static void process_setting(struct setting *s) void apply(void) { - if (list_empty(settings)) return; /* we will be called for each page when the user clicks OK */ + if (list_empty(&settings)) return; /* we will be called for each page when the user clicks OK */ WINE_TRACE("()\n"); - while (!list_empty(settings)) + while (!list_empty(&settings)) { - struct setting *s = (struct setting *) list_head(settings); + struct setting *s = (struct setting *) list_head(&settings); process_setting(s); free_setting(s); } @@ -758,9 +758,5 @@ BOOL initialize(HINSTANCE hInstance) return TRUE; } - /* we could probably just have the list as static data */ - settings = HeapAlloc(GetProcessHeap(), 0, sizeof(struct list)); - list_init(settings); - return FALSE; }

1 0

Detlef Riekenberg : winspool: Use all Fields from DRIVER_INFO_8A when we add a Printer Driver.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 7cba560ab22158ceb4792fde7b658e4cfa857878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cba560ab22158ceb4792fde7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 27 00:59:50 2016 +0100 winspool: Use all Fields from DRIVER_INFO_8A when we add a Printer Driver. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2b2e0fc..39ae4eb 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6948,6 +6948,12 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW MultiByteToWideChar(CP_ACP, 0, diA->pConfigFile, -1, diW.pConfigFile, len); } + if ((Level > 2) && diA->pHelpFile) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pHelpFile, -1, NULL, 0); + diW.pHelpFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pHelpFile, -1, diW.pHelpFile, len); + } + if ((Level > 2) && diA->pDependentFiles) { lenA = multi_sz_lenA(diA->pDependentFiles); len = MultiByteToWideChar(CP_ACP, 0, diA->pDependentFiles, lenA, NULL, 0); @@ -6961,7 +6967,7 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW MultiByteToWideChar(CP_ACP, 0, diA->pMonitorName, -1, diW.pMonitorName, len); } - if ((Level > 3) && diA->pDefaultDataType) { + if ((Level > 2) && diA->pDefaultDataType) { len = MultiByteToWideChar(CP_ACP, 0, diA->pDefaultDataType, -1, NULL, 0); diW.pDefaultDataType = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, diA->pDefaultDataType, -1, diW.pDefaultDataType, len); @@ -6974,6 +6980,11 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW MultiByteToWideChar(CP_ACP, 0, diA->pszzPreviousNames, lenA, diW.pszzPreviousNames, len); } + if (Level > 5) { + diW.ftDriverDate = diA->ftDriverDate; + diW.dwlDriverVersion = diA->dwlDriverVersion; + } + if ((Level > 5) && diA->pszMfgName) { len = MultiByteToWideChar(CP_ACP, 0, diA->pszMfgName, -1, NULL, 0); diW.pszMfgName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); @@ -6998,8 +7009,42 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW MultiByteToWideChar(CP_ACP, 0, diA->pszProvider, -1, diW.pszProvider, len); } + if ((Level > 7) && diA->pszPrintProcessor) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pszPrintProcessor, -1, NULL, 0); + diW.pszPrintProcessor = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszPrintProcessor, -1, diW.pszPrintProcessor, len); + } + + if ((Level > 7) && diA->pszVendorSetup) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pszVendorSetup, -1, NULL, 0); + diW.pszVendorSetup = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszVendorSetup, -1, diW.pszVendorSetup, len); + } + + if ((Level > 7) && diA->pszzColorProfiles) { + lenA = multi_sz_lenA(diA->pszzColorProfiles); + len = MultiByteToWideChar(CP_ACP, 0, diA->pszzColorProfiles, lenA, NULL, 0); + diW.pszzColorProfiles = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszzColorProfiles, lenA, diW.pszzColorProfiles, len); + } + + if ((Level > 7) && diA->pszInfPath) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pszInfPath, -1, NULL, 0); + diW.pszInfPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszInfPath, -1, diW.pszInfPath, len); + } + + if ((Level > 7) && diA->pszzCoreDriverDependencies) { + lenA = multi_sz_lenA(diA->pszzCoreDriverDependencies); + len = MultiByteToWideChar(CP_ACP, 0, diA->pszzCoreDriverDependencies, lenA, NULL, 0); + diW.pszzCoreDriverDependencies = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszzCoreDriverDependencies, lenA, diW.pszzCoreDriverDependencies, len); + } + if (Level > 7) { - FIXME("level %u is incomplete\n", Level); + diW.dwPrinterDriverAttributes = diA->dwPrinterDriverAttributes; + diW.ftMinInboxDriverVerDate = diA->ftMinInboxDriverVerDate; + diW.dwlMinInboxDriverVerVersion = diA->dwlMinInboxDriverVerVersion; } res = AddPrinterDriverExW(nameW, Level, (LPBYTE) &diW, dwFileCopyFlags); @@ -7010,6 +7055,7 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW HeapFree(GetProcessHeap(), 0, diW.pDriverPath); HeapFree(GetProcessHeap(), 0, diW.pDataFile); HeapFree(GetProcessHeap(), 0, diW.pConfigFile); + HeapFree(GetProcessHeap(), 0, diW.pHelpFile); HeapFree(GetProcessHeap(), 0, diW.pDependentFiles); HeapFree(GetProcessHeap(), 0, diW.pMonitorName); HeapFree(GetProcessHeap(), 0, diW.pDefaultDataType); @@ -7018,6 +7064,11 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW HeapFree(GetProcessHeap(), 0, diW.pszOEMUrl); HeapFree(GetProcessHeap(), 0, diW.pszHardwareID); HeapFree(GetProcessHeap(), 0, diW.pszProvider); + HeapFree(GetProcessHeap(), 0, diW.pszPrintProcessor); + HeapFree(GetProcessHeap(), 0, diW.pszVendorSetup); + HeapFree(GetProcessHeap(), 0, diW.pszzColorProfiles); + HeapFree(GetProcessHeap(), 0, diW.pszInfPath); + HeapFree(GetProcessHeap(), 0, diW.pszzCoreDriverDependencies); TRACE("=> %u with %u\n", res, GetLastError()); return res;

1 0

Jeremy Newman : cleanup and bootstrapify
by Jeremy Newman 28 Nov '16

28 Nov '16

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 28 Nov '16

28 Nov '16

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 28 Nov '16

28 Nov '16

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 25 Nov '16

25 Nov '16

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

Tag wine-1.9.24 : Alexandre Julliard : Release 1.9.24
by Alexandre Julliard 25 Nov '16

25 Nov '16

Module: wine Branch: refs/tags/wine-1.9.24 Tag: a3dd19ce8dbd53c3ba8a566da1915d5b906c507e URL: http://source.winehq.org/git/wine.git/?a=tag;h=a3dd19ce8dbd53c3ba8a566da191… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 25 21:17:31 2016 +0100 Release 1.9.24

1 0

Alexandre Julliard : Release 1.9.24.
by Alexandre Julliard 25 Nov '16

25 Nov '16

Module: wine Branch: master Commit: 705c52691a4e8c6224cda5080fb88f257de5fd77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=705c52691a4e8c6224cda5080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 25 21:17:31 2016 +0100 Release 1.9.24. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 490 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 4 + VERSION | 2 +- configure | 18 +-- 4 files changed, 267 insertions(+), 247 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=705c52691a4e8c6224cda…

1 0

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

25 Nov '16

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

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

25 Nov '16

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

← Newer
1
...
5
6
7
8
9
10
11
...
47
Older →

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