marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

widl: Output "LONG" instead of "long" for a 32bit integer. 

long is always 32bit in IDL files but that's not true in C.
oldstable
Michael Stefaniuc 2009-03-12 23:04:35 +01:00 committed by Alexandre Julliard
parent d11e14d77f
commit efbb4ebf3e
19 changed files with 74 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/amstream/amstream.c
View File

@ -145,11 +145,11 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream
return MS_E_NOSTREAM;
}
static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStream* iface, long Index, IMediaStream** ppMediaStream)
static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStream* iface, LONG Index, IMediaStream** ppMediaStream)
{
IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface;
FIXME("(%p/%p)->(%ld,%p) stub!\n", This, iface, Index, ppMediaStream);
FIXME("(%p/%p)->(%d,%p) stub!\n", This, iface, Index, ppMediaStream);
return E_NOTIMPL;
}

4
dlls/amstream/mediastreamfilter.c
View File

@ -235,9 +235,9 @@ static HRESULT WINAPI MediaStreamFilterImpl_GetMediaStream(IMediaStreamFilter* i
return E_NOTIMPL;
}
static HRESULT WINAPI MediaStreamFilterImpl_EnumMediaStreams(IMediaStreamFilter* iface, long Index, IMediaStream **ppMediaStream)
static HRESULT WINAPI MediaStreamFilterImpl_EnumMediaStreams(IMediaStreamFilter* iface, LONG Index, IMediaStream **ppMediaStream)
{
FIXME("(%p)->(%ld,%p): Stub!\n", iface, Index, ppMediaStream);
FIXME("(%p)->(%d,%p): Stub!\n", iface, Index, ppMediaStream);
return E_NOTIMPL;
}

12
dlls/inkobj/inkcollector.c
View File

@ -80,14 +80,14 @@ static HRESULT WINAPI InkCollector_Invoke(
}
static HRESULT WINAPI InkCollector_get_hWnd(
IInkCollector* This, long* CurrentWindow)
IInkCollector* This, LONG* CurrentWindow)
{
FIXME("stub!\n");
return E_NOTIMPL;
}
static HRESULT WINAPI InkCollector_put_hWnd(
IInkCollector* This, long CurrentWindow)
IInkCollector* This, LONG CurrentWindow)
{
FIXME("stub!\n");
return E_NOTIMPL;
@ -255,28 +255,28 @@ static HRESULT WINAPI InkCollector_get_Cursors(
}
static HRESULT WINAPI InkCollector_get_MarginX(
IInkCollector* This, long* MarginX)
IInkCollector* This, LONG* MarginX)
{
FIXME("stub!\n");
return E_NOTIMPL;
}
static HRESULT WINAPI InkCollector_put_MarginX(
IInkCollector* This, long MarginX)
IInkCollector* This, LONG MarginX)
{
FIXME("stub!\n");
return E_NOTIMPL;
}
static HRESULT WINAPI InkCollector_get_MarginY(
IInkCollector* This, long* MarginY)
IInkCollector* This, LONG* MarginY)
{
FIXME("stub!\n");
return E_NOTIMPL;
}
static HRESULT WINAPI InkCollector_put_MarginY(
IInkCollector* This, long MarginY)
IInkCollector* This, LONG MarginY)
{
FIXME("stub!\n");
return E_NOTIMPL;

10
dlls/ole32/marshal.c
View File

@ -431,7 +431,7 @@ static HRESULT WINAPI Proxy_MarshalInterface(
if (SUCCEEDED(hr))
{
TRACE("writing stdobjref:\n\tflags = %04lx\n\tcPublicRefs = %ld\n\toxid = %s\n\toid = %s\n\tipid = %s\n",
TRACE("writing stdobjref:\n\tflags = %04x\n\tcPublicRefs = %d\n\toxid = %s\n\toid = %s\n\tipid = %s\n",
stdobjref.flags, stdobjref.cPublicRefs,
wine_dbgstr_longlong(stdobjref.oxid),
wine_dbgstr_longlong(stdobjref.oid),
@ -925,7 +925,7 @@ static HRESULT proxy_manager_create_ifproxy(
LeaveCriticalSection(&This->cs);
*iif_out = ifproxy;
TRACE("ifproxy %p created for IPID %s, interface %s with %lu public refs\n",
TRACE("ifproxy %p created for IPID %s, interface %s with %u public refs\n",
ifproxy, debugstr_guid(&stdobjref->ipid), debugstr_guid(riid), stdobjref->cPublicRefs);
}
else
@ -1239,7 +1239,7 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt,
assert(apt);
TRACE("stdobjref:\n\tflags = %04lx\n\tcPublicRefs = %ld\n\toxid = %s\n\toid = %s\n\tipid = %s\n",
TRACE("stdobjref:\n\tflags = %04x\n\tcPublicRefs = %d\n\toxid = %s\n\toid = %s\n\tipid = %s\n",
stdobjref->flags, stdobjref->cPublicRefs,
wine_dbgstr_longlong(stdobjref->oxid),
wine_dbgstr_longlong(stdobjref->oid),
@ -1546,7 +1546,7 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal,
/* sanity check on header */
if (objref.signature != OBJREF_SIGNATURE)
{
ERR("Bad OBJREF signature 0x%08lx\n", objref.signature);
ERR("Bad OBJREF signature 0x%08x\n", objref.signature);
return RPC_E_INVALID_OBJREF;
}
@ -1578,7 +1578,7 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal,
}
else
{
FIXME("Invalid or unimplemented marshaling type specified: %lx\n",
FIXME("Invalid or unimplemented marshaling type specified: %x\n",
objref.flags);
return RPC_E_INVALID_OBJREF;
}

6
dlls/ole32/rpc.c
View File

@ -1175,7 +1175,7 @@ static HRESULT unmarshal_ORPC_EXTENT_ARRAY(RPC_MESSAGE *msg, const char *end,
/* arbitrary limit for security (don't know what native does) */
if (extensions->size > 256)
{
ERR("too many extensions: %ld\n", extensions->size);
ERR("too many extensions: %d\n", extensions->size);
return RPC_S_INVALID_BOUND;
}
@ -1242,7 +1242,7 @@ static HRESULT unmarshal_ORPCTHIS(RPC_MESSAGE *msg, ORPCTHIS *orpcthis,
if (orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4))
{
ERR("invalid flags 0x%lx\n", orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4));
ERR("invalid flags 0x%x\n", orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4));
return RPC_E_INVALID_HEADER;
}
@ -1285,7 +1285,7 @@ static HRESULT unmarshal_ORPCTHAT(RPC_MESSAGE *msg, ORPCTHAT *orpcthat,
if (orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4))
{
ERR("invalid flags 0x%lx\n", orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4));
ERR("invalid flags 0x%x\n", orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4));
return RPC_E_INVALID_HEADER;
}

2
dlls/ole32/stg_prop.c
View File

@ -1063,7 +1063,7 @@ static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This,
case VT_INT:
case VT_I4:
StorageUtl_ReadDWord(data, 0, (DWORD*)&prop->u.lVal);
TRACE("Read long %ld\n", prop->u.lVal);
TRACE("Read long %d\n", prop->u.lVal);
break;
case VT_UINT:
case VT_UI4:

4
dlls/ole32/stubmanager.c
View File

@ -702,7 +702,7 @@ static HRESULT WINAPI RemUnknown_RemAddRef(IRemUnknown *iface,
stub_manager_ext_addref(stubmgr, InterfaceRefs[i].cPublicRefs, FALSE);
if (InterfaceRefs[i].cPrivateRefs)
FIXME("Adding %ld refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs);
FIXME("Adding %d refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs);
stub_manager_int_release(stubmgr);
apartment_release(apt);
@ -735,7 +735,7 @@ static HRESULT WINAPI RemUnknown_RemRelease(IRemUnknown *iface,
stub_manager_ext_release(stubmgr, InterfaceRefs[i].cPublicRefs, FALSE, TRUE);
if (InterfaceRefs[i].cPrivateRefs)
FIXME("Releasing %ld refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs);
FIXME("Releasing %d refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs);
stub_manager_int_release(stubmgr);
apartment_release(apt);

6
dlls/ole32/tests/stg_prop.c
View File

@ -160,7 +160,7 @@ static void testProps(void)
hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var);
ok(hr == S_OK, "ReadMultiple failed: 0x%08x\n", hr);
ok(var.vt == VT_I4 && U(var).lVal == 1,
"Didn't get expected type or value for property (got type %d, value %ld)\n",
"Didn't get expected type or value for property (got type %d, value %d)\n",
var.vt, U(var).lVal);
/* read by name */
spec.ulKind = PRSPEC_LPWSTR;
@ -168,7 +168,7 @@ static void testProps(void)
hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var);
ok(hr == S_OK, "ReadMultiple failed: 0x%08x\n", hr);
ok(var.vt == VT_I4 && U(var).lVal == 2,
"Didn't get expected type or value for property (got type %d, value %ld)\n",
"Didn't get expected type or value for property (got type %d, value %d)\n",
var.vt, U(var).lVal);
/* read string value */
spec.ulKind = PRSPEC_PROPID;
@ -273,7 +273,7 @@ static void testProps(void)
hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var);
ok(hr == S_OK, "ReadMultiple failed: 0x%08x\n", hr);
ok(var.vt == VT_I4 && U(var).lVal == 2,
"Didn't get expected type or value for property (got type %d, value %ld)\n",
"Didn't get expected type or value for property (got type %d, value %d)\n",
var.vt, U(var).lVal);
spec.ulKind = PRSPEC_PROPID;
U(spec).propid = PIDSI_AUTHOR;

2
dlls/ole32/tests/usrmarshal.c
View File

@ -139,7 +139,7 @@ static void test_marshal_HWND(void)
init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL);
HWND_UserMarshal(&umcb.Flags, buffer, &hwnd);
wirehwnd = (wireHWND)buffer;
ok(wirehwnd->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08lx\n", wirehwnd->fContext);
ok(wirehwnd->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehwnd->fContext);
ok(wirehwnd->u.hInproc == (LONG_PTR)hwnd, "Marshaled value should be %p instead of %p\n", hwnd, (HANDLE)wirehwnd->u.hRemote);
init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL);

4
dlls/ole32/usrmarshal.c
View File

@ -2414,7 +2414,7 @@ HRESULT CALLBACK IStorage_OpenStream_Proxy(
HRESULT __RPC_STUB IStorage_OpenStream_Stub(
IStorage* This,
LPCOLESTR pwcsName,
unsigned long cbReserved1,
ULONG cbReserved1,
byte *reserved1,
DWORD grfMode,
DWORD reserved2,
@ -2438,7 +2438,7 @@ HRESULT CALLBACK IStorage_EnumElements_Proxy(
HRESULT __RPC_STUB IStorage_EnumElements_Stub(
IStorage* This,
DWORD reserved1,
unsigned long cbReserved2,
ULONG cbReserved2,
byte *reserved2,
DWORD reserved3,
IEnumSTATSTG **ppenum)

2
dlls/oleaut32/tests/tmarshal.c
View File

@ -849,7 +849,7 @@ static HRESULT WINAPI KindaEnum_Next(
static HRESULT WINAPI KindaEnum_Count(
IKindaEnumWidget *iface,
/* [out] */ unsigned long __RPC_FAR *count)
/* [out] */ ULONG __RPC_FAR *count)
{
return E_NOTIMPL;
}

2
dlls/quartz/memallocator.c
View File

@ -501,7 +501,7 @@ static HRESULT WINAPI StdMediaSample2_GetPointer(IMediaSample2 * iface, BYTE **
return S_OK;
}
static long WINAPI StdMediaSample2_GetSize(IMediaSample2 * iface)
static LONG WINAPI StdMediaSample2_GetSize(IMediaSample2 * iface)
{
StdMediaSample2 *This = (StdMediaSample2 *)iface;

4
dlls/quartz/pin.c
View File

@ -620,12 +620,12 @@ static HRESULT WINAPI MemInputPin_Receive(IMemInputPin * iface, IMediaSample * p
return hr;
}
static HRESULT WINAPI MemInputPin_ReceiveMultiple(IMemInputPin * iface, IMediaSample ** pSamples, long nSamples, long *nSamplesProcessed)
static HRESULT WINAPI MemInputPin_ReceiveMultiple(IMemInputPin * iface, IMediaSample ** pSamples, LONG nSamples, LONG *nSamplesProcessed)
{
HRESULT hr = S_OK;
InputPin *This = impl_from_IMemInputPin(iface);
TRACE("(%p/%p)->(%p, %ld, %p)\n", This, iface, pSamples, nSamples, nSamplesProcessed);
TRACE("(%p/%p)->(%p, %d, %p)\n", This, iface, pSamples, nSamples, nSamplesProcessed);
for (*nSamplesProcessed = 0; *nSamplesProcessed < nSamples; (*nSamplesProcessed)++)
{

6
dlls/rpcrt4/tests/server.c
View File

@ -141,8 +141,8 @@ s_square_half_float(float x, float *y)
return x * x;
}
long
s_square_half_long(long x, long *y)
LONG
s_square_half_long(LONG x, LONG *y)
{
*y = x / 2;
return x * x;
@ -741,7 +741,7 @@ basic_tests(void)
int i1, i2, i3, *pi2, *pi3, **ppi3;
double u, v;
float s, t;
long q, r;
LONG q, r;
short h;
char c;
int x;

26
dlls/shdocvw/ie.c
View File

@ -220,59 +220,59 @@ static HRESULT WINAPI InternetExplorer_get_Type(IWebBrowser2 *iface, BSTR *Type)
return E_NOTIMPL;
}
static HRESULT WINAPI InternetExplorer_get_Left(IWebBrowser2 *iface, long *pl)
static HRESULT WINAPI InternetExplorer_get_Left(IWebBrowser2 *iface, LONG *pl)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%p)\n", This, pl);
return E_NOTIMPL;
}
static HRESULT WINAPI InternetExplorer_put_Left(IWebBrowser2 *iface, long Left)
static HRESULT WINAPI InternetExplorer_put_Left(IWebBrowser2 *iface, LONG Left)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%ld)\n", This, Left);
FIXME("(%p)->(%d)\n", This, Left);
return E_NOTIMPL;
}
static HRESULT WINAPI InternetExplorer_get_Top(IWebBrowser2 *iface, long *pl)
static HRESULT WINAPI InternetExplorer_get_Top(IWebBrowser2 *iface, LONG *pl)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%p)\n", This, pl);
return E_NOTIMPL;
}
static HRESULT WINAPI InternetExplorer_put_Top(IWebBrowser2 *iface, long Top)
static HRESULT WINAPI InternetExplorer_put_Top(IWebBrowser2 *iface, LONG Top)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%ld)\n", This, Top);
FIXME("(%p)->(%d)\n", This, Top);
return E_NOTIMPL;
}
static HRESULT WINAPI InternetExplorer_get_Width(IWebBrowser2 *iface, long *pl)
static HRESULT WINAPI InternetExplorer_get_Width(IWebBrowser2 *iface, LONG *pl)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%p)\n", This, pl);
return E_NOTIMPL;
}
static HRESULT WINAPI InternetExplorer_put_Width(IWebBrowser2 *iface, long Width)
static HRESULT WINAPI InternetExplorer_put_Width(IWebBrowser2 *iface, LONG Width)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%ld)\n", This, Width);
FIXME("(%p)->(%d)\n", This, Width);
return E_NOTIMPL;
}
static HRESULT WINAPI InternetExplorer_get_Height(IWebBrowser2 *iface, long *pl)
static HRESULT WINAPI InternetExplorer_get_Height(IWebBrowser2 *iface, LONG *pl)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%p)\n", This, pl);
return E_NOTIMPL;
}
static HRESULT WINAPI InternetExplorer_put_Height(IWebBrowser2 *iface, long Height)
static HRESULT WINAPI InternetExplorer_put_Height(IWebBrowser2 *iface, LONG Height)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%ld)\n", This, Height);
FIXME("(%p)->(%d)\n", This, Height);
return E_NOTIMPL;
}
@ -332,7 +332,7 @@ static HRESULT WINAPI InternetExplorer_get_Name(IWebBrowser2 *iface, BSTR *Name)
return E_NOTIMPL;
}
static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, long *pHWND)
static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, LONG *pHWND)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%p)\n", This, pHWND);

4
dlls/shdocvw/tests/webbrowser.c
View File

@ -1570,7 +1570,7 @@ static void test_ie_funcs(IUnknown *unk)
IDispatch *disp;
VARIANT_BOOL b;
int i;
long hwnd;
LONG hwnd;
HRESULT hres;
hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb);
@ -1583,7 +1583,7 @@ static void test_ie_funcs(IUnknown *unk)
hwnd = 0xdeadbeef;
hres = IWebBrowser2_get_HWND(wb, &hwnd);
ok(hres == E_FAIL, "get_HWND failed: %08x, expected E_FAIL\n", hres);
ok(hwnd == 0, "unexpected hwnd %lx\n", hwnd);
ok(hwnd == 0, "unexpected hwnd %x\n", hwnd);
/* MenuBar */

26
dlls/shdocvw/webbrowser.c
View File

@ -351,7 +351,7 @@ static HRESULT WINAPI WebBrowser_get_Type(IWebBrowser2 *iface, BSTR *Type)
return E_NOTIMPL;
}
static HRESULT WINAPI WebBrowser_get_Left(IWebBrowser2 *iface, long *pl)
static HRESULT WINAPI WebBrowser_get_Left(IWebBrowser2 *iface, LONG *pl)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
@ -361,12 +361,12 @@ static HRESULT WINAPI WebBrowser_get_Left(IWebBrowser2 *iface, long *pl)
return S_OK;
}
static HRESULT WINAPI WebBrowser_put_Left(IWebBrowser2 *iface, long Left)
static HRESULT WINAPI WebBrowser_put_Left(IWebBrowser2 *iface, LONG Left)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
RECT rect;
TRACE("(%p)->(%ld)\n", This, Left);
TRACE("(%p)->(%d)\n", This, Left);
if(!This->inplace)
return E_UNEXPECTED;
@ -379,7 +379,7 @@ static HRESULT WINAPI WebBrowser_put_Left(IWebBrowser2 *iface, long Left)
return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect);
}
static HRESULT WINAPI WebBrowser_get_Top(IWebBrowser2 *iface, long *pl)
static HRESULT WINAPI WebBrowser_get_Top(IWebBrowser2 *iface, LONG *pl)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
@ -389,12 +389,12 @@ static HRESULT WINAPI WebBrowser_get_Top(IWebBrowser2 *iface, long *pl)
return S_OK;
}
static HRESULT WINAPI WebBrowser_put_Top(IWebBrowser2 *iface, long Top)
static HRESULT WINAPI WebBrowser_put_Top(IWebBrowser2 *iface, LONG Top)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
RECT rect;
TRACE("(%p)->(%ld)\n", This, Top);
TRACE("(%p)->(%d)\n", This, Top);
if(!This->inplace)
return E_UNEXPECTED;
@ -407,7 +407,7 @@ static HRESULT WINAPI WebBrowser_put_Top(IWebBrowser2 *iface, long Top)
return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect);
}
static HRESULT WINAPI WebBrowser_get_Width(IWebBrowser2 *iface, long *pl)
static HRESULT WINAPI WebBrowser_get_Width(IWebBrowser2 *iface, LONG *pl)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
@ -417,12 +417,12 @@ static HRESULT WINAPI WebBrowser_get_Width(IWebBrowser2 *iface, long *pl)
return S_OK;
}
static HRESULT WINAPI WebBrowser_put_Width(IWebBrowser2 *iface, long Width)
static HRESULT WINAPI WebBrowser_put_Width(IWebBrowser2 *iface, LONG Width)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
RECT rect;
TRACE("(%p)->(%ld)\n", This, Width);
TRACE("(%p)->(%d)\n", This, Width);
if(!This->inplace)
return E_UNEXPECTED;
@ -435,7 +435,7 @@ static HRESULT WINAPI WebBrowser_put_Width(IWebBrowser2 *iface, long Width)
return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect);
}
static HRESULT WINAPI WebBrowser_get_Height(IWebBrowser2 *iface, long *pl)
static HRESULT WINAPI WebBrowser_get_Height(IWebBrowser2 *iface, LONG *pl)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
@ -445,12 +445,12 @@ static HRESULT WINAPI WebBrowser_get_Height(IWebBrowser2 *iface, long *pl)
return S_OK;
}
static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, long Height)
static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
RECT rect;
TRACE("(%p)->(%ld)\n", This, Height);
TRACE("(%p)->(%d)\n", This, Height);
if(!This->inplace)
return E_UNEXPECTED;
@ -534,7 +534,7 @@ static HRESULT WINAPI WebBrowser_get_Name(IWebBrowser2 *iface, BSTR *Name)
return E_NOTIMPL;
}
static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, long *pHWND)
static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND)
{
WebBrowser *This = WEBBROWSER_THIS(iface);

8
programs/rpcss/epmp.c
View File

@ -98,7 +98,7 @@ void ept_insert(handle_t h,
unsigned32 i;
RPC_STATUS rpc_status;
WINE_TRACE("(%p, %lu, %p, %lu, %p)\n", h, num_ents, entries, replace, status);
WINE_TRACE("(%p, %u, %p, %u, %p)\n", h, num_ents, entries, replace, status);
*status = RPC_S_OK;
@ -149,7 +149,7 @@ void ept_delete(handle_t h,
*status = RPC_S_OK;
WINE_TRACE("(%p, %lu, %p, %p)\n", h, num_ents, entries, status);
WINE_TRACE("(%p, %u, %p, %p)\n", h, num_ents, entries, status);
EnterCriticalSection(&csEpm);
@ -213,7 +213,7 @@ void ept_map(handle_t h,
*status = RPC_S_OK;
*num_towers = 0;
WINE_TRACE("(%p, %p, %p, %p, %lu, %p, %p, %p)\n", h, object, map_tower,
WINE_TRACE("(%p, %p, %p, %p, %u, %p, %p, %p)\n", h, object, map_tower,
entry_handle, max_towers, num_towers, towers, status);
rpc_status = TowerExplode(map_tower, &iface, &syntax, &protseq,
@ -278,7 +278,7 @@ void ept_mgmt_delete(handle_t h,
twr_p_t tower,
error_status_t *status)
{
WINE_FIXME("(%p, %ld, %p, %p, %p): stub\n", h, object_speced, object, tower, status);
WINE_FIXME("(%p, %d, %p, %p, %p): stub\n", h, object_speced, object, tower, status);
*status = EPT_S_CANT_PERFORM_OP;
}

10
tools/widl/header.c
View File

@ -253,7 +253,8 @@ void write_type_left(FILE *h, type_t *t, int declonly)
}
break;
case TYPE_BASIC:
if (type_basic_get_type(t) != TYPE_BASIC_HYPER)
if (type_basic_get_type(t) != TYPE_BASIC_INT32 &&
type_basic_get_type(t) != TYPE_BASIC_HYPER)
{
if (type_basic_get_sign(t) < 0) fprintf(h, "signed ");
else if (type_basic_get_sign(t) > 0) fprintf(h, "unsigned ");
@ -262,7 +263,6 @@ void write_type_left(FILE *h, type_t *t, int declonly)
{
case TYPE_BASIC_INT8: fprintf(h, "small"); break;
case TYPE_BASIC_INT16: fprintf(h, "short"); break;
case TYPE_BASIC_INT32: fprintf(h, "long"); break;
case TYPE_BASIC_INT: fprintf(h, "int"); break;
case TYPE_BASIC_INT64: fprintf(h, "__int64"); break;
case TYPE_BASIC_BYTE: fprintf(h, "byte"); break;
@ -272,6 +272,12 @@ void write_type_left(FILE *h, type_t *t, int declonly)
case TYPE_BASIC_DOUBLE: fprintf(h, "double"); break;
case TYPE_BASIC_ERROR_STATUS_T: fprintf(h, "error_status_t"); break;
case TYPE_BASIC_HANDLE: fprintf(h, "handle_t"); break;
case TYPE_BASIC_INT32:
if (type_basic_get_sign(t) > 0)
fprintf(h, "ULONG");
else
fprintf(h, "LONG");
break;
case TYPE_BASIC_HYPER:
if (type_basic_get_sign(t) > 0)
fprintf(h, "MIDL_uhyper");