Module: wine Branch: master Commit: 14a5d71f39d6f0b462f2bc684c256f4730435c43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a5d71f39d6f0b462f2bc684...
Author: Eric Pouech eric.pouech@gmail.com Date: Mon Feb 7 23:10:09 2022 +0100
activeds: Enable compilation with long types.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/activeds/Makefile.in | 1 - dlls/activeds/activeds_main.c | 14 +++++++------- dlls/activeds/pathname.c | 26 +++++++++++++------------- 3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in index 0ab8281c1f2..b9fbdfeca82 100644 --- a/dlls/activeds/Makefile.in +++ b/dlls/activeds/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = activeds.dll IMPORTLIB = activeds IMPORTS = advapi32 ole32 oleaut32 uuid diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 9a8bb3b0e73..e04485b4e36 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -76,7 +76,7 @@ HRESULT WINAPI ADsFreeEnumerator(IEnumVARIANT* pEnumVariant) */ HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements, VARIANT* pvar, ULONG * pcElementsFetched) { - FIXME("(%p)->(%u, %p, %p)!stub\n",pEnumVariant, cElements, pvar, pcElementsFetched); + FIXME("(%p)->(%lu, %p, %p)!stub\n",pEnumVariant, cElements, pvar, pcElementsFetched); return E_NOTIMPL; }
@@ -89,7 +89,7 @@ HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR *str, DWORD count, VARIANT *var) SAFEARRAY *sa; LONG idx, end = count;
- TRACE("(%p, %u, %p)\n", str, count, var); + TRACE("(%p, %lu, %p)\n", str, count, var);
if (!var) return E_ADS_BAD_PARAMETER;
@@ -128,7 +128,7 @@ fail: */ HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD lpdwObjectTypes, DWORD dwObjectTypes, VARIANT* pvar) { - FIXME("(%p, %d, %p)!stub\n",lpdwObjectTypes, dwObjectTypes, pvar); + FIXME("(%p, %ld, %p)!stub\n",lpdwObjectTypes, dwObjectTypes, pvar); return E_NOTIMPL; }
@@ -142,7 +142,7 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD WCHAR provider[MAX_PATH], progid[MAX_PATH]; DWORD idx = 0;
- TRACE("(%s,%s,%u,%s,%p)\n", debugstr_w(path), debugstr_w(user), reserved, debugstr_guid(riid), obj); + TRACE("(%s,%s,%lu,%s,%p)\n", debugstr_w(path), debugstr_w(user), reserved, debugstr_guid(riid), obj);
if (!path || !riid || !obj) return E_INVALIDARG; @@ -216,7 +216,7 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD */ VOID WINAPI ADsSetLastError(DWORD dwErr, LPWSTR pszError, LPWSTR pszProvider) { - FIXME("(%d,%p,%p)!stub\n", dwErr, pszError, pszProvider); + FIXME("(%ld,%p,%p)!stub\n", dwErr, pszError, pszProvider); }
/***************************************************** @@ -224,7 +224,7 @@ VOID WINAPI ADsSetLastError(DWORD dwErr, LPWSTR pszError, LPWSTR pszProvider) */ HRESULT WINAPI ADsGetLastError(LPDWORD perror, LPWSTR errorbuf, DWORD errorbuflen, LPWSTR namebuf, DWORD namebuflen) { - FIXME("(%p,%p,%d,%p,%d)!stub\n", perror, errorbuf, errorbuflen, namebuf, namebuflen); + FIXME("(%p,%p,%ld,%p,%ld)!stub\n", perror, errorbuf, errorbuflen, namebuf, namebuflen); return E_NOTIMPL; }
@@ -295,6 +295,6 @@ BOOL WINAPI ReallocADsStr(LPWSTR *ppStr, LPWSTR pStr) */ HRESULT WINAPI ADsEncodeBinaryData(PBYTE pbSrcData, DWORD dwSrcLen, LPWSTR *ppszDestData) { - FIXME("(%p,%d,%p)!stub\n", pbSrcData, dwSrcLen, *ppszDestData); + FIXME("(%p,%ld,%p)!stub\n", pbSrcData, dwSrcLen, *ppszDestData); return E_NOTIMPL; } diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index fbc7984f2e4..943afd5603d 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -98,21 +98,21 @@ static HRESULT WINAPI path_GetTypeInfoCount(IADsPathname *iface, UINT *count)
static HRESULT WINAPI path_GetTypeInfo(IADsPathname *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%#lx,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; }
static HRESULT WINAPI path_GetIDsOfNames(IADsPathname *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; }
static HRESULT WINAPI path_Invoke(IADsPathname *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -180,7 +180,7 @@ static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) HRESULT hr; BSTR provider, server, dn;
- TRACE("%p,%s,%d\n", iface, debugstr_w(adspath), type); + TRACE("%p,%s,%ld\n", iface, debugstr_w(adspath), type);
if (!adspath) return E_INVALIDARG;
@@ -207,7 +207,7 @@ static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type)
if (type != ADS_SETTYPE_FULL) { - FIXME("type %d not implemented\n", type); + FIXME("type %ld not implemented\n", type); return E_INVALIDARG; }
@@ -227,7 +227,7 @@ static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type)
static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) { - FIXME("%p,%d: stub\n", iface, type); + FIXME("%p,%ld: stub\n", iface, type); return E_NOTIMPL; }
@@ -236,14 +236,14 @@ static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspat Pathname *path = impl_from_IADsPathname(iface); int len;
- TRACE("%p,%d,%p\n", iface, type, adspath); + TRACE("%p,%ld,%p\n", iface, type, adspath);
if (!adspath) return E_INVALIDARG;
switch (type) { default: - FIXME("type %d not implemented\n", type); + FIXME("type %ld not implemented\n", type); /* fall through */
case ADS_FORMAT_X500: @@ -320,7 +320,7 @@ static HRESULT WINAPI path_GetElement(IADsPathname *iface, LONG index, BSTR *ele WCHAR *p, *end; LONG count;
- TRACE("%p,%d,%p\n", iface, index, element); + TRACE("%p,%ld,%p\n", iface, index, element);
if (!element) return E_INVALIDARG;
@@ -366,7 +366,7 @@ static HRESULT WINAPI path_CopyPath(IADsPathname *iface, IDispatch **path)
static HRESULT WINAPI path_GetEscapedElement(IADsPathname *iface, LONG reserved, BSTR element, BSTR *str) { - FIXME("%p,%d,%s,%p: stub\n", iface, reserved, debugstr_w(element), str); + FIXME("%p,%ld,%s,%p: stub\n", iface, reserved, debugstr_w(element), str); return E_NOTIMPL; }
@@ -378,7 +378,7 @@ static HRESULT WINAPI path_get_EscapedMode(IADsPathname *iface, LONG *mode)
static HRESULT WINAPI path_put_EscapedMode(IADsPathname *iface, LONG mode) { - FIXME("%p,%d: stub\n", iface, mode); + FIXME("%p,%ld: stub\n", iface, mode); return E_NOTIMPL; }
@@ -469,7 +469,7 @@ static ULONG WINAPI factory_AddRef(IClassFactory *iface) class_factory *factory = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&factory->ref);
- TRACE("(%p) ref %u\n", iface, ref); + TRACE("(%p) ref %lu\n", iface, ref);
return ref; } @@ -479,7 +479,7 @@ static ULONG WINAPI factory_Release(IClassFactory *iface) class_factory *factory = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&factory->ref);
- TRACE("(%p) ref %u\n", iface, ref); + TRACE("(%p) ref %lu\n", iface, ref);
if (!ref) heap_free(factory);