riched20 and test app
Krzysztof Foltman
kfoltman at portal.onet.pl
Mon Feb 28 08:06:14 CST 2005
This is an attempt at starting a RichEdit 2.0 clone, plus a test app for
it (which I, for some reason, decided to call Wine WordPad).
It lacks most essential functionality, and source formatting is not
exactly standard, but it has enough functionality to make a couple of
Wine developers convince me to release it now. Or weeks ago.
The test app uses the Mike McCormack's test snippet to fill the control
with some fancy formatted text.
Hope the patch is OK. Adding new DLL's and EXE's isn't an easy process.
Krzysztof
-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.340
diff -u -r1.340 configure.ac
--- configure.ac 26 Feb 2005 17:43:50 -0000 1.340
+++ configure.ac 28 Feb 2005 13:40:54 -0000
@@ -1633,6 +1633,7 @@
dlls/quartz/Makefile
dlls/quartz/tests/Makefile
dlls/rasapi32/Makefile
+dlls/riched20/Makefile
dlls/richedit/Makefile
dlls/rpcrt4/Makefile
dlls/rpcrt4/tests/Makefile
@@ -1748,6 +1749,7 @@
programs/winevdm/Makefile
programs/winhelp/Makefile
programs/winver/Makefile
+programs/wordpad/Makefile
server/Makefile
tools/Makefile
tools/widl/Makefile
Index: dlls/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/Makefile.in,v
retrieving revision 1.232
diff -u -r1.232 Makefile.in
--- dlls/Makefile.in 28 Jan 2005 14:13:08 -0000 1.232
+++ dlls/Makefile.in 28 Feb 2005 13:40:54 -0000
@@ -108,6 +108,7 @@
qcap \
quartz \
rasapi32 \
+ riched20 \
richedit \
rpcrt4 \
rsabase \
@@ -351,6 +352,7 @@
qcap.dll.so \
quartz.dll.so \
rasapi32.dll.so \
+ riched20.dll.so \
riched32.dll.so \
rpcrt4.dll.so \
rsabase.dll.so \
@@ -781,6 +783,9 @@
rasapi16.dll.so : rasapi32.dll.so
$(RM) $@ && $(LN_S) rasapi32.dll.so $@
+riched20.dll.so: riched20/riched20.dll.so
+ $(RM) $@ && $(LN_S) riched20/riched20.dll.so $@
+
riched32.dll.so: richedit/riched32.dll.so
$(RM) $@ && $(LN_S) richedit/riched32.dll.so $@
@@ -1092,6 +1097,7 @@
libqcap.$(IMPLIBEXT) \
libquartz.$(IMPLIBEXT) \
librasapi32.$(IMPLIBEXT) \
+ libriched20.$(IMPLIBEXT) \
libriched32.$(IMPLIBEXT) \
librpcrt4.$(IMPLIBEXT) \
librsabase.$(IMPLIBEXT) \
@@ -1595,6 +1601,11 @@
libriched32.a: richedit/riched32.spec.def
$(DLLTOOL) -k -l $@ -d richedit/riched32.spec.def
+libriched20.def: riched20/riched20.spec.def
+ $(RM) $@ && $(LN_S) riched20/riched20.spec.def $@
+libriched20.a: riched20/riched20.spec.def
+ $(DLLTOOL) -k -l $@ -d riched20/riched20.spec.def
+
librpcrt4.def: rpcrt4/rpcrt4.spec.def
$(RM) $@ && $(LN_S) rpcrt4/rpcrt4.spec.def $@
librpcrt4.a: rpcrt4/rpcrt4.spec.def
@@ -1880,6 +1891,7 @@
qcap/qcap.spec.def: $(WINEBUILD)
quartz/quartz.spec.def: $(WINEBUILD)
rasapi32/rasapi32.spec.def: $(WINEBUILD)
+riched20/riched20.spec.def: $(WINEBUILD)
richedit/riched32.spec.def: $(WINEBUILD)
rpcrt4/rpcrt4.spec.def: $(WINEBUILD)
rsabase/rsabase.spec.def: $(WINEBUILD)
@@ -2032,6 +2044,7 @@
qcap/qcap.dll.so: qcap
quartz/quartz.dll.so: quartz
rasapi32/rasapi32.dll.so: rasapi32
+riched20/riched20.dll.so: riched20
richedit/riched32.dll.so: richedit
rpcrt4/rpcrt4.dll.so: rpcrt4
rsabase/rsabase.dll.so: rsabase
Index: include/richedit.h
===================================================================
RCS file: /home/wine/wine/include/richedit.h,v
retrieving revision 1.20
diff -u -r1.20 richedit.h
--- include/richedit.h 18 Oct 2004 22:28:21 -0000 1.20
+++ include/richedit.h 28 Feb 2005 13:40:57 -0000
@@ -284,6 +284,7 @@
#define CFM_KERNING 0x00100000
#define CFM_SPACING 0x00200000
#define CFM_WEIGHT 0x00400000
+#define CFM_UNDERLINETYPE 0x00800000
#define CFM_LCID 0x02000000
#define CFM_BACKCOLOR 0x04000000
#define CFM_CHARSET 0x08000000
@@ -313,6 +314,7 @@
#define CFE_IMPRINT CFM_IMPRINT
#define CFE_DISABLED CFM_DISABLED
#define CFE_REVISED CFM_REVISED
+#define CFE_AUTOBACKCOLOR CFM_BACKCOLOR
#define CFU_CF1UNDERLINE 0xFF
#define CFU_INVERT 0xFE
@@ -488,6 +490,25 @@
LONG rgxTabs[MAX_TAB_STOPS];
} PARAFORMAT;
+typedef struct _paraformat2 {
+ UINT cbSize;
+ DWORD dwMask;
+ WORD wNumbering;
+ WORD wEffects;
+ LONG dxStartIndent;
+ LONG dxRightIndent;
+ LONG dxOffset;
+ WORD wAlignment;
+ SHORT cTabCount;
+ LONG rgxTabs[MAX_TAB_STOPS];
+ LONG dySpaceBefore, dySpaceAfter, dyLineSpacing;
+ SHORT sStyle;
+ BYTE bLineSpacingRule, bOutlineLevel;
+ WORD wShadingWeight, wShadingStyle;
+ WORD wNumberingStart, wNumberingStyle, wNumberingTab;
+ WORD wBorderSpace, wBorderWidth, wBorders;
+} PARAFORMAT2;
+
typedef struct _selchange {
NMHDR nmhdr;
CHARRANGE chrg;
Index: programs/Makefile.in
===================================================================
RCS file: /home/wine/wine/programs/Makefile.in,v
retrieving revision 1.46
diff -u -r1.46 Makefile.in
--- programs/Makefile.in 11 Aug 2004 20:59:09 -0000 1.46
+++ programs/Makefile.in 28 Feb 2005 13:40:57 -0000
@@ -35,7 +35,8 @@
winetest \
winevdm \
winhelp \
- winver
+ winver \
+ wordpad
# Sub-directories to run make install into
INSTALLSUBDIRS = \
@@ -66,7 +67,8 @@
winetest \
winevdm \
winhelp \
- winver
+ winver \
+ wordpad
# Programs to install in bin directory
INSTALLPROGS = \
@@ -84,7 +86,8 @@
winefile \
winemine \
winepath \
- winhelp
+ winhelp \
+ wordpad
# Symlinks to apps that we want to run from inside the source tree
SYMLINKS = \
@@ -119,7 +122,8 @@
winetest.exe$(DLLEXT) \
winevdm.exe$(DLLEXT) \
winhelp.exe$(DLLEXT) \
- winver.exe$(DLLEXT)
+ winver.exe$(DLLEXT) \
+ wordpad.exe$(DLLEXT)
@MAKE_RULES@
@@ -260,6 +264,9 @@
winver.exe$(DLLEXT): winver/winver.exe$(DLLEXT)
$(RM) $@ && $(LN_S) winver/winver.exe$(DLLEXT) $@
+wordpad.exe$(DLLEXT): wordpad/wordpad.exe$(DLLEXT)
+ $(RM) $@ && $(LN_S) wordpad/wordpad.exe$(DLLEXT) $@
+
avitools/aviinfo.exe$(DLLEXT): avitools
avitools/aviplay.exe$(DLLEXT): avitools
clock/clock.exe$(DLLEXT): clock
@@ -292,5 +299,6 @@
winevdm/winevdm.exe$(DLLEXT): winevdm
winhelp/winhelp.exe$(DLLEXT): winhelp
winver/winver.exe$(DLLEXT): winver
+wordpad/wordpad.exe$(DLLEXT): wordpad
### Dependencies:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: riched20wp.tar.gz
Type: application/gzip
Size: 44404 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20050228/2d05bca5/riched20wp.tar.bin
More information about the wine-patches
mailing list