Sync to Wine-20050524:

Alexandre Julliard <julliard@winehq.org>
- Added rules for building import libraries in the individual dll
  makefiles, and added support for building a .def.a static import
  library too.
Vincent Beron <vberon@mecano.gme.usherb.ca>
- Provide minimal API documentation in advapi/eventlog.c to silence some
  winapi_check output.
- Move around functions in riched20, richedit and rpcrt4 to achieve the
  same goal.

svn path=/trunk/; revision=15579

diff --git a/reactos/lib/richedit/Makefile.in b/reactos/lib/richedit/Makefile.in
index d8d709e..0364e7e 100644 (file)
--- a/reactos/lib/richedit/Makefile.in
+++ b/reactos/lib/richedit/Makefile.in
@@ -3,6 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@\r
 VPATH     = @srcdir@\r
 MODULE    = riched32.dll\r
+IMPORTLIB = libriched32.$(IMPLIBEXT)\r
 IMPORTS   = riched20 user32 kernel32\r
 \r
 C_SRCS = \\r

diff --git a/reactos/lib/richedit/richedit.c b/reactos/lib/richedit/richedit.c
index e0d5616..93dfec4 100644 (file)
--- a/reactos/lib/richedit/richedit.c
+++ b/reactos/lib/richedit/richedit.c
@@ -40,26 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 extern LRESULT WINAPI RichEdit10ANSIWndProc(HWND, UINT, WPARAM, LPARAM);\r
 \r
 \r
-/***********************************************************************\r
- * DllGetVersion [RICHED32.2]\r
- *\r
- * Retrieves version information\r
- */\r
-HRESULT WINAPI RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi)\r
-{\r
-    TRACE("\n");\r
-\r
-    if (pdvi->cbSize != sizeof(DLLVERSIONINFO))\r
-       return E_INVALIDARG;\r
-\r
-    pdvi->dwMajorVersion = 4;\r
-    pdvi->dwMinorVersion = 0;\r
-    pdvi->dwBuildNumber = 0;\r
-    pdvi->dwPlatformID = 0;\r
-\r
-    return S_OK;\r
-}\r
-\r
 /* Unregisters the window class. */\r
 static BOOL RICHED32_Unregister(void)\r
 {\r
@@ -104,3 +84,23 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     }\r
     return TRUE;\r
 }\r
+\r
+/***********************************************************************\r
+ * DllGetVersion [RICHED32.2]\r
+ *\r
+ * Retrieves version information\r
+ */\r
+HRESULT WINAPI RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi)\r
+{\r
+    TRACE("\n");\r
+\r
+    if (pdvi->cbSize != sizeof(DLLVERSIONINFO))\r
+       return E_INVALIDARG;\r
+\r
+    pdvi->dwMajorVersion = 4;\r
+    pdvi->dwMinorVersion = 0;\r
+    pdvi->dwBuildNumber = 0;\r
+    pdvi->dwPlatformID = 0;\r
+\r
+    return S_OK;\r
+}\r