Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 17:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update of richedit to Wine 20030911 version

Browse source 
svn path=/trunk/; revision=6115
This commit is contained in:
Filip Navara 2003-09-22 06:11:49 +00:00
parent 19aeb83a4b
commit cb74b26689
7 changed files with 13 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/lib/richedit/Makefile
View file

@ -7,9 +7,9 @@ TARGET_NAME = riched32
TARGET_BASE = 0x76340000 TARGET_BASE = 0x76340000
# require os code to explicitly request A/W version of structs/functions # require os code to explicitly request A/W version of structs/functions
TARGET_CFLAGS += -include "windows.h" -DIDC_ARROWA=IDC_ARROW -DWM_ALTTABACTIVE=0x0029 -D_DISABLE_TIDENTS -D__USE_W32API TARGET_CFLAGS += -DWM_ALTTABACTIVE=0x0029 -D_DISABLE_TIDENTS -D__USE_W32API
TARGET_SDKLIBS = ntdll.a TARGET_SDKLIBS = ntdll.a winedbgc.a
TARGET_OBJECTS = charlist.o reader.o richedit.o text-writer.o TARGET_OBJECTS = charlist.o reader.o richedit.o text-writer.o

9
reactos/lib/richedit/charlist.c
View file

@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stddef.h> #include <stddef.h>
@ -28,17 +29,9 @@
#include "charlist.h" #include "charlist.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "debug.h"
#if 0
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(richedit); WINE_DEFAULT_DEBUG_CHANNEL(richedit);
#else
#define TRACE DPRINT
#define WARN DPRINT
#define FIXME DPRINT
#endif
extern HANDLE RICHED32_hHeap; extern HANDLE RICHED32_hHeap;

12
reactos/lib/richedit/reader.c
View file

@ -64,17 +64,9 @@
#include "charlist.h" #include "charlist.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "debug.h"
#if 0
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(richedit); WINE_DEFAULT_DEBUG_CHANNEL(richedit);
#else
#define TRACE DPRINT
#define WARN DPRINT
#define FIXME DPRINT
#endif
extern HANDLE RICHED32_hHeap; extern HANDLE RICHED32_hHeap;
@ -2769,7 +2761,7 @@ FILE *RTFOpenLibFile (char *file, char *mode)
static void DefaultMsgProc(char *s) static void DefaultMsgProc(char *s)
{ {
DPRINT( "%s", s); MESSAGE( "%s", s);
} }
@ -2806,7 +2798,7 @@ char buf[rtfBufSiz];
static void DefaultPanicProc(char *s) static void DefaultPanicProc(char *s)
{ {
DPRINT( "%s", s); MESSAGE( "%s", s);
/*exit (1);*/ /*exit (1);*/
} }

5
reactos/lib/richedit/riched32.h
View file

@ -22,12 +22,13 @@
#ifndef __WINE_RICHED32_H #ifndef __WINE_RICHED32_H
#define __WINE_RICHED32_H #define __WINE_RICHED32_H
#include <stdarg.h>
#include "windef.h" #include "windef.h"
#include "winbase.h"
#include "winuser.h" #include "winuser.h"
#include "richedit.h" #include "richedit.h"
#define NOWINEDEBUG 1
extern VOID RICHED32_Register (VOID); extern VOID RICHED32_Register (VOID);
extern VOID RICHED32_Unregister (VOID); extern VOID RICHED32_Unregister (VOID);

15
reactos/lib/richedit/richedit.c
View file

@ -22,6 +22,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <stdarg.h>
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
@ -36,23 +37,15 @@
#include "rtf.h" #include "rtf.h"
#include "rtf2text.h" #include "rtf2text.h"
#include "debug.h"
#if 0
#include "wine/debug.h" #include "wine/debug.h"
#define ID_EDIT 1
WINE_DEFAULT_DEBUG_CHANNEL(richedit); WINE_DEFAULT_DEBUG_CHANNEL(richedit);
#else
#define TRACE DPRINT
#define WARN DPRINT
#define FIXME DPRINT
#endif
HANDLE RICHED32_hHeap = NULL; HANDLE RICHED32_hHeap = NULL;
/* LPSTR RICHED32_aSubclass = NULL; */ /* LPSTR RICHED32_aSubclass = NULL; */
#define ID_EDIT 1
#define TRACE_EDIT_MSG32(str) \ #define TRACE_EDIT_MSG32(str) \
TRACE(\ TRACE(\
"32 bit : " str ": hwnd=%p, wParam=%08x, lParam=%08x\n"\ "32 bit : " str ": hwnd=%p, wParam=%08x, lParam=%08x\n"\
@ -810,7 +803,7 @@ VOID RICHED32_Register(void)
wndClass.lpfnWndProc = (WNDPROC)RICHED32_WindowProc; wndClass.lpfnWndProc = (WNDPROC)RICHED32_WindowProc;
wndClass.cbClsExtra = 0; wndClass.cbClsExtra = 0;
wndClass.cbWndExtra = 0; /*(sizeof(RICHED32_INFO *);*/ wndClass.cbWndExtra = 0; /*(sizeof(RICHED32_INFO *);*/
wndClass.hCursor = LoadCursorA(0, IDC_ARROWA); wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
wndClass.lpszClassName = RICHEDIT_CLASS10A; /* WC_RICHED32A; */ wndClass.lpszClassName = RICHEDIT_CLASS10A; /* WC_RICHED32A; */

1
reactos/lib/richedit/rtf.h
View file

@ -1,6 +1,7 @@
#ifndef _RTF #ifndef _RTF
#define _RTF #define _RTF
#include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include "windef.h" #include "windef.h"

8
reactos/lib/richedit/text-writer.c
View file

@ -41,17 +41,9 @@
#include "rtf.h" #include "rtf.h"
#include "rtf2text.h" #include "rtf2text.h"
#include "charlist.h" #include "charlist.h"
#include "debug.h"
#if 0
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(richedit); WINE_DEFAULT_DEBUG_CHANNEL(richedit);
#else
#define TRACE DPRINT
#define WARN DPRINT
#define FIXME DPRINT
#endif
static void TextClass (); static void TextClass ();
static void ControlClass (); static void ControlClass ();