gmane.comp.emulators.wine.patches
http://blog.gmane.org/gmane.comp.emulators.wine.patches
hourly
1
1901-01-01T00:00+00:00
Gmane
http://gmane.org/img/gmane-25t.png
http://gmane.org
-
[website] French translation for release 1.5.31
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115822
<pre>---
news/fr/2013052401.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 news/fr/2013052401.xml
diff --git a/news/fr/2013052401.xml b/news/fr/2013052401.xml
new file mode 100644
index 0000000..f03d30d
--- /dev/null
+++ b/news/fr/2013052401.xml
< at >< at > -0,0 +1,14 < at >< at >
+<news>
+<date>24 mai 2013</date>
+<title>Sortie de Wine 1.5.31</title>
+<body>
+<p> La version de développement 1.5.31 de Wine est disponible.</p>
+<p> <a href="{$root}/announce/1.5.31">Nouveautés</a> de cette version :
+<ul>
+ <li>Nouvelle version du moteur Gecko basée sur Firefox 21.</li>
+ <li>Prise en charge du retour de force des joysticks sous Mac OS X.</li>
+ <li>Correctifs dans la gestion des fenêtres dans le pilote Mac.</li>
+ <li>Diverses corrections de bogues.</li>
+</ul></p>
+<p><p>Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.31.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs.
+</p></body></news>
</pre>
Frédéric Delanoy
2013-05-24T18:55:54
-
[PATCH] atl100: Added stub for AtlIPersistPropertyBag_Load.
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115821
<pre>Make QQ happier, fix http://bugs.winehq.org/show_bug.cgi?id=33250
---
dlls/atl/atl.spec | 2 +-
dlls/atl100/atl.c | 8 ++++++++
dlls/atl100/atl100.spec | 2 +-
dlls/atl80/atl80.spec | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
</pre>
Qian Hong
2013-05-24T16:43:52
-
[PATCH 4/4] oleaut32: Implement ICreateTypeLib::CreateTypeInfo
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115820
<pre>---
dlls/oleaut32/typelib.c | 104 +++++++++++++++++++++++++++++++++++++++---------
1 file changed, 85 insertions(+), 19 deletions(-)
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 83b503c..c9ee1cd 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
< at >< at > -1652,6 +1652,18 < at >< at > static inline TLBCustData *TLB_get_custdata_by_guid(struct list *custdata_list,
return NULL;
}
+static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeInfoImpl **typeinfos,
+ UINT n, const OLECHAR *name)
+{
+ while(n){
+ if(!lstrcmpiW((*typeinfos)->Name, name))
+ return *typeinfos;
+ ++typeinfos;
+ --n;
+ }
+ return NULL;
+}
+
static TLBVarDesc *TLBVarDesc_Constructor(UINT n)
{
TLBVarDesc *ret;
< at >< at > -5051,31 +5063,25 < at >< at > static HRESULT WINAPI ITypeLibComp_fnBindType(
ITypeComp ** ppTComp)
{
ITypeLibImpl *This = impl_from_ITypeComp(iface);
- int i;
+ ITypeInfoImpl *info;
TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp);
if(!szName || !ppTInfo || !ppTComp)
return E_INVALIDARG;
- for(i = 0; i < This->TypeInfoCount; ++i)
- {
- ITypeInfoImpl *pTypeInfo = This->typeinfos[i];
- /* FIXME: should use lHash to do the search */
- if (pTypeInfo->Name && !strcmpiW(pTypeInfo->Name, szName))
- {
- TRACE("returning %p\n", pTypeInfo);
- *ppTInfo = (ITypeInfo *)&pTypeInfo->ITypeInfo2_iface;
- ITypeInfo_AddRef(*ppTInfo);
- *ppTComp = &pTypeInfo->ITypeComp_iface;
- ITypeComp_AddRef(*ppTComp);
- return S_OK;
- }
+ info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, szName);
+ if(!info){
+ *ppTInfo = NULL;
+ *ppTComp = NULL;
+ return S_OK;
}
- TRACE("not found\n");
- *ppTInfo = NULL;
- *ppTComp = NULL;
+ *ppTInfo = (ITypeInfo *)&info->ITypeInfo2_iface;
+ ITypeInfo_AddRef(*ppTInfo);
+ *ppTComp = &info->ITypeComp_iface;
+ ITypeComp_AddRef(*ppTComp);
+
return S_OK;
}
< at >< at > -8102,8 +8108,68 < at >< at > static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface,
LPOLESTR name, TYPEKIND kind, ICreateTypeInfo **ctinfo)
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- FIXME("%p %s %d %p - stub\n", This, wine_dbgstr_w(name), kind, ctinfo);
- return E_NOTIMPL;
+ ITypeInfoImpl *info;
+ HRESULT hres;
+
+ TRACE("%p %s %d %p\n", This, wine_dbgstr_w(name), kind, ctinfo);
+
+ if (!ctinfo || !name)
+ return E_INVALIDARG;
+
+ info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, name);
+ if (info)
+ return TYPE_E_NAMECONFLICT;
+
+ if (This->typeinfos)
+ This->typeinfos = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->typeinfos,
+ sizeof(ITypeInfoImpl*) * (This->TypeInfoCount + 1));
+ else
+ This->typeinfos = heap_alloc_zero(sizeof(ITypeInfoImpl*));
+
+ info = This->typeinfos[This->TypeInfoCount] = ITypeInfoImpl_Constructor();
+
+ info->pTypeLib = This;
+ info->Name = SysAllocString(name);
+ info->index = This->TypeInfoCount;
+ info->TypeAttr.typekind = kind;
+ info->TypeAttr.cbAlignment = 4;
+
+ switch(info->TypeAttr.typekind) {
+ case TKIND_ENUM:
+ case TKIND_INTERFACE:
+ case TKIND_DISPATCH:
+ case TKIND_COCLASS:
+ info->TypeAttr.cbSizeInstance = 4;
+ break;
+ case TKIND_RECORD:
+ case TKIND_UNION:
+ info->TypeAttr.cbSizeInstance = 0;
+ break;
+ case TKIND_MODULE:
+ info->TypeAttr.cbSizeInstance = 2;
+ break;
+ case TKIND_ALIAS:
+ info->TypeAttr.cbSizeInstance = -0x75;
+ break;
+ default:
+ FIXME("unrecognized typekind %d\n", info->TypeAttr.typekind);
+ info->TypeAttr.cbSizeInstance = 0xdeadbeef;
+ break;
+ }
+
+ hres = ITypeInfo2_QueryInterface(&info->ITypeInfo2_iface,
+ &IID_ICreateTypeInfo, (void **)ctinfo);
+ if (FAILED(hres)) {
+ SysFreeString(info->Name);
+ ITypeInfo2_Release(&info->ITypeInfo2_iface);
+ return hres;
+ }
+
+ info->hreftype = info->index * sizeof(MSFT_TypeInfoBase);
+
+ ++This->TypeInfoCount;
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeLib2_fnSetName(ICreateTypeLib2 *iface,
</pre>
Andrew Eikum
2013-05-24T16:28:42
-
[PATCH 3/4] oleaut32: Implement basic ICreateTypeInfo functions
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115819
<pre>---
dlls/oleaut32/typelib.c | 102 ++++++++++++++++++++++++++++++++++++++----------
1 file changed, 81 insertions(+), 21 deletions(-)
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 9bbd86f..83b503c 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
< at >< at > -8307,40 +8307,68 < at >< at > static HRESULT WINAPI ICreateTypeInfo2_fnSetGuid(ICreateTypeInfo2 *iface,
REFGUID guid)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %s - stub\n", This, debugstr_guid(guid));
- return E_NOTIMPL;
+
+ TRACE("%p %s\n", This, debugstr_guid(guid));
+
+ memcpy(&This->TypeAttr.guid, guid, sizeof(GUID));
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface,
UINT typeFlags)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %x - stub\n", This, typeFlags);
- return E_NOTIMPL;
+
+ TRACE("%p %x\n", This, typeFlags);
+
+ if (typeFlags & TYPEFLAG_FDUAL)
+ typeFlags |= TYPEFLAG_FDISPATCHABLE;
+
+ This->TypeAttr.wTypeFlags = typeFlags;
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeInfo2_fnSetDocString(ICreateTypeInfo2 *iface,
- LPOLESTR strDoc)
+ LPOLESTR doc)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %s - stub\n", This, wine_dbgstr_w(strDoc));
- return E_NOTIMPL;
+
+ TRACE("%p %s\n", This, wine_dbgstr_w(doc));
+
+ if (!doc)
+ return E_INVALIDARG;
+
+ SysFreeString(This->DocString);
+ This->DocString = SysAllocString(doc);
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpContext(ICreateTypeInfo2 *iface,
DWORD helpContext)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %d - stub\n", This, helpContext);
- return E_NOTIMPL;
+
+ TRACE("%p %d\n", This, helpContext);
+
+ This->dwHelpContext = helpContext;
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeInfo2_fnSetVersion(ICreateTypeInfo2 *iface,
WORD majorVerNum, WORD minorVerNum)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %d %d - stub\n", This, majorVerNum, minorVerNum);
- return E_NOTIMPL;
+
+ TRACE("%p %d %d\n", This, majorVerNum, minorVerNum);
+
+ This->TypeAttr.wMajorVerNum = majorVerNum;
+ This->TypeAttr.wMinorVerNum = minorVerNum;
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo(ICreateTypeInfo2 *iface,
< at >< at > -8379,16 +8407,28 < at >< at > static HRESULT WINAPI ICreateTypeInfo2_fnSetAlignment(ICreateTypeInfo2 *iface,
WORD alignment)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %d - stub\n", This, alignment);
- return E_NOTIMPL;
+
+ TRACE("%p %d\n", This, alignment);
+
+ This->TypeAttr.cbAlignment = alignment;
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeInfo2_fnSetSchema(ICreateTypeInfo2 *iface,
LPOLESTR schema)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %s - stub\n", This, wine_dbgstr_w(schema));
- return E_NOTIMPL;
+
+ TRACE("%p %s\n", This, wine_dbgstr_w(schema));
+
+ if (!schema)
+ return E_INVALIDARG;
+
+ SysFreeString(This->TypeAttr.lpstrSchema);
+ This->TypeAttr.lpstrSchema = SysAllocString(schema);
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface,
< at >< at > -8475,8 +8515,16 < at >< at > static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeIdldesc(ICreateTypeInfo2 *iface,
IDLDESC *idlDesc)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %p - stub\n", This, idlDesc);
- return E_NOTIMPL;
+
+ TRACE("%p %p\n", This, idlDesc);
+
+ if (!idlDesc)
+ return E_INVALIDARG;
+
+ This->TypeAttr.idldescType.dwReserved = idlDesc->dwReserved;
+ This->TypeAttr.idldescType.wIDLFlags = idlDesc->wIDLFlags;
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface)
< at >< at > -8570,8 +8618,12 < at >< at > static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext(ICreateTypeInfo2 *
ULONG helpStringContext)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %u - stub\n", This, helpStringContext);
- return E_NOTIMPL;
+
+ TRACE("%p %u\n", This, helpStringContext);
+
+ This->dwHelpStringContext = helpStringContext;
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpStringContext(ICreateTypeInfo2 *iface,
< at >< at > -8601,8 +8653,16 < at >< at > static HRESULT WINAPI ICreateTypeInfo2_fnSetName(ICreateTypeInfo2 *iface,
LPOLESTR name)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %s - stub\n", This, wine_dbgstr_w(name));
- return E_NOTIMPL;
+
+ TRACE("%p %s\n", This, wine_dbgstr_w(name));
+
+ if (!name)
+ return E_INVALIDARG;
+
+ SysFreeString(This->Name);
+ This->Name = SysAllocString(name);
+
+ return S_OK;
}
static const ICreateTypeInfo2Vtbl CreateTypeInfo2Vtbl = {
</pre>
Andrew Eikum
2013-05-24T16:28:39
-
[PATCH 2/4] oleaut32: Implement basic ICreateTypeLib functions
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115818
<pre>---
dlls/oleaut32/typelib.c | 88 +++++++++++++++++++++++++++++++++++++++----------
1 file changed, 70 insertions(+), 18 deletions(-)
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index edc9f21..9bbd86f 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
< at >< at > -8110,64 +8110,109 < at >< at > static HRESULT WINAPI ICreateTypeLib2_fnSetName(ICreateTypeLib2 *iface,
LPOLESTR name)
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- FIXME("%p %s - stub\n", This, wine_dbgstr_w(name));
- return E_NOTIMPL;
+
+ TRACE("%p %s\n", This, wine_dbgstr_w(name));
+
+ if (!name)
+ return E_INVALIDARG;
+
+ SysFreeString(This->Name);
+ This->Name = SysAllocString(name);
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeLib2_fnSetVersion(ICreateTypeLib2 *iface,
WORD majorVerNum, WORD minorVerNum)
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- FIXME("%p %d %d - stub\n", This, majorVerNum, minorVerNum);
- return E_NOTIMPL;
+
+ TRACE("%p %d %d\n", This, majorVerNum, minorVerNum);
+
+ This->LibAttr.wMajorVerNum = majorVerNum;
+ This->LibAttr.wMinorVerNum = minorVerNum;
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeLib2_fnSetGuid(ICreateTypeLib2 *iface,
REFGUID guid)
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- FIXME("%p %s - stub\n", This, debugstr_guid(guid));
- return E_NOTIMPL;
+
+ TRACE("%p %s\n", This, debugstr_guid(guid));
+
+ memcpy(&This->LibAttr.guid, guid, sizeof(GUID));
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeLib2_fnSetDocString(ICreateTypeLib2 *iface,
LPOLESTR doc)
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- FIXME("%p %s - stub\n", This, wine_dbgstr_w(doc));
- return E_NOTIMPL;
+
+ TRACE("%p %s\n", This, wine_dbgstr_w(doc));
+
+ if (!doc)
+ return E_INVALIDARG;
+
+ SysFreeString(This->DocString);
+ This->DocString = SysAllocString(doc);
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeLib2_fnSetHelpFileName(ICreateTypeLib2 *iface,
LPOLESTR helpFileName)
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- FIXME("%p %s - stub\n", This, wine_dbgstr_w(helpFileName));
- return E_NOTIMPL;
+
+ TRACE("%p %s\n", This, wine_dbgstr_w(helpFileName));
+
+ if (!helpFileName)
+ return E_INVALIDARG;
+
+ SysFreeString(This->HelpFile);
+ This->HelpFile = SysAllocString(helpFileName);
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 *iface,
DWORD helpContext)
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- FIXME("%p %d - stub\n", This, helpContext);
- return E_NOTIMPL;
+
+ TRACE("%p %d\n", This, helpContext);
+
+ This->dwHelpContext = helpContext;
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 *iface,
LCID lcid)
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- FIXME("%p %x - stub\n", This, lcid);
- return E_NOTIMPL;
+
+ TRACE("%p %x\n", This, lcid);
+
+ This->LibAttr.lcid = lcid;
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeLib2_fnSetLibFlags(ICreateTypeLib2 *iface,
UINT libFlags)
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- FIXME("%p %x - stub\n", This, libFlags);
- return E_NOTIMPL;
+
+ TRACE("%p %x\n", This, libFlags);
+
+ This->LibAttr.wLibFlags = libFlags;
+
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface)
< at >< at > -8205,8 +8250,15 < at >< at > static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringDll(ICreateTypeLib2 *iface,
LPOLESTR filename)
{
ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
- FIXME("%p %s - stub\n", This, wine_dbgstr_w(filename));
- return E_NOTIMPL;
+ TRACE("%p %s\n", This, wine_dbgstr_w(filename));
+
+ if (!filename)
+ return E_INVALIDARG;
+
+ SysFreeString(This->HelpStringDll);
+ This->HelpStringDll = SysAllocString(filename);
+
+ return S_OK;
}
static const ICreateTypeLib2Vtbl CreateTypeLib2Vtbl = {
</pre>
Andrew Eikum
2013-05-24T16:28:35
-
[PATCH 1/4] oleaut32: Stub typelib and typeinfo creation interfacesin typelib.c
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115817
<pre>---
Note: These patches shouldn't conflict with Tatyana's in any way.
This is the start of a fairly long (~30) series of patches to
implement the typelib creation interfaces on top of the typelib.c
structures.
There is an existing implementation of the typelib creation interfaces
in <dlls/oleaut32/typelib2.c>. This implementation is a huge pain to
work with, as it basically moves and pokes the typelib file's bits
directly. Additionally, having two implementations of the typelib
reading/wrigin interfaces causes a lot of unnecessary work. For
example, Tatyana's bug is not present in the <typelib.c>
implementation.
There are basically no tests added through most this sequence. Then
there is a patch to switch to the new creation implementation, which
enables all of the existing tests against the new code and deletes the
old implementation. The next patch past that one adds a bunch of tests
to verify that the typelibs saved to disk read back exactly as they do
on Windows (the current typelib2.c implementation fails the added
tests quite badly, while the new implementation passes).
For reference, here is a log of all of the patches in the series as it
stands today:
oleaut32: Stub typelib and typeinfo creation interfaces in typelib.c
oleaut32: Implement basic ICreateTypeLib functions
oleaut32: Implement basic ICreateTypeInfo functions
oleaut32: Implement ICreateTypeLib::CreateTypeInfo
oleaut32: Implement ICreateTypeInfo::AddRefTypeInfo
oleaut32: Implement ICreateTypeInfo::AddImplType
oleaut32: Improve TYPEFLAG_FDUAL handling
oleaut32: Implement ICreateTypeInfo::AddFuncDesc
oleaut32: Implement ICreateTypeInfo::SetFuncHelpContext
oleaut32: Implement ICreateTypeInfo::SetFuncAndParamNames
oleaut32: Implement ICreateTypeInfo::SetImplTypeFlags
oleaut32: Implement ICreateTypeInfo::SetCustData
oleaut32: Implement ICreateTypeInfo::LayOut
oleaut32: Load and store all of the strings in a typelib
oleaut32: Store all Names in typelibs, too
oleaut32: Pull TLIBATTR struct contents out
oleaut32: Pull TYPEATTR struct contents out
oleaut32: Store all GUIDs in typelibs
oleaut32: Implement ICreateTypeInfo::SetVarHelpContext
oleaut32: Implement ICreateTypeInfo::SetVarDocString
oleaut32: Implement ICreateTypeInfo::AddVarDesc
oleaut32: Implement ICreateTypeLib::SaveAllChanges
oleaut32: When loading typelibs, skip over function default parameters as well
oleaut32: Only copy previous function name if both are property accessors
oleaut32: Don't fall back on typelib name for docstring
oleaut32: Fix ITypeInfo::GetNames for functions
oleaut32: Use implementation bitflag in href
oleaut32: Always read all imports from the typelib
oleaut32: Use the new typelib creation implementation
oleaut32/tests: Add save/load tests for created typelibs
oleaut32: Consistently print numbers
dlls/oleaut32/typelib.c | 547 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 547 insertions(+)
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 9ffcaaa..edc9f21 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
< at >< at > -5,7 +5,9 < at >< at >
* 1999 Rein Klazes
* 2000 Francois Jacques
* 2001 Huw D M Davies for CodeWeavers
+ * 2004 Alastair Bridgewater
* 2005 Robert Shearman, for CodeWeavers
+ * 2013 Andrew Eikum for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
< at >< at > -985,6 +987,7 < at >< at > typedef struct tagITypeLibImpl
{
ITypeLib2 ITypeLib2_iface;
ITypeComp ITypeComp_iface;
+ ICreateTypeLib2 ICreateTypeLib2_iface;
LONG ref;
TLIBATTR LibAttr; /* guid,lcid,syskind,version,flags */
LCID lcid;
< at >< at > -1017,6 +1020,7 < at >< at > typedef struct tagITypeLibImpl
static const ITypeLib2Vtbl tlbvt;
static const ITypeCompVtbl tlbtcvt;
+static const ICreateTypeLib2Vtbl CreateTypeLib2Vtbl;
static inline ITypeLibImpl *impl_from_ITypeLib2(ITypeLib2 *iface)
{
< at >< at > -1033,6 +1037,11 < at >< at > static inline ITypeLibImpl *impl_from_ITypeComp( ITypeComp *iface )
return CONTAINING_RECORD(iface, ITypeLibImpl, ITypeComp_iface);
}
+static inline ITypeLibImpl *impl_from_ICreateTypeLib2( ICreateTypeLib2 *iface )
+{
+ return CONTAINING_RECORD(iface, ITypeLibImpl, ICreateTypeLib2_iface);
+}
+
/* ITypeLib methods */
static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength);
static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength);
< at >< at > -1106,6 +1115,7 < at >< at > typedef struct tagITypeInfoImpl
{
ITypeInfo2 ITypeInfo2_iface;
ITypeComp ITypeComp_iface;
+ ICreateTypeInfo2 ICreateTypeInfo2_iface;
LONG ref;
BOOL not_attached_to_typelib;
TYPEATTR TypeAttr ; /* _lots_ of type information. */
< at >< at > -1148,8 +1158,14 < at >< at > static inline ITypeInfoImpl *impl_from_ITypeInfo( ITypeInfo *iface )
return impl_from_ITypeInfo2((ITypeInfo2*)iface);
}
+static inline ITypeInfoImpl *info_impl_from_ICreateTypeInfo2( ICreateTypeInfo2 *iface )
+{
+ return CONTAINING_RECORD(iface, ITypeInfoImpl, ICreateTypeInfo2_iface);
+}
+
static const ITypeInfo2Vtbl tinfvt;
static const ITypeCompVtbl tcompvt;
+static const ICreateTypeInfo2Vtbl CreateTypeInfo2Vtbl;
static ITypeInfoImpl* ITypeInfoImpl_Constructor(void);
static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This);
< at >< at > -3024,6 +3040,7 < at >< at > static ITypeLibImpl* TypeLibImpl_Constructor(void)
pTypeLibImpl->ITypeLib2_iface.lpVtbl = &tlbvt;
pTypeLibImpl->ITypeComp_iface.lpVtbl = &tlbtcvt;
+ pTypeLibImpl->ICreateTypeLib2_iface.lpVtbl = &CreateTypeLib2Vtbl;
pTypeLibImpl->ref = 1;
list_init(&pTypeLibImpl->implib_list);
< at >< at > -4253,6 +4270,11 < at >< at > static HRESULT WINAPI ITypeLib2_fnQueryInterface(ITypeLib2 *iface, REFIID riid,
{
*ppv = &This->ITypeLib2_iface;
}
+ else if(IsEqualIID(riid, &IID_ICreateTypeLib) ||
+ IsEqualIID(riid, &IID_ICreateTypeLib2))
+ {
+ *ppv = &This->ICreateTypeLib2_iface;
+ }
else
{
*ppv = NULL;
< at >< at > -5078,6 +5100,7 < at >< at > static ITypeInfoImpl* ITypeInfoImpl_Constructor(void)
{
pTypeInfoImpl->ITypeInfo2_iface.lpVtbl = &tinfvt;
pTypeInfoImpl->ITypeComp_iface.lpVtbl = &tcompvt;
+ pTypeInfoImpl->ICreateTypeInfo2_iface.lpVtbl = &CreateTypeInfo2Vtbl;
pTypeInfoImpl->ref = 0;
pTypeInfoImpl->hreftype = -1;
pTypeInfoImpl->TypeAttr.memidConstructor = MEMBERID_NIL;
< at >< at > -5104,6 +5127,9 < at >< at > static HRESULT WINAPI ITypeInfo_fnQueryInterface(
IsEqualIID(riid,&IID_ITypeInfo)||
IsEqualIID(riid,&IID_ITypeInfo2))
*ppvObject = This;
+ else if(IsEqualIID(riid, &IID_ICreateTypeInfo) ||
+ IsEqualIID(riid, &IID_ICreateTypeInfo2))
+ *ppvObject = &This->ICreateTypeInfo2_iface;
if(*ppvObject){
ITypeInfo2_AddRef(iface);
< at >< at > -8049,3 +8075,524 < at >< at > static const ITypeCompVtbl tcompvt =
ITypeComp_fnBind,
ITypeComp_fnBindType
};
+
+static HRESULT WINAPI ICreateTypeLib2_fnQueryInterface(ICreateTypeLib2 *iface,
+ REFIID riid, void **object)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+
+ return ITypeLib2_QueryInterface((ITypeLib2*)This, riid, object);
+}
+
+static ULONG WINAPI ICreateTypeLib2_fnAddRef(ICreateTypeLib2 *iface)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+
+ return ITypeLib2_AddRef((ITypeLib2*)This);
+}
+
+static ULONG WINAPI ICreateTypeLib2_fnRelease(ICreateTypeLib2 *iface)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+
+ return ITypeLib2_Release((ITypeLib2*)This);
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface,
+ LPOLESTR name, TYPEKIND kind, ICreateTypeInfo **ctinfo)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %s %d %p - stub\n", This, wine_dbgstr_w(name), kind, ctinfo);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnSetName(ICreateTypeLib2 *iface,
+ LPOLESTR name)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %s - stub\n", This, wine_dbgstr_w(name));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnSetVersion(ICreateTypeLib2 *iface,
+ WORD majorVerNum, WORD minorVerNum)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %d %d - stub\n", This, majorVerNum, minorVerNum);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnSetGuid(ICreateTypeLib2 *iface,
+ REFGUID guid)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %s - stub\n", This, debugstr_guid(guid));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnSetDocString(ICreateTypeLib2 *iface,
+ LPOLESTR doc)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %s - stub\n", This, wine_dbgstr_w(doc));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnSetHelpFileName(ICreateTypeLib2 *iface,
+ LPOLESTR helpFileName)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %s - stub\n", This, wine_dbgstr_w(helpFileName));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 *iface,
+ DWORD helpContext)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %d - stub\n", This, helpContext);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 *iface,
+ LCID lcid)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %x - stub\n", This, lcid);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnSetLibFlags(ICreateTypeLib2 *iface,
+ UINT libFlags)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %x - stub\n", This, libFlags);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p - stub\n", This);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnDeleteTypeInfo(ICreateTypeLib2 *iface,
+ LPOLESTR name)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %s - stub\n", This, wine_dbgstr_w(name));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnSetCustData(ICreateTypeLib2 *iface,
+ REFGUID guid, VARIANT *varVal)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %s %p - stub\n", This, debugstr_guid(guid), varVal);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringContext(ICreateTypeLib2 *iface,
+ ULONG helpStringContext)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %u - stub\n", This, helpStringContext);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringDll(ICreateTypeLib2 *iface,
+ LPOLESTR filename)
+{
+ ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface);
+ FIXME("%p %s - stub\n", This, wine_dbgstr_w(filename));
+ return E_NOTIMPL;
+}
+
+static const ICreateTypeLib2Vtbl CreateTypeLib2Vtbl = {
+ ICreateTypeLib2_fnQueryInterface,
+ ICreateTypeLib2_fnAddRef,
+ ICreateTypeLib2_fnRelease,
+ ICreateTypeLib2_fnCreateTypeInfo,
+ ICreateTypeLib2_fnSetName,
+ ICreateTypeLib2_fnSetVersion,
+ ICreateTypeLib2_fnSetGuid,
+ ICreateTypeLib2_fnSetDocString,
+ ICreateTypeLib2_fnSetHelpFileName,
+ ICreateTypeLib2_fnSetHelpContext,
+ ICreateTypeLib2_fnSetLcid,
+ ICreateTypeLib2_fnSetLibFlags,
+ ICreateTypeLib2_fnSaveAllChanges,
+ ICreateTypeLib2_fnDeleteTypeInfo,
+ ICreateTypeLib2_fnSetCustData,
+ ICreateTypeLib2_fnSetHelpStringContext,
+ ICreateTypeLib2_fnSetHelpStringDll
+};
+
+static HRESULT WINAPI ICreateTypeInfo2_fnQueryInterface(ICreateTypeInfo2 *iface,
+ REFIID riid, void **object)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+
+ return ITypeInfo2_QueryInterface((ITypeInfo2*)This, riid, object);
+}
+
+static ULONG WINAPI ICreateTypeInfo2_fnAddRef(ICreateTypeInfo2 *iface)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+
+ return ITypeInfo2_AddRef((ITypeInfo2*)This);
+}
+
+static ULONG WINAPI ICreateTypeInfo2_fnRelease(ICreateTypeInfo2 *iface)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+
+ return ITypeInfo2_Release((ITypeInfo2*)This);
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetGuid(ICreateTypeInfo2 *iface,
+ REFGUID guid)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %s - stub\n", This, debugstr_guid(guid));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface,
+ UINT typeFlags)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %x - stub\n", This, typeFlags);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetDocString(ICreateTypeInfo2 *iface,
+ LPOLESTR strDoc)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %s - stub\n", This, wine_dbgstr_w(strDoc));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpContext(ICreateTypeInfo2 *iface,
+ DWORD helpContext)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %d - stub\n", This, helpContext);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetVersion(ICreateTypeInfo2 *iface,
+ WORD majorVerNum, WORD minorVerNum)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %d %d - stub\n", This, majorVerNum, minorVerNum);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo(ICreateTypeInfo2 *iface,
+ ITypeInfo *typeInfo, HREFTYPE *refType)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %p %p - stub\n", This, typeInfo, refType);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc(ICreateTypeInfo2 *iface,
+ UINT index, FUNCDESC *funcDesc)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %p - stub\n", This, index, funcDesc);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface,
+ UINT index, HREFTYPE refType)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %d - stub\n", This, index, refType);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetImplTypeFlags(ICreateTypeInfo2 *iface,
+ UINT index, INT implTypeFlags)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %x - stub\n", This, index, implTypeFlags);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetAlignment(ICreateTypeInfo2 *iface,
+ WORD alignment)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %d - stub\n", This, alignment);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetSchema(ICreateTypeInfo2 *iface,
+ LPOLESTR schema)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %s - stub\n", This, wine_dbgstr_w(schema));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface,
+ UINT index, VARDESC *varDesc)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %p - stub\n", This, index, varDesc);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames(ICreateTypeInfo2 *iface,
+ UINT index, LPOLESTR *names, UINT numNames)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %p %u - stub\n", This, index, names, numNames);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName(ICreateTypeInfo2 *iface,
+ UINT index, LPOLESTR name)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(name));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeDescAlias(ICreateTypeInfo2 *iface,
+ TYPEDESC *tdescAlias)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %p - stub\n", This, tdescAlias);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnDefineFuncAsDllEntry(ICreateTypeInfo2 *iface,
+ UINT index, LPOLESTR dllName, LPOLESTR procName)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %s %s - stub\n", This, index, wine_dbgstr_w(dllName), wine_dbgstr_w(procName));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncDocString(ICreateTypeInfo2 *iface,
+ UINT index, LPOLESTR docString)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(docString));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetVarDocString(ICreateTypeInfo2 *iface,
+ UINT index, LPOLESTR docString)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(docString));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext(ICreateTypeInfo2 *iface,
+ UINT index, DWORD helpContext)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %d - stub\n", This, index, helpContext);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext(ICreateTypeInfo2 *iface,
+ UINT index, DWORD helpContext)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %d - stub\n", This, index, helpContext);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetMops(ICreateTypeInfo2 *iface,
+ UINT index, BSTR bstrMops)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(bstrMops));
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeIdldesc(ICreateTypeInfo2 *iface,
+ IDLDESC *idlDesc)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %p - stub\n", This, idlDesc);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p - stub\n", This);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDesc(ICreateTypeInfo2 *iface,
+ UINT index)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u - stub\n", This, index);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDescByMemId(ICreateTypeInfo2 *iface,
+ MEMBERID memid, INVOKEKIND invKind)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %x %d - stub\n", This, memid, invKind);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnDeleteVarDesc(ICreateTypeInfo2 *iface,
+ UINT index)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u - stub\n", This, index);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnDeleteVarDescByMemId(ICreateTypeInfo2 *iface,
+ MEMBERID memid)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %x - stub\n", This, memid);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnDeleteImplType(ICreateTypeInfo2 *iface,
+ UINT index)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u - stub\n", This, index);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetCustData(ICreateTypeInfo2 *iface,
+ REFGUID guid, VARIANT *varVal)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %s %p - stub\n", This, debugstr_guid(guid), varVal);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncCustData(ICreateTypeInfo2 *iface,
+ UINT index, REFGUID guid, VARIANT *varVal)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %s %p - stub\n", This, index, debugstr_guid(guid), varVal);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetParamCustData(ICreateTypeInfo2 *iface,
+ UINT funcIndex, UINT paramIndex, REFGUID guid, VARIANT *varVal)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %u %s %p - stub\n", This, funcIndex, paramIndex, debugstr_guid(guid), varVal);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetVarCustData(ICreateTypeInfo2 *iface,
+ UINT index, REFGUID guid, VARIANT *varVal)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %s %p - stub\n", This, index, debugstr_guid(guid), varVal);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetImplTypeCustData(ICreateTypeInfo2 *iface,
+ UINT index, REFGUID guid, VARIANT *varVal)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %s %p - stub\n", This, index, debugstr_guid(guid), varVal);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext(ICreateTypeInfo2 *iface,
+ ULONG helpStringContext)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u - stub\n", This, helpStringContext);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpStringContext(ICreateTypeInfo2 *iface,
+ UINT index, ULONG helpStringContext)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %u - stub\n", This, index, helpStringContext);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpStringContext(ICreateTypeInfo2 *iface,
+ UINT index, ULONG helpStringContext)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %u %u - stub\n", This, index, helpStringContext);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnInvalidate(ICreateTypeInfo2 *iface)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p - stub\n", This);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ICreateTypeInfo2_fnSetName(ICreateTypeInfo2 *iface,
+ LPOLESTR name)
+{
+ ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
+ FIXME("%p %s - stub\n", This, wine_dbgstr_w(name));
+ return E_NOTIMPL;
+}
+
+static const ICreateTypeInfo2Vtbl CreateTypeInfo2Vtbl = {
+ ICreateTypeInfo2_fnQueryInterface,
+ ICreateTypeInfo2_fnAddRef,
+ ICreateTypeInfo2_fnRelease,
+ ICreateTypeInfo2_fnSetGuid,
+ ICreateTypeInfo2_fnSetTypeFlags,
+ ICreateTypeInfo2_fnSetDocString,
+ ICreateTypeInfo2_fnSetHelpContext,
+ ICreateTypeInfo2_fnSetVersion,
+ ICreateTypeInfo2_fnAddRefTypeInfo,
+ ICreateTypeInfo2_fnAddFuncDesc,
+ ICreateTypeInfo2_fnAddImplType,
+ ICreateTypeInfo2_fnSetImplTypeFlags,
+ ICreateTypeInfo2_fnSetAlignment,
+ ICreateTypeInfo2_fnSetSchema,
+ ICreateTypeInfo2_fnAddVarDesc,
+ ICreateTypeInfo2_fnSetFuncAndParamNames,
+ ICreateTypeInfo2_fnSetVarName,
+ ICreateTypeInfo2_fnSetTypeDescAlias,
+ ICreateTypeInfo2_fnDefineFuncAsDllEntry,
+ ICreateTypeInfo2_fnSetFuncDocString,
+ ICreateTypeInfo2_fnSetVarDocString,
+ ICreateTypeInfo2_fnSetFuncHelpContext,
+ ICreateTypeInfo2_fnSetVarHelpContext,
+ ICreateTypeInfo2_fnSetMops,
+ ICreateTypeInfo2_fnSetTypeIdldesc,
+ ICreateTypeInfo2_fnLayOut,
+ ICreateTypeInfo2_fnDeleteFuncDesc,
+ ICreateTypeInfo2_fnDeleteFuncDescByMemId,
+ ICreateTypeInfo2_fnDeleteVarDesc,
+ ICreateTypeInfo2_fnDeleteVarDescByMemId,
+ ICreateTypeInfo2_fnDeleteImplType,
+ ICreateTypeInfo2_fnSetCustData,
+ ICreateTypeInfo2_fnSetFuncCustData,
+ ICreateTypeInfo2_fnSetParamCustData,
+ ICreateTypeInfo2_fnSetVarCustData,
+ ICreateTypeInfo2_fnSetImplTypeCustData,
+ ICreateTypeInfo2_fnSetHelpStringContext,
+ ICreateTypeInfo2_fnSetFuncHelpStringContext,
+ ICreateTypeInfo2_fnSetVarHelpStringContext,
+ ICreateTypeInfo2_fnInvalidate,
+ ICreateTypeInfo2_fnSetName
+};
</pre>
Andrew Eikum
2013-05-24T16:28:30
-
gdi32: fix up glyph metrics for tategaki glyphs
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115816
<pre>---
dlls/gdi32/freetype.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 54 insertions(+), 3 deletions(-)
</pre>
Aric Stewart
2013-05-24T16:00:41
-
gdi32: Fix Tategaki rotation
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115815
<pre>
Tategaki does not ignore orientation rotation, instead it always rotates affect glyphs by 90 degrees inside their cell.
---
dlls/gdi32/freetype.c | 57 ++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 43 insertions(+), 14 deletions(-)
</pre>
Aric Stewart
2013-05-24T16:00:25
-
[PATCH 2/2] oleaut32/tests: Add test for ITypeInfo2_fnGetContainingTypeLib (Try 4)
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115814
<pre>Null pointers ppTLib and pIndex result in crash of wine.
Nikolay Sivov wrote 20.12.2012 14:59:
Fixed.
</pre>
Tatyana Fokina
2013-05-24T14:23:47
-
[PATCH 1/2] oleaut32: Ignore NULL ppTLib/pIndex inITypeInfo2_fnGetContainingTypeLib. (try 4)
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115813
<pre>Null pointers ppTLib and pIndex result in crash of wine.
Nikolay Sivov wrote 20.12.2012 14:59:
Fixed.From b64b11c64d0b76e3bd36180ef3f2305548a433b8 Mon Sep 17 00:00:00 2001
From: tatyana <tatyana< at >etersoft.ru>
Date: Fri, 24 May 2013 18:05:14 +0400
Subject: [PATCH 1/2] oleaut32: Ignore NULL ppTLib/pIndex in
ITypeInfo2_fnGetContainingTypeLib
---
dlls/oleaut32/typelib2.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c
index 1aeb27a..4ffc005 100644
--- a/dlls/oleaut32/typelib2.c
+++ b/dlls/oleaut32/typelib2.c
< at >< at > -3707,9 +3707,13 < at >< at > static HRESULT WINAPI ITypeInfo2_fnGetContainingTypeLib(
TRACE("(%p,%p,%p)\n", iface, ppTLib, pIndex);
- *ppTLib = (ITypeLib *)&This->typelib->ITypeLib2_iface;
- ICreateTypeLib_AddRef((ICreateTypeLib*)This->typelib);
- *pIndex = This->typeinfo->typekind >> 16;
+ if(ppTLib)
+ {
+ *ppTLib = (ITypeLib *)&This->typelib->ITypeLib2_iface;
+ ICreateTypeLib_AddRef((ICreateTypeLib*)This->typelib);
+ }
+ if(pIndex)
+ *pIndex = This->typeinfo->typekind >> 16;
return S_OK;
}
</pre>
Tatyana Fokina
2013-05-24T14:23:39
-
[4/5] oledb32: Implement GetConversionSize DBTYPE_VARIANT ->DBTYPE_BYTES
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115812
<pre>Hi,
Also fixes whitespace issue.
Changelog:
oledb32: Implement GetConversionSize DBTYPE_VARIANT -> DBTYPE_BYTES
Best Regards
Alistair Leslie-Hughes
From: Alistair Leslie-Hughes <leslie_alistair< at >hotmail.com>
Date: Tue, 21 May 2013 20:39:09 +1000
Subject: [PATCH] Implement GetConversionSize DBTYPE_VARIANT -> DBTYPE_BYTES
To: wine-patches <wine-patches< at >winehq.org>
---
dlls/oledb32/convert.c | 23 ++++++++++++++++++++++-
dlls/oledb32/tests/convert.c | 16 ++++++++++++++++
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index beca387..fd98b31 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
< at >< at > -121,7 +121,7 < at >< at > static int get_length(DBTYPE type)
case DBTYPE_UI2:
return 2;
case DBTYPE_BOOL:
-return sizeof(VARIANT_BOOL);
+ return sizeof(VARIANT_BOOL);
case DBTYPE_I4:
case DBTYPE_UI4:
case DBTYPE_R4:
< at >< at > -143,6 +143,7 < at >< at > static int get_length(DBTYPE type)
return sizeof(FILETIME);
case DBTYPE_GUID:
return sizeof(GUID);
+ case DBTYPE_BYTES:
case DBTYPE_WSTR:
case DBTYPE_STR:
case DBTYPE_BYREF | DBTYPE_WSTR:
< at >< at > -1378,6 +1379,26 < at >< at > static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface,
}
}
break;
+ case DBTYPE_BYTES:
+ {
+ switch (src_type)
+ {
+ case DBTYPE_VARIANT:
+ {
+ if(V_VT((VARIANT*)src) == VT_BSTR)
+ *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))) / sizeof(WCHAR);
+ else
+ WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src));
+
+ return S_OK;
+ }
+ break;
+ default:
+ FIXME("unimplemented for %04x -> DBTYPE_BYTES\n", src_type);
+ return E_NOTIMPL;
+ }
+ }
+ break;
default:
FIXME("unimplemented for conversion %d->%d\n", src_type, dst_type);
return E_NOTIMPL;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index aee27b8..3a25777 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
< at >< at > -2469,6 +2469,22 < at >< at > static void test_getconversionsize(void)
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
VariantClear(&var);
+ dst_len = 0;
+ src_len = 20;
+ V_VT(&var) = VT_BSTR;
+ V_BSTR(&var) = SysAllocString(strW);
+ hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(dst_len == 2, "%ld\n", dst_len);
+ VariantClear(&var);
+
+ dst_len = 0;
+ src_len = 20;
+ V_VT(&var) = VT_NULL;
+ hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ todo_wine ok(dst_len == 110, "%ld\n", dst_len);
+ VariantClear(&var);
}
static void test_converttobytes(void)
</pre>
Alistair Leslie-Hughes
2013-05-24T08:04:48
-
[3/5] oledb32: Check for DBSTATUS_S_ISNULL first
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115811
<pre>Hi,
Changelog:
oledb32: Check for DBSTATUS_S_ISNULL first
Best Regards
Alistair Leslie-Hughes
From: Alistair Leslie-Hughes <leslie_alistair< at >hotmail.com>
Date: Fri, 24 May 2013 15:35:30 +1000
Subject: [PATCH] Check for DBSTATUS_S_ISNULL first
To: wine-patches <wine-patches< at >winehq.org>
---
dlls/oledb32/convert.c | 10 +++++-----
dlls/oledb32/tests/convert.c | 16 ++++++++++++++++
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 24dbe1a..beca387 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
< at >< at > -179,11 +179,6 < at >< at > static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
*dst_status = DBSTATUS_E_BADACCESSOR;
- if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK)
- {
- return DB_E_UNSUPPORTEDCONVERSION;
- }
-
if(src_status == DBSTATUS_S_ISNULL)
{
*dst_status = DBSTATUS_S_ISNULL;
< at >< at > -191,6 +186,11 < at >< at > static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
return S_OK;
}
+ if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK)
+ {
+ return DB_E_UNSUPPORTEDCONVERSION;
+ }
+
if(dst == NULL && get_length(dst_type) != 0)
{
*dst_len = get_length(src_type);
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index 4f98413..aee27b8 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
< at >< at > -2719,6 +2719,21 < at >< at > static void test_converttotimestamp(void)
SysFreeString(bstr);
}
+static void test_converttoiunknown(void)
+{
+ HRESULT hr;
+ DBSTATUS dst_status;
+ DBLENGTH dst_len;
+ IUnknown *dst = NULL;
+ static WCHAR strW[] = {'t','e','s','t',0};
+
+ dst_len = 0x1234;
+ hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_IUNKNOWN, sizeof(strW), &dst_len, strW, dst, sizeof(dst), DBSTATUS_S_ISNULL, &dst_status, 0, 0, 0);
+ ok(hr == S_OK, "got %08x\n", hr);
+ ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status);
+ ok(dst_len == 0, "got %ld\n", dst_len);
+}
+
START_TEST(convert)
{
HRESULT hr;
< at >< at > -2756,6 +2771,7 < at >< at > START_TEST(convert)
test_converttodbdate();
test_getconversionsize();
test_converttotimestamp();
+ test_converttoiunknown();
IDataConvert_Release(convert);
</pre>
Alistair Leslie-Hughes
2013-05-24T08:04:45
-
[PATCH 2/2] ieframe: Get rid of no longer needed IEDocHost.
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115810
<pre>---
dlls/ieframe/ie.c | 31 +++++++++-------------
dlls/ieframe/ieframe.h | 10 +------
dlls/ieframe/iexplore.c | 69
++++++++++++++++---------------------------------
3 files changed, 35 insertions(+), 75 deletions(-)
</pre>
Jacek Caban
2013-05-24T08:39:31
-
[PATCH 1/2] ieframe: Keep track of InternetExplore external referencesand use that to release document.
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115809
<pre>---
dlls/ieframe/ie.c | 43 +++++++++++++++++++++++++++++++++++++++----
dlls/ieframe/ieframe.h | 2 ++
dlls/ieframe/iexplore.c | 7 +++++--
3 files changed, 46 insertions(+), 6 deletions(-)
</pre>
Jacek Caban
2013-05-24T08:39:20
-
[2/5] oledb32: DataConvert Support NULL variant
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115808
<pre>Hi,
Changelog:
oledb32:
Best Regards
Alistair Leslie-Hughes
From: Alistair Leslie-Hughes <leslie_alistair< at >hotmail.com>
Date: Fri, 24 May 2013 12:23:18 +1000
Subject: [PATCH] DataConver Support NULL variant in
DBTYPE_VARIANT->DBTYPE_WSTR
To: wine-patches <wine-patches< at >winehq.org>
---
dlls/oledb32/convert.c | 3 ++-
dlls/oledb32/tests/convert.c | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 64b7c8a..24dbe1a 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
< at >< at > -787,7 +787,8 < at >< at > static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len,
src, &b, sizeof(BSTR), src_status, dst_status,
precision, scale, flags);
- if(hr != S_OK) return hr;
+ if(hr != S_OK || *dst_status == DBSTATUS_S_ISNULL)
+ return hr;
bstr_len = SysStringLen(b);
*dst_len = bstr_len * sizeof(WCHAR); /* Doesn't include size for '\0' */
*dst_status = DBSTATUS_S_OK;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index dcc20a1..4f98413 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
< at >< at > -1017,6 +1017,7 < at >< at > static void test_converttowstr(void)
static const WCHAR hexunpacked_w[] = {'5','7','0','0','6','9','0','0','6','E','0','0','6','5','0','0','0','0','0','0', 0 };
static const WCHAR hexpacked_w[] = {'W','i','n','e', 0 };
BSTR b;
+ VARIANT v;
memset(dst, 0xcc, sizeof(dst));
dst_len = 0x1234;
< at >< at > -1470,6 +1471,29 < at >< at > static void test_converttowstr(void)
ok(dst_len == 0, "got %ld\n", dst_len);
ok(dst[0] == 0, "not null terminated\n");
ok(dst[1] == 0xcccc, "clobbered buffer\n");
+
+ b = SysAllocStringLen(NULL, 0);
+ V_VT(&v) = VT_BSTR;
+ V_BSTR(&v) = b;
+ hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
+ ok(hr == S_OK, "got %08x\n", hr);
+ ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status);
+ ok(dst_len == 0, "got %ld\n", dst_len);
+ ok(dst != NULL, "got %p\n", dst);
+ ok(dst != b, "got %p src %p\n", dst, b);
+ ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst));
+ SysFreeString(dst);
+ SysFreeString(b);
+
+ V_VT(&v) = VT_NULL;
+ hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
+ ok(hr == S_OK, "got %08x\n", hr);
+ ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status);
+ ok(dst_len == 0, "got %ld\n", dst_len);
+ ok(dst != NULL, "got %p\n", dst);
+ ok(dst != b, "got %p src %p\n", dst, b);
+ ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst));
+ SysFreeString(dst);
}
static void test_converttostr(void)
</pre>
Alistair Leslie-Hughes
2013-05-24T08:04:43
-
[5/5] oledb32: GetConversionSize only returns a valid size of BSTR
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115807
<pre>Hi,
Changed to not use a magic number.
Changelog:
oledb32: GetConversionSize only returns a valid size of BSTR
Best Regards
Alistair Leslie-Hughes
From: Alistair Leslie-Hughes <leslie_alistair< at >hotmail.com>
Date: Fri, 24 May 2013 15:12:24 +1000
Subject: [PATCH] GetConversionSize only returns a valid size of BSTR
To: wine-patches <wine-patches< at >winehq.org>
---
dlls/oledb32/convert.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index fd98b31..7e75356 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
< at >< at > -1349,16 +1349,12 < at >< at > static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface,
{
case DBTYPE_VARIANT:
{
- VARIANT v;
-
- VariantInit(&v);
- if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK)
- {
- *dst_len = (SysStringLen(V_BSTR(&v)) + 1) * sizeof(WCHAR);
- VariantClear(&v);
- }
+ if(V_VT((VARIANT*)src) == VT_BSTR)
+ *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))+1) * sizeof(WCHAR);
else
- return hr;
+ WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src));
+
+ return S_OK;
}
break;
case DBTYPE_STR:
</pre>
Alistair Leslie-Hughes
2013-05-24T08:04:50
-
[1/5] oledb32: Implemented DataConvert DBTYPE_BSTR->DBTYPE_DBTIMESTAMP
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115806
<pre>Hi,
Also corrects whitespace issue.
Changelog:
oledb32: Implemented DataConvert DBTYPE_BSTR->DBTYPE_DBTIMESTAMP
Best Regards
Alistair Leslie-Hughes
From: Alistair Leslie-Hughes <leslie_alistair< at >hotmail.com>
Date: Thu, 23 May 2013 12:13:17 +1000
Subject: [PATCH] Implemented DataConvert DBTYPE_BSTR->DBTYPE_DBTIMESTAMP
To: wine-patches <wine-patches< at >winehq.org>
---
dlls/oledb32/convert.c | 30 ++++++++++++++++++++++++++++--
dlls/oledb32/tests/convert.c | 11 +++++++++++
2 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 9d41860..0961464 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
< at >< at > -480,8 +480,34 < at >< at > static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
DBTIMESTAMP *d=dst;
switch (src_type)
{
-case DBTYPE_EMPTY: memset(d, 0, sizeof(DBTIMESTAMP)); hr = S_OK; break;
-case DBTYPE_DBTIMESTAMP: memcpy(d, src, sizeof(DBTIMESTAMP)); hr = S_OK; break;
+ case DBTYPE_EMPTY: memset(d, 0, sizeof(DBTIMESTAMP)); hr = S_OK; break;
+ case DBTYPE_DBTIMESTAMP: memcpy(d, src, sizeof(DBTIMESTAMP)); hr = S_OK; break;
+ case DBTYPE_BSTR:
+ {
+ VARIANT var;
+ BSTR s = *(WCHAR**)src;
+
+ VariantInit(&var);
+ V_VT(&var) = VT_BSTR;
+ V_BSTR(&var) = SysAllocString(s);
+
+ if ((hr = VariantChangeType(&var, &var, 0, VT_DATE)) == S_OK)
+ {
+ SYSTEMTIME st;
+
+ hr = (VariantTimeToSystemTime( V_DATE(&var), &st) ? S_OK : E_FAIL);
+ d->year = st.wYear;
+ d->month = st.wMonth;
+ d->day = st.wDay;
+ d->hour = st.wHour;
+ d->minute = st.wMinute;
+ d->second = st.wSecond;
+ d->fraction = st.wMilliseconds * 1000000;
+ }
+
+ VariantClear(&var);
+ }
+ break;
case DBTYPE_DATE:
{
SYSTEMTIME st;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index ee2a39b..dcc20a1 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
< at >< at > -2666,12 +2666,14 < at >< at > static void test_converttovar(void)
static void test_converttotimestamp(void)
{
+ static WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2',0};
DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0};
DBTIMESTAMP dst;
DBSTATUS dst_status;
DBLENGTH dst_len;
VARIANT var;
HRESULT hr;
+ BSTR bstr;
VariantInit(&var);
V_VT(&var) = VT_DATE;
< at >< at > -2682,6 +2684,15 < at >< at > static void test_converttotimestamp(void)
ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status);
ok(dst_len == sizeof(dst), "got %ld\n", dst_len);
ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n");
+
+ bstr = SysAllocString(strW);
+ dst_len = 0x1234;
+ hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
+ ok(hr == S_OK, "got %08x\n", hr);
+ ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status);
+ ok(dst_len == sizeof(dst), "got %ld\n", dst_len);
+ ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n");
+ SysFreeString(bstr);
}
START_TEST(convert)
</pre>
Alistair Leslie-Hughes
2013-05-24T08:04:40
-
[2/2] server: A being destroyed object may need to access otherobjects using a handle.
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115805
<pre>A valid winstation handle is needed during clipboard thread clean up.
---
dlls/kernel32/tests/process.c | 1 -
server/handle.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 350c858..88dcfbb 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
< at >< at > -1957,7 +1957,6 < at >< at > static void test_TerminateProcess(void)
SetLastError(0xdeadbeef);
ret = TerminateProcess(pi.hProcess, 0);
-todo_wine
ok(ret, "TerminateProcess error %u\n", GetLastError());
CloseHandle(pi.hProcess);
diff --git a/server/handle.c b/server/handle.c
index 1d8087b..5dc4187 100644
--- a/server/handle.c
+++ b/server/handle.c
< at >< at > -165,7 +165,6 < at >< at > static void handle_table_destroy( struct object *obj )
for (i = 0, entry = table->entries; i <= table->last; i++, entry++)
{
struct object *obj = entry->ptr;
- entry->ptr = NULL;
if (obj) release_object( obj );
}
free( table->entries );
< at >< at > -176,8 +175,8 < at >< at > void close_process_handles( struct process *process )
{
struct handle_table *table = process->handles;
- process->handles = NULL;
if (table) release_object( table );
+ process->handles = NULL;
}
/* allocate a new handle table */
</pre>
Dmitry Timoshkov
2013-05-24T07:58:03
-
[1/2] kernel32: Add a test to show that a process with a not closedhandle to an already terminated thread fails to terminate cleanly.
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115804
<pre>---
dlls/kernel32/tests/process.c | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 2bdc42e..350c858 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
< at >< at > -1926,6 +1926,44 < at >< at > static void test_RegistryQuota(void)
"Expected GetSystemRegistryQuota to return TRUE, got %d\n", ret);
}
+static void test_TerminateProcess(void)
+{
+ static char cmdline[] = "winver.exe";
+ PROCESS_INFORMATION pi;
+ STARTUPINFO si;
+ DWORD ret;
+ HANDLE dummy, thread;
+
+ memset(&si, 0, sizeof(si));
+ si.cb = sizeof(si);
+ SetLastError(0xdeadbeef);
+ ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi);
+ ok(ret, "CreateProcess error %u\n", GetLastError());
+
+ SetLastError(0xdeadbeef);
+ thread = CreateRemoteThread(pi.hProcess, NULL, 0, (void *)0xdeadbeef, NULL, CREATE_SUSPENDED, &ret);
+ ok(thread != 0, "CreateRemoteThread error %d\n", GetLastError());
+
+ /* create a not closed thread handle duplicate in the target process */
+ SetLastError(0xdeadbeef);
+ ret = DuplicateHandle(GetCurrentProcess(), thread, pi.hProcess, &dummy,
+ 0, FALSE, DUPLICATE_SAME_ACCESS);
+ ok(ret, "DuplicateHandle error %u\n", GetLastError());
+
+ SetLastError(0xdeadbeef);
+ ret = TerminateThread(thread, 0);
+ ok(ret, "TerminateThread error %u\n", GetLastError());
+ CloseHandle(thread);
+
+ SetLastError(0xdeadbeef);
+ ret = TerminateProcess(pi.hProcess, 0);
+todo_wine
+ ok(ret, "TerminateProcess error %u\n", GetLastError());
+
+ CloseHandle(pi.hProcess);
+ CloseHandle(pi.hThread);
+}
+
START_TEST(process)
{
int b = init();
< at >< at > -1937,6 +1975,7 < at >< at > START_TEST(process)
doChild(myARGV[2], (myARGC == 3) ? NULL : myARGV[3]);
return;
}
+ test_TerminateProcess();
test_Startup();
test_CommandLine();
test_Directory();
</pre>
Dmitry Timoshkov
2013-05-24T07:57:16
-
[PATCH] user32: Make CreateWindowExA and CreateWindowExW hotpatchable.
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115803
<pre>Fix QQ crashing: http://bugs.winehq.org/show_bug.cgi?id=33322
---
dlls/user32/win.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
</pre>
Qian Hong
2013-05-24T07:24:11
-
clusapi: Add stub for GetClusterInformation
http://comments.gmane.org/gmane.comp.emulators.wine.patches/115802
<pre>---
dlls/clusapi/clusapi.c | 14 ++++++++++++++
dlls/clusapi/clusapi.spec | 2 +-
include/clusapi.h | 17 +++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/dlls/clusapi/clusapi.c b/dlls/clusapi/clusapi.c
index f782d43..88c6fbf 100644
--- a/dlls/clusapi/clusapi.c
+++ b/dlls/clusapi/clusapi.c
< at >< at > -28,6 +28,20 < at >< at >
WINE_DEFAULT_DEBUG_CHANNEL(clusapi);
/***********************************************************************
+ * GetClusterInformation (CLUSAPI.< at >)
+ *
+ */
+DWORD WINAPI GetClusterInformation(HCLUSTER hCluster, LPWSTR lpszClusterName,
+ LPDWORD lpcchClusterName, LPCLUSTERVERSIONINFO lpClusterInfo)
+{
+ FIXME("(%p, %p, %p, %p) stub!\n", hCluster, lpszClusterName, lpcchClusterName, lpClusterInfo);
+
+ *lpcchClusterName = 0;
+
+ return ERROR_SUCCESS;
+}
+
+/***********************************************************************
* GetNodeClusterState (CLUSAPI.< at >)
*
* PARAMS
diff --git a/dlls/clusapi/clusapi.spec b/dlls/clusapi/clusapi.spec
index 9c6abe2..01d3329 100644
--- a/dlls/clusapi/clusapi.spec
+++ b/dlls/clusapi/clusapi.spec
< at >< at > -70,7 +70,7 < at >< at >
< at > stub GetClusterFromResource
< at > stub GetClusterGroupKey
< at > stub GetClusterGroupState
-< at > stub GetClusterInformation
+< at > stdcall GetClusterInformation(ptr ptr ptr ptr)
< at > stub GetClusterKey
< at > stub GetClusterNetInterface
< at > stub GetClusterNetInterfaceKey
diff --git a/include/clusapi.h b/include/clusapi.h
index 7e04964..4ab07cc 100644
--- a/include/clusapi.h
+++ b/include/clusapi.h
< at >< at > -26,7 +26,24 < at >< at > extern "C" {
typedef struct _HCLUSTER *HCLUSTER;
typedef struct _HCLUSENUM *HCLUSENUM;
+
+typedef struct _CLUSTERVERSIONINFO
+{
+ DWORD dwVersionInfoSize;
+ WORD MajorVersion;
+ WORD MinorVersion;
+ WORD BuildNumber;
+ WCHAR szVendorId[64];
+ WCHAR szCSDVersion[64];
+ DWORD dwClusterHighestVersion;
+ DWORD dwClusterLowestVersion;
+ DWORD dwFlags;
+ DWORD dwReserved;
+} CLUSTERVERSIONINFO, *LPCLUSTERVERSIONINFO;
+
BOOL WINAPI CloseCluster(HCLUSTER hCluster);
+DWORD WINAPI GetClusterInformation(HCLUSTER hCluster, LPWSTR lpszClusterName,
+ LPDWORD lpcchClusterName, LPCLUSTERVERSIONINFO lpClusterInfo);
DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState);
HCLUSTER WINAPI OpenCluster(LPCWSTR lpszClusterName);
HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType);
</pre>
André Hentschel
2013-05-23T23:01:03
Search Engine
Search the mailing list at Gmane
query
http://search.gmane.org/?group=$group=gmane.comp.emulators.wine.patches