diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 7314c1d1c22..494096313df 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); #define FROM_IME 0xcafe1337 -static void (WINAPI *pX11DRV_ForceXIMReset)(HWND); +static void (*pX11DRV_ForceXIMReset)(HWND); typedef struct tagInputContextData { diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index e796313aeb3..c6105bb3581 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -1079,7 +1079,7 @@ @ stdcall FindActCtxSectionGuid(long ptr long ptr ptr) @ stdcall FindActCtxSectionStringA(long ptr long str ptr) @ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) -@ stdcall GetCurrentActCtx() +@ stdcall GetCurrentActCtx(ptr) @ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) @ stdcall ReleaseActCtx(ptr) @ stdcall ZombifyActCtx(ptr) diff --git a/dlls/kernel/module.c b/dlls/kernel/module.c index be4af66bfce..1bb41d827ec 100644 --- a/dlls/kernel/module.c +++ b/dlls/kernel/module.c @@ -25,9 +25,7 @@ #include #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_UNISTD_H # include #endif diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index e65770d3ee9..1b32987f96c 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -136,6 +136,10 @@ static void wprint_name(WCHAR *buffer, int len, ULONG transport, *ptr1 = *ptr2; *ptr1 = '\0'; } + +/*********************************************************************** + * NetWkstaTransportEnum (NETAPI32.@) + */ struct WkstaTransportEnumData { @@ -146,6 +150,8 @@ struct WkstaTransportEnumData NET_API_STATUS ret; }; +/**********************************************************************/ + static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex, ULONG transport, const NetBIOSAdapterImpl *data, void *closure) { @@ -237,6 +243,8 @@ static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex, return ret; } +/**********************************************************************/ + NET_API_STATUS WINAPI NetWkstaTransportEnum(LPWSTR ServerName, DWORD level, PBYTE* pbuf, DWORD prefmaxlen, LPDWORD read_entries, diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 9f008512300..6cb11a4b80a 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -33,9 +33,7 @@ #include "config.h" -#ifdef HAVE_STRING_H -# include -#endif +#include #include #include #include "windef.h" diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index c23c7d9a503..2f19ca87a1b 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -26,12 +26,8 @@ #include "config.h" -#ifdef HAVE_STRING_H -# include -#endif -#ifdef HAVE_STDLIB_H -# include -#endif +#include +#include #include #include diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 5327700012e..cdfb3787e3a 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -24,12 +24,8 @@ #include "config.h" -#ifdef HAVE_STRING_H -# include -#endif -#ifdef HAVE_STDLIB_H -# include -#endif +#include +#include #include #define NONAMELESSUNION diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index ca6384e4d9e..6688e3cf62a 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -72,7 +72,7 @@ @ stub RasSetSubEntryPropertiesA @ stub RasSetSubEntryPropertiesW @ stdcall RasValidateEntryNameA(str str) -@ stub RasValidateEntryNameW +@ stdcall RasValidateEntryNameW(wstr wstr) 500 stub RnaEngineRequest 501 stub DialEngineRequest diff --git a/dlls/wineps/wineps.spec b/dlls/wineps/wineps.spec index a1d650923c3..91003f54c83 100644 --- a/dlls/wineps/wineps.spec +++ b/dlls/wineps/wineps.spec @@ -32,7 +32,7 @@ @ cdecl SelectFont(ptr long) PSDRV_SelectFont @ cdecl SelectPen(ptr long) PSDRV_SelectPen @ cdecl SetBkColor(ptr long) PSDRV_SetBkColor -@ cdecl SetDeviceClipping(ptr long) PSDRV_SetDeviceClipping +@ cdecl SetDeviceClipping(ptr long long) PSDRV_SetDeviceClipping @ cdecl SetPixel(ptr long long long) PSDRV_SetPixel @ cdecl SetTextColor(ptr long) PSDRV_SetTextColor @ cdecl StartDoc(ptr ptr) PSDRV_StartDoc diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 50c25c7ffbb..e4be76611c2 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -26,9 +26,7 @@ #ifdef HAVE_SYS_TIME_H # include #endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_SYS_SOCKET_H # include #endif diff --git a/dlls/x11drv/x11drv.spec b/dlls/x11drv/x11drv.spec index f521884d701..fd726d16229 100644 --- a/dlls/x11drv/x11drv.spec +++ b/dlls/x11drv/x11drv.spec @@ -52,7 +52,7 @@ @ cdecl SetDIBColorTable(ptr long long ptr) X11DRV_SetDIBColorTable @ cdecl SetDIBits(ptr long long long ptr ptr long) X11DRV_SetDIBits @ cdecl SetDIBitsToDevice(ptr long long long long long long long long ptr ptr long) X11DRV_SetDIBitsToDevice -@ cdecl SetDeviceClipping(ptr long) X11DRV_SetDeviceClipping +@ cdecl SetDeviceClipping(ptr long long) X11DRV_SetDeviceClipping @ cdecl SetDeviceGammaRamp(ptr ptr) X11DRV_SetDeviceGammaRamp @ cdecl SetPixel(ptr long long long) X11DRV_SetPixel @ cdecl SetPixelFormat(ptr long ptr) X11DRV_SetPixelFormat diff --git a/dlls/x11drv/xim.c b/dlls/x11drv/xim.c index 591aa2e0aca..6dbc43e727c 100644 --- a/dlls/x11drv/xim.c +++ b/dlls/x11drv/xim.c @@ -314,7 +314,7 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, FIXME("PreeditCaretCalback %p\n",ic); } -void WINAPI X11DRV_ForceXIMReset(HWND hwnd) +void X11DRV_ForceXIMReset(HWND hwnd) { XIC ic = X11DRV_get_ic(hwnd); if (ic)