Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-08 19:27:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32SS]

Browse source 
- Do not link gdi32.dll and user32.dll to msvcrt

svn path=/trunk/; revision=57675
This commit is contained in:
Jérôme Gardou 2012-11-05 20:20:49 +00:00
parent d23b82a133
commit e557a51d3e
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/win32ss/gdi/gdi32/CMakeLists.txt
View file

@ -48,14 +48,17 @@ list(APPEND SOURCE
add_library(gdi32 SHARED ${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 target_link_libraries(gdi32
win32ksys win32ksys
dxguid dxguid
${PSEH_LIB}) ${PSEH_LIB})
add_importlibs(gdi32 user32 advapi32 msvcrt kernel32 ntdll) add_importlibs(gdi32 user32 advapi32 kernel32 ntdll)
add_pch(gdi32 include/precomp.h) add_pch(gdi32 include/precomp.h)
add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all) add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all)

7
reactos/win32ss/user/user32/CMakeLists.txt
View file

@ -71,7 +71,10 @@ else()
endif() endif()
add_library(user32 SHARED ${SOURCE}) add_library(user32 SHARED ${SOURCE})
set_module_type(user32 win32dll UNICODE) set_module_type(user32
win32dll
ENTRYPOINT DllMain 12
UNICODE)
target_link_libraries(user32 target_link_libraries(user32
user32_wsprintf user32_wsprintf
@ -80,7 +83,7 @@ target_link_libraries(user32
${PSEH_LIB}) ${PSEH_LIB})
add_delay_importlibs(user32 imm32 usp10) 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_pch(user32 include/user32.h)
add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all)

4
reactos/win32ss/user/user32/windows/dialog.c
View file

@ -2162,7 +2162,7 @@ GetDlgItemInt(
result = strtol( str, &endptr, 10 ); result = strtol( str, &endptr, 10 );
if (!endptr || (endptr == str)) /* Conversion was unsuccessful */ if (!endptr || (endptr == str)) /* Conversion was unsuccessful */
return 0; return 0;
if (((result == LONG_MIN) || (result == LONG_MAX)) && (errno == ERANGE) ) if (((result == LONG_MIN) || (result == LONG_MAX)))
return 0; return 0;
} }
else else
@ -2170,7 +2170,7 @@ GetDlgItemInt(
result = strtoul( str, &endptr, 10 ); result = strtoul( str, &endptr, 10 );
if (!endptr || (endptr == str)) /* Conversion was unsuccessful */ if (!endptr || (endptr == str)) /* Conversion was unsuccessful */
return 0; return 0;
if ((result == ULONG_MAX) && (errno == ERANGE) ) return 0; if (result == ULONG_MAX) return 0;
} }
if (lpTranslated) *lpTranslated = TRUE; if (lpTranslated) *lpTranslated = TRUE;
return (UINT)result; return (UINT)result;