ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scrobj: Implement get_GUID(). 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-01-27 00:36:12 +03:00 committed by Alexandre Julliard
parent 99a9f53138
commit 0fa152791f
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/scrobj/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = scrobj.dll MODULE = scrobj.dll
IMPORTS = uuid oleaut32 IMPORTS = uuid ole32 oleaut32
C_SRCS = \ C_SRCS = \
scrobj.c scrobj.c

33
dlls/scrobj/scrobj.c
View File

@ -113,6 +113,8 @@ struct scriptlet_typelib
{ {
IGenScriptletTLib IGenScriptletTLib_iface; IGenScriptletTLib IGenScriptletTLib_iface;
LONG ref; LONG ref;
BSTR guid;
}; };
static inline struct scriptlet_typelib *impl_from_IGenScriptletTLib(IGenScriptletTLib *iface) static inline struct scriptlet_typelib *impl_from_IGenScriptletTLib(IGenScriptletTLib *iface)
@ -155,7 +157,10 @@ static ULONG WINAPI scriptlet_typelib_Release(IGenScriptletTLib *iface)
TRACE("(%p)->(%u)\n", This, ref); TRACE("(%p)->(%u)\n", This, ref);
if (!ref) if (!ref)
{
SysFreeString(This->guid);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
}
return ref; return ref;
} }
@ -346,13 +351,34 @@ static HRESULT WINAPI scriptlet_typelib_put_GUID(IGenScriptletTLib *iface, BSTR
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI scriptlet_typelib_get_GUID(IGenScriptletTLib *iface, BSTR *guid) static HRESULT WINAPI scriptlet_typelib_get_GUID(IGenScriptletTLib *iface, BSTR *ret)
{ {
struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface);
FIXME("(%p, %p): stub\n", This, guid); TRACE("(%p, %p)\n", This, ret);
return E_NOTIMPL; *ret = NULL;
if (!This->guid)
{
WCHAR guidW[39];
GUID guid;
HRESULT hr;
hr = CoCreateGuid(&guid);
if (FAILED(hr))
return hr;
hr = StringFromGUID2(&guid, guidW, sizeof(guidW)/sizeof(guidW[0]));
if (FAILED(hr))
return hr;
if (!(This->guid = SysAllocString(guidW)))
return E_OUTOFMEMORY;
}
*ret = SysAllocString(This->guid);
return *ret ? S_OK : E_OUTOFMEMORY;
} }
static const IGenScriptletTLibVtbl scriptlet_typelib_vtbl = static const IGenScriptletTLibVtbl scriptlet_typelib_vtbl =
@ -434,6 +460,7 @@ HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, IUnknown
This->IGenScriptletTLib_iface.lpVtbl = &scriptlet_typelib_vtbl; This->IGenScriptletTLib_iface.lpVtbl = &scriptlet_typelib_vtbl;
This->ref = 1; This->ref = 1;
This->guid = NULL;
hr = IGenScriptletTLib_QueryInterface(&This->IGenScriptletTLib_iface, riid, obj); hr = IGenScriptletTLib_QueryInterface(&This->IGenScriptletTLib_iface, riid, obj);
IGenScriptletTLib_Release(&This->IGenScriptletTLib_iface); IGenScriptletTLib_Release(&This->IGenScriptletTLib_iface);