Updated some of the generated tests.

This commit is contained in:
Alexandre Julliard 2003-10-24 04:45:35 +00:00
parent 2f31228dfe
commit b83789fdc3
5 changed files with 40 additions and 43 deletions

View File

@ -27,7 +27,7 @@
* Windows API extension * Windows API extension
*/ */
#if (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field) # define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field) # define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
@ -35,7 +35,7 @@
/* FIXME: Not sure if is possible to do without compiler extension */ /* FIXME: Not sure if is possible to do without compiler extension */
#endif #endif
#if (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
@ -58,7 +58,7 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(FIELD_ALIGNMENT(type, field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
FIELD_ALIGNMENT(type, field)) FIELD_ALIGNMENT(type, field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
@ -66,7 +66,7 @@
#define TEST_FIELD_OFFSET(type, field, offset) \ #define TEST_FIELD_OFFSET(type, field, offset) \
ok(FIELD_OFFSET(type, field) == offset, \ ok(FIELD_OFFSET(type, field) == offset, \
"FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")", \ "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")\n", \
FIELD_OFFSET(type, field)) FIELD_OFFSET(type, field))
#ifdef _TYPE_ALIGNMENT #ifdef _TYPE_ALIGNMENT
@ -78,13 +78,13 @@
#ifdef TYPE_ALIGNMENT #ifdef TYPE_ALIGNMENT
#define TEST_TYPE_ALIGNMENT(type, align) \ #define TEST_TYPE_ALIGNMENT(type, align) \
ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")", TYPE_ALIGNMENT(type)) ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")\n", TYPE_ALIGNMENT(type))
#else #else
# define TEST_TYPE_ALIGNMENT(type, align) do { } while (0) # define TEST_TYPE_ALIGNMENT(type, align) do { } while (0)
#endif #endif
#define TEST_TYPE_SIZE(type, size) \ #define TEST_TYPE_SIZE(type, size) \
ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")", sizeof(type)) ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")\n", sizeof(type))
/*********************************************************************** /***********************************************************************
* Test macros * Test macros
@ -104,10 +104,10 @@
TEST_TYPE_SIZE(*(type)0, size) TEST_TYPE_SIZE(*(type)0, size)
#define TEST_TYPE_SIGNED(type) \ #define TEST_TYPE_SIGNED(type) \
ok((type) -1 < 0, "(" #type ") -1 < 0"); ok((type) -1 < 0, "(" #type ") -1 < 0\n");
#define TEST_TYPE_UNSIGNED(type) \ #define TEST_TYPE_UNSIGNED(type) \
ok((type) -1 > 0, "(" #type ") -1 > 0"); ok((type) -1 > 0, "(" #type ") -1 > 0\n");
static void test_pack_ABC(void) static void test_pack_ABC(void)
{ {

View File

@ -12,7 +12,6 @@
#define WINE_NOWINSOCK #define WINE_NOWINSOCK
#include <stdarg.h> #include <stdarg.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wtypes.h" #include "wtypes.h"
@ -33,7 +32,7 @@
* Windows API extension * Windows API extension
*/ */
#if (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field) # define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field) # define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
@ -41,7 +40,7 @@
/* FIXME: Not sure if is possible to do without compiler extension */ /* FIXME: Not sure if is possible to do without compiler extension */
#endif #endif
#if (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
@ -64,7 +63,7 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(FIELD_ALIGNMENT(type, field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
FIELD_ALIGNMENT(type, field)) FIELD_ALIGNMENT(type, field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
@ -72,7 +71,7 @@
#define TEST_FIELD_OFFSET(type, field, offset) \ #define TEST_FIELD_OFFSET(type, field, offset) \
ok(FIELD_OFFSET(type, field) == offset, \ ok(FIELD_OFFSET(type, field) == offset, \
"FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")", \ "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")\n", \
FIELD_OFFSET(type, field)) FIELD_OFFSET(type, field))
#ifdef _TYPE_ALIGNMENT #ifdef _TYPE_ALIGNMENT
@ -84,13 +83,13 @@
#ifdef TYPE_ALIGNMENT #ifdef TYPE_ALIGNMENT
#define TEST_TYPE_ALIGNMENT(type, align) \ #define TEST_TYPE_ALIGNMENT(type, align) \
ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")", TYPE_ALIGNMENT(type)) ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")\n", TYPE_ALIGNMENT(type))
#else #else
# define TEST_TYPE_ALIGNMENT(type, align) do { } while (0) # define TEST_TYPE_ALIGNMENT(type, align) do { } while (0)
#endif #endif
#define TEST_TYPE_SIZE(type, size) \ #define TEST_TYPE_SIZE(type, size) \
ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")", sizeof(type)) ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")\n", sizeof(type))
/*********************************************************************** /***********************************************************************
* Test macros * Test macros
@ -110,10 +109,10 @@
TEST_TYPE_SIZE(*(type)0, size) TEST_TYPE_SIZE(*(type)0, size)
#define TEST_TYPE_SIGNED(type) \ #define TEST_TYPE_SIGNED(type) \
ok((type) -1 < 0, "(" #type ") -1 < 0"); ok((type) -1 < 0, "(" #type ") -1 < 0\n");
#define TEST_TYPE_UNSIGNED(type) \ #define TEST_TYPE_UNSIGNED(type) \
ok((type) -1 > 0, "(" #type ") -1 > 0"); ok((type) -1 > 0, "(" #type ") -1 > 0\n");
static void test_pack_DLLGETVERSIONPROC(void) static void test_pack_DLLGETVERSIONPROC(void)
{ {

View File

@ -12,7 +12,6 @@
#define WINE_NOWINSOCK #define WINE_NOWINSOCK
#include <stdarg.h> #include <stdarg.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "urlmon.h" #include "urlmon.h"
@ -31,7 +30,7 @@
* Windows API extension * Windows API extension
*/ */
#if (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field) # define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field) # define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
@ -39,7 +38,7 @@
/* FIXME: Not sure if is possible to do without compiler extension */ /* FIXME: Not sure if is possible to do without compiler extension */
#endif #endif
#if (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
@ -62,7 +61,7 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(FIELD_ALIGNMENT(type, field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
FIELD_ALIGNMENT(type, field)) FIELD_ALIGNMENT(type, field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
@ -70,7 +69,7 @@
#define TEST_FIELD_OFFSET(type, field, offset) \ #define TEST_FIELD_OFFSET(type, field, offset) \
ok(FIELD_OFFSET(type, field) == offset, \ ok(FIELD_OFFSET(type, field) == offset, \
"FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")", \ "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")\n", \
FIELD_OFFSET(type, field)) FIELD_OFFSET(type, field))
#ifdef _TYPE_ALIGNMENT #ifdef _TYPE_ALIGNMENT
@ -82,13 +81,13 @@
#ifdef TYPE_ALIGNMENT #ifdef TYPE_ALIGNMENT
#define TEST_TYPE_ALIGNMENT(type, align) \ #define TEST_TYPE_ALIGNMENT(type, align) \
ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")", TYPE_ALIGNMENT(type)) ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")\n", TYPE_ALIGNMENT(type))
#else #else
# define TEST_TYPE_ALIGNMENT(type, align) do { } while (0) # define TEST_TYPE_ALIGNMENT(type, align) do { } while (0)
#endif #endif
#define TEST_TYPE_SIZE(type, size) \ #define TEST_TYPE_SIZE(type, size) \
ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")", sizeof(type)) ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")\n", sizeof(type))
/*********************************************************************** /***********************************************************************
* Test macros * Test macros
@ -108,10 +107,10 @@
TEST_TYPE_SIZE(*(type)0, size) TEST_TYPE_SIZE(*(type)0, size)
#define TEST_TYPE_SIGNED(type) \ #define TEST_TYPE_SIGNED(type) \
ok((type) -1 < 0, "(" #type ") -1 < 0"); ok((type) -1 < 0, "(" #type ") -1 < 0\n");
#define TEST_TYPE_UNSIGNED(type) \ #define TEST_TYPE_UNSIGNED(type) \
ok((type) -1 > 0, "(" #type ") -1 > 0"); ok((type) -1 > 0, "(" #type ") -1 > 0\n");
static void test_pack_BINDINFO(void) static void test_pack_BINDINFO(void)
{ {

View File

@ -27,7 +27,7 @@
* Windows API extension * Windows API extension
*/ */
#if (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field) # define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field) # define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
@ -35,7 +35,7 @@
/* FIXME: Not sure if is possible to do without compiler extension */ /* FIXME: Not sure if is possible to do without compiler extension */
#endif #endif
#if (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
@ -58,7 +58,7 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(FIELD_ALIGNMENT(type, field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
FIELD_ALIGNMENT(type, field)) FIELD_ALIGNMENT(type, field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
@ -66,7 +66,7 @@
#define TEST_FIELD_OFFSET(type, field, offset) \ #define TEST_FIELD_OFFSET(type, field, offset) \
ok(FIELD_OFFSET(type, field) == offset, \ ok(FIELD_OFFSET(type, field) == offset, \
"FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")", \ "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")\n", \
FIELD_OFFSET(type, field)) FIELD_OFFSET(type, field))
#ifdef _TYPE_ALIGNMENT #ifdef _TYPE_ALIGNMENT
@ -78,13 +78,13 @@
#ifdef TYPE_ALIGNMENT #ifdef TYPE_ALIGNMENT
#define TEST_TYPE_ALIGNMENT(type, align) \ #define TEST_TYPE_ALIGNMENT(type, align) \
ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")", TYPE_ALIGNMENT(type)) ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")\n", TYPE_ALIGNMENT(type))
#else #else
# define TEST_TYPE_ALIGNMENT(type, align) do { } while (0) # define TEST_TYPE_ALIGNMENT(type, align) do { } while (0)
#endif #endif
#define TEST_TYPE_SIZE(type, size) \ #define TEST_TYPE_SIZE(type, size) \
ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")", sizeof(type)) ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")\n", sizeof(type))
/*********************************************************************** /***********************************************************************
* Test macros * Test macros
@ -104,10 +104,10 @@
TEST_TYPE_SIZE(*(type)0, size) TEST_TYPE_SIZE(*(type)0, size)
#define TEST_TYPE_SIGNED(type) \ #define TEST_TYPE_SIGNED(type) \
ok((type) -1 < 0, "(" #type ") -1 < 0"); ok((type) -1 < 0, "(" #type ") -1 < 0\n");
#define TEST_TYPE_UNSIGNED(type) \ #define TEST_TYPE_UNSIGNED(type) \
ok((type) -1 > 0, "(" #type ") -1 > 0"); ok((type) -1 > 0, "(" #type ") -1 > 0\n");
static void test_pack_ACCEL(void) static void test_pack_ACCEL(void)
{ {

View File

@ -12,7 +12,6 @@
#define WINE_NOWINSOCK #define WINE_NOWINSOCK
#include <stdarg.h> #include <stdarg.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wininet.h" #include "wininet.h"
@ -31,7 +30,7 @@
* Windows API extension * Windows API extension
*/ */
#if (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field) # define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field) # define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
@ -39,7 +38,7 @@
/* FIXME: Not sure if is possible to do without compiler extension */ /* FIXME: Not sure if is possible to do without compiler extension */
#endif #endif
#if (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
@ -62,7 +61,7 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(FIELD_ALIGNMENT(type, field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
FIELD_ALIGNMENT(type, field)) FIELD_ALIGNMENT(type, field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
@ -70,7 +69,7 @@
#define TEST_FIELD_OFFSET(type, field, offset) \ #define TEST_FIELD_OFFSET(type, field, offset) \
ok(FIELD_OFFSET(type, field) == offset, \ ok(FIELD_OFFSET(type, field) == offset, \
"FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")", \ "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")\n", \
FIELD_OFFSET(type, field)) FIELD_OFFSET(type, field))
#ifdef _TYPE_ALIGNMENT #ifdef _TYPE_ALIGNMENT
@ -82,13 +81,13 @@
#ifdef TYPE_ALIGNMENT #ifdef TYPE_ALIGNMENT
#define TEST_TYPE_ALIGNMENT(type, align) \ #define TEST_TYPE_ALIGNMENT(type, align) \
ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")", TYPE_ALIGNMENT(type)) ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")\n", TYPE_ALIGNMENT(type))
#else #else
# define TEST_TYPE_ALIGNMENT(type, align) do { } while (0) # define TEST_TYPE_ALIGNMENT(type, align) do { } while (0)
#endif #endif
#define TEST_TYPE_SIZE(type, size) \ #define TEST_TYPE_SIZE(type, size) \
ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")", sizeof(type)) ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")\n", sizeof(type))
/*********************************************************************** /***********************************************************************
* Test macros * Test macros
@ -108,10 +107,10 @@
TEST_TYPE_SIZE(*(type)0, size) TEST_TYPE_SIZE(*(type)0, size)
#define TEST_TYPE_SIGNED(type) \ #define TEST_TYPE_SIGNED(type) \
ok((type) -1 < 0, "(" #type ") -1 < 0"); ok((type) -1 < 0, "(" #type ") -1 < 0\n");
#define TEST_TYPE_UNSIGNED(type) \ #define TEST_TYPE_UNSIGNED(type) \
ok((type) -1 > 0, "(" #type ") -1 > 0"); ok((type) -1 > 0, "(" #type ") -1 > 0\n");
static void test_pack_GOPHER_FIND_DATAA(void) static void test_pack_GOPHER_FIND_DATAA(void)
{ {