[ros-diffs] [jgardou] 57675: [WIN32SS] - Do not link gdi32.dll and user32.dll to msvcrt

Author: jgardou
Date: Mon Nov  5 20:20:49 2012
New Revision: 57675

URL: http://svn.reactos.org/svn/reactos?rev=57675&view=rev
Log:
[WIN32SS]
- Do not link gdi32.dll and user32.dll to msvcrt

Modified:
    trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt
    trunk/reactos/win32ss/user/user32/CMakeLists.txt
    trunk/reactos/win32ss/user/user32/windows/dialog.c

Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/CMakeLis…
==============================================================================
--- trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] Mon Nov  5 20:20:49 2012
@@ -48,14 +48,17 @@
 
 add_library(gdi32 SHARED ${SOURCE})
 
-set_module_type(gdi32 win32dll UNICODE)
+set_module_type(gdi32
+    win32dll
+    ENTRYPOINT DllMain 12
+    UNICODE)
 
 target_link_libraries(gdi32
     win32ksys
     dxguid
     ${PSEH_LIB})
 
-add_importlibs(gdi32 user32 advapi32 msvcrt kernel32 ntdll)
+add_importlibs(gdi32 user32 advapi32 kernel32 ntdll)
 add_pch(gdi32 include/precomp.h)
 add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all)
 

Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL…
==============================================================================
--- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Mon Nov  5 20:20:49
2012
@@ -71,7 +71,10 @@
 endif()
 
 add_library(user32 SHARED ${SOURCE})
-set_module_type(user32 win32dll UNICODE)
+set_module_type(user32
+    win32dll
+    ENTRYPOINT DllMain 12
+    UNICODE)
 
 target_link_libraries(user32
     user32_wsprintf
@@ -80,7 +83,7 @@
     ${PSEH_LIB})
 
 add_delay_importlibs(user32 imm32 usp10)
-add_importlibs(user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_importlibs(user32 gdi32 advapi32 kernel32 ntdll)
 add_pch(user32 include/user32.h)
 add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all)
 

Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Mon Nov  5 20:20:49
2012
@@ -2162,7 +2162,7 @@
         result = strtol( str, &endptr, 10 );
         if (!endptr || (endptr == str))  /* Conversion was unsuccessful */
             return 0;
-        if (((result == LONG_MIN) || (result == LONG_MAX)) && (errno == ERANGE)
)
+        if (((result == LONG_MIN) || (result == LONG_MAX)))
             return 0;
     }
     else
@@ -2170,7 +2170,7 @@
         result = strtoul( str, &endptr, 10 );
         if (!endptr || (endptr == str))  /* Conversion was unsuccessful */
             return 0;
-        if ((result == ULONG_MAX) && (errno == ERANGE) ) return 0;
+        if (result == ULONG_MAX) return 0;
     }
     if (lpTranslated) *lpTranslated = TRUE;
     return (UINT)result;