ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed some unnecessary inclusions of wingdi.h and winuser.h

This commit is contained in:
Alexandre Julliard 2000-07-29 21:58:17 +00:00
parent 0aa6cc298e
commit 58d5a0a786
20 changed files with 31 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debugger/winedbg.c
View File

@ -6,6 +6,7 @@
*/
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "debugger.h"
@ -49,7 +50,7 @@ int DEBUG_Printf(int chn, const char* format, ...)
int len;
va_start(valist, format);
len = wvsnprintf(buf, sizeof(buf), format, valist);
len = vsnprintf(buf, sizeof(buf), format, valist);
va_end(valist);
if (len <= -1) {

4
dlls/crtdll/crtdll.spec
View File

@ -322,7 +322,7 @@ import ntdll
@ cdecl _unlink(str) CRTDLL__unlink
@ stub _unloaddll
@ stub _utime
@ cdecl _vsnprintf(ptr long ptr ptr) CRTDLL__vsnprintf
@ cdecl _vsnprintf(ptr long ptr ptr) vsnprintf
@ stub _vsnwprintf
@ cdecl _wcsdup(wstr) CRTDLL__wcsdup
@ forward _wcsicmp ntdll._wcsicmp
@ -504,7 +504,7 @@ import ntdll
@ cdecl vfprintf(ptr str ptr) CRTDLL_vfprintf
@ stub vfwprintf
@ stub vprintf
@ cdecl vsprintf(ptr str ptr) CRTDLL_vsprintf
@ cdecl vsprintf(ptr str ptr) vsprintf
@ cdecl vswprintf(ptr wstr ptr) CRTDLL_vswprintf
@ stub vwprintf
@ forward wcscat ntdll.wcscat

25
dlls/crtdll/crtdll_main.c
View File

@ -931,22 +931,6 @@ int __cdecl CRTDLL__mbsicmp(unsigned char *x,unsigned char *y)
}
/*********************************************************************
* vsprintf (CRTDLL.500)
*/
INT __cdecl CRTDLL_vsprintf( LPSTR buffer, LPCSTR spec, va_list args )
{
return wvsprintfA( buffer, spec, args );
}
/*********************************************************************
* _vsnprintf (CRTDLL.@)
*/
INT __cdecl CRTDLL__vsnprintf(LPSTR buffer,DWORD size,LPCSTR spec,va_list args )
{
return wvsnprintfA( buffer, size, spec, args );
}
/*********************************************************************
* vswprintf (CRTDLL.501)
*/
@ -1639,15 +1623,6 @@ LPSTR __cdecl CRTDLL_tmpnam(LPSTR s)
}
/*********************************************************************
* _itoa (CRTDLL.165)
*/
LPSTR __cdecl CRTDLL__itoa(INT x,LPSTR buf,INT buflen)
{
wsnprintfA(buf,buflen,"%d",x);
return buf;
}
typedef VOID (*sig_handler_type)(VOID);

4
graphics/painting.c
View File

@ -18,10 +18,8 @@
#include "winerror.h"
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/winuser16.h"
DEFAULT_DEBUG_CHANNEL(gdi)
DEFAULT_DEBUG_CHANNEL(gdi);
/***********************************************************************

7
graphics/x11drv/xfont.c
View File

@ -26,7 +26,6 @@
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "heap.h"
#include "options.h"
@ -1307,7 +1306,7 @@ static void XFONT_WindowsNames(void)
}
lpch = fr->lfFaceName;
wsnprintfA( fr->lfFaceName, sizeof(fr->lfFaceName), "%s %s",
snprintf( fr->lfFaceName, sizeof(fr->lfFaceName), "%s %s",
/* prepend vendor name */
(pfr==fr) ? "" : fr->resource->foundry,
fr->resource->family);
@ -1570,7 +1569,7 @@ static void XFONT_LoadAliases(void)
{
BOOL bHaveAlias, bSubst;
char subsection[32];
wsnprintfA( subsection, sizeof subsection, "%s%i", INIAliasSection, i++ );
snprintf( subsection, sizeof subsection, "%s%i", INIAliasSection, i++ );
bHaveAlias = PROFILE_GetWineIniString( INIFontSection,
subsection, "", buffer, sizeof buffer);
@ -1700,7 +1699,7 @@ static void XFONT_LoadIgnores(void)
/* Others from INI file */
do
{
wsprintfA( subsection, "%s%i", INIIgnoreSection, i++ );
sprintf( subsection, "%s%i", INIIgnoreSection, i++ );
if( PROFILE_GetWineIniString( INIFontSection,
subsection, "", buffer, sizeof buffer) )

2
if1632/snoop.c
View File

@ -9,8 +9,6 @@
#include <stdio.h>
#include "winbase.h"
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "winnt.h"
#include "heap.h"
#include "global.h"

24
include/winbase.h
View File

@ -1711,6 +1711,7 @@ UINT WINAPI GetAtomNameW(ATOM,LPWSTR,INT);
UINT WINAPI GetCurrentDirectoryA(UINT,LPSTR);
UINT WINAPI GetCurrentDirectoryW(UINT,LPWSTR);
#define GetCurrentDirectory WINELIB_NAME_AW(GetCurrentDirectory)
#define GetCurrentTime() GetTickCount()
BOOL WINAPI GetDiskFreeSpaceA(LPCSTR,LPDWORD,LPDWORD,LPDWORD,LPDWORD);
BOOL WINAPI GetDiskFreeSpaceW(LPCWSTR,LPDWORD,LPDWORD,LPDWORD,LPDWORD);
#define GetDiskFreeSpace WINELIB_NAME_AW(GetDiskFreeSpace)
@ -1720,6 +1721,7 @@ BOOL WINAPI GetDiskFreeSpaceExW(LPCWSTR,PULARGE_INTEGER,PULARGE_INTEGER,PUL
UINT WINAPI GetDriveTypeA(LPCSTR);
UINT WINAPI GetDriveTypeW(LPCWSTR);
#define GetDriveType WINELIB_NAME_AW(GetDriveType)
BOOL WINAPI GetExitCodeProcess(HANDLE,LPDWORD);
DWORD WINAPI GetFileAttributesA(LPCSTR);
DWORD WINAPI GetFileAttributesW(LPCWSTR);
#define GetFileAttributes WINELIB_NAME_AW(GetFileAttributes)
@ -1771,26 +1773,36 @@ BOOL WINAPI GetStringTypeW(DWORD,LPCWSTR,INT,LPWORD);
UINT WINAPI GetSystemDirectoryA(LPSTR,UINT);
UINT WINAPI GetSystemDirectoryW(LPWSTR,UINT);
#define GetSystemDirectory WINELIB_NAME_AW(GetSystemDirectory)
UINT WINAPI GetTempFileNameA(LPCSTR,LPCSTR,UINT,LPSTR);
UINT WINAPI GetTempFileNameW(LPCWSTR,LPCWSTR,UINT,LPWSTR);
DWORD WINAPI GetTickCount(void);
UINT WINAPI GetTempFileNameA(LPCSTR,LPCSTR,UINT,LPSTR);
UINT WINAPI GetTempFileNameW(LPCWSTR,LPCWSTR,UINT,LPWSTR);
#define GetTempFileName WINELIB_NAME_AW(GetTempFileName)
UINT WINAPI GetTempPathA(UINT,LPSTR);
UINT WINAPI GetTempPathW(UINT,LPWSTR);
#define GetTempPath WINELIB_NAME_AW(GetTempPath)
LONG WINAPI GetVersion(void);
BOOL WINAPI GetExitCodeProcess(HANDLE,LPDWORD);
BOOL WINAPI GetVolumeInformationA(LPCSTR,LPSTR,DWORD,LPDWORD,LPDWORD,LPDWORD,LPSTR,DWORD);
BOOL WINAPI GetVolumeInformationW(LPCWSTR,LPWSTR,DWORD,LPDWORD,LPDWORD,LPDWORD,LPWSTR,DWORD);
#define GetVolumeInformation WINELIB_NAME_AW(GetVolumeInformation)
UINT WINAPI GetWindowsDirectoryA(LPSTR,UINT);
UINT WINAPI GetWindowsDirectoryW(LPWSTR,UINT);
#define GetWindowsDirectory WINELIB_NAME_AW(GetWindowsDirectory)
ATOM WINAPI GlobalAddAtomA(LPCSTR);
ATOM WINAPI GlobalAddAtomW(LPCWSTR);
#define GlobalAddAtom WINELIB_NAME_AW(GlobalAddAtom)
HGLOBAL16 WINAPI GlobalAlloc16(UINT16,DWORD);
HGLOBAL WINAPI GlobalAlloc(UINT,DWORD);
HGLOBAL WINAPI GlobalAlloc(UINT,DWORD);
DWORD WINAPI GlobalCompact(DWORD);
UINT WINAPI GlobalFlags(HGLOBAL);
ATOM WINAPI GlobalDeleteAtom(ATOM);
ATOM WINAPI GlobalFindAtomA(LPCSTR);
ATOM WINAPI GlobalFindAtomW(LPCWSTR);
#define GlobalFindAtom WINELIB_NAME_AW(GlobalFindAtom)
UINT WINAPI GlobalFlags(HGLOBAL);
HGLOBAL16 WINAPI GlobalFree16(HGLOBAL16);
HGLOBAL WINAPI GlobalFree(HGLOBAL);
HGLOBAL WINAPI GlobalFree(HGLOBAL);
UINT WINAPI GlobalGetAtomNameA(ATOM,LPSTR,INT);
UINT WINAPI GlobalGetAtomNameW(ATOM,LPWSTR,INT);
#define GlobalGetAtomName WINELIB_NAME_AW(GlobalGetAtomName)
HGLOBAL WINAPI GlobalHandle(LPCVOID);
WORD WINAPI GlobalFix16(HGLOBAL16);
VOID WINAPI GlobalFix(HGLOBAL);

13
include/winuser.h
View File

@ -3097,14 +3097,11 @@ DWORD WINAPI GetMenuCheckMarkDimensions(void);
LONG WINAPI GetMessageExtraInfo(void);
DWORD WINAPI GetMessagePos(void);
LONG WINAPI GetMessageTime(void);
DWORD WINAPI GetTickCount(void);
ATOM WINAPI GlobalDeleteAtom(ATOM);
DWORD WINAPI OemKeyScan(WORD);
BOOL WINAPI ReleaseCapture(void);
BOOL WINAPI SetKeyboardState(LPBYTE);
VOID WINAPI WaitMessage(void);
/* Declarations for functions that change between Win16 and Win32 */
BOOL WINAPI AdjustWindowRect(LPRECT,DWORD,BOOL);
@ -3369,7 +3366,6 @@ INT WINAPI GetClipboardFormatNameW(UINT,LPWSTR,INT);
HWND WINAPI GetClipboardOwner(void);
HWND WINAPI GetClipboardViewer(void);
BOOL WINAPI GetClipCursor(LPRECT);
#define GetCurrentTime() GetTickCount()
HCURSOR WINAPI GetCursor(void);
BOOL WINAPI GetCursorPos(LPPOINT);
HDC WINAPI GetDC(HWND);
@ -3453,15 +3449,6 @@ INT WINAPI GetWindowTextLengthA(HWND);
INT WINAPI GetWindowTextLengthW(HWND);
#define GetWindowTextLength WINELIB_NAME_AW(GetWindowTextLength)
WORD WINAPI GetWindowWord(HWND,INT);
ATOM WINAPI GlobalAddAtomA(LPCSTR);
ATOM WINAPI GlobalAddAtomW(LPCWSTR);
#define GlobalAddAtom WINELIB_NAME_AW(GlobalAddAtom)
ATOM WINAPI GlobalFindAtomA(LPCSTR);
ATOM WINAPI GlobalFindAtomW(LPCWSTR);
#define GlobalFindAtom WINELIB_NAME_AW(GlobalFindAtom)
UINT WINAPI GlobalGetAtomNameA(ATOM,LPSTR,INT);
UINT WINAPI GlobalGetAtomNameW(ATOM,LPWSTR,INT);
#define GlobalGetAtomName WINELIB_NAME_AW(GlobalGetAtomName)
BOOL WINAPI GrayStringA(HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,
INT,INT,INT,INT,INT);
BOOL WINAPI GrayStringW(HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,

5
loader/resource.c
View File

@ -12,12 +12,9 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include "winbase.h"
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "winbase.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wine/exception.h"
#include "ldt.h"
#include "global.h"

3
memory/atom.c
View File

@ -17,10 +17,7 @@
#include <ctype.h>
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "winerror.h"
#include "instance.h"
#include "ldt.h"

2
memory/environ.c
View File

@ -7,8 +7,6 @@
#include <stdlib.h>
#include <string.h>
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/winestring.h"
#include "process.h"
#include "heap.h"

2
misc/comm.c
View File

@ -52,8 +52,6 @@
#include <unistd.h>
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "comm.h"
#ifdef HAVE_SYS_MODEM_H
# include <sys/modem.h>

2
misc/lstr.c
View File

@ -579,7 +579,7 @@ DWORD WINAPI FormatMessage16(
argliststart=args+insertnr-1;
/* CMF - This makes a BIG assumption about va_list */
while (wvsnprintf16(b, sz, fmtstr, (va_list) argliststart) < 0) {
while (vsnprintf(b, sz, fmtstr, (va_list) argliststart) < 0) {
b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz += 100);
}
for (x=b; *x; x++) ADD_TO_T(*x);

3
objects/gdiobj.c
View File

@ -23,9 +23,8 @@
#include "tweak.h"
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
DEFAULT_DEBUG_CHANNEL(gdi)
DEFAULT_DEBUG_CHANNEL(gdi);
/**********************************************************************/

1
objects/region.c
View File

@ -85,7 +85,6 @@ SOFTWARE.
#include <string.h>
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "debugtools.h"
#include "region.h"
#include "heap.h"

1
objects/text.c
View File

@ -11,7 +11,6 @@
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winbase.h"
#include "winuser.h"
#include "winerror.h"
#include "dc.h"
#include "gdi.h"

2
relay32/builtin32.c
View File

@ -20,8 +20,6 @@
#include "windef.h"
#include "wine/winbase16.h"
#include "wingdi.h"
#include "winuser.h"
#include "builtin32.h"
#include "elfdll.h"
#include "file.h"

6
relay32/snoop.c
View File

@ -10,8 +10,6 @@
#include <stdio.h>
#include <string.h>
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winnt.h"
#include "heap.h"
#include "builtin32.h"
@ -231,7 +229,7 @@ SNOOP_PrintArg(DWORD x) {
}
if (!nostring) {
if (i>5) {
wsnprintfA(buf,sizeof(buf),"%08lx %s",x,debugstr_an((LPSTR)x,sizeof(buf)-10));
snprintf(buf,sizeof(buf),"%08lx %s",x,debugstr_an((LPSTR)x,sizeof(buf)-10));
ret=buf;
}
}
@ -251,7 +249,7 @@ SNOOP_PrintArg(DWORD x) {
}
if (!nostring) {
if (i>5) {
wsnprintfA(buf,sizeof(buf),"%08lx %s",x,debugstr_wn((LPWSTR)x,sizeof(buf)-10));
snprintf(buf,sizeof(buf),"%08lx %s",x,debugstr_wn((LPWSTR)x,sizeof(buf)-10));
ret=buf;
}
}

2
win32/device.c
View File

@ -23,9 +23,7 @@
#include <stdarg.h>
#include <time.h>
#include "windef.h"
#include "wingdi.h"
#include "winbase.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
#include "winversion.h"

2
win32/except.c
View File

@ -25,8 +25,6 @@
#include <assert.h>
#include <stdio.h>
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
#include "ntddk.h"
#include "wine/exception.h"