wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

Kyle Auble : Redo links on main status page
by Jeremy Newman 27 Aug '12

27 Aug '12

Module: website Branch: master Commit: 50365369e0d6060655d522a3848a7673d99aec68 URL: http://source.winehq.org/git/website.git/?a=commit;h=50365369e0d6060655d522… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Thu Aug 23 08:09:51 2012 -0700 Redo links on main status page I've redirected some of the links on the status page to pages on the wiki. The changelog I just deleted though since changes are already recorded in git for static pages and revision history for the wiki. --- templates/en/status.template | 9 ++------- templates/he/status.template | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/templates/en/status.template b/templates/en/status.template index 229db34..d740b16 100644 --- a/templates/en/status.template +++ b/templates/en/status.template @@ -65,20 +65,15 @@ Status of user interface elements. </dd> - <dt><a href="{$root}/status/porting">Porting Status</a></dt> + <dt><a href="http://wiki.winehq.org/WinePortingStatus">Porting Status</a></dt> <dd> Status of porting Wine to various compilers, OSes, architectures. </dd> - <dt><a href="{$root}/status/todo">Known To Do's</a></dt> + <dt><a href="http://wiki.winehq.org/TodoList">Known TO-DOs</a></dt> <dd> List of known issues. </dd> - - <dt><a href="{$root}/status/changelog">ChangeLog</a></dt> - <dd> - Have a look here to get a feeling about development progress. - </dd> </dl> </td></tr> </table> diff --git a/templates/he/status.template b/templates/he/status.template index dc4660c..42af425 100644 --- a/templates/he/status.template +++ b/templates/he/status.template @@ -64,20 +64,15 @@ מצב רכיבי מנשק המשתמש. </dd> - <dt><a href="{$root}/status/porting">מצב ההסבה</a></dt> + <dt><a href="http://wiki.winehq.org/WinePortingStatus">מצב ההסבה</a></dt> <dd> מצב הסבת Wine למגוון של מהדרים, מערכות הפעלה, ארכיטקטורות. </dd> - <dt><a href="{$root}/status/todo">נושאים לטיפול</a></dt> + <dt><a href="http://wiki.winehq.org/TodoList">נושאים לטיפול</a></dt> <dd> רשימה של נושאים לטיפול. </dd> - - <dt><a href="{$root}/status/changelog">יומן שינויים</a></dt> - <dd> - ניתן להביט להלן כדי לקבל תחושה על התקדמות הפיתוח. - </dd> </dl> </td></tr> </table>

1 0

Austin English : website: update Red Hat / CentOS / Fedora version info
by Jeremy Newman 27 Aug '12

27 Aug '12

Module: website Branch: master Commit: aec1633e0919ef57754842a8d55070f71b898827 URL: http://source.winehq.org/git/website.git/?a=commit;h=aec1633e0919ef57754842… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Aug 22 19:21:24 2012 -0700 website: update Red Hat / CentOS / Fedora version info http://bugs.winehq.org/show_bug.cgi?id=31500 -- -Austin --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/fr/download.template | 4 ++-- templates/he/download.template | 2 +- templates/pl/download.template | 2 +- templates/pt/download.template | 2 +- templates/tr/download.template | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 18fd2ef..b31731e 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -80,7 +80,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Red Hat / CentOS / Fedora</a> - binär und Quellcode .rpms für Red Hat Enterprise Linux 4, 5; CentOS 4, 5; Fedora Core 5, 6; Fedora Linux 7 und + binär und Quellcode .rpms für Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 und kompatible Distributionen. Das wine meta package ist via <tt>yum</tt> im EPEL / Fedora Extras / Fedora Repository verfügbar, indem man <tt>$ yum install diff --git a/templates/en/download.template b/templates/en/download.template index 5b90bf3..2e65cff 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -79,7 +79,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="Red Hat Linux" border="0"></a> </td> <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Download Red Hat / CentOS / Fedora packages</a> - - binary and source .rpms for Red Hat Enterprise Linux 4, 5; CentOS 4, 5; Fedora Core 5, 6; Fedora Linux 7 and + - binary and source .rpms for Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 and compatible distributions. The wine meta package is available via <tt>yum</tt> through the EPEL / Fedora Extras / Fedora repository by running <tt>$ yum install diff --git a/templates/fr/download.template b/templates/fr/download.template index fca9100..08d3be1 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -84,8 +84,8 @@ center;">Voyez la <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Paquets Red Hat / CentOS / Fedora</a> - - .rpm binaires et sources pour Red Hat Enterprise Linux 4 et 5, CentOS - 4 et 5, Fedora Core 5 et 6, Fedora Linux 7 et distributions compatibles. + - .rpm binaires et sources pour Red Hat Enterprise Linux 5 et 6, CentOS + 5 et 6, Fedora Linux 16, 17 et distributions compatibles. Le méta-paquet wine est disponible via <tt>yum</tt> au travers du dépôt EPEL / Fedora Extras / Fedora en exécutant <tt>$ yum install wine </tt>" diff --git a/templates/he/download.template b/templates/he/download.template index 36d7f38..2e6cd76 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -80,7 +80,7 @@ <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">הורדת חבילות ל־Red Hat / CentOS / Fedora</a> - - קובצי .rpm בינריים ולמקור להפצות תומכות Red Hat Enterprise Linux 4, 5; CentOS 4, 5; Fedora Core 5, 6; Fedora Linux 7 + - קובצי .rpm בינריים ולמקור להפצות תומכות Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 חבילת העל של wine זמינה דרך <tt>yum</tt>. באמצעות מאגר EPEL / Fedora Extras / Fedora על ידי הפעלת הפקודה <tt>$ yum install wine </tt>" diff --git a/templates/pl/download.template b/templates/pl/download.template index 5136b95..2bdb14f 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -78,7 +78,7 @@ <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Pobierz paczki dla Red Hat / CentOS / Fedora</a> - - binarne i źródłowe paczki .rpm dla Red Hat Enterprise Linux 4, 5; CentOS 4, 5; Fedora Core 5, 6; Fedora Linux 7 i + - binarne i źródłowe paczki .rpm dla Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 i kompatybilnych dystrybucji. Meta paczka Wine jest dostępna przez <tt>yum</tt> dzięki repozytorium EPEL / Fedora Extras / Fedora poprzez wpisanie w terminalu <tt>$ yum install diff --git a/templates/pt/download.template b/templates/pt/download.template index e5c290f..d1cf046 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -77,7 +77,7 @@ <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="Red Hat Linux" border="0"></a> </td> <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Descarregar pacotes para Red Hat / CentOS / Fedora</a> - - .rpms binários e do código fonte para Red Hat Enterprise Linux 4, 5; CentOS 4, 5; Fedora Core 5, 6; Fedora Linux 7 e distribuições compatíveis. + - .rpms binários e do código fonte para Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 e distribuições compatíveis. O meta pacote do Wine está disponível via <tt>yum</tt> nos repositórios EPEL / Fedora Extras / Fedora executando o comando <tt>$ yum install wine </tt>" diff --git a/templates/tr/download.template b/templates/tr/download.template index a2d352d..0aa1547 100644 --- a/templates/tr/download.template +++ b/templates/tr/download.template @@ -79,7 +79,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="Red Hat Linux" border="0"></a> </td> <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Red Hat / CentOS / Fedora paketleri indirin</a> - - binary and source .rpms for Red Hat Enterprise Linux 4, 5; CentOS 4, 5; Fedora Core 5, 6; Fedora Linux 7 and + - binary and source .rpms for Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 and compatible distributions. The wine meta package is available via <tt>yum</tt> through the EPEL / Fedora Extras / Fedora repository by running <tt>$ yum install

1 0

André Hentschel : German JIB announcement
by Jeremy Newman 27 Aug '12

27 Aug '12

Module: website Branch: master Commit: b7db20f87fcd5bbcc85da339a21597c0ecd95157 URL: http://source.winehq.org/git/website.git/?a=commit;h=b7db20f87fcd5bbcc85da3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 21 21:07:17 2012 +0200 German JIB announcement --- news/de/2012082101.xml | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/news/de/2012082101.xml b/news/de/2012082101.xml new file mode 100644 index 0000000..5a59a7a --- /dev/null +++ b/news/de/2012082101.xml @@ -0,0 +1,6 @@ +<news> +<date>21. August 2012</date> +<title>Spenden von JIB</title> +<body> +Das <a href="http://jib.magicermine.com">Jinn in the Bottle</a> +Projekt gab kürzlich bekannt, dass sie nun 15% ihres Umsatzes an Wine spenden.</body></news>

1 0

Dmitry Timoshkov : gdiplus: Make GdipMeasureCharacterRanges use common font transformation code.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 4e2959ab9b87cfeaec232f3b7aecc04e6cd3d0e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2959ab9b87cfeaec232f3b7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 24 15:43:45 2012 +0900 gdiplus: Make GdipMeasureCharacterRanges use common font transformation code. --- dlls/gdiplus/graphics.c | 10 +++++----- dlls/gdiplus/tests/graphics.c | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0056a2f..a0c130e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4927,8 +4927,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, { GpStatus stat; int i; - LOGFONTW lfw; - HFONT oldfont; + HFONT gdifont, oldfont; struct measure_ranges_args args; HDC hdc, temp_hdc=NULL; GpPointF pt[3]; @@ -4971,8 +4970,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, scaled_rect.Width = layoutRect->Width * args.rel_width; scaled_rect.Height = layoutRect->Height * args.rel_height; - get_log_fontW(font, graphics, &lfw); - oldfont = SelectObject(hdc, CreateFontIndirectW(&lfw)); + get_font_hfont(graphics, font, &gdifont); + oldfont = SelectObject(hdc, gdifont); for (i=0; i<stringFormat->range_count; i++) { @@ -4986,7 +4985,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, stat = gdip_format_string(hdc, string, length, font, &scaled_rect, stringFormat, measure_ranges_callback, &args); - DeleteObject(SelectObject(hdc, oldfont)); + SelectObject(hdc, oldfont); + DeleteObject(gdifont); if (temp_hdc) DeleteDC(temp_hdc); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 913d895..1cd847d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3828,9 +3828,13 @@ static void test_font_height_scaling(void) win_skip("GdipMeasureCharacterRanges ignores units before Win7\n"); continue; } + /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ + if (height < 1.0) expectf_(height, rect.Height, height / 15.0); + else todo_wine - expectf_(bounds.Width, rect.Width + margin * 2.0, bounds.Width / 25.0); + expectf_(height, rect.Height, height / 15.0); + expectf_(bounds.Width, rect.Width + margin * 2.0, bounds.Width / 15.0); } }

1 0

Dmitry Timoshkov : gdiplus: Do not convert range_rect.X twice.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 7a1ccd8abe04a2eeb27f9215ff910a6e45688d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1ccd8abe04a2eeb27f9215f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 24 15:42:47 2012 +0900 gdiplus: Do not convert range_rect.X twice. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5e76927..0056a2f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4909,7 +4909,7 @@ static GpStatus measure_ranges_callback(HDC hdc, GetTextExtentExPointW(hdc, string + index, range_end - index, INT_MAX, NULL, NULL, &range_size); - range_rect.Width = (bounds->X + range_size.cx - range_rect.X) / args->rel_width; + range_rect.Width = (bounds->X + range_size.cx) / args->rel_width - range_rect.X; stat = GdipCombineRegionRect(args->regions[i], &range_rect, CombineModeUnion); if (stat != Ok)

1 0

Nikolay Sivov : riched20/tests: Use proper method macros.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 28821a924c9fa78b23d4a4edb564a90861d3c9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=28821a924c9fa78b23d4a4edb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 24 13:03:56 2012 +0400 riched20/tests: Use proper method macros. --- dlls/riched20/tests/richole.c | 4 ++-- dlls/riched20/tests/txtsrv.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index ee89086..d22904a 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -76,7 +76,7 @@ START_TEST(richole) ok(res, "SendMessage\n"); ok(reOle != NULL, "EM_GETOLEINTERFACE\n"); - hres = IUnknown_QueryInterface(reOle, &IID_ITextDocument, + hres = IRichEditOle_QueryInterface(reOle, &IID_ITextDocument, (void **) &txtDoc); ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); ok(txtDoc != NULL, "IRichEditOle_QueryInterface\n"); @@ -104,7 +104,7 @@ START_TEST(richole) IUnknown_Release(punk); ITextDocument_Release(txtDoc); - IUnknown_Release(reOle); + IRichEditOle_Release(reOle); DestroyWindow(w); /* Methods should return CO_E_RELEASED if the backing document has diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index fbd1f6b..e517e03 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -657,7 +657,7 @@ static BOOL init_texthost(void) static void free_texthost(void) { - IUnknown_Release(txtserv); + ITextServices_Release(txtserv); CoTaskMemFree(dummyTextHost); }

1 0

Nikolay Sivov : qmgr: Use proper method macros.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: fcda3c7ad8556381acbd114a86fb1719a37dd61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcda3c7ad8556381acbd114a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 24 12:52:18 2012 +0400 qmgr: Use proper method macros. --- dlls/qmgr/job.c | 2 +- dlls/qmgr/tests/enum_jobs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 9d8d928..c4d6eec 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -82,7 +82,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_AddFileSet( ULONG i; for (i = 0; i < cFileCount; ++i) { - HRESULT hr = IBackgroundCopyJob_AddFile(iface, pFileSet[i].RemoteName, + HRESULT hr = IBackgroundCopyJob2_AddFile(iface, pFileSet[i].RemoteName, pFileSet[i].LocalName); if (FAILED(hr)) return hr; diff --git a/dlls/qmgr/tests/enum_jobs.c b/dlls/qmgr/tests/enum_jobs.c index 5c52480..e388087 100644 --- a/dlls/qmgr/tests/enum_jobs.c +++ b/dlls/qmgr/tests/enum_jobs.c @@ -218,7 +218,7 @@ static void test_Next_walkList_2(void) { ok(jobs[i] != NULL, "Next returned NULL\n"); if (jobs[i]) - IBackgroundCopyFile_Release(jobs[i]); + IBackgroundCopyJob_Release(jobs[i]); } HeapFree(GetProcessHeap(), 0, jobs);

1 0

Nikolay Sivov : wshom.ocx/tests: Use proper method macro.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: f91f6034ded85cb78101153d56ce45b4a108d4ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91f6034ded85cb78101153d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 24 13:23:43 2012 +0400 wshom.ocx/tests: Use proper method macro. --- dlls/wshom.ocx/tests/wshom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index c70696c..b2f60a8 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -64,7 +64,7 @@ static void test_wshshell(void) hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); EXPECT_HR(hr, E_NOINTERFACE); - hr = IDispatch_QueryInterface(shell, &IID_IWshShell3, (void**)&sh3); + hr = IUnknown_QueryInterface(shell, &IID_IWshShell3, (void**)&sh3); EXPECT_HR(hr, S_OK); hr = IWshShell3_get_SpecialFolders(sh3, &coll);

1 0

Nikolay Sivov : shell32/tests: Use proper method macros.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 96005d17d5228b5c2961cee5203b15efb9c63a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96005d17d5228b5c2961cee52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 24 13:17:20 2012 +0400 shell32/tests: Use proper method macros. --- dlls/shell32/tests/assoc.c | 17 +++++++++-------- dlls/shell32/tests/shelldispatch.c | 2 +- dlls/shell32/tests/shelllink.c | 4 ++-- dlls/shell32/tests/shlfolder.c | 2 +- dlls/shell32/tests/shlview.c | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 488f8e9..29524dc 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -43,19 +43,19 @@ static void test_IQueryAssociations_QueryInterface(void) return; } - hr = IUnknown_QueryInterface(qa, &IID_IQueryAssociations, (void**)&qa2); + hr = IQueryAssociations_QueryInterface(qa, &IID_IQueryAssociations, (void**)&qa2); ok(hr == S_OK, "QueryInterface (IQueryAssociations) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { - IUnknown_Release(qa2); + IQueryAssociations_Release(qa2); } - hr = IUnknown_QueryInterface(qa, &IID_IUnknown, (void**)&unk); + hr = IQueryAssociations_QueryInterface(qa, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { IUnknown_Release(unk); } - hr = IUnknown_QueryInterface(qa, &IID_IUnknown, NULL); + hr = IQueryAssociations_QueryInterface(qa, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); IQueryAssociations_Release(qa); @@ -78,19 +78,20 @@ static void test_IApplicationAssociationRegistration_QueryInterface(void) return; } - hr = IUnknown_QueryInterface(appreg, &IID_IApplicationAssociationRegistration, (void**)&appreg2); + hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IApplicationAssociationRegistration, + (void**)&appreg2); ok(hr == S_OK, "QueryInterface (IApplicationAssociationRegistration) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { - IUnknown_Release(appreg2); + IApplicationAssociationRegistration_Release(appreg2); } - hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, (void**)&unk); + hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { IUnknown_Release(unk); } - hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, NULL); + hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); IApplicationAssociationRegistration_Release(appreg); diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 9d8d70b..0c49674 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -360,7 +360,7 @@ static void test_service(void) ok(V_BOOL(&v) == VARIANT_FALSE, "got %d\n", V_BOOL(&v)); SysFreeString(name); - IShellDispatch_Release(sd); + IShellDispatch2_Release(sd); } START_TEST(shelldispatch) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 8c6275d..f2f33aa 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -417,7 +417,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) lok(r == S_OK, "SetHotkey failed (0x%08x)\n", r); } - r = IShellLinkW_QueryInterface(sl, &IID_IPersistFile, (LPVOID*)&pf); + r = IShellLinkA_QueryInterface(sl, &IID_IPersistFile, (void**)&pf); lok(r == S_OK, "no IID_IPersistFile (0x%08x)\n", r); if (r == S_OK) { @@ -902,7 +902,7 @@ if (0) LocalFree( dar ); - IUnknown_Release( dl ); + IShellLinkDataList_Release( dl ); IShellLinkW_Release( sl ); } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f34bb70..ef8aae9 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -796,7 +796,7 @@ static void test_GetDisplayName(void) broken(hr == S_OK), /* Win9x, W2K */ "hr = %08x\n", hr); if (hr == S_OK) { - IShellFolder_Release(psfFile); + IUnknown_Release(psfFile); } if (!pSHBindToParent) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 6e97499..554e086 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -170,7 +170,7 @@ static HRESULT WINAPI IDataObjectImpl_QueryInterface(IDataObject *iface, REFIID if(*ppvObj) { - IUnknown_AddRef(iface); + IDataObject_AddRef(iface); return S_OK; } @@ -302,7 +302,7 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, if(*ppvObj) { - IUnknown_AddRef(iface); + IShellBrowser_AddRef(iface); return S_OK; }

1 0

Nikolay Sivov : quartz/tests: Use proper method macros.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 1552e22b0bbde9b80409a020cd85336a43e091e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1552e22b0bbde9b80409a020c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 24 13:01:11 2012 +0400 quartz/tests: Use proper method macros. --- dlls/quartz/tests/avisplitter.c | 24 ++++++++++++------------ dlls/quartz/tests/dsoundrender.c | 2 +- dlls/quartz/tests/filtergraph.c | 22 +++++++++++----------- dlls/quartz/tests/memallocator.c | 4 ++-- dlls/quartz/tests/videorenderer.c | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 250c631..ad01906 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -227,7 +227,7 @@ static void test_threads(void) ok(hr == E_NOINTERFACE, "Avi splitter returns unexpected error: %08x\n", hr); if (pfile) - IUnknown_Release(pfile); + IFileSourceFilter_Release(pfile); pfile = NULL; hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, @@ -236,7 +236,7 @@ static void test_threads(void) if (hr != S_OK) goto fail; - hr = IUnknown_QueryInterface(preader, &IID_IFileSourceFilter, + hr = IBaseFilter_QueryInterface(preader, &IID_IFileSourceFilter, (void**)&pfile); ok(hr == S_OK, "Could not get IFileSourceFilter: %08x\n", hr); if (hr != S_OK) @@ -265,7 +265,7 @@ static void test_threads(void) if (hr != S_OK) goto fail; - IUnknown_Release(enumpins); + IEnumPins_Release(enumpins); enumpins = NULL; hr = IBaseFilter_EnumPins(pavi, &enumpins); @@ -292,7 +292,7 @@ static void test_threads(void) ok(curlevel == expected, "The thread count should be %d not %d\n", expected, curlevel); - IUnknown_Release(avipin); + IPin_Release(avipin); avipin = NULL; IEnumPins_Reset(enumpins); @@ -334,12 +334,12 @@ static void test_threads(void) ++expected; } - IUnknown_Release(avipin); + IPin_Release(avipin); avipin = NULL; } if (avipin) - IUnknown_Release(avipin); + IPin_Release(avipin); avipin = NULL; if (hr != S_OK) @@ -414,10 +414,10 @@ fail: if (hr != S_OK) skip("Prerequisites not matched, skipping remainder of test\n"); if (enumpins) - IUnknown_Release(enumpins); + IEnumPins_Release(enumpins); if (avipin) - IUnknown_Release(avipin); + IPin_Release(avipin); if (filepin) { IPin *to = NULL; @@ -428,15 +428,15 @@ fail: IPin_Disconnect(filepin); IPin_Disconnect(to); } - IUnknown_Release(filepin); + IPin_Release(filepin); } if (preader) - IUnknown_Release(preader); + IBaseFilter_Release(preader); if (pavi) - IUnknown_Release(pavi); + IBaseFilter_Release(pavi); if (pfile) - IUnknown_Release(pfile); + IFileSourceFilter_Release(pfile); curlevel = count_threads(); todo_wine diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index fc214e1..a3e4778 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -33,7 +33,7 @@ ok(ppv != NULL, "Pointer is NULL\n"); #define RELEASE_EXPECT(iface, num) if (iface) { \ - hr = IUnknown_Release(iface); \ + hr = IUnknown_Release((IUnknown*)iface); \ ok(hr == num, "IUnknown_Release should return %d, got %d\n", num, hr); \ } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index ea37b2f..6e839a8 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -236,7 +236,7 @@ static void test_graph_builder_addfilter(void) hr = IGraphBuilder_AddFilter(pgraph, pF, NULL); ok(hr == S_OK, "IGraphBuilder_AddFilter returned: %x\n", hr); - IMediaFilter_Release(pF); + IBaseFilter_Release(pF); } static void test_mediacontrol(void) @@ -247,26 +247,26 @@ static void test_mediacontrol(void) IMediaFilter *filter = NULL; IMediaControl *control = NULL; - IFilterGraph2_SetDefaultSyncSource(pgraph); - hr = IFilterGraph2_QueryInterface(pgraph, &IID_IMediaSeeking, (void**) &seeking); + IGraphBuilder_SetDefaultSyncSource(pgraph); + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaSeeking, (void**) &seeking); ok(hr == S_OK, "QueryInterface IMediaControl failed: %08x\n", hr); if (FAILED(hr)) return; - hr = IFilterGraph2_QueryInterface(pgraph, &IID_IMediaFilter, (void**) &filter); + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaFilter, (void**) &filter); ok(hr == S_OK, "QueryInterface IMediaFilter failed: %08x\n", hr); if (FAILED(hr)) { - IUnknown_Release(seeking); + IMediaSeeking_Release(seeking); return; } - hr = IFilterGraph2_QueryInterface(pgraph, &IID_IMediaControl, (void**) &control); + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaControl, (void**) &control); ok(hr == S_OK, "QueryInterface IMediaControl failed: %08x\n", hr); if (FAILED(hr)) { - IUnknown_Release(seeking); - IUnknown_Release(filter); + IMediaSeeking_Release(seeking); + IMediaFilter_Release(filter); return; } @@ -288,9 +288,9 @@ static void test_mediacontrol(void) hr = IMediaControl_GetState(control, 1000, NULL); ok(hr == E_POINTER, "GetState expected %08x, got %08x\n", E_POINTER, hr); - IUnknown_Release(control); - IUnknown_Release(seeking); - IUnknown_Release(filter); + IMediaControl_Release(control); + IMediaSeeking_Release(seeking); + IMediaFilter_Release(filter); releasefiltergraph(); } diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index d2ace87..1086ed5 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -69,9 +69,9 @@ static void CommitDecommitTest(void) hr = IMemAllocator_GetBuffer(pMemAllocator, &sample2, NULL, NULL, 0); ok(hr==S_OK, "Could not get a buffer: %x\n", hr); - IUnknown_Release(sample); + IMediaSample_Release(sample); if (sample2) - IUnknown_Release(sample2); + IMediaSample_Release(sample2); hr = IMemAllocator_Decommit(pMemAllocator); ok(hr==S_OK, "Cecommit returned: %x\n", hr); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 3c09f83..ce1ac29 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -28,7 +28,7 @@ ok(ppv != NULL, "Pointer is NULL\n"); #define RELEASE_EXPECT(iface, num) if (iface) { \ - hr = IUnknown_Release(iface); \ + hr = IUnknown_Release((IUnknown*)iface); \ ok(hr == num, "IUnknown_Release should return %d, got %d\n", num, hr); \ }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
55
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 August 2012