From: Gé van Geldorp <ge@gse.nl>
Date: Sat, 28 May 2005 14:42:07 +0000 (+0000)
Subject: Sync to Wine-20050524:
X-Git-Tag: backups/new_headers@23355^2~30
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=0474d63d02ecf3758bc3fa712f7ae62159c3ec3c

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 d8d709e3386..0364e7e393b 100644
--- a/reactos/lib/richedit/Makefile.in
+++ b/reactos/lib/richedit/Makefile.in
@@ -3,6 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched32.dll
+IMPORTLIB = libriched32.$(IMPLIBEXT)
 IMPORTS   = riched20 user32 kernel32
 
 C_SRCS = \
diff --git a/reactos/lib/richedit/richedit.c b/reactos/lib/richedit/richedit.c
index e0d56167ea3..93dfec4bd89 100644
--- 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);
 
 
-/***********************************************************************
- * DllGetVersion [RICHED32.2]
- *
- * Retrieves version information
- */
-HRESULT WINAPI RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi)
-{
-    TRACE("\n");
-
-    if (pdvi->cbSize != sizeof(DLLVERSIONINFO))
-	return E_INVALIDARG;
-
-    pdvi->dwMajorVersion = 4;
-    pdvi->dwMinorVersion = 0;
-    pdvi->dwBuildNumber = 0;
-    pdvi->dwPlatformID = 0;
-
-    return S_OK;
-}
-
 /* Unregisters the window class. */
 static BOOL RICHED32_Unregister(void)
 {
@@ -104,3 +84,23 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     }
     return TRUE;
 }
+
+/***********************************************************************
+ * DllGetVersion [RICHED32.2]
+ *
+ * Retrieves version information
+ */
+HRESULT WINAPI RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi)
+{
+    TRACE("\n");
+
+    if (pdvi->cbSize != sizeof(DLLVERSIONINFO))
+	return E_INVALIDARG;
+
+    pdvi->dwMajorVersion = 4;
+    pdvi->dwMinorVersion = 0;
+    pdvi->dwBuildNumber = 0;
+    pdvi->dwPlatformID = 0;
+
+    return S_OK;
+}