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

Nikolay Sivov : ole32/tests: Test for OleRegGetMiscStatus() redirection behaviour.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 15bc45a54cf1e5f02125e21973b6346871dccd9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bc45a54cf1e5f02125e2197… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 25 21:16:25 2013 +0400 ole32/tests: Test for OleRegGetMiscStatus() redirection behaviour. --- dlls/ole32/tests/compobj.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 5f5ab77..c81a017 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -220,9 +220,12 @@ static const char actctx_manifest[] = " <comClass description=\"Test com class\"" " clsid=\"{12345678-1234-1234-1234-56789abcdef0}\"" " progid=\"ProgId.ProgId\"" +" miscStatusIcon=\"recomposeonresize\"" " />" " <comClass clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb851}\"" " progid=\"CustomFont\"" +" miscStatusIcon=\"recomposeonresize\"" +" miscStatusContent=\"insideout\"" " />" " <comClass clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb852}\"" " progid=\"StdFont\"" @@ -230,6 +233,8 @@ static const char actctx_manifest[] = "</file>" "</assembly>"; +DEFINE_GUID(CLSID_Testclass, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0); + static void test_ProgIDFromCLSID(void) { ULONG_PTR cookie = 0; @@ -1720,6 +1725,30 @@ static void test_CoInitializeEx(void) OleUninitialize(); } +static void test_OleRegGetMiscStatus(void) +{ + ULONG_PTR cookie; + HANDLE handle; + DWORD status; + HRESULT hr; + + hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_ICON, &status); + ok(hr == REGDB_E_CLASSNOTREG, "got 0x%08x\n", hr); + + if ((handle = activate_context(actctx_manifest, &cookie))) + { + + status = 0; + hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_ICON, &status); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(status == OLEMISC_RECOMPOSEONRESIZE, "got 0x%08x\n", status); +} + pDeactivateActCtx(0, cookie); + pReleaseActCtx(handle); + } +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -1771,4 +1800,5 @@ START_TEST(compobj) test_CoGetContextToken(); test_CoGetTreatAsClass(); test_CoInitializeEx(); + test_OleRegGetMiscStatus(); }

1 0

Piotr Caban : msvcrt: Fix parameter validation in _stat64 function.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 024ece50e8a42b62800f899343b8330b5d831e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024ece50e8a42b62800f89934… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 26 13:29:27 2013 +0200 msvcrt: Fix parameter validation in _stat64 function. --- dlls/msvcrt/file.c | 6 ++++-- dlls/msvcrt/tests/file.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0054222..1594c33 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2684,7 +2684,8 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf) while (plen && path[plen-1]==' ') plen--; - if (plen && (path[plen-1]=='\\' || path[plen-1]=='/')) + if (plen && (plen<2 || path[plen-2]!=':') && + (path[plen-1]==':' || path[plen-1]=='\\' || path[plen-1]=='/')) { *MSVCRT__errno() = MSVCRT_ENOENT; return -1; @@ -2784,7 +2785,8 @@ int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * bu while (plen && path[plen-1]==' ') plen--; - if(plen && (path[plen-1]=='\\' || path[plen-1]=='/')) + if(plen && (plen<2 || path[plen-2]!=':') && + (path[plen-1]==':' || path[plen-1]=='\\' || path[plen-1]=='/')) { *MSVCRT__errno() = MSVCRT_ENOENT; return -1; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 7a3253a..2d2399a 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1907,6 +1907,16 @@ static void test_stat(void) } else skip("mkdir failed with errno %d\n", errno); + + errno = 0xdeadbeef; + ret = stat("c:", &buf); + ok(ret == -1, "stat returned %d\n", ret); + ok(errno == ENOENT, "errno = %d\n", errno); + + ret = stat("c:/", &buf); + ok(!ret, "stat returned %d\n", ret); + ok(buf.st_dev == 2, "st_dev = %d\n", buf.st_dev); + ok(buf.st_rdev == 2, "st_rdev = %d\n", buf.st_rdev); } static const char* pipe_string="Hello world";

1 0

Alistair Leslie-Hughes : comsvcs: Add stub dll.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 04bf2009aacbcbbf193154cd71992ce605a0882b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04bf2009aacbcbbf193154cd7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 10:19:23 2013 +1000 comsvcs: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/comsvcs/Makefile.in | 8 ++++ dlls/comsvcs/comsvcs.spec | 20 +++++++++++ dlls/comsvcs/main.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 114 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ddf79be..793f5a1 100755 --- a/configure +++ b/configure @@ -16053,6 +16053,7 @@ wine_fn_config_dll comm.drv16 enable_win16 wine_fn_config_dll commdlg.dll16 enable_win16 wine_fn_config_dll compobj.dll16 enable_win16 wine_fn_config_dll compstui enable_compstui implib +wine_fn_config_dll comsvcs enable_comsvcs implib wine_fn_config_dll credui enable_credui implib,po wine_fn_config_test dlls/credui/tests credui_test wine_fn_config_dll crtdll enable_crtdll implib diff --git a/configure.ac b/configure.ac index 1cba660..0f84770 100644 --- a/configure.ac +++ b/configure.ac @@ -2641,6 +2641,7 @@ WINE_CONFIG_DLL(comm.drv16,enable_win16) WINE_CONFIG_DLL(commdlg.dll16,enable_win16) WINE_CONFIG_DLL(compobj.dll16,enable_win16) WINE_CONFIG_DLL(compstui,,[implib]) +WINE_CONFIG_DLL(comsvcs,,[implib]) WINE_CONFIG_DLL(credui,,[implib,po]) WINE_CONFIG_TEST(dlls/credui/tests) WINE_CONFIG_DLL(crtdll,,[implib]) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in new file mode 100644 index 0000000..1e52806 --- /dev/null +++ b/dlls/comsvcs/Makefile.in @@ -0,0 +1,8 @@ +MODULE = comsvcs.dll +IMPORTLIB = comsvcs +IMPORTS = ole32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/comsvcs/comsvcs.spec b/dlls/comsvcs/comsvcs.spec new file mode 100644 index 0000000..6bd6ec9 --- /dev/null +++ b/dlls/comsvcs/comsvcs.spec @@ -0,0 +1,20 @@ +@ stub CosGetCallContext +@ stub CoCreateActivity +@ stub CoEnterServiceDomain +@ stub CoLeaveServiceDomain +@ stub CoLoadServices +@ stub ComSvcsExceptionFilter +@ stub ComSvcsLogError +@ stub DispManGetContext +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub GetMTAThreadPoolMetrics +@ stub GetManagedExtensions +@ stub GetObjectContext +@ stub GetTrkSvrObject +@ stub MTSCreateActivity +@ stub MiniDumpW +@ stub RecycleSurrogate +@ stub SafeRef diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c new file mode 100644 index 0000000..3fc69de --- /dev/null +++ b/dlls/comsvcs/main.c @@ -0,0 +1,84 @@ +/* + * COM+ Services + * + * Copyright 2013 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); + +static HINSTANCE COMSVCS_hInstance; + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + COMSVCS_hInstance = hinst; + DisableThreadLibraryCalls(hinst); + break; + } + return TRUE; +} + +/****************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + FIXME("(%s,%s,%p) stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +/****************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (comsvcs.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( COMSVCS_hInstance ); +} + +/*********************************************************************** + * DllUnregisterServer (comsvcs.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( COMSVCS_hInstance ); +}

1 0

Andrew Cook : ntdll: Implement NtQueryEvent.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

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

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

Aug. 26, 2013

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

Nikolay Sivov : oledb32: Implement SetRowPosition().
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

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

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

Aug. 26, 2013

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

George Stephanos : advapi32/tests: Add more tests for hkcr handle mask in existent tests.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 96b03962cd9a901d9473e57ae99e8a1506fceae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b03962cd9a901d9473e57ae… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Sat Aug 24 05:11:38 2013 +0200 advapi32/tests: Add more tests for hkcr handle mask in existent tests. --- dlls/advapi32/tests/registry.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 59ef82e..fd5d373 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2122,6 +2122,7 @@ static void test_classesroot(void) skip("not enough privileges to add a user class\n"); return; } + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, @@ -2129,6 +2130,7 @@ static void test_classesroot(void) todo_wine ok(res == ERROR_SUCCESS || broken(res == ERROR_FILE_NOT_FOUND /* WinNT */), "test key not found in hkcr: %d\n", res); + todo_wine ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr); if (res) { skip("HKCR key merging not supported\n"); @@ -2192,12 +2194,14 @@ static void test_classesroot(void) skip("not enough privileges to add a system class\n"); return; } + ok(!IS_HKCR(hklm), "hkcr mask set in %p\n", hklm); /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcr ); ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr); if (res) { delete_key( hklm ); @@ -2225,12 +2229,14 @@ static void test_classesroot(void) if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return; + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcr ); ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + ok(IS_HKCR(hkcr), "hkcr mask not set in %p\n", hkcr); /* set a value in user's classes */ res = RegSetValueExA(hkey, "val2", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); @@ -2268,9 +2274,11 @@ static void test_classesroot(void) /* create a subkey in hklm */ if (RegCreateKeyExA( hklm, "subkey1", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hklmsub1, NULL )) return; + ok(!IS_HKCR(hklmsub1), "hkcr mask set in %p\n", hklmsub1); /* try to open that subkey in hkcr */ res = RegOpenKeyExA( hkcr, "subkey1", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcrsub1 ); ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + ok(IS_HKCR(hkcrsub1), "hkcr mask not set in %p\n", hkcrsub1); /* set a value in hklm classes */ res = RegSetValueExA(hklmsub1, "subval1", 0, REG_SZ, (const BYTE *)"hklm", sizeof("hklm")); @@ -2293,6 +2301,7 @@ static void test_classesroot(void) /* create a subkey in user's classes */ if (RegCreateKeyExA( hkey, "subkey1", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkeysub1, NULL )) return; + ok(!IS_HKCR(hkeysub1), "hkcr mask set in %p\n", hkeysub1); /* set a value in user's classes */ res = RegSetValueExA(hkeysub1, "subval1", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); @@ -2330,6 +2339,7 @@ static void test_classesroot(void) /* new subkey in hkcr */ if (RegCreateKeyExA( hkcr, "subkey2", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkcrsub2, NULL )) return; + ok(IS_HKCR(hkcrsub2), "hkcr mask not set in %p\n", hkcrsub2); res = RegSetValueExA(hkcrsub2, "subval1", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); @@ -2339,6 +2349,7 @@ static void test_classesroot(void) hklmsub2 = 0; res = RegOpenKeyExA( hklm, "subkey2", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hklmsub2 ); ok(res == ERROR_SUCCESS, "test key not found in hklm: %d\n", res); + ok(!IS_HKCR(hklmsub2), "hkcr mask set in %p\n", hklmsub2); /* check that the value is present in hklm */ res = RegQueryValueExA(hklmsub2, "subval1", NULL, &type, (LPBYTE)buffer, &size); @@ -2358,6 +2369,7 @@ static void test_classesroot(void) ok(res == ERROR_FILE_NOT_FOUND, "test key found in user's classes: %d\n", res); res = RegOpenKeyExA(hklm, "subkey1", 0, KEY_READ, &hklmsub1); ok(res == ERROR_SUCCESS, "test key not found in hklm: %d\n", res); + ok(!IS_HKCR(hklmsub1), "hkcr mask set in %p\n", hklmsub1); /* delete subkey1 from hkcr again (which should now point at hklm) */ res = RegDeleteKey(hkcr, "subkey1");

1 0

George Stephanos : advapi32/tests: Add tests for hkcr handle mask.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 69208b60f887c4beaae7ce8c422551e92e8a4924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69208b60f887c4beaae7ce8c4… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Sat Aug 24 05:11:37 2013 +0200 advapi32/tests: Add tests for hkcr handle mask. --- dlls/advapi32/tests/registry.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index bd7e4e2..59ef82e 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -31,6 +31,8 @@ #include "winerror.h" #include "aclapi.h" +#define IS_HKCR(hk) ((UINT_PTR)hk > 0 && ((UINT_PTR)hk & 3) == 2) + static HKEY hkey_main; static DWORD GLE; @@ -2562,6 +2564,37 @@ cleanup: RegCloseKey( hkcr ); } +static void test_classesroot_mask(void) +{ + HKEY hkey; + LSTATUS res; + + res = RegOpenKeyA( HKEY_CLASSES_ROOT, "CLSID", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + todo_wine ok(IS_HKCR(hkey), "hkcr mask not set in %p\n", hkey); + RegCloseKey( hkey ); + + res = RegOpenKeyA( HKEY_CURRENT_USER, "Software", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); + RegCloseKey( hkey ); + + res = RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); + RegCloseKey( hkey ); + + res = RegOpenKeyA( HKEY_USERS, ".Default", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); + RegCloseKey( hkey ); + + res = RegOpenKeyA( HKEY_CURRENT_CONFIG, "Software", &hkey ); + ok(res == ERROR_SUCCESS, "RegOpenKeyA failed: %d\n", res); + ok(!IS_HKCR(hkey), "hkcr mask set in %p\n", hkey); + RegCloseKey( hkey ); +} + static void test_deleted_key(void) { HKEY hkey, hkey2; @@ -2656,6 +2689,7 @@ START_TEST(registry) test_redirection(); test_classesroot(); test_classesroot_enum(); + test_classesroot_mask(); /* SaveKey/LoadKey require the SE_BACKUP_NAME privilege to be set */ if (set_privileges(SE_BACKUP_NAME, TRUE) &&

1 0

Henri Verbeet : wined3d: Introduce a separate function for cleaning up a wined3d_state structure.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: aee3c0faeb743b6f1b797f508a602fcb622e2e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee3c0faeb743b6f1b797f508… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:39 2013 +0200 wined3d: Introduce a separate function for cleaning up a wined3d_state structure. --- dlls/wined3d/stateblock.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3685a2e..8abd8e5 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -588,6 +588,27 @@ void state_unbind_resources(struct wined3d_state *state) } } +static void state_cleanup(struct wined3d_state *state) +{ + unsigned int counter; + + state_unbind_resources(state); + + for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) + { + struct list *e1, *e2; + LIST_FOR_EACH_SAFE(e1, e2, &state->light_map[counter]) + { + struct wined3d_light_info *light = LIST_ENTRY(e1, struct wined3d_light_info, entry); + list_remove(&light->entry); + HeapFree(GetProcessHeap(), 0, light); + } + } + + HeapFree(GetProcessHeap(), 0, state->vs_consts_f); + HeapFree(GetProcessHeap(), 0, state->ps_consts_f); +} + ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) { ULONG refcount = InterlockedDecrement(&stateblock->ref); @@ -596,24 +617,9 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) if (!refcount) { - int counter; - - state_unbind_resources(&stateblock->state); - - for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) - { - struct list *e1, *e2; - LIST_FOR_EACH_SAFE(e1, e2, &stateblock->state.light_map[counter]) - { - struct wined3d_light_info *light = LIST_ENTRY(e1, struct wined3d_light_info, entry); - list_remove(&light->entry); - HeapFree(GetProcessHeap(), 0, light); - } - } + state_cleanup(&stateblock->state); - HeapFree(GetProcessHeap(), 0, stateblock->state.vs_consts_f); HeapFree(GetProcessHeap(), 0, stateblock->changed.vertexShaderConstantsF); - HeapFree(GetProcessHeap(), 0, stateblock->state.ps_consts_f); HeapFree(GetProcessHeap(), 0, stateblock->changed.pixelShaderConstantsF); HeapFree(GetProcessHeap(), 0, stateblock->contained_vs_consts_f); HeapFree(GetProcessHeap(), 0, stateblock->contained_ps_consts_f);

1 0