Commit 8f9b09e9 authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard

Fixed some issues found by winapi_check.

parent 4f6a1d34
...@@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); ...@@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm);
#define FROM_IME 0xcafe1337 #define FROM_IME 0xcafe1337
static void (WINAPI *pX11DRV_ForceXIMReset)(HWND); static void (*pX11DRV_ForceXIMReset)(HWND);
typedef struct tagInputContextData typedef struct tagInputContextData
{ {
......
...@@ -1079,7 +1079,7 @@ ...@@ -1079,7 +1079,7 @@
@ stdcall FindActCtxSectionGuid(long ptr long ptr ptr) @ stdcall FindActCtxSectionGuid(long ptr long ptr ptr)
@ stdcall FindActCtxSectionStringA(long ptr long str ptr) @ stdcall FindActCtxSectionStringA(long ptr long str ptr)
@ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) @ stdcall FindActCtxSectionStringW(long ptr long wstr ptr)
@ stdcall GetCurrentActCtx() @ stdcall GetCurrentActCtx(ptr)
@ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) @ stdcall QueryActCtxW(long ptr ptr long ptr long ptr)
@ stdcall ReleaseActCtx(ptr) @ stdcall ReleaseActCtx(ptr)
@ stdcall ZombifyActCtx(ptr) @ stdcall ZombifyActCtx(ptr)
......
...@@ -25,9 +25,7 @@ ...@@ -25,9 +25,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_SYS_TYPES_H #include <sys/types.h>
# include <sys/types.h>
#endif
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#endif #endif
......
...@@ -137,6 +137,10 @@ static void wprint_name(WCHAR *buffer, int len, ULONG transport, ...@@ -137,6 +137,10 @@ static void wprint_name(WCHAR *buffer, int len, ULONG transport,
*ptr1 = '\0'; *ptr1 = '\0';
} }
/***********************************************************************
* NetWkstaTransportEnum (NETAPI32.@)
*/
struct WkstaTransportEnumData struct WkstaTransportEnumData
{ {
UCHAR n_adapt; UCHAR n_adapt;
...@@ -146,6 +150,8 @@ struct WkstaTransportEnumData ...@@ -146,6 +150,8 @@ struct WkstaTransportEnumData
NET_API_STATUS ret; NET_API_STATUS ret;
}; };
/**********************************************************************/
static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex, static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex,
ULONG transport, const NetBIOSAdapterImpl *data, void *closure) ULONG transport, const NetBIOSAdapterImpl *data, void *closure)
{ {
...@@ -237,6 +243,8 @@ static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex, ...@@ -237,6 +243,8 @@ static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex,
return ret; return ret;
} }
/**********************************************************************/
NET_API_STATUS WINAPI NET_API_STATUS WINAPI
NetWkstaTransportEnum(LPWSTR ServerName, DWORD level, PBYTE* pbuf, NetWkstaTransportEnum(LPWSTR ServerName, DWORD level, PBYTE* pbuf,
DWORD prefmaxlen, LPDWORD read_entries, DWORD prefmaxlen, LPDWORD read_entries,
......
...@@ -33,9 +33,7 @@ ...@@ -33,9 +33,7 @@
#include "config.h" #include "config.h"
#ifdef HAVE_STRING_H #include <string.h>
# include <string.h>
#endif
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include "windef.h" #include "windef.h"
......
...@@ -26,12 +26,8 @@ ...@@ -26,12 +26,8 @@
#include "config.h" #include "config.h"
#ifdef HAVE_STRING_H #include <string.h>
# include <string.h> #include <stdlib.h>
#endif
#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -24,12 +24,8 @@ ...@@ -24,12 +24,8 @@
#include "config.h" #include "config.h"
#ifdef HAVE_STRING_H #include <string.h>
# include <string.h> #include <stdlib.h>
#endif
#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif
#include <stdarg.h> #include <stdarg.h>
#define NONAMELESSUNION #define NONAMELESSUNION
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
@ stub RasSetSubEntryPropertiesA @ stub RasSetSubEntryPropertiesA
@ stub RasSetSubEntryPropertiesW @ stub RasSetSubEntryPropertiesW
@ stdcall RasValidateEntryNameA(str str) @ stdcall RasValidateEntryNameA(str str)
@ stub RasValidateEntryNameW @ stdcall RasValidateEntryNameW(wstr wstr)
500 stub RnaEngineRequest 500 stub RnaEngineRequest
501 stub DialEngineRequest 501 stub DialEngineRequest
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
@ cdecl SelectFont(ptr long) PSDRV_SelectFont @ cdecl SelectFont(ptr long) PSDRV_SelectFont
@ cdecl SelectPen(ptr long) PSDRV_SelectPen @ cdecl SelectPen(ptr long) PSDRV_SelectPen
@ cdecl SetBkColor(ptr long) PSDRV_SetBkColor @ 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 SetPixel(ptr long long long) PSDRV_SetPixel
@ cdecl SetTextColor(ptr long) PSDRV_SetTextColor @ cdecl SetTextColor(ptr long) PSDRV_SetTextColor
@ cdecl StartDoc(ptr ptr) PSDRV_StartDoc @ cdecl StartDoc(ptr ptr) PSDRV_StartDoc
......
...@@ -26,9 +26,7 @@ ...@@ -26,9 +26,7 @@
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
# include <sys/time.h> # include <sys/time.h>
#endif #endif
#ifdef HAVE_SYS_TYPES_H #include <sys/types.h>
# include <sys/types.h>
#endif
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h> # include <sys/socket.h>
#endif #endif
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
@ cdecl SetDIBColorTable(ptr long long ptr) X11DRV_SetDIBColorTable @ cdecl SetDIBColorTable(ptr long long ptr) X11DRV_SetDIBColorTable
@ cdecl SetDIBits(ptr long long long ptr ptr long) X11DRV_SetDIBits @ 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 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 SetDeviceGammaRamp(ptr ptr) X11DRV_SetDeviceGammaRamp
@ cdecl SetPixel(ptr long long long) X11DRV_SetPixel @ cdecl SetPixel(ptr long long long) X11DRV_SetPixel
@ cdecl SetPixelFormat(ptr long ptr) X11DRV_SetPixelFormat @ cdecl SetPixelFormat(ptr long ptr) X11DRV_SetPixelFormat
......
...@@ -314,7 +314,7 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, ...@@ -314,7 +314,7 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data,
FIXME("PreeditCaretCalback %p\n",ic); FIXME("PreeditCaretCalback %p\n",ic);
} }
void WINAPI X11DRV_ForceXIMReset(HWND hwnd) void X11DRV_ForceXIMReset(HWND hwnd)
{ {
XIC ic = X11DRV_get_ic(hwnd); XIC ic = X11DRV_get_ic(hwnd);
if (ic) if (ic)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment