[ros-diffs] [jimtabor] 54498: [User32] - Fix errno in dialog.c by linking to msvcrt with rbuild. Cmake does not have this issue, already links to msvcrt. Gdi32 rbuild does link to crtdll instead of msvcrt. Sho...

[jimtabor]

Author: jimtabor
Date: Fri Nov 25 22:18:20 2011
New Revision: 54498

URL: http://svn.reactos.org/svn/reactos?rev=54498&view=rev
Log:
[User32]
- Fix errno in dialog.c by linking to msvcrt with rbuild. Cmake does not have 
this issue, already links to msvcrt. Gdi32 rbuild does link to crtdll instead 
of msvcrt. Should we fix this too, before the Cmake switch over to see anything 
is different?

Modified:
    trunk/reactos/dll/win32/user32/user32.rbuild
    trunk/reactos/dll/win32/user32/windows/dialog.c

Modified: trunk/reactos/dll/win32/user32/user32.rbuild
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rbuild?rev=54498&r1=54497&r2=54498&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Fri Nov 25 
22:18:20 2011
@@ -1,4 +1,4 @@
-<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" 
installbase="system32" installname="user32.dll" unicode="yes" crt="dll">
+<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" 
installbase="system32" installname="user32.dll" unicode="yes" crt="msvcrt">
        <importlibrary definition="user32.pspec" />
        <include base="user32">.</include>
        <include base="user32">include</include>

Modified: trunk/reactos/dll/win32/user32/windows/dialog.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/dialog.c?rev=54498&r1=54497&r2=54498&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Fri Nov 25 
22:18:20 2011
@@ -2105,8 +2105,7 @@
         result = strtol( str, &endptr, 10 );
         if (!endptr || (endptr == str))  /* Conversion was unsuccessful */
             return 0;
-               /* FIXME: errno? */
-        if (((result == 0) || (result == 0xFFFFFFFF))/* && (errno == ERANGE) 
*/)
+        if (((result == LONG_MIN) || (result == LONG_MAX)) && (errno == 
ERANGE) )
             return 0;
     }
     else
@@ -2114,8 +2113,7 @@
         result = strtoul( str, &endptr, 10 );
         if (!endptr || (endptr == str))  /* Conversion was unsuccessful */
             return 0;
-               /* FIXME: errno? */
-        if ((result == 0xFFFFFFFF)/* && (errno == ERANGE) */) return 0;
+        if ((result == ULONG_MAX) && (errno == ERANGE) ) return 0;
     }
     if (lpTranslated) *lpTranslated = TRUE;
     return (UINT)result;