Changeset 9407 for trunk/src

Timestamp:

Nov 13, 2002, 1:17:19 PM (23 years ago)

Author:

sandervl

Message:

Wine resync

Location:

trunk/src/riched32

Files:

• COPYING.LIB (added)
• LICENSE.TXT (modified) (1 diff)
• ansi_gen.h (modified) (1 diff)
• ansi_sym.h (modified) (1 diff)
• charlist.c (modified) (8 diffs)
• charlist.h (modified) (2 diffs)
• initriched32.cpp (modified) (3 diffs)
• makefile (modified) (2 diffs)
• reader.c (modified) (75 diffs)
• riched32.h (modified) (2 diffs)
• richedit.c (modified) (10 diffs)
• rtf.h (modified) (3 diffs)
• stdcharnames.h (modified) (2 diffs)
• text-writer.c (modified) (8 diffs)
• text_map.h (modified) (1 diff)
• textwriter.c (deleted)

trunk/src/riched32/LICENSE.TXT

@@ -1 @@
-$Id: LICENSE.TXT,v 1.1 2001-07-21 08:58:46 sandervl Exp $
-@c This is an additional Odin license agreement.
-@c It supercedes the main Odin license, but is only valid in 
-@c the source directory in which it is present.
+$Id: LICENSE.TXT,v 1.2 2002-11-13 12:17:17 sandervl Exp $
+This is an additional Odin license agreement.
+It supercedes the main Odin license, but is only valid in 
+the source directory in which it is present.
 
-@c This file is processed by GNU's TeXinfo
-@c If you modify it or move it to another location, make sure that
-@c TeXinfo works (type `make' in directory documentation).
-
-Copyright (c) 1993-2000 the Wine project authors (see the file AUTHORS
+Copyright (c) 1993-2002 the Wine project authors (see the file AUTHORS
 for a complete list)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Wine 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. 
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+This program 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.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+A copy of the GNU Lesser General Public License is included in the
+Wine distribution in the file COPYING.LIB. If you did not receive this
+copy, write to the Free Software Foundation, Inc., 59 Temple Place,
+Suite 330, Boston, MA 02111-1307 USA.

trunk/src/riched32/ansi_gen.h

@@ -13 +13 @@
  characters.*/
 
-int ansi_gen[] = 
+int ansi_gen[] =
 {
   rtfSC_formula          ,0x06,

trunk/src/riched32/ansi_sym.h

@@ -1 +1 @@
 /*
  * RTF ANSI character set (\ansi) Symbol font map
- * 
+ *
  * Field 1 is the standard character name which the character value in
  * field 2 maps onto.  (It doesn't mean "to produce the character in field 1,
  * use the value in field 2.)
- * 
+ *
  * The character value may be given either as a single character (which will be
  * converted to the ASCII value of the character), or in numeric format, either
  * in decimal or 0xyy as hex yy.  Single or double quotes may be used to quote
  * characters.
- * 
+ *
  */
- 
+
 int ansi_sym[] =
 {

trunk/src/riched32/charlist.c

@@ -1 @@
-/* $Id: charlist.c,v 1.2 2000-08-02 14:58:40 bird Exp $ */
 /*
  *
@@ -6 +5 @@
  *  Copyright (c) 2000 by Jean-Claude Batista
  *
+ * 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
  */
 
@@ -13 +25 @@
 #include <ctype.h>
 #include <stdlib.h>
+
 #include "charlist.h"
-#include "windows.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
 extern HANDLE RICHED32_hHeap;
@@ -23 +40 @@
     pNewEntry->pNext = NULL;
     pNewEntry->myChar = myChar;
+
+    TRACE("\n");
 
     if(pCharList->pTail == NULL)
@@ -40 +59 @@
 {
     CHARLISTENTRY* pNewEntry = malloc(sizeof(CHARLISTENTRY));
+
+    TRACE("\n");
 
     pNewEntry->myChar = myChar;
@@ -63 +84 @@
     char myChar;
 
+    TRACE("\n");
+
     if(pCharList->nCount == 0)
       return 0;
@@ -85 +108 @@
 int CHARLIST_GetNbItems(CHARLIST* pCharList)
 {
+    TRACE("\n");
+
     return pCharList->nCount;
 }
 
 void CHARLIST_FreeList(CHARLIST* pCharList){
+    TRACE("\n");
+
     while(pCharList->nCount)
         CHARLIST_Dequeue(pCharList);
 }
 
-/* this function count the number of occurences of a caracter */
+/* this function counts the number of occurrences of a caracter */
 int CHARLIST_CountChar(CHARLIST* pCharList, char myChar)
 {
     CHARLISTENTRY *pCurrent;
     int nCount = 0;
+
+    TRACE("\n");
 
     for(pCurrent =pCharList->pHead ;pCurrent;pCurrent=pCurrent->pNext)
@@ -108 +137 @@
 int CHARLIST_toBuffer(CHARLIST* pCharList, char* pBuffer, int nBufferSize)
 {
+
+   TRACE("\n");
 
    /* we add one to store a NULL caracter */

trunk/src/riched32/charlist.h

@@ +1 @@
+/*
+ * Character List
+ *
+ * Copyright (c) 2000 by Jean-Claude Batista
+ *
+ * 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
+ */
+
 #ifndef _CHARLIST
 #define _CHARLIST
@@ -10 +30 @@
 typedef struct _tagCHARLIST
 {
-    unsigned int nCount; // Entries Count;
+    unsigned int nCount; /* Entries Count; */
     CHARLISTENTRY *pHead;
     CHARLISTENTRY *pTail;

trunk/src/riched32/initriched32.cpp

@@ -1 @@
-/* $Id: initriched32.cpp,v 1.3 2001-09-30 08:45:52 bird Exp $ */
+/* $Id: initriched32.cpp,v 1.4 2002-11-13 12:17:18 sandervl Exp $ */
 /*
  * DLL entry point
@@ -53 +53 @@
    {
    case DLL_PROCESS_ATTACH:
-    return RICHED32_LibMain(hinstDLL, fdwReason, fImpLoad);
+       return RICHED32_LibMain(hinstDLL, fdwReason, fImpLoad);
 
    case DLL_THREAD_ATTACH:
    case DLL_THREAD_DETACH:
-    return RICHED32_LibMain(hinstDLL, fdwReason, fImpLoad);
+       return RICHED32_LibMain(hinstDLL, fdwReason, fImpLoad);
 
    case DLL_PROCESS_DETACH:
-    ret = RICHED32_LibMain(hinstDLL, fdwReason, fImpLoad);
-    ctordtorTerm();
-        return ret;
+       ret = RICHED32_LibMain(hinstDLL, fdwReason, fImpLoad);
+       ctordtorTerm();
+       return ret;
    }
    return FALSE;
@@ -88 +88 @@
       case 0 :
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
-     dllHandle = RegisterLxDll(hModule, OdinLibMain, (PVOID)&riched32_PEResTab);
+         dllHandle = RegisterLxDll(hModule, OdinLibMain, (PVOID)&riched32_PEResTab);
          if(dllHandle == 0)
-        return 0UL;
+             return 0UL;
 
          break;
+
       case 1 :
          if(dllHandle) {
-        UnregisterLxDll(dllHandle);
+             UnregisterLxDll(dllHandle);
          }
          break;

trunk/src/riched32/makefile

@@ -1 @@
-# $Id: makefile,v 1.7 2001-09-30 09:34:43 bird Exp $
+# $Id: makefile,v 1.8 2002-11-13 12:17:18 sandervl Exp $
 
 #
@@ -27 +27 @@
 $(OBJDIR)\reader.obj \
 $(OBJDIR)\charlist.obj \
-$(OBJDIR)\textwriter.obj \
+$(OBJDIR)\text-writer.obj \
 $(OBJDIR)\richedit.obj \
 $(OBJDIR)\initterm.obj \

trunk/src/riched32/reader.c

@@ -1 @@
-/* $Id: reader.c,v 1.2 2000-08-02 14:58:40 bird Exp $ */
 /*
  * - Need to document error code meanings.
@@ -74 +73 @@
 
 #include <stdlib.h>
+
 #include "charlist.h"
-#include "windows.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
 extern HANDLE RICHED32_hHeap;
@@ -93 +97 @@
 
 # define        maxCSStack              10
-
-#ifndef __WIN32OS2__
-#ifndef THINK_C
-extern char     *malloc ();
-#else
-extern void     *malloc(size_t);
-#endif
-#endif
 
 static int      _RTFGetChar();
@@ -128 +124 @@
 int     rtfMinor;
 int     rtfParam;
+int     rtfFormat;
 char    *rtfTextBuf = (char *) NULL;
 int     rtfTextLen;
@@ -166 +163 @@
  */
 
-static char     *stdCharName[] =
-{
-# include       "stdcharnames.h"
-        (char *) NULL
-};
-
+#include "stdcharnames.h"
 
 /*
@@ -214 +206 @@
  */
 
-int
-_RTFGetChar()
+int _RTFGetChar(void)
 {
     char myChar;
+
+    TRACE("\n");
+
     if(CHARLIST_GetNbItems(&inputCharList) == 0)
     {
@@ -232 +226 @@
 }
 
-void
-RTFSetEditStream(EDITSTREAM *es)
-{
+void RTFSetEditStream(EDITSTREAM *es)
+{
+    TRACE("\n");
+
     editstream.dwCookie = es->dwCookie;
     editstream.dwError  = es->dwError;
@@ -246 +241 @@
  */
 
-void
-RTFInit ()
+void RTFInit(void)
 {
 int     i;
@@ -254 +248 @@
 RTFStyle        *sp;
 RTFStyleElt     *eltList, *ep;
+
+    TRACE("\n");
 
         if (rtfTextBuf == (char *) NULL)        /* initialize the text buffers */
@@ -337 +333 @@
  */
 
-void
-RTFSetInputName (name)
-char    *name;
-{
+void RTFSetInputName(char *name)
+{
+    TRACE("\n");
+
         if ((inputName = RTFStrSave (name)) == (char *) NULL)
                 RTFPanic ("RTFSetInputName: out of memory");
@@ -346 +342 @@
 
 
-char *
-RTFGetInputName ()
+char *RTFGetInputName(void)
 {
         return (inputName);
@@ -353 +348 @@
 
 
-void
-RTFSetOutputName (name)
-char    *name;
-{
+void RTFSetOutputName(char *name)
+{
+    TRACE("\n");
+
         if ((outputName = RTFStrSave (name)) == (char *) NULL)
                 RTFPanic ("RTFSetOutputName: out of memory");
@@ -362 +357 @@
 
 
-char *
-RTFGetOutputName ()
+char *RTFGetOutputName(void)
 {
         return (outputName);
@@ -385 +379 @@
 
 
-void
-RTFSetClassCallback (class, callback)
-int             class;
-RTFFuncPtr      callback;
+void RTFSetClassCallback(int class, RTFFuncPtr callback)
 {
         if (class >= 0 && class < rtfMaxClass)
@@ -395 +386 @@
 
 
-RTFFuncPtr
-RTFGetClassCallback (class)
-int     class;
+RTFFuncPtr RTFGetClassCallback(int class)
 {
         if (class >= 0 && class < rtfMaxClass)
@@ -412 +401 @@
 
 
-void
-RTFSetDestinationCallback (dest, callback)
-int             dest;
-RTFFuncPtr      callback;
+void RTFSetDestinationCallback(int dest, RTFFuncPtr callback)
 {
         if (dest >= 0 && dest < rtfMaxDestination)
@@ -422 +408 @@
 
 
-RTFFuncPtr
-RTFGetDestinationCallback (dest)
-int     dest;
+RTFFuncPtr RTFGetDestinationCallback(int dest)
 {
         if (dest >= 0 && dest < rtfMaxDestination)
@@ -444 +428 @@
  */
 
-void
-RTFRead ()
+void RTFRead(void)
 {
         while (RTFGetToken () != rtfEOF)
@@ -458 +441 @@
  */
 
-void
-RTFRouteToken ()
+void RTFRouteToken(void)
 {
 RTFFuncPtr      p;
+
+    TRACE("\n");
 
         if (rtfClass < 0 || rtfClass >= rtfMaxClass)    /* watchdog */
@@ -491 +475 @@
  */
 
-void
-RTFSkipGroup ()
+void RTFSkipGroup(void)
 {
 int     level = 1;
+    TRACE("\n");
 
         while (RTFGetToken () != rtfEOF)
@@ -518 +502 @@
  */
 
-int
-RTFGetToken ()
+int RTFGetToken(void)
 {
 RTFFuncPtr      p;
+    TRACE("\n");
 
         for (;;)
@@ -530 +514 @@
 
                 /* Silently discard newlines, carriage returns, nulls.  */
-                if (!(rtfClass == rtfText
-                        && (rtfMajor == '\n' || rtfMajor == '\r'
-                                                || rtfMajor == '\0')))
+                if (!(rtfClass == rtfText && rtfFormat != SF_TEXT
+                        && (rtfMajor == '\r' || rtfMajor == '\n' || rtfMajor == '\0')))
                         break;
         }
@@ -546 +529 @@
 
 
-void
-RTFSetReadHook (f)
-RTFFuncPtr      f;
+void RTFSetReadHook(RTFFuncPtr f)
 {
         readHook = f;
@@ -554 +535 @@
 
 
-RTFFuncPtr
-RTFGetReadHook ()
+RTFFuncPtr RTFGetReadHook(void)
 {
         return (readHook);
@@ -561 +541 @@
 
 
-void
-RTFUngetToken ()
-{
+void RTFUngetToken(void)
+{
+    TRACE("\n");
+
         if (pushedClass >= 0)   /* there's already an ungotten token */
                 RTFPanic ("cannot unget two tokens");
@@ -576 +557 @@
 
 
-int
-RTFPeekToken ()
+int RTFPeekToken(void)
 {
         _RTFGetToken ();
@@ -585 +565 @@
 
 
-static void
-_RTFGetToken ()
+static void _RTFGetToken(void)
 {
 RTFFont *fp;
+
+    TRACE("\n");
+
+        if (rtfFormat == SF_TEXT) {
+            rtfMajor = GetChar ();
+            rtfMinor = rtfSC_nothing;
+            rtfParam = rtfNoParam;
+            rtfTextBuf[rtfTextLen = 0] = '\0';
+            if (rtfMajor == EOF)
+                rtfClass = rtfEOF;
+            else
+                rtfClass = rtfText;
+            return;
+        }
 
         /* first check for pushed token from RTFUngetToken() */
@@ -660 +653 @@
 /* this shouldn't be called anywhere but from _RTFGetToken() */
 
-static void
-_RTFGetToken2 ()
+static void _RTFGetToken2(void)
 {
 int     sign;
 int     c;
+
+    TRACE("\n");
 
         /* initialize token vars */
@@ -831 +825 @@
 
 
-static int
-GetChar ()
+static int GetChar(void)
 {
 int     c;
 int     oldBumpLine;
+
+    TRACE("\n");
 
         if ((c = _RTFGetChar()) != EOF)
@@ -874 +869 @@
  */
 
-void
-RTFSetToken (class, major, minor, param, text)
-int     class, major, minor, param;
-char    *text;
-{
+void RTFSetToken(int class, int major, int minor, int param, char *text)
+{
+    TRACE("\n");
+
         rtfClass = class;
         rtfMajor = major;
@@ -911 +905 @@
  */
 
-static void
-CharSetInit ()
-{
+static void CharSetInit(void)
+{
+    TRACE("\n");
+
         autoCharSetFlags = (rtfReadCharSet | rtfSwitchCharSet);
         RTFFree (genCharSetFile);
@@ -931 +926 @@
  */
 
-void
-RTFSetCharSetMap (name, csId)
-char    *name;
-int     csId;
-{
+void RTFSetCharSetMap (char *name, int csId)
+{
+    TRACE("\n");
+
         if ((name = RTFStrSave (name)) == (char *) NULL)        /* make copy */
                 RTFPanic ("RTFSetCharSetMap: out of memory");
@@ -961 +955 @@
  */
 
-static void
-ReadCharSetMaps ()
+static void ReadCharSetMaps(void)
 {
 char    buf[rtfBufSiz];
+
+    TRACE("\n");
 
         if (genCharSetFile != (char *) NULL)
@@ -987 +982 @@
  */
 
-int
-RTFReadCharSetMap (csId)
-int     csId;
+int RTFReadCharSetMap(int csId)
 {
         int     *stdCodeArray;
         int i;
+
+    TRACE("\n");
+
         switch (csId)
         {
@@ -1037 +1033 @@
  */
 
-int
-RTFStdCharCode (name)
-char    *name;
+int RTFStdCharCode(char *name)
 {
 int     i;
+
+    TRACE("\n");
 
         for (i = 0; i < rtfSC_MaxChar; i++)
@@ -1057 +1053 @@
  */
 
-char *
-RTFStdCharName (code)
-int     code;
+char *RTFStdCharName(int code)
 {
         if (code < 0 || code >= rtfSC_MaxChar)
@@ -1076 +1070 @@
  */
 
-int
-RTFMapChar (c)
-int     c;
-{
+int RTFMapChar(int c)
+{
+    TRACE("\n");
+
         switch (curCharSet)
         {
@@ -1107 +1101 @@
  */
 
-void
-RTFSetCharSet (csId)
-int     csId;
-{
+void RTFSetCharSet(int csId)
+{
+    TRACE("\n");
+
         switch (csId)
         {
@@ -1126 +1120 @@
 
 
-int
-RTFGetCharSet ()
+int RTFGetCharSet(void)
 {
         return (curCharSet);
@@ -1161 +1154 @@
  */
 
-static void
-ReadFontTbl ()
+static void ReadFontTbl(void)
 {
 RTFFont *fp = NULL;
@@ -1168 +1160 @@
 int     old = -1;
 char    *fn = "ReadFontTbl";
+
+    TRACE("\n");
 
         for (;;)
@@ -1312 +1306 @@
  */
 
-static void
-ReadColorTbl ()
+static void ReadColorTbl(void)
 {
 RTFColor        *cp;
 int             cnum = 0;
 char            *fn = "ReadColorTbl";
+
+    TRACE("\n");
 
         for (;;)
@@ -1352 +1347 @@
  */
 
-static void
-ReadStyleSheet ()
+static void ReadStyleSheet(void)
 {
 RTFStyle        *sp;
@@ -1359 +1353 @@
 char            buf[rtfBufSiz], *bp;
 char            *fn = "ReadStyleSheet";
+
+    TRACE("\n");
 
         for (;;)
@@ -1502 +1498 @@
 
 
-static void
-ReadInfoGroup ()
+static void ReadInfoGroup(void)
 {
         RTFSkipGroup ();
@@ -1510 +1505 @@
 
 
-static void
-ReadPictGroup ()
+static void ReadPictGroup(void)
 {
         RTFSkipGroup ();
@@ -1518 +1512 @@
 
 
-static void
-ReadObjGroup ()
+static void ReadObjGroup(void)
 {
         RTFSkipGroup ();
@@ -1534 +1527 @@
 
 
-RTFStyle *
-RTFGetStyle (num)
-int     num;
+RTFStyle *RTFGetStyle(int num)
 {
 RTFStyle        *s;
@@ -1551 +1542 @@
 
 
-RTFFont *
-RTFGetFont (num)
-int     num;
+RTFFont *RTFGetFont(int num)
 {
 RTFFont *f;
@@ -1568 +1557 @@
 
 
-RTFColor *
-RTFGetColor (num)
-int     num;
+RTFColor *RTFGetColor(int num)
 {
 RTFColor        *c;
@@ -1592 +1579 @@
  */
 
-void
-RTFExpandStyle (n)
-int     n;
+void RTFExpandStyle(int n)
 {
 RTFStyle        *s;
 RTFStyleElt     *se;
+
+    TRACE("\n");
 
         if (n == -1 || (s = RTFGetStyle (n)) == (RTFStyle *) NULL)
@@ -2555 +2542 @@
  */
 
-static void
-LookupInit ()
+static void LookupInit(void)
 {
 static int      inited = 0;
@@ -2575 +2561 @@
  */
 
-static void
-Lookup (s)
-char    *s;
+static void Lookup(char *s)
 {
 RTFKey  *rp;
 int     hash;
 
+        TRACE("\n");
         ++s;                    /* skip over the leading \ character */
         hash = Hash (s);
@@ -2602 +2587 @@
  */
 
-static int
-Hash (s)
-char    *s;
+static int Hash(char *s)
 {
 char    c;
@@ -2631 +2614 @@
  */
 
-char *
-_RTFAlloc (size)
-int     size;
+char *_RTFAlloc(int size)
 {
         return HeapAlloc(RICHED32_hHeap, 0, size);
@@ -2644 +2625 @@
 
 
-char *
-RTFStrSave (s)
-char    *s;
+char *RTFStrSave(char *s)
 {
 char    *p;
@@ -2656 +2635 @@
 
 
-void
-RTFFree (p)
-char    *p;
+void RTFFree(char *p)
 {
         if (p != (char *) NULL)
@@ -2672 +2649 @@
  */
 
-int
-RTFCheckCM (class, major)
-int     class, major;
+int RTFCheckCM(int class, int major)
 {
         return (rtfClass == class && rtfMajor == major);
@@ -2680 +2655 @@
 
 
-int
-RTFCheckCMM (class, major, minor)
-int     class, major, minor;
+int RTFCheckCMM(int class, int major, int minor)
 {
         return (rtfClass == class && rtfMajor == major && rtfMinor == minor);
@@ -2688 +2661 @@
 
 
-int
-RTFCheckMM (major, minor)
-int     major, minor;
+int RTFCheckMM(int major, int minor)
 {
         return (rtfMajor == major && rtfMinor == minor);
@@ -2699 +2670 @@
 
 
-int
-RTFCharToHex (c)
-char    c;
+int RTFCharToHex(char c)
 {
         if (isupper (c))
@@ -2711 +2680 @@
 
 
-int
-RTFHexToChar (i)
-int     i;
+int RTFHexToChar(int i)
 {
         if (i < 10)
@@ -2742 +2709 @@
  */
 
-int
-RTFReadOutputMap (outMap, reinit)
-char    *outMap[];
-int     reinit;
+int RTFReadOutputMap(char *outMap[], int reinit)
 {
     int  i;
@@ -2781 +2745 @@
 
 
-void
-RTFSetOpenLibFileProc (proc)
-FILE    *(*proc) ();
+void RTFSetOpenLibFileProc(FILE *(*proc)())
 {
     libFileOpen = proc;
@@ -2789 +2751 @@
 
 
-FILE *
-RTFOpenLibFile (file, mode)
-char    *file;
-char    *mode;
+FILE *RTFOpenLibFile (char *file, char *mode)
 {
         if (libFileOpen == NULL)
@@ -2813 +2772 @@
 
 
-static void
-DefaultMsgProc (s)
-char    *s;
-{
-        fprintf (stderr, "%s", s);
+static void DefaultMsgProc(char *s)
+{
+    MESSAGE( "%s", s);
 }
 
@@ -2824 +2781 @@
 
 
-void
-RTFSetMsgProc (proc)
-RTFFuncPtr      proc;
+void RTFSetMsgProc(RTFFuncPtr proc)
 {
         msgProc = proc;
@@ -2838 +2793 @@
  */
 
-void
-RTFMsg (char *fmt, ...)
+void RTFMsg (char *fmt, ...)
 {
 char    buf[rtfBufSiz];
@@ -2859 +2813 @@
  */
 
-void
-RTFMsg (va_alist)
-va_dcl
+void RTFMsg (va_dcl va_alist)
 {
 va_list args;
@@ -2880 +2832 @@
  */
 
-void
-RTFMsg (fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9)
-char    *fmt;
-char    *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8, *a9;
+void RTFMsg (char *fmt, char *a1, char *a2, char *a3, char *a4, char *a5, char *a6, char *a7, char *a8, char *a9)
 {
 char    buf[rtfBufSiz];
@@ -2905 +2854 @@
  */
 
-static void
-DefaultPanicProc (s)
-char    *s;
-{
-        fprintf (stderr, "%s", s);
+static void DefaultPanicProc(char *s)
+{
+    MESSAGE( "%s", s);
         /*exit (1);*/
 }
@@ -2917 +2864 @@
 
 
-void
-RTFSetPanicProc (proc)
-RTFFuncPtr      proc;
+void RTFSetPanicProc(RTFFuncPtr proc)
 {
         panicProc = proc;
@@ -2931 +2876 @@
  */
 
-void
-RTFPanic (char *fmt, ...)
+void RTFPanic(char *fmt, ...)
 {
 char    buf[rtfBufSiz];
@@ -2959 +2903 @@
  */
 
-void
-RTFPanic (va_alist)
-va_dcl
+void RTFPanic(va_dcl va_alist)
 {
 va_list args;
@@ -2987 +2929 @@
  */
 
-void
-RTFPanic (fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9)
-char    *fmt;
-char    *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8, *a9;
+void RTFPanic (char *fmt, char *a1, char *a2, char *a3, char *a4, char *a5, char *a6, char *a7, char *a8, char *a9)
 {
 char    buf[rtfBufSiz];

trunk/src/riched32/riched32.h

@@ -4 +4 @@
  * Copyright 2000 Jean-Clauyde Batista
  *
+ *
+ * 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
  */
 
@@ -9 +23 @@
 #define __WINE_RICHED32_H
 
+#include "windef.h"
+#include "winuser.h"
 #include "richedit.h"
 
-extern HMODULE RICHED32_hModule;
 extern VOID RICHED32_Register (VOID);
 extern VOID RICHED32_Unregister (VOID);

trunk/src/riched32/richedit.c

@@ -1 @@
-/* $Id: richedit.c,v 1.4 2000-10-02 13:36:39 sandervl Exp $ */
 /*
  * RichEdit32  functions
  *
- * This module is a simple wrap-arround the edit controls.
- * At the point, it is good only for application who use the RICHEDIT control to
- * display RTF text.
+ * This module is a simple wrapper for the edit controls.
+ * At the point, it is good only for application who use the RICHEDIT
+ * control to display RTF text.
  *
  * Copyright 2000 by Jean-Claude Batista
  *
+ * 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 "windows.h"
+#include <string.h>
+#include "windef.h"
 #include "winbase.h"
-#include "heap.h"
-#include "debugtools.h"
+#include "wingdi.h"
+#include "winreg.h"
 #include "winerror.h"
 #include "riched32.h"
 #include "richedit.h"
 #include "charlist.h"
+#define NO_SHLWAPI_STREAM
+#include "shlwapi.h"
 
 #include "rtf.h"
 #include "rtf2text.h"
+#include "wine/debug.h"
 
 #define ID_EDIT      1
 
-DEFAULT_DEBUG_CHANNEL(richedit)
+WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
 HANDLE RICHED32_hHeap = (HANDLE)NULL;
-DWORD  RICHED32_dwProcessesAttached = 0;
 /* LPSTR  RICHED32_aSubclass = (LPSTR)NULL; */
-HMODULE RICHED32_hModule = 0;
-
-/*
- * RICHED32_LibMain [Internal] Initializes the internal 'RICHED32.DLL'.
+
+#define DPRINTF_EDIT_MSG32(str) \
+        TRACE(\
+                     "32 bit : " str ": hwnd=%p, wParam=%08x, lParam=%08x\n"\
+                     , \
+                     hwnd, (UINT)wParam, (UINT)lParam)
+
+
+/***********************************************************************
+ * DllMain [Internal] Initializes the internal 'RICHED32.DLL'.
  *
  * PARAMS
- *     hinstDLL    [I] handle to the 'dlls' instance
+ *     hinstDLL    [I] handle to the DLL's instance
  *     fdwReason   [I]
- *     lpvReserved [I] reserverd, must be NULL
+ *     lpvReserved [I] reserved, must be NULL
  *
  * RETURNS
@@ -45 +66 @@
  */
 
-BOOL WINAPI
-RICHED32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+#ifdef __WIN32OS2__
+BOOL WINAPI RICHED32_LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+#else
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+#endif
 {
-
-    switch (fdwReason) {
-            case DLL_PROCESS_ATTACH:
-
-            if (RICHED32_dwProcessesAttached == 0) {
-
-                    /* This will be wrong for any other process attching in this address-space! */
-                    RICHED32_hModule = (HMODULE)hinstDLL;
-
-                        /* create private heap */
-                        RICHED32_hHeap = HeapCreate (0, 0x10000, 0);
-
-                }
-
-                /* register the Rich Edit class */
-                RICHED32_Register ();
-
-                RICHED32_dwProcessesAttached++;
-                break;
-
-            case DLL_PROCESS_DETACH:
-                RICHED32_dwProcessesAttached--;
-
-                /* unregister all common control classes */
-                RICHED32_Unregister ();
-
-                if (RICHED32_dwProcessesAttached == 0) {
-                    HeapDestroy (RICHED32_hHeap);
-                    RICHED32_hHeap = (HANDLE)NULL;
-                }
-                break;
+    TRACE("\n");
+    switch (fdwReason)
+    {
+    case DLL_PROCESS_ATTACH:
+        /* create private heap */
+        RICHED32_hHeap = HeapCreate (0, 0x10000, 0);
+        /* register the Rich Edit class */
+        RICHED32_Register ();
+        break;
+
+    case DLL_PROCESS_DETACH:
+        /* unregister all common control classes */
+        RICHED32_Unregister ();
+        HeapDestroy (RICHED32_hHeap);
+        RICHED32_hHeap = (HANDLE)NULL;
+        break;
     }
-
     return TRUE;
 }
+
+/* Support routines for window procedure */
+   INT RICHEDIT_GetTextRange(HWND hwnd,TEXTRANGEA *tr);
+   INT RICHEDIT_GetSelText(HWND hwnd,LPSTR lpstrBuffer);
+
 
 /*
@@ -98 +111 @@
 
     static HWND hwndEdit;
+    static HWND hwndParent;
     static char* rtfBuffer;
     int rtfBufferSize;
 
+    CHARRANGE *cr;
+    TRACE("previous hwndEdit: %p hwndParent %p\n",hwndEdit,hwndParent);
+    hwndEdit = GetWindow(hwnd,GW_CHILD);
+    TRACE("uMsg: 0x%x hwnd: %p hwndEdit: %p\n",uMsg,hwnd,hwndEdit);
+
     switch (uMsg)
     {
 
     case WM_CREATE :
+            DPRINTF_EDIT_MSG32("WM_CREATE");
 
             /* remove SCROLLBARS from the current window style */
+            hwndParent = ((LPCREATESTRUCTA) lParam)->hwndParent;
+
             newstyle = style = ((LPCREATESTRUCTA) lParam)->style;
             newstyle &= ~WS_HSCROLL;
@@ -113 +135 @@
             newstyle &= ~ES_AUTOVSCROLL;
 
-#ifdef __WIN32OS2__
-            style |= WS_CHILD;
-#endif
+    TRACE("previous hwndEdit: %p\n",hwndEdit);
             hwndEdit = CreateWindowA ("edit", ((LPCREATESTRUCTA) lParam)->lpszName,
                                    style, 0, 0, 0, 0,
                                    hwnd, (HMENU) ID_EDIT,
                                    ((LPCREATESTRUCTA) lParam)->hInstance, NULL) ;
+    TRACE("hwndEdit: %p hwnd: %p\n",hwndEdit,hwnd);
 
             SetWindowLongA(hwnd,GWL_STYLE, newstyle);
@@ -125 +146 @@
 
     case WM_SETFOCUS :
+            DPRINTF_EDIT_MSG32("WM_SETFOCUS");
             SetFocus (hwndEdit) ;
             return 0 ;
 
     case WM_SIZE :
+            DPRINTF_EDIT_MSG32("WM_SIZE");
             MoveWindow (hwndEdit, 0, 0, LOWORD (lParam), HIWORD (lParam), TRUE) ;
             return 0 ;
 
     case WM_COMMAND :
-            if (LOWORD (wParam) == ID_EDIT)
-                 if (HIWORD (wParam) == EN_ERRSPACE ||
-                           HIWORD (wParam) == EN_MAXTEXT)
-
-                      MessageBoxA (hwnd, "RichEdit control out of space.",
+        DPRINTF_EDIT_MSG32("WM_COMMAND");
+        switch(HIWORD(wParam)) {
+                case EN_CHANGE:
+                case EN_HSCROLL:
+                case EN_KILLFOCUS:
+                case EN_SETFOCUS:
+                case EN_UPDATE:
+                case EN_VSCROLL:
+                        return SendMessageA(hwndParent, WM_COMMAND,
+                                wParam, (LPARAM)(hwnd));
+
+                case EN_ERRSPACE:
+                case EN_MAXTEXT:
+                        MessageBoxA (hwnd, "RichEdit control out of space.",
                                   "ERROR", MB_OK | MB_ICONSTOP) ;
-            return 0 ;
-
-#ifdef __WIN32OS2__
-    case WM_SETTEXT:
-            return SetWindowTextA(hwndEdit, lParam);
-#endif
+                        return 0 ;
+                }
 
     case EM_STREAMIN:
+            DPRINTF_EDIT_MSG32("EM_STREAMIN");
 
             /* setup the RTF parser */
             RTFSetEditStream(( EDITSTREAM*)lParam);
+            rtfFormat = wParam&(SF_TEXT|SF_RTF);
             WriterInit();
             RTFInit ();
@@ -169 +199 @@
 
             return 0;
+
+/* Messages specific to Richedit controls */
+
+    case EM_AUTOURLDETECT:
+            DPRINTF_EDIT_MSG32("EM_AUTOURLDETECT Ignored");
+            return 0;
+
+    case EM_CANPASTE:
+            DPRINTF_EDIT_MSG32("EM_CANPASTE Ignored");
+            return 0;
+
+    case EM_CANREDO:
+            DPRINTF_EDIT_MSG32("EM_CANREDO Ignored");
+            return 0;
+
+    case EM_DISPLAYBAND:
+            DPRINTF_EDIT_MSG32("EM_DISPLAYBAND Ignored");
+            return 0;
+
+    case EM_EXGETSEL:
+            DPRINTF_EDIT_MSG32("EM_EXGETSEL -> EM_GETSEL");
+            cr = (VOID *) lParam;
+            if (hwndEdit) SendMessageA( hwndEdit, EM_GETSEL, (INT)&cr->cpMin, (INT)&cr->cpMax);
+            TRACE("cpMin: 0x%x cpMax: 0x%x\n",(INT)cr->cpMin,(INT)cr->cpMax);
+            return 0;
+
+    case EM_EXLIMITTEXT:
+        {
+           DWORD limit = lParam;
+           DPRINTF_EDIT_MSG32("EM_EXLIMITTEXT");
+           if (limit > 65534)
+           {
+                limit = 0xFFFFFFFF;
+           }
+           return SendMessageA(hwndEdit,EM_SETLIMITTEXT,limit,0);
+        }
+
+    case EM_EXLINEFROMCHAR:
+            DPRINTF_EDIT_MSG32("EM_EXLINEFROMCHAR -> LINEFROMCHAR");
+            if (hwndEdit) return SendMessageA( hwndEdit, EM_LINEFROMCHAR, lParam, wParam);
+            return 0;
+
+    case EM_EXSETSEL:
+            DPRINTF_EDIT_MSG32("EM_EXSETSEL -> EM_SETSEL");
+            cr = (VOID *) lParam;
+            if (hwndEdit) SendMessageA( hwndEdit, EM_SETSEL, cr->cpMin, cr->cpMax);
+            return 0;
+
+    case EM_FINDTEXT:
+            DPRINTF_EDIT_MSG32("EM_FINDTEXT Ignored");
+            return 0;
+
+    case EM_FINDTEXTEX:
+            DPRINTF_EDIT_MSG32("EM_FINDTEXTEX Ignored");
+            return 0;
+
+    case EM_FINDTEXTEXW:
+            DPRINTF_EDIT_MSG32("EM_FINDTEXTEXW Ignored");
+            return 0;
+
+    case EM_FINDTEXTW:
+            DPRINTF_EDIT_MSG32("EM_FINDTEXTW Ignored");
+            return 0;
+
+    case EM_FINDWORDBREAK:
+            DPRINTF_EDIT_MSG32("EM_FINDWORDBREAK Ignored");
+            return 0;
+
+    case EM_FORMATRANGE:
+            DPRINTF_EDIT_MSG32("EM_FORMATRANGE Ignored");
+            return 0;
+
+    case EM_GETAUTOURLDETECT:
+            DPRINTF_EDIT_MSG32("EM_GETAUTOURLDETECT Ignored");
+            return 0;
+
+    case EM_GETBIDIOPTIONS:
+            DPRINTF_EDIT_MSG32("EM_GETBIDIOPTIONS Ignored");
+            return 0;
+
+    case EM_GETCHARFORMAT:
+            DPRINTF_EDIT_MSG32("EM_GETCHARFORMAT Ignored");
+            return 0;
+
+    case EM_GETEDITSTYLE:
+            DPRINTF_EDIT_MSG32("EM_GETEDITSTYLE Ignored");
+            return 0;
+
+    case EM_GETEVENTMASK:
+            DPRINTF_EDIT_MSG32("EM_GETEVENTMASK Ignored");
+            return 0;
+
+    case EM_GETIMECOLOR:
+            DPRINTF_EDIT_MSG32("EM_GETIMECOLOR Ignored");
+            return 0;
+
+    case EM_GETIMECOMPMODE:
+            DPRINTF_EDIT_MSG32("EM_GETIMECOMPMODE Ignored");
+            return 0;
+
+    case EM_GETIMEOPTIONS:
+            DPRINTF_EDIT_MSG32("EM_GETIMEOPTIONS Ignored");
+            return 0;
+
+    case EM_GETLANGOPTIONS:
+            DPRINTF_EDIT_MSG32("STUB: EM_GETLANGOPTIONS");
+            return 0;
+
+    case EM_GETOLEINTERFACE:
+            DPRINTF_EDIT_MSG32("EM_GETOLEINTERFACE Ignored");
+            return 0;
+
+    case EM_GETOPTIONS:
+            DPRINTF_EDIT_MSG32("EM_GETOPTIONS Ignored");
+            return 0;
+
+    case EM_GETPARAFORMAT:
+            DPRINTF_EDIT_MSG32("EM_GETPARAFORMAT Ignored");
+            return 0;
+
+    case EM_GETPUNCTUATION:
+            DPRINTF_EDIT_MSG32("EM_GETPUNCTUATION Ignored");
+            return 0;
+
+    case EM_GETREDONAME:
+            DPRINTF_EDIT_MSG32("EM_GETREDONAME Ignored");
+            return 0;
+
+    case EM_GETSCROLLPOS:
+            DPRINTF_EDIT_MSG32("EM_GETSCROLLPOS Ignored");
+            return 0;
+
+    case EM_GETSELTEXT:
+            DPRINTF_EDIT_MSG32("EM_GETSELTEXT");
+            return RICHEDIT_GetSelText(hwndEdit,(void *)lParam);
+
+    case EM_GETTEXTEX:
+            DPRINTF_EDIT_MSG32("EM_GETTEXTEX Ignored");
+            return 0;
+
+    case EM_GETTEXTLENGTHEX:
+            DPRINTF_EDIT_MSG32("EM_GETTEXTLENGTHEX Ignored");
+            return 0;
+
+    case EM_GETTEXTMODE:
+            DPRINTF_EDIT_MSG32("EM_GETTEXTMODE Ignored");
+            return 0;
+
+    case EM_GETTEXTRANGE:
+            DPRINTF_EDIT_MSG32("EM_GETTEXTRANGE");
+            return RICHEDIT_GetTextRange(hwndEdit,(TEXTRANGEA *)lParam);
+
+    case EM_GETTYPOGRAPHYOPTIONS:
+            DPRINTF_EDIT_MSG32("EM_GETTYPOGRAPHYOPTIONS Ignored");
+            return 0;
+
+    case EM_GETUNDONAME:
+            DPRINTF_EDIT_MSG32("EM_GETUNDONAME Ignored");
+            return 0;
+
+    case EM_GETWORDBREAKPROCEX:
+            DPRINTF_EDIT_MSG32("EM_GETWORDBREAKPROCEX Ignored");
+            return 0;
+
+    case EM_GETWORDWRAPMODE:
+            DPRINTF_EDIT_MSG32("EM_GETWORDWRAPMODE Ignored");
+            return 0;
+
+    case EM_GETZOOM:
+            DPRINTF_EDIT_MSG32("EM_GETZOOM Ignored");
+            return 0;
+
+    case EM_HIDESELECTION:
+            DPRINTF_EDIT_MSG32("EM_HIDESELECTION Ignored");
+            return 0;
+
+    case EM_PASTESPECIAL:
+            DPRINTF_EDIT_MSG32("EM_PASTESPECIAL Ignored");
+            return 0;
+
+    case EM_RECONVERSION:
+            DPRINTF_EDIT_MSG32("EM_RECONVERSION Ignored");
+            return 0;
+
+    case EM_REDO:
+            DPRINTF_EDIT_MSG32("EM_REDO Ignored");
+            return 0;
+
+    case EM_REQUESTRESIZE:
+            DPRINTF_EDIT_MSG32("EM_REQUESTRESIZE Ignored");
+            return 0;
+
+    case EM_SELECTIONTYPE:
+            DPRINTF_EDIT_MSG32("EM_SELECTIONTYPE Ignored");
+            return 0;
+
+    case EM_SETBIDIOPTIONS:
+            DPRINTF_EDIT_MSG32("EM_SETBIDIOPTIONS Ignored");
+            return 0;
+
+    case EM_SETBKGNDCOLOR:
+            DPRINTF_EDIT_MSG32("EM_SETBKGNDCOLOR Ignored");
+            return 0;
+
+    case EM_SETCHARFORMAT:
+            DPRINTF_EDIT_MSG32("EM_SETCHARFORMAT Ignored");
+            return 0;
+
+    case EM_SETEDITSTYLE:
+            DPRINTF_EDIT_MSG32("EM_SETEDITSTYLE Ignored");
+            return 0;
+
+    case EM_SETEVENTMASK:
+            DPRINTF_EDIT_MSG32("EM_SETEVENTMASK Ignored");
+            return 0;
+
+    case EM_SETFONTSIZE:
+            DPRINTF_EDIT_MSG32("EM_SETFONTSIZE Ignored");
+            return 0;
+
+    case EM_SETIMECOLOR:
+            DPRINTF_EDIT_MSG32("EM_SETIMECOLO Ignored");
+            return 0;
+
+    case EM_SETIMEOPTIONS:
+            DPRINTF_EDIT_MSG32("EM_SETIMEOPTIONS Ignored");
+            return 0;
+
+    case EM_SETLANGOPTIONS:
+            DPRINTF_EDIT_MSG32("EM_SETLANGOPTIONS Ignored");
+            return 0;
+
+    case EM_SETOLECALLBACK:
+            DPRINTF_EDIT_MSG32("EM_SETOLECALLBACK Ignored");
+            return 0;
+
+    case EM_SETOPTIONS:
+            DPRINTF_EDIT_MSG32("EM_SETOPTIONS Ignored");
+            return 0;
+
+    case EM_SETPALETTE:
+            DPRINTF_EDIT_MSG32("EM_SETPALETTE Ignored");
+            return 0;
+
+    case EM_SETPARAFORMAT:
+            DPRINTF_EDIT_MSG32("EM_SETPARAFORMAT Ignored");
+            return 0;
+
+    case EM_SETPUNCTUATION:
+            DPRINTF_EDIT_MSG32("EM_SETPUNCTUATION Ignored");
+            return 0;
+
+    case EM_SETSCROLLPOS:
+            DPRINTF_EDIT_MSG32("EM_SETSCROLLPOS Ignored");
+            return 0;
+
+    case EM_SETTARGETDEVICE:
+            DPRINTF_EDIT_MSG32("EM_SETTARGETDEVICE Ignored");
+            return 0;
+
+    case EM_SETTEXTEX:
+            DPRINTF_EDIT_MSG32("EM_SETTEXTEX Ignored");
+            return 0;
+
+    case EM_SETTEXTMODE:
+            DPRINTF_EDIT_MSG32("EM_SETTEXTMODE Ignored");
+            return 0;
+
+    case EM_SETTYPOGRAPHYOPTIONS:
+            DPRINTF_EDIT_MSG32("EM_SETTYPOGRAPHYOPTIONS Ignored");
+            return 0;
+
+    case EM_SETUNDOLIMIT:
+            DPRINTF_EDIT_MSG32("EM_SETUNDOLIMIT Ignored");
+            return 0;
+
+    case EM_SETWORDBREAKPROCEX:
+            DPRINTF_EDIT_MSG32("EM_SETWORDBREAKPROCEX Ignored");
+            return 0;
+
+    case EM_SETWORDWRAPMODE:
+            DPRINTF_EDIT_MSG32("EM_SETWORDWRAPMODE Ignored");
+            return 0;
+
+    case EM_SETZOOM:
+            DPRINTF_EDIT_MSG32("EM_SETZOOM Ignored");
+            return 0;
+
+    case EM_SHOWSCROLLBAR:
+            DPRINTF_EDIT_MSG32("EM_SHOWSCROLLBAR Ignored");
+            return 0;
+
+    case EM_STOPGROUPTYPING:
+            DPRINTF_EDIT_MSG32("EM_STOPGROUPTYPING Ignored");
+            return 0;
+
+    case EM_STREAMOUT:
+            DPRINTF_EDIT_MSG32("EM_STREAMOUT Ignored");
+            return 0;
+
+/* Messages dispatched to the edit control */
+     case EM_CANUNDO:
+            DPRINTF_EDIT_MSG32("EM_CANUNDO Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_CHARFROMPOS:
+            DPRINTF_EDIT_MSG32("EM_CHARFROMPOS Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_EMPTYUNDOBUFFER:
+            DPRINTF_EDIT_MSG32("EM_EMPTYUNDOBUFFER Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_FMTLINES:
+            DPRINTF_EDIT_MSG32("EM_FMTLINES Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_GETFIRSTVISIBLELINE:
+            DPRINTF_EDIT_MSG32("EM_GETFIRSTVISIBLELINE Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_GETHANDLE:
+            DPRINTF_EDIT_MSG32("EM_GETHANDLE Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+ /*    case EM_GETIMESTATUS:*/
+     case EM_GETLIMITTEXT:
+            DPRINTF_EDIT_MSG32("EM_GETLIMITTEXT Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_GETLINE:
+            DPRINTF_EDIT_MSG32("EM_GETLINE Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_GETLINECOUNT:
+            DPRINTF_EDIT_MSG32("EM_GETLINECOUNT Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_GETMARGINS:
+            DPRINTF_EDIT_MSG32("EM_GETMARGINS Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_GETMODIFY:
+            DPRINTF_EDIT_MSG32("EM_GETMODIFY Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_GETPASSWORDCHAR:
+            DPRINTF_EDIT_MSG32("EM_GETPASSWORDCHAR Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_GETRECT:
+            DPRINTF_EDIT_MSG32("EM_GETRECT Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_GETSEL:
+            DPRINTF_EDIT_MSG32("EM_GETSEL Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_GETTHUMB:
+            DPRINTF_EDIT_MSG32("EM_GETTHUMB Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_GETWORDBREAKPROC:
+            DPRINTF_EDIT_MSG32("EM_GETWORDBREAKPROC Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_LINEFROMCHAR:
+            DPRINTF_EDIT_MSG32("EM_LINEFROMCHAR Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_LINEINDEX:
+            DPRINTF_EDIT_MSG32("EM_LINEINDEX Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_LINELENGTH:
+            DPRINTF_EDIT_MSG32("EM_LINELENGTH Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_LINESCROLL:
+            DPRINTF_EDIT_MSG32("EM_LINESCROLL Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_POSFROMCHAR:
+            DPRINTF_EDIT_MSG32("EM_POSFROMCHAR Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_REPLACESEL:
+            DPRINTF_EDIT_MSG32("case EM_REPLACESEL Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_SCROLL:
+            DPRINTF_EDIT_MSG32("case EM_SCROLL Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_SCROLLCARET:
+            DPRINTF_EDIT_MSG32("EM_SCROLLCARET Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_SETHANDLE:
+            DPRINTF_EDIT_MSG32("EM_SETHANDLE Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+ /*    case EM_SETIMESTATUS:*/
+     case EM_SETLIMITTEXT:
+            DPRINTF_EDIT_MSG32("EM_SETLIMITTEXT Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_SETMARGINS:
+            DPRINTF_EDIT_MSG32("case EM_SETMARGINS Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_SETMODIFY:
+            DPRINTF_EDIT_MSG32("EM_SETMODIFY Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_SETPASSWORDCHAR:
+            DPRINTF_EDIT_MSG32("EM_SETPASSWORDCHAR Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_SETREADONLY:
+            DPRINTF_EDIT_MSG32("EM_SETREADONLY Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_SETRECT:
+            DPRINTF_EDIT_MSG32("EM_SETRECT Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_SETRECTNP:
+            DPRINTF_EDIT_MSG32("EM_SETRECTNP Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_SETSEL:
+            DPRINTF_EDIT_MSG32("EM_SETSEL Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_SETTABSTOPS:
+            DPRINTF_EDIT_MSG32("EM_SETTABSTOPS Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_SETWORDBREAKPROC:
+            DPRINTF_EDIT_MSG32("EM_SETWORDBREAKPROC Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case EM_UNDO:
+            DPRINTF_EDIT_MSG32("EM_UNDO Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+
+     case WM_STYLECHANGING:
+            DPRINTF_EDIT_MSG32("WM_STYLECHANGING Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case WM_STYLECHANGED:
+            DPRINTF_EDIT_MSG32("WM_STYLECHANGED Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case WM_NCCALCSIZE:
+            DPRINTF_EDIT_MSG32("WM_NCCALCSIZE Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case WM_GETTEXT:
+            DPRINTF_EDIT_MSG32("WM_GETTEXT Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case WM_GETTEXTLENGTH:
+            DPRINTF_EDIT_MSG32("WM_GETTEXTLENGTH Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case WM_SETTEXT:
+            DPRINTF_EDIT_MSG32("WM_SETTEXT Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case WM_CUT:
+            DPRINTF_EDIT_MSG32("WM_CUT Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+     case WM_COPY:
+            DPRINTF_EDIT_MSG32("WM_COPY Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+    case WM_PASTE:
+            DPRINTF_EDIT_MSG32("WM_PASTE Passed to edit control");
+            return SendMessageA( hwndEdit, uMsg, wParam, lParam);
+
+    /* Messages passed to default handler. */
+    case WM_NCPAINT:
+        DPRINTF_EDIT_MSG32("WM_NCPAINT Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_PAINT:
+        DPRINTF_EDIT_MSG32("WM_PAINT Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_ERASEBKGND:
+        DPRINTF_EDIT_MSG32("WM_ERASEBKGND Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_KILLFOCUS:
+        DPRINTF_EDIT_MSG32("WM_KILLFOCUS Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_DESTROY:
+        DPRINTF_EDIT_MSG32("WM_DESTROY Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_CHILDACTIVATE:
+        DPRINTF_EDIT_MSG32("WM_CHILDACTIVATE Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+
+    case WM_WINDOWPOSCHANGING:
+        DPRINTF_EDIT_MSG32("WM_WINDOWPOSCHANGING Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_WINDOWPOSCHANGED:
+        DPRINTF_EDIT_MSG32("WM_WINDOWPOSCHANGED Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+/*    case WM_INITIALUPDATE:
+        DPRINTF_EDIT_MSG32("WM_INITIALUPDATE Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam); */
+    case WM_CTLCOLOREDIT:
+        DPRINTF_EDIT_MSG32("WM_CTLCOLOREDIT Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_SETCURSOR:
+        DPRINTF_EDIT_MSG32("WM_SETCURSOR Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_MOVE:
+        DPRINTF_EDIT_MSG32("WM_MOVE Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_SHOWWINDOW:
+        DPRINTF_EDIT_MSG32("WM_SHOWWINDOW Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_NCCREATE:
+        DPRINTF_EDIT_MSG32("WM_NCCREATE Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_PARENTNOTIFY:
+        DPRINTF_EDIT_MSG32("WM_PARENTNOTIFY Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_SETREDRAW:
+        DPRINTF_EDIT_MSG32("WM_SETREDRAW Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_NCDESTROY:
+        DPRINTF_EDIT_MSG32("WM_NCDESTROY Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_NCHITTEST:
+        DPRINTF_EDIT_MSG32("WM_NCHITTEST Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_CTLCOLORSTATIC:
+        DPRINTF_EDIT_MSG32("WM_CTLCOLORSTATIC Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_NCMOUSEMOVE:
+        DPRINTF_EDIT_MSG32("WM_NCMOUSEMOVE Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_CLEAR:
+        DPRINTF_EDIT_MSG32("WM_CLEAR Passed to default");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+   /*
+    * used by IE in the EULA box
+    */
+    case WM_ALTTABACTIVE:
+        DPRINTF_EDIT_MSG32("WM_ALTTABACTIVE");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_GETDLGCODE:
+        DPRINTF_EDIT_MSG32("WM_GETDLGCODE");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+    case WM_SETFONT:
+        DPRINTF_EDIT_MSG32("WM_SETFONT");
+        return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+
     }
-    /*return SendMessageA( hwndEdit,uMsg,wParam,lParam);*/
-    return DefWindowProcA( hwnd,uMsg,wParam,lParam);
+
+    FIXME("Unknown message 0x%x Passed to default hwnd=%p, wParam=%08x, lParam=%08x\n",
+           uMsg, hwnd, (UINT)wParam, (UINT)lParam);
+
+   return DefWindowProcA( hwnd,uMsg,wParam,lParam);
 }
 
-/*
- * DllGetVersion [COMCTL32.25]
- *
- * Retrieves version information of the 'COMCTL32.DLL'
+/***********************************************************************
+ * DllGetVersion [RICHED32.2]
+ *
+ * Retrieves version information of the 'RICHED32.DLL'
  *
  * PARAMS
@@ -193 +744 @@
 RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi)
 {
+    TRACE("\n");
+
     if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) {
 
@@ -219 +772 @@
 {
     WNDCLASSA wndClass;
+
+    TRACE("\n");
 
     ZeroMemory(&wndClass, sizeof(WNDCLASSA));
@@ -227 +782 @@
     wndClass.hCursor = LoadCursorA(0, IDC_ARROWA);
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
-    wndClass.lpszClassName = RICHEDIT_CLASS10A;//WC_RICHED32A;
+    wndClass.lpszClassName = RICHEDIT_CLASS10A; /* WC_RICHED32A; */
 
     RegisterClassA (&wndClass);
@@ -244 +799 @@
 VOID RICHED32_Unregister(void)
 {
+    TRACE("\n");
+
     UnregisterClassA(RICHEDIT_CLASS10A, (HINSTANCE)NULL);
 }
+
+INT RICHEDIT_GetTextRange(HWND hwnd,TEXTRANGEA *tr)
+{
+    UINT alloc_size, text_size, range_size;
+    char *text;
+
+    TRACE("start: 0x%x stop: 0x%x\n",(INT)tr->chrg.cpMin,(INT)tr->chrg.cpMax);
+
+    if (!(alloc_size = SendMessageA(hwnd,WM_GETTEXTLENGTH,0,0))) return FALSE;
+    if (!(text = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (alloc_size+1))))
+                return FALSE;
+    text_size = SendMessageA(hwnd,WM_GETTEXT,alloc_size,(INT)text);
+
+    if (text_size > tr->chrg.cpMin)
+    {
+       range_size = (text_size> tr->chrg.cpMax) ? (tr->chrg.cpMax - tr->chrg.cpMin) : (text_size - tr->chrg.cpMin);
+       TRACE("EditText: %.30s ...\n",text+tr->chrg.cpMin);
+       memcpy(tr->lpstrText,text+tr->chrg.cpMin,range_size);
+    }
+    else range_size = 0;
+    HeapFree(GetProcessHeap(), 0, text);
+
+    return range_size;
+}
+
+INT RICHEDIT_GetSelText(HWND hwnd,LPSTR lpstrBuffer)
+{
+    TEXTRANGEA textrange;
+
+    textrange.lpstrText = lpstrBuffer;
+    SendMessageA(hwnd,EM_GETSEL,(INT)&textrange.chrg.cpMin,(INT)&textrange.chrg.cpMax);
+    return RICHEDIT_GetTextRange(hwnd,&textrange);
+}

trunk/src/riched32/rtf.h

@@ -3 +3 @@
 
 #include <stdio.h>
-#include <windows.h>
-#include <richedit.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "richedit.h"
+
 void RTFSetEditStream(EDITSTREAM *es);
 
@@ -428 +433 @@
 extern int      rtfMinor;               /* token minor number */
 extern int      rtfParam;               /* control symbol parameter */
+extern int      rtfFormat;              /* either SF_RTF or SF_TEXT */
 
 # ifdef THINK_C
@@ -1421 +1427 @@
 char            *RTFStrSave ();
 void            RTFFree ();
-int             RTFCharToHex ();
+int             RTFCharToHex (char);
 int             RTFHexToChar ();
 void            RTFSetMsgProc ();

trunk/src/riched32/stdcharnames.h

@@ +1 @@
+static char     *stdCharName[] =
+{
         "nothing",
         "space",
@@ -351 +353 @@
         "mathequal",
         "mathtilde",
+        (char *) NULL
+};

trunk/src/riched32/text-writer.c

@@ -1 @@
-/* $Id: text-writer.c,v 1.2 2000-08-02 14:58:40 bird Exp $ */
 /*
  * text-writer -- RTF-to-text translation writer code.
@@ -38 +37 @@
  */
 
-# include       <stdio.h>
-
-# include       "rtf.h"
-# include       "rtf2text.h"
-# include       "charlist.h"
+#include <stdio.h>
+
+#include "rtf.h"
+#include "rtf2text.h"
+#include "charlist.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
 static void     TextClass ();
@@ -63 +65 @@
    /* we require one more for the '\0'                          */
 
+   TRACE("\n");
 
    if(nBufferSize < charlist.nCount + 1) {
@@ -121 +124 @@
 char    buf[rtfBufSiz];
 
-        if (rtfMinor != rtfSC_nothing)
+        TRACE("\n");
+
+        if (rtfFormat == SF_TEXT)
+                PutLitChar (rtfMajor);
+        else if (rtfMinor != rtfSC_nothing)
                 PutStdChar (rtfMinor);
         else
@@ -137 +144 @@
 ControlClass ()
 {
+        TRACE("\n");
         switch (rtfMajor)
         {
@@ -158 +166 @@
 Destination ()
 {
+
+        TRACE("\n");
+
         switch (rtfMinor)
         {
@@ -187 +198 @@
 void SpecialChar ()
 {
+
+        TRACE("\n");
+
         switch (rtfMinor)
         {
@@ -251 +265 @@
                 RTFPanic ("Unknown character code, logic error\n");
 */
+        TRACE("\n");
+
         oStr = outMap[stdCode];
         if (oStr == (char *) NULL)      /* no output sequence in map */

trunk/src/riched32/text_map.h

@@ -1 +1 @@
 /*
  *  Output sequence map for rtf2text
- * 
+ *
  *  Field 1 is the standard character name.  Field 2 is the output sequence
  *  to produce for that character.
- * 
+ *
  *  The output sequence is simply a string of characters.  If it contains
  *  whitespace, it may be quoted.  If it contains quotes, it may be quoted
  *  with a different quote character.
- * 
+ *
  *  characters in ASCII range (32-127
  */