Avoid spaces before preprocessor directives, that's not portable.
diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h
index 42ad019..8d32424 100644
--- a/dlls/d3d8/d3d8_private.h
+++ b/dlls/d3d8/d3d8_private.h
@@ -378,10 +378,10 @@
BOOL last_was_rhw; /* true iff last draw_primitive was in xyzrhw mode */
GLenum tracking_parm; /* Which source is tracking current colour */
LONG tracking_color; /* used iff GL_COLOR_MATERIAL was enabled */
- #define DISABLED_TRACKING 0 /* Disabled */
- #define IS_TRACKING 1 /* tracking_parm is tracking diffuse color */
- #define NEEDS_TRACKING 2 /* Tracking needs to be enabled when needed */
- #define NEEDS_DISABLE 3 /* Tracking needs to be disabled when needed*/
+#define DISABLED_TRACKING 0 /* Disabled */
+#define IS_TRACKING 1 /* tracking_parm is tracking diffuse color */
+#define NEEDS_TRACKING 2 /* Tracking needs to be enabled when needed */
+#define NEEDS_DISABLE 3 /* Tracking needs to be disabled when needed*/
/* OpenGL related */
GLXContext glCtx;
diff --git a/dlls/kernel/local16.c b/dlls/kernel/local16.c
index 9fe2dbb..c6f80bb2 100644
--- a/dlls/kernel/local16.c
+++ b/dlls/kernel/local16.c
@@ -95,9 +95,9 @@
*/
#ifdef ALLOW_UNALIGNED_ACCESS
- #define MOVEABLE_PREFIX sizeof(HLOCAL16)
+# define MOVEABLE_PREFIX sizeof(HLOCAL16)
#else
- #define MOVEABLE_PREFIX sizeof(int)
+# define MOVEABLE_PREFIX sizeof(int)
#endif
diff --git a/dlls/kernel/tests/thread.c b/dlls/kernel/tests/thread.c
index 6b51543..48a6d55 100644
--- a/dlls/kernel/tests/thread.c
+++ b/dlls/kernel/tests/thread.c
@@ -43,13 +43,13 @@
Anyhow, the check is currently commented out
*/
#if CHECK_STACK
- #ifdef __try
- #define __TRY __try
- #define __EXCEPT __except
- #define __ENDTRY
- #else
- #include "wine/exception.h"
- #endif
+# ifdef __try
+# define __TRY __try
+# define __EXCEPT __except
+# define __ENDTRY
+# else
+# include "wine/exception.h"
+# endif
#endif
typedef BOOL (WINAPI *GetThreadPriorityBoost_t)(HANDLE,PBOOL);
diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c
index c9eedd2..689eed1 100644
--- a/dlls/mscms/mscms_main.c
+++ b/dlls/mscms/mscms_main.c
@@ -68,7 +68,7 @@
}
}
- #define LOAD_FUNCPTR(f) \
+#define LOAD_FUNCPTR(f) \
if ((p##f = wine_dlsym( lcmshandle, #f, NULL, 0 )) == NULL) \
goto sym_not_found;
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index cfe121d..d66489a 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -6020,10 +6020,10 @@
USHORT uStringLength;
USHORT uStringOffset; /* from start of storage area */
}TT_NAME_RECORD;
-
- #define SWAPWORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x))
- #define SWAPLONG(x) MAKELONG(SWAPWORD(HIWORD(x)), SWAPWORD(LOWORD(x)))
-
+
+#define SWAPWORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x))
+#define SWAPLONG(x) MAKELONG(SWAPWORD(HIWORD(x)), SWAPWORD(LOWORD(x)))
+
handle = CreateFileW(filename ,GENERIC_READ, 0, NULL, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, 0 );
if (handle != INVALID_HANDLE_VALUE)
diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index cab20d6..ca054d4 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -92,10 +92,10 @@
lack the following constants. */
#ifndef CD_SECS
- #define CD_SECS 60 /* seconds per minute */
+# define CD_SECS 60 /* seconds per minute */
#endif
#ifndef CD_FRAMES
- #define CD_FRAMES 75 /* frames per second */
+# define CD_FRAMES 75 /* frames per second */
#endif
/* definitions taken from libdvdcss */
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 6bf457a..777e038 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -1441,9 +1441,9 @@
break;
}
#elif defined (__APPLE__)
- #include <IOKit/IOKitLib.h>
- #include <CoreFoundation/CFNumber.h> /* for kCFBooleanTrue, kCFBooleanFalse */
- #include <paths.h>
+# include <IOKit/IOKitLib.h>
+# include <CoreFoundation/CFNumber.h> /* for kCFBooleanTrue, kCFBooleanFalse */
+# include <paths.h>
struct statfs stfs;
info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c
index 74156e8..635dd83 100644
--- a/dlls/ole32/clipboard.c
+++ b/dlls/ole32/clipboard.c
@@ -82,7 +82,7 @@
/* For CoGetMalloc (MEMCTX_TASK is currently ignored) */
#ifndef MEMCTX_TASK
- #define MEMCTX_TASK -1
+# define MEMCTX_TASK -1
#endif
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c
index a66bf21..b3c4098 100644
--- a/dlls/quartz/main.c
+++ b/dlls/quartz/main.c
@@ -205,15 +205,16 @@
}
+#define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } , #name },
+
static struct {
const GUID riid;
const char *name;
} InterfaceDesc[] =
{
- #define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
- { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } , #name },
- #include "uuids.h"
- { { 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0} }, NULL }
+#include "uuids.h"
+ { { 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0} }, NULL }
};
/***********************************************************************
diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 56654c9..da71b80 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -45,21 +45,21 @@
#define BUFFER_PARANOIA 20
#if defined(__i386__)
- #define LITTLE_ENDIAN_UINT32_WRITE(pchar, uint32) \
+# define LITTLE_ENDIAN_UINT32_WRITE(pchar, uint32) \
(*((UINT32 *)(pchar)) = (uint32))
- #define LITTLE_ENDIAN_UINT32_READ(pchar) \
+# define LITTLE_ENDIAN_UINT32_READ(pchar) \
(*((UINT32 *)(pchar)))
#else
/* these would work for i386 too, but less efficient */
- #define LITTLE_ENDIAN_UINT32_WRITE(pchar, uint32) \
+# define LITTLE_ENDIAN_UINT32_WRITE(pchar, uint32) \
(*(pchar) = LOBYTE(LOWORD(uint32)), \
*((pchar)+1) = HIBYTE(LOWORD(uint32)), \
*((pchar)+2) = LOBYTE(HIWORD(uint32)), \
*((pchar)+3) = HIBYTE(HIWORD(uint32)), \
(uint32)) /* allow as r-value */
- #define LITTLE_ENDIAN_UINT32_READ(pchar) \
+# define LITTLE_ENDIAN_UINT32_READ(pchar) \
(MAKELONG( \
MAKEWORD(*(pchar), *((pchar)+1)), \
MAKEWORD(*((pchar)+2), *((pchar)+3))))
@@ -78,14 +78,14 @@
MAKEWORD(*((pchar)+1), *(pchar))))
#ifdef NDR_LOCAL_IS_BIG_ENDIAN
- #define NDR_LOCAL_UINT32_WRITE(pchar, uint32) \
+# define NDR_LOCAL_UINT32_WRITE(pchar, uint32) \
BIG_ENDIAN_UINT32_WRITE(pchar, uint32)
- #define NDR_LOCAL_UINT32_READ(pchar) \
+# define NDR_LOCAL_UINT32_READ(pchar) \
BIG_ENDIAN_UINT32_READ(pchar)
#else
- #define NDR_LOCAL_UINT32_WRITE(pchar, uint32) \
+# define NDR_LOCAL_UINT32_WRITE(pchar, uint32) \
LITTLE_ENDIAN_UINT32_WRITE(pchar, uint32)
- #define NDR_LOCAL_UINT32_READ(pchar) \
+# define NDR_LOCAL_UINT32_READ(pchar) \
LITTLE_ENDIAN_UINT32_READ(pchar)
#endif
diff --git a/dlls/twain/twain.h b/dlls/twain/twain.h
index b6576ae..8d89105 100644
--- a/dlls/twain/twain.h
+++ b/dlls/twain/twain.h
@@ -86,25 +86,25 @@
/* SDH - 05/05/95 - TWUNK */
/* For common code between 16 and 32 bits. */
- #ifdef WIN32
- #define TW_HUGE
- #else /* WIN32 */
- #define TW_HUGE huge
- #endif /* WIN32 */
+# ifdef WIN32
+# define TW_HUGE
+# else /* WIN32 */
+# define TW_HUGE huge
+# endif /* WIN32 */
typedef BYTE TW_HUGE * HPBYTE;
typedef void TW_HUGE * HPVOID;
#endif /* _MSWIN_ */
#ifdef _MAC_
- #define PASCAL pascal
- #define FAR
+#define PASCAL pascal
+#define FAR
typedef Handle TW_HANDLE;
typedef char *TW_MEMREF;
#endif /* _MAC_ */
#ifdef _UNIX_
/* #define PASCAL pascal */
- #define FAR
+#define FAR
typedef unsigned char *TW_HANDLE;
typedef unsigned char *TW_MEMREF;
#endif /* _UNIX_ */
@@ -1827,19 +1827,19 @@
extern "C" {
#endif /* __cplusplus */
#ifdef _MSWIN_
- #ifdef _WIN32
+# ifdef _WIN32
__declspec(dllexport) TW_UINT16 FAR PASCAL DS_Entry (pTW_IDENTITY pOrigin,
TW_UINT32 DG,
TW_UINT16 DAT,
TW_UINT16 MSG,
TW_MEMREF pData);
- #else /* _WIN32 */
+# else /* _WIN32 */
TW_UINT16 FAR PASCAL DS_Entry (pTW_IDENTITY pOrigin,
TW_UINT32 DG,
TW_UINT16 DAT,
TW_UINT16 MSG,
TW_MEMREF pData);
- #endif /* _WIN32 */
+# endif /* _WIN32 */
typedef TW_UINT16 (FAR PASCAL *DSENTRYPROC) (pTW_IDENTITY pOrigin,
TW_UINT32 DG,
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 7a5dcef..b56f1db 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -327,7 +327,7 @@
/* Setup the texture operations texture stage states */
void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, D3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3)
{
- #define GLINFO_LOCATION ((IWineD3DImpl *)(This->wineD3D))->gl_info
+#define GLINFO_LOCATION ((IWineD3DImpl *)(This->wineD3D))->gl_info
GLenum src1, src2, src3;
GLenum opr1, opr2, opr3;
GLenum comb_target;
diff --git a/dlls/wineps/graphics.c b/dlls/wineps/graphics.c
index a38f8af..bd4b34b 100644
--- a/dlls/wineps/graphics.c
+++ b/dlls/wineps/graphics.c
@@ -24,10 +24,10 @@
#include <string.h>
#include <math.h>
#if defined(HAVE_FLOAT_H)
- #include <float.h>
+# include <float.h>
#endif
#if !defined(PI)
- #define PI M_PI
+# define PI M_PI
#endif
#include "psdrv.h"
#include "wine/debug.h"
diff --git a/dlls/winmm/joystick/joystick.c b/dlls/winmm/joystick/joystick.c
index a36f5c0..8a01fe4 100644
--- a/dlls/winmm/joystick/joystick.c
+++ b/dlls/winmm/joystick/joystick.c
@@ -352,7 +352,7 @@
lpInfo->dwZpos = jstck->z + 32767;
if (lpInfo->dwFlags & JOY_RETURNR)
lpInfo->dwRpos = jstck->r + 32767;
- #ifdef BODGE_THE_HAT
+# ifdef BODGE_THE_HAT
else if (lpInfo->dwFlags & JOY_RETURNBUTTONS)
{
if (jstck->r > 0)
@@ -360,10 +360,10 @@
else if (jstck->r < 0)
lpInfo->dwButtons |= 1<<8;
}
- #endif
+# endif
if (lpInfo->dwFlags & JOY_RETURNU)
lpInfo->dwUpos = jstck->u + 32767;
- #ifdef BODGE_THE_HAT
+# ifdef BODGE_THE_HAT
else if (lpInfo->dwFlags & JOY_RETURNBUTTONS)
{
if (jstck->u > 0)
@@ -371,7 +371,7 @@
else if (jstck->u < 0)
lpInfo->dwButtons |= 1<<10;
}
- #endif
+# endif
if (lpInfo->dwFlags & JOY_RETURNV)
lpInfo->dwVpos = jstck->v + 32767;
diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c
index afa20ee..8d9b8a8 100644
--- a/dlls/wsock32/socket.c
+++ b/dlls/wsock32/socket.c
@@ -589,7 +589,7 @@
case WSCNTL_TCPIP_ICMP_ECHO:
{
unsigned int addr = *(unsigned int*)pRequestInfo;
- #if 0
+#if 0
int timeout= *(unsigned int*)(inbuf+4);
short x1 = *(unsigned short*)(inbuf+8);
short sendbufsize = *(unsigned short*)(inbuf+10);
@@ -597,7 +597,7 @@
char ttl = *(unsigned char*)(inbuf+13);
char service = *(unsigned char*)(inbuf+14);
char type= *(unsigned char*)(inbuf+15); /* 0x2: don't fragment*/
- #endif
+#endif
FIXME("(ICMP_ECHO) to 0x%08x stub \n", addr);
break;
diff --git a/dlls/x11drv/clipboard.c b/dlls/x11drv/clipboard.c
index cb0d96b..4263fad 100644
--- a/dlls/x11drv/clipboard.c
+++ b/dlls/x11drv/clipboard.c
@@ -2335,10 +2335,10 @@
{
FIXME("\timplement function CopyMetaFilePict32to16\n");
FIXME("\tin the appropriate file.\n");
- #ifdef SOMEONE_IMPLEMENTED_ME
+#ifdef SOMEONE_IMPLEMENTED_ME
CopyMetaFilePict32to16(GlobalLock16(lpRender->hData16),
GlobalLock(lpRender->hData32));
- #endif
+#endif
}
else
{
diff --git a/include/dmusicc.h b/include/dmusicc.h
index 18aa40c..c7aebae 100644
--- a/include/dmusicc.h
+++ b/include/dmusicc.h
@@ -123,47 +123,47 @@
* Flags
*/
#ifndef _DIRECTAUDIO_PRIORITIES_DEFINED_
- #define _DIRECTAUDIO_PRIORITIES_DEFINED_
+#define _DIRECTAUDIO_PRIORITIES_DEFINED_
- #define DAUD_CRITICAL_VOICE_PRIORITY 0xF0000000
- #define DAUD_HIGH_VOICE_PRIORITY 0xC0000000
- #define DAUD_STANDARD_VOICE_PRIORITY 0x80000000
- #define DAUD_LOW_VOICE_PRIORITY 0x40000000
- #define DAUD_PERSIST_VOICE_PRIORITY 0x10000000
-
- #define DAUD_CHAN1_VOICE_PRIORITY_OFFSET 0x0000000E
- #define DAUD_CHAN2_VOICE_PRIORITY_OFFSET 0x0000000D
- #define DAUD_CHAN3_VOICE_PRIORITY_OFFSET 0x0000000C
- #define DAUD_CHAN4_VOICE_PRIORITY_OFFSET 0x0000000B
- #define DAUD_CHAN5_VOICE_PRIORITY_OFFSET 0x0000000A
- #define DAUD_CHAN6_VOICE_PRIORITY_OFFSET 0x00000009
- #define DAUD_CHAN7_VOICE_PRIORITY_OFFSET 0x00000008
- #define DAUD_CHAN8_VOICE_PRIORITY_OFFSET 0x00000007
- #define DAUD_CHAN9_VOICE_PRIORITY_OFFSET 0x00000006
- #define DAUD_CHAN10_VOICE_PRIORITY_OFFSET 0x0000000F
- #define DAUD_CHAN11_VOICE_PRIORITY_OFFSET 0x00000005
- #define DAUD_CHAN12_VOICE_PRIORITY_OFFSET 0x00000004
- #define DAUD_CHAN13_VOICE_PRIORITY_OFFSET 0x00000003
- #define DAUD_CHAN14_VOICE_PRIORITY_OFFSET 0x00000002
- #define DAUD_CHAN15_VOICE_PRIORITY_OFFSET 0x00000001
- #define DAUD_CHAN16_VOICE_PRIORITY_OFFSET 0x00000000
-
- #define DAUD_CHAN1_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN1_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN2_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN2_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN3_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN3_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN4_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN4_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN5_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN5_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN6_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN6_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN7_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN7_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN8_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN8_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN9_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN9_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN10_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN10_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN11_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN11_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN12_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN12_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN13_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN13_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN14_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN14_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN15_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN15_VOICE_PRIORITY_OFFSET)
- #define DAUD_CHAN16_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN16_VOICE_PRIORITY_OFFSET)
+#define DAUD_CRITICAL_VOICE_PRIORITY 0xF0000000
+#define DAUD_HIGH_VOICE_PRIORITY 0xC0000000
+#define DAUD_STANDARD_VOICE_PRIORITY 0x80000000
+#define DAUD_LOW_VOICE_PRIORITY 0x40000000
+#define DAUD_PERSIST_VOICE_PRIORITY 0x10000000
+
+#define DAUD_CHAN1_VOICE_PRIORITY_OFFSET 0x0000000E
+#define DAUD_CHAN2_VOICE_PRIORITY_OFFSET 0x0000000D
+#define DAUD_CHAN3_VOICE_PRIORITY_OFFSET 0x0000000C
+#define DAUD_CHAN4_VOICE_PRIORITY_OFFSET 0x0000000B
+#define DAUD_CHAN5_VOICE_PRIORITY_OFFSET 0x0000000A
+#define DAUD_CHAN6_VOICE_PRIORITY_OFFSET 0x00000009
+#define DAUD_CHAN7_VOICE_PRIORITY_OFFSET 0x00000008
+#define DAUD_CHAN8_VOICE_PRIORITY_OFFSET 0x00000007
+#define DAUD_CHAN9_VOICE_PRIORITY_OFFSET 0x00000006
+#define DAUD_CHAN10_VOICE_PRIORITY_OFFSET 0x0000000F
+#define DAUD_CHAN11_VOICE_PRIORITY_OFFSET 0x00000005
+#define DAUD_CHAN12_VOICE_PRIORITY_OFFSET 0x00000004
+#define DAUD_CHAN13_VOICE_PRIORITY_OFFSET 0x00000003
+#define DAUD_CHAN14_VOICE_PRIORITY_OFFSET 0x00000002
+#define DAUD_CHAN15_VOICE_PRIORITY_OFFSET 0x00000001
+#define DAUD_CHAN16_VOICE_PRIORITY_OFFSET 0x00000000
+
+#define DAUD_CHAN1_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN1_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN2_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN2_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN3_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN3_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN4_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN4_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN5_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN5_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN6_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN6_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN7_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN7_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN8_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN8_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN9_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN9_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN10_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN10_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN11_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN11_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN12_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN12_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN13_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN13_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN14_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN14_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN15_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN15_VOICE_PRIORITY_OFFSET)
+#define DAUD_CHAN16_DEF_VOICE_PRIORITY (DAUD_STANDARD_VOICE_PRIORITY | DAUD_CHAN16_VOICE_PRIORITY_OFFSET)
#endif /* _DIRECTAUDIO_PRIORITIES_DEFINED_ */
#define DMUS_CLOCKF_GLOBAL 0x1
diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h
index 073f32b..583d472 100644
--- a/include/wine/rpcfc.h
+++ b/include/wine/rpcfc.h
@@ -90,32 +90,32 @@
/* proc header: oiflags, NdrFcLong(rpcflags), NdrFcShort(procnum), NdrFcShort(stacksiz),
* oi2 header: NdrFcShort(clientbuf), NdrFcShort(servbuf), oi2flags, parmcount
* oi2 parameters: NdrFcShort(flags), NdrFcShort(stackofs), NdrFcShort(typeofs)/basetype */
- #define RPC_FC_PROC_OIF_FULLPTR 0x01
- #define RPC_FC_PROC_OIF_RPCSSALLOC 0x02
- #define RPC_FC_PROC_OIF_OBJECT 0x04
- #define RPC_FC_PROC_OIF_RPCFLAGS 0x08
- #define RPC_FC_PROC_OIF_OBJ_V2 0x20
- #define RPC_FC_PROC_OIF_NEWINIT 0x40
+#define RPC_FC_PROC_OIF_FULLPTR 0x01
+#define RPC_FC_PROC_OIF_RPCSSALLOC 0x02
+#define RPC_FC_PROC_OIF_OBJECT 0x04
+#define RPC_FC_PROC_OIF_RPCFLAGS 0x08
+#define RPC_FC_PROC_OIF_OBJ_V2 0x20
+#define RPC_FC_PROC_OIF_NEWINIT 0x40
- #define RPC_FC_PROC_OI2F_SRVMUSTSIZE 0x01
- #define RPC_FC_PROC_OI2F_CLTMUSTSIZE 0x02
- #define RPC_FC_PROC_OI2F_HASRETURN 0x04
- #define RPC_FC_PROC_OI2F_HASPIPES 0x08
- #define RPC_FC_PROC_OI2F_HASASYNCUUID 0x20
- #define RPC_FC_PROC_OI2F_HASEXTS 0x40
- #define RPC_FC_PROC_OI2F_HASASYNCHND 0x80
- #define RPC_FC_PROC_PF_MUSTSIZE 0x0001
- #define RPC_FC_PROC_PF_MUSTFREE 0x0002
- #define RPC_FC_PROC_PF_PIPE 0x0004
- #define RPC_FC_PROC_PF_IN 0x0008
- #define RPC_FC_PROC_PF_OUT 0x0010
- #define RPC_FC_PROC_PF_RETURN 0x0020
- #define RPC_FC_PROC_PF_BASETYPE 0x0040
- #define RPC_FC_PROC_PF_BYVAL 0x0080
- #define RPC_FC_PROC_PF_SIMPLEREF 0x0100
- #define RPC_FC_PROC_PF_DONTFREEINST 0x0200
- #define RPC_FC_PROC_PF_SAVEASYNC 0x0400
- #define RPC_FC_PROC_PF_SRVALLOCSIZE 0xe000 /* in 8 byte units */
+#define RPC_FC_PROC_OI2F_SRVMUSTSIZE 0x01
+#define RPC_FC_PROC_OI2F_CLTMUSTSIZE 0x02
+#define RPC_FC_PROC_OI2F_HASRETURN 0x04
+#define RPC_FC_PROC_OI2F_HASPIPES 0x08
+#define RPC_FC_PROC_OI2F_HASASYNCUUID 0x20
+#define RPC_FC_PROC_OI2F_HASEXTS 0x40
+#define RPC_FC_PROC_OI2F_HASASYNCHND 0x80
+#define RPC_FC_PROC_PF_MUSTSIZE 0x0001
+#define RPC_FC_PROC_PF_MUSTFREE 0x0002
+#define RPC_FC_PROC_PF_PIPE 0x0004
+#define RPC_FC_PROC_PF_IN 0x0008
+#define RPC_FC_PROC_PF_OUT 0x0010
+#define RPC_FC_PROC_PF_RETURN 0x0020
+#define RPC_FC_PROC_PF_BASETYPE 0x0040
+#define RPC_FC_PROC_PF_BYVAL 0x0080
+#define RPC_FC_PROC_PF_SIMPLEREF 0x0100
+#define RPC_FC_PROC_PF_DONTFREEINST 0x0200
+#define RPC_FC_PROC_PF_SAVEASYNC 0x0400
+#define RPC_FC_PROC_PF_SRVALLOCSIZE 0xe000 /* in 8 byte units */
#define RPC_FC_PROC_EXT_NEWCORRDESC 0x01
#define RPC_FC_PROC_EXT_CLIENTCORRCHECK 0x02
#define RPC_FC_PROC_EXT_SERVERCORRCHECK 0x04
diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c
index 8cc2998..79edb98 100644
--- a/programs/rpcss/rpcss_main.c
+++ b/programs/rpcss/rpcss_main.c
@@ -92,17 +92,17 @@
static SYSTEMTIME lazy_timeout_time;
#if defined(NONAMELESSSTRUCT)
- #define FILETIME_TO_ULARGEINT(filetime, ularge) \
+# define FILETIME_TO_ULARGEINT(filetime, ularge) \
( ularge.u.LowPart = filetime.dwLowDateTime, \
ularge.u.HighPart = filetime.dwHighDateTime )
- #define ULARGEINT_TO_FILETIME(ularge, filetime) \
+# define ULARGEINT_TO_FILETIME(ularge, filetime) \
( filetime.dwLowDateTime = ularge.u.LowPart, \
filetime.dwHighDateTime = ularge.u.HighPart )
#else
- #define FILETIME_TO_ULARGEINT(filetime, ularge) \
+# define FILETIME_TO_ULARGEINT(filetime, ularge) \
( ularge.LowPart = filetime.dwLowDateTime, \
ularge.HighPart = filetime.dwHighDateTime )
- #define ULARGEINT_TO_FILETIME(ularge, filetime) \
+# define ULARGEINT_TO_FILETIME(ularge, filetime) \
( filetime.dwLowDateTime = ularge.LowPart, \
filetime.dwHighDateTime = ularge.HighPart )
#endif /* NONAMELESSSTRUCT */
diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c
index 3680310..d4b8d1b 100644
--- a/programs/taskmgr/perfdata.c
+++ b/programs/taskmgr/perfdata.c
@@ -349,11 +349,11 @@
EnterCriticalSection(&PerfDataCriticalSection);
if (Index < ProcessCount) {
- #ifdef _UNICODE
+#ifdef _UNICODE
wcsncpy(lpImageName, pPerfData[Index].ImageName, nMaxCount);
- #else
+#else
WideCharToMultiByte(CP_ACP, 0, pPerfData[Index].ImageName, -1, lpImageName, nMaxCount, NULL, NULL);
- #endif
+#endif
bSuccessful = TRUE;
} else {
@@ -386,11 +386,11 @@
EnterCriticalSection(&PerfDataCriticalSection);
if (Index < ProcessCount) {
- #ifdef _UNICODE
+#ifdef _UNICODE
wcsncpy(lpUserName, pPerfData[Index].UserName, nMaxCount);
- #else
+#else
WideCharToMultiByte(CP_ACP, 0, pPerfData[Index].UserName, -1, lpUserName, nMaxCount, NULL, NULL);
- #endif
+#endif
bSuccessful = TRUE;
} else {
diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c
index 9eb29b0..e2f1cc8 100644
--- a/programs/taskmgr/procpage.c
+++ b/programs/taskmgr/procpage.c
@@ -176,11 +176,11 @@
{
switch (pnmh->code)
{
- #if 0
+#if 0
case LVN_ITEMCHANGED:
ProcessPageUpdate();
break;
- #endif
+#endif
case LVN_GETDISPINFO:
diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c
index 49dd97b..f9eac9d 100644
--- a/programs/wineconsole/curses.c
+++ b/programs/wineconsole/curses.c
@@ -61,9 +61,9 @@
#if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
#ifdef HAVE_NCURSES_H
- #define CURSES_NAME "ncurses"
+# define CURSES_NAME "ncurses"
#else
- #define CURSES_NAME "curses"
+# define CURSES_NAME "curses"
#endif
struct inner_data_curse
diff --git a/programs/winemine/main.h b/programs/winemine/main.h
index ce3ec1a..c2e3f6a 100644
--- a/programs/winemine/main.h
+++ b/programs/winemine/main.h
@@ -91,13 +91,13 @@
POINT press;
/* defines for mb */
- #define MB_NONE 0
- #define MB_LEFTDOWN 1
- #define MB_LEFTUP 2
- #define MB_RIGHTDOWN 3
- #define MB_RIGHTUP 4
- #define MB_BOTHDOWN 5
- #define MB_BOTHUP 6
+#define MB_NONE 0
+#define MB_LEFTDOWN 1
+#define MB_LEFTUP 2
+#define MB_RIGHTDOWN 3
+#define MB_RIGHTUP 4
+#define MB_BOTHDOWN 5
+#define MB_BOTHUP 6
unsigned mb;
FACE_BMP face_bmp;
@@ -111,10 +111,10 @@
} box [MAX_COLS + 2] [MAX_ROWS + 2];
/* defines for FlagType */
- #define NORMAL 0
- #define QUESTION 1
- #define FLAG 2
- #define COMPLETE 3
+#define NORMAL 0
+#define QUESTION 1
+#define FLAG 2
+#define COMPLETE 3
} BOARD;
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index ab11dcd..2b61f39 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -735,11 +735,11 @@
/* ------------------------------ UserType ------------------------------ */
userres : usertype loadmemopts file_raw {
- #ifdef WORDS_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
if(pedantic && byteorder != WRC_BO_LITTLE)
- #else
+#else
if(pedantic && byteorder == WRC_BO_BIG)
- #endif
+#endif
yywarning("Byteordering is not little-endian and type cannot be interpreted");
$$ = new_user($1, $3, $2);
}
