winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2013
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
566 discussions
Start a n
N
ew thread
Henri Verbeet : ddraw: Don't bother checking for DDSD_CAPS in CreateSurface ().
by Alexandre Julliard
25 Nov '13
25 Nov '13
Module: wine Branch: master Commit: b62d55d8103d8f505bf4b137dd14bfaf36a39d4a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b62d55d8103d8f505bf4b137d…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 25 12:31:23 2013 +0100 ddraw: Don't bother checking for DDSD_CAPS in CreateSurface(). We made sure it's always set earlier. --- dlls/ddraw/ddraw.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 63dce96..99f0c3b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2927,10 +2927,8 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, desc2.u4.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); /* Just to be sure */ /* The first surface is a front buffer, the back buffer is created afterwards */ - if( (desc2.dwFlags & DDSD_CAPS) && (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) ) - { + if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) desc2.ddsCaps.dwCaps |= DDSCAPS_FRONTBUFFER; - } if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, &object))) {
1
0
0
0
Henri Verbeet : ddraw: Only reset the device when creating an exclusive mode front buffer in ddraw_surface_create_texture ().
by Alexandre Julliard
25 Nov '13
25 Nov '13
Module: wine Branch: master Commit: 8ce73e2ad67746fc28bc760c6fa4f926fb0c0386 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8ce73e2ad67746fc28bc760c6…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 25 12:31:22 2013 +0100 ddraw: Only reset the device when creating an exclusive mode front buffer in ddraw_surface_create_texture(). --- dlls/ddraw/surface.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 958abd7..21eff17 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5646,7 +5646,9 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, if (!desc->dwWidth || !desc->dwHeight) return DDERR_INVALIDPARAMS; - if ((desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) && (ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + if ((desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) + == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER) + && (ddraw->cooperative_level & DDSCL_EXCLUSIVE)) { struct wined3d_swapchain_desc swapchain_desc;
1
0
0
0
Henri Verbeet : wined3d: Get rid of surface_set_dirty().
by Alexandre Julliard
25 Nov '13
25 Nov '13
Module: wine Branch: master Commit: 4122cd80831c4fd2e13a91f32ca5b0379346f734 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4122cd80831c4fd2e13a91f32…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 25 12:31:21 2013 +0100 wined3d: Get rid of surface_set_dirty(). --- dlls/wined3d/surface.c | 14 -------------- dlls/wined3d/texture.c | 7 +++++-- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d18c42..3bf4926 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2240,20 +2240,6 @@ GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) return GL_BACK; } -/* Slightly inefficient way to handle multiple dirty rects but it works :) */ -void surface_set_dirty(struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - if (!(surface->flags & SFLAG_INSYSMEM) && (surface->flags & SFLAG_INTEXTURE)) - surface_load_location(surface, SFLAG_INSYSMEM); - - surface_validate_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - - wined3d_texture_set_dirty(surface->container); -} - void surface_load(struct wined3d_surface *surface, BOOL srgb) { DWORD flag = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6256b91..879a91a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -658,7 +658,6 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3DERR_INVALIDCALL; } - wined3d_texture_set_dirty(texture); texture->texture_ops->texture_sub_resource_add_dirty_region(sub_resource, dirty_region); return WINED3D_OK; @@ -673,7 +672,10 @@ static void texture2d_sub_resource_load(struct wined3d_resource *sub_resource, static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, const struct wined3d_box *dirty_region) { - surface_set_dirty(surface_from_resource(sub_resource)); + struct wined3d_surface *surface = surface_from_resource(sub_resource); + + surface_load_location(surface, SFLAG_INSYSMEM); + surface_invalidate_location(surface, ~SFLAG_INSYSMEM); } static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource) @@ -996,6 +998,7 @@ static void texture3d_sub_resource_load(struct wined3d_resource *sub_resource, static void texture3d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, const struct wined3d_box *dirty_region) { + wined3d_texture_set_dirty(volume_from_resource(sub_resource)->container); } static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource)
1
0
0
0
Henri Verbeet : wined3d: Just use surface_invalidate_location() in surface_map().
by Alexandre Julliard
25 Nov '13
25 Nov '13
Module: wine Branch: master Commit: 71b982d04053b51be6003b001c2c5b918e3ed381 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=71b982d04053b51be6003b001…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 25 12:31:20 2013 +0100 wined3d: Just use surface_invalidate_location() in surface_map(). --- dlls/wined3d/surface.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c947898..8d18c42 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -779,7 +779,6 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); surface_prepare_system_memory(surface); surface_validate_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); } else { @@ -789,6 +788,9 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD surface_load_location(surface, SFLAG_INSYSMEM); } + if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) + surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + if (surface->flags & SFLAG_PBO) { const struct wined3d_gl_info *gl_info; @@ -815,9 +817,6 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD context_release(context); } - - if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) - surface_set_dirty(surface); } static void surface_unmap(struct wined3d_surface *surface)
1
0
0
0
Henri Verbeet : wined3d: Just validate the sysmem location in surface_init( ).
by Alexandre Julliard
25 Nov '13
25 Nov '13
Module: wine Branch: master Commit: 82c1d0136458e5b056fd5cb2005c74ad41b3c2f1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=82c1d0136458e5b056fd5cb20…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 25 12:31:19 2013 +0100 wined3d: Just validate the sysmem location in surface_init(). This is all surface_set_dirty() really does here. --- dlls/wined3d/surface.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f456bb9..c947898 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6519,10 +6519,12 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text } surface_set_container(surface, container); + surface_validate_location(surface, SFLAG_INSYSMEM); + list_init(&surface->renderbuffers); list_init(&surface->overlays); /* Flags */ - surface->flags = SFLAG_NORMCOORD; /* Default to normalized coords. */ + surface->flags |= SFLAG_NORMCOORD; /* Default to normalized coords. */ if (flags & WINED3D_SURFACE_DISCARD) surface->flags |= SFLAG_DISCARD; if (flags & WINED3D_SURFACE_PIN_SYSMEM) @@ -6540,10 +6542,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text if (lockable && (desc->usage & WINED3DUSAGE_RENDERTARGET)) surface->flags |= SFLAG_DYNLOCK; - /* Mark the texture as dirty so that it gets loaded first time around. */ - surface_set_dirty(surface); - list_init(&surface->renderbuffers); - TRACE("surface %p, memory %p, size %u\n", surface, surface->resource.allocatedMemory, surface->resource.size);
1
0
0
0
Michael Stefaniuc : comctl32/tests: Make tab.c compile with -D__WINESRC__.
by Alexandre Julliard
25 Nov '13
25 Nov '13
Module: wine Branch: master Commit: c2d07d5cf49d880ece2efc98820573fe5859a721 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c2d07d5cf49d880ece2efc988…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 25 10:09:00 2013 +0100 comctl32/tests: Make tab.c compile with -D__WINESRC__. --- dlls/comctl32/tests/tab.c | 311 ++++++++++++++++++++++----------------------- 1 files changed, 149 insertions(+), 162 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2d07d5cf49d880ece2ef…
1
0
0
0
Nikolay Sivov : qmgr: Added parameter tracing for Job and Manager, make naming more compact.
by Alexandre Julliard
25 Nov '13
25 Nov '13
Module: wine Branch: master Commit: 15bfd4a925ff6d79305598422b248df11c0ae733 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=15bfd4a925ff6d79305598422…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 25 10:43:50 2013 +0400 qmgr: Added parameter tracing for Job and Manager, make naming more compact. --- dlls/qmgr/job.c | 278 +++++++++++++++++++++++++++++++----------------------- dlls/qmgr/qmgr.c | 46 +++++----- 2 files changed, 185 insertions(+), 139 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=15bfd4a925ff6d7930559…
1
0
0
0
Nikolay Sivov : qmgr: Implement IBackgroundCopyManager::GetJob().
by Alexandre Julliard
25 Nov '13
25 Nov '13
Module: wine Branch: master Commit: 421a26a9a855b36f1f92bd30db892afcffced048 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=421a26a9a855b36f1f92bd30d…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 25 10:43:29 2013 +0400 qmgr: Implement IBackgroundCopyManager::GetJob(). --- dlls/qmgr/qmgr.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index bb66410..adbc94b 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -74,10 +74,34 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob(IBackgroundCopyManag } static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob(IBackgroundCopyManager *iface, - REFGUID jobID, IBackgroundCopyJob **ppJob) + REFGUID jobID, IBackgroundCopyJob **job) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyManagerImpl *qmgr = &globalMgr; + HRESULT hr = BG_E_NOT_FOUND; + BackgroundCopyJobImpl *cur; + + TRACE("(%s %p)\n", debugstr_guid(jobID), job); + + if (!job || !jobID) return E_INVALIDARG; + + *job = NULL; + + EnterCriticalSection(&qmgr->cs); + + LIST_FOR_EACH_ENTRY(cur, &qmgr->jobs, BackgroundCopyJobImpl, entryFromQmgr) + { + if (IsEqualGUID(&cur->jobId, jobID)) + { + *job = (IBackgroundCopyJob*)&cur->IBackgroundCopyJob2_iface; + IBackgroundCopyJob2_AddRef(&cur->IBackgroundCopyJob2_iface); + hr = S_OK; + break; + } + } + + LeaveCriticalSection(&qmgr->cs); + + return hr; } static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs(IBackgroundCopyManager *iface,
1
0
0
0
Nikolay Sivov : qmgr/tests: Remove skips around tests that don't fail.
by Alexandre Julliard
25 Nov '13
25 Nov '13
Module: wine Branch: master Commit: cd777e54182fee4d31439bc981de0fb62368630e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cd777e54182fee4d31439bc98…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 25 10:43:11 2013 +0400 qmgr/tests: Remove skips around tests that don't fail. --- dlls/qmgr/tests/job.c | 90 ++++++------------------------------------------- 1 files changed, 11 insertions(+), 79 deletions(-) diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index f972547..1979140 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -136,11 +136,6 @@ static void test_GetId(void) hres = IBackgroundCopyJob_GetId(test_job, &tmpId); ok(hres == S_OK, "GetId failed: %08x\n", hres); - if(hres != S_OK) - { - skip("Unable to get ID of test_job.\n"); - return; - } ok(memcmp(&tmpId, &test_jobId, sizeof tmpId) == 0, "Got incorrect GUID\n"); } @@ -152,11 +147,6 @@ static void test_GetType(void) hres = IBackgroundCopyJob_GetType(test_job, &type); ok(hres == S_OK, "GetType failed: %08x\n", hres); - if(hres != S_OK) - { - skip("Unable to get type of test_job.\n"); - return; - } ok(type == test_type, "Got incorrect type\n"); } @@ -168,11 +158,6 @@ static void test_GetName(void) hres = IBackgroundCopyJob_GetDisplayName(test_job, &displayName); ok(hres == S_OK, "GetName failed: %08x\n", hres); - if(hres != S_OK) - { - skip("Unable to get display name of test_job.\n"); - return; - } ok(lstrcmpW(displayName, test_displayName) == 0, "Got incorrect type\n"); CoTaskMemFree(displayName); } @@ -185,11 +170,6 @@ static void test_AddFile(void) hres = IBackgroundCopyJob_AddFile(test_job, test_remotePathA, test_localPathA); ok(hres == S_OK, "First call to AddFile failed: 0x%08x\n", hres); - if (hres != S_OK) - { - skip("Unable to add first file to job\n"); - return; - } hres = IBackgroundCopyJob_AddFile(test_job, test_remotePathB, test_localPathB); @@ -218,19 +198,10 @@ static void test_EnumFiles(void) hres = IBackgroundCopyJob_AddFile(test_job, test_remotePathA, test_localPathA); - if (hres != S_OK) - { - skip("Unable to add file to job\n"); - return; - } + ok(hres == S_OK, "got 0x%08x\n", hres); hres = IBackgroundCopyJob_EnumFiles(test_job, &enumFiles); ok(hres == S_OK, "EnumFiles failed: 0x%08x\n", hres); - if(hres != S_OK) - { - skip("Unable to create file enumerator.\n"); - return; - } res = IEnumBackgroundCopyFiles_Release(enumFiles); ok(res == 0, "Bad ref count on release: %u\n", res); @@ -244,12 +215,6 @@ static void test_GetProgress_preTransfer(void) hres = IBackgroundCopyJob_GetProgress(test_job, &progress); ok(hres == S_OK, "GetProgress failed: 0x%08x\n", hres); - if (hres != S_OK) - { - skip("Unable to get job progress\n"); - teardown(); - return; - } ok(progress.BytesTotal == 0, "Incorrect BytesTotal: %x%08x\n", (DWORD)(progress.BytesTotal >> 32), (DWORD)progress.BytesTotal); @@ -268,11 +233,6 @@ static void test_GetState(void) state = BG_JOB_STATE_ERROR; hres = IBackgroundCopyJob_GetState(test_job, &state); ok(hres == S_OK, "GetState failed: 0x%08x\n", hres); - if (hres != S_OK) - { - skip("Unable to get job state\n"); - return; - } ok(state == BG_JOB_STATE_SUSPENDED, "Incorrect job state: %d\n", state); } @@ -284,19 +244,10 @@ static void test_ResumeEmpty(void) hres = IBackgroundCopyJob_Resume(test_job); ok(hres == BG_E_EMPTY, "Resume failed to return BG_E_EMPTY error: 0x%08x\n", hres); - if (hres != BG_E_EMPTY) - { - skip("Failed calling resume job\n"); - return; - } state = BG_JOB_STATE_ERROR; hres = IBackgroundCopyJob_GetState(test_job, &state); - if (hres != S_OK) - { - skip("Unable to get job state\n"); - return; - } + ok(hres == S_OK, "got 0x%08x\n", hres); ok(state == BG_JOB_STATE_SUSPENDED, "Incorrect job state: %d\n", state); } @@ -354,19 +305,11 @@ static void test_CompleteLocal(void) hres = IBackgroundCopyJob_AddFile(test_job, test_remotePathA, test_localPathA); - if (hres != S_OK) - { - skip("Unable to add file to job\n"); - return; - } + ok(hres == S_OK, "got 0x%08x\n", hres); hres = IBackgroundCopyJob_AddFile(test_job, test_remotePathB, test_localPathB); - if (hres != S_OK) - { - skip("Unable to add file to job\n"); - return; - } + ok(hres == S_OK, "got 0x%08x\n", hres); hres = IBackgroundCopyJob_Resume(test_job); ok(hres == S_OK, "IBackgroundCopyJob_Resume\n"); @@ -432,22 +375,10 @@ static void test_CompleteLocalURL(void) lstrcatW(urlB, test_remotePathB); hres = IBackgroundCopyJob_AddFile(test_job, urlA, test_localPathA); - if (hres != S_OK) - { - skip("Unable to add file to job\n"); - HeapFree(GetProcessHeap(), 0, urlA); - HeapFree(GetProcessHeap(), 0, urlB); - return; - } + ok(hres == S_OK, "got 0x%08x\n", hres); hres = IBackgroundCopyJob_AddFile(test_job, urlB, test_localPathB); - if (hres != S_OK) - { - skip("Unable to add file to job\n"); - HeapFree(GetProcessHeap(), 0, urlA); - HeapFree(GetProcessHeap(), 0, urlB); - return; - } + ok(hres == S_OK, "got 0x%08x\n", hres); hres = IBackgroundCopyJob_Resume(test_job); ok(hres == S_OK, "IBackgroundCopyJob_Resume\n"); @@ -505,17 +436,18 @@ START_TEST(job) 0 }; const test_t *test; + int i; init_paths(); CoInitialize(NULL); - for (test = tests; *test; ++test) + for (test = tests, i = 0; *test; ++test, ++i) { /* Keep state separate between tests. */ if (!setup()) { - skip("Unable to setup test\n"); + ok(0, "tests:%d: Unable to setup test\n", i); break; } (*test)(); @@ -524,12 +456,12 @@ START_TEST(job) if (check_bits20()) { - for (test = tests_bits20; *test; ++test) + for (test = tests_bits20, i = 0; *test; ++test, ++i) { /* Keep state separate between tests. */ if (!setup()) { - skip("Unable to setup test\n"); + ok(0, "tests_bits20:%d: Unable to setup test\n", i); break; } (*test)();
1
0
0
0
Nikolay Sivov : qmgr: Implement IBackgroundCopyJob::GetDescription().
by Alexandre Julliard
25 Nov '13
25 Nov '13
Module: wine Branch: master Commit: b8771368c6d12f6e128a04490a8ea4b54a03da7e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b8771368c6d12f6e128a04490…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 25 10:42:50 2013 +0400 qmgr: Implement IBackgroundCopyJob::GetDescription(). --- dlls/qmgr/job.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index a395ec6..d66ccc7 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -34,6 +34,23 @@ static inline BOOL is_job_done(const BackgroundCopyJobImpl *job) return job->state == BG_JOB_STATE_CANCELLED || job->state == BG_JOB_STATE_ACKNOWLEDGED; } +static HRESULT return_strval(const WCHAR *str, WCHAR **ret) +{ + int len; + + if (!ret) return E_INVALIDARG; + + len = strlenW(str); + *ret = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); + if (!*ret) return E_OUTOFMEMORY; + + if (len) + strcpyW(*ret, str); + else + **ret = 0; + return S_OK; +} + static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob2(IBackgroundCopyJob2 *iface) { return CONTAINING_RECORD(iface, BackgroundCopyJobImpl, IBackgroundCopyJob2_iface); @@ -313,17 +330,10 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetDisplayName( LPWSTR *pVal) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); - int n; - if (!pVal) - return E_INVALIDARG; + TRACE("(%p)->(%p)\n", This, pVal); - n = (strlenW(This->displayName) + 1) * sizeof **pVal; - *pVal = CoTaskMemAlloc(n); - if (*pVal == NULL) - return E_OUTOFMEMORY; - memcpy(*pVal, This->displayName, n); - return S_OK; + return return_strval(This->displayName, pVal); } static HRESULT WINAPI BITS_IBackgroundCopyJob_SetDescription( @@ -366,8 +376,11 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetDescription( IBackgroundCopyJob2 *iface, LPWSTR *pVal) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); + + TRACE("(%p)->(%p)\n", This, pVal); + + return return_strval(This->description, pVal); } static HRESULT WINAPI BITS_IBackgroundCopyJob_SetPriority(
1
0
0
0
← Newer
1
...
6
7
8
9
10
11
12
...
57
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
Results per page:
10
25
50
100
200