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

Cleaned up the code so it would be easier to parse with the new C 

parser.
This commit is contained in:
Patrik Stridvall 2002-09-23 20:45:57 +00:00 committed by Alexandre Julliard
parent 11f0359977
commit 1a4db3e72a
8 changed files with 151 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/comctl32/rebar.c
View File

@ -316,10 +316,10 @@ typedef struct
((a)->fStyle & RBBS_NOVERT))) ((a)->fStyle & RBBS_NOVERT)))
/* The following defines adjust the right or left end of a rectangle */ /* The following defines adjust the right or left end of a rectangle */
#define READJ(b,i) {if(infoPtr->dwStyle & CCS_VERT) b->rcBand.bottom+=(i); \ #define READJ(b,i) do { if(infoPtr->dwStyle & CCS_VERT) b->rcBand.bottom+=(i); \
else b->rcBand.right += (i);} else b->rcBand.right += (i); } while(0)
#define LEADJ(b,i) {if(infoPtr->dwStyle & CCS_VERT) b->rcBand.top+=(i); \ #define LEADJ(b,i) do { if(infoPtr->dwStyle & CCS_VERT) b->rcBand.top+=(i); \
else b->rcBand.left += (i);} else b->rcBand.left += (i); } while(0)
#define REBAR_GetInfoPtr(wndPtr) ((REBAR_INFO *)GetWindowLongA (hwnd, 0)) #define REBAR_GetInfoPtr(wndPtr) ((REBAR_INFO *)GetWindowLongA (hwnd, 0))
@ -2440,7 +2440,7 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, POINTS *ptsmove)
band = &infoPtr->bands[i]; band = &infoPtr->bands[i];
if (HIDDENBAND(band)) continue; if (HIDDENBAND(band)) continue;
if (i == ihitBand) { if (i == ihitBand) {
LEADJ(band, movement) LEADJ(band, movement);
} }
else else
movement = REBAR_Shrink (infoPtr, band, movement, i); movement = REBAR_Shrink (infoPtr, band, movement, i);
@ -2463,7 +2463,7 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, POINTS *ptsmove)
if (HIDDENBAND(band)) continue; if (HIDDENBAND(band)) continue;
if (first) { if (first) {
first = FALSE; first = FALSE;
READJ(band, movement) READJ(band, movement);
} }
else else
movement = REBAR_Shrink (infoPtr, band, movement, i); movement = REBAR_Shrink (infoPtr, band, movement, i);

32
dlls/gdi/freetype.c
View File

@ -88,22 +88,22 @@ static FT_Version_t FT_Version;
static void *ft_handle = NULL; static void *ft_handle = NULL;
#define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL
MAKE_FUNCPTR(FT_Cos) MAKE_FUNCPTR(FT_Cos);
MAKE_FUNCPTR(FT_Done_Face) MAKE_FUNCPTR(FT_Done_Face);
MAKE_FUNCPTR(FT_Get_Char_Index) MAKE_FUNCPTR(FT_Get_Char_Index);
MAKE_FUNCPTR(FT_Get_Sfnt_Table) MAKE_FUNCPTR(FT_Get_Sfnt_Table);
MAKE_FUNCPTR(FT_Init_FreeType) MAKE_FUNCPTR(FT_Init_FreeType);
MAKE_FUNCPTR(FT_Load_Glyph) MAKE_FUNCPTR(FT_Load_Glyph);
MAKE_FUNCPTR(FT_MulFix) MAKE_FUNCPTR(FT_MulFix);
MAKE_FUNCPTR(FT_New_Face) MAKE_FUNCPTR(FT_New_Face);
MAKE_FUNCPTR(FT_Outline_Get_Bitmap) MAKE_FUNCPTR(FT_Outline_Get_Bitmap);
MAKE_FUNCPTR(FT_Outline_Transform) MAKE_FUNCPTR(FT_Outline_Transform);
MAKE_FUNCPTR(FT_Outline_Translate) MAKE_FUNCPTR(FT_Outline_Translate);
MAKE_FUNCPTR(FT_Select_Charmap) MAKE_FUNCPTR(FT_Select_Charmap);
MAKE_FUNCPTR(FT_Set_Pixel_Sizes) MAKE_FUNCPTR(FT_Set_Pixel_Sizes);
MAKE_FUNCPTR(FT_Sin) MAKE_FUNCPTR(FT_Sin);
MAKE_FUNCPTR(FT_Vector_Rotate) MAKE_FUNCPTR(FT_Vector_Rotate);
#undef MAKE_FUNCPTR #undef MAKE_FUNCPTR
static void (*pFT_Library_Version)(FT_Library,FT_Int*,FT_Int*,FT_Int*); static void (*pFT_Library_Version)(FT_Library,FT_Int*,FT_Int*,FT_Int*);

16
dlls/kernel/tests/environ.c
View File

@ -143,10 +143,10 @@ static void test_GetSetEnvironmentVariableW(void)
lstrcpyW(buf, fooW); lstrcpyW(buf, fooW);
ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value)); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value));
todo_wine
{ todo_wine {
ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer"); ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer");
}; };
ok(ret_size == lstrlenW(value) + 1, "should return length with terminating 0"); ok(ret_size == lstrlenW(value) + 1, "should return length with terminating 0");
lstrcpyW(buf, fooW); lstrcpyW(buf, fooW);
@ -176,10 +176,10 @@ todo_wine
lstrcpyW(buf, fooW); lstrcpyW(buf, fooW);
ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1);
ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable"); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable");
todo_wine
{ todo_wine {
ok(lstrcmpW(buf, empty_strW) == 0, "should copy an empty string"); ok(lstrcmpW(buf, empty_strW) == 0, "should copy an empty string");
}; };
} }
START_TEST(environ) START_TEST(environ)

252
dlls/richedit/reader.c
View File

@ -162,12 +162,7 @@ static CHARLIST inputCharList = {0, NULL, NULL};
* stdcharnames.h is generated in the ../h directory. * stdcharnames.h is generated in the ../h directory.
*/ */
static char *stdCharName[] = #include "stdcharnames.h"
{
# include "stdcharnames.h"
(char *) NULL
};
/* /*
* These arrays are used to map RTF input character values onto the standard * These arrays are used to map RTF input character values onto the standard
@ -210,8 +205,7 @@ static int csTop = 0;
* *
*/ */
int int _RTFGetChar(void)
_RTFGetChar()
{ {
char myChar; char myChar;
@ -231,8 +225,7 @@ _RTFGetChar()
return (int) myChar; return (int) myChar;
} }
void void RTFSetEditStream(EDITSTREAM *es)
RTFSetEditStream(EDITSTREAM *es)
{ {
TRACE("\n"); TRACE("\n");
@ -247,8 +240,7 @@ RTFSetEditStream(EDITSTREAM *es)
* stream; that must be done with RTFSetStream(). * stream; that must be done with RTFSetStream().
*/ */
void void RTFInit(void)
RTFInit ()
{ {
int i; int i;
RTFColor *cp; RTFColor *cp;
@ -340,9 +332,7 @@ RTFStyleElt *eltList, *ep;
* to be accurate, only insofar as the calling program makes them so. * to be accurate, only insofar as the calling program makes them so.
*/ */
void void RTFSetInputName(char *name)
RTFSetInputName (name)
char *name;
{ {
TRACE("\n"); TRACE("\n");
@ -351,16 +341,13 @@ char *name;
} }
char * char *RTFGetInputName(void)
RTFGetInputName ()
{ {
return (inputName); return (inputName);
} }
void void RTFSetOutputName(char *name)
RTFSetOutputName (name)
char *name;
{ {
TRACE("\n"); TRACE("\n");
@ -369,8 +356,7 @@ char *name;
} }
char * char *RTFGetOutputName(void)
RTFGetOutputName ()
{ {
return (outputName); return (outputName);
} }
@ -392,19 +378,14 @@ RTFGetOutputName ()
static RTFFuncPtr ccb[rtfMaxClass]; /* class callbacks */ static RTFFuncPtr ccb[rtfMaxClass]; /* class callbacks */
void void RTFSetClassCallback(int class, RTFFuncPtr callback)
RTFSetClassCallback (class, callback)
int class;
RTFFuncPtr callback;
{ {
if (class >= 0 && class < rtfMaxClass) if (class >= 0 && class < rtfMaxClass)
ccb[class] = callback; ccb[class] = callback;
} }
RTFFuncPtr RTFFuncPtr RTFGetClassCallback(int class)
RTFGetClassCallback (class)
int class;
{ {
if (class >= 0 && class < rtfMaxClass) if (class >= 0 && class < rtfMaxClass)
return (ccb[class]); return (ccb[class]);
@ -419,19 +400,14 @@ int class;
static RTFFuncPtr dcb[rtfMaxDestination]; /* destination callbacks */ static RTFFuncPtr dcb[rtfMaxDestination]; /* destination callbacks */
void void RTFSetDestinationCallback(int dest, RTFFuncPtr callback)
RTFSetDestinationCallback (dest, callback)
int dest;
RTFFuncPtr callback;
{ {
if (dest >= 0 && dest < rtfMaxDestination) if (dest >= 0 && dest < rtfMaxDestination)
dcb[dest] = callback; dcb[dest] = callback;
} }
RTFFuncPtr RTFFuncPtr RTFGetDestinationCallback(int dest)
RTFGetDestinationCallback (dest)
int dest;
{ {
if (dest >= 0 && dest < rtfMaxDestination) if (dest >= 0 && dest < rtfMaxDestination)
return (dcb[dest]); return (dcb[dest]);
@ -451,8 +427,7 @@ int dest;
* where appropriate. * where appropriate.
*/ */
void void RTFRead(void)
RTFRead ()
{ {
while (RTFGetToken () != rtfEOF) while (RTFGetToken () != rtfEOF)
RTFRouteToken (); RTFRouteToken ();
@ -465,8 +440,7 @@ RTFRead ()
* pass the token to the writer's class callback. * pass the token to the writer's class callback.
*/ */
void void RTFRouteToken(void)
RTFRouteToken ()
{ {
RTFFuncPtr p; RTFFuncPtr p;
@ -500,8 +474,7 @@ RTFFuncPtr p;
* closing brace. * closing brace.
*/ */
void void RTFSkipGroup(void)
RTFSkipGroup ()
{ {
int level = 1; int level = 1;
TRACE("\n"); TRACE("\n");
@ -528,8 +501,7 @@ int level = 1;
* are no more tokens. * are no more tokens.
*/ */
int int RTFGetToken(void)
RTFGetToken ()
{ {
RTFFuncPtr p; RTFFuncPtr p;
TRACE("\n"); TRACE("\n");
@ -556,23 +528,19 @@ RTFFuncPtr p;
static RTFFuncPtr readHook; static RTFFuncPtr readHook;
void void RTFSetReadHook(RTFFuncPtr f)
RTFSetReadHook (f)
RTFFuncPtr f;
{ {
readHook = f; readHook = f;
} }
RTFFuncPtr RTFFuncPtr RTFGetReadHook(void)
RTFGetReadHook ()
{ {
return (readHook); return (readHook);
} }
void void RTFUngetToken(void)
RTFUngetToken ()
{ {
TRACE("\n"); TRACE("\n");
@ -588,8 +556,7 @@ RTFUngetToken ()
} }
int int RTFPeekToken(void)
RTFPeekToken ()
{ {
_RTFGetToken (); _RTFGetToken ();
RTFUngetToken (); RTFUngetToken ();
@ -597,8 +564,7 @@ RTFPeekToken ()
} }
static void static void _RTFGetToken(void)
_RTFGetToken ()
{ {
RTFFont *fp; RTFFont *fp;
@ -686,8 +652,7 @@ RTFFont *fp;
/* this shouldn't be called anywhere but from _RTFGetToken() */ /* this shouldn't be called anywhere but from _RTFGetToken() */
static void static void _RTFGetToken2(void)
_RTFGetToken2 ()
{ {
int sign; int sign;
int c; int c;
@ -859,8 +824,7 @@ int c;
*/ */
static int static int GetChar(void)
GetChar ()
{ {
int c; int c;
int oldBumpLine; int oldBumpLine;
@ -904,10 +868,7 @@ int oldBumpLine;
* part of the token text. * part of the token text.
*/ */
void void RTFSetToken(int class, int major, int minor, int param, char *text)
RTFSetToken (class, major, minor, param, text)
int class, major, minor, param;
char *text;
{ {
TRACE("\n"); TRACE("\n");
@ -943,8 +904,7 @@ char *text;
* Initialize charset stuff. * Initialize charset stuff.
*/ */
static void static void CharSetInit(void)
CharSetInit ()
{ {
TRACE("\n"); TRACE("\n");
@ -965,10 +925,7 @@ CharSetInit ()
* done. * done.
*/ */
void void RTFSetCharSetMap (char *name, int csId)
RTFSetCharSetMap (name, csId)
char *name;
int csId;
{ {
TRACE("\n"); TRACE("\n");
@ -997,8 +954,7 @@ int csId;
* *
*/ */
static void static void ReadCharSetMaps(void)
ReadCharSetMaps ()
{ {
char buf[rtfBufSiz]; char buf[rtfBufSiz];
@ -1025,9 +981,7 @@ char buf[rtfBufSiz];
* this form : array[caracter_ident] = caracter; * this form : array[caracter_ident] = caracter;
*/ */
int int RTFReadCharSetMap(int csId)
RTFReadCharSetMap (csId)
int csId;
{ {
int *stdCodeArray; int *stdCodeArray;
int i; int i;
@ -1078,9 +1032,7 @@ int csId;
* Return -1 if name is unknown. * Return -1 if name is unknown.
*/ */
int int RTFStdCharCode(char *name)
RTFStdCharCode (name)
char *name;
{ {
int i; int i;
@ -1100,9 +1052,7 @@ int i;
* Return NULL if code is unknown. * Return NULL if code is unknown.
*/ */
char * char *RTFStdCharName(int code)
RTFStdCharName (code)
int code;
{ {
if (code < 0 || code >= rtfSC_MaxChar) if (code < 0 || code >= rtfSC_MaxChar)
return ((char *) NULL); return ((char *) NULL);
@ -1119,9 +1069,7 @@ int code;
* and reads the map as necessary. * and reads the map as necessary.
*/ */
int int RTFMapChar(int c)
RTFMapChar (c)
int c;
{ {
TRACE("\n"); TRACE("\n");
@ -1152,9 +1100,7 @@ int c;
* Set the current character set. If csId is illegal, uses general charset. * Set the current character set. If csId is illegal, uses general charset.
*/ */
void void RTFSetCharSet(int csId)
RTFSetCharSet (csId)
int csId;
{ {
TRACE("\n"); TRACE("\n");
@ -1173,8 +1119,7 @@ int csId;
} }
int int RTFGetCharSet(void)
RTFGetCharSet ()
{ {
return (curCharSet); return (curCharSet);
} }
@ -1208,8 +1153,7 @@ RTFGetCharSet ()
* braces around each table entry; try to adjust for that. * braces around each table entry; try to adjust for that.
*/ */
static void static void ReadFontTbl(void)
ReadFontTbl ()
{ {
RTFFont *fp = NULL; RTFFont *fp = NULL;
char buf[rtfBufSiz], *bp; char buf[rtfBufSiz], *bp;
@ -1361,8 +1305,7 @@ char *fn = "ReadFontTbl";
* here. * here.
*/ */
static void static void ReadColorTbl(void)
ReadColorTbl ()
{ {
RTFColor *cp; RTFColor *cp;
int cnum = 0; int cnum = 0;
@ -1403,8 +1346,7 @@ char *fn = "ReadColorTbl";
* all others do. Normal style is given style rtfNormalStyleNum. * all others do. Normal style is given style rtfNormalStyleNum.
*/ */
static void static void ReadStyleSheet(void)
ReadStyleSheet ()
{ {
RTFStyle *sp; RTFStyle *sp;
RTFStyleElt *sep, *sepLast; RTFStyleElt *sep, *sepLast;
@ -1555,24 +1497,21 @@ char *fn = "ReadStyleSheet";
} }
static void static void ReadInfoGroup(void)
ReadInfoGroup ()
{ {
RTFSkipGroup (); RTFSkipGroup ();
RTFRouteToken (); /* feed "}" back to router */ RTFRouteToken (); /* feed "}" back to router */
} }
static void static void ReadPictGroup(void)
ReadPictGroup ()
{ {
RTFSkipGroup (); RTFSkipGroup ();
RTFRouteToken (); /* feed "}" back to router */ RTFRouteToken (); /* feed "}" back to router */
} }
static void static void ReadObjGroup(void)
ReadObjGroup ()
{ {
RTFSkipGroup (); RTFSkipGroup ();
RTFRouteToken (); /* feed "}" back to router */ RTFRouteToken (); /* feed "}" back to router */
@ -1587,9 +1526,7 @@ ReadObjGroup ()
*/ */
RTFStyle * RTFStyle *RTFGetStyle(int num)
RTFGetStyle (num)
int num;
{ {
RTFStyle *s; RTFStyle *s;
@ -1604,9 +1541,7 @@ RTFStyle *s;
} }
RTFFont * RTFFont *RTFGetFont(int num)
RTFGetFont (num)
int num;
{ {
RTFFont *f; RTFFont *f;
@ -1621,9 +1556,7 @@ RTFFont *f;
} }
RTFColor * RTFColor *RTFGetColor(int num)
RTFGetColor (num)
int num;
{ {
RTFColor *c; RTFColor *c;
@ -1645,9 +1578,7 @@ RTFColor *c;
* Expand style n, if there is such a style. * Expand style n, if there is such a style.
*/ */
void void RTFExpandStyle(int n)
RTFExpandStyle (n)
int n;
{ {
RTFStyle *s; RTFStyle *s;
RTFStyleElt *se; RTFStyleElt *se;
@ -2610,8 +2541,7 @@ static RTFKey rtfKey[] =
* Initialize lookup table hash values. Only need to do this once. * Initialize lookup table hash values. Only need to do this once.
*/ */
static void static void LookupInit(void)
LookupInit ()
{ {
static int inited = 0; static int inited = 0;
RTFKey *rp; RTFKey *rp;
@ -2630,9 +2560,7 @@ RTFKey *rp;
* not found, the class turns into rtfUnknown. * not found, the class turns into rtfUnknown.
*/ */
static void static void Lookup(char *s)
Lookup (s)
char *s;
{ {
RTFKey *rp; RTFKey *rp;
int hash; int hash;
@ -2658,9 +2586,7 @@ int hash;
* Compute hash value of symbol * Compute hash value of symbol
*/ */
static int static int Hash(char *s)
Hash (s)
char *s;
{ {
char c; char c;
int val = 0; int val = 0;
@ -2687,9 +2613,7 @@ int val = 0;
* failing under THINK C when a long is passed. * failing under THINK C when a long is passed.
*/ */
char * char *_RTFAlloc(int size)
_RTFAlloc (size)
int size;
{ {
return HeapAlloc(RICHED32_hHeap, 0, size); return HeapAlloc(RICHED32_hHeap, 0, size);
} }
@ -2700,9 +2624,7 @@ int size;
*/ */
char * char *RTFStrSave(char *s)
RTFStrSave (s)
char *s;
{ {
char *p; char *p;
@ -2712,9 +2634,7 @@ char *p;
} }
void void RTFFree(char *p)
RTFFree (p)
char *p;
{ {
if (p != (char *) NULL) if (p != (char *) NULL)
HeapFree(RICHED32_hHeap, 0, p); HeapFree(RICHED32_hHeap, 0, p);
@ -2728,25 +2648,19 @@ char *p;
* Token comparison routines * Token comparison routines
*/ */
int int RTFCheckCM(int class, int major)
RTFCheckCM (class, major)
int class, major;
{ {
return (rtfClass == class && rtfMajor == major); return (rtfClass == class && rtfMajor == major);
} }
int int RTFCheckCMM(int class, int major, int minor)
RTFCheckCMM (class, major, minor)
int class, major, minor;
{ {
return (rtfClass == class && rtfMajor == major && rtfMinor == minor); return (rtfClass == class && rtfMajor == major && rtfMinor == minor);
} }
int int RTFCheckMM(int major, int minor)
RTFCheckMM (major, minor)
int major, minor;
{ {
return (rtfMajor == major && rtfMinor == minor); return (rtfMajor == major && rtfMinor == minor);
} }
@ -2755,9 +2669,7 @@ int major, minor;
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
int int RTFCharToHex(char c)
RTFCharToHex (c)
char c;
{ {
if (isupper (c)) if (isupper (c))
c = tolower (c); c = tolower (c);
@ -2767,9 +2679,7 @@ char c;
} }
int int RTFHexToChar(int i)
RTFHexToChar (i)
int i;
{ {
if (i < 10) if (i < 10)
return (i + '0'); return (i + '0');
@ -2798,10 +2708,7 @@ int i;
* *
*/ */
int int RTFReadOutputMap(char *outMap[], int reinit)
RTFReadOutputMap (outMap, reinit)
char *outMap[];
int reinit;
{ {
int i; int i;
int stdCode; int stdCode;
@ -2837,18 +2744,13 @@ static FILE *(*libFileOpen) () = NULL;
void void RTFSetOpenLibFileProc(FILE *(*proc)())
RTFSetOpenLibFileProc (proc)
FILE *(*proc) ();
{ {
libFileOpen = proc; libFileOpen = proc;
} }
FILE * FILE *RTFOpenLibFile (char *file, char *mode)
RTFOpenLibFile (file, mode)
char *file;
char *mode;
{ {
if (libFileOpen == NULL) if (libFileOpen == NULL)
return ((FILE *) NULL); return ((FILE *) NULL);
@ -2869,9 +2771,7 @@ char *mode;
*/ */
static void static void DefaultMsgProc(char *s)
DefaultMsgProc (s)
char *s;
{ {
MESSAGE( "%s", s); MESSAGE( "%s", s);
} }
@ -2880,9 +2780,7 @@ char *s;
static RTFFuncPtr msgProc = DefaultMsgProc; static RTFFuncPtr msgProc = DefaultMsgProc;
void void RTFSetMsgProc(RTFFuncPtr proc)
RTFSetMsgProc (proc)
RTFFuncPtr proc;
{ {
msgProc = proc; msgProc = proc;
} }
@ -2894,8 +2792,7 @@ RTFFuncPtr proc;
* This version is for systems with stdarg * This version is for systems with stdarg
*/ */
void void RTFMsg (char *fmt, ...)
RTFMsg (char *fmt, ...)
{ {
char buf[rtfBufSiz]; char buf[rtfBufSiz];
@ -2915,9 +2812,7 @@ char buf[rtfBufSiz];
* This version is for systems that have varargs. * This version is for systems that have varargs.
*/ */
void void RTFMsg (va_dcl va_alist)
RTFMsg (va_alist)
va_dcl
{ {
va_list args; va_list args;
char *fmt; char *fmt;
@ -2936,10 +2831,7 @@ char buf[rtfBufSiz];
* This version is for systems that don't have varargs. * This version is for systems that don't have varargs.
*/ */
void void RTFMsg (char *fmt, char *a1, char *a2, char *a3, char *a4, char *a5, char *a6, char *a7, char *a8, char *a9)
RTFMsg (fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9)
char *fmt;
char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8, *a9;
{ {
char buf[rtfBufSiz]; char buf[rtfBufSiz];
@ -2961,9 +2853,7 @@ char buf[rtfBufSiz];
* has been read if prevChar is EOF). * has been read if prevChar is EOF).
*/ */
static void static void DefaultPanicProc(char *s)
DefaultPanicProc (s)
char *s;
{ {
MESSAGE( "%s", s); MESSAGE( "%s", s);
/*exit (1);*/ /*exit (1);*/
@ -2973,9 +2863,7 @@ char *s;
static RTFFuncPtr panicProc = DefaultPanicProc; static RTFFuncPtr panicProc = DefaultPanicProc;
void void RTFSetPanicProc(RTFFuncPtr proc)
RTFSetPanicProc (proc)
RTFFuncPtr proc;
{ {
panicProc = proc; panicProc = proc;
} }
@ -2987,8 +2875,7 @@ RTFFuncPtr proc;
* This version is for systems with stdarg * This version is for systems with stdarg
*/ */
void void RTFPanic(char *fmt, ...)
RTFPanic (char *fmt, ...)
{ {
char buf[rtfBufSiz]; char buf[rtfBufSiz];
@ -3015,9 +2902,7 @@ char buf[rtfBufSiz];
* This version is for systems that have varargs. * This version is for systems that have varargs.
*/ */
void void RTFPanic(va_dcl va_alist)
RTFPanic (va_alist)
va_dcl
{ {
va_list args; va_list args;
char *fmt; char *fmt;
@ -3043,10 +2928,7 @@ char buf[rtfBufSiz];
* This version is for systems that don't have varargs. * This version is for systems that don't have varargs.
*/ */
void void RTFPanic (char *fmt, char *a1, char *a2, char *a3, char *a4, char *a5, char *a6, char *a7, char *a8, char *a9)
RTFPanic (fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9)
char *fmt;
char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8, *a9;
{ {
char buf[rtfBufSiz]; char buf[rtfBufSiz];

2
dlls/richedit/rtf.h
View File

@ -1426,7 +1426,7 @@ RTFStyle *RTFGetStyle ();
char *_RTFAlloc (); char *_RTFAlloc ();
char *RTFStrSave (); char *RTFStrSave ();
void RTFFree (); void RTFFree ();
int RTFCharToHex (); int RTFCharToHex (char);
int RTFHexToChar (); int RTFHexToChar ();
void RTFSetMsgProc (); void RTFSetMsgProc ();
void RTFSetPanicProc (); void RTFSetPanicProc ();

4
dlls/richedit/stdcharnames.h
View File

@ -1,3 +1,5 @@
static char *stdCharName[] =
{
"nothing", "nothing",
"space", "space",
"exclam", "exclam",
@ -350,3 +352,5 @@
"dotmath", "dotmath",
"mathequal", "mathequal",
"mathtilde", "mathtilde",
(char *) NULL
};

10
include/wine/obj_base.h
View File

@ -662,10 +662,11 @@ typedef struct IUnknown IUnknown, *LPUNKNOWN;
typedef struct ICOM_VTABLE(IUnknown) ICOM_VTABLE(IUnknown); typedef struct ICOM_VTABLE(IUnknown) ICOM_VTABLE(IUnknown);
struct IUnknown { struct IUnknown {
ICOM_VFIELD(IUnknown); ICOM_VFIELD(IUnknown);
}
#if defined(ICOM_USE_COM_INTERFACE_ATTRIBUTE) #if defined(ICOM_USE_COM_INTERFACE_ATTRIBUTE)
} __attribute__ ((com_interface)); __attribute__ ((com_interface));
#else #else
}; ;
#endif /* ICOM_US_COM_INTERFACE_ATTRIBUTE */ #endif /* ICOM_US_COM_INTERFACE_ATTRIBUTE */
struct ICOM_VTABLE(IUnknown) { struct ICOM_VTABLE(IUnknown) {
@ -682,10 +683,11 @@ struct IUnknown {
ICOM_METHOD2(HRESULT,QueryInterface,REFIID,riid, LPVOID*,ppvObj) ICOM_METHOD2(HRESULT,QueryInterface,REFIID,riid, LPVOID*,ppvObj)
ICOM_METHOD (ULONG,AddRef) ICOM_METHOD (ULONG,AddRef)
ICOM_METHOD (ULONG,Release) ICOM_METHOD (ULONG,Release)
}
#if defined(ICOM_USE_COM_INTERFACE_ATTRIBUTE) #if defined(ICOM_USE_COM_INTERFACE_ATTRIBUTE)
} __attribute__ ((com_interface)); __attribute__ ((com_interface));
#else #else
}; ;
#endif /* ICOM_US_COM_INTERFACE_ATTRIBUTE */ #endif /* ICOM_US_COM_INTERFACE_ATTRIBUTE */
#undef ICOM_INTERFACE #undef ICOM_INTERFACE

86
include/winsock2.h
View File

@ -295,55 +295,55 @@ typedef void (CALLBACK *LPWSAOVERLAPPED_COMPLETION_ROUTINE)
* "Prototypes" section in winsock.h. * "Prototypes" section in winsock.h.
*/ */
#if WS_API_TYPEDEFS #if WS_API_TYPEDEFS
typedef HANDLE (WINAPI *LPFN_WSAASYNCGETHOSTBYADDR)(HWND,u_int,const char*,int,int,char*,int)); typedef HANDLE (WINAPI *LPFN_WSAASYNCGETHOSTBYADDR)(HWND,u_int,const char*,int,int,char*,int);
typedef HANDLE (WINAPI *LPFN_WSAASYNCGETHOSTBYNAME)(HWND,u_int,const char*,char*,int)); typedef HANDLE (WINAPI *LPFN_WSAASYNCGETHOSTBYNAME)(HWND,u_int,const char*,char*,int);
typedef HANDLE (WINAPI *LPFN_WSAASYNCGETPROTOBYNAME)(HWND,u_int,const char*,char*,int)); typedef HANDLE (WINAPI *LPFN_WSAASYNCGETPROTOBYNAME)(HWND,u_int,const char*,char*,int);
typedef HANDLE (WINAPI *LPFN_WSAASYNCGETPROTOBYNUMBER)(HWND,u_int,int,char*,int)); typedef HANDLE (WINAPI *LPFN_WSAASYNCGETPROTOBYNUMBER)(HWND,u_int,int,char*,int);
typedef HANDLE (WINAPI *LPFN_WSAASYNCGETSERVBYNAME)(HWND,u_int,const char*,const char*,char*,int)); typedef HANDLE (WINAPI *LPFN_WSAASYNCGETSERVBYNAME)(HWND,u_int,const char*,const char*,char*,int);
typedef HANDLE (WINAPI *LPFN_WSAASYNCGETSERVBYPORT)(HWND,u_int,int,const char*,char*,int)); typedef HANDLE (WINAPI *LPFN_WSAASYNCGETSERVBYPORT)(HWND,u_int,int,const char*,char*,int);
typedef int (WINAPI *LPFN_WSAASYNCSELECT)(SOCKET,HWND,u_int,long)); typedef int (WINAPI *LPFN_WSAASYNCSELECT)(SOCKET,HWND,u_int,long);
typedef int (WINAPI *LPFN_WSACANCELASYNCREQUEST)(HANDLE)); typedef int (WINAPI *LPFN_WSACANCELASYNCREQUEST)(HANDLE));
typedef int (WINAPI *LPFN_WSACANCELBLOCKINGCALL)(void)); typedef int (WINAPI *LPFN_WSACANCELBLOCKINGCALL)(void);
typedef int (WINAPI *LPFN_WSACLEANUP)(void)); typedef int (WINAPI *LPFN_WSACLEANUP)(void);
typedef int (WINAPI *LPFN_WSAGETLASTERROR)(void)); typedef int (WINAPI *LPFN_WSAGETLASTERROR)(void);
typedef BOOL (WINAPI *LPFN_WSAISBLOCKING)(void)); typedef BOOL (WINAPI *LPFN_WSAISBLOCKING)(void);
typedef FARPROC (WINAPI *LPFN_WSASETBLOCKINGHOOK)(FARPROC)); typedef FARPROC (WINAPI *LPFN_WSASETBLOCKINGHOOK)(FARPROC);
typedef void (WINAPI *LPFN_WSASETLASTERROR)(int)); typedef void (WINAPI *LPFN_WSASETLASTERROR)(int);
typedef int (WINAPI *LPFN_WSASTARTUP)(WORD,LPWSADATA)); typedef int (WINAPI *LPFN_WSASTARTUP)(WORD,LPWSADATA);
typedef int (WINAPI *LPFN_WSAUNHOOKBLOCKINGHOOK)(void)); typedef int (WINAPI *LPFN_WSAUNHOOKBLOCKINGHOOK)(void);
typedef SOCKET (WINAPI *LPFN_ACCEPT)(SOCKET,struct WS(sockaddr)*,int*)); typedef SOCKET (WINAPI *LPFN_ACCEPT)(SOCKET,struct WS(sockaddr)*,int*);
typedef int (WINAPI *LPFN_BIND)(SOCKET,const struct WS(sockaddr)*,int)); typedef int (WINAPI *LPFN_BIND)(SOCKET,const struct WS(sockaddr)*,int);
typedef int (WINAPI *LPFN_CLOSESOCKET)(SOCKET)); typedef int (WINAPI *LPFN_CLOSESOCKET)(SOCKET);
typedef int (WINAPI *LPFN_CONNECT)(SOCKET,const struct WS(sockaddr)*,int)); typedef int (WINAPI *LPFN_CONNECT)(SOCKET,const struct WS(sockaddr)*,int);
typedef struct WS(hostent)* (WINAPI *LPFN_GETHOSTBYADDR)(const char*,int,int)); typedef struct WS(hostent)* (WINAPI *LPFN_GETHOSTBYADDR)(const char*,int,int);
typedef struct WS(hostent)* (WINAPI *LPFN_GETHOSTBYNAME)(const char*)); typedef struct WS(hostent)* (WINAPI *LPFN_GETHOSTBYNAME)(const char*);
typedef int (WINAPI *LPFN_GETHOSTNAME)(char*,int)); typedef int (WINAPI *LPFN_GETHOSTNAME)(char*,int);
typedef int (WINAPI *LPFN_GETPEERNAME)(SOCKET,struct WS(sockaddr)*,int*)); typedef int (WINAPI *LPFN_GETPEERNAME)(SOCKET,struct WS(sockaddr)*,int*);
typedef struct WS(protoent)* (WINAPI *LPFN_GETPROTOBYNAME)(const char*)); typedef struct WS(protoent)* (WINAPI *LPFN_GETPROTOBYNAME)(const char*);
typedef struct WS(protoent)* (WINAPI *LPFN_GETPROTOBYNUMBER)(int)); typedef struct WS(protoent)* (WINAPI *LPFN_GETPROTOBYNUMBER)(int);
#ifdef WS_DEFINE_SELECT #ifdef WS_DEFINE_SELECT
typedef int (WINAPI* LPFN_SELECT)(int,WS(fd_set)*,WS(fd_set)*,WS(fd_set)*,const struct WS(timeval)*); typedef int (WINAPI* LPFN_SELECT)(int,WS(fd_set)*,WS(fd_set)*,WS(fd_set)*,const struct WS(timeval)*);
#endif #endif
typedef struct WS(servent)* (WINAPI *LPFN_GETSERVBYNAME)(const char*,const char*)); typedef struct WS(servent)* (WINAPI *LPFN_GETSERVBYNAME)(const char*,const char*);
typedef struct WS(servent)* (WINAPI *LPFN_GETSERVBYPORT)(int,const char*)); typedef struct WS(servent)* (WINAPI *LPFN_GETSERVBYPORT)(int,const char*);
typedef int (WINAPI *LPFN_GETSOCKNAME)(SOCKET,struct WS(sockaddr)*,int*)); typedef int (WINAPI *LPFN_GETSOCKNAME)(SOCKET,struct WS(sockaddr)*,int*);
typedef int (WINAPI *LPFN_GETSOCKOPT)(SOCKET,int,int,char*,int*)); typedef int (WINAPI *LPFN_GETSOCKOPT)(SOCKET,int,int,char*,int*);
typedef u_long (WINAPI *LPFN_HTONL)(u_long)); typedef u_long (WINAPI *LPFN_HTONL)(u_long);
typedef u_short (WINAPI *LPFN_HTONS)(u_short)); typedef u_short (WINAPI *LPFN_HTONS)(u_short);
typedef unsigned long (WINAPI *LPFN_INET_ADDR)(const char*); typedef unsigned long (WINAPI *LPFN_INET_ADDR)(const char*);
typedef char* (WINAPI *LPFN_INET_NTOA)(struct WS(in_addr)); typedef char* (WINAPI *LPFN_INET_NTOA)(struct WS(in_addr);
typedef int (WINAPI *LPFN_IOCTLSOCKET)(SOCKET,long,u_long*)); typedef int (WINAPI *LPFN_IOCTLSOCKET)(SOCKET,long,u_long*);
typedef int (WINAPI *LPFN_LISTEN)(SOCKET,int)); typedef int (WINAPI *LPFN_LISTEN)(SOCKET,int);
typedef u_long (WINAPI *LPFN_NTOHL)(u_long)); typedef u_long (WINAPI *LPFN_NTOHL)(u_long);
typedef u_short (WINAPI *LPFN_NTOHS)(u_short)); typedef u_short (WINAPI *LPFN_NTOHS)(u_short);
typedef int (WINAPI *LPFN_RECV)(SOCKET,char*,int,int)); typedef int (WINAPI *LPFN_RECV)(SOCKET,char*,int,int);
typedef int (WINAPI *LPFN_RECVFROM)(SOCKET,char*,int,int,struct WS(sockaddr)*,int*)); typedef int (WINAPI *LPFN_RECVFROM)(SOCKET,char*,int,int,struct WS(sockaddr)*,int*);
typedef int (WINAPI *LPFN_SEND)(SOCKET,const char*,int,int)); typedef int (WINAPI *LPFN_SEND)(SOCKET,const char*,int,int);
typedef int (WINAPI *LPFN_SENDTO)(SOCKET,const char*,int,int,const struct WS(sockaddr)*,int)); typedef int (WINAPI *LPFN_SENDTO)(SOCKET,const char*,int,int,const struct WS(sockaddr)*,int);
typedef int (WINAPI *LPFN_SETSOCKOPT)(SOCKET,int,int,const char*,int)); typedef int (WINAPI *LPFN_SETSOCKOPT)(SOCKET,int,int,const char*,int);
typedef int (WINAPI *LPFN_SHUTDOWN)(SOCKET,int)); typedef int (WINAPI *LPFN_SHUTDOWN)(SOCKET,int);
typedef SOCKET (WINAPI *LPFN_SOCKET)(int,int,int)); typedef SOCKET (WINAPI *LPFN_SOCKET)(int,int,int);
#endif /* WS_API_TYPEDEFS */ #endif /* WS_API_TYPEDEFS */