wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Henri Verbeet : ddraw: Move the mipmap desc fixup code to ddraw_surface_create_texture() from device_parent_create_texture_surface().
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 191db92fd59073242600c90cb58e5cf27ebda325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=191db92fd59073242600c90cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:35 2012 +0200 ddraw: Move the mipmap desc fixup code to ddraw_surface_create_texture() from device_parent_create_texture_surface(). --- dlls/ddraw/ddraw.c | 41 ----------------------------------------- dlls/ddraw/surface.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 41 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index fa1beff..014ad27 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5218,47 +5218,6 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ desc.dwWidth = width; desc.dwHeight = height; - if (level) - desc.ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; - else - desc.ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; - - if (desc.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - { - desc.ddsCaps.dwCaps2 &= ~DDSCAPS2_CUBEMAP_ALLFACES; - - switch (face) - { - case WINED3D_CUBEMAP_FACE_POSITIVE_X: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEX; - break; - - case WINED3D_CUBEMAP_FACE_NEGATIVE_X: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEX; - break; - - case WINED3D_CUBEMAP_FACE_POSITIVE_Y: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEY; - break; - - case WINED3D_CUBEMAP_FACE_NEGATIVE_Y: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEY; - break; - - case WINED3D_CUBEMAP_FACE_POSITIVE_Z: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEZ; - break; - - case WINED3D_CUBEMAP_FACE_NEGATIVE_Z: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEZ; - break; - - default: - ERR("Unexpected cube face.\n"); - return DDERR_INVALIDPARAMS; - } - - } /* FIXME: Validate that format, usage, pool, etc. really make sense. */ if (FAILED(hr = ddraw_create_surface(ddraw, &desc, &ddraw_surface, tex_root->version))) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 51bd876..1c548a5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5592,6 +5592,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface) struct wined3d_resource *resource; enum wined3d_format_id format; UINT layers, levels, i, j; + DDSURFACEDESC2 *mip_desc; enum wined3d_pool pool; HRESULT hr; @@ -5638,6 +5639,41 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface) if (mip == surface) continue; + mip_desc = &mip->surface_desc; + + if (j) + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; + else + mip_desc->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; + + if (mip_desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + { + mip_desc->ddsCaps.dwCaps2 &= ~DDSCAPS2_CUBEMAP_ALLFACES; + + switch (i) + { + case WINED3D_CUBEMAP_FACE_POSITIVE_X: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEX; + break; + case WINED3D_CUBEMAP_FACE_NEGATIVE_X: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEX; + break; + case WINED3D_CUBEMAP_FACE_POSITIVE_Y: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEY; + break; + case WINED3D_CUBEMAP_FACE_NEGATIVE_Y: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEY; + break; + case WINED3D_CUBEMAP_FACE_POSITIVE_Z: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEZ; + break; + case WINED3D_CUBEMAP_FACE_NEGATIVE_Z: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEZ; + break; + } + + } + *attach = mip; attach = &mip->complex_array[0]; }

1 0

André Hentschel : gdi32: Fix free of address-of expression (coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: f5df798611e37a5f2d885f20b852b74d86b41026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5df798611e37a5f2d885f20b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:53:03 2012 +0200 gdi32: Fix free of address-of expression (coverity). --- dlls/gdi32/freetype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 20186fa..b22fb52 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1024,8 +1024,8 @@ static BOOL add_font_subst(struct list *subst_list, FontSubst *subst, INT flags) if(from_exist && (flags & ADD_FONT_SUBST_FORCE)) { list_remove(&from_exist->entry); - HeapFree(GetProcessHeap(), 0, &from_exist->from.name); - HeapFree(GetProcessHeap(), 0, &from_exist->to.name); + HeapFree(GetProcessHeap(), 0, from_exist->from.name); + HeapFree(GetProcessHeap(), 0, from_exist->to.name); HeapFree(GetProcessHeap(), 0, from_exist); from_exist = NULL; }

1 0

André Hentschel : d3dx9_36: Fix free of address-of expression (coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 8f6b6303ecbb081e84f70d5258bc50ae7dde4549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6b6303ecbb081e84f70d525… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:53:00 2012 +0200 d3dx9_36: Fix free of address-of expression (coverity). --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index ded0848..3e8fc1f 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3590,7 +3590,7 @@ static HRESULT filedata_get_name(IDirectXFileData *filedata, char **name) hr = IDirectXFileObject_GetName(filedata, *name, &name_len); if (FAILED(hr)) - HeapFree(GetProcessHeap(), 0, name); + HeapFree(GetProcessHeap(), 0, *name); if (!name_len) (*name)[0] = 0;

1 0

André Hentschel : windowscodecs: Fix resource leak ( coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: bbefb29d1cd9fd644946618574ad1aed8ced4925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbefb29d1cd9fd64494661857… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:53:17 2012 +0200 windowscodecs: Fix resource leak (coverity). --- dlls/windowscodecs/ungif.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 0f55242..c2887ed 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -159,6 +159,7 @@ MakeMapObject(int ColorCount, Object->Colors = ungif_calloc(ColorCount, sizeof(GifColorType)); if (Object->Colors == NULL) { + ungif_free(Object); return NULL; }

1 0

André Hentschel : gdiplus: Fix order of GdipFrees ( coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 31eef521e9dfbde80740b05606b2584a77b9d48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31eef521e9dfbde80740b0560… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:53:10 2012 +0200 gdiplus: Fix order of GdipFrees (coverity). --- dlls/gdiplus/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 47a864b..ca96bda 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1067,9 +1067,9 @@ GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) (*clone)->pathdata.Points = GdipAlloc(path->datalen * sizeof(PointF)); (*clone)->pathdata.Types = GdipAlloc(path->datalen); if(!(*clone)->pathdata.Points || !(*clone)->pathdata.Types){ - GdipFree(*clone); GdipFree((*clone)->pathdata.Points); GdipFree((*clone)->pathdata.Types); + GdipFree(*clone); return OutOfMemory; }

1 0

André Hentschel : browseui: HeapFree after deleting the cs (coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 69f01adf2d9e11055c1f185a673d297f577d63cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f01adf2d9e11055c1f185a6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:53:06 2012 +0200 browseui: HeapFree after deleting the cs (coverity). --- dlls/browseui/progressdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 7d478cc..598197b 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -265,9 +265,9 @@ static void ProgressDialog_Destructor(ProgressDialog *This) heap_free(This->lines[2]); heap_free(This->cancelMsg); heap_free(This->title); - heap_free(This); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); + heap_free(This); BROWSEUI_refCount--; }

1 0

André Hentschel : gameux: Avoid double free (coverity) .
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 97dbccf5f254648fd96e011adeba0136af340658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97dbccf5f254648fd96e011ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:52:57 2012 +0200 gameux: Avoid double free (coverity). --- dlls/gameux/gameexplorer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 1f51f12..8f30601 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -783,13 +783,15 @@ HRESULT GAMEUX_FindGameInstanceId( sConfigGDFBinaryPath, &lpValue); if(SUCCEEDED(hr)) + { if(lstrcmpW(lpValue, sGDFBinaryPath)==0) { /* key found, let's copy instance id and exit */ hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL); found = TRUE; } - HeapFree(GetProcessHeap(), 0, lpValue); + HeapFree(GetProcessHeap(), 0, lpValue); + } } }

1 0

André Hentschel : ieframe: Check for null before dereferencing it (coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 07fd75baddcf2818a8118db35ebc932b00a188b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07fd75baddcf2818a8118db35… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:52:55 2012 +0200 ieframe: Check for null before dereferencing it (coverity). --- dlls/ieframe/shellbrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 91a3bf6..6e84264 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -663,9 +663,9 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( if(cbPostData) { post_data = SafeArrayCreateVector(VT_UI1, 0, cbPostData); - memcpy(post_data->pvData, pPostData, cbPostData); if(!post_data) return E_OUTOFMEMORY; + memcpy(post_data->pvData, pPostData, cbPostData); }else { post_data = NULL; }

1 0

Francois Gouget : testbot/web: Give better titles to the job details pages.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: tools Branch: master Commit: 41b35e60772c4c7abfc0a720e0e6a22f7df2d12b URL: http://source.winehq.org/git/tools.git/?a=commit;h=41b35e60772c4c7abfc0a720… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 19:15:06 2012 +0200 testbot/web: Give better titles to the job details pages. In particular show the job remarks field which is usually the patch subject line. Also arrange for this subject line to be visible in the Web browser's tab label. --- testbot/web/JobDetails.pl | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 50512b0..ea07014 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -39,22 +39,32 @@ sub _initialize { $JobId = $self->GetParam("JobId"); } - my $Job = CreateJobs()->GetItem($JobId); - if (! defined($Job)) + $self->{Job} = CreateJobs()->GetItem($JobId); + if (!defined $self->{Job}) { $self->Redirect("/index.pl"); } + $self->{JobId} = $JobId; - $self->{JobId} = $Job->Id; + $self->SUPER::_initialize(@_, CreateStepsTasks($self->{Job})); +} + +sub GetPageTitle() +{ + my $self = shift; - $self->SUPER::_initialize(@_, CreateStepsTasks($Job)); + my $PageTitle = $self->{Job}->Remarks; + $PageTitle =~ s/^[[]wine-patches[]] //; + $PageTitle = "Job " . $self->{JobId} if ($PageTitle eq ""); + $PageTitle .= " - ${ProjectName} Test Bot"; + return $PageTitle; } sub GetTitle() { my $self = shift; - return "Job " . $self->{JobId}; + return "Job " . $self->{JobId} . " - " . $self->{Job}->Remarks; } sub DisplayProperty

1 0

Francois Gouget : testbot/web: Make it possible for web pages to set their page title.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: tools Branch: master Commit: c1d75ee839c357dfb32b2ce0b13e39fb7daa4011 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c1d75ee839c357dfb32b2ce0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 19:14:57 2012 +0200 testbot/web: Make it possible for web pages to set their page title. Previously they could set their header but not the label that appears in the Web browser's tab or title bar. --- testbot/lib/ObjectModel/CGI/Page.pm | 14 ++++++++++++++ testbot/lib/WineTestBot/CGI/PageBase.pm | 14 +++++++++++++- 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index a21ad36..0661519 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -102,6 +102,20 @@ sub SetCookies $self->{PageBase}->SetCookies($self); } +sub GetPageTitle +{ + my $self = shift; + + return $self->{PageBase}->GetPageTitle($self); +} + +sub GetTitle +{ + my $self = shift; + + return undef; +} + sub GenerateHeader { my $self = shift; diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 141833f..5439ebf 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -195,16 +195,28 @@ sub SetCookies } } +sub GetPageTitle +{ + my $self = shift; + my $Page = $_[0]; + + my $Title = $Page->GetTitle() || ""; + $Title .= " - " if ($Title ne ""); + $Title .= "${ProjectName} Test Bot"; + return $Title; +} + sub GenerateHeader { my $self = shift; my $Page = $_[0]; + my $Title = $Page->CGI->escapeHTML($Page->GetPageTitle()); print <<EOF; <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <title>${ProjectName} Test Bot</title> + <title>$Title</title> <link rel='icon' href='/${ProjectName}FavIcon.png' type='image/png'> <link rel='shortcut icon' href='/${ProjectName}FavIcon.png' type='image/png'> <link rel='stylesheet' href='/${ProjectName}TestBot.css' type='text/css' media='screen'>

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
96
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 October 2012