July 2006 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Check the color data type too when deciding whether to convert data.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: 0dd13f2cb74a7c965e4865007c1e1126b8a3d42a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0dd13f2cb74a7c965e48650… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 12 00:04:28 2006 +0200 wined3d: Check the color data type too when deciding whether to convert data. --- dlls/wined3d/vertexbuffer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 35a4d9e..9317b4c 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -198,8 +198,8 @@ static void WINAPI IWineD3DVertexBuf /* If any data that needs conversion has changed we have to reload the whole buffer */ if( ( (This->strided.u.s.position_transformed || strided.u.s.position_transformed) && This->strided.u.s.position.lpData != strided.u.s.position.lpData) || - !(This->strided.u.s.diffuse.lpData == strided.u.s.diffuse.lpData || strided.u.s.diffuse.VBO != This->vbo) || - !(This->strided.u.s.specular.lpData == strided.u.s.specular.lpData || strided.u.s.specular.VBO != This->vbo) ) { + !((This->strided.u.s.diffuse.lpData == strided.u.s.diffuse.lpData && This->strided.u.s.diffuse.dwType == strided.u.s.diffuse.dwType) || strided.u.s.diffuse.VBO != This->vbo) || + !((This->strided.u.s.specular.lpData == strided.u.s.specular.lpData && This->strided.u.s.specular.dwType == strided.u.s.specular.dwType)|| strided.u.s.specular.VBO != This->vbo) ) { start = 0; end = This->resource.size;

1 0

Mike McCormack : ole32: Implement IPropertyStorage::Enum using enumx.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: a8b38fa2ea1b5711565e0773d39f27a5bb6cd8c6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8b38fa2ea1b5711565e077… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 11 18:38:33 2006 +0900 ole32: Implement IPropertyStorage::Enum using enumx. --- dlls/ole32/stg_prop.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 102 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 4764b26..e0567c8 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -39,7 +39,6 @@ * - Not all PROPVARIANT types are supported. * - User defined properties are not supported, see comment in * PropertyStorage_ReadFromStream - * - IPropertyStorage::Enum is unimplemented */ #include <assert.h> @@ -154,7 +153,9 @@ static HRESULT PropertyStorage_StringCop static const IPropertyStorageVtbl IPropertyStorage_Vtbl; static const IEnumSTATPROPSETSTGVtbl IEnumSTATPROPSETSTG_Vtbl; +static const IEnumSTATPROPSTGVtbl IEnumSTATPROPSTG_Vtbl; static HRESULT create_EnumSTATPROPSETSTG(StorageImpl *, IEnumSTATPROPSETSTG**); +static HRESULT create_EnumSTATPROPSTG(PropertyStorage_impl *, IEnumSTATPROPSTG**); /*********************************************************************** * Implementation of IPropertyStorage @@ -862,8 +863,8 @@ static HRESULT WINAPI IPropertyStorage_f IPropertyStorage* iface, IEnumSTATPROPSTG** ppenum) { - FIXME("\n"); - return E_NOTIMPL; + PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + return create_EnumSTATPROPSTG(This, ppenum); } /************************************************************************ @@ -2332,6 +2333,93 @@ static HRESULT create_EnumSTATPROPSETSTG return S_OK; } +/************************************************************************ + * Implement IEnumSTATPROPSTG using enumx + */ +static HRESULT WINAPI IEnumSTATPROPSTG_fnQueryInterface( + IEnumSTATPROPSTG *iface, + REFIID riid, + void** ppvObject) +{ + return enumx_QueryInterface((enumx_impl*)iface, riid, ppvObject); +} + +static ULONG WINAPI IEnumSTATPROPSTG_fnAddRef( + IEnumSTATPROPSTG *iface) +{ + return enumx_AddRef((enumx_impl*)iface); +} + +static ULONG WINAPI IEnumSTATPROPSTG_fnRelease( + IEnumSTATPROPSTG *iface) +{ + return enumx_Release((enumx_impl*)iface); +} + +static HRESULT WINAPI IEnumSTATPROPSTG_fnNext( + IEnumSTATPROPSTG *iface, + ULONG celt, + STATPROPSTG *rgelt, + ULONG *pceltFetched) +{ + return enumx_Next((enumx_impl*)iface, celt, rgelt, pceltFetched); +} + +static HRESULT WINAPI IEnumSTATPROPSTG_fnSkip( + IEnumSTATPROPSTG *iface, + ULONG celt) +{ + return enumx_Skip((enumx_impl*)iface, celt); +} + +static HRESULT WINAPI IEnumSTATPROPSTG_fnReset( + IEnumSTATPROPSTG *iface) +{ + return enumx_Reset((enumx_impl*)iface); +} + +static HRESULT WINAPI IEnumSTATPROPSTG_fnClone( + IEnumSTATPROPSTG *iface, + IEnumSTATPROPSTG **ppenum) +{ + return enumx_Clone((enumx_impl*)iface, (enumx_impl**)ppenum); +} + +static BOOL prop_enum_stat(const void *k, const void *v, void *extra, void *arg) +{ + enumx_impl *enumx = arg; + PROPID propid = (PROPID) k; + const PROPVARIANT *prop = v; + STATPROPSTG stat; + + stat.lpwstrName = NULL; + stat.propid = propid; + stat.vt = prop->vt; + + enumx_add_element(enumx, &stat); + + return TRUE; +} + +static HRESULT create_EnumSTATPROPSTG( + PropertyStorage_impl *This, + IEnumSTATPROPSTG** ppenum) +{ + enumx_impl *enumx; + + TRACE("%p %p\n", This, ppenum); + + enumx = enumx_allocate(&IID_IEnumSTATPROPSTG, + &IEnumSTATPROPSTG_Vtbl, + sizeof (STATPROPSTG)); + + dictionary_enumerate(This->propid_to_prop, prop_enum_stat, enumx); + + *ppenum = (IEnumSTATPROPSTG*) enumx; + + return S_OK; +} + /*********************************************************************** * vtables */ @@ -2376,6 +2464,17 @@ static const IEnumSTATPROPSETSTGVtbl IEn IEnumSTATPROPSETSTG_fnClone, }; +static const IEnumSTATPROPSTGVtbl IEnumSTATPROPSTG_Vtbl = +{ + IEnumSTATPROPSTG_fnQueryInterface, + IEnumSTATPROPSTG_fnAddRef, + IEnumSTATPROPSTG_fnRelease, + IEnumSTATPROPSTG_fnNext, + IEnumSTATPROPSTG_fnSkip, + IEnumSTATPROPSTG_fnReset, + IEnumSTATPROPSTG_fnClone, +}; + /*********************************************************************** * Format ID <-> name conversion */

1 0

Mike McCormack : ole32: Clean up some declarations.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: 6c21ac2565273e3266f2b9c750f6d9fe403a9363 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c21ac2565273e3266f2b9c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 11 18:38:01 2006 +0900 ole32: Clean up some declarations. --- dlls/ole32/stg_prop.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 441457b..4764b26 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -118,25 +118,23 @@ typedef struct tagPROPERTYIDOFFSET DWORD dwOffset; /* from beginning of section */ } PROPERTYIDOFFSET; -struct tagPropertyStorage_impl; +typedef struct tagPropertyStorage_impl PropertyStorage_impl; /* Initializes the property storage from the stream (and undoes any uncommitted * changes in the process.) Returns an error if there is an error reading or * if the stream format doesn't match what's expected. */ -static HRESULT PropertyStorage_ReadFromStream(struct tagPropertyStorage_impl *); +static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *); -static HRESULT PropertyStorage_WriteToStream(struct tagPropertyStorage_impl *); +static HRESULT PropertyStorage_WriteToStream(PropertyStorage_impl *); /* Creates the dictionaries used by the property storage. If successful, all * the dictionaries have been created. If failed, none has been. (This makes * it a bit easier to deal with destroying them.) */ -static HRESULT PropertyStorage_CreateDictionaries( - struct tagPropertyStorage_impl *); +static HRESULT PropertyStorage_CreateDictionaries(PropertyStorage_impl *); -static void PropertyStorage_DestroyDictionaries( - struct tagPropertyStorage_impl *); +static void PropertyStorage_DestroyDictionaries(PropertyStorage_impl *); /* Copies from propvar to prop. If propvar's type is VT_LPSTR, copies the * string using PropertyStorage_StringCopy. @@ -161,7 +159,7 @@ static HRESULT create_EnumSTATPROPSETSTG /*********************************************************************** * Implementation of IPropertyStorage */ -typedef struct tagPropertyStorage_impl +struct tagPropertyStorage_impl { const IPropertyStorageVtbl *vtbl; LONG ref; @@ -180,7 +178,7 @@ typedef struct tagPropertyStorage_impl struct dictionary *name_to_propid; struct dictionary *propid_to_name; struct dictionary *propid_to_prop; -} PropertyStorage_impl; +}; /************************************************************************ * IPropertyStorage_fnQueryInterface (IPropertyStorage)

1 0

Mike McCormack : ole32: Use enumx to implement IPropertySetStorage::Enum.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: d35176d52ab798ab013583ca20192556c6630a4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d35176d52ab798ab013583c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 11 16:13:29 2006 +0900 ole32: Use enumx to implement IPropertySetStorage::Enum. --- dlls/ole32/stg_prop.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 120 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 1773224..441457b 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -60,6 +60,7 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "dictionary.h" #include "storage32.h" +#include "enumx.h" WINE_DEFAULT_DEBUG_CHANNEL(storage); @@ -154,6 +155,8 @@ static HRESULT PropertyStorage_StringCop LCID targetCP); static const IPropertyStorageVtbl IPropertyStorage_Vtbl; +static const IEnumSTATPROPSETSTGVtbl IEnumSTATPROPSETSTG_Vtbl; +static HRESULT create_EnumSTATPROPSETSTG(StorageImpl *, IEnumSTATPROPSETSTG**); /*********************************************************************** * Implementation of IPropertyStorage @@ -2222,10 +2225,114 @@ static HRESULT WINAPI IPropertySetStorag IEnumSTATPROPSETSTG** ppenum) { StorageImpl *This = impl_from_IPropertySetStorage(ppstg); - FIXME("%p\n", This); - return E_NOTIMPL; + return create_EnumSTATPROPSETSTG(This, ppenum); +} + +/************************************************************************ + * Implement IEnumSTATPROPSETSTG using enumx + */ +static HRESULT WINAPI IEnumSTATPROPSETSTG_fnQueryInterface( + IEnumSTATPROPSETSTG *iface, + REFIID riid, + void** ppvObject) +{ + return enumx_QueryInterface((enumx_impl*)iface, riid, ppvObject); +} + +static ULONG WINAPI IEnumSTATPROPSETSTG_fnAddRef( + IEnumSTATPROPSETSTG *iface) +{ + return enumx_AddRef((enumx_impl*)iface); +} + +static ULONG WINAPI IEnumSTATPROPSETSTG_fnRelease( + IEnumSTATPROPSETSTG *iface) +{ + return enumx_Release((enumx_impl*)iface); +} + +static HRESULT WINAPI IEnumSTATPROPSETSTG_fnNext( + IEnumSTATPROPSETSTG *iface, + ULONG celt, + STATPROPSETSTG *rgelt, + ULONG *pceltFetched) +{ + return enumx_Next((enumx_impl*)iface, celt, rgelt, pceltFetched); +} + +static HRESULT WINAPI IEnumSTATPROPSETSTG_fnSkip( + IEnumSTATPROPSETSTG *iface, + ULONG celt) +{ + return enumx_Skip((enumx_impl*)iface, celt); } +static HRESULT WINAPI IEnumSTATPROPSETSTG_fnReset( + IEnumSTATPROPSETSTG *iface) +{ + return enumx_Reset((enumx_impl*)iface); +} + +static HRESULT WINAPI IEnumSTATPROPSETSTG_fnClone( + IEnumSTATPROPSETSTG *iface, + IEnumSTATPROPSETSTG **ppenum) +{ + return enumx_Clone((enumx_impl*)iface, (enumx_impl**)ppenum); +} + +static HRESULT create_EnumSTATPROPSETSTG( + StorageImpl *This, + IEnumSTATPROPSETSTG** ppenum) +{ + IStorage *stg = (IStorage*) &This->base.lpVtbl; + IEnumSTATSTG *penum = NULL; + STATSTG stat; + ULONG count; + HRESULT r; + STATPROPSETSTG statpss; + enumx_impl *enumx; + + TRACE("%p %p\n", This, ppenum); + + enumx = enumx_allocate(&IID_IEnumSTATPROPSETSTG, + &IEnumSTATPROPSETSTG_Vtbl, + sizeof (STATPROPSETSTG)); + + /* add all the property set elements into a list */ + r = IStorage_EnumElements(stg, 0, NULL, 0, &penum); + if (FAILED(r)) + return E_OUTOFMEMORY; + + while (1) + { + count = 0; + r = IEnumSTATSTG_Next(penum, 1, &stat, &count); + if (FAILED(r)) + break; + if (!count) + break; + if (!stat.pwcsName) + continue; + if (stat.pwcsName[0] == 5 && stat.type == STGTY_STREAM) + { + PropStgNameToFmtId(stat.pwcsName, &statpss.fmtid); + TRACE("adding %s (%s)\n", debugstr_w(stat.pwcsName), + debugstr_guid(&statpss.fmtid)); + statpss.mtime = stat.mtime; + statpss.atime = stat.atime; + statpss.ctime = stat.ctime; + statpss.grfFlags = stat.grfMode; + memcpy(&statpss.clsid, &stat.clsid, sizeof stat.clsid); + enumx_add_element(enumx, &statpss); + } + CoTaskMemFree(stat.pwcsName); + } + IEnumSTATSTG_Release(penum); + + *ppenum = (IEnumSTATPROPSETSTG*) enumx; + + return S_OK; +} /*********************************************************************** * vtables @@ -2260,6 +2367,17 @@ static const IPropertyStorageVtbl IPrope IPropertyStorage_fnStat, }; +static const IEnumSTATPROPSETSTGVtbl IEnumSTATPROPSETSTG_Vtbl = +{ + IEnumSTATPROPSETSTG_fnQueryInterface, + IEnumSTATPROPSETSTG_fnAddRef, + IEnumSTATPROPSETSTG_fnRelease, + IEnumSTATPROPSETSTG_fnNext, + IEnumSTATPROPSETSTG_fnSkip, + IEnumSTATPROPSETSTG_fnReset, + IEnumSTATPROPSETSTG_fnClone, +}; + /*********************************************************************** * Format ID <-> name conversion */

1 0

Mike McCormack : ole32: Add a framework for implementing IEnum* interfaces.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: 127ae2bf8b80c7f2b4a9d61fe6c318f1464ab585 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=127ae2bf8b80c7f2b4a9d61… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 11 16:12:38 2006 +0900 ole32: Add a framework for implementing IEnum* interfaces. --- dlls/ole32/Makefile.in | 1 dlls/ole32/enumx.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/enumx.h | 34 ++++++++ 3 files changed, 237 insertions(+), 0 deletions(-) create mode 100644 dlls/ole32/enumx.c create mode 100644 dlls/ole32/enumx.h diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 01b7ea6..0a44570 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -18,6 +18,7 @@ C_SRCS = \ datacache.c \ defaulthandler.c \ dictionary.c \ + enumx.c \ errorinfo.c \ filemoniker.c \ ftmarshal.c \ diff --git a/dlls/ole32/enumx.c b/dlls/ole32/enumx.c new file mode 100644 index 0000000..c928e4e --- /dev/null +++ b/dlls/ole32/enumx.c @@ -0,0 +1,202 @@ +/* + * IEnum* implementation + * + * Copyright 2006 Mike McCormack + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wine/list.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +typedef struct tagEnumSTATPROPSETSTG_impl +{ + const void *vtbl; + LONG ref; + struct list elements; + struct list *current; + ULONG elem_size; + GUID riid; +} enumx_impl; + +/************************************************************************ + * enumx_QueryInterface + */ +HRESULT WINAPI enumx_QueryInterface( + enumx_impl *This, + REFIID riid, + void** ppvObject) +{ + if ( (This==0) || (ppvObject==0) ) + return E_INVALIDARG; + + *ppvObject = 0; + + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&This->riid, riid)) + { + IUnknown_AddRef(((IUnknown*)This)); + *ppvObject = This; + return S_OK; + } + + return E_NOINTERFACE; +} + +/************************************************************************ + * enumx_AddRef + */ +ULONG WINAPI enumx_AddRef(enumx_impl *This) +{ + return InterlockedIncrement(&This->ref); +} + +/************************************************************************ + * enumx_Release + */ +ULONG WINAPI enumx_Release(enumx_impl *This) +{ + ULONG ref; + + ref = InterlockedDecrement(&This->ref); + if (ref == 0) + { + while (!list_empty(&This->elements)) + { + struct list *x = list_head(&This->elements); + list_remove(x); + HeapFree(GetProcessHeap(), 0, x); + } + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +/************************************************************************ + * enumx_Next + */ +HRESULT WINAPI enumx_Next(enumx_impl *This, ULONG celt, + void *rgelt, ULONG *pceltFetched) +{ + unsigned char *p; + ULONG count = 0; + + TRACE("%p %lu %p\n", This, celt, pceltFetched); + + if (This->current == NULL) + This->current = list_head(&This->elements); + p = rgelt; + while (count < celt && This->current && This->current != &This->elements) + { + memcpy(p, &This->current[1], This->elem_size); + p += This->elem_size; + This->current = This->current->next; + count++; + } + if (pceltFetched) + *pceltFetched = count; + if (count < celt) + return S_FALSE; + return S_OK; +} + +/************************************************************************ + * enumx_Skip + */ +HRESULT WINAPI enumx_Skip(enumx_impl *This, ULONG celt) +{ + ULONG count = 0; + + TRACE("%p %lu\n", This, celt); + + if (This->current == NULL) + This->current = list_head(&This->elements); + + while (count < celt && This->current && This->current != &This->elements) + count++; + + return S_OK; +} + +/************************************************************************ + * enumx_Reset + */ +HRESULT WINAPI enumx_Reset(enumx_impl *This) +{ + TRACE("\n"); + + This->current = NULL; + return S_OK; +} + +/************************************************************************ + * enumx_fnClone + */ +HRESULT WINAPI enumx_Clone( + enumx_impl *iface, + enumx_impl **ppenum) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +/************************************************************************ + * enumx_allocate + * + * Allocate a generic enumerator + */ +enumx_impl *enumx_allocate(REFIID riid, const void *vtbl, ULONG elem_size) +{ + enumx_impl *enumx; + + enumx = HeapAlloc(GetProcessHeap(), 0, sizeof *enumx); + if (enumx) + { + enumx->vtbl = vtbl; + enumx->ref = 1; + enumx->current = NULL; + enumx->elem_size = elem_size; + memcpy(&enumx->riid, riid, sizeof *riid); + list_init(&enumx->elements); + } + + return enumx; +} + +/************************************************************************ + * enumx_add_element + * + * Add an element to the enumeration. + */ +void *enumx_add_element(enumx_impl *enumx, void *data) +{ + struct list *element; + + element = HeapAlloc(GetProcessHeap(), 0, sizeof *element + enumx->elem_size); + if (!element) + return NULL; + memcpy(&element[1], data, enumx->elem_size); + list_add_tail(&enumx->elements, element); + return &element[1]; +} diff --git a/dlls/ole32/enumx.h b/dlls/ole32/enumx.h new file mode 100644 index 0000000..2d36b73 --- /dev/null +++ b/dlls/ole32/enumx.h @@ -0,0 +1,34 @@ +/* + * Copyright 2006 Mike McCormack + * + * 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 + */ + +#ifndef __OLE_ENUM_H__ +#define __OLE_ENUM_H__ + +typedef struct tagEnumSTATPROPSETSTG_impl enumx_impl; + +extern HRESULT WINAPI enumx_QueryInterface(enumx_impl *, REFIID, void**); +extern ULONG WINAPI enumx_AddRef(enumx_impl *); +extern ULONG WINAPI enumx_Release(enumx_impl *); +extern HRESULT WINAPI enumx_Next(enumx_impl *, ULONG, void *, ULONG *); +extern HRESULT WINAPI enumx_Skip(enumx_impl *, ULONG); +extern HRESULT WINAPI enumx_Reset(enumx_impl *); +extern HRESULT WINAPI enumx_Clone(enumx_impl *, enumx_impl **); +extern enumx_impl *enumx_allocate(REFIID, const void *, ULONG); +extern void *enumx_add_element(enumx_impl *, void *); + +#endif

1 0

Mike McCormack : ole32: Fix conformance test to compile with MSVC6.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: d323acc23b70d3e062dc58c11d7f8cca23b8feaf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d323acc23b70d3e062dc58c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 12 14:53:57 2006 +0900 ole32: Fix conformance test to compile with MSVC6. --- dlls/ole32/tests/stg_prop.c | 8 ++++++-- dlls/ole32/tests/storage32.c | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index 5cd8879..19fd593 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -20,6 +20,10 @@ #define COBJMACROS #include "objbase.h" #include "wine/test.h" +#ifndef PID_BEHAVIOR +#define PID_BEHAVIOR 0x80000003 +#endif + static HRESULT (WINAPI *pFmtIdToPropStgName)(const FMTID *, LPOLESTR); static HRESULT (WINAPI *pPropStgNameToFmtId)(const LPOLESTR, FMTID *); static HRESULT (WINAPI *pStgCreatePropSetStg)(IStorage *, DWORD, IPropertySetStorage **); @@ -391,7 +395,7 @@ static void testCodepage(void) * obviously something about string conversion I don't understand. */ if(0) { - static const char strVal[] = { 0x81, 0xff, 0x04, 0 }; + static const unsigned char strVal[] = { 0x81, 0xff, 0x04, 0 }; /* Set code page to 950 (Traditional Chinese) */ U(var).iVal = 950; hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0); @@ -408,7 +412,7 @@ static void testCodepage(void) /* Check returned string */ hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var); ok(SUCCEEDED(hr), "ReadMultiple failed: 0x%08lx\n", hr); - ok(var.vt == VT_LPSTR && !strcmp(U(var).pszVal, strVal), + ok(var.vt == VT_LPSTR && !strcmp(U(var).pszVal, (LPCSTR)strVal), "Didn't get expected type or value for property\n"); } diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index f1fda2c..d4ed369 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -22,10 +22,9 @@ #include <stdio.h> #define COBJMACROS +#include <windows.h> #include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" + #include "ole2.h" #include "objidl.h" #include "initguid.h"

1 0

Mike McCormack : ole32: This cannot be NULL, so don't check it.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: a5b3479774ff29276ef26ed3c64362f3eff8dc3d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a5b3479774ff29276ef26ed… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 12 13:03:22 2006 +0900 ole32: This cannot be NULL, so don't check it. --- dlls/ole32/stg_prop.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index c7a7b6e..1773224 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -307,8 +307,7 @@ static HRESULT WINAPI IPropertyStorage_f ULONG i; TRACE("(%p, %ld, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar); - if (!This) - return E_INVALIDARG; + if (cpspec && (!rgpspec || !rgpropvar)) return E_INVALIDARG; EnterCriticalSection(&This->cs); @@ -562,8 +561,7 @@ static HRESULT WINAPI IPropertyStorage_f ULONG i; TRACE("(%p, %ld, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar); - if (!This) - return E_INVALIDARG; + if (cpspec && (!rgpspec || !rgpropvar)) return E_INVALIDARG; if (!(This->grfMode & STGM_READWRITE)) @@ -662,8 +660,7 @@ static HRESULT WINAPI IPropertyStorage_f HRESULT hr; TRACE("(%p, %ld, %p)\n", iface, cpspec, rgpspec); - if (!This) - return E_INVALIDARG; + if (cpspec && !rgpspec) return E_INVALIDARG; if (!(This->grfMode & STGM_READWRITE)) @@ -711,8 +708,7 @@ static HRESULT WINAPI IPropertyStorage_f HRESULT hr = S_FALSE; TRACE("(%p, %ld, %p, %p)\n", iface, cpropid, rgpropid, rglpwstrName); - if (!This) - return E_INVALIDARG; + if (cpropid && (!rgpropid || !rglpwstrName)) return E_INVALIDARG; EnterCriticalSection(&This->cs); @@ -752,8 +748,7 @@ static HRESULT WINAPI IPropertyStorage_f HRESULT hr; TRACE("(%p, %ld, %p, %p)\n", iface, cpropid, rgpropid, rglpwstrName); - if (!This) - return E_INVALIDARG; + if (cpropid && (!rgpropid || !rglpwstrName)) return E_INVALIDARG; if (!(This->grfMode & STGM_READWRITE)) @@ -786,8 +781,7 @@ static HRESULT WINAPI IPropertyStorage_f HRESULT hr; TRACE("(%p, %ld, %p)\n", iface, cpropid, rgpropid); - if (!This) - return E_INVALIDARG; + if (cpropid && !rgpropid) return E_INVALIDARG; if (!(This->grfMode & STGM_READWRITE)) @@ -823,8 +817,7 @@ static HRESULT WINAPI IPropertyStorage_f HRESULT hr; TRACE("(%p, 0x%08lx)\n", iface, grfCommitFlags); - if (!This) - return E_INVALIDARG; + if (!(This->grfMode & STGM_READWRITE)) return STG_E_ACCESSDENIED; EnterCriticalSection(&This->cs); @@ -846,8 +839,6 @@ static HRESULT WINAPI IPropertyStorage_f PropertyStorage_impl *This = (PropertyStorage_impl *)iface; TRACE("%p\n", iface); - if (!This) - return E_INVALIDARG; EnterCriticalSection(&This->cs); if (This->dirty) @@ -897,7 +888,8 @@ static HRESULT WINAPI IPropertyStorage_f PropertyStorage_impl *This = (PropertyStorage_impl *)iface; TRACE("%p, %s\n", iface, debugstr_guid(clsid)); - if (!This || !clsid) + + if (!clsid) return E_INVALIDARG; if (!(This->grfMode & STGM_READWRITE)) return STG_E_ACCESSDENIED; @@ -920,7 +912,8 @@ static HRESULT WINAPI IPropertyStorage_f HRESULT hr; TRACE("%p, %p\n", iface, statpsstg); - if (!This || !statpsstg) + + if (!statpsstg) return E_INVALIDARG; hr = IStream_Stat(This->stm, &stat, STATFLAG_NONAME);

1 0

Mike McCormack : ole32: Don't warn when clearing PropVariants that don' t have allocated memory.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: 918cf3261b2790b96c76fc544b9e88bc2dc9653b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=918cf3261b2790b96c76fc5… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 12 15:26:01 2006 +0900 ole32: Don't warn when clearing PropVariants that don't have allocated memory. --- dlls/ole32/ole2.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 3a8be57..d0f4a78 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2572,6 +2572,23 @@ HRESULT WINAPI PropVariantClear(PROPVARI switch(pvar->vt) { + case VT_EMPTY: + case VT_NULL: + case VT_I2: + case VT_I4: + case VT_R4: + case VT_R8: + case VT_CY: + case VT_DATE: + case VT_ERROR: + case VT_BOOL: + case VT_UI1: + case VT_UI2: + case VT_UI4: + case VT_I8: + case VT_UI8: + case VT_FILETIME: + break; case VT_STREAM: case VT_STREAMED_OBJECT: case VT_STORAGE: @@ -2594,7 +2611,7 @@ HRESULT WINAPI PropVariantClear(PROPVARI if (pvar->u.bstrVal) PropSysFreeString(pvar->u.bstrVal); break; - case VT_CF: + case VT_CF: if (pvar->u.pclipdata) { OLE_FreeClipDataArray(1, pvar->u.pclipdata);

1 0

Mike McCormack : ole32: Only return S_FALSE in IPropertyStorage:: ReadMultiple if a property was not found.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: 7f891787bcd7c2cca9d537b735a3e4f7db194862 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f891787bcd7c2cca9d537b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 12 01:39:30 2006 +0900 ole32: Only return S_FALSE in IPropertyStorage::ReadMultiple if a property was not found. --- dlls/ole32/stg_prop.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index c59eba1..c7a7b6e 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -303,7 +303,7 @@ static HRESULT WINAPI IPropertyStorage_f PROPVARIANT rgpropvar[]) { PropertyStorage_impl *This = (PropertyStorage_impl *)iface; - HRESULT hr = S_FALSE; + HRESULT hr = S_OK; ULONG i; TRACE("(%p, %ld, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar); @@ -344,6 +344,8 @@ static HRESULT WINAPI IPropertyStorage_f if (prop) PropertyStorage_PropVariantCopy(&rgpropvar[i], prop, GetACP(), This->codePage); + else + hr = S_FALSE; } } }

1 0

Mike McCormack : ole32: Allocate copied VT_CF data correctly in PropVariantCopy.
by Alexandre Julliard July 12, 2006

July 12, 2006

Module: wine Branch: master Commit: 704dffcb097acc3b9cc8adc7a0ac20eaa4b6670b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=704dffcb097acc3b9cc8adc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 11 23:47:59 2006 +0900 ole32: Allocate copied VT_CF data correctly in PropVariantCopy. --- dlls/ole32/ole2.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 1e890f9..3a8be57 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2699,6 +2699,9 @@ HRESULT WINAPI PropVariantCopy(PROPVARIA if (pvarSrc->u.pclipdata) { len = pvarSrc->u.pclipdata->cbSize - sizeof(pvarSrc->u.pclipdata->ulClipFmt); + pvarDest->u.pclipdata = CoTaskMemAlloc(sizeof (CLIPDATA)); + pvarDest->u.pclipdata->cbSize = pvarSrc->u.pclipdata->cbSize; + pvarDest->u.pclipdata->ulClipFmt = pvarSrc->u.pclipdata->ulClipFmt; pvarDest->u.pclipdata->pClipData = CoTaskMemAlloc(len); CopyMemory(pvarDest->u.pclipdata->pClipData, pvarSrc->u.pclipdata->pClipData, len); }

1 0