Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[tkreuzer] 51861: [CRT] Fix a bug in amd64 version of __chkstk_ms, noticed by Stefan

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 23 17:13:38 2011 New Revision: 51861 URL: http://svn.reactos.org/svn/reactos?rev=51861&view=rev Log: [CRT] Fix a bug in amd64 version of __chkstk_ms, noticed by Stefan Modified: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s Modified: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/c… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s [iso-8859-1] Mon May 23 17:13:38 2011 @@ -30,7 +30,7 @@ .l_MoreThanAPage: sub rcx, PAGE_SIZE /* yes, move pointer down 4k */ - or rcx, 0 /* probe there */ + or [rcx], 0 /* probe there */ sub rax, PAGE_SIZE /* decrement count */ cmp rax, PAGE_SIZE

13 years, 5 months

[tkreuzer] 51860: [CMAKE] - Create a new library msvcrtex, which will be automatically linked, when msvcrt is linked. This is yet a minimal version which replaces the different mingw libs. - Use pr...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 23 15:50:03 2011 New Revision: 51860 URL: http://svn.reactos.org/svn/reactos?rev=51860&view=rev Log: [CMAKE] - Create a new library msvcrtex, which will be automatically linked, when msvcrt is linked. This is yet a minimal version which replaces the different mingw libs. - Use proper unicode entrypoints - remove unneeded libcoldname.a Added: trunk/reactos/lib/sdk/crt/crt.cmake (with props) trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/ - copied from r51855, trunk/reactos/include/reactos/mingw-w64/ trunk/reactos/lib/sdk/crt/libcntpr.cmake (with props) trunk/reactos/lib/sdk/crt/misc/getopt.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/getopt.c trunk/reactos/lib/sdk/crt/moldname-msvcrt.def - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/moldname-msvcrt.def trunk/reactos/lib/sdk/crt/msvcrtex.cmake (with props) trunk/reactos/lib/sdk/crt/oldnames.cmake (with props) trunk/reactos/lib/sdk/crt/startup/ (with props) trunk/reactos/lib/sdk/crt/startup/_newmode.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/_newmode.c trunk/reactos/lib/sdk/crt/startup/atonexit.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/atonexit.c trunk/reactos/lib/sdk/crt/startup/charmax.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/charmax.c trunk/reactos/lib/sdk/crt/startup/cinitexe.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/cinitexe.c trunk/reactos/lib/sdk/crt/startup/crt0_c.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/crt0_c.c trunk/reactos/lib/sdk/crt/startup/crt0_w.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/crt0_w.c trunk/reactos/lib/sdk/crt/startup/crtexe.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/crtexe.c trunk/reactos/lib/sdk/crt/startup/dll_argv.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/dll_argv.c trunk/reactos/lib/sdk/crt/startup/dllargv.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/dllargv.c trunk/reactos/lib/sdk/crt/startup/gccmain.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/gccmain.c trunk/reactos/lib/sdk/crt/startup/gs_support.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/gs_support.c trunk/reactos/lib/sdk/crt/startup/merr.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/merr.c trunk/reactos/lib/sdk/crt/startup/mingw_helpers.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c trunk/reactos/lib/sdk/crt/startup/mscmain.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/mscmain.c trunk/reactos/lib/sdk/crt/startup/natstart.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/natstart.c trunk/reactos/lib/sdk/crt/startup/pseudo-reloc.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c trunk/reactos/lib/sdk/crt/startup/tlsmcrt.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/tlsmcrt.c trunk/reactos/lib/sdk/crt/startup/tlsmthread.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/tlsmthread.c trunk/reactos/lib/sdk/crt/startup/tlssup.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/tlssup.c trunk/reactos/lib/sdk/crt/startup/tlsthrd.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/tlsthrd.c trunk/reactos/lib/sdk/crt/startup/txtmode.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/txtmode.c trunk/reactos/lib/sdk/crt/startup/wcrtexe.c (with props) trunk/reactos/lib/sdk/crt/startup/wdllargv.c (with props) trunk/reactos/lib/sdk/crt/startup/wildcard.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/wildcard.c Removed: trunk/reactos/importlibs/libcoldname.a Modified: trunk/reactos/ (props changed) trunk/reactos/base/applications/charmap/CMakeLists.txt trunk/reactos/base/applications/games/solitaire/CMakeLists.txt trunk/reactos/base/applications/games/spider/CMakeLists.txt trunk/reactos/base/applications/network/telnet/CMakeLists.txt trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/gcc.cmake trunk/reactos/lib/3rdparty/CMakeLists.txt trunk/reactos/lib/sdk/crt/CMakeLists.txt Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 23 15:50:03 2011 @@ -1,3 +1,4 @@ +/branches/cmake-bringup:50484,50693,50719 /branches/header-work:45691-47721 /branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 /branches/reactx/reactos:49994-49995 Modified: trunk/reactos/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -17,6 +17,6 @@ set_module_type(charmap win32gui) -add_importlibs(charmap user32 gdi32 comctl32 kernel32 msvcrt) +add_importlibs(charmap msvcrt user32 gdi32 comctl32 kernel32) add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/games/solitaire/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -15,6 +15,6 @@ set_module_type(sol win32gui) -add_importlibs(sol advapi32 comctl32 user32 gdi32 kernel32 msvcrt) +add_importlibs(sol advapi32 comctl32 user32 gdi32 msvcrt kernel32) add_cd_file(TARGET sol DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/games/spider/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -15,6 +15,6 @@ set_module_type(spider win32gui) -add_importlibs(spider advapi32 comctl32 user32 gdi32 kernel32 msvcrt) +add_importlibs(spider advapi32 comctl32 user32 gdi32 msvcrt kernel32) add_cd_file(TARGET spider DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/telnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -28,5 +28,5 @@ telnet.rc) set_module_type(telnet win32cui) -add_importlibs(telnet ws2_32 user32 kernel32 msvcrt) +add_importlibs(telnet ws2_32 user32 msvcrt kernel32) add_cd_file(TARGET telnet DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -29,7 +29,7 @@ set_module_type(rapps win32gui) target_link_libraries(rapps uuid) -add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi kernel32 msvcrt ntdll) +add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi msvcrt kernel32 ntdll) add_dependencies(rapps rappsmsg) add_message_headers(rappsmsg.mc) add_cd_file(TARGET rapps DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/gcc.cmake?rev=51860&r1=518… ============================================================================== --- trunk/reactos/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/gcc.cmake [iso-8859-1] Mon May 23 15:50:03 2011 @@ -3,7 +3,7 @@ if(ARCH MATCHES i386) link_directories("${REACTOS_SOURCE_DIR}/importlibs") endif() -link_directories(${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) +link_directories(${REACTOS_BINARY_DIR}/lib/sdk/crt) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import") @@ -180,25 +180,20 @@ set_entrypoint(${MODULE} NtProcessStartup 4) elseif(${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) - set_entrypoint(${MODULE} WinMainCRTStartup) - if(NOT IS_UNICODE) - target_link_libraries(${MODULE} mingw_main) + if(IS_UNICODE) + set_entrypoint(${MODULE} wWinMainCRTStartup) else() - target_link_libraries(${MODULE} mingw_wmain) - endif(NOT IS_UNICODE) - target_link_libraries(${MODULE} mingw_common) + set_entrypoint(${MODULE} WinMainCRTStartup) + endif(IS_UNICODE) elseif(${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) - set_entrypoint(${MODULE} mainCRTStartup) - if(NOT IS_UNICODE) - target_link_libraries(${MODULE} mingw_main) + if(IS_UNICODE) + set_entrypoint(${MODULE} wmainCRTStartup) else() - target_link_libraries(${MODULE} mingw_wmain) - endif(NOT IS_UNICODE) - target_link_libraries(${MODULE} mingw_common) + set_entrypoint(${MODULE} mainCRTStartup) + endif(IS_UNICODE) elseif(${TYPE} MATCHES win32dll) set_entrypoint(${MODULE} DllMain 12) - target_link_libraries(${MODULE} mingw_dllmain mingw_common) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) else() @@ -206,11 +201,9 @@ endif() elseif(${TYPE} MATCHES win32ocx) set_entrypoint(${MODULE} DllMain 12) - target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") elseif(${TYPE} MATCHES cpl) set_entrypoint(${MODULE} DllMain 12) - target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") elseif(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys") @@ -271,6 +264,9 @@ macro(add_importlibs MODULE) add_dependency_node(${MODULE}) foreach(LIB ${ARGN}) + if ("${LIB}" MATCHES "msvcrt") + target_link_libraries(${MODULE} msvcrtex) + endif() target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.a) add_dependencies(${MODULE} lib${LIB}) add_dependency_edge(${MODULE} ${LIB}) Removed: trunk/reactos/importlibs/libcoldname.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libcoldname.a?r… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/CMakeLists.tx… ============================================================================== --- trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -10,6 +10,5 @@ add_subdirectory(libsamplerate) add_subdirectory(libwine) add_subdirectory(libxml2) -add_subdirectory(mingw) add_subdirectory(stlport) add_subdirectory(zlib) Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -3,618 +3,10 @@ add_definitions(-D_CRTBLD) -list(APPEND CRT_SOURCE - conio/cgets.c - conio/cputs.c - conio/getch.c - conio/getche.c - conio/kbhit.c - conio/putch.c - conio/ungetch.c - direct/chdir.c - direct/chdrive.c - direct/getcwd.c - direct/getdcwd.c - direct/getdfree.c - direct/getdrive.c - direct/mkdir.c - direct/rmdir.c - direct/wchdir.c - direct/wgetcwd.c - direct/wgetdcwd.c - direct/wmkdir.c - direct/wrmdir.c - except/abnorter.c - except/checkesp.c - except/cpp.c - except/cppexcept.c - except/except.c - except/matherr.c - except/xcptfil.c - float/chgsign.c - float/copysign.c - float/fpclass.c - float/fpecode.c - float/isnan.c - float/nafter.c - float/scalb.c - locale/locale.c - math/acos.c - math/adjust.c - math/asin.c - math/cabs.c - math/cosf.c - math/cosh.c - math/div.c - math/fdivbug.c - math/frexp.c - math/huge_val.c - math/hypot.c - math/ldiv.c - math/logf.c - math/modf.c - math/powf.c - math/rand.c - math/sqrtf.c - math/s_modf.c - math/sinf.c - math/sinh.c - math/tanh.c - mbstring/hanzen.c - mbstring/ischira.c - mbstring/iskana.c - mbstring/iskmoji.c - mbstring/iskpun.c - mbstring/islead.c - mbstring/islwr.c - mbstring/ismbal.c - mbstring/ismbaln.c - mbstring/ismbc.c - mbstring/ismbgra.c - mbstring/ismbkaln.c - mbstring/ismblead.c - mbstring/ismbpri.c - mbstring/ismbpun.c - mbstring/ismbtrl.c - mbstring/isuppr.c - mbstring/jistojms.c - mbstring/jmstojis.c - mbstring/mbbtype.c - mbstring/mbccpy.c - mbstring/mbclen.c - mbstring/mbscat.c - mbstring/mbschr.c - mbstring/mbscmp.c - mbstring/mbscoll.c - mbstring/mbscpy.c - mbstring/mbscspn.c - mbstring/mbsdec.c - mbstring/mbsdup.c - mbstring/mbsicmp.c - mbstring/mbsicoll.c - mbstring/mbsinc.c - mbstring/mbslen.c - mbstring/mbslwr.c - mbstring/mbsncat.c - mbstring/mbsnccnt.c - mbstring/mbsncmp.c - mbstring/mbsncoll.c - mbstring/mbsncpy.c - mbstring/mbsnextc.c - mbstring/mbsnicmp.c - mbstring/mbsnicoll.c - mbstring/mbsninc.c - mbstring/mbsnset.c - mbstring/mbspbrk.c - mbstring/mbsrchr.c - mbstring/mbsrev.c - mbstring/mbsset.c - mbstring/mbsspn.c - mbstring/mbsspnp.c - mbstring/mbsstr.c - mbstring/mbstok.c - mbstring/mbstrlen.c - mbstring/mbsupr.c - mem/memcmp.c - mem/memccpy.c - mem/memicmp.c - misc/amsg.c - misc/assert.c - misc/environ.c - misc/getargs.c - misc/i10output.c - misc/initterm.c - misc/lock.c - misc/purecall.c - misc/stubs.c - misc/tls.c - printf/_cprintf.c - printf/_snprintf.c - printf/_snwprintf.c - printf/_vcprintf.c - printf/_vsnprintf.c - printf/_vsnwprintf.c - printf/fprintf.c - printf/fwprintf.c - printf/printf.c - printf/sprintf.c - printf/streamout.c - printf/swprintf.c - printf/vfprintf.c - printf/vfwprintf.c - printf/vprintf.c - printf/vsprintf.c - printf/vswprintf.c - printf/vwprintf.c - printf/wprintf.c - printf/wstreamout.c - process/_cwait.c - process/_system.c - process/dll.c - process/process.c - process/procid.c - process/thread.c - process/threadid.c - process/threadx.c - process/wprocess.c - search/bsearch.c - search/lfind.c - search/lsearch.c - signal/signal.c - signal/xcptinfo.c - stdio/_flsbuf.c - stdio/_flswbuf.c - stdio/access.c - stdio/file.c - stdio/find.c - stdio/find64.c - stdio/findi64.c - stdio/fmode.c - stdio/lock_file.c - stdio/perror.c - stdio/popen.c - stdio/stat.c - stdio/stat64.c - stdio/waccess.c - stdio/wfind.c - stdio/wfind64.c - stdio/wfindi64.c - stdio/wpopen.c - stdio/wstat.c - stdio/wstat64.c - stdlib/_exit.c - stdlib/abort.c - stdlib/atexit.c - stdlib/ecvt.c - stdlib/errno.c - stdlib/fcvt.c - stdlib/fcvtbuf.c - stdlib/fullpath.c - stdlib/gcvt.c - stdlib/getenv.c - stdlib/makepath.c - stdlib/makepath_s.c - stdlib/mbtowc.c - stdlib/mbstowcs.c - stdlib/obsol.c - stdlib/putenv.c - stdlib/qsort.c - stdlib/rot.c - stdlib/senv.c - stdlib/swab.c - stdlib/wfulpath.c - stdlib/wputenv.c - stdlib/wsenv.c - stdlib/wmakpath.c - stdlib/wmakpath_s.c - string/atof.c - string/atoi.c - string/atoi64.c - string/atol.c - string/ctype.c - string/itoa.c - string/itow.c - string/lasttok.c - string/scanf.c - string/splitp.c - string/strcoll.c - string/strcspn.c - string/strdup.c - string/strerror.c - string/stricmp.c - string/string.c - string/strlwr.c - string/strncoll.c - string/strnicmp.c - string/strpbrk.c - string/strrev.c - string/strset.c - string/strspn.c - string/strstr.c - string/strtod.c - string/strtoi64.c - string/strtok.c - string/strtol.c - string/strtoul.c - string/strtoull.c - string/strupr.c - string/strxfrm.c - string/wcs.c - string/wcstol.c - string/wcstoul.c - string/wsplitp.c - string/wtoi.c - string/wtoi64.c - string/wtol.c - sys_stat/systime.c - time/asctime.c - time/clock.c - time/ctime32.c - time/ctime64.c - time/ctime.c - time/difftime32.c - time/difftime64.c - time/difftime.c - time/ftime32.c - time/ftime64.c - time/ftime.c - time/futime32.c - time/futime64.c - time/futime.c - time/gmtime.c - time/localtime32.c - time/localtime64.c - time/localtime.c - time/mktime.c - time/strdate.c - time/strftime.c - time/strtime.c - time/time32.c - time/time64.c - time/time.c - time/timezone.c - time/tzname.c - time/utime32.c - time/utime64.c - time/utime.c - time/wasctime.c - time/wcsftime.c - time/wctime32.c - time/wctime64.c - time/wctime.c - time/wstrdate.c - time/wstrtime.c - time/wutime32.c - time/wutime64.c - time/wutime.c - wstring/wcscoll.c - wstring/wcscspn.c - wstring/wcsicmp.c - wstring/wcslwr.c - wstring/wcsnicmp.c - wstring/wcsspn.c - wstring/wcsstr.c - wstring/wcstok.c - wstring/wcsupr.c - wstring/wcsxfrm.c - wstring/wlasttok.c - wine/heap.c - wine/undname.c) - -if(ARCH MATCHES i386) - list(APPEND CRT_SOURCE - except/i386/chkstk_asm.s - except/i386/prolog.s - except/i386/seh.s - except/i386/seh_prolog.s - except/i386/unwind.c - float/i386/clearfp.c - float/i386/cntrlfp.c - float/i386/fpreset.c - float/i386/logb.c - float/i386/statfp.c - setjmp/i386/setjmp.s) -elseif(ARCH MATCHES amd64) - list(APPEND CRT_SOURCE - except/amd64/chkstk_asm.s - except/amd64/seh.s - float/i386/clearfp.c - float/i386/cntrlfp.c - float/i386/fpreset.c - float/i386/logb.c - float/i386/statfp.c - setjmp/amd64/setjmp.s) -endif() - -if(ARCH MATCHES i386) - list(APPEND CRT_SOURCE - math/i386/alldiv_asm.s - math/i386/alldvrm_asm.s - math/i386/allmul_asm.s - math/i386/allrem_asm.s - math/i386/allshl_asm.s - math/i386/allshr_asm.s - math/i386/atan_asm.s - math/i386/aulldiv_asm.s - math/i386/aulldvrm_asm.s - math/i386/aullrem_asm.s - math/i386/aullshr_asm.s - math/i386/ceil_asm.s - math/i386/ceilf.S - math/i386/cos_asm.s - math/i386/fabs_asm.s - math/i386/floor_asm.s - math/i386/floorf.S - math/i386/ftol_asm.s - math/i386/ftol2_asm.s - math/i386/log_asm.s - math/i386/log10_asm.s - math/i386/pow_asm.s - math/i386/sin_asm.s - math/i386/sqrt_asm.s - math/i386/tan_asm.s - math/i386/atan2_asm.s - math/i386/ci.c - math/i386/exp_asm.s - math/i386/fmod_asm.s - math/i386/fmodf_asm.s - math/i386/ldexp.c - mem/i386/memchr_asm.s - mem/i386/memmove_asm.s - mem/i386/memset_asm.s - misc/i386/readcr4.S - string/i386/strcat_asm.s - string/i386/strchr_asm.s - string/i386/strcmp_asm.s - string/i386/strcpy_asm.s - string/i386/strlen_asm.s - string/i386/strncat_asm.s - string/i386/strncmp_asm.s - string/i386/strncpy_asm.s - string/i386/strnlen_asm.s - string/i386/strrchr_asm.s - string/i386/wcscat_asm.s - string/i386/wcschr_asm.s - string/i386/wcscmp_asm.s - string/i386/wcscpy_asm.s - string/i386/wcslen_asm.s - string/i386/wcsncat_asm.s - string/i386/wcsncmp_asm.s - string/i386/wcsncpy_asm.s - string/i386/wcsnlen_asm.s - string/i386/wcsrchr_asm.s) -else() - list(APPEND CRT_SOURCE - math/stubs.c - mem/memchr.c - mem/memcpy.c - mem/memmove.c - mem/memset.c - string/strcat.c - string/strchr.c - string/strcmp.c - string/strcpy.c - string/strlen.c - string/strncat.c - string/strncmp.c - string/strncpy.c - string/strnlen.c - string/strrchr.c - string/wcscat.c - string/wcschr.c - string/wcscmp.c - string/wcscpy.c - string/wcslen.c - string/wcsncat.c - string/wcsncmp.c - string/wcsncpy.c - string/wcsnlen.c - string/wcsrchr.c) -endif() - -if(ARCH MATCHES amd64) - list(APPEND CRT_SOURCE - math/cos.c - math/sin.c - math/amd64/alldiv.S - math/amd64/atan.S - math/amd64/atan2.S - math/amd64/ceil.S - math/amd64/ceilf.S - math/amd64/exp.S - math/amd64/fabs.S - math/amd64/floor.S - math/amd64/floorf.S - math/amd64/fmod.S - math/amd64/fmodf.S - math/amd64/ldexp.S - math/amd64/log.S - math/amd64/log10.S - math/amd64/pow.S - math/amd64/sqrt.S - math/amd64/sqrtf.S - math/amd64/tan.S) -endif() - -add_library(crt ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch ${CRT_SOURCE}) - -set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) -add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE}) -add_dependencies(crt psdk asm) - -list(APPEND LIBCNTPR_SOURCE - float/isnan.c - math/abs.c - math/div.c - math/labs.c - math/rand_nt.c - mbstring/mbstrlen.c - mem/memccpy.c - mem/memcmp.c - mem/memicmp.c - printf/_snprintf.c - printf/_snwprintf.c - printf/_vcprintf.c - printf/_vsnprintf.c - printf/_vsnwprintf.c - printf/sprintf.c - printf/streamout.c - printf/swprintf.c - printf/vprintf.c - printf/vsprintf.c - printf/vswprintf.c - printf/wstreamout.c - search/bsearch.c - search/lfind.c - stdlib/qsort.c - string/ctype.c - string/scanf.c - string/strcspn.c - string/stricmp.c - string/strnicmp.c - string/strlwr.c - string/strrev.c - string/strset.c - string/strstr.c - string/strupr.c - string/strpbrk.c - string/strspn.c - string/atoi64.c - string/atoi.c - string/atol.c - string/itoa.c - string/itow.c - string/mbstowcs_nt.c - string/splitp.c - string/strtol.c - string/strtoul.c - string/strtoull.c - string/wcs.c - string/wcstol.c - string/wcstombs_nt.c - string/wcstoul.c - string/wsplitp.c - string/wtoi64.c - string/wtoi.c - string/wtol.c - wstring/wcsicmp.c - wstring/wcslwr.c - wstring/wcsnicmp.c - wstring/wcsupr.c - wstring/wcscspn.c - wstring/wcsspn.c - wstring/wcsstr.c) - -if(ARCH MATCHES i386) - list(APPEND LIBCNTPR_SOURCE - except/i386/chkstk_asm.s - except/i386/seh.s - except/i386/seh_prolog.s - setjmp/i386/setjmp.s - math/i386/alldiv_asm.s - math/i386/alldvrm_asm.s - math/i386/allmul_asm.s - math/i386/allrem_asm.s - math/i386/allshl_asm.s - math/i386/allshr_asm.s - math/i386/atan_asm.s - math/i386/aulldiv_asm.s - math/i386/aulldvrm_asm.s - math/i386/aullrem_asm.s - math/i386/aullshr_asm.s - math/i386/ceil_asm.s - math/i386/cos_asm.s - math/i386/fabs_asm.s - math/i386/floor_asm.s - math/i386/ftol_asm.s - math/i386/ftol2_asm.s - math/i386/log_asm.s - math/i386/log10_asm.s - math/i386/pow_asm.s - math/i386/sin_asm.s - math/i386/sqrt_asm.s - math/i386/tan_asm.s - math/i386/ci.c - misc/i386/readcr4.S) -elseif(ARCH MATCHES amd64) - list(APPEND LIBCNTPR_SOURCE - except/amd64/chkstk_asm.s - except/amd64/seh.s - setjmp/amd64/setjmp.s - math/cos.c - math/sin.c - math/amd64/alldiv.S - math/amd64/atan.S - math/amd64/atan2.S - math/amd64/ceil.S - math/amd64/exp.S - math/amd64/fabs.S - math/amd64/floor.S - math/amd64/fmod.S - math/amd64/ldexp.S - math/amd64/log.S - math/amd64/log10.S - math/amd64/pow.S - math/amd64/sqrt.S - math/amd64/tan.S) -endif() - -if(ARCH MATCHES i386) - list(APPEND LIBCNTPR_SOURCE - mem/i386/memchr_asm.s - mem/i386/memmove_asm.s - mem/i386/memset_asm.s - string/i386/strcat_asm.s - string/i386/strchr_asm.s - string/i386/strcmp_asm.s - string/i386/strcpy_asm.s - string/i386/strlen_asm.s - string/i386/strncat_asm.s - string/i386/strncmp_asm.s - string/i386/strncpy_asm.s - string/i386/strnlen_asm.s - string/i386/strrchr_asm.s - string/i386/wcscat_asm.s - string/i386/wcschr_asm.s - string/i386/wcscmp_asm.s - string/i386/wcscpy_asm.s - string/i386/wcslen_asm.s - string/i386/wcsncat_asm.s - string/i386/wcsncmp_asm.s - string/i386/wcsncpy_asm.s - string/i386/wcsnlen_asm.s - string/i386/wcsrchr_asm.s) -else() - list(APPEND LIBCNTPR_SOURCE - mem/memchr.c - mem/memcpy.c - mem/memmove.c - mem/memset.c - string/strcat.c - string/strchr.c - string/strcmp.c - string/strcpy.c - string/strlen.c - string/strncat.c - string/strncmp.c - string/strncpy.c - string/strnlen.c - string/strrchr.c - string/wcscat.c - string/wcschr.c - string/wcscmp.c - string/wcscpy.c - string/wcslen.c - string/wcsncat.c - string/wcsncmp.c - string/wcsncpy.c - string/wcsnlen.c - string/wcsrchr.c) -endif() - -add_library(libcntpr ${LIBCNTPR_SOURCE}) -set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) -add_dependencies(libcntpr psdk asm) +include(crt.cmake) +include(libcntpr.cmake) +include(msvcrtex.cmake) +include(oldnames.cmake) if(MSVC) # This is a temporary solution until we have proper crt libs @@ -641,3 +33,7 @@ string/wcstombs_nt.c) set_property(TARGET user32_wsprintf PROPERTY COMPILE_DEFINITIONS _USER32_WSPRINTF) + +add_library(getopt misc/getopt.c) +set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP) +add_dependencies(getopt psdk) Added: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake (added) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Mon May 23 15:50:03 2011 @@ -1,0 +1,438 @@ +list(APPEND CRT_SOURCE + conio/cgets.c + conio/cputs.c + conio/getch.c + conio/getche.c + conio/kbhit.c + conio/putch.c + conio/ungetch.c + direct/chdir.c + direct/chdrive.c + direct/getcwd.c + direct/getdcwd.c + direct/getdfree.c + direct/getdrive.c + direct/mkdir.c + direct/rmdir.c + direct/wchdir.c + direct/wgetcwd.c + direct/wgetdcwd.c + direct/wmkdir.c + direct/wrmdir.c + except/abnorter.c + except/checkesp.c + except/cpp.c + except/cppexcept.c + except/except.c + except/matherr.c + except/xcptfil.c + float/chgsign.c + float/copysign.c + float/fpclass.c + float/fpecode.c + float/isnan.c + float/nafter.c + float/scalb.c + locale/locale.c + math/acos.c + math/adjust.c + math/asin.c + math/cabs.c + math/cosf.c + math/cosh.c + math/div.c + math/fdivbug.c + math/frexp.c + math/huge_val.c + math/hypot.c + math/ldiv.c + math/logf.c + math/modf.c + math/powf.c + math/rand.c + math/sqrtf.c + math/s_modf.c + math/sinf.c + math/sinh.c + math/tanh.c + mbstring/hanzen.c + mbstring/ischira.c + mbstring/iskana.c + mbstring/iskmoji.c + mbstring/iskpun.c + mbstring/islead.c + mbstring/islwr.c + mbstring/ismbal.c + mbstring/ismbaln.c + mbstring/ismbc.c + mbstring/ismbgra.c + mbstring/ismbkaln.c + mbstring/ismblead.c + mbstring/ismbpri.c + mbstring/ismbpun.c + mbstring/ismbtrl.c + mbstring/isuppr.c + mbstring/jistojms.c + mbstring/jmstojis.c + mbstring/mbbtype.c + mbstring/mbccpy.c + mbstring/mbclen.c + mbstring/mbscat.c + mbstring/mbschr.c + mbstring/mbscmp.c + mbstring/mbscoll.c + mbstring/mbscpy.c + mbstring/mbscspn.c + mbstring/mbsdec.c + mbstring/mbsdup.c + mbstring/mbsicmp.c + mbstring/mbsicoll.c + mbstring/mbsinc.c + mbstring/mbslen.c + mbstring/mbslwr.c + mbstring/mbsncat.c + mbstring/mbsnccnt.c + mbstring/mbsncmp.c + mbstring/mbsncoll.c + mbstring/mbsncpy.c + mbstring/mbsnextc.c + mbstring/mbsnicmp.c + mbstring/mbsnicoll.c + mbstring/mbsninc.c + mbstring/mbsnset.c + mbstring/mbspbrk.c + mbstring/mbsrchr.c + mbstring/mbsrev.c + mbstring/mbsset.c + mbstring/mbsspn.c + mbstring/mbsspnp.c + mbstring/mbsstr.c + mbstring/mbstok.c + mbstring/mbstrlen.c + mbstring/mbsupr.c + mem/memcmp.c + mem/memccpy.c + mem/memicmp.c + misc/amsg.c + misc/assert.c + misc/environ.c + misc/getargs.c + misc/i10output.c + misc/initterm.c + misc/lock.c + misc/purecall.c + misc/stubs.c + misc/tls.c + printf/_cprintf.c + printf/_snprintf.c + printf/_snwprintf.c + printf/_vcprintf.c + printf/_vsnprintf.c + printf/_vsnwprintf.c + printf/fprintf.c + printf/fwprintf.c + printf/printf.c + printf/sprintf.c + printf/streamout.c + printf/swprintf.c + printf/vfprintf.c + printf/vfwprintf.c + printf/vprintf.c + printf/vsprintf.c + printf/vswprintf.c + printf/vwprintf.c + printf/wprintf.c + printf/wstreamout.c + process/_cwait.c + process/_system.c + process/dll.c + process/process.c + process/procid.c + process/thread.c + process/threadid.c + process/threadx.c + process/wprocess.c + search/bsearch.c + search/lfind.c + search/lsearch.c + signal/signal.c + signal/xcptinfo.c + stdio/_flsbuf.c + stdio/_flswbuf.c + stdio/access.c + stdio/file.c + stdio/find.c + stdio/find64.c + stdio/findi64.c + stdio/fmode.c + stdio/lock_file.c + stdio/perror.c + stdio/popen.c + stdio/stat.c + stdio/stat64.c + stdio/waccess.c + stdio/wfind.c + stdio/wfind64.c + stdio/wfindi64.c + stdio/wpopen.c + stdio/wstat.c + stdio/wstat64.c + stdlib/_exit.c + stdlib/abort.c + stdlib/atexit.c + stdlib/ecvt.c + stdlib/errno.c + stdlib/fcvt.c + stdlib/fcvtbuf.c + stdlib/fullpath.c + stdlib/gcvt.c + stdlib/getenv.c + stdlib/makepath.c + stdlib/makepath_s.c + stdlib/mbtowc.c + stdlib/mbstowcs.c + stdlib/obsol.c + stdlib/putenv.c + stdlib/qsort.c + stdlib/rot.c + stdlib/senv.c + stdlib/swab.c + stdlib/wfulpath.c + stdlib/wputenv.c + stdlib/wsenv.c + stdlib/wmakpath.c + stdlib/wmakpath_s.c + string/atof.c + string/atoi.c + string/atoi64.c + string/atol.c + string/ctype.c + string/itoa.c + string/itow.c + string/lasttok.c + string/scanf.c + string/splitp.c + string/strcoll.c + string/strcspn.c + string/strdup.c + string/strerror.c + string/stricmp.c + string/string.c + string/strlwr.c + string/strncoll.c + string/strnicmp.c + string/strpbrk.c + string/strrev.c + string/strset.c + string/strspn.c + string/strstr.c + string/strtod.c + string/strtoi64.c + string/strtok.c + string/strtol.c + string/strtoul.c + string/strtoull.c + string/strupr.c + string/strxfrm.c + string/wcs.c + string/wcstol.c + string/wcstoul.c + string/wsplitp.c + string/wtoi.c + string/wtoi64.c + string/wtol.c + sys_stat/systime.c + time/asctime.c + time/clock.c + time/ctime32.c + time/ctime64.c + time/ctime.c + time/difftime32.c + time/difftime64.c + time/difftime.c + time/ftime32.c + time/ftime64.c + time/ftime.c + time/futime32.c + time/futime64.c + time/futime.c + time/gmtime.c + time/localtime32.c + time/localtime64.c + time/localtime.c + time/mktime.c + time/strdate.c + time/strftime.c + time/strtime.c + time/time32.c + time/time64.c + time/time.c + time/timezone.c + time/tzname.c + time/utime32.c + time/utime64.c + time/utime.c + time/wasctime.c + time/wcsftime.c + time/wctime32.c + time/wctime64.c + time/wctime.c + time/wstrdate.c + time/wstrtime.c + time/wutime32.c + time/wutime64.c + time/wutime.c + wstring/wcscoll.c + wstring/wcscspn.c + wstring/wcsicmp.c + wstring/wcslwr.c + wstring/wcsnicmp.c + wstring/wcsspn.c + wstring/wcsstr.c + wstring/wcstok.c + wstring/wcsupr.c + wstring/wcsxfrm.c + wstring/wlasttok.c + wine/heap.c + wine/undname.c) + +if(ARCH MATCHES i386) + list(APPEND CRT_SOURCE + except/i386/chkstk_asm.s + except/i386/prolog.s + except/i386/seh.s + except/i386/seh_prolog.s + except/i386/unwind.c + float/i386/clearfp.c + float/i386/cntrlfp.c + float/i386/fpreset.c + float/i386/logb.c + float/i386/statfp.c + setjmp/i386/setjmp.s) +elseif(ARCH MATCHES amd64) + list(APPEND CRT_SOURCE + except/amd64/chkstk_asm.s + except/amd64/seh.s + float/i386/clearfp.c + float/i386/cntrlfp.c + float/i386/fpreset.c + float/i386/logb.c + float/i386/statfp.c + setjmp/amd64/setjmp.s) +endif() + +if(ARCH MATCHES i386) + list(APPEND CRT_SOURCE + math/i386/alldiv_asm.s + math/i386/alldvrm_asm.s + math/i386/allmul_asm.s + math/i386/allrem_asm.s + math/i386/allshl_asm.s + math/i386/allshr_asm.s + math/i386/atan_asm.s + math/i386/aulldiv_asm.s + math/i386/aulldvrm_asm.s + math/i386/aullrem_asm.s + math/i386/aullshr_asm.s + math/i386/ceil_asm.s + math/i386/ceilf.S + math/i386/cos_asm.s + math/i386/fabs_asm.s + math/i386/floor_asm.s + math/i386/floorf.S + math/i386/ftol_asm.s + math/i386/ftol2_asm.s + math/i386/log_asm.s + math/i386/log10_asm.s + math/i386/pow_asm.s + math/i386/sin_asm.s + math/i386/sqrt_asm.s + math/i386/tan_asm.s + math/i386/atan2_asm.s + math/i386/ci.c + math/i386/exp_asm.s + math/i386/fmod_asm.s + math/i386/fmodf_asm.s + math/i386/ldexp.c + mem/i386/memchr_asm.s + mem/i386/memmove_asm.s + mem/i386/memset_asm.s + misc/i386/readcr4.S + string/i386/strcat_asm.s + string/i386/strchr_asm.s + string/i386/strcmp_asm.s + string/i386/strcpy_asm.s + string/i386/strlen_asm.s + string/i386/strncat_asm.s + string/i386/strncmp_asm.s + string/i386/strncpy_asm.s + string/i386/strnlen_asm.s + string/i386/strrchr_asm.s + string/i386/wcscat_asm.s + string/i386/wcschr_asm.s + string/i386/wcscmp_asm.s + string/i386/wcscpy_asm.s + string/i386/wcslen_asm.s + string/i386/wcsncat_asm.s + string/i386/wcsncmp_asm.s + string/i386/wcsncpy_asm.s + string/i386/wcsnlen_asm.s + string/i386/wcsrchr_asm.s) +else() + list(APPEND CRT_SOURCE + math/stubs.c + mem/memchr.c + mem/memcpy.c + mem/memmove.c + mem/memset.c + string/strcat.c + string/strchr.c + string/strcmp.c + string/strcpy.c + string/strlen.c + string/strncat.c + string/strncmp.c + string/strncpy.c + string/strnlen.c + string/strrchr.c + string/wcscat.c + string/wcschr.c + string/wcscmp.c + string/wcscpy.c + string/wcslen.c + string/wcsncat.c + string/wcsncmp.c + string/wcsncpy.c + string/wcsnlen.c + string/wcsrchr.c) +endif() + +if(ARCH MATCHES amd64) + list(APPEND CRT_SOURCE + math/cos.c + math/sin.c + math/amd64/alldiv.S + math/amd64/atan.S + math/amd64/atan2.S + math/amd64/ceil.S + math/amd64/ceilf.S + math/amd64/exp.S + math/amd64/fabs.S + math/amd64/floor.S + math/amd64/floorf.S + math/amd64/fmod.S + math/amd64/fmodf.S + math/amd64/ldexp.S + math/amd64/log.S + math/amd64/log10.S + math/amd64/pow.S + math/amd64/sqrt.S + math/amd64/sqrtf.S + math/amd64/tan.S) +endif() + +add_library(crt ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch ${CRT_SOURCE}) + +set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) +add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE}) +add_dependencies(crt psdk asm) Propchange: trunk/reactos/lib/sdk/crt/crt.cmake ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake (added) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Mon May 23 15:50:03 2011 @@ -1,0 +1,174 @@ + +list(APPEND LIBCNTPR_SOURCE + float/isnan.c + math/abs.c + math/div.c + math/labs.c + math/rand_nt.c + mbstring/mbstrlen.c + mem/memccpy.c + mem/memcmp.c + mem/memicmp.c + printf/_snprintf.c + printf/_snwprintf.c + printf/_vcprintf.c + printf/_vsnprintf.c + printf/_vsnwprintf.c + printf/sprintf.c + printf/streamout.c + printf/swprintf.c + printf/vprintf.c + printf/vsprintf.c + printf/vswprintf.c + printf/wstreamout.c + search/bsearch.c + search/lfind.c + stdlib/qsort.c + string/ctype.c + string/scanf.c + string/strcspn.c + string/stricmp.c + string/strnicmp.c + string/strlwr.c + string/strrev.c + string/strset.c + string/strstr.c + string/strupr.c + string/strpbrk.c + string/strspn.c + string/atoi64.c + string/atoi.c + string/atol.c + string/itoa.c + string/itow.c + string/mbstowcs_nt.c + string/splitp.c + string/strtol.c + string/strtoul.c + string/strtoull.c + string/wcs.c + string/wcstol.c + string/wcstombs_nt.c + string/wcstoul.c + string/wsplitp.c + string/wtoi64.c + string/wtoi.c + string/wtol.c + wstring/wcsicmp.c + wstring/wcslwr.c + wstring/wcsnicmp.c + wstring/wcsupr.c + wstring/wcscspn.c + wstring/wcsspn.c + wstring/wcsstr.c) + +if(ARCH MATCHES i386) + list(APPEND LIBCNTPR_SOURCE + except/i386/chkstk_asm.s + except/i386/seh.s + except/i386/seh_prolog.s + setjmp/i386/setjmp.s + math/i386/alldiv_asm.s + math/i386/alldvrm_asm.s + math/i386/allmul_asm.s + math/i386/allrem_asm.s + math/i386/allshl_asm.s + math/i386/allshr_asm.s + math/i386/atan_asm.s + math/i386/aulldiv_asm.s + math/i386/aulldvrm_asm.s + math/i386/aullrem_asm.s + math/i386/aullshr_asm.s + math/i386/ceil_asm.s + math/i386/cos_asm.s + math/i386/fabs_asm.s + math/i386/floor_asm.s + math/i386/ftol_asm.s + math/i386/ftol2_asm.s + math/i386/log_asm.s + math/i386/log10_asm.s + math/i386/pow_asm.s + math/i386/sin_asm.s + math/i386/sqrt_asm.s + math/i386/tan_asm.s + math/i386/ci.c + misc/i386/readcr4.S) +elseif(ARCH MATCHES amd64) + list(APPEND LIBCNTPR_SOURCE + except/amd64/chkstk_asm.s + except/amd64/seh.s + setjmp/amd64/setjmp.s + math/cos.c + math/sin.c + math/amd64/alldiv.S + math/amd64/atan.S + math/amd64/atan2.S + math/amd64/ceil.S + math/amd64/exp.S + math/amd64/fabs.S + math/amd64/floor.S + math/amd64/fmod.S + math/amd64/ldexp.S + math/amd64/log.S + math/amd64/log10.S + math/amd64/pow.S + math/amd64/sqrt.S + math/amd64/tan.S) +endif() + +if(ARCH MATCHES i386) + list(APPEND LIBCNTPR_SOURCE + mem/i386/memchr_asm.s + mem/i386/memmove_asm.s + mem/i386/memset_asm.s + string/i386/strcat_asm.s + string/i386/strchr_asm.s + string/i386/strcmp_asm.s + string/i386/strcpy_asm.s + string/i386/strlen_asm.s + string/i386/strncat_asm.s + string/i386/strncmp_asm.s + string/i386/strncpy_asm.s + string/i386/strnlen_asm.s + string/i386/strrchr_asm.s + string/i386/wcscat_asm.s + string/i386/wcschr_asm.s + string/i386/wcscmp_asm.s + string/i386/wcscpy_asm.s + string/i386/wcslen_asm.s + string/i386/wcsncat_asm.s + string/i386/wcsncmp_asm.s + string/i386/wcsncpy_asm.s + string/i386/wcsnlen_asm.s + string/i386/wcsrchr_asm.s) +else() + list(APPEND LIBCNTPR_SOURCE + mem/memchr.c + mem/memcpy.c + mem/memmove.c + mem/memset.c + string/strcat.c + string/strchr.c + string/strcmp.c + string/strcpy.c + string/strlen.c + string/strncat.c + string/strncmp.c + string/strncpy.c + string/strnlen.c + string/strrchr.c + string/wcscat.c + string/wcschr.c + string/wcscmp.c + string/wcscpy.c + string/wcslen.c + string/wcsncat.c + string/wcsncmp.c + string/wcsncpy.c + string/wcsnlen.c + string/wcsrchr.c) +endif() + +add_library(libcntpr ${LIBCNTPR_SOURCE}) +set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) +add_dependencies(libcntpr psdk asm) Propchange: trunk/reactos/lib/sdk/crt/libcntpr.cmake ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake (added) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Mon May 23 15:50:03 2011 @@ -1,0 +1,47 @@ + +include_directories(include/internal/mingw-w64) + +if(NOT MSVC) + add_definitions(-Wno-main) +endif() + +list(APPEND MSVCRTEX_SOURCE + startup/crtexe.c + startup/wcrtexe.c + startup/_newmode.c + startup/wildcard.c + startup/tlssup.c + startup/mingw_helpers.c + startup/natstart.c + startup/charmax.c + startup/merr.c + startup/atonexit.c + startup/txtmode.c + startup/pseudo-reloc.c + startup/tlsmcrt.c + startup/tlsthrd.c + startup/tlsmthread.c + startup/cinitexe.c + startup/gs_support.c + startup/dll_argv.c + startup/dllargv.c + startup/wdllargv.c + startup/crt0_c.c + startup/crt0_w.c + + misc/fltused.c +) + +if(MSVC) + list(APPEND MSVCRTEX_SOURCE startup/mscmain.c) +else() + list(APPEND MSVCRTEX_SOURCE startup/gccmain.c) +endif() + +add_library(msvcrtex ${MSVCRTEX_SOURCE}) +set_target_properties(msvcrtex PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) + +if(NOT MSVC) + target_link_libraries(msvcrtex oldnames) +endif() + Propchange: trunk/reactos/lib/sdk/crt/msvcrtex.cmake ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/oldnames.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/oldnames.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/oldnames.cmake (added) +++ trunk/reactos/lib/sdk/crt/oldnames.cmake [iso-8859-1] Mon May 23 15:50:03 2011 @@ -1,0 +1,10 @@ +if(NOT MSVC) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a + COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a + COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) + + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) + + add_custom_target(oldnames ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) +endif() Propchange: trunk/reactos/lib/sdk/crt/oldnames.cmake ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/sdk/crt/startup/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon May 23 15:50:03 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/sdk/crt/startup/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/sdk/crt/startup/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/sdk/crt/startup/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/crt/startup/wcrtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/wcrtex… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/wcrtexe.c (added) +++ trunk/reactos/lib/sdk/crt/startup/wcrtexe.c [iso-8859-1] Mon May 23 15:50:03 2011 @@ -1,0 +1,13 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#define WPRFLAG +#define UNICODE +#define _UNICODE +#define mainCRTStartup wmainCRTStartup +#define WinMainCRTStartup wWinMainCRTStartup + +#include "crtexe.c" Propchange: trunk/reactos/lib/sdk/crt/startup/wcrtexe.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/startup/wdllargv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/wdllar… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/wdllargv.c (added) +++ trunk/reactos/lib/sdk/crt/startup/wdllargv.c [iso-8859-1] Mon May 23 15:50:03 2011 @@ -1,0 +1,3 @@ + +#define WPRFLAG +#include "dllargv.c" Propchange: trunk/reactos/lib/sdk/crt/startup/wdllargv.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 5 months

[tkreuzer] 51859: [MMIXER_TEST] - Fix order of importlibs (will be required soon)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 23 15:36:00 2011 New Revision: 51859 URL: http://svn.reactos.org/svn/reactos?rev=51859&view=rev Log: [MMIXER_TEST] - Fix order of importlibs (will be required soon) Modified: trunk/rostests/tests/mmixer_test/CMakeLists.txt Modified: trunk/rostests/tests/mmixer_test/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/mmixer_test/CMakeLi… ============================================================================== --- trunk/rostests/tests/mmixer_test/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/tests/mmixer_test/CMakeLists.txt [iso-8859-1] Mon May 23 15:36:00 2011 @@ -8,4 +8,4 @@ set_module_type(mmixer_test win32cui) target_link_libraries(mmixer_test mmixer) -add_importlibs(mmixer_test advapi32 setupapi winmm ksuser user32 kernel32 msvcrt) +add_importlibs(mmixer_test advapi32 setupapi winmm ksuser user32 msvcrt kernel32)

13 years, 5 months

[janderwald] 51858: [USBOHCI] - Fix bug in calculating offset of status register - Start implementing deferred processing routine - Signal status change when new device is arrived - Implement basic...

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon May 23 11:29:55 2011 New Revision: 51858 URL: http://svn.reactos.org/svn/reactos?rev=51858&view=rev Log: [USBOHCI] - Fix bug in calculating offset of status register - Start implementing deferred processing routine - Signal status change when new device is arrived - Implement basic GetPortStatus - Start implementing SetPortFeature, ClearPortStatus - ResetPort not yet fully working, WIP Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp branches/usb-bringup/drivers/usb/usbohci/hardware.h Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Mon May 23 11:29:55 2011 @@ -112,6 +112,7 @@ POHCI_ENDPOINT_DESCRIPTOR m_IsoEndpointDescriptor; // iso endpoint descriptor POHCI_ENDPOINT_DESCRIPTOR m_InterruptEndpoints[OHCI_STATIC_ENDPOINT_COUNT]; // endpoints for interrupt / iso transfers ULONG m_NumberOfPorts; // number of ports + OHCI_PORT_STATUS m_PortStatus[OHCI_MAX_PORT_COUNT]; // port change status PDMAMEMORYMANAGER m_MemoryManager; // memory manager HD_INIT_CALLBACK* m_SCECallBack; // status change callback routine PVOID m_SCEContext; // status change callback routine context @@ -852,9 +853,11 @@ OUT USHORT *PortStatus, OUT USHORT *PortChange) { - UNIMPLEMENTED - *PortStatus = 0; - *PortChange = 0; + // + // FIXME: should read status from hardware + // + *PortStatus = m_PortStatus[PortId].PortStatus; + *PortChange = m_PortStatus[PortId].PortChange; return STATUS_SUCCESS; } @@ -863,7 +866,84 @@ ULONG PortId, ULONG Status) { - UNIMPLEMENTED + ULONG Value, Index = 0; + + DPRINT("CUSBHardwareDevice::ClearPortStatus PortId %x Feature %x\n", PortId, Status); + + if (PortId > m_NumberOfPorts) + return STATUS_UNSUCCESSFUL; + + // + // read port status + // + Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId))); + KeStallExecutionProcessor(100); + + if (Status == C_PORT_RESET) + { + // + // complete reset + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PRSC); + + do + { + // + // read port status + // + Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId))); + + if ((Value & OHCI_RH_PORTSTATUS_PRS) == 0) + { + // + // reset is complete + // + break; + } + + // + // wait a bit + // + KeStallExecutionProcessor(100); + DPRINT1("Wait...\n"); + + }while(Index++ < 10); + + if ((Value & OHCI_RH_PORTSTATUS_PRS)) + { + DPRINT1("Failed to reset\n"); + } + + // + // update port status + // + m_PortStatus[PortId].PortChange &= ~USB_PORT_STATUS_RESET; + + // + // sanity check + // + ASSERT((Value & OHCI_RH_PORTSTATUS_PES)); + + if (Value & OHCI_RH_PORTSTATUS_PES) + { + // + // port is enabled + // + m_PortStatus[PortId].PortStatus |= USB_PORT_STATUS_ENABLE; + } + } + + if (Status == C_PORT_CONNECTION) + { + // + // clear bit + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_CSC); + m_PortStatus[PortId].PortChange &= ~USB_PORT_STATUS_CONNECT; + } + + + return STATUS_SUCCESS; } @@ -873,6 +953,16 @@ ULONG PortId, ULONG Feature) { + ULONG Value; + + DPRINT1("CUSBHardwareDevice::SetPortFeature PortId %x Feature %x\n", PortId, Feature); + + // + // read port status + // + Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId))); + + if (Feature == PORT_ENABLE) { // @@ -900,9 +990,25 @@ else if (Feature == PORT_RESET) { // + // assert + // + ASSERT((Value & OHCI_RH_PORTSTATUS_CCS)); + + // // reset port // WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PRS); + + // + // wait + // + KeStallExecutionProcessor(100); + + // + // update cached settings + // + m_PortStatus[PortId].PortChange |= USB_PORT_STATUS_RESET; + m_PortStatus[PortId].PortStatus &= ~USB_PORT_STATUS_ENABLE; // // is there a status change callback @@ -1045,7 +1151,7 @@ // // halt controller // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)(This->m_Base + OHCI_CONTROL_OFFSET)), OHCI_HC_FUNCTIONAL_STATE_RESET); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_CONTROL_OFFSET), OHCI_HC_FUNCTIONAL_STATE_RESET); } if (Status & OHCI_ROOT_HUB_STATUS_CHANGE) @@ -1053,12 +1159,11 @@ // // new device has arrived // - DPRINT1("InterruptServiceRoutine> New Device arrival\n"); // // disable interrupt as it will fire untill the port has been reset // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)(This->m_Base + OHCI_INTERRUPT_DISABLE_OFFSET)), OHCI_ROOT_HUB_STATUS_CHANGE); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_DISABLE_OFFSET), OHCI_ROOT_HUB_STATUS_CHANGE); Acknowledge |= OHCI_ROOT_HUB_STATUS_CHANGE; } @@ -1070,7 +1175,7 @@ // // ack change // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)(This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)), Acknowledge); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET), Acknowledge); } // @@ -1094,13 +1199,76 @@ IN PVOID SystemArgument2) { CUSBHardwareDevice *This; - ULONG CStatus; + ULONG CStatus, Index, PortStatus; // // get parameters // This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; + + if (CStatus & OHCI_ROOT_HUB_STATUS_CHANGE) + { + // + // device connected, lets check which port + // + for(Index = 0; Index < This->m_NumberOfPorts; Index++) + { + // + // read port status + // + PortStatus = READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_RH_PORT_STATUS(Index))); + + // + // check if there is a status change + // + if (PortStatus & OHCI_RH_PORTSTATUS_CSC) + { + // + // did a device connect + // + if (PortStatus & OHCI_RH_PORTSTATUS_CCS) + { + // + // device connected + // + DPRINT1("New device arrival at Port %d LowSpeed %x\n", Index, (PortStatus & OHCI_RH_PORTSTATUS_LSDA)); + + // + // store change + // + This->m_PortStatus[Index].PortStatus |= USB_PORT_STATUS_CONNECT; + This->m_PortStatus[Index].PortChange |= USB_PORT_STATUS_CONNECT; + + if ((PortStatus & OHCI_RH_PORTSTATUS_LSDA)) + { + // + // low speed device connected + // + This->m_PortStatus[Index].PortStatus |= USB_PORT_STATUS_LOW_SPEED; + } + + // + // is there a status change callback + // + if (This->m_SCECallBack != NULL) + { + // + // queue work item for processing + // + ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); + } + } + else + { + // + // device disconnected + // + DPRINT1("Device disconnected at Port %x\n", Index); + } + } + } + } } Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] Mon May 23 11:29:55 2011 @@ -210,4 +210,25 @@ // // Maximum port count set by OHCI // -#define OHCI_MAX_PORT_COUNT 15 +#define OHCI_MAX_PORT_COUNT 15 + + +typedef struct +{ + ULONG PortStatus; + ULONG PortChange; +}OHCI_PORT_STATUS; + + +typedef struct { + // Hardware part 16 bytes + uint32 flags; // Flags field + uint32 buffer_physical; // Physical buffer pointer + uint32 next_physical_descriptor; // Physical pointer next descriptor + uint32 last_physical_byte_address; // Physical pointer to buffer end + // Software part + addr_t physical_address; // Physical address of this descriptor + size_t buffer_size; // Size of the buffer + void *buffer_logical; // Logical pointer to the buffer + void *next_logical_descriptor; // Logical pointer next descriptor +} ohci_general_td;

13 years, 5 months

[akhaldi] 51857: [CMAKE] * Add module_clean targets.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 23 10:52:37 2011 New Revision: 51857 URL: http://svn.reactos.org/svn/reactos?rev=51857&view=rev Log: [CMAKE] * Add module_clean targets. Modified: trunk/reactos/CMakeMacros.cmake Modified: trunk/reactos/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeMacros.cmake?rev=5185… ============================================================================== --- trunk/reactos/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/CMakeMacros.cmake [iso-8859-1] Mon May 23 10:52:37 2011 @@ -204,3 +204,26 @@ endif() endif() #end bootcd endfunction() + +# Create module_clean targets +function(add_clean_target target) + if(CMAKE_GENERATOR MATCHES "Unix Makefiles" OR CMAKE_GENERATOR MATCHES "MinGW Makefiles") + set(CLEAN_COMMAND make clean) + elseif(CMAKE_GENERATOR MATCHES "NMake Makefiles") + set(CLEAN_COMMAND nmake clean) + endif() + add_custom_target(${target}_clean + COMMAND ${CLEAN_COMMAND} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Cleaning ${target}") +endfunction() + +function(add_library name) + _add_library(${name} ${ARGN}) + add_clean_target(${name}) +endfunction() + +function(add_executable name) + _add_executable(${name} ${ARGN}) + add_clean_target(${name}) +endfunction()

13 years, 5 months

[tkreuzer] 51856: [FREELDR] "Fix" build with MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 23 07:57:44 2011 New Revision: 51856 URL: http://svn.reactos.org/svn/reactos?rev=51856&view=rev Log: [FREELDR] "Fix" build with MSVC Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S [iso-8859-1] Mon May 23 07:57:44 2011 @@ -76,5 +76,7 @@ PUBLIC _Int386 _Int386: +PUBLIC _PxeCallApi +_PxeCallApi: END

13 years, 5 months

[akhaldi] 51855: * Back out r51854 as our KeBugCheckEx does return (due to a hack).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun May 22 22:19:47 2011 New Revision: 51855 URL: http://svn.reactos.org/svn/reactos?rev=51855&view=rev Log: * Back out r51854 as our KeBugCheckEx does return (due to a hack). Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/kefuncs.h Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun May 22 22:19:47 2011 @@ -340,7 +340,7 @@ return 0; } -DECLSPEC_NORETURN +//DECLSPEC_NORETURN NTKERNELAPI VOID NTAPI Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5185… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun May 22 22:19:47 2011 @@ -9772,7 +9772,7 @@ } #endif -DECLSPEC_NORETURN +//DECLSPEC_NORETURN NTKERNELAPI VOID NTAPI Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] Sun May 22 22:19:47 2011 @@ -207,7 +207,7 @@ } #endif -DECLSPEC_NORETURN +//DECLSPEC_NORETURN NTKERNELAPI VOID NTAPI

13 years, 5 months

[akhaldi] 51854: * Consistently mark KeBugCheckEx with the noreturn attribute. Patch by Igor Paliychuk.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun May 22 22:08:01 2011 New Revision: 51854 URL: http://svn.reactos.org/svn/reactos?rev=51854&view=rev Log: * Consistently mark KeBugCheckEx with the noreturn attribute. Patch by Igor Paliychuk. Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/kefuncs.h Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun May 22 22:08:01 2011 @@ -340,6 +340,7 @@ return 0; } +DECLSPEC_NORETURN NTKERNELAPI VOID NTAPI Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5185… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun May 22 22:08:01 2011 @@ -9772,8 +9772,8 @@ } #endif -NTKERNELAPI -//DECLSPEC_NORETURN +DECLSPEC_NORETURN +NTKERNELAPI VOID NTAPI KeBugCheckEx( Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] Sun May 22 22:08:01 2011 @@ -207,8 +207,8 @@ } #endif -NTKERNELAPI -//DECLSPEC_NORETURN +DECLSPEC_NORETURN +NTKERNELAPI VOID NTAPI KeBugCheckEx(

13 years, 5 months

[tkreuzer] 51853: [GDI FONT DRIVER] - Calculate bounding box in fixpoints and round up/down - Make sure the bitmaps don't exceed the previously calculated maximum size. Webdings has suchs glyphs fo...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 22 21:26:22 2011 New Revision: 51853 URL: http://svn.reactos.org/svn/reactos?rev=51853&view=rev Log: [GDI FONT DRIVER] - Calculate bounding box in fixpoints and round up/down - Make sure the bitmaps don't exceed the previously calculated maximum size. Webdings has suchs glyphs for unknown reasons. - Handle 0 pixel bitmaps by only zeroing the 1st byte of the destination bitmap - Pass ponter to GLYPHBITS structure to FtfdCopyBits and use its size instead of freetype's glyph size Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c [iso-8859-1] Sun May 22 21:26:22 2011 @@ -11,19 +11,19 @@ static VOID FtfdCopyBits_S1D1( - BYTE *pjDest, + GLYPHBITS *pgb, FT_Bitmap *ftbitmap) { ULONG ulRows, ulDstDelta, ulSrcDelta; PBYTE pjDstLine, pjSrcLine; - pjDstLine = pjDest; - ulDstDelta = (ftbitmap->width + 7) / 8; + pjDstLine = pgb->aj; + ulDstDelta = (pgb->sizlBitmap.cx + 7) / 8; pjSrcLine = ftbitmap->buffer; ulSrcDelta = abs(ftbitmap->pitch); - ulRows = ftbitmap->rows; + ulRows = pgb->sizlBitmap.cy; while (ulRows--) { /* Copy one line */ @@ -38,7 +38,7 @@ static VOID FtfdCopyBits_S8D1( - BYTE *pjDest, + GLYPHBITS *pgb, FT_Bitmap *ftbitmap) { __debugbreak(); @@ -48,7 +48,7 @@ static VOID FtfdCopyBits_S1D4( - BYTE *pjDest, + GLYPHBITS *pgb, FT_Bitmap *ftbitmap) { ULONG ulRows, ulSrcDelta; @@ -56,15 +56,15 @@ //__debugbreak(); - pjDstLine = pjDest; + pjDstLine = pgb->aj; pjSrcLine = ftbitmap->buffer; ulSrcDelta = abs(ftbitmap->pitch); - ulRows = ftbitmap->rows; + ulRows = pgb->sizlBitmap.cy; while (ulRows--) { - ULONG ulWidth = ftbitmap->width; + ULONG ulWidth = pgb->sizlBitmap.cx; BYTE j, *pjSrc; static USHORT ausExpand[] = {0x0000, 0x000f, 0x00f0, 0x00ff, 0x0f00, 0x0f0f, 0x0ff0, 0x0fff, @@ -102,19 +102,19 @@ static VOID FtfdCopyBits_S8D4( - BYTE *pjDest, + GLYPHBITS *pgb, FT_Bitmap *ftbitmap) { ULONG ulRows, ulDstDelta, ulSrcDelta; PBYTE pjDstLine, pjSrcLine; - pjDstLine = pjDest; - ulDstDelta = (ftbitmap->width*4 + 7) / 8; + pjDstLine = pgb->aj; + ulDstDelta = (pgb->sizlBitmap.cx*4 + 7) / 8; pjSrcLine = ftbitmap->buffer; ulSrcDelta = abs(ftbitmap->pitch); - ulRows = ftbitmap->rows; + ulRows = pgb->sizlBitmap.cy; while (ulRows--) { ULONG ulWidth = ulDstDelta; @@ -127,7 +127,7 @@ j = (*pjSrc++) & 0xf0; /* Get the 2nd pixel */ - if (ulWidth > 0 || !(ftbitmap->width & 1)) + if (ulWidth > 0 || !(pgb->sizlBitmap.cx & 1)) j |= (*pjSrc++) >> 4; *pjDstLine++ = j; } @@ -137,24 +137,30 @@ } } -void +VOID NTAPI FtfdCopyBits( BYTE jBppDst, - BYTE *pjDest, + GLYPHBITS *pgb, FT_Bitmap *ftbitmap) { + /* handle empty bitmaps */ + if (ftbitmap->width == 0 || ftbitmap->rows == 0) + { + pgb->aj[0] = 0; + return; + } if (jBppDst == 1) { if (ftbitmap->pixel_mode == FT_PIXEL_MODE_MONO) { - FtfdCopyBits_S1D1(pjDest, ftbitmap); + FtfdCopyBits_S1D1(pgb, ftbitmap); } else if (ftbitmap->pixel_mode == FT_PIXEL_MODE_GRAY && ftbitmap->num_grays == 256) { - FtfdCopyBits_S8D1(pjDest, ftbitmap); + FtfdCopyBits_S8D1(pgb, ftbitmap); } else { @@ -167,12 +173,12 @@ { if (ftbitmap->pixel_mode == FT_PIXEL_MODE_MONO) { - FtfdCopyBits_S1D4(pjDest, ftbitmap); + FtfdCopyBits_S1D4(pgb, ftbitmap); } else if (ftbitmap->pixel_mode == FT_PIXEL_MODE_GRAY && ftbitmap->num_grays == 256) { - FtfdCopyBits_S8D4(pjDest, ftbitmap); + FtfdCopyBits_S8D4(pgb, ftbitmap); } else { Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sun May 22 21:26:22 2011 @@ -125,7 +125,7 @@ POINTL ptlStrikeout; POINTL ptlULThickness; POINTL ptlSOThickness; - POINTL aptlBBox[4]; + POINTL aptfxBBox[4]; }; }; FIX fxMaxAscender; @@ -147,7 +147,7 @@ FT_Face ftface; FD_XFORM fdxQuantized; FTFD_DEVICEMETRICS metrics; - RECTL rclBBox; + RECTL rcfxBBox; SIZEL sizlMax; POINTEF ptefBase; POINTEF ptefSide; @@ -349,5 +349,5 @@ NTAPI FtfdCopyBits( BYTE jBppDst, - BYTE *pjDest, + GLYPHBITS *pgb, FT_Bitmap *ftbitmap); Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Sun May 22 21:26:22 2011 @@ -237,14 +237,14 @@ pmetrics->ptlULThickness.y = pface->ifiex.ifi.fwdUnderscoreSize; pmetrics->ptlSOThickness.x = 0; pmetrics->ptlSOThickness.y = pface->ifiex.ifi.fwdStrikeoutSize; - pmetrics->aptlBBox[0].x = ftface->bbox.xMin; - pmetrics->aptlBBox[0].y = ftface->bbox.yMin; - pmetrics->aptlBBox[1].x = ftface->bbox.xMax; - pmetrics->aptlBBox[1].y = ftface->bbox.yMin; - pmetrics->aptlBBox[2].x = ftface->bbox.xMax; - pmetrics->aptlBBox[2].y = ftface->bbox.yMax; - pmetrics->aptlBBox[3].x = ftface->bbox.xMin; - pmetrics->aptlBBox[3].y = ftface->bbox.yMax; + pmetrics->aptfxBBox[0].x = ftface->bbox.xMin << 4; + pmetrics->aptfxBBox[0].y = ftface->bbox.yMin << 4; + pmetrics->aptfxBBox[1].x = ftface->bbox.xMax << 4; + pmetrics->aptfxBBox[1].y = ftface->bbox.yMin << 4; + pmetrics->aptfxBBox[2].x = ftface->bbox.xMax << 4; + pmetrics->aptfxBBox[2].y = ftface->bbox.yMax << 4; + pmetrics->aptfxBBox[3].x = ftface->bbox.xMin << 4; + pmetrics->aptfxBBox[3].y = ftface->bbox.yMax << 4; /* Transform all coordinates into device space */ if (!XFORMOBJ_bApplyXform(pxo, XF_LTOL, 8, pmetrics->aptl, pmetrics->aptl)) @@ -254,23 +254,29 @@ return NULL; } - /* Extract the bounding box in device coordinates */ - pfont->rclBBox.left = min(pmetrics->aptlBBox[0].x, pmetrics->aptlBBox[1].x); - pfont->rclBBox.left = min(pfont->rclBBox.left, pmetrics->aptlBBox[2].x); - pfont->rclBBox.left = min(pfont->rclBBox.left, pmetrics->aptlBBox[3].x); - pfont->rclBBox.right = max(pmetrics->aptlBBox[0].x, pmetrics->aptlBBox[1].x); - pfont->rclBBox.right = max(pfont->rclBBox.right, pmetrics->aptlBBox[2].x); - pfont->rclBBox.right = max(pfont->rclBBox.right, pmetrics->aptlBBox[3].x); - pfont->rclBBox.top = min(pmetrics->aptlBBox[0].y, pmetrics->aptlBBox[1].y); - pfont->rclBBox.top = min(pfont->rclBBox.top, pmetrics->aptlBBox[2].y); - pfont->rclBBox.top = min(pfont->rclBBox.top, pmetrics->aptlBBox[3].y); - pfont->rclBBox.bottom = max(pmetrics->aptlBBox[0].y, pmetrics->aptlBBox[1].y); - pfont->rclBBox.bottom = max(pfont->rclBBox.bottom, pmetrics->aptlBBox[2].y); - pfont->rclBBox.bottom = max(pfont->rclBBox.bottom, pmetrics->aptlBBox[3].y); - - /* Calculate maximum extents */ - pfont->sizlMax.cx = pfont->rclBBox.right - pfont->rclBBox.left; - pfont->sizlMax.cy = pfont->rclBBox.bottom - pfont->rclBBox.top; + /* Extract the bounding box in FIX device coordinates */ + pfont->rcfxBBox.left = min(pmetrics->aptfxBBox[0].x, pmetrics->aptfxBBox[1].x); + pfont->rcfxBBox.left = min(pfont->rcfxBBox.left, pmetrics->aptfxBBox[2].x); + pfont->rcfxBBox.left = min(pfont->rcfxBBox.left, pmetrics->aptfxBBox[3].x); + pfont->rcfxBBox.right = max(pmetrics->aptfxBBox[0].x, pmetrics->aptfxBBox[1].x); + pfont->rcfxBBox.right = max(pfont->rcfxBBox.right, pmetrics->aptfxBBox[2].x); + pfont->rcfxBBox.right = max(pfont->rcfxBBox.right, pmetrics->aptfxBBox[3].x); + pfont->rcfxBBox.top = min(pmetrics->aptfxBBox[0].y, pmetrics->aptfxBBox[1].y); + pfont->rcfxBBox.top = min(pfont->rcfxBBox.top, pmetrics->aptfxBBox[2].y); + pfont->rcfxBBox.top = min(pfont->rcfxBBox.top, pmetrics->aptfxBBox[3].y); + pfont->rcfxBBox.bottom = max(pmetrics->aptfxBBox[0].y, pmetrics->aptfxBBox[1].y); + pfont->rcfxBBox.bottom = max(pfont->rcfxBBox.bottom, pmetrics->aptfxBBox[2].y); + pfont->rcfxBBox.bottom = max(pfont->rcfxBBox.bottom, pmetrics->aptfxBBox[3].y); + + /* Round the bounding box margings to pixels */ + pfont->rcfxBBox.left = pfont->rcfxBBox.left & ~0xf; + pfont->rcfxBBox.top = pfont->rcfxBBox.top & ~0xf; + pfont->rcfxBBox.right = (pfont->rcfxBBox.right + 0xf) & ~0xf; + pfont->rcfxBBox.bottom = (pfont->rcfxBBox.bottom + 0xf) & ~0xf; + + /* Calculate maximum extents in pixels */ + pfont->sizlMax.cx = (pfont->rcfxBBox.right - pfont->rcfxBBox.left) >> 4; + pfont->sizlMax.cy = (pfont->rcfxBBox.bottom - pfont->rcfxBBox.top) >> 4; /* Fixup some minimum values */ if (pmetrics->ptlULThickness.y <= 0) pmetrics->ptlULThickness.y = 1; @@ -309,7 +315,6 @@ PFTFD_FONT pfont = FtfdGetFontInstance(pfo); PFTFD_FACE pface = pfont->pface; FT_Face ftface = pfont->ftface; - XFORMOBJ *pxo; TRACE("FtfdQueryMaxExtents\n"); @@ -322,9 +327,6 @@ WARN("cjSize = %ld\n", cjSize); return FD_ERROR; } - - /* Get the XFORMOBJ */ - pxo = FONTOBJ_pxoGetXform(pfo); /* Accelerator flags (ignored atm) */ pfddm->flRealizedType = 0; @@ -416,6 +418,7 @@ { PFTFD_FONT pfont = pfo->pvProducer; FT_GlyphSlot ftglyph = pfont->ftface->glyph; + SIZEL sizlBitmap; pgd->gdf.pgb = pvGlyphData; pgd->hg = hg; @@ -436,15 +439,23 @@ /* D is the glyph advance width */ pgd->fxD = ftglyph->advance.x / 4; // FIXME: should be projected on the x-axis + /* Get the bitnmap size */ + sizlBitmap.cx = ftglyph->bitmap.width; + sizlBitmap.cy = ftglyph->bitmap.rows; + + /* Make the bitmap at least 1x1 pixel large */ + if (sizlBitmap.cx == 0) sizlBitmap.cx++; + if (sizlBitmap.cy == 0) sizlBitmap.cy++; + + /* Don't let the bitmap be larger than the maximum */ + sizlBitmap.cx = min(sizlBitmap.cx, pfont->sizlMax.cx); + sizlBitmap.cy = min(sizlBitmap.cy, pfont->sizlMax.cy); + /* This is the box in which the bitmap fits */ pgd->rclInk.left = ftglyph->bitmap_left; pgd->rclInk.top = -ftglyph->bitmap_top; - pgd->rclInk.right = pgd->rclInk.left + ftglyph->bitmap.width; - pgd->rclInk.bottom = pgd->rclInk.top + ftglyph->bitmap.rows; - - /* Make the bitmap at least 1x1 pixel large */ - if (ftglyph->bitmap.width == 0) pgd->rclInk.right++; - if (ftglyph->bitmap.rows == 0) pgd->rclInk.bottom++; + pgd->rclInk.right = pgd->rclInk.left + sizlBitmap.cx; + pgd->rclInk.bottom = pgd->rclInk.top + sizlBitmap.cy; /* FIX representation of bitmap top and bottom */ pgd->fxInkBottom = (-pgd->rclInk.bottom) << 4; @@ -456,12 +467,6 @@ pgd->ptqD.y.LowPart = 0; pgd->ptqD.y.HighPart = 0; - if (ftglyph->bitmap.width > pfont->sizlMax.cx || - ftglyph->bitmap.rows > pfont->sizlMax.cy) - { - __debugbreak(); - } - //__debugbreak(); } @@ -485,13 +490,9 @@ if (pgb->sizlBitmap.cx == 0) pgb->sizlBitmap.cx++; if (pgb->sizlBitmap.cy == 0) pgb->sizlBitmap.cy++; - if (pgb->sizlBitmap.cx > pfont->sizlMax.cx || - pgb->sizlBitmap.cy > pfont->sizlMax.cy) - { - WARN("The size of the bitmap exceeds the maximum size\n"); - __debugbreak(); - return; - } + /* Don't let the bitmap be larger than the maximum */ + pgb->sizlBitmap.cx = min(pgb->sizlBitmap.cx, pfont->sizlMax.cx); + pgb->sizlBitmap.cy = min(pgb->sizlBitmap.cy, pfont->sizlMax.cy); cjBitmapSize = BITMAP_SIZE(pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, @@ -505,7 +506,7 @@ } /* Copy the bitmap */ - FtfdCopyBits(pfont->jBpp, pgb->aj, &ftglyph->bitmap); + FtfdCopyBits(pfont->jBpp, pgb, &ftglyph->bitmap); //TRACE("QueryGlyphBits hg=%lx, (%ld,%ld) cjSize=%ld, need %ld\n", // hg, pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, cjSize, Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] Sun May 22 21:26:22 2011 @@ -7,8 +7,8 @@ - FtfdDisablePDEV: 100% done - FtfdEscape: unimplemented, probably unneccessary - FtfdLoadFontFile: 95% done -- FtfdQueryFont: 70% done, depends on FtfdInitIfiMetrics -- FtfdQueryFontTree: 70% done, depends on FtfdInitGlyphSet and FtfdInitKerningPairs +- FtfdQueryFont: 80% done, depends on FtfdInitIfiMetrics +- FtfdQueryFontTree: 90% done, depends on FtfdInitGlyphSet and FtfdInitKerningPairs - FtfdUnloadFontFile: 100% done, depends on FtfdDestroyFace - FtfdQueryFontFile: 50% - implement QFF_DESCRIPTION, unimportant @@ -32,21 +32,18 @@ ------------------- - FtfdInitIfiMetrics: 80% done - handle other font types than TTF/OTF - - dpwszFamilyName, dpwszStyleName, dpwszFaceName: locale - - dpwszUniqueName: get from 'name' table + - localized dpwszFamilyName, dpwszStyleName, dpwszFaceName + - get dpwszUniqueName from 'name' table - dpFontSim: implement - - dpCharSets: implement - fwdMacLineGap: from hhea table - fwdMaxCharInc: check/fix - fwdCapHeight: check/fix - - fwdUnderscorePosition: fix - - chFirstChar, chLastChar, chDefaultChar, chBreakChar: fix - - wcDefaultChar, wcBreakChar: fix - ptlBaseline: fix - ptlCaret: use hhea table caretSlopeRun, caretSlopeRise - Put most important charset into slot 0 -- FtfdInitGlyphSet: 100% done +- FtfdInitGlyphSet: 90% done + - completely handle symbol and other charsets - FtfdInitKerningPairs: 90% done - Should we do complete glyph -> unicode expansion? @@ -55,6 +52,7 @@ - FtfdCreateFontInstance: 95% - FtfdGetFontInstance: 100% done - FtfdQueryMaxExtents: 90% done + - check lNonLinear* and lMin* - FtfdLoadGlyph: 80% done - hande accelerator flags for bitmap / outline @@ -62,17 +60,20 @@ - handle vertical layout - handle ptqD for rotation / skewing -- FtfdQueryGlyphBits: 90% depends on FtfdCopyBitmap4Bpp and FtfdCopyBitmap1Bpp +- FtfdQueryGlyphBits: 90% depends on FtfdCopyBits - FtfdQueryGlyphOutline: unimplemented -- FtfdCopyBitmap4Bpp: 90 % +- FtfdCopyBits: 70 % depends on FtfdCopyBits_S1D1, FtfdCopyBits_S1D4, + FtfdCopyBits_S8D1, FtfdCopyBits_S8D4 + +- FtfdCopyBits_S1D1: 95 % + - Can we use full memcpy? +- FtfdCopyBits_S1D4: 100 % +- FtfdCopyBits_S8D1: unimpemented +- FtfdCopyBits_S8D4: 90% - add rounding - - Could need optimization -- FtfdCopyBitmap1Bpp: 90 % - - Can we use full memcpy? When replacing the original ttf driver ----------------------------------------------- -- Horizontal metrics are broken -- Marlett symbols are wrong +- arrow symbol in startmenu is broken

13 years, 5 months

[janderwald] 51852: [OHCI] - Add check that controller is functional state - enable interrupts after the controller has been started - partly implement isr routine

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun May 22 20:48:50 2011 New Revision: 51852 URL: http://svn.reactos.org/svn/reactos?rev=51852&view=rev Log: [OHCI] - Add check that controller is functional state - enable interrupts after the controller has been started - partly implement isr routine Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp branches/usb-bringup/drivers/usb/usbohci/usbohci.h Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sun May 22 20:48:50 2011 @@ -22,7 +22,7 @@ VOID NTAPI -EhciDefferedRoutine( +OhciDefferedRoutine( IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, @@ -82,7 +82,7 @@ // friend function friend BOOLEAN NTAPI InterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); - friend VOID NTAPI EhciDefferedRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); + friend VOID NTAPI OhciDefferedRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); friend VOID NTAPI StatusChangeWorkItemRoutine(PVOID Context); // constructor / destructor CUSBHardwareDevice(IUnknown *OuterUnknown){} @@ -249,7 +249,7 @@ case CmResourceTypeInterrupt: { KeInitializeDpc(&m_IntDpcObject, - EhciDefferedRoutine, + OhciDefferedRoutine, this); Status = IoConnectInterrupt(&m_Interrupt, @@ -522,6 +522,21 @@ WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), Control); // + // wait a bit + // + KeStallExecutionProcessor(100); + + // + // is the controller started + // + Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); + + // + // assert that the controller has been started + // + ASSERT((Control & OHCI_HC_FUNCTIONAL_STATE_MASK) == OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); + + // // retrieve number of ports // for(Index = 0; Index < 10; Index++) @@ -562,6 +577,12 @@ // print out number ports // DPRINT1("NumberOfPorts %lu\n", m_NumberOfPorts); + + + // + // now enable the interrupts + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_NORMAL_INTERRUPTS | OHCI_MASTER_INTERRUPT_ENABLE); // // done @@ -938,19 +959,150 @@ IN PKINTERRUPT Interrupt, IN PVOID ServiceContext) { - ASSERT(FALSE); + CUSBHardwareDevice *This; + ULONG DoneHead, Status, Acknowledge = 0; + + // + // get context + // + This = (CUSBHardwareDevice*) ServiceContext; + + DPRINT1("InterruptServiceRoutine\n"); + + // + // get done head + // + DoneHead = This->m_HCCA->DoneHead; + + // + // check if zero + // + if (DoneHead == 0) + { + // + // the interrupt was not caused by DoneHead update + // check if something important happened + // + Status = READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)) & READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET)) & (~OHCI_WRITEBACK_DONE_HEAD); + if (Status == 0) + { + // + // nothing happened, appears to be shared interrupt + // + return FALSE; + } + } + else + { + // + // DoneHead update happened, check if there are other events too + // + Status = OHCI_WRITEBACK_DONE_HEAD; + + // + // since ed descriptors are 16 byte aligned, the controller sets the lower bits if there were other interrupt requests + // + if (DoneHead & OHCI_DONE_INTERRUPTS) + { + // + // get other events + // + Status |= READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)) & READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET)); + } + } + + // + // sanity check + // + ASSERT(Status != 0); + + if (Status & OHCI_WRITEBACK_DONE_HEAD) + { + // + // head completed + // + DPRINT1("InterruptServiceRoutine> Done Head completion\n"); + + // + // FIXME: handle event + // + Acknowledge |= OHCI_WRITEBACK_DONE_HEAD; + } + + if (Status & OHCI_RESUME_DETECTED) + { + // + // resume + // + DPRINT1("InterruptServiceRoutine> Resume\n"); + Acknowledge |= OHCI_RESUME_DETECTED; + } + + + if (Status & OHCI_UNRECOVERABLE_ERROR) + { + DPRINT1("InterruptServiceRoutine> Controller error\n"); + // + // halt controller + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)(This->m_Base + OHCI_CONTROL_OFFSET)), OHCI_HC_FUNCTIONAL_STATE_RESET); + } + + if (Status & OHCI_ROOT_HUB_STATUS_CHANGE) + { + // + // new device has arrived + // + DPRINT1("InterruptServiceRoutine> New Device arrival\n"); + + // + // disable interrupt as it will fire untill the port has been reset + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)(This->m_Base + OHCI_INTERRUPT_DISABLE_OFFSET)), OHCI_ROOT_HUB_STATUS_CHANGE); + Acknowledge |= OHCI_ROOT_HUB_STATUS_CHANGE; + } + + // + // is there something to acknowledge + // + if (Acknowledge) + { + // + // ack change + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)(This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)), Acknowledge); + } + + // + // defer processing + // + DPRINT1("Status %x\n", Status); + KeInsertQueueDpc(&This->m_IntDpcObject, This, (PVOID)Status); + + // + // interrupt handled + // return TRUE; } -VOID NTAPI -EhciDefferedRoutine( +VOID +NTAPI +OhciDefferedRoutine( IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2) { - ASSERT(FALSE); - return; + CUSBHardwareDevice *This; + ULONG CStatus; + + // + // get parameters + // + This = (CUSBHardwareDevice*) SystemArgument1; + CStatus = (ULONG) SystemArgument2; + + } VOID Modified: branches/usb-bringup/drivers/usb/usbohci/usbohci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usbohci.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usbohci.h [iso-8859-1] Sun May 22 20:48:50 2011 @@ -49,7 +49,7 @@ // // tag for allocations // -#define TAG_USBOHCI 'ICHE' +#define TAG_USBOHCI 'ICHO' // // assert for c++ - taken from portcls

13 years, 5 months

← Newer
1
...
15
16
17
18
19
20
21
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011