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. Modified: trunk/reactos/lib/richedit/Makefile.in Modified: trunk/reactos/lib/richedit/richedit.c _____
Modified: trunk/reactos/lib/richedit/Makefile.in --- trunk/reactos/lib/richedit/Makefile.in 2005-05-28 14:40:26 UTC (rev 15578) +++ trunk/reactos/lib/richedit/Makefile.in 2005-05-28 14:42:07 UTC (rev 15579) @@ -3,6 +3,7 @@
SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = riched32.dll +IMPORTLIB = libriched32.$(IMPLIBEXT) IMPORTS = riched20 user32 kernel32
C_SRCS = \ _____
Modified: trunk/reactos/lib/richedit/richedit.c --- trunk/reactos/lib/richedit/richedit.c 2005-05-28 14:40:26 UTC (rev 15578) +++ trunk/reactos/lib/richedit/richedit.c 2005-05-28 14:42:07 UTC (rev 15579) @@ -40,26 +40,6 @@
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 @@ } 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; +}