Skip to content

W
wine-cw
Commit b5bb32c0 authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard
Browse files
Options

Fixed some issues found by winapi_check.

parent de306f2e
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 68 deletions
dlls/gdi/gdi16.c
View file @ b5bb32c0
......@@ -1254,7 +1254,6 @@ void WINAPI Resurrection16(HDC16 hdc,
/**********************************************************************
* CreateMetaFile (GDI.125)
* CreateMetaFile16 (GDI32.@)
*/
HDC16 WINAPI CreateMetaFile16( LPCSTR filename )
{
......@@ -1596,7 +1595,6 @@ HPALETTE16 WINAPI CreatePalette16( const LOGPALETTE* palette )
/***********************************************************************
* GDISelectPalette (GDI.361)
* GDISelectPalette16 (GDI32.@)
*/
HPALETTE16 WINAPI GDISelectPalette16( HDC16 hdc, HPALETTE16 hpalette, WORD wBkg )
{
......@@ -1606,7 +1604,6 @@ HPALETTE16 WINAPI GDISelectPalette16( HDC16 hdc, HPALETTE16 hpalette, WORD wBkg
/***********************************************************************
* GDIRealizePalette (GDI.362)
* GDIRealizePalette16 (GDI32.@)
*/
UINT16 WINAPI GDIRealizePalette16( HDC16 hdc )
{
......
dlls/gdi/mfdrv/init.c
View file @ b5bb32c0
......@@ -317,7 +317,6 @@ static DC *MFDRV_CloseMetaFile( HDC hdc )
/******************************************************************
* CloseMetaFile (GDI.126)
* CloseMetaFile16 (GDI32.@)
*/
HMETAFILE16 WINAPI CloseMetaFile16(
HDC16 hdc /* [in] Metafile DC to close */
......
dlls/gdi/printdrv.c
View file @ b5bb32c0
......@@ -520,7 +520,6 @@ static int FreePrintJob(HANDLE16 hJob)
/**********************************************************************
* OpenJob (GDI.240)
* OpenJob16 (GDI32.@)
*
*/
HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC)
......@@ -567,7 +566,6 @@ HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC)
/**********************************************************************
* CloseJob (GDI.243)
* CloseJob16 (GDI32.@)
*
*/
INT16 WINAPI CloseJob16(HPJOB16 hJob)
......@@ -590,7 +588,6 @@ INT16 WINAPI CloseJob16(HPJOB16 hJob)
/**********************************************************************
* WriteSpool (GDI.241)
* WriteSpool16 (GDI32.@)
*
*/
INT16 WINAPI WriteSpool16(HPJOB16 hJob, LPSTR lpData, INT16 cch)
......@@ -739,7 +736,6 @@ LPBYTE lpPrinterData, int cbData, int what)
/******************************************************************
* DrvGetPrinterData (GDI.282)
* DrvGetPrinterData16 (GDI32.@)
*
*/
DWORD WINAPI DrvGetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile,
......@@ -834,7 +830,6 @@ failed:
/******************************************************************
* DrvSetPrinterData (GDI.281)
* DrvSetPrinterData16 (GDI32.@)
*
*/
DWORD WINAPI DrvSetPrinterData16(LPSTR lpPrinter, LPSTR lpProfile,
......
dlls/netapi32/access.c
View file @ b5bb32c0
......@@ -18,12 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <winbase.h>
#include <winerror.h>
#include <lmcons.h>
#include <lmaccess.h>
#include <lmapibuf.h>
#include <lmerr.h>
#include "winbase.h"
#include "winerror.h"
#include "lmcons.h"
#include "lmaccess.h"
#include "lmapibuf.h"
#include "lmerr.h"
#include "netapi32_misc.h"
#include "wine/debug.h"
#include "wine/unicode.h"
......
dlls/netapi32/browsr.c
View file @ b5bb32c0
......@@ -18,10 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <winbase.h>
#include <winerror.h>
#include <lmcons.h>
#include <lmbrowsr.h>
#include "winbase.h"
#include "winerror.h"
#include "lmcons.h"
#include "lmbrowsr.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
......
dlls/netapi32/wksta.c
View file @ b5bb32c0
......@@ -18,15 +18,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <winbase.h>
#include <nb30.h>
#include <lmcons.h>
#include <lmapibuf.h>
#include <lmerr.h>
#include <lmwksta.h>
#include <winerror.h>
#include <winternl.h>
#include <ntsecapi.h>
#include "winbase.h"
#include "nb30.h"
#include "lmcons.h"
#include "lmapibuf.h"
#include "lmerr.h"
#include "lmwksta.h"
#include "winerror.h"
#include "winternl.h"
#include "ntsecapi.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
......
dlls/user/msg16.c
View file @ b5bb32c0
......@@ -112,7 +112,6 @@ BOOL16 WINAPI PostMessage16( HWND16 hwnd16, UINT16 msg, WPARAM16 wparam, LPARAM
/***********************************************************************
* PostAppMessage (USER.116)
* PostAppMessage16 (USER32.@)
*/
BOOL16 WINAPI PostAppMessage16( HTASK16 hTask, UINT16 msg, WPARAM16 wparam, LPARAM lparam )
{
......
loader/module.c
View file @ b5bb32c0
......@@ -808,7 +808,6 @@ BOOL WINAPI GetBinaryTypeW( LPCWSTR lpApplicationName, LPDWORD lpBinaryType )
/***********************************************************************
* WinExec (KERNEL.166)
* WinExec16 (KERNEL32.@)
*/
HINSTANCE16 WINAPI WinExec16( LPCSTR lpCmdLine, UINT16 nCmdShow )
{
......
loader/ne/convert.c
View file @ b5bb32c0
......@@ -30,7 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource);
/**********************************************************************
* ConvertDialog32To16 (KERNEL.615)
* ConvertDialog32To16 (KERNEL32.@)
*/
VOID WINAPI ConvertDialog32To16( LPVOID dialog32, DWORD size, LPVOID dialog16 )
{
......@@ -454,4 +453,3 @@ HGLOBAL16 NE_LoadPEResource( NE_MODULE *pModule, WORD type, LPVOID bits, DWORD s
return handle;
}
loader/ne/module.c
View file @ b5bb32c0
......@@ -1051,7 +1051,6 @@ static HINSTANCE16 NE_CreateThread( NE_MODULE *pModule, WORD cmdShow, LPCSTR cmd
/**********************************************************************
* LoadModule (KERNEL.45)
* LoadModule16 (KERNEL32.@)
*/
HINSTANCE16 WINAPI LoadModule16( LPCSTR name, LPVOID paramBlock )
{
......@@ -1420,7 +1419,6 @@ WORD WINAPI GetExpWinVer16( HMODULE16 hModule )
/**********************************************************************
* GetModuleFileName (KERNEL.49)
* GetModuleFileName16 (KERNEL32.@)
*
* Comment: see GetModuleFileNameA
*
......
loader/resource.c
View file @ b5bb32c0
......@@ -336,7 +336,6 @@ static HGLOBAL RES_LoadResource( HMODULE hModule, HRSRC hRsrc, BOOL bRet16 )
/**********************************************************************
* FindResource (KERNEL.60)
* FindResource16 (KERNEL32.@)
*/
HRSRC16 WINAPI FindResource16( HMODULE16 hModule, LPCSTR name, LPCSTR type )
{
......@@ -384,7 +383,6 @@ HRSRC WINAPI FindResourceW(HINSTANCE hModule, LPCWSTR name, LPCWSTR type)
/**********************************************************************
* LoadResource (KERNEL.61)
* LoadResource16 (KERNEL32.@)
*/
HGLOBAL16 WINAPI LoadResource16( HMODULE16 hModule, HRSRC16 hRsrc )
{
......@@ -436,7 +434,6 @@ typedef WORD (WINAPI *pDestroyIcon32Proc)( HGLOBAL16 handle, UINT16 flags );
/**********************************************************************
* FreeResource (KERNEL.63)
* FreeResource16 (KERNEL32.@)
*/
BOOL16 WINAPI FreeResource16( HGLOBAL16 handle )
{
......@@ -476,7 +473,6 @@ BOOL WINAPI FreeResource( HGLOBAL handle )
/**********************************************************************
* SizeofResource (KERNEL.65)
* SizeofResource16 (KERNEL32.@)
*/
DWORD WINAPI SizeofResource16( HMODULE16 hModule, HRSRC16 hRsrc )
{
......
loader/task.c
View file @ b5bb32c0
......@@ -1292,7 +1292,6 @@ WORD WINAPI GetDummyModuleHandleDS16(void)
/***********************************************************************
* IsTask (KERNEL.320)
* IsTask16 (KERNEL32.@)
*/
BOOL16 WINAPI IsTask16( HTASK16 hTask )
{
......
memory/environ.c
View file @ b5bb32c0
......@@ -750,7 +750,6 @@ DWORD WINAPI ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR dst, DWORD len )
/***********************************************************************
* GetDOSEnvironment (KERNEL.131)
* GetDOSEnvironment16 (KERNEL32.@)
*/
SEGPTR WINAPI GetDOSEnvironment16(void)
{
......
memory/global.c
View file @ b5bb32c0
......@@ -277,7 +277,6 @@ HGLOBAL16 WINAPI GlobalAlloc16(
/***********************************************************************
* GlobalReAlloc (KERNEL.16)
* GlobalReAlloc16 (KERNEL32.@)
* RETURNS
* Handle: Success
* NULL: Failure
......@@ -578,7 +577,7 @@ DWORD WINAPI GlobalHandleNoRIP16( WORD sel )
/***********************************************************************
* GlobalFlags (KERNEL.22)
* GlobalFlags16 (KERNEL32.@)
*
* NOTES
* Should this return GMEM_INVALID_HANDLE instead of 0 on invalid
* handle?
......
memory/selector.c
View file @ b5bb32c0
......@@ -328,6 +328,10 @@ DWORD WINAPI WIN16_GetSelectorBase( WORD sel )
DWORD base = GetSelectorBase( sel );
return W32S_WINE2APP( base );
}
/***********************************************************************
* GetSelectorBase
*/
DWORD WINAPI GetSelectorBase( WORD sel )
{
void *base = wine_ldt_copy.base[sel >> __AHSHIFT];
......@@ -353,6 +357,10 @@ DWORD WINAPI WIN16_SetSelectorBase( WORD sel, DWORD base )
SetSelectorBase( sel, W32S_APP2WINE( base ) );
return sel;
}
/***********************************************************************
* SetSelectorBase
*/
WORD WINAPI SetSelectorBase( WORD sel, DWORD base )
{
LDT_ENTRY entry;
......
objects/clipping.c
View file @ b5bb32c0
......@@ -118,7 +118,6 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode )
/***********************************************************************
* SelectVisRgn (GDI.105)
* SelectVisRgn16 (GDI32.@)
*/
INT16 WINAPI SelectVisRgn16( HDC16 hdc, HRGN16 hrgn )
{
......@@ -267,7 +266,6 @@ INT WINAPI IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom
/***********************************************************************
* ExcludeVisRect (GDI.73)
* ExcludeVisRect16 (GDI32.@)
*/
INT16 WINAPI ExcludeVisRect16( HDC16 hdc, INT16 left, INT16 top,
INT16 right, INT16 bottom )
......@@ -300,7 +298,6 @@ INT16 WINAPI ExcludeVisRect16( HDC16 hdc, INT16 left, INT16 top,
/***********************************************************************
* IntersectVisRect (GDI.98)
* IntersectVisRect16 (GDI32.@)
*/
INT16 WINAPI IntersectVisRect16( HDC16 hdc, INT16 left, INT16 top,
INT16 right, INT16 bottom )
......@@ -414,7 +411,6 @@ INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn )
/***********************************************************************
* SaveVisRgn (GDI.129)
* SaveVisRgn16 (GDI32.@)
*/
HRGN16 WINAPI SaveVisRgn16( HDC16 hdc )
{
......@@ -455,7 +451,6 @@ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc )
/***********************************************************************
* RestoreVisRgn (GDI.130)
* RestoreVisRgn16 (GDI32.@)
*/
INT16 WINAPI RestoreVisRgn16( HDC16 hdc )
{
......
objects/dc.c
View file @ b5bb32c0
......@@ -268,7 +268,6 @@ void DC_UpdateXforms( DC *dc )
/***********************************************************************
* GetDCState (GDI.179)
* GetDCState16 (GDI32.@)
*/
HDC16 WINAPI GetDCState16( HDC16 hdc )
{
......@@ -358,7 +357,6 @@ HDC16 WINAPI GetDCState16( HDC16 hdc )
/***********************************************************************
* SetDCState (GDI.180)
* SetDCState16 (GDI32.@)
*/
void WINAPI SetDCState16( HDC16 hdc, HDC16 hdcs )
{
......@@ -901,7 +899,6 @@ BOOL WINAPI GetDCOrgEx( HDC hDC, LPPOINT lpp )
/***********************************************************************
* SetDCOrg (GDI.117)
* SetDCOrg16 (GDI32.@)
*/
DWORD WINAPI SetDCOrg16( HDC16 hdc, INT16 x, INT16 y )
{
......@@ -1169,7 +1166,6 @@ DWORD WINAPI GetDCHook16( HDC16 hdc, FARPROC16 *phookProc )
/***********************************************************************
* SetHookFlags (GDI.192)
* SetHookFlags16 (GDI32.@)
*/
WORD WINAPI SetHookFlags16(HDC16 hDC, WORD flags)
{
......
objects/dcvalues.c
View file @ b5bb32c0
......@@ -399,7 +399,6 @@ BOOL WINAPI GetWindowOrgEx( HDC hdc, LPPOINT pt )
/***********************************************************************
* InquireVisRgn (GDI.131)
* InquireVisRgn16 (GDI32.@)
*/
HRGN16 WINAPI InquireVisRgn16( HDC16 hdc )
{
......
objects/metafile.c
View file @ b5bb32c0
......@@ -182,7 +182,6 @@ static BOOL16 MF_ReleaseMetaHeader16( HMETAFILE16 hmf )
/******************************************************************
* DeleteMetaFile (GDI.127)
* DeleteMetaFile16 (GDI32.@)
*/
BOOL16 WINAPI DeleteMetaFile16( HMETAFILE16 hmf )
{
......
objects/palette.c
View file @ b5bb32c0
......@@ -732,7 +732,6 @@ UINT16 WINAPI RealizeDefaultPalette16( HDC16 hdc )
/***********************************************************************
* IsDCCurrentPalette (GDI.412)
* IsDCCurrentPalette16 (GDI32.@)
*/
BOOL16 WINAPI IsDCCurrentPalette16(HDC16 hDC)
{
......
windows/cursoricon.c
View file @ b5bb32c0
......@@ -1235,7 +1235,6 @@ HCURSOR16 WINAPI CopyCursor16( HINSTANCE16 hInstance, HCURSOR16 hCursor )
/**********************************************************************
* DestroyIcon32 (USER.610)
* DestroyIcon32 (USER32.@)
*
* This routine is actually exported from Win95 USER under the name
* DestroyIcon32 ... The behaviour implemented here should mimic
......
windows/dialog.c
View file @ b5bb32c0
......@@ -966,7 +966,6 @@ HWND16 WINAPI CreateDialogIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate,
/***********************************************************************
* CreateDialogIndirectParam (USER.242)
* CreateDialogIndirectParam16 (USER32.@)
*/
HWND16 WINAPI CreateDialogIndirectParam16( HINSTANCE16 hInst,
LPCVOID dlgTemplate,
......@@ -1137,7 +1136,6 @@ INT16 WINAPI DialogBoxIndirect16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
/***********************************************************************
* DialogBoxIndirectParam (USER.240)
* DialogBoxIndirectParam16 (USER32.@)
*/
INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
HWND16 owner16, DLGPROC16 dlgProc,
......
windows/driver.c
View file @ b5bb32c0
......@@ -127,7 +127,6 @@ static LRESULT inline DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT16 msg,
/**************************************************************************
* SendDriverMessage (USER.251)
* SendDriverMessage16 (USER32.@)
*/
LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1,
LPARAM lParam2)
......@@ -267,7 +266,6 @@ static LPWINE_DRIVER DRIVER_TryOpenDriver16(LPCSTR lpFileName, LPARAM lParam2)
/**************************************************************************
* OpenDriver (USER.252)
* OpenDriver16 (USER32.@)
*/
HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lParam2)
{
......@@ -301,7 +299,6 @@ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lP
/**************************************************************************
* CloseDriver (USER.253)
* CloseDriver16 (USER32.@)
*/
LRESULT WINAPI CloseDriver16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2)
{
......@@ -323,7 +320,6 @@ LRESULT WINAPI CloseDriver16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2)
/**************************************************************************
* GetDriverModuleHandle (USER.254)
* GetDriverModuleHandle16 (USER32.@)
*/
HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
{
......@@ -341,7 +337,6 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
/**************************************************************************
* DefDriverProc (USER.255)
* DefDriverProc16 (USER32.@)
*/
LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
LPARAM lParam1, LPARAM lParam2)
......@@ -431,4 +426,3 @@ HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags)
TRACE("return %04x !\n", hRetDrv);
return hRetDrv;
}
windows/hook.c
View file @ b5bb32c0
......@@ -926,7 +926,6 @@ HHOOK WINAPI SetWindowsHookW( INT id, HOOKPROC proc )
/***********************************************************************
* SetWindowsHookEx (USER.291)
* SetWindowsHookEx16 (USER32.@)
*/
HHOOK WINAPI SetWindowsHookEx16( INT16 id, HOOKPROC16 proc, HINSTANCE16 hInst,
HTASK16 hTask )
......@@ -1005,7 +1004,6 @@ BOOL WINAPI UnhookWindowsHookEx( HHOOK hhook )
/***********************************************************************
* CallNextHookEx (USER.293)
* CallNextHookEx16 (USER32.@)
*
* I wouldn't have separated this into 16 and 32 bit versions, but I
* need a way to figure out if I need to do a mapping or not.
......
windows/message.c
View file @ b5bb32c0
......@@ -798,7 +798,6 @@ DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut )
/***********************************************************************
* UserYield (USER.332)
* UserYield16 (USER32.@)
*/
void WINAPI UserYield16(void)
{
......
windows/queue.c
View file @ b5bb32c0
......@@ -457,7 +457,6 @@ HTASK16 WINAPI GetWindowTask16( HWND16 hwnd )
/***********************************************************************
* InitThreadInput (USER.409)
* InitThreadInput16 (USER32.@)
*/
HQUEUE16 WINAPI InitThreadInput16( WORD unknown, WORD flags )
{
......
windows/winproc.c
View file @ b5bb32c0
......@@ -2707,7 +2707,6 @@ static LRESULT WINAPI WINPROC_CallProc32WTo16( WNDPROC16 func, HWND hwnd,
/**********************************************************************
* CallWindowProc (USER.122)
* CallWindowProc16 (USER32.@)
*/
LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg,
WPARAM16 wParam, LPARAM lParam )
......
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