November 2013 - Wine-commits

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

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

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

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

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

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

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

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

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

Jacek Caban : vbscript: Added support for VT_BYREF|VT_VARIANT to to_int.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: d22252198949d3bf5fd3df77fa686adb8202a390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22252198949d3bf5fd3df77f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 22 16:48:23 2013 +0100 vbscript: Added support for VT_BYREF|VT_VARIANT to to_int. --- dlls/vbscript/global.c | 3 +++ dlls/vbscript/tests/lang.vbs | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5088e59..9d8f021 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -152,6 +152,9 @@ static inline HRESULT return_date(VARIANT *res, double date) HRESULT to_int(VARIANT *v, int *ret) { + if(V_VT(v) == (VT_BYREF|VT_VARIANT)) + v = V_VARIANTREF(v); + switch(V_VT(v)) { case VT_I2: *ret = V_I2(v); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index f4b0255..06d0284 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -964,7 +964,6 @@ Class Property2 Function Property() End Function - Sub Test(property) End Sub @@ -1042,4 +1041,7 @@ for x=1 to 1 forarr(1) = x+1 next +x=1 +Call ok(forarr(x) = 2, "forarr(x) = " & forarr(x)) + reportSuccess()

1 0