Avoid annoying 'macro redefinition' warnings by defining

WIN32_NO_STATUS at the right time.
Define _WIN32_WINNT otherwise we are missing some symbols with the
Windows headers.
This commit is contained in:
Francois Gouget 2004-08-14 00:42:12 +00:00 committed by Alexandre Julliard
parent 870f55fefc
commit a625761eb9
10 changed files with 48 additions and 61 deletions

View File

@ -18,15 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdarg.h>
#include <stdio.h>
#include "wine/test.h"
#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "winnt.h"
#include "winreg.h"
#include "winternl.h"
#include "ntdll_test.h"
#include "wine/unicode.h"
static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPDWORD reslen,

View File

@ -11,8 +11,7 @@
#define WINE_NOWINSOCK
#include "ntstatus.h"
#include "windows.h"
#include "ntdll_test.h"
#include "wine/test.h"

View File

@ -21,17 +21,11 @@
* windows.
*/
#include <stdarg.h>
#include <stdlib.h>
#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "wine/test.h"
#include "winnt.h"
#include "ntdll_test.h"
#include "winnls.h"
#include "winreg.h"
#include "winternl.h"
/* Function ptrs for ntdll calls */
static HMODULE hntdll = 0;

View File

@ -0,0 +1,35 @@
/*
* Unit test suite for ntdll path functions
*
* Copyright 2003 Eric Pouech
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdarg.h>
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x500 /* For NTSTATUS */
#endif
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
#include "winnt.h"
#include "winreg.h"
#include "winternl.h"
#include "wine/test.h"

View File

@ -18,15 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdarg.h>
#include "wine/test.h"
#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "winnt.h"
#include "winreg.h"
#include "winternl.h"
#include "ntdll_test.h"
static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPDWORD reslen,
LPCSTR src, DWORD srclen );

View File

@ -21,17 +21,10 @@
* windows.
*/
#include <stdarg.h>
#include <stdlib.h>
#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "wine/test.h"
#include "winnt.h"
#include "ntdll_test.h"
#include "winnls.h"
#include "winreg.h"
#include "winternl.h"
/* Function ptrs for ntdll calls */
static HMODULE hntdll = 0;

View File

@ -20,15 +20,8 @@
* We use function pointers here as some of the bitmap functions exist only
* in later versions of ntdll.
*/
#include <stdarg.h>
#include "wine/test.h"
#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "winnt.h"
#include "winreg.h"
#include "winternl.h"
#include "ntdll_test.h"
/* Function ptrs for ordinal calls */
static HMODULE hntdll = 0;

View File

@ -22,18 +22,12 @@
* windows.
*/
#include <stdarg.h>
#include <stdlib.h>
#define INITGUID
#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "wine/test.h"
#include "winnt.h"
#include "ntdll_test.h"
#include "winnls.h"
#include "winreg.h"
#include "winternl.h"
#include "guiddef.h"
/* Function ptrs for ntdll calls */

View File

@ -21,17 +21,11 @@
* windows.
*/
#include <stdarg.h>
#include <stdlib.h>
#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "wine/test.h"
#include "winnt.h"
#include "ntdll_test.h"
#include "winnls.h"
#include "winreg.h"
#include "winternl.h"
/* Function ptrs for ntdll calls */
static HMODULE hntdll = 0;

View File

@ -628,8 +628,7 @@ windef.h
%include
"ntstatus.h"
"windows.h"
"ntdll_test.h"
%type