October 2012 - Wine-Commits

Henri Verbeet : wined3d: Replace the face and level parameters to device_parent_create_texture_surface () with the sub-resource index.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: 2bf46c60fbb6999ce155f644077e5a2e899a006f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf46c60fbb6999ce155f6440… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:36 2012 +0200 wined3d: Replace the face and level parameters to device_parent_create_texture_surface() with the sub-resource index. --- dlls/d3d10core/device.c | 6 +++--- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 6 +++--- dlls/ddraw/ddraw.c | 8 ++++---- dlls/wined3d/texture.c | 8 ++++---- include/wine/wined3d.h | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index cd2d710..8dd5b95 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1440,13 +1440,13 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) + enum wined3d_pool pool, UINT sub_resource_idx, struct wined3d_surface **surface) { struct d3d10_device *device = device_from_wined3d_device_parent(device_parent); TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" - "\tpool %#x, level %u, face %u, surface %p.\n", - device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + "\tpool %#x, sub_resource_idx %u, surface %p.\n", + device_parent, container_parent, width, height, format, usage, pool, sub_resource_idx, surface); return wined3d_surface_create(device->wined3d_device, width, height, format, usage, pool, WINED3D_MULTISAMPLE_NONE, 0, WINED3D_SURFACE_TYPE_OPENGL, 0, container_parent, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 58aaf3c..c73f065 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2739,7 +2739,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) + enum wined3d_pool pool, UINT sub_resource_idx, struct wined3d_surface **surface) { struct d3d8_device *device = device_from_device_parent(device_parent); struct d3d8_surface *d3d_surface; @@ -2747,8 +2747,8 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" - "\tpool %#x, level %u, face %u, surface %p.\n", - device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + "\tpool %#x, sub_resource_idx %u, surface %p.\n", + device_parent, container_parent, width, height, format, usage, pool, sub_resource_idx, surface); if (pool == WINED3D_POOL_DEFAULT && !(usage & WINED3DUSAGE_DYNAMIC)) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6c9ccc9..ce5bf1a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3106,7 +3106,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) + enum wined3d_pool pool, UINT sub_resource_idx, struct wined3d_surface **surface) { struct d3d9_device *device = device_from_device_parent(device_parent); struct d3d9_surface *d3d_surface; @@ -3114,8 +3114,8 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" - "\tpool %#x, level %u, face %u, surface %p.\n", - device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + "\tpool %#x, sub_resource_idx %u, surface %p.\n", + device_parent, container_parent, width, height, format, usage, pool, sub_resource_idx, surface); if (pool == WINED3D_POOL_DEFAULT && !(usage & D3DUSAGE_DYNAMIC)) lockable = FALSE; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 014ad27..376db17 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5197,7 +5197,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) + enum wined3d_pool pool, UINT sub_resource_idx, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); struct ddraw_surface *tex_root = container_parent; @@ -5206,11 +5206,11 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" - "\tpool %#x, level %u, face %u, surface %p.\n", - device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + "\tpool %#x, sub_resource_idx %u, surface %p.\n", + device_parent, container_parent, width, height, format, usage, pool, sub_resource_idx, surface); /* The ddraw root surface is created before the wined3d texture. */ - if (!level && face == WINED3D_CUBEMAP_FACE_POSITIVE_X) + if (!sub_resource_idx) { ddraw_surface = tex_root; goto done; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9fb6b80..d9152b1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -859,8 +859,8 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt UINT idx = j * texture->level_count + i; struct wined3d_surface *surface; - if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, parent, - tmp_w, tmp_w, format_id, usage, pool, i /* Level */, j, &surface))) + if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, + parent, tmp_w, tmp_w, format_id, usage, pool, idx, &surface))) { FIXME("(%p) Failed to create surface, hr %#x.\n", texture, hr); wined3d_texture_cleanup(texture); @@ -1014,8 +1014,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he struct wined3d_surface *surface; /* Use the callback to create the texture surface. */ - if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, parent, - tmp_w, tmp_h, format->id, usage, pool, i, 0, &surface))) + if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, + parent, tmp_w, tmp_h, format->id, usage, pool, i, &surface))) { FIXME("Failed to create surface %p, hr %#x\n", texture, hr); wined3d_texture_cleanup(texture); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 05af2ee..e201c2e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2004,7 +2004,7 @@ struct wined3d_device_parent_ops struct wined3d_surface **surface); HRESULT (__cdecl *create_texture_surface)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, DWORD usage, enum wined3d_pool pool, - UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface); + UINT sub_resource_idx, struct wined3d_surface **surface); HRESULT (__cdecl *create_volume)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, UINT depth, enum wined3d_format_id format_id, enum wined3d_pool pool, DWORD usage, struct wined3d_volume **volume);

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DTEXTURE9.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: 32809395630d6ee4c79c7388b14726b04f72b416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32809395630d6ee4c79c7388b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:39 2012 +0200 d3dx9: Avoid LPDIRECT3DTEXTURE9. --- dlls/d3dx9_36/texture.c | 147 +++++++++++------------------------------- include/d3dx9core.h | 12 ++-- include/d3dx9mesh.h | 19 +++--- include/d3dx9tex.h | 162 ++++++++++++----------------------------------- 4 files changed, 96 insertions(+), 244 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32809395630d6ee4c79c7…

1 0

Henri Verbeet : wined3d: Make the shader backend responsible for controlling the fixed function fragment pipe .
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: 17e33e9b27ced39a93e61dad20cba9195b2e18e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17e33e9b27ced39a93e61dad2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:37 2012 +0200 wined3d: Make the shader backend responsible for controlling the fixed function fragment pipe. --- dlls/wined3d/arb_program_shader.c | 36 ++++++++++++++- dlls/wined3d/context.c | 11 +++-- dlls/wined3d/device.c | 85 ++++++++++++------------------------- dlls/wined3d/glsl_shader.c | 32 +++++++++++++- dlls/wined3d/shader.c | 56 +++++++++++++++++++++++- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 6 ++- 7 files changed, 157 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17e33e9b27ced39a93e61…

1 0

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

Oct. 25, 2012

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 : windowscodecs: Fix resource leak ( coverity).
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

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 Oct. 25, 2012

Oct. 25, 2012

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

Marcus Meissner : dbghelp: Size of the floating point stack registers is 10 bytes (Coverity).
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: 6d6b2160020df41b114bd74b0d3f48bf7009d734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6b2160020df41b114bd74b0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 24 23:11:29 2012 +0200 dbghelp: Size of the floating point stack registers is 10 bytes (Coverity). --- dlls/dbghelp/cpu_i386.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index d15afdd..c912a0a 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -575,14 +575,16 @@ static void* i386_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size case CV_REG_ESP: *size = sizeof(ctx->Esp); return &ctx->Esp; case CV_REG_EIP: *size = sizeof(ctx->Eip); return &ctx->Eip; - case CV_REG_ST0 + 0: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[0*sizeof(long double)]; - case CV_REG_ST0 + 1: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[1*sizeof(long double)]; - case CV_REG_ST0 + 2: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[2*sizeof(long double)]; - case CV_REG_ST0 + 3: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[3*sizeof(long double)]; - case CV_REG_ST0 + 4: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[4*sizeof(long double)]; - case CV_REG_ST0 + 5: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[5*sizeof(long double)]; - case CV_REG_ST0 + 6: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[6*sizeof(long double)]; - case CV_REG_ST0 + 7: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[7*sizeof(long double)]; + /* These are x87 floating point registers... They do not match a C type in + * the Linux ABI, so hardcode their 80-bitness. */ + case CV_REG_ST0 + 0: *size = 10; return &ctx->FloatSave.RegisterArea[0*10]; + case CV_REG_ST0 + 1: *size = 10; return &ctx->FloatSave.RegisterArea[1*10]; + case CV_REG_ST0 + 2: *size = 10; return &ctx->FloatSave.RegisterArea[2*10]; + case CV_REG_ST0 + 3: *size = 10; return &ctx->FloatSave.RegisterArea[3*10]; + case CV_REG_ST0 + 4: *size = 10; return &ctx->FloatSave.RegisterArea[4*10]; + case CV_REG_ST0 + 5: *size = 10; return &ctx->FloatSave.RegisterArea[5*10]; + case CV_REG_ST0 + 6: *size = 10; return &ctx->FloatSave.RegisterArea[6*10]; + case CV_REG_ST0 + 7: *size = 10; return &ctx->FloatSave.RegisterArea[7*10]; case CV_REG_CTRL: *size = sizeof(DWORD); return &ctx->FloatSave.ControlWord; case CV_REG_STAT: *size = sizeof(DWORD); return &ctx->FloatSave.StatusWord;

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DCUBETEXTURE9.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: 9b19d755198e70d82263e5235e13fdd57f5f30b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b19d755198e70d82263e5235… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:38 2012 +0200 d3dx9: Avoid LPDIRECT3DCUBETEXTURE9. --- dlls/d3dx9_36/texture.c | 19 ++---- include/d3dx9core.h | 2 +- include/d3dx9tex.h | 152 ++++++++++++----------------------------------- 3 files changed, 45 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b19d755198e70d82263e…

1 0

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

Oct. 25, 2012

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/VMs: Tweak the sort order so retired and deleted VMs are last.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: tools Branch: master Commit: 7eb5ce4728a04a39a4203d9c6518d85ecd5cdb16 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7eb5ce4728a04a39a4203d9c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 19:14:18 2012 +0200 testbot/VMs: Tweak the sort order so retired and deleted VMs are last. --- testbot/lib/WineTestBot/VMs.pm | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index a356e98..734a58d 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -601,20 +601,19 @@ sub SortKeysBySortOrder my $self = shift; my $Keys = $_[0]; + # Sort retired and deleted VMs last + my %RoleOrders = ("retired" => 1, "deleted" => 2); + my %SortOrder; foreach my $Key (@$Keys) { my $Item = $self->GetItem($Key); - $SortOrder{$Key} = [$Item->Role, $Item->SortOrder]; + $SortOrder{$Key} = [$RoleOrders{$Item->Role} || 0, $Item->SortOrder]; } my @SortedKeys = sort { my ($soa, $sob) = ($SortOrder{$a}, $SortOrder{$b}); - # Sort deleted VMs last - return 1 if (@$soa[0] eq "deleted"); - return -1 if (@$sob[0] eq "deleted"); - # Otherwise follow the SortOrder key - return @$soa[1] <=> @$sob[1]; + return @$soa[0] <=> @$sob[0] || @$soa[1] <=> @$sob[1]; } @$Keys; return \@SortedKeys; }

1 0