mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-01 20:13:38 +00:00
Added CreateFormatEnumerator implementation.
This commit is contained in:
parent
95a173a52b
commit
1aad8088e5
|
@ -8,6 +8,7 @@ IMPORTS = cabinet ole32 shlwapi wininet user32 advapi32 kernel32 ntdll
|
|||
EXTRALIBS = -luuid
|
||||
|
||||
C_SRCS = \
|
||||
format.c \
|
||||
regsvr.c \
|
||||
sec_mgr.c \
|
||||
umon.c \
|
||||
|
|
191
dlls/urlmon/format.c
Normal file
191
dlls/urlmon/format.c
Normal file
|
@ -0,0 +1,191 @@
|
|||
/*
|
||||
* Copyright 2005 Jacek Caban
|
||||
*
|
||||
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#define COBJMACROS
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "winuser.h"
|
||||
#include "ole2.h"
|
||||
#include "urlmon.h"
|
||||
#include "urlmon_main.h"
|
||||
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
|
||||
|
||||
typedef struct {
|
||||
const IEnumFORMATETCVtbl *lpEnumFORMATETCVtbl;
|
||||
|
||||
FORMATETC *fetc;
|
||||
UINT fetc_cnt;
|
||||
UINT it;
|
||||
|
||||
LONG ref;
|
||||
} EnumFORMATETC;
|
||||
|
||||
static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, FORMATETC *rgfmtetc, UINT it);
|
||||
|
||||
#define ENUMF_THIS(iface) ICOM_THIS_MULTI(EnumFORMATETC, lpEnumFORMATETCVtbl, iface)
|
||||
|
||||
static HRESULT WINAPI EnumFORMATETC_QueryInterface(IEnumFORMATETC *iface, REFIID riid, void **ppv)
|
||||
{
|
||||
TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv);
|
||||
|
||||
*ppv = NULL;
|
||||
|
||||
if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IEnumFORMATETC, riid)) {
|
||||
*ppv = iface;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
WARN("not supported interface %s\n", debugstr_guid(riid));
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface)
|
||||
{
|
||||
ENUMF_THIS(iface);
|
||||
LONG ref = InterlockedIncrement(&This->ref);
|
||||
TRACE("(%p) ref=%ld\n", This, ref);
|
||||
return ref;
|
||||
}
|
||||
|
||||
static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface)
|
||||
{
|
||||
ENUMF_THIS(iface);
|
||||
LONG ref = InterlockedDecrement(&This->ref);
|
||||
|
||||
TRACE("(%p) ref=%ld\n", This, ref);
|
||||
|
||||
if(!ref) {
|
||||
HeapFree(GetProcessHeap(), 0, This->fetc);
|
||||
HeapFree(GetProcessHeap(), 0, This);
|
||||
|
||||
URLMON_UnlockModule();
|
||||
}
|
||||
|
||||
return ref;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt,
|
||||
FORMATETC *rgelt, ULONG *pceltFetched)
|
||||
{
|
||||
ENUMF_THIS(iface);
|
||||
ULONG cnt;
|
||||
|
||||
TRACE("(%p)->(%ld %p %p)\n", This, celt, rgelt, pceltFetched);
|
||||
|
||||
if(!rgelt)
|
||||
return E_INVALIDARG;
|
||||
|
||||
if(This->it >= This->fetc_cnt || !celt) {
|
||||
if(pceltFetched)
|
||||
*pceltFetched = 0;
|
||||
return celt ? S_FALSE : S_OK;
|
||||
}
|
||||
|
||||
cnt = This->fetc_cnt-This->it > celt ? celt : This->fetc_cnt-This->it;
|
||||
|
||||
memcpy(rgelt, This->fetc+This->it, cnt*sizeof(FORMATETC));
|
||||
This->it += cnt;
|
||||
|
||||
if(pceltFetched)
|
||||
*pceltFetched = cnt;
|
||||
|
||||
return cnt == celt ? S_OK : S_FALSE;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt)
|
||||
{
|
||||
ENUMF_THIS(iface);
|
||||
|
||||
TRACE("(%p)->(%ld)\n", This, celt);
|
||||
|
||||
This->it += celt;
|
||||
return This->it > This->fetc_cnt ? S_FALSE : S_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI EnumFORMATETC_Reset(IEnumFORMATETC *iface)
|
||||
{
|
||||
ENUMF_THIS(iface);
|
||||
|
||||
TRACE("(%p)\n", This);
|
||||
|
||||
This->it = 0;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI EnumFORMATETC_Clone(IEnumFORMATETC *iface, IEnumFORMATETC **ppenum)
|
||||
{
|
||||
ENUMF_THIS(iface);
|
||||
|
||||
TRACE("(%p)->(%p)\n", This, ppenum);
|
||||
|
||||
if(!ppenum)
|
||||
return E_INVALIDARG;
|
||||
|
||||
*ppenum = EnumFORMATETC_Create(This->fetc_cnt, This->fetc, This->it);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
static const IEnumFORMATETCVtbl EnumFORMATETCVtbl = {
|
||||
EnumFORMATETC_QueryInterface,
|
||||
EnumFORMATETC_AddRef,
|
||||
EnumFORMATETC_Release,
|
||||
EnumFORMATETC_Next,
|
||||
EnumFORMATETC_Skip,
|
||||
EnumFORMATETC_Reset,
|
||||
EnumFORMATETC_Clone
|
||||
};
|
||||
|
||||
static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, FORMATETC *rgfmtetc, UINT it)
|
||||
{
|
||||
EnumFORMATETC *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(EnumFORMATETC));
|
||||
|
||||
URLMON_LockModule();
|
||||
|
||||
ret->lpEnumFORMATETCVtbl = &EnumFORMATETCVtbl;
|
||||
ret->ref = 1;
|
||||
ret->it = it;
|
||||
ret->fetc_cnt = cfmtetc;
|
||||
|
||||
ret->fetc = HeapAlloc(GetProcessHeap(), 0, cfmtetc*sizeof(FORMATETC));
|
||||
memcpy(ret->fetc, rgfmtetc, cfmtetc*sizeof(FORMATETC));
|
||||
|
||||
return (IEnumFORMATETC*)ret;
|
||||
}
|
||||
|
||||
/**********************************************************
|
||||
* CreateFormatEnumerator (urlmon.@)
|
||||
*/
|
||||
HRESULT WINAPI CreateFormatEnumerator(UINT cfmtetc, FORMATETC *rgfmtetc,
|
||||
IEnumFORMATETC** ppenumfmtetc)
|
||||
{
|
||||
TRACE("(%d %p %p)\n", cfmtetc, rgfmtetc, ppenumfmtetc);
|
||||
|
||||
if(!ppenumfmtetc)
|
||||
return E_INVALIDARG;
|
||||
if(!cfmtetc)
|
||||
return E_FAIL;
|
||||
|
||||
*ppenumfmtetc = EnumFORMATETC_Create(cfmtetc, rgfmtetc, 0);
|
||||
return S_OK;
|
||||
}
|
|
@ -1,4 +1,5 @@
|
|||
Makefile
|
||||
generated.ok
|
||||
misc.ok
|
||||
testlist.c
|
||||
url.ok
|
||||
|
|
|
@ -8,6 +8,7 @@ EXTRALIBS = -luuid
|
|||
|
||||
CTESTS = \
|
||||
generated.c \
|
||||
misc.c \
|
||||
url.c
|
||||
|
||||
@MAKE_TEST_RULES@
|
||||
|
|
135
dlls/urlmon/tests/misc.c
Normal file
135
dlls/urlmon/tests/misc.c
Normal file
|
@ -0,0 +1,135 @@
|
|||
/*
|
||||
* Copyright 2005 Jacek Caban
|
||||
*
|
||||
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#define COBJMACROS
|
||||
|
||||
#include <wine/test.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "ole2.h"
|
||||
#include "urlmon.h"
|
||||
|
||||
static void test_CreateFormatEnum(void)
|
||||
{
|
||||
IEnumFORMATETC *fenum = NULL, *fenum2 = NULL;
|
||||
FORMATETC fetc[5];
|
||||
ULONG ul;
|
||||
HRESULT hres;
|
||||
|
||||
static DVTARGETDEVICE dev = {sizeof(dev),0,0,0,0,{0}};
|
||||
static FORMATETC formatetc[] = {
|
||||
{0,&dev,0,0,0},
|
||||
{0,&dev,0,1,0},
|
||||
{0,NULL,0,2,0},
|
||||
{0,NULL,0,3,0},
|
||||
{0,NULL,0,4,0}
|
||||
};
|
||||
|
||||
hres = CreateFormatEnumerator(0, formatetc, &fenum);
|
||||
ok(hres == E_FAIL, "CreateFormatEnumerator failed: %08lx, expected E_FAIL\n", hres);
|
||||
hres = CreateFormatEnumerator(0, formatetc, NULL);
|
||||
ok(hres == E_INVALIDARG, "CreateFormatEnumerator failed: %08lx, expected E_INVALIDARG\n", hres);
|
||||
hres = CreateFormatEnumerator(5, formatetc, NULL);
|
||||
ok(hres == E_INVALIDARG, "CreateFormatEnumerator failed: %08lx, expected E_INVALIDARG\n", hres);
|
||||
|
||||
|
||||
hres = CreateFormatEnumerator(5, formatetc, &fenum);
|
||||
ok(hres == S_OK, "CreateFormatEnumerator failed: %08lx\n", hres);
|
||||
if(FAILED(hres))
|
||||
return;
|
||||
|
||||
hres = IEnumFORMATETC_Next(fenum, 2, NULL, &ul);
|
||||
ok(hres == E_INVALIDARG, "Next failed: %08lx, expected E_INVALIDARG\n", hres);
|
||||
ul = 100;
|
||||
hres = IEnumFORMATETC_Next(fenum, 0, fetc, &ul);
|
||||
ok(hres == S_OK, "Next failed: %08lx\n", hres);
|
||||
ok(ul == 0, "ul=%ld, expected 0\n", ul);
|
||||
|
||||
hres = IEnumFORMATETC_Next(fenum, 2, fetc, &ul);
|
||||
ok(hres == S_OK, "Next failed: %08lx\n", hres);
|
||||
ok(fetc[0].lindex == 0, "fetc[0].lindex=%ld, expected 0\n", fetc[0].lindex);
|
||||
ok(fetc[1].lindex == 1, "fetc[1].lindex=%ld, expected 1\n", fetc[1].lindex);
|
||||
ok(fetc[0].ptd == &dev, "fetc[0].ptd=%p, expected %p\n", fetc[0].ptd, &dev);
|
||||
ok(ul == 2, "ul=%ld, expected 2\n", ul);
|
||||
|
||||
hres = IEnumFORMATETC_Skip(fenum, 1);
|
||||
ok(hres == S_OK, "Skip failed: %08lx\n", hres);
|
||||
|
||||
hres = IEnumFORMATETC_Next(fenum, 4, fetc, &ul);
|
||||
ok(hres == S_FALSE, "Next failed: %08lx, expected S_FALSE\n", hres);
|
||||
ok(fetc[0].lindex == 3, "fetc[0].lindex=%ld, expected 3\n", fetc[0].lindex);
|
||||
ok(fetc[1].lindex == 4, "fetc[1].lindex=%ld, expected 4\n", fetc[1].lindex);
|
||||
ok(fetc[0].ptd == NULL, "fetc[0].ptd=%p, expected NULL\n", fetc[0].ptd);
|
||||
ok(ul == 2, "ul=%ld, expected 2\n", ul);
|
||||
|
||||
hres = IEnumFORMATETC_Next(fenum, 4, fetc, &ul);
|
||||
ok(hres == S_FALSE, "Next failed: %08lx, expected S_FALSE\n", hres);
|
||||
ok(ul == 0, "ul=%ld, expected 0\n", ul);
|
||||
ul = 100;
|
||||
hres = IEnumFORMATETC_Next(fenum, 0, fetc, &ul);
|
||||
ok(hres == S_OK, "Next failed: %08lx\n", hres);
|
||||
ok(ul == 0, "ul=%ld, expected 0\n", ul);
|
||||
|
||||
hres = IEnumFORMATETC_Skip(fenum, 3);
|
||||
ok(hres == S_FALSE, "Skip failed: %08lx, expected S_FALSE\n", hres);
|
||||
|
||||
hres = IEnumFORMATETC_Reset(fenum);
|
||||
ok(hres == S_OK, "Reset failed: %08lx\n", hres);
|
||||
|
||||
hres = IEnumFORMATETC_Next(fenum, 5, fetc, NULL);
|
||||
ok(hres == S_OK, "Next failed: %08lx\n", hres);
|
||||
ok(fetc[0].lindex == 0, "fetc[0].lindex=%ld, expected 0\n", fetc[0].lindex);
|
||||
|
||||
hres = IEnumFORMATETC_Reset(fenum);
|
||||
ok(hres == S_OK, "Reset failed: %08lx\n", hres);
|
||||
|
||||
hres = IEnumFORMATETC_Skip(fenum, 2);
|
||||
ok(hres == S_OK, "Skip failed: %08lx\n", hres);
|
||||
|
||||
hres = IEnumFORMATETC_Clone(fenum, NULL);
|
||||
ok(hres == E_INVALIDARG, "Clone failed: %08lx, expected E_INVALIDARG\n", hres);
|
||||
|
||||
hres = IEnumFORMATETC_Clone(fenum, &fenum2);
|
||||
ok(hres == S_OK, "Clone failed: %08lx\n", hres);
|
||||
|
||||
if(SUCCEEDED(hres)) {
|
||||
ok(fenum != fenum2, "fenum == fenum2\n");
|
||||
|
||||
hres = IEnumFORMATETC_Next(fenum2, 2, fetc, &ul);
|
||||
ok(hres == S_OK, "Next failed: %08lx\n", hres);
|
||||
ok(fetc[0].lindex == 2, "fetc[0].lindex=%ld, expected 2\n", fetc[0].lindex);
|
||||
|
||||
IEnumFORMATETC_Release(fenum2);
|
||||
}
|
||||
|
||||
hres = IEnumFORMATETC_Next(fenum, 2, fetc, &ul);
|
||||
ok(hres == S_OK, "Next failed: %08lx\n", hres);
|
||||
ok(fetc[0].lindex == 2, "fetc[0].lindex=%ld, expected 2\n", fetc[0].lindex);
|
||||
|
||||
hres = IEnumFORMATETC_Skip(fenum, 1);
|
||||
ok(hres == S_OK, "Skip failed: %08lx\n", hres);
|
||||
|
||||
IEnumFORMATETC_Release(fenum);
|
||||
}
|
||||
|
||||
START_TEST(misc)
|
||||
{
|
||||
test_CreateFormatEnum();
|
||||
}
|
|
@ -24,7 +24,7 @@
|
|||
@ stub CopyStgMedium
|
||||
@ stdcall CreateAsyncBindCtx(long ptr ptr ptr)
|
||||
@ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long)
|
||||
@ stub CreateFormatEnumerator
|
||||
@ stdcall CreateFormatEnumerator(long ptr ptr)
|
||||
@ stdcall CreateURLMoniker(ptr wstr ptr)
|
||||
@ stdcall -private DllCanUnloadNow()
|
||||
@ stdcall -private DllGetClassObject(ptr ptr ptr)
|
||||
|
|
|
@ -1122,6 +1122,7 @@ cpp_quote("HRESULT WINAPI CoInternetCombineUrl(LPCWSTR,LPCWSTR,DWORD,LPWSTR,DWOR
|
|||
cpp_quote("HRESULT WINAPI CoInternetCompareUrl(LPCWSTR,LPCWSTR,DWORD);")
|
||||
cpp_quote("HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider*, IInternetZoneManager**, DWORD);")
|
||||
cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);")
|
||||
cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC**);")
|
||||
cpp_quote("HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi);")
|
||||
cpp_quote("HRESULT WINAPI FaultInIEFeature(HWND,uCLSSPEC*,QUERYCONTEXT*,DWORD);")
|
||||
cpp_quote("HRESULT WINAPI FindMimeFromData(LPBC,LPCWSTR,LPVOID,DWORD,LPCWSTR,DWORD,LPWSTR*,DWORD);")
|
||||
|
@ -1133,6 +1134,8 @@ cpp_quote("HRESULT WINAPI HlinkSimpleNavigateToMoniker(IMoniker*,LPCWSTR,LPCWSTR
|
|||
cpp_quote("HRESULT WINAPI HlinkSimpleNavigateToString(LPCWSTR,LPCWSTR,LPCWSTR,IUnknown*,IBindCtx*,IBindStatusCallback*,DWORD,DWORD);")
|
||||
cpp_quote("HRESULT WINAPI IsValidURL(LPBC,LPCWSTR,DWORD);")
|
||||
cpp_quote("HRESULT WINAPI ObtainUserAgentString(DWORD,LPSTR,DWORD*);")
|
||||
cpp_quote("HRESULT WINAPI RegisterFormatEnumerator(LPBC,IEnumFORMATETC*,DWORD);")
|
||||
cpp_quote("HRESULT WINAPI RevokeFormatEnumerator(LPBC,IEnumFORMATETC*);")
|
||||
cpp_quote("HRESULT WINAPI RevokeBindStatusCallback(LPBC,IBindStatusCallback*);")
|
||||
cpp_quote("void WINAPI ReleaseBindInfo(BINDINFO*);")
|
||||
cpp_quote("HRESULT WINAPI UrlMkGetSessionOption(DWORD,LPVOID,DWORD,DWORD*,DWORD);")
|
||||
|
|
Loading…
Reference in a new issue