[ros-diffs] [osiejka] 53038: [CSRSRV] - don't hack the dll entry point name. Patch by Thomas Faber

Author: osiejka
Date: Tue Aug  2 22:54:30 2011
New Revision: 53038

URL: http://svn.reactos.org/svn/reactos?rev=53038&view=rev
Log:
[CSRSRV]
- don't hack the dll entry point name. Patch by Thomas Faber

Modified:
    trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt
    trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild
    trunk/reactos/subsystems/win32/csrss/csrsrv/init.c

Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrs...
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] Tue Aug  2 22:54:30 2011
@@ -19,11 +19,6 @@

set_module_type(csrsrv nativedll)

-if(MSVC)
-set_entrypoint(csrsrv DllMainCRTStartup)
-endif()
-
-
 add_importlibs(csrsrv ntdll smdll)

add_pch(csrsrv srv.h)

Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrs...
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1] Tue Aug  2 22:54:30 2011
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="csrsrv" type="nativedll" installbase="system32" installname="csrsrv.dll">
+<module name="csrsrv" type="nativedll" entrypoint="DllMain@12" installbase="system32" installname="csrsrv.dll">
    <importlibrary definition="csrsrv.spec" />
    <include base="csrsrv">.</include>
    <include base="csrss">.</include>

Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrs...
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Tue Aug  2 22:54:30 2011
@@ -778,9 +778,9 @@

BOOL
 NTAPI
-DllMainCRTStartup(HANDLE hDll,
-                  DWORD dwReason,
-                  LPVOID lpReserved)
+DllMain(HANDLE hDll,
+        DWORD dwReason,
+        LPVOID lpReserved)
 {
     /* We don't do much */
     UNREFERENCED_PARAMETER(hDll);