August 2013 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Implement sRGB for volumes.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 6bc3cbf1c57d59368af6930aa25243fc074f4345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc3cbf1c57d59368af6930aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 26 02:01:29 2013 +0200 wined3d: Implement sRGB for volumes. --- dlls/wined3d/texture.c | 54 +++++++-------------- dlls/wined3d/utils.c | 1 + dlls/wined3d/volume.c | 102 ++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 4 +- 4 files changed, 104 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bc3cbf1c57d59368af69…

1 0

Stefan Dösinger : wined3d: UpdateTexture requires a sysmem source and default destination.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 9fbc90b8e3763eef9d5bdb8de85276b4573d694e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fbc90b8e3763eef9d5bdb8de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 26 02:01:30 2013 +0200 wined3d: UpdateTexture requires a sysmem source and default destination. --- dlls/wined3d/device.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a0db7c7..79a957b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4131,9 +4131,14 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - if (src_texture == dst_texture) + if (src_texture->resource.pool != WINED3D_POOL_SYSTEM_MEM) { - WARN("Source and destination are the same object, returning WINED3DERR_INVALIDCALL.\n"); + WARN("Source texture not in WINED3D_POOL_SYSTEM_MEM, returning WINED3DERR_INVALIDCALL.\n"); + return WINED3DERR_INVALIDCALL; + } + if (dst_texture->resource.pool != WINED3D_POOL_DEFAULT) + { + WARN("Destination texture not in WINED3D_POOL_DEFAULT, returning WINED3DERR_INVALIDCALL.\n"); return WINED3DERR_INVALIDCALL; }

1 0

Stefan Dösinger : wined3d: Check volume formats and sizes in device_update_volume.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 1bd6710b6ff077ed3647850ec3149134dccad642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd6710b6ff077ed3647850ec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 26 02:01:31 2013 +0200 wined3d: Check volume formats and sizes in device_update_volume. --- dlls/wined3d/device.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 79a957b..18dcae4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4096,6 +4096,19 @@ static HRESULT device_update_volume(struct wined3d_device *device, TRACE("device %p, src_volume %p, dst_volume %p.\n", device, src_volume, dst_volume); + if (src_volume->resource.format != dst_volume->resource.format) + { + FIXME("Source and destination formats do not match.\n"); + return WINED3DERR_INVALIDCALL; + } + if (src_volume->resource.width != dst_volume->resource.width + || src_volume->resource.height != dst_volume->resource.height + || src_volume->resource.depth != dst_volume->resource.depth) + { + FIXME("Source and destination sizes do not match.\n"); + return WINED3DERR_INVALIDCALL; + } + if (FAILED(hr = wined3d_volume_map(src_volume, &src, NULL, WINED3D_MAP_READONLY))) return hr;

1 0

Stefan Dösinger : wined3d: Disallow MANAGED or SCRATCH pool dynamic volumes.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: e69670f76b009a161d04cc13f36cdbaaddc93082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69670f76b009a161d04cc13f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 26 02:01:32 2013 +0200 wined3d: Disallow MANAGED or SCRATCH pool dynamic volumes. --- dlls/wined3d/volume.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9f49f87..c472b3c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -676,6 +676,14 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device WARN("Volume cannot be created - no volume texture support.\n"); return WINED3DERR_INVALIDCALL; } + /* TODO: Write tests for other resources and move this check + * to resource_init, if applicable. */ + if (usage & WINED3DUSAGE_DYNAMIC + && (pool == WINED3D_POOL_MANAGED || pool == WINED3D_POOL_SCRATCH)) + { + WARN("Attempted to create a DYNAMIC texture in pool %u.\n", pool); + return WINED3DERR_INVALIDCALL; + } size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, depth);

1 0

Alexandre Julliard : server: Don' t include SYNCHRONIZE in the keyed event access rights.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 33406f51beabbe799f34483b085718bdad8ca942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33406f51beabbe799f34483b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 23 14:39:49 2013 +0200 server: Don't include SYNCHRONIZE in the keyed event access rights. --- server/event.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/event.c b/server/event.c index 7b150f5..3b052b8 100644 --- a/server/event.c +++ b/server/event.c @@ -103,7 +103,7 @@ static const struct object_ops keyed_event_ops = #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 -#define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x0003) +#define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003) struct event *create_event( struct directory *root, const struct unicode_str *name, @@ -252,10 +252,10 @@ static int keyed_event_signaled( struct object *obj, struct thread *thread ) static unsigned int keyed_event_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE | KEYEDEVENT_WAIT; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | KEYEDEVENT_WAIT; if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | KEYEDEVENT_WAKE; if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; - if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | KEYEDEVENT_ALL_ACCESS; + if (access & GENERIC_ALL) access |= KEYEDEVENT_ALL_ACCESS; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

Alexandre Julliard : server: Map new handle access even when not checking it.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 4654d871b2cf4e1779fe3dbfdbc8bf96d72e943b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4654d871b2cf4e1779fe3dbfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 26 14:00:30 2013 +0200 server: Map new handle access even when not checking it. --- server/handle.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/server/handle.c b/server/handle.c index 28c49c2..0293ed6 100644 --- a/server/handle.c +++ b/server/handle.c @@ -235,12 +235,12 @@ static obj_handle_t alloc_entry( struct handle_table *table, void *obj, unsigned } /* allocate a handle for an object, incrementing its refcount */ -/* return the handle, or 0 on error */ -obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr ) +static obj_handle_t alloc_handle_entry( struct process *process, void *ptr, + unsigned int access, unsigned int attr ) { struct object *obj = ptr; - access &= ~RESERVED_ALL; + assert( !(access & RESERVED_ALL) ); if (attr & OBJ_INHERIT) access |= RESERVED_INHERIT; if (!process->handles) { @@ -250,15 +250,24 @@ obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, u return alloc_entry( process->handles, obj, access ); } +/* allocate a handle for an object, incrementing its refcount */ +/* return the handle, or 0 on error */ +obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr ) +{ + struct object *obj = ptr; + access = obj->ops->map_access( obj, access ) & ~RESERVED_ALL; + return alloc_handle_entry( process, ptr, access, attr ); +} + /* allocate a handle for an object, checking the dacl allows the process to */ /* access it and incrementing its refcount */ /* return the handle, or 0 on error */ obj_handle_t alloc_handle( struct process *process, void *ptr, unsigned int access, unsigned int attr ) { struct object *obj = ptr; - access = obj->ops->map_access( obj, access ); + access = obj->ops->map_access( obj, access ) & ~RESERVED_ALL; if (access && !check_object_access( obj, &access )) return 0; - return alloc_handle_no_access_check( process, ptr, access, attr ); + return alloc_handle_entry( process, ptr, access, attr ); } /* allocate a global handle for an object, incrementing its refcount */ @@ -539,7 +548,7 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str res = src_handle; } else - res = alloc_handle_no_access_check( dst, obj, access, attr ); + res = alloc_handle_entry( dst, obj, access, attr ); } release_object( obj );

1 0

Andrew Cook : ntdll: Implement NtQueryEvent.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: cdfee68be1886f78602cef140a762b2ceb95ec61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdfee68be1886f78602cef140… Author: Andrew Cook <ariscop(a)gmail.com> Date: Mon Aug 26 19:52:51 2013 +1000 ntdll: Implement NtQueryEvent. --- dlls/ntdll/sync.c | 35 ++++++++++++++++++++++++------- dlls/ntdll/tests/om.c | 45 ++++++++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 16 +++++++++++++- server/event.c | 13 +++++++++++ server/protocol.def | 6 +++++ server/request.h | 7 ++++++ server/trace.c | 14 ++++++++++++ 7 files changed, 127 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdfee68be1886f78602ce…

1 0

Nikolay Sivov : browseui/tests: Call methods using helpers instead of direct vtbl access.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 2a1513415dee0b10e1605889d2145395e2a3dd11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1513415dee0b10e1605889d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 24 08:38:06 2013 +0400 browseui/tests: Call methods using helpers instead of direct vtbl access. --- dlls/browseui/tests/autocomplete.c | 113 ++++++++++++++++++++++-------------- 1 files changed, 69 insertions(+), 44 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index 120a5b0..e7da647 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include <initguid.h> @@ -28,16 +30,6 @@ #include "wine/test.h" -#define stop_on_error(exp) \ -{ \ - HRESULT res = (exp); \ - if (FAILED(res)) \ - { \ - ok(FALSE, #exp " failed: %x\n", res); \ - return; \ - } \ -} - #define ole_ok(exp) \ { \ HRESULT res = (exp); \ @@ -123,7 +115,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFI if (*ppvOut) { - iface->lpVtbl->AddRef(iface); + IEnumString_AddRef(iface); return S_OK; } @@ -222,14 +214,14 @@ IACListVtbl TestACL_ACListVtbl = #define expect_str(obj, str) \ { \ - ole_ok(obj->lpVtbl->Next(obj, 1, &wstr, &i)); \ + ole_ok(IEnumString_Next(obj, 1, &wstr, &i)); \ ok(i == 1, "Expected i == 1, got %d\n", i); \ ok(str[0] == wstr[0], "String mismatch\n"); \ CoTaskMemFree(wstr); \ } #define expect_end(obj) \ - ok(obj->lpVtbl->Next(obj, 1, &wstr, &i) == S_FALSE, "Unexpected return from Next\n"); + ok(IEnumString_Next(obj, 1, &wstr, &i) == S_FALSE, "Unexpected return from Next\n"); static void test_ACLMulti(void) { @@ -245,36 +237,51 @@ static void test_ACLMulti(void) LPWSTR wstr; LPWSTR wstrtab[15]; LPVOID tmp; + ULONG ref; UINT i; - stop_on_error(CoCreateInstance(&CLSID_ACLMulti, NULL, CLSCTX_INPROC, &IID_IEnumString, (LPVOID *)&obj)); - stop_on_error(obj->lpVtbl->QueryInterface(obj, &IID_IACList, (LPVOID *)&acl)); - ok(obj->lpVtbl->QueryInterface(obj, &IID_IACList2, &tmp) == E_NOINTERFACE, - "Unexpected interface IACList2 in ACLMulti\n"); - stop_on_error(obj->lpVtbl->QueryInterface(obj, &IID_IObjMgr, (LPVOID *)&mgr)); + hr = CoCreateInstance(&CLSID_ACLMulti, NULL, CLSCTX_INPROC, &IID_IEnumString, (void**)&obj); + ok(hr == S_OK, "failed to create ACLMulti instance, 0x%08x\n", hr); + if (hr != S_OK) return; - hr = obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk); + hr = IEnumString_QueryInterface(obj, &IID_IACList, (void**)&acl); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IEnumString_QueryInterface(obj, &IID_IACList2, &tmp); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IEnumString_QueryInterface(obj, &IID_IObjMgr, (void**)&mgr); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumString_QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk); if (hr == E_NOINTERFACE) todo_wine win_skip("IEnumACString is not supported, skipping tests\n"); else { ok(hr == S_OK, "QueryInterface(IID_IEnumACString) failed: %x\n", hr); if (unk != NULL) - unk->lpVtbl->Release(unk); + IEnumACString_Release(unk); } - ok(obj->lpVtbl->Next(obj, 1, (LPOLESTR *)&tmp, &i) == S_FALSE, "Unexpected return from Next\n"); + i = -1; + hr = IEnumString_Next(obj, 1, (LPOLESTR *)&tmp, &i); + ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(i == 0, "Unexpected fetched value %d\n", i); - ok(obj->lpVtbl->Next(obj, 44, (LPOLESTR *)&tmp, &i) == S_FALSE, "Unexpected return from Next\n"); - ok(obj->lpVtbl->Skip(obj, 1) == E_NOTIMPL, "Unexpected return from Skip\n"); - ok(obj->lpVtbl->Clone(obj, (IEnumString **)&tmp) == E_OUTOFMEMORY, "Unexpected return from Clone\n"); - ole_ok(acl->lpVtbl->Expand(acl, exp)); + hr = IEnumString_Next(obj, 44, (LPOLESTR *)&tmp, &i); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + hr = IEnumString_Skip(obj, 1); + ok(hr == E_NOTIMPL, "got 0x%08x\n", hr); + hr = IEnumString_Clone(obj, (IEnumString **)&tmp); + ok(hr == E_OUTOFMEMORY, "got 0x%08x\n", hr); + hr = IACList_Expand(acl, exp); + ok(hr == S_OK, "got 0x%08x\n", hr); acl1 = TestACL_Constructor(3, strings1); acl2 = TestACL_Constructor(3, strings2); - stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)&acl1->IACList_iface)); - stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)&acl2->IACList_iface)); - ok(mgr->lpVtbl->Append(mgr, NULL) == E_FAIL, "Unexpected return from Append\n"); + hr = IObjMgr_Append(mgr, (IUnknown *)&acl1->IACList_iface); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IObjMgr_Append(mgr, (IUnknown *)&acl2->IACList_iface); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IObjMgr_Append(mgr, NULL); + ok(hr == E_FAIL, "got 0x%08x\n", hr); expect_str(obj, "a"); expect_str(obj, "c"); expect_str(obj, "e"); @@ -283,55 +290,73 @@ static void test_ACLMulti(void) expect_str(obj, "d"); expect_end(obj); - ole_ok(obj->lpVtbl->Reset(obj)); + hr = IEnumString_Reset(obj); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(acl1->pos == 0, "acl1 not reset\n"); ok(acl2->pos == 0, "acl2 not reset\n"); - ole_ok(acl->lpVtbl->Expand(acl, exp)); + hr = IACList_Expand(acl, exp); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(acl1->expcount == 1, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 1 /* Vista */, "expcount - expected 0 or 1, got %d\n", acl2->expcount); - ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); + hr = IEnumString_Next(obj, 15, wstrtab, &i); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(i == 1, "Expected i == 1, got %d\n", i); CoTaskMemFree(wstrtab[0]); - ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); + + hr = IEnumString_Next(obj, 15, wstrtab, &i); + ok(hr == S_OK, "got 0x%08x\n", hr); CoTaskMemFree(wstrtab[0]); - ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); + + hr = IEnumString_Next(obj, 15, wstrtab, &i); + ok(hr == S_OK, "got 0x%08x\n", hr); CoTaskMemFree(wstrtab[0]); - ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); + + hr = IEnumString_Next(obj, 15, wstrtab, &i); + ok(hr == S_OK, "got 0x%08x\n", hr); CoTaskMemFree(wstrtab[0]); - ole_ok(acl->lpVtbl->Expand(acl, exp)); + + hr = IACList_Expand(acl, exp); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(acl1->expcount == 2, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 2 /* Vista */, "expcount - expected 0 or 2, got %d\n", acl2->expcount); acl1->expret = S_FALSE; - ole_ok(acl->lpVtbl->Expand(acl, exp)); + hr = IACList_Expand(acl, exp); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(acl1->expcount == 3, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 1 /* XP */ || acl2->expcount == 3 /* Vista */, "expcount - expected 0 or 3, got %d\n", acl2->expcount); acl1->expret = E_NOTIMPL; - ole_ok(acl->lpVtbl->Expand(acl, exp)); + hr = IACList_Expand(acl, exp); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(acl1->expcount == 4, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 2 /* XP */ || acl2->expcount == 4 /* Vista */, "expcount - expected 0 or 4, got %d\n", acl2->expcount); acl2->expret = E_OUTOFMEMORY; - ok(acl->lpVtbl->Expand(acl, exp) == E_OUTOFMEMORY, "Unexpected Expand return\n"); + hr = IACList_Expand(acl, exp); + ok(hr == E_OUTOFMEMORY, "got 0x%08x\n", hr); acl2->expret = E_FAIL; - ok(acl->lpVtbl->Expand(acl, exp) == E_FAIL, "Unexpected Expand return\n"); + hr = IACList_Expand(acl, exp); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + + hr = IObjMgr_Remove(mgr, (IUnknown *)&acl1->IACList_iface); + ok(hr == S_OK, "got 0x%08x\n", hr); - stop_on_error(mgr->lpVtbl->Remove(mgr, (IUnknown *)&acl1->IACList_iface)); ok(acl1->ref == 1, "acl1 not released\n"); expect_end(obj); - obj->lpVtbl->Reset(obj); + IEnumString_Reset(obj); expect_str(obj, "a"); expect_str(obj, "b"); expect_str(obj, "d"); expect_end(obj); - obj->lpVtbl->Release(obj); - acl->lpVtbl->Release(acl); - ok(mgr->lpVtbl->Release(mgr) == 0, "Unexpected references\n"); + IEnumString_Release(obj); + IACList_Release(acl); + ref = IObjMgr_Release(mgr); + ok(ref == 0, "Unexpected references\n"); ok(acl1->ref == 1, "acl1 not released\n"); ok(acl2->ref == 1, "acl2 not released\n");

1 0

Nikolay Sivov : ole32: Release marshal info on error path.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 4d565644b63ec45a79cd71ea20950b9061d5fcdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d565644b63ec45a79cd71ea2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 25 15:40:36 2013 +0400 ole32: Release marshal info on error path. --- dlls/ole32/git.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index 4d44e39..b83d415 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -180,7 +180,12 @@ StdGlobalInterfaceTable_RegisterInterfaceInGlobal( IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); entry = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGITEntry)); - if (entry == NULL) return E_OUTOFMEMORY; + if (!entry) + { + CoReleaseMarshalData(stream); + IStream_Release(stream); + return E_OUTOFMEMORY; + } EnterCriticalSection(&git_section);

1 0

Nikolay Sivov : oledb32: Implement SetRowPosition().
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 0988938d0fd692e6de2856222f947b75f460d830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0988938d0fd692e6de2856222… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 26 08:47:28 2013 +0400 oledb32: Implement SetRowPosition(). --- dlls/oledb32/rowpos.c | 66 ++++++++++++++++++++++++++++++++++++++-- dlls/oledb32/tests/database.c | 36 +++++++++++++++++----- 2 files changed, 90 insertions(+), 12 deletions(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index 2b932c9..c1cee12 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -47,9 +47,11 @@ struct rowpos LONG ref; IRowset *rowset; + IChapteredRowset *chrst; HROW row; HCHAPTER chapter; DBPOSITIONFLAGS flags; + BOOL cleared; rowpos_cp cp; }; @@ -72,13 +74,14 @@ static inline rowpos_cp *impl_from_IConnectionPoint(IConnectionPoint *iface) static HRESULT rowpos_fireevent(rowpos *rp, DBREASON reason, DBEVENTPHASE phase) { + BOOL cant_deny = phase == DBEVENTPHASE_FAILEDTODO || phase == DBEVENTPHASE_SYNCHAFTER; HRESULT hr = S_OK; DWORD i; for (i = 0; i < rp->cp.sinks_size; i++) if (rp->cp.sinks[i]) { - hr = IRowPositionChange_OnRowPositionChange(rp->cp.sinks[i], reason, phase, phase == DBEVENTPHASE_FAILEDTODO); + hr = IRowPositionChange_OnRowPositionChange(rp->cp.sinks[i], reason, phase, cant_deny); if (phase == DBEVENTPHASE_FAILEDTODO) return DB_E_CANCELED; if (hr != S_OK) return hr; } @@ -88,6 +91,14 @@ static HRESULT rowpos_fireevent(rowpos *rp, DBREASON reason, DBEVENTPHASE phase) static void rowpos_clearposition(rowpos *rp) { + if (!rp->cleared) + { + if (rp->rowset) + IRowset_ReleaseRows(rp->rowset, 1, &rp->row, NULL, NULL, NULL); + if (rp->chrst) + IChapteredRowset_ReleaseChapter(rp->chrst, rp->chapter, NULL); + } + rp->row = DB_NULL_HROW; rp->chapter = DB_NULL_HCHAPTER; rp->flags = DBPOSITION_NOROW; @@ -138,6 +149,7 @@ static ULONG WINAPI rowpos_Release(IRowPosition* iface) if (ref == 0) { if (This->rowset) IRowset_Release(This->rowset); + if (This->chrst) IChapteredRowset_Release(This->chrst); rowposchange_cp_destroy(&This->cp); heap_free(This); } @@ -163,6 +175,7 @@ static HRESULT WINAPI rowpos_ClearRowPosition(IRowPosition* iface) return rowpos_fireevent(This, DBREASON_ROWPOSITION_CLEARED, DBEVENTPHASE_FAILEDTODO); rowpos_clearposition(This); + This->cleared = TRUE; return S_OK; } @@ -195,20 +208,63 @@ static HRESULT WINAPI rowpos_GetRowset(IRowPosition *iface, REFIID riid, IUnknow static HRESULT WINAPI rowpos_Initialize(IRowPosition *iface, IUnknown *rowset) { rowpos *This = impl_from_IRowPosition(iface); + HRESULT hr; TRACE("(%p)->(%p)\n", This, rowset); if (This->rowset) return DB_E_ALREADYINITIALIZED; - return IUnknown_QueryInterface(rowset, &IID_IRowset, (void**)&This->rowset); + hr = IUnknown_QueryInterface(rowset, &IID_IRowset, (void**)&This->rowset); + if (FAILED(hr)) return hr; + + /* this one is optional */ + IUnknown_QueryInterface(rowset, &IID_IChapteredRowset, (void**)&This->chrst); + return S_OK; } static HRESULT WINAPI rowpos_SetRowPosition(IRowPosition *iface, HCHAPTER chapter, HROW row, DBPOSITIONFLAGS flags) { rowpos *This = impl_from_IRowPosition(iface); - FIXME("(%p)->(%lx %lx %d): stub\n", This, chapter, row, flags); - return E_NOTIMPL; + DBREASON reason; + HRESULT hr; + + TRACE("(%p)->(%lx %lx %d)\n", This, chapter, row, flags); + + if (!This->cleared) return E_UNEXPECTED; + + hr = IRowset_AddRefRows(This->rowset, 1, &row, NULL, NULL); + if (FAILED(hr)) return hr; + + if (This->chrst) + { + hr = IChapteredRowset_AddRefChapter(This->chrst, chapter, NULL); + if (FAILED(hr)) + { + IRowset_ReleaseRows(This->rowset, 1, &row, NULL, NULL, NULL); + return hr; + } + } + + reason = This->chrst ? DBREASON_ROWPOSITION_CHAPTERCHANGED : DBREASON_ROWPOSITION_CHANGED; + hr = rowpos_fireevent(This, reason, DBEVENTPHASE_SYNCHAFTER); + if (hr != S_OK) + { + IRowset_ReleaseRows(This->rowset, 1, &row, NULL, NULL, NULL); + if (This->chrst) + IChapteredRowset_ReleaseChapter(This->chrst, chapter, NULL); + return rowpos_fireevent(This, reason, DBEVENTPHASE_FAILEDTODO); + } + else + rowpos_fireevent(This, reason, DBEVENTPHASE_DIDEVENT); + + /* previously set chapter and row are released with ClearRowPosition() */ + This->chapter = chapter; + This->row = row; + This->flags = flags; + This->cleared = FALSE; + + return S_OK; } static const struct IRowPositionVtbl rowpos_vtbl = @@ -434,6 +490,8 @@ HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) This->IConnectionPointContainer_iface.lpVtbl = &rowpos_cpc_vtbl; This->ref = 1; This->rowset = NULL; + This->chrst = NULL; + This->cleared = FALSE; rowpos_clearposition(This); rowposchange_cp_init(&This->cp, This); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 7801bf8..d0eb9ff 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -317,8 +317,8 @@ static ULONG WINAPI rset_Release(IRowset *iface) static HRESULT WINAPI rset_AddRefRows(IRowset *iface, DBCOUNTITEM cRows, const HROW rghRows[], DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + trace("AddRefRows: %ld\n", rghRows[0]); + return S_OK; } static HRESULT WINAPI rset_GetData(IRowset *iface, HROW hRow, HACCESSOR hAccessor, void *pData) @@ -337,8 +337,7 @@ static HRESULT WINAPI rset_GetNextRows(IRowset *iface, HCHAPTER hReserved, DBROW static HRESULT WINAPI rset_ReleaseRows(IRowset *iface, DBCOUNTITEM cRows, const HROW rghRows[], DBROWOPTIONS rgRowOptions[], DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI rset_RestartPosition(IRowset *iface, HCHAPTER hReserved) @@ -375,14 +374,12 @@ static ULONG WINAPI chrset_Release(IChapteredRowset *iface) static HRESULT WINAPI chrset_AddRefChapter(IChapteredRowset *iface, HCHAPTER chapter, DBREFCOUNT *refcount) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI chrset_ReleaseChapter(IChapteredRowset *iface, HCHAPTER chapter, DBREFCOUNT *refcount) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + return S_OK; } static const IChapteredRowsetVtbl chrset_vtbl = { @@ -528,6 +525,28 @@ static void test_rowpos_clearrowposition(void) IRowPosition_Release(rowpos); } +static void test_rowpos_setrowposition(void) +{ + IRowPosition *rowpos; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_OLEDB_ROWPOSITIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IRowPosition, (void**)&rowpos); + ok(hr == S_OK, "got %08x\n", hr); + + init_test_rset(); + hr = IRowPosition_Initialize(rowpos, (IUnknown*)&test_rset.IRowset_iface); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IRowPosition_ClearRowPosition(rowpos); + ok(hr == S_OK, "got %08x\n", hr); + + init_onchange_sink(rowpos); + hr = IRowPosition_SetRowPosition(rowpos, 0x123, 0x456, DBPOSITION_OK); + ok(hr == S_OK, "got %08x\n", hr); + + IRowPosition_Release(rowpos); +} + START_TEST(database) { OleInitialize(NULL); @@ -540,6 +559,7 @@ START_TEST(database) test_rowposition(); test_rowpos_initialize(); test_rowpos_clearrowposition(); + test_rowpos_setrowposition(); OleUninitialize(); }

1 0