From: Jérôme Gardou <jerome.gardou@reactos.org>
Date: Mon, 5 Nov 2012 20:20:49 +0000 (+0000)
Subject: [WIN32SS]
X-Git-Tag: backups/ros-csrss@60644~120^2~38
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=e557a51d3ec938c79b074f050505f53eebc9a16f

[WIN32SS]
- Do not link gdi32.dll and user32.dll to msvcrt

svn path=/trunk/; revision=57675
---

diff --git a/reactos/win32ss/gdi/gdi32/CMakeLists.txt b/reactos/win32ss/gdi/gdi32/CMakeLists.txt
index 184f81f64cf..0e4ba75bb2c 100644
--- a/reactos/win32ss/gdi/gdi32/CMakeLists.txt
+++ b/reactos/win32ss/gdi/gdi32/CMakeLists.txt
@@ -48,14 +48,17 @@ list(APPEND SOURCE
 
 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)
 
diff --git a/reactos/win32ss/user/user32/CMakeLists.txt b/reactos/win32ss/user/user32/CMakeLists.txt
index 8c5930d14a9..83801b1219c 100644
--- a/reactos/win32ss/user/user32/CMakeLists.txt
+++ b/reactos/win32ss/user/user32/CMakeLists.txt
@@ -71,7 +71,10 @@ else()
 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 @@ target_link_libraries(user32
     ${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)
 
diff --git a/reactos/win32ss/user/user32/windows/dialog.c b/reactos/win32ss/user/user32/windows/dialog.c
index 1ce55fd6f3a..0df3dd3b930 100644
--- a/reactos/win32ss/user/user32/windows/dialog.c
+++ b/reactos/win32ss/user/user32/windows/dialog.c
@@ -2162,7 +2162,7 @@ GetDlgItemInt(
         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 @@ GetDlgItemInt(
         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;