[ros-diffs] [gvg] 14091: Sync to Wine-20050310:

Sync to Wine-20050310:
import
Added: trunk/reactos/include/wine/richole.h
Added: trunk/reactos/lib/riched20/
Added: trunk/reactos/lib/riched20/Makefile.ros-template
Added: trunk/reactos/lib/riched20/makefile
Modified: trunk/reactos/lib/uuid/uuid.c
Modified: trunk/reactos/w32api/include/richedit.h
  _____  

Added: trunk/reactos/include/wine/richole.h
--- trunk/reactos/include/wine/richole.h	2005-03-15 09:01:28 UTC
(rev 14090)
+++ trunk/reactos/include/wine/richole.h	2005-03-15 09:04:29 UTC
(rev 14091)
@@ -0,0 +1,40 @@

+/*
+ * Compatibility header
+ *
+ * This header is wrapper to allow compilation of Wine DLLs under
ReactOS
+ * build system. It contains definitions commonly refered to as
Wineisms
+ * and definitions that are missing in w32api.
+ */
+
+#include <richedit.h>
+
+#include_next <richole.h>
+
+#ifndef WINE_RICHOLE_H_INCLUDED
+#define WINE_RICHOLE_H_INCLUDED
+
+#ifdef COBJMACROS
+/*** IUnknown methods ***/
+#define IRichEditOle_QueryInterface(p,a,b)
(p)->lpVtbl->QueryInterface(p,a,b)
+#define IRichEditOle_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IRichEditOle_Release(p) (p)->lpVtbl->Release(p)
+/*** IRichEditOle methods ***/
+#define IRichEditOle_GetClientSite(p,a) (p)->lpVtbl->GetClientSite(p,a)
+#define IRichEditOle_GetObjectCount(p) (p)->lpVtbl->GetObjectCount(p)
+#define IRichEditOle_GetLinkCount(p) (p)->lpVtbl->GetLinkCount(p)
+#define IRichEditOle_GetObject(p,a,b,c) (p)->lpVtbl->GetObject(p,a,b,c)
+#define IRichEditOle_InsertObject(p,a) (p)->lpVtbl->InsertObject(p,a)
+#define IRichEditOle_ConvertObject(p,a,b,c)
(p)->lpVtbl->ConvertObject(p,a,b,c)
+#define IRichEditOle_ActivateAs(p,a,b) (p)->lpVtbl->ActivateAs(p,a,b)
+#define IRichEditOle_SetHostNames(p,a,b)
(p)->lpVtbl->SetHostNames(p,a,b)
+#define IRichEditOle_SetLinkAvailable(p,a,b)
(p)->lpVtbl->SetLinkAvailable(p,a,b)
+#define IRichEditOle_SetDvaspect(p,a,b) (p)->lpVtbl->SetDvaspect(p,a,b)
+#define IRichEditOle_HandsOffStorage(p,a)
(p)->lpVtbl->HandsOffStorage(p,a)
+#define IRichEditOle_SaveCompleted(p,a,b)
(p)->lpVtbl->SaveCompleted(p,a,b)
+#define IRichEditOle_InPlaceDeactivate(p)
(p)->lpVtbl->InPlaceDeactivate(p)
+#define IRichEditOle_ContextSensitiveHelp(p,a)
(p)->lpVtbl->ContextSensitiveHelp(p,a)
+#define IRichEditOle_GetClipboardData(p,a,b,c)
(p)->lpVtbl->GetClipboardData(p,a,b,c)
+#define IRichEditOle_ImportDataObject(p,a,b,c)
(p)->lpVtbl->ImportDataObject(p,a,b,c)
+#endif
+
+#endif /* WINE_RICHOLE_H_INCLUDED */
Property changes on: trunk/reactos/include/wine/richole.h
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native
  _____  

Copied: trunk/reactos/lib/riched20 (from rev 14090,
vendor/wine/dlls/riched20/current)
  _____  

Added: trunk/reactos/lib/riched20/Makefile.ros-template
--- vendor/wine/dlls/riched20/current/Makefile.ros-template
2005-03-15 09:01:28 UTC (rev 14090)
+++ trunk/reactos/lib/riched20/Makefile.ros-template	2005-03-15
09:04:29 UTC (rev 14091)
@@ -0,0 +1,19 @@

+# $Id$
+
+TARGET_NAME = riched20
+
+TARGET_OBJECTS = @C_SRCS@
+
+TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -D__WINESRC__
+
+TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a
+
+TARGET_BASE = $(TARGET_BASE_LIB_SETUPAPI)
+
+TARGET_NORC = yes
+
+default: all
+
+DEP_OBJECTS = $(TARGET_OBJECTS)
+
+include $(TOOLS_PATH)/depend.mk
Property changes on: trunk/reactos/lib/riched20/Makefile.ros-template
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native
  _____  

Added: trunk/reactos/lib/riched20/makefile
--- vendor/wine/dlls/riched20/current/makefile	2005-03-15 09:01:28 UTC
(rev 14090)
+++ trunk/reactos/lib/riched20/makefile	2005-03-15 09:04:29 UTC (rev
14091)
@@ -0,0 +1,9 @@

+# $Id: makefile 12852 2005-01-06 13:58:04Z mf $
+
+PATH_TO_TOP = ../..
+
+TARGET_TYPE = winedll
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
  _____  

Modified: trunk/reactos/lib/uuid/uuid.c
--- trunk/reactos/lib/uuid/uuid.c	2005-03-15 09:01:28 UTC (rev
14090)
+++ trunk/reactos/lib/uuid/uuid.c	2005-03-15 09:04:29 UTC (rev
14091)
@@ -81,6 +81,9 @@

 
DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x
97,0x08,0x00,0x2B,0x2C,0xF9,0xAE);
 
DEFINE_GUID(FMTID_UserDefinedProperties,0xD5CDD505,0x2E9C,0x101B,0x93,0x
97,0x08,0x00,0x2B,0x2C,0xF9,0xAE);
 
+DEFINE_GUID(IID_IRichEditOle,0x00020D00,0,0,0xC0,0,0,0,0,0,0,0x46);
+DEFINE_GUID(IID_IRichEditOleCallback,0x00020D03,0,0,0xC0,0,0,0,0,0,0,0x
46);
+
 DEFINE_OLEGUID(IID_StdOle,0x00020430,0,0);
 
 
DEFINE_GUID(CLSID_StdFont,0x0be35203,0x8f91,0x11ce,0x9d,0xe3,0x00,0xaa,0
x00,0x4b,0xb8,0x51);
  _____  

Modified: trunk/reactos/w32api/include/richedit.h
--- trunk/reactos/w32api/include/richedit.h	2005-03-15 09:01:28 UTC
(rev 14090)
+++ trunk/reactos/w32api/include/richedit.h	2005-03-15 09:04:29 UTC
(rev 14091)
@@ -29,8 +29,26 @@

 #define CFM_FACE	0x20000000
 #define CFM_OFFSET	0x10000000
 #define CFM_CHARSET	0x08000000
+#define CFM_BACKCOLOR	0x04000000
+#define CFM_LCID	0x02000000
+#define CFM_UNDERLINETYPE	0x00800000
+#define CFM_WEIGHT	0x00400000
+#define CFM_SPACING	0x00200000
+#define CFM_KERNING	0x00100000
+#define CFM_STYLE	0x00080000
+#define CFM_ANIMATION	0x00040000
 #define CFM_SUBSCRIPT	0x00030000
 #define CFM_SUPERSCRIPT	0x00030000
+#define CFM_REVAUTHOR	0x00008000
+#define CFM_REVISED	0x00004000
+#define CFM_DISABLED	0x00002000
+#define CFM_IMPRINT	0x00001000
+#define CFM_EMBOSS	0x00000800
+#define CFM_SHADOW	0x00000400
+#define CFM_OUTLINE	0x00000200
+#define CFM_HIDDEN	0x00000100
+#define CFM_ALLCAPS	0x00000080
+#define CFM_SMALLCAPS	0x00000040
 #define CFM_EFFECTS	(CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE |
CFM_COLOR | CFM_STRIKEOUT | CFE_PROTECTED | CFM_LINK)
 #define CFE_BOLD	1
 #define CFE_ITALIC	2
@@ -38,6 +56,7 @@
 #define CFE_STRIKEOUT	8
 #define CFE_PROTECTED	16
 #define CFE_AUTOCOLOR	0x40000000
+#define CFE_AUTOBACKCOLOR	0x04000000
 #define CFE_SUBSCRIPT	0x00010000
 #define CFE_SUPERSCRIPT	0x00020000
 #define IMF_FORCENONE	1