[ros-diffs] [gvg] 12988: Sync to Wine-20050111:

[gvg at svn.reactos.com]

Sync to Wine-20050111:
Michael Stefaniuc <mstefani at redhat.de>
- Do not check for non NULL pointer before HeapFree'ing it. It's
  redundant.
Eric Pouech <pouech-eric at wanadoo.fr>
- Fixed some errors in function prototypes.
Robert Shearman <rob at codeweavers.com>
- Remove unnecessary WNDPROC casts.
Modified: trunk/reactos/lib/richedit/reader.c
Modified: trunk/reactos/lib/richedit/richedit.c
Modified: trunk/reactos/lib/richedit/rtf2text.h
  _____  

Modified: trunk/reactos/lib/richedit/reader.c
--- trunk/reactos/lib/richedit/reader.c	2005-01-12 19:51:40 UTC (rev
12987)
+++ trunk/reactos/lib/richedit/reader.c	2005-01-12 20:12:53 UTC (rev
12988)
@@ -98,9 +98,9 @@

 static void	ReadInfoGroup (RTF_Info *);
 static void	ReadPictGroup (RTF_Info *);
 static void	ReadObjGroup (RTF_Info *);
-static void	LookupInit ();
+static void	LookupInit (void);
 static void	Lookup (RTF_Info *, char *);
-static int	Hash ();
+static int	Hash (char*);
 
 static void	CharSetInit (RTF_Info *);
 static void	ReadCharSetMaps (RTF_Info *);
@@ -2451,7 +2451,7 @@
  * Initialize lookup table hash values.  Only need to do this once.
  */
 
-static void LookupInit()
+static void LookupInit(void)
 {
 static int	inited = 0;
 RTFKey	*rp;
@@ -2546,8 +2546,7 @@
 
 void RTFFree(char *p)
 {
-	if (p != (char *) NULL)
-		HeapFree(RICHED32_hHeap, 0, p);
+        HeapFree(RICHED32_hHeap, 0, p);
 }
 
 
  _____  

Modified: trunk/reactos/lib/richedit/richedit.c
--- trunk/reactos/lib/richedit/richedit.c	2005-01-12 19:51:40 UTC
(rev 12987)
+++ trunk/reactos/lib/richedit/richedit.c	2005-01-12 20:12:53 UTC
(rev 12988)
@@ -778,7 +778,7 @@

 
     ZeroMemory(&wndClass, sizeof(WNDCLASSA));
     wndClass.style = CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS;
-    wndClass.lpfnWndProc = (WNDPROC)RICHED32_WindowProc;
+    wndClass.lpfnWndProc = RICHED32_WindowProc;
     wndClass.cbClsExtra = 0;
     wndClass.cbWndExtra = RTFInfoOffset + sizeof(RTFControl_Info*);
     wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
  _____  

Modified: trunk/reactos/lib/richedit/rtf2text.h
--- trunk/reactos/lib/richedit/rtf2text.h	2005-01-12 19:51:40 UTC
(rev 12987)
+++ trunk/reactos/lib/richedit/rtf2text.h	2005-01-12 20:12:53 UTC
(rev 12988)
@@ -1,2 +1,2 @@

-void	WriterInit ();
-int	BeginFile ();
+void	WriterInit (RTF_Info *);
+int	BeginFile (RTF_Info *);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050112/c8e8b9dd/attachment.html