Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[royce] 13344: bug fix: use the requested default os when timeout is 0 instead of defaulting to the first OS in the list.

by royce＠svn.reactos.com

bug fix: use the requested default os when timeout is 0 instead of defaulting to the first OS in the list. Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-01-27 21:23:43 UTC (rev 13343) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-01-28 06:07:48 UTC (rev 13344) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - + #include <freeldr.h> #include <rtl.h> #include <fs.h> @@ -70,14 +70,14 @@ MachConsGetCh(); return; } - + if (!InitOperatingSystemList(&OperatingSystemSectionNames, &OperatingSystemDisplayNames, &OperatingSystemCount)) { UiMessageBox("Press ENTER to reboot.\n"); goto reboot; } - + if (OperatingSystemCount == 0) { UiMessageBox("There were no operating systems listed in freeldr.ini.\nPress ENTER to reboot."); @@ -85,7 +85,7 @@ } DefaultOperatingSystem = GetDefaultOperatingSystem(OperatingSystemSectionNames, OperatingSystemCount); - + // // Find all the message box settings and run them // @@ -93,12 +93,13 @@ for (;;) { - + /* If Timeout is 0, don't even bother loading any gui */ if (!UserInterfaceUp) { + SelectedOperatingSystem = DefaultOperatingSystem; goto NoGui; } - + // Redraw the backdrop UiDrawBackdrop(); @@ -108,10 +109,9 @@ UiMessageBox("Press ENTER to reboot.\n"); goto reboot; } - + NoGui: TimeOut = -1; - DefaultOperatingSystem = SelectedOperatingSystem; // Try to open the operating system section in the .ini file if (!IniOpenSection(OperatingSystemSectionNames[SelectedOperatingSystem], &SectionId)) @@ -153,7 +153,7 @@ } } - + reboot: UiUnInitialize("Rebooting..."); return;

19 years, 7 months

[gdalsnes] 13343: build msvcrt and crtdll from same source via lib\crt

by gdalsnes＠svn.reactos.com

build msvcrt and crtdll from same source via lib\crt fix problem with scanf/printf reading/printing doubles Modified: trunk/reactos/Makefile Modified: trunk/reactos/include/msvcrt/internal/file.h Added: trunk/reactos/include/msvcrt/wine/ Added: trunk/reactos/include/msvcrt/wine/cppexcept.h Added: trunk/reactos/include/msvcrt/wine/eh.h Added: trunk/reactos/include/msvcrt/wine/msvcrt.h _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-01-27 21:18:04 UTC (rev 13342) +++ trunk/reactos/Makefile 2005-01-27 21:23:43 UTC (rev 13343) @@ -42,7 +42,7 @@ LIB_FSLIB = vfatlib # Static libraries -LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns dxguid strmiids +LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns dxguid strmiids crt # Keyboard layout libraries DLLS_KBD = kbdda kbddv kbdes kbdfr kbdgr kbdse kbduk kbdus _____ Modified: trunk/reactos/include/msvcrt/internal/file.h --- trunk/reactos/include/msvcrt/internal/file.h 2005-01-27 21:18:04 UTC (rev 13342) +++ trunk/reactos/include/msvcrt/internal/file.h 2005-01-27 21:23:43 UTC (rev 13343) @@ -70,6 +70,8 @@ void _dosmaperr(unsigned long oserrcode); +extern int __fmode; + #ifdef __cplusplus } #endif _____ Copied: trunk/reactos/include/msvcrt/wine/cppexcept.h (from rev 13290, trunk/reactos/lib/msvcrt/wine/cppexcept.h) _____ Copied: trunk/reactos/include/msvcrt/wine/eh.h (from rev 13290, trunk/reactos/lib/msvcrt/wine/eh.h) _____ Copied: trunk/reactos/include/msvcrt/wine/msvcrt.h (from rev 13290, trunk/reactos/lib/msvcrt/wine/msvcrt.h)

19 years, 7 months

[gdalsnes] 13342: build msvcrt and crtdll from same source via lib\crt

by gdalsnes＠svn.reactos.com

build msvcrt and crtdll from same source via lib\crt fix problem with scanf/printf reading/printing doubles Added: trunk/reactos/lib/crt/ Added: trunk/reactos/lib/crt/README.txt Added: trunk/reactos/lib/crt/conio/ Added: trunk/reactos/lib/crt/ctype/ Added: trunk/reactos/lib/crt/direct/ Added: trunk/reactos/lib/crt/except/ Added: trunk/reactos/lib/crt/float/ Added: trunk/reactos/lib/crt/io/ Modified: trunk/reactos/lib/crt/io/fmode.c Modified: trunk/reactos/lib/crt/io/open.c Modified: trunk/reactos/lib/crt/io/read.c Added: trunk/reactos/lib/crt/locale/ Modified: trunk/reactos/lib/crt/locale/locale.c Added: trunk/reactos/lib/crt/makefile Added: trunk/reactos/lib/crt/math/ Added: trunk/reactos/lib/crt/mbstring/ Added: trunk/reactos/lib/crt/misc/ Deleted: trunk/reactos/lib/crt/misc/dllmain.c Modified: trunk/reactos/lib/crt/misc/environ.c Modified: trunk/reactos/lib/crt/misc/getargs.c Added: trunk/reactos/lib/crt/precomp.h Added: trunk/reactos/lib/crt/process/ Modified: trunk/reactos/lib/crt/process/_system.c Added: trunk/reactos/lib/crt/search/ Added: trunk/reactos/lib/crt/setjmp/ Added: trunk/reactos/lib/crt/signal/ Added: trunk/reactos/lib/crt/signal/xcptinfo.c Added: trunk/reactos/lib/crt/stdio/ Modified: trunk/reactos/lib/crt/stdio/fopen.c Modified: trunk/reactos/lib/crt/stdio/freopen.c Modified: trunk/reactos/lib/crt/stdio/fsopen.c Modified: trunk/reactos/lib/crt/stdio/popen.c Modified: trunk/reactos/lib/crt/stdio/vfprintf.c Modified: trunk/reactos/lib/crt/stdio/vfscanf.c Modified: trunk/reactos/lib/crt/stdio/vfwprint.c Added: trunk/reactos/lib/crt/stdlib/ Modified: trunk/reactos/lib/crt/stdlib/getenv.c Added: trunk/reactos/lib/crt/string/ Added: trunk/reactos/lib/crt/sys_stat/ Added: trunk/reactos/lib/crt/sys_stat/systime.c Added: trunk/reactos/lib/crt/time/ Added: trunk/reactos/lib/crt/wine/ Modified: trunk/reactos/lib/crt/wine/cpp.c Modified: trunk/reactos/lib/crt/wine/cppexcept.c Deleted: trunk/reactos/lib/crt/wine/cppexcept.h Deleted: trunk/reactos/lib/crt/wine/eh.h Modified: trunk/reactos/lib/crt/wine/heap.c Deleted: trunk/reactos/lib/crt/wine/msvcrt.h Modified: trunk/reactos/lib/crt/wine/thread.c Added: trunk/reactos/lib/crt/wstring/ _____ Copied: trunk/reactos/lib/crt/README.txt (from rev 13314, trunk/reactos/lib/msvcrt/README.txt) _____ Copied: trunk/reactos/lib/crt/conio (from rev 13291, trunk/reactos/lib/msvcrt/conio) _____ Copied: trunk/reactos/lib/crt/ctype (from rev 13290, trunk/reactos/lib/msvcrt/ctype) _____ Copied: trunk/reactos/lib/crt/direct (from rev 13290, trunk/reactos/lib/msvcrt/direct) _____ Copied: trunk/reactos/lib/crt/except (from rev 13290, trunk/reactos/lib/msvcrt/except) _____ Copied: trunk/reactos/lib/crt/float (from rev 13290, trunk/reactos/lib/msvcrt/float) _____ Copied: trunk/reactos/lib/crt/io (from rev 13290, trunk/reactos/lib/msvcrt/io) _____ Modified: trunk/reactos/lib/crt/io/fmode.c --- trunk/reactos/lib/msvcrt/io/fmode.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/crt/io/fmode.c 2005-01-27 21:18:04 UTC (rev 13342) @@ -2,13 +2,13 @@ #include <msvcrt/fcntl.h> #include <msvcrt/io.h> -#undef _fmode -unsigned int _fmode = O_TEXT; +int __fmode = O_TEXT; + /* * @implemented */ -unsigned int *__p__fmode(void) +int *__p__fmode(void) { - return &_fmode; + return &__fmode; } _____ Modified: trunk/reactos/lib/crt/io/open.c --- trunk/reactos/lib/msvcrt/io/open.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/crt/io/open.c 2005-01-27 21:18:04 UTC (rev 13342) @@ -21,10 +21,10 @@ #include <msvcrt/fcntl.h> #include <msvcrt/sys/stat.h> #include <msvcrt/stdlib.h> -#include <msvcrt/internal/file.h> #include <msvcrt/string.h> #include <msvcrt/share.h> #include <msvcrt/errno.h> +#include <msvcrt/internal/file.h> #define NDEBUG #include <msvcrt/msvcrtdbg.h> @@ -192,7 +192,7 @@ } DPRINT("OK\n"); if (!(_oflag & (_O_TEXT|_O_BINARY))) { - _oflag |= _fmode; + _oflag |= __fmode; } return __fileno_alloc(hFile,_oflag); } _____ Modified: trunk/reactos/lib/crt/io/read.c --- trunk/reactos/lib/msvcrt/io/read.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/crt/io/read.c 2005-01-27 21:18:04 UTC (rev 13342) @@ -12,7 +12,7 @@ * behavior for line-buffered streams (KJK::Hyperion) */ -#include "precomp.h" +#include <windows.h> #include <msvcrt/io.h> #include <msvcrt/internal/file.h> _____ Copied: trunk/reactos/lib/crt/locale (from rev 13290, trunk/reactos/lib/msvcrt/locale) _____ Modified: trunk/reactos/lib/crt/locale/locale.c --- trunk/reactos/lib/msvcrt/locale/locale.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/crt/locale/locale.c 2005-01-27 21:18:04 UTC (rev 13342) @@ -1,3 +1,9 @@ +/* + * Some stuff takem from wine msvcrt\locale.c + * + * Copyright 2000 Jon Griffiths + */ + #include "precomp.h" #include <msvcrt/stdio.h> #include <msvcrt/locale.h> @@ -201,3 +207,74 @@ DPRINT1("__lc_codepage - stub\n"); return; } + + +/********************************************************************* + * _Gettnames (MSVCRT.@) + */ +void *_Gettnames(void) +{ + DPRINT1("(void), stub!\n"); + return NULL; +} + +/********************************************************************* + * __lconv_init (MSVCRT.@) + */ +void __lconv_init(void) +{ + DPRINT1(" stub\n"); +} + + +/********************************************************************* + * _Strftime (MSVCRT.@) + */ +const char* _Strftime(char *out, unsigned int len, const char *fmt, + const void *tm, void *foo) +{ + /* FIXME: */ + DPRINT1("(%p %d %s %p %p) stub\n", out, len, fmt, tm, foo); + return ""; +} + + +/********************************************************************* + * _Getdays (MSVCRT.@) + */ +const char* _Getdays(void) +{ + static const char *MSVCRT_days = ":Sun:Sunday:Mon:Monday:Tue:Tuesday:Wed:" + "Wednesday:Thu:Thursday:Fri:Friday:Sat:Saturday"; + /* FIXME: Use locale */ + DPRINT1("(void) semi-stub\n"); + return MSVCRT_days; +} + +/********************************************************************* + * _Getmonths (MSVCRT.@) + */ +const char* _Getmonths(void) +{ + static const char *MSVCRT_months = ":Jan:January:Feb:February:Mar:March:Apr:" + "April:May:May:Jun:June:Jul:July:Aug:August:Sep:September:Oct:" + "October:Nov:November:Dec:December"; + /* FIXME: Use locale */ + DPRINT1("(void) semi-stub\n"); + return MSVCRT_months; +} + +/********************************************************************* + * __crtLCMapStringA (MSVCRT.@) + */ +int __crtLCMapStringA( + LCID lcid, DWORD mapflags, const char* src, int srclen, char* dst, + int dstlen, unsigned int codepage, int xflag +) { + DPRINT1("(lcid %lx, flags %lx, %s(%d), %p(%d), %x, %d), partial stub!\n", + lcid,mapflags,src,srclen,dst,dstlen,codepage,xflag); + /* FIXME: A bit incorrect. But msvcrt itself just converts its + * arguments to wide strings and then calls LCMapStringW + */ + return LCMapStringA(lcid,mapflags,src,srclen,dst,dstlen); +} _____ Added: trunk/reactos/lib/crt/makefile --- trunk/reactos/lib/crt/makefile 2005-01-27 21:17:28 UTC (rev 13341) +++ trunk/reactos/lib/crt/makefile 2005-01-27 21:18:04 UTC (rev 13342) @@ -0,0 +1,475 @@ +# $Id: Makefile 12852 2005-01-06 13:58:04Z mf $ + +PATH_TO_TOP = ../.. + +TARGET_DEFONLY = yes + +TARGET_TYPE = library + +TARGET_NAME = crt + +TARGET_PCH = precomp.h + +TARGET_CFLAGS = -D_MSVCRT_LIB_ -Wall -Werror + +# require os code to explicitly request A/W version of structs/functions +TARGET_CFLAGS += \ + -D_DISABLE_TIDENTS \ + -D__USE_W32API \ + -D__REACTOS__ \ + -D_WIN32_IE=0x600 \ + -D_WIN32_WINNT=0x501 \ + -DUSE_MSVCRT_PREFIX \ + -D_MT + +CONIO_OBJECTS = \ + conio/cgets.o \ + conio/cprintf.o \ + conio/cputs.o \ + conio/cscanf.o \ + conio/getch.o \ + conio/getche.o \ + conio/kbhit.o \ + conio/putch.o \ + conio/ungetch.o + +CTYPE_OBJECTS = \ + ctype/ctype.o \ + ctype/isalnum.o \ + ctype/isalpha.o \ + ctype/isascii.o \ + ctype/iscntrl.o \ + ctype/isdigit.o \ + ctype/isgraph.o \ + ctype/islower.o \ + ctype/isprint.o \ + ctype/ispunct.o \ + ctype/isspace.o \ + ctype/isupper.o \ + ctype/isxdigit.o \ + ctype/toascii.o \ + ctype/tolower.o \ + ctype/toupper.o \ + ctype/iscsym.o \ + ctype/isctype.o + +DIRECT_OBJECTS = \ + direct/chdir.o \ + direct/chdrive.o \ + direct/getcwd.o \ + direct/getdcwd.o \ + direct/getdfree.o \ + direct/getdrive.o \ + direct/mkdir.o \ + direct/rmdir.o \ + direct/wchdir.o \ + direct/wgetcwd.o \ + direct/wgetdcwd.o \ + direct/wmkdir.o \ + direct/wrmdir.o + +EXCEPT_OBJECTS = \ + except/seh.o \ + except/abnorter.o \ + except/exhand2.o \ + except/matherr.o \ + except/unwind.o \ + except/xcptfil.o + +FLOAT_OBJECTS = \ + float/chgsign.o \ + float/clearfp.o \ + float/cntrlfp.o \ + float/copysign.o \ + float/fpclass.o \ + float/fpecode.o \ + float/fpreset.o \ + float/isnan.o \ + float/logb.o \ + float/nafter.o \ + float/scalb.o \ + float/statfp.o + +IO_OBJECTS = \ + io/access.o \ + io/chmod.o \ + io/chsize.o \ + io/close.o \ + io/commit.o \ + io/create.o \ + io/dup.o \ + io/dup2.o \ + io/eof.o \ + io/filelen.o \ + io/fileleni.o \ + io/find.o \ + io/fmode.o \ + io/isatty.o \ + io/locking.o \ + io/lseek.o \ + io/lseeki64.o \ + io/mktemp.o \ + io/open.o \ + io/pipe.o \ + io/read.o \ + io/setmode.o \ + io/sopen.o \ + io/stubs.o \ + io/tell.o \ + io/telli64.o \ + io/umask.o \ + io/unlink.o \ + io/utime.o \ + io/waccess.o \ + io/wchmod.o \ + io/wcreate.o \ + io/wfind.o \ + io/wmktemp.o \ + io/wopen.o \ + io/write.o \ + io/wunlink.o \ + io/wutime.o + +LOCALE_OBJECTS = \ + locale/locale.o + +MATH_OBJECTS = \ + math/acos.o \ + math/adjust.o \ + math/asin.o \ + math/atan.o \ + math/atan2.o \ + math/cabs.o \ + math/ceil.o \ + math/cos.o \ + math/cosh.o \ + math/exp.o \ + math/fabs.o \ + math/floor.o \ + math/fmod.o \ + math/frexp.o \ + math/huge_val.o \ + math/hypot.o \ + math/j0_y0.o \ + math/j1_y1.o \ + math/jn_yn.o \ + math/ldexp.o \ + math/log.o \ + math/log10.o \ + math/modf.o \ + math/pow.o \ + math/sin.o \ + math/sinh.o \ + math/sqrt.o \ + math/stubs.o \ + math/tan.o \ + math/tanh.o + +MBSTRING_OBJECTS = \ + mbstring/hanzen.o \ + mbstring/ischira.o \ + mbstring/iskana.o \ + mbstring/iskpun.o \ + mbstring/islead.o \ + mbstring/islwr.o \ + mbstring/ismbal.o \ + mbstring/ismbaln.o \ + mbstring/ismbc.o \ + mbstring/ismbgra.o \ + mbstring/ismbkaln.o \ + mbstring/ismblead.o \ + mbstring/ismbpri.o \ + mbstring/ismbpun.o \ + mbstring/ismbtrl.o \ + mbstring/isuppr.o \ + mbstring/jistojms.o \ + mbstring/jmstojis.o \ + mbstring/mbbtype.o \ + mbstring/mbccpy.o \ + mbstring/mbclen.o \ + mbstring/mbscat.o \ + mbstring/mbschr.o \ + mbstring/mbscmp.o \ + mbstring/mbscoll.o \ + mbstring/mbscpy.o \ + mbstring/mbscspn.o \ + mbstring/mbsdec.o \ + mbstring/mbsdup.o \ + mbstring/mbsicmp.o \ + mbstring/mbsicoll.o \ + mbstring/mbsinc.o \ + mbstring/mbslen.o \ + mbstring/mbslwr.o \ + mbstring/mbsncat.o \ + mbstring/mbsnccnt.o \ + mbstring/mbsncmp.o \ + mbstring/mbsncoll.o \ + mbstring/mbsncpy.o \ + mbstring/mbsnextc.o \ + mbstring/mbsnicmp.o \ + mbstring/mbsnicoll.o \ + mbstring/mbsninc.o \ + mbstring/mbsnset.o \ + mbstring/mbspbrk.o \ + mbstring/mbsrchr.o \ + mbstring/mbsrev.o \ + mbstring/mbsset.o \ + mbstring/mbsspn.o \ + mbstring/mbsspnp.o \ + mbstring/mbsstr.o \ + mbstring/mbstok.o \ + mbstring/mbstrlen.o \ + mbstring/mbsupr.o + +MISC_OBJECTS = \ + misc/amsg.o \ + misc/assert.o \ + misc/crtmain.o \ + misc/environ.o \ + misc/getargs.o \ + misc/initterm.o \ + misc/lock.o \ + misc/purecall.o \ + misc/stubs.o \ + misc/tls.o + +PROCESS_OBJECTS = \ + process/_cwait.o \ + process/_system.o \ + process/dll.o \ + process/process.o \ + process/procid.o \ + process/thread.o \ + process/threadid.o \ + process/threadx.o + +SEARCH_OBJECTS = \ + search/lfind.o \ + search/lsearch.o + +SETJMP_OBJECTS = \ + setjmp/i386/setjmp.o + +SIGNAL_OBJECTS = \ + signal/signal.o \ + signal/xcptinfo.o + +STDIO_OBJECTS = \ + stdio/allocfil.o \ + stdio/clearerr.o \ + stdio/fclose.o \ + stdio/fdopen.o \ + stdio/feof.o \ + stdio/ferror.o \ + stdio/fflush.o \ + stdio/fgetc.o \ + stdio/fgetchar.o \ + stdio/fgetpos.o \ + stdio/fgets.o \ + stdio/fgetws.o \ + stdio/filbuf.o \ + stdio/fileno.o \ + stdio/flsbuf.o \ + stdio/fopen.o \ + stdio/fprintf.o \ + stdio/fputc.o \ + stdio/fputchar.o \ + stdio/fputs.o \ + stdio/fread.o \ + stdio/freopen.o \ + stdio/fscanf.o \ + stdio/fseek.o \ + stdio/fsetpos.o \ + stdio/fsopen.o \ + stdio/ftell.o \ + stdio/fwalk.o \ + stdio/fwrite.o \ + stdio/getc.o \ + stdio/getchar.o \ + stdio/gets.o \ + stdio/getw.o \ + stdio/perror.o \ + stdio/popen.o \ + stdio/printf.o \ + stdio/putc.o \ + stdio/putchar.o \ + stdio/puts.o \ + stdio/putw.o \ + stdio/remove.o \ + stdio/rename.o \ + stdio/rewind.o \ + stdio/rmtmp.o \ + stdio/scanf.o \ + stdio/setbuf.o \ + stdio/setvbuf.o \ + stdio/sprintf.o \ + stdio/sscanf.o \ + stdio/stdhnd.o \ + stdio/tempnam.o \ + stdio/tmpfile.o \ + stdio/tmpnam.o \ + stdio/ungetc.o \ + stdio/vfprintf.o \ + stdio/vfscanf.o \ + stdio/vfwprint.o \ + stdio/vprintf.o \ + stdio/vscanf.o \ + stdio/vsprintf.o \ + stdio/vsscanf.o \ + stdio/wfdopen.o \ + stdio/wrename.o \ + stdio/wtempnam.o \ + stdio/wtmpnam.o + +STDLIB_OBJECTS = \ + stdlib/_exit.o \ + stdlib/abort.o \ + stdlib/abs.o \ + stdlib/atexit.o \ + stdlib/atof.o \ + stdlib/atoi.o \ + stdlib/atoi64.o \ + stdlib/atol.o \ + stdlib/bsearch.o \ + stdlib/div.o \ + stdlib/ecvt.o \ + stdlib/ecvtbuf.o \ + stdlib/errno.o \ + stdlib/fcvt.o \ + stdlib/fcvtbuf.o \ + stdlib/fullpath.o \ + stdlib/gcvt.o \ + stdlib/getenv.o \ + stdlib/itoa.o \ + stdlib/itow.o \ + stdlib/labs.o \ + stdlib/ldiv.o \ + stdlib/makepath.o \ + stdlib/malloc.o \ + stdlib/mbstowcs.o \ + stdlib/mbtowc.o \ + stdlib/obsol.o \ + stdlib/putenv.o \ + stdlib/qsort.o \ + stdlib/rand.o \ + stdlib/rot.o \ + stdlib/senv.o \ + stdlib/splitp.o \ + stdlib/strtod.o \ + stdlib/strtol.o \ + stdlib/strtoul.o \ + stdlib/swab.o \ + stdlib/wcstod.o \ + stdlib/wcstol.o \ + stdlib/wcstombs.o \ + stdlib/wcstoul.o \ + stdlib/wctomb.o \ + stdlib/wfulpath.o \ + stdlib/witoa.o \ + stdlib/witow.o \ + stdlib/wputenv.o \ + stdlib/wsenv.o \ + stdlib/wsplitp.o \ + stdlib/wmakpath.o \ + stdlib/wtoi.o \ + stdlib/wtoi64.o + +STRING_OBJECTS = \ + string/lasttok.o \ + string/memicmp.o \ + string/strcoll.o \ + string/strdup.o \ + string/strerror.o \ + string/stricmp.o \ + string/strlwr.o \ + string/strncoll.o \ + string/strnicmp.o \ + string/strpbrk.o \ + string/strrev.o\ + string/strset.o \ + string/strstr.o \ + string/strtok.o \ + string/strupr.o \ + string/strxfrm.o + +SYS_STAT_OBJECTS = \ + sys_stat/fstat.o \ + sys_stat/fstati64.o \ + sys_stat/futime.o \ + sys_stat/stat.o \ + sys_stat/wstat.o \ + sys_stat/systime.o + +TIME_OBJECTS = \ + time/clock.o \ + time/ctime.o \ + time/difftime.o \ + time/ftime.o \ + time/strdate.o \ + time/strftime.o \ + time/strtime.o \ + time/time.o \ + time/tz_vars.o \ + time/wctime.o \ + time/wstrdate.o \ + time/wstrtime.o + + + +WSTRING_OBJECTS = \ + wstring/wcscoll.o \ + wstring/wcscspn.o \ + wstring/wcsdup.o \ + wstring/wcsicmp.o \ + wstring/wcslwr.o \ + wstring/wcsnicmp.o \ + wstring/wcspbrk.o \ + wstring/wcsrev.o \ + wstring/wcsset.o \ + wstring/wcsspn.o \ + wstring/wcsstr.o \ + wstring/wcstok.o \ + wstring/wcsupr.o \ + wstring/wcsxfrm.o \ + wstring/wlasttok.o + +WINE_OBJECTS = \ + wine/cpp.o \ + wine/cppexcept.o \ + wine/heap.o \ + wine/thread.o + +TARGET_OBJECTS = \ + $(CONIO_OBJECTS) \ + $(CTYPE_OBJECTS) \ + $(DIRECT_OBJECTS) \ + $(EXCEPT_OBJECTS) \ + $(FLOAT_OBJECTS) \ + $(IO_OBJECTS) \ + $(LOCALE_OBJECTS) \ + $(MATH_OBJECTS) \ + $(MBSTRING_OBJECTS) \ + $(MISC_OBJECTS) \ + $(PROCESS_OBJECTS) \ + $(SEARCH_OBJECTS) \ + $(SETJMP_OBJECTS) \ + $(SIGNAL_OBJECTS) \ + $(STDIO_OBJECTS) \ + $(STDLIB_OBJECTS) \ + $(STRING_OBJECTS) \ + $(SYS_STAT_OBJECTS) \ + $(TIME_OBJECTS) \ + $(WSTRING_OBJECTS) \ + $(WINE_OBJECTS) + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +DEP_OBJECTS := $(TARGET_OBJECTS) + +TARGET_CLEAN = $(DEP_FILES) + +include $(PATH_TO_TOP)/tools/depend.mk + +# EOF _____ Copied: trunk/reactos/lib/crt/math (from rev 13290, trunk/reactos/lib/msvcrt/math) _____ Copied: trunk/reactos/lib/crt/mbstring (from rev 13290, trunk/reactos/lib/msvcrt/mbstring) _____ Copied: trunk/reactos/lib/crt/misc (from rev 13290, trunk/reactos/lib/msvcrt/misc) _____ Deleted: trunk/reactos/lib/crt/misc/dllmain.c --- trunk/reactos/lib/msvcrt/misc/dllmain.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/crt/misc/dllmain.c 2005-01-27 21:18:04 UTC (rev 13342) @@ -1,140 +0,0 @@ -/* $Id$ - * - * dllmain.c - * - * ReactOS MSVCRT.DLL Compatibility Library - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAMED. This includes but is not limited to warrenties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision: 1.24 $ - * $Author$ - * $Date$ - * - */ - -#include "precomp.h" -#include <msvcrt/internal/tls.h> -#include <msvcrt/stdlib.h> -#include "../wine/msvcrt.h" - -#define NDEBUG -#include <msvcrt/msvcrtdbg.h> - - -/* EXTERNAL PROTOTYPES ********************************************************/ - -//void __fileno_init(void); -extern BOOL __fileno_init(void); -extern int BlockEnvToEnvironA(void); -extern int BlockEnvToEnvironW(void); -extern void FreeEnvironment(char **environment); - -extern unsigned int _osver; -extern unsigned int _winminor; -extern unsigned int _winmajor; -extern unsigned int _winver; - -extern char* _acmdln; /* pointer to ascii command line */ -extern wchar_t* _wcmdln; /* pointer to wide character command line */ -#undef _environ -extern char** _environ; /* pointer to environment block */ -extern char** __initenv; /* pointer to initial environment block */ -extern wchar_t** _wenviron; /* pointer to environment block */ -extern wchar_t** __winitenv; /* pointer to initial environment block */ - - -/* LIBRARY GLOBAL VARIABLES ***************************************************/ - -HANDLE hHeap = NULL; /* handle for heap */ - - -/* LIBRARY ENTRY POINT ********************************************************/ - -BOOL -STDCALL -DllMain(PVOID hinstDll, ULONG dwReason, PVOID reserved) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH://1 - /* initialize version info */ - DPRINT("Attach %d\n", nAttachCount); - _osver = GetVersion(); - _winmajor = (_osver >> 8) & 0xFF; - _winminor = _osver & 0xFF; - _winver = (_winmajor << 8) + _winminor; - _osver = (_osver >> 16) & 0xFFFF; - hHeap = HeapCreate(0, 100000, 0); - if (hHeap == NULL) - return FALSE; - if (!__fileno_init()) - return FALSE; - - /* create tls stuff */ - if (!CreateThreadData()) - return FALSE; - - if (BlockEnvToEnvironA() < 0) - return FALSE; - - if (BlockEnvToEnvironW() < 0) - { - FreeEnvironment((char**)_wenviron); - return FALSE; - } - - _acmdln = strdup(GetCommandLineA()); - _wcmdln = wcsdup(GetCommandLineW()); - - /* FIXME: more initializations... */ - - /* FIXME: Initialization of the WINE code */ - msvcrt_init_mt_locks(); - - DPRINT("Attach done\n"); - break; - - case DLL_THREAD_ATTACH://2 - break; - - case DLL_THREAD_DETACH://4 - FreeThreadData(NULL); - break; - - case DLL_PROCESS_DETACH://0 - DPRINT("Detach %d\n", nAttachCount); - /* FIXME: more cleanup... */ - _fcloseall(); - - /* destroy tls stuff */ - DestroyThreadData(); - - if (__winitenv && __winitenv != _wenviron) - FreeEnvironment((char**)__winitenv); - if (_wenviron) - FreeEnvironment((char**)_wenviron); - - if (__initenv && __initenv != _environ) - FreeEnvironment(__initenv); - if (_environ) - FreeEnvironment(_environ); - - /* destroy heap */ - HeapDestroy(hHeap); - - DPRINT("Detach done\n"); - break; - } - - return TRUE; -} - -/* EOF */ _____ Modified: trunk/reactos/lib/crt/misc/environ.c --- trunk/reactos/lib/msvcrt/misc/environ.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/crt/misc/environ.c 2005-01-27 21:18:04 UTC (rev 13342) @@ -9,7 +9,7 @@ #include <msvcrt/internal/tls.h> #include <msvcrt/stdlib.h> #include <msvcrt/string.h> - + #define NDEBUG #include <msvcrt/msvcrtdbg.h> @@ -18,6 +18,7 @@ unsigned int _winminor = 0; unsigned int _winmajor = 0; unsigned int _winver = 0; + char *_acmdln = NULL; /* pointer to ascii command line */ wchar_t *_wcmdln = NULL; /* pointer to wide character command line */ @@ -165,9 +166,9 @@ for (envptr = original_environment; count > 1; newenvptr++, count--) { if (wide) - *newenvptr = (char*)wcsdup((wchar_t*)*envptr++); + *newenvptr = (char*)_wcsdup((wchar_t*)*envptr++); else - *newenvptr = strdup(*envptr++); + *newenvptr = _strdup(*envptr++); if (*newenvptr == NULL) { for (newenvptr--; newenvptr >= newenv; newenvptr--); @@ -243,7 +244,7 @@ /* Find the option we're trying to modify. */ for (index = 0, wenvptr = _wenviron; *wenvptr != NULL; wenvptr++, index++) { - if (!wcsnicmp(*wenvptr, option, epos - option)) + if (!_wcsnicmp(*wenvptr, option, epos - option)) { found = 1; break; @@ -277,7 +278,7 @@ else { /* Make a copy of the option that we will store in the environment block. */ - woption = wcsdup((wchar_t*)option); + woption = _wcsdup((wchar_t*)option); if (woption == NULL) { free(name); _____ Modified: trunk/reactos/lib/crt/misc/getargs.c --- trunk/reactos/lib/msvcrt/misc/getargs.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/crt/misc/getargs.c 2005-01-27 21:18:04 UTC (rev 13342) @@ -68,7 +68,7 @@ do { if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { strcpy(&buffer[pos], fd.cFileName); - if (add(strdup(buffer)) < 0) { + if (add(_strdup(buffer)) < 0) { FindClose(hFile); return -1; } @@ -136,7 +136,7 @@ *argc = __argc; *argv = __argv; *env = _environ; - _pgmptr = strdup((char*)argv[0]); + _pgmptr = _strdup((char*)argv[0]); return 0; } _____ Added: trunk/reactos/lib/crt/precomp.h --- trunk/reactos/lib/crt/precomp.h 2005-01-27 21:17:28 UTC (rev 13341) +++ trunk/reactos/lib/crt/precomp.h 2005-01-27 21:18:04 UTC (rev 13342) @@ -0,0 +1 @@ +#include <windows.h> _____ Copied: trunk/reactos/lib/crt/process (from rev 13290, trunk/reactos/lib/msvcrt/process) _____ Modified: trunk/reactos/lib/crt/process/_system.c --- trunk/reactos/lib/msvcrt/process/_system.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/crt/process/_system.c 2005-01-27 21:18:04 UTC (rev 13342) @@ -47,7 +47,7 @@ if (szComSpec == NULL) { - szComSpec = strdup("cmd.exe"); + szComSpec = _strdup("cmd.exe"); if (szComSpec == NULL) { __set_errno(ENOMEM); _____ Copied: trunk/reactos/lib/crt/search (from rev 13290, trunk/reactos/lib/msvcrt/search) _____ Copied: trunk/reactos/lib/crt/setjmp (from rev 13290, trunk/reactos/lib/msvcrt/setjmp) _____ Copied: trunk/reactos/lib/crt/signal (from rev 13290, trunk/reactos/lib/msvcrt/signal) _____ Added: trunk/reactos/lib/crt/signal/xcptinfo.c --- trunk/reactos/lib/msvcrt/signal/xcptinfo.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/crt/signal/xcptinfo.c 2005-01-27 21:18:04 UTC (rev 13342) @@ -0,0 +1,9 @@ +#include <msvcrt/stdlib.h> + +/* + * @unimplemented + */ +void **__pxcptinfoptrs (void) +{ + return NULL; +} _____ Copied: trunk/reactos/lib/crt/stdio (from rev 13290, trunk/reactos/lib/msvcrt/stdio) _____ Modified: trunk/reactos/lib/crt/stdio/fopen.c --- trunk/reactos/lib/msvcrt/stdio/fopen.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/crt/stdio/fopen.c 2005-01-27 21:18:04 UTC (rev 13342) @@ -30,18 +30,13 @@ #include <msvcrt/string.h> #include <msvcrt/io.h> #include <msvcrt/fcntl.h> -//#include <msvcrt/internal/file.h> +#include <msvcrt/internal/file.h> //might change fopen(file,mode) -> fsopen(file,mode,_SH_DENYNO); -#undef _fmode -extern unsigned int _fmode; - FILE* __alloc_file(void); -//extern int _fmode; - FILE* fopen(const char *file, const char *mode) { FILE *f; @@ -68,7 +63,7 @@ else if (strchr(mode, 'b')) oflags |= O_BINARY; else - oflags |= (_fmode & (O_TEXT|O_BINARY)); + oflags |= (__fmode & (O_TEXT|O_BINARY)); fd = _open(file, oflags, 0); if (fd < 0) @@ -94,7 +89,7 @@ f->_flag |= _IOTEXT; else if (strchr(mode, 'b')) f->_flag |= _IOBINARY; - else if (_fmode & O_BINARY) + else if (__fmode & O_BINARY) f->_flag |= _IOBINARY; f->_base = f->_ptr = NULL; @@ -130,7 +125,7 @@ else if (wcschr(mode, L'b')) oflags |= O_BINARY; else - oflags |= (_fmode & (O_TEXT|O_BINARY)); + oflags |= (__fmode & (O_TEXT|O_BINARY)); fd = _wopen(file, oflags, 0); if (fd < 0) @@ -155,7 +150,7 @@ f->_flag |= _IOTEXT; else if (wcschr(mode, L'b')) f->_flag |= _IOBINARY; - else if (_fmode & O_BINARY) + else if (__fmode & O_BINARY) f->_flag |= _IOBINARY; f->_base = f->_ptr = NULL; _____ Modified: trunk/reactos/lib/crt/stdio/freopen.c --- trunk/reactos/lib/msvcrt/stdio/freopen.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/crt/stdio/freopen.c 2005-01-27 21:18:04 UTC (rev 13342) @@ -44,7 +44,7 @@ else if (tbchar == 'b') oflags |= O_BINARY; else - oflags |= (_fmode & (O_TEXT|O_BINARY)); + oflags |= (__fmode & (O_TEXT|O_BINARY)); fd = _open(file, oflags, 0666); if (fd < 0) @@ -104,7 +104,7 @@ else if (tbchar == L'b') oflags |= O_BINARY; else - oflags |= (_fmode & (O_TEXT|O_BINARY)); + oflags |= (__fmode & (O_TEXT|O_BINARY)); fd = _wopen(file, oflags, 0666); if (fd < 0) _____ Modified: trunk/reactos/lib/crt/stdio/fsopen.c --- trunk/reactos/lib/msvcrt/stdio/fsopen.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/crt/stdio/fsopen.c 2005-01-27 21:18:04 UTC (rev 13342) @@ -65,7 +65,7 @@ else if (tbchar == 'b') oflags |= O_BINARY; else - oflags |= (_fmode & (O_TEXT|O_BINARY)); + oflags |= (__fmode & (O_TEXT|O_BINARY)); if ( shflag == _SH_DENYNO ) shf = _S_IREAD | _S_IWRITE; @@ -146,7 +146,7 @@ else if (tbchar == L'b') oflags |= O_BINARY; else - oflags |= (_fmode & (O_TEXT|O_BINARY)); + oflags |= (__fmode & (O_TEXT|O_BINARY)); if ( shflag == _SH_DENYNO ) shf = _S_IREAD | _S_IWRITE; [truncated at 1000 lines; 3380 more skipped]

19 years, 7 months

[gdalsnes] 13341: build msvcrt and crtdll from same source via lib\crt

by gdalsnes＠svn.reactos.com

build msvcrt and crtdll from same source via lib\crt fix problem with scanf/printf reading/printing doubles Modified: trunk/reactos/lib/crtdll/crtdll.def Added: trunk/reactos/lib/crtdll/dllmain.c Modified: trunk/reactos/lib/crtdll/makefile _____ Modified: trunk/reactos/lib/crtdll/crtdll.def --- trunk/reactos/lib/crtdll/crtdll.def 2005-01-27 21:16:41 UTC (rev 13340) +++ trunk/reactos/lib/crtdll/crtdll.def 2005-01-27 21:17:28 UTC (rev 13341) @@ -35,16 +35,16 @@ ; __builtin_new ; __builtin_delete ; _set_new_handler__FPFUi_i +; I commented out these, cause i dont get why they were added. -Gunnar ; -; LIBRARY CRTDLL.DLL EXPORTS -__builtin_new -__builtin_delete -??2@YAPAXI@Z=malloc -??3@YAXPAX@Z=free -?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z=_set_new_handler__FPFUi_i -_set_new_handler__FPFUi_i +;__builtin_new +;__builtin_delete +??2@YAPAXI@Z=MSVCRT_operator_new +??3@YAXPAX@Z=MSVCRT_operator_delete +?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z=MSVCRT__set_new_handler +;_set_new_handler__FPFUi_i _CIacos _CIasin _CIatan @@ -61,31 +61,31 @@ _CIsqrt _CItan _CItanh -_HUGE_dll +_HUGE_dll=_HUGE DATA _XcptFilter __GetMainArgs -__argc_dll -__argv_dll +__argc_dll=__argc DATA +__argv_dll=__argv DATA __dllonexit __doserrno __fpecode __isascii __iscsym=NTDLL.__iscsym __iscsymf=NTDLL.__iscsymf -__mb_cur_max_dll +__mb_cur_max_dll=__mb_cur_max DATA __pxcptinfoptrs __threadhandle __threadid __toascii=NTDLL.__toascii _abnormal_termination _access -_acmdln_dll -_aexit_rtn_dll +_acmdln_dll=_acmdln DATA +_aexit_rtn_dll=_aexit_rtn DATA _amsg_exit _assert -_basemajor_dll -_baseminor_dll -_baseversion_dll +_basemajor_dll=CRTDLL__basemajor_dll DATA +_baseminor_dll=CRTDLL__baseminor_dll DATA +_baseversion_dll=CRTDLL__baseversion_dll DATA _beep _beginthread _c_exit @@ -100,23 +100,23 @@ _clearfp _close _commit -_commode_dll +_commode_dll=_commode DATA _control87 _controlfp _copysign _cprintf -_cpumode_dll +_cpumode_dll=_cpumode DATA ;fixme: wine has CRTDLL__cpumode_dll _cputs _creat _cscanf -_ctype +_ctype DATA _cwait -_daylight_dll +_daylight_dll=_daylight DATA _dup _dup2 _ecvt _endthread -_environ_dll +_environ_dll=_environ DATA _eof _errno _except_handler2 @@ -136,23 +136,23 @@ _fgetchar _fgetwchar _filbuf -_fileinfo_dll +;_fileinfo_dll=_fileinfo DATA _filelength -_fileno +_fileno DATA _findclose _findfirst _findnext _finite _flsbuf _flushall -_fmode_dll +_fmode_dll=__fmode DATA _fpclass _fpieee_flt _fpreset _fputchar _fputwchar _fsopen -_fstat +_fstat=CRTDLL__fstat _ftime _ftol=NTDLL._ftol _fullpath @@ -177,7 +177,7 @@ _heapwalk _hypot _initterm -_iob +_iob DATA _isatty _isctype _ismbbalnum @@ -236,7 +236,7 @@ _mbctolower _mbctombb _mbctoupper -_mbctype +_mbctype DATA _mbsbtype _mbscat _mbschr @@ -282,21 +282,21 @@ _onexit _open _open_osfhandle -_osmajor_dll -_osminor_dll -_osmode_dll -_osver_dll -_osversion_dll +_osmajor_dll=CRTDLL__osmajor_dll DATA +_osminor_dll=CRTDLL__osminor_dll DATA +_osmode_dll=CRTDLL__osmode_dll DATA +_osver_dll=_osver DATA +_osversion_dll=CRTDLL__osversion_dll DATA _pclose -_pctype_dll -_pgmptr_dll +_pctype_dll=_pctype DATA +_pgmptr_dll=_pgmptr DATA _pipe _popen _purecall _putch _putenv _putw -_pwctype_dll +_pwctype_dll=_pwctype DATA _read _rmdir _rmtmp @@ -321,7 +321,7 @@ _spawnvp _spawnvpe _splitpath -_stat +_stat=CRTDLL__stat _statusfp _strcmpi=NTDLL._strcmpi _strdate @@ -343,14 +343,14 @@ _strtime _strupr=NTDLL._strupr _swab -_sys_errlist -_sys_nerr_dll +_sys_errlist DATA +_sys_nerr_dll=_sys_nerr DATA _tell _tempnam -_timezone_dll +_timezone_dll=_timezone _tolower=NTDLL._tolower _toupper=NTDLL._toupper -_tzname +_tzname DATA _tzset _ultoa=NTDLL._ultoa _ultow=NTDLL._ultow @@ -370,9 +370,9 @@ _wcsrev _wcsset _wcsupr -_winmajor_dll -_winminor_dll -_winver_dll +_winmajor_dll=_winmajor DATA +_winminor_dll=_winminor DATA +_winver_dll=_winver DATA _write _wtoi=NTDLL._wtoi _wtol=NTDLL._wtol _____ Added: trunk/reactos/lib/crtdll/dllmain.c --- trunk/reactos/lib/crtdll/dllmain.c 2005-01-27 21:16:41 UTC (rev 13340) +++ trunk/reactos/lib/crtdll/dllmain.c 2005-01-27 21:17:28 UTC (rev 13341) @@ -0,0 +1,296 @@ +/* $Id: dllmain.c 12852 2005-01-06 13:58:04Z mf $ + * + * dllmain.c + * + * ReactOS MSVCRT.DLL Compatibility Library + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAMED. This includes but is not limited to warrenties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * $Revision: 1.24 $ + * $Author: mf $ + * $Date: 2005-01-06 14:58:04 +0100 (Thu, 06 Jan 2005) $ + * + */ + +#include "precomp.h" +#include <msvcrt/internal/tls.h> +#include <msvcrt/stdlib.h> +#include <msvcrt/wine/msvcrt.h> +#include <sys/stat.h> + +#define NDEBUG +#include <msvcrt/msvcrtdbg.h> + + +/* EXTERNAL PROTOTYPES ********************************************************/ + +//void __fileno_init(void); +extern BOOL __fileno_init(void); +extern int BlockEnvToEnvironA(void); +extern int BlockEnvToEnvironW(void); +extern void FreeEnvironment(char **environment); + +extern unsigned int _osver; +extern unsigned int _winminor; +extern unsigned int _winmajor; +extern unsigned int _winver; + +unsigned int CRTDLL__basemajor_dll; +unsigned int CRTDLL__baseminor_dll; +unsigned int CRTDLL__baseversion_dll; +unsigned int CRTDLL__cpumode_dll; +unsigned int CRTDLL__osmajor_dll; +unsigned int CRTDLL__osminor_dll; +unsigned int CRTDLL__osmode_dll; +unsigned int CRTDLL__osversion_dll; + +extern char* _acmdln; /* pointer to ascii command line */ +extern wchar_t* _wcmdln; /* pointer to wide character command line */ +#undef _environ +extern char** _environ; /* pointer to environment block */ +extern char** __initenv; /* pointer to initial environment block */ +extern wchar_t** _wenviron; /* pointer to environment block */ +extern wchar_t** __winitenv; /* pointer to initial environment block */ + + + +/* dev_t is a short in crtdll but an unsigned int in msvcrt */ +typedef short crtdll_dev_t; + +struct crtdll_stat +{ + crtdll_dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + crtdll_dev_t st_rdev; + _off_t st_size; + time_t st_atime; + time_t st_mtime; + time_t st_ctime; +}; + +/* convert struct _stat from crtdll format to msvcrt format */ +static void convert_struct_stat( struct crtdll_stat *dst, const struct _stat *src ) +{ + dst->st_dev = src->st_dev; + dst->st_ino = src->st_ino; + dst->st_mode = src->st_mode; + dst->st_nlink = src->st_nlink; + dst->st_uid = src->st_uid; + dst->st_gid = src->st_gid; + dst->st_rdev = src->st_rdev; + dst->st_size = src->st_size; + dst->st_atime = src->st_atime; + dst->st_mtime = src->st_mtime; + dst->st_ctime = src->st_ctime; +} + +/* from msvcrt */ +extern void __getmainargs( int *argc, char ***argv, char ***envp, + int expand_wildcards, int *new_mode ); + +/* LIBRARY GLOBAL VARIABLES ***************************************************/ + +HANDLE hHeap = NULL; /* handle for heap */ + + +/* LIBRARY ENTRY POINT ********************************************************/ + +BOOL +STDCALL +DllMain(PVOID hinstDll, ULONG dwReason, PVOID reserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH://1 + /* initialize version info */ + DPRINT("Attach %d\n", nAttachCount); + + _osver = GetVersion(); + + CRTDLL__basemajor_dll = (_osver >> 24) & 0xFF; + CRTDLL__baseminor_dll = (_osver >> 16) & 0xFF; + CRTDLL__baseversion_dll = (_osver >> 16); + CRTDLL__cpumode_dll = 1; /* FIXME */ + CRTDLL__osmajor_dll = (_osver >>8) & 0xFF; + CRTDLL__osminor_dll = (_osver & 0xFF); + CRTDLL__osmode_dll = 1; /* FIXME */ + CRTDLL__osversion_dll = (_osver & 0xFFFF); + + _winmajor = (_osver >> 8) & 0xFF; + _winminor = _osver & 0xFF; + _winver = (_winmajor << 8) + _winminor; + _osver = (_osver >> 16) & 0xFFFF; + hHeap = HeapCreate(0, 100000, 0); + if (hHeap == NULL) + return FALSE; + if (!__fileno_init()) + return FALSE; + + /* create tls stuff */ + if (!CreateThreadData()) + return FALSE; + + if (BlockEnvToEnvironA() < 0) + return FALSE; + + if (BlockEnvToEnvironW() < 0) + { + FreeEnvironment((char**)_wenviron); + return FALSE; + } + + _acmdln = _strdup(GetCommandLineA()); + _wcmdln = _wcsdup(GetCommandLineW()); + + /* FIXME: more initializations... */ + + /* FIXME: Initialization of the WINE code */ + msvcrt_init_mt_locks(); + + DPRINT("Attach done\n"); + break; + + case DLL_THREAD_ATTACH://2 + break; + + case DLL_THREAD_DETACH://4 + FreeThreadData(NULL); + break; + + case DLL_PROCESS_DETACH://0 + DPRINT("Detach %d\n", nAttachCount); + /* FIXME: more cleanup... */ + _fcloseall(); + + /* destroy tls stuff */ + DestroyThreadData(); + + if (__winitenv && __winitenv != _wenviron) + FreeEnvironment((char**)__winitenv); + if (_wenviron) + FreeEnvironment((char**)_wenviron); + + if (__initenv && __initenv != _environ) + FreeEnvironment(__initenv); + if (_environ) + FreeEnvironment(_environ); + + /* destroy heap */ + HeapDestroy(hHeap); + + DPRINT("Detach done\n"); + break; + } + + return TRUE; +} + + + + +/********************************************************************* + * __GetMainArgs (CRTDLL.@) + */ +void __GetMainArgs( int *argc, char ***argv, char ***envp, int expand_wildcards ) +{ + int new_mode = 0; + __getmainargs( argc, argv, envp, expand_wildcards, &new_mode ); +} + + +/********************************************************************* + * _fstat (CRTDLL.@) + */ +int CRTDLL__fstat(int fd, struct crtdll_stat* buf) +{ + extern int _fstat(int,struct _stat*); + struct _stat st; + int ret; + + if (!(ret = _fstat( fd, &st ))) convert_struct_stat( buf, &st ); + return ret; +} + + +/********************************************************************* + * _stat (CRTDLL.@) + */ +int CRTDLL__stat(const char* path, struct crtdll_stat * buf) +{ + extern int _stat(const char*,struct _stat*); + struct _stat st; + int ret; + + if (!(ret = _stat( path, &st ))) convert_struct_stat( buf, &st ); + return ret; +} + + +/********************************************************************* + * _strdec (CRTDLL.@) + */ +char *_strdec(const char *str1, const char *str2) +{ + return (char *)(str2 - 1); +} + + +/********************************************************************* + * _strinc (CRTDLL.@) + */ +char *_strinc(const char *str) +{ + return (char *)(str + 1); +} + + +/********************************************************************* + * _strncnt (CRTDLL.@) + */ +size_t _strncnt(const char *str, size_t maxlen) +{ + size_t len = strlen(str); + return (len > maxlen) ? maxlen : len; +} + + +/********************************************************************* + * _strnextc (CRTDLL.@) + */ +unsigned int _strnextc(const char *str) +{ + return (unsigned int)str[0]; +} + + +/********************************************************************* + * _strninc (CRTDLL.@) + */ +char *_strninc(const char *str, size_t len) +{ + return (char *)(str + len); +} + + +/********************************************************************* + * _strspnp (CRTDLL.@) + */ +char *_strspnp( const char *str1, const char *str2) +{ + str1 += strspn( str1, str2 ); + return *str1 ? (char*)str1 : NULL; +} + +/* EOF */ _____ Modified: trunk/reactos/lib/crtdll/makefile --- trunk/reactos/lib/crtdll/makefile 2005-01-27 21:16:41 UTC (rev 13340) +++ trunk/reactos/lib/crtdll/makefile 2005-01-27 21:17:28 UTC (rev 13341) @@ -2,7 +2,7 @@ PATH_TO_TOP = ../.. -PATH_TO_MSVCRT = ../msvcrt +TARGET_DEFONLY = yes TARGET_TYPE = dynlink @@ -15,489 +15,39 @@ # don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports RM_AT_FROM_SYMBOLS = no -TARGET_LFLAGS = -nostartfiles -nostdlib +TARGET_LFLAGS = -nostartfiles -nostdlib --enable-stdcall-fixup -TARGET_CFLAGS = -D_MSVCRT_LIB_ -Werror -Wall +TARGET_SDKLIBS = crt.a string.a kernel32.a ntdll.a wine.a -# require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS +TARGET_GCCLIBS = gcc -TARGET_SDKLIBS = string.a kernel32.a ntdll.a +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -TARGET_GCCLIBS = gcc +# require os code to explicitly request A/W version of structs/functions +TARGET_CFLAGS += \ + -D_DISABLE_TIDENTS \ + -D__USE_W32API \ + -D__REACTOS__ \ + -D_WIN32_IE=0x600 \ + -D_WIN32_WINNT=0x501 \ + -DUSE_MSVCRT_PREFIX \ + -D_MT TARGET_OBJECTS = $(TARGET_NAME).o -TARGET_CLEAN = \ - conio/*.o \ - ctype/*.o \ - direct/*.o \ - dirent/*.o \ - except/*.o \ - float/*.o \ - io/*.o \ - libc/*.o \ - malloc/*.o \ - math/*.o \ - mbstring/*.o \ - misc/*.o \ - process/*.o \ - quad/*.o \ - search/*.o \ - setjmp/*.o \ - signal/*.o \ - stdio/*.o \ - stdlib/*.o \ - string/*.o \ - sys_stat/*.o \ - tchar/*.o \ - time/*.o \ - wchar/*.o +TARGET_CLEAN = dllmain.o - include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk -CONIO_OBJECTS = \ - $(PATH_TO_MSVCRT)/conio/cgets.o \ - $(PATH_TO_MSVCRT)/conio/cprintf.o \ - $(PATH_TO_MSVCRT)/conio/cputs.o \ - $(PATH_TO_MSVCRT)/conio/cscanf.o \ - $(PATH_TO_MSVCRT)/conio/getch.o \ - $(PATH_TO_MSVCRT)/conio/getche.o \ - $(PATH_TO_MSVCRT)/conio/kbhit.o \ - $(PATH_TO_MSVCRT)/conio/putch.o \ - $(PATH_TO_MSVCRT)/conio/ungetch.o -CTYPE_OBJECTS = \ - $(PATH_TO_MSVCRT)/ctype/ctype.o \ - $(PATH_TO_MSVCRT)/ctype/isalnum.o \ - $(PATH_TO_MSVCRT)/ctype/isascii.o \ - $(PATH_TO_MSVCRT)/ctype/iscntrl.o \ - ctype/isctype.o \ - $(PATH_TO_MSVCRT)/ctype/isgraph.o \ - $(PATH_TO_MSVCRT)/ctype/isprint.o \ - $(PATH_TO_MSVCRT)/ctype/ispunct.o \ - $(PATH_TO_MSVCRT)/ctype/isupper.o -# REMOVED CTYPE ENTRIES: -# $(PATH_TO_MSVCRT)/ctype/isalpha.o \ -# $(PATH_TO_MSVCRT)/ctype/iscsym.o \ -# $(PATH_TO_MSVCRT)/ctype/isdigit.o \ -# $(PATH_TO_MSVCRT)/ctype/islower.o \ -# $(PATH_TO_MSVCRT)/ctype/isspace.o \ -# $(PATH_TO_MSVCRT)/ctype/isxdigit.o \ -# $(PATH_TO_MSVCRT)/ctype/toascii.o \ -# $(PATH_TO_MSVCRT)/ctype/tolower.o \ -# $(PATH_TO_MSVCRT)/ctype/toupper.o \ +OBJECTS = dllmain.o -DIRECT_OBJECTS = \ - $(PATH_TO_MSVCRT)/direct/chdir.o \ - $(PATH_TO_MSVCRT)/direct/chdrive.o \ - $(PATH_TO_MSVCRT)/direct/getcwd.o \ - $(PATH_TO_MSVCRT)/direct/getdcwd.o \ - $(PATH_TO_MSVCRT)/direct/getdfree.o \ - $(PATH_TO_MSVCRT)/direct/getdrive.o \ - $(PATH_TO_MSVCRT)/direct/mkdir.o \ - $(PATH_TO_MSVCRT)/direct/rmdir.o - -EXCEPT_OBJECTS = \ - except/abnorter.o \ - except/exhand2.o \ - except/matherr.o \ - except/unwind.o - -FLOAT_OBJECTS = \ - $(PATH_TO_MSVCRT)/float/chgsign.o \ - $(PATH_TO_MSVCRT)/float/clearfp.o \ - $(PATH_TO_MSVCRT)/float/cntrlfp.o \ - $(PATH_TO_MSVCRT)/float/copysign.o \ - $(PATH_TO_MSVCRT)/float/fpclass.o \ - $(PATH_TO_MSVCRT)/float/fpreset.o \ - $(PATH_TO_MSVCRT)/float/isnan.o \ - $(PATH_TO_MSVCRT)/float/logb.o \ - $(PATH_TO_MSVCRT)/float/nafter.o \ - $(PATH_TO_MSVCRT)/float/scalb.o \ - $(PATH_TO_MSVCRT)/float/statfp.o - -IO_OBJECTS = \ - $(PATH_TO_MSVCRT)/io/access.o \ - $(PATH_TO_MSVCRT)/io/chmod.o \ - $(PATH_TO_MSVCRT)/io/chsize.o \ - $(PATH_TO_MSVCRT)/io/close.o \ - $(PATH_TO_MSVCRT)/io/commit.o \ - io/create.o \ - io/dup.o \ - $(PATH_TO_MSVCRT)/io/dup2.o \ - io/eof.o \ - $(PATH_TO_MSVCRT)/io/filelen.o \ - io/find.o \ - io/fmode.o \ - $(PATH_TO_MSVCRT)/io/isatty.o \ - $(PATH_TO_MSVCRT)/io/locking.o \ - io/lseek.o \ - $(PATH_TO_MSVCRT)/io/mktemp.o \ - io/open.o \ - io/pipe.o \ - io/read.o \ - $(PATH_TO_MSVCRT)/io/setmode.o \ - $(PATH_TO_MSVCRT)/io/sopen.o \ - $(PATH_TO_MSVCRT)/io/tell.o \ - $(PATH_TO_MSVCRT)/io/umask.o \ - io/unlink.o \ - $(PATH_TO_MSVCRT)/io/utime.o \ - io/write.o - -LOCALE_OBJECTS = \ - $(PATH_TO_MSVCRT)/locale/locale.o - -MATH_OBJECTS = \ - $(PATH_TO_MSVCRT)/math/acos.o \ - math/acosh.o \ - $(PATH_TO_MSVCRT)/math/asin.o \ - math/asinh.o \ - $(PATH_TO_MSVCRT)/math/atan.o \ - $(PATH_TO_MSVCRT)/math/atan2.o\ - math/atanh.o \ - $(PATH_TO_MSVCRT)/math/cabs.o \ - math/ceil.o \ - $(PATH_TO_MSVCRT)/math/cos.o \ - $(PATH_TO_MSVCRT)/math/cosh.o \ - $(PATH_TO_MSVCRT)/math/exp.o \ - $(PATH_TO_MSVCRT)/math/fabs.o\ - math/floor.o \ - $(PATH_TO_MSVCRT)/math/fmod.o \ - $(PATH_TO_MSVCRT)/math/frexp.o \ - math/huge_val.o \ - $(PATH_TO_MSVCRT)/math/hypot.o \ - $(PATH_TO_MSVCRT)/math/j0_y0.o \ - $(PATH_TO_MSVCRT)/math/j1_y1.o \ - $(PATH_TO_MSVCRT)/math/jn_yn.o \ - $(PATH_TO_MSVCRT)/math/ldexp.o \ - $(PATH_TO_MSVCRT)/math/log.o \ - $(PATH_TO_MSVCRT)/math/log10.o \ - $(PATH_TO_MSVCRT)/math/modf.o \ - $(PATH_TO_MSVCRT)/math/pow.o \ - $(PATH_TO_MSVCRT)/math/sin.o \ - $(PATH_TO_MSVCRT)/math/sinh.o \ - $(PATH_TO_MSVCRT)/math/sqrt.o \ - $(PATH_TO_MSVCRT)/math/stubs.o \ - $(PATH_TO_MSVCRT)/math/tan.o \ - $(PATH_TO_MSVCRT)/math/tanh.o - -MALLOC_OBJECTS = \ - malloc/expand.o \ - malloc/heap.o - -MBSTRING_OBJECTS = \ - $(PATH_TO_MSVCRT)/mbstring/hanzen.o \ - $(PATH_TO_MSVCRT)/mbstring/ischira.o \ - $(PATH_TO_MSVCRT)/mbstring/iskana.o \ - $(PATH_TO_MSVCRT)/mbstring/iskpun.o \ - $(PATH_TO_MSVCRT)/mbstring/islead.o \ - $(PATH_TO_MSVCRT)/mbstring/islwr.o \ - $(PATH_TO_MSVCRT)/mbstring/iskmoji.o \ - $(PATH_TO_MSVCRT)/mbstring/ismbal.o \ - $(PATH_TO_MSVCRT)/mbstring/ismbaln.o \ - $(PATH_TO_MSVCRT)/mbstring/ismbc.o \ - $(PATH_TO_MSVCRT)/mbstring/ismbgra.o \ - $(PATH_TO_MSVCRT)/mbstring/ismbkaln.o \ - $(PATH_TO_MSVCRT)/mbstring/ismblead.o \ - $(PATH_TO_MSVCRT)/mbstring/ismbpri.o \ - $(PATH_TO_MSVCRT)/mbstring/ismbpun.o \ - $(PATH_TO_MSVCRT)/mbstring/ismbtrl.o \ - $(PATH_TO_MSVCRT)/mbstring/isuppr.o \ - $(PATH_TO_MSVCRT)/mbstring/jistojms.o \ - $(PATH_TO_MSVCRT)/mbstring/jmstojis.o \ - $(PATH_TO_MSVCRT)/mbstring/mbbtype.o \ - $(PATH_TO_MSVCRT)/mbstring/mbccpy.o \ - $(PATH_TO_MSVCRT)/mbstring/mbclen.o \ - $(PATH_TO_MSVCRT)/mbstring/mbscat.o \ - $(PATH_TO_MSVCRT)/mbstring/mbschr.o \ - $(PATH_TO_MSVCRT)/mbstring/mbscmp.o \ - $(PATH_TO_MSVCRT)/mbstring/mbscoll.o \ - $(PATH_TO_MSVCRT)/mbstring/mbscpy.o \ - $(PATH_TO_MSVCRT)/mbstring/mbscspn.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsdec.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsdup.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsicmp.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsicoll.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsinc.o \ - $(PATH_TO_MSVCRT)/mbstring/mbslen.o \ - $(PATH_TO_MSVCRT)/mbstring/mbslwr.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsncat.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsnccnt.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsncmp.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsncoll.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsncpy.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsnextc.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsnicmp.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsnicoll.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsninc.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsnset.o \ - $(PATH_TO_MSVCRT)/mbstring/mbspbrk.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsrchr.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsrev.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsset.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsspn.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsspnp.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsstr.o \ - $(PATH_TO_MSVCRT)/mbstring/mbstok.o \ - $(PATH_TO_MSVCRT)/mbstring/mbstrlen.o \ - $(PATH_TO_MSVCRT)/mbstring/mbsupr.o - -MISC_OBJECTS = \ - misc/amsg.o \ - $(PATH_TO_MSVCRT)/misc/assert.o \ - misc/debug.o \ - misc/dllmain.o \ - misc/GetArgs.o \ - $(PATH_TO_MSVCRT)/misc/initterm.o \ - misc/purecall.o \ - misc/setnew.o - -PROCESS_OBJECTS = \ - process/_cwait.o \ - process/_system.o\ - $(PATH_TO_MSVCRT)/process/dll.o \ - process/spawnl.o \ - process/spawnlp.o \ - process/spawnlpe.o \ - process/spawnvp.o \ - process/spawnv.o \ - process/spawnve.o \ - process/spawnle.o \ - process/execl.o \ - process/execlp.o \ - process/execlpe.o \ - process/execvpe.o \ - process/execvp.o \ - process/execv.o \ - process/execle.o \ - process/execve.o \ - $(PATH_TO_MSVCRT)/process/procid.o \ - process/thread.o \ - $(PATH_TO_MSVCRT)/process/threadid.o - -QUAD_OBJECTS = \ - quad/qdivrem.o \ - quad/divdi3.o \ - quad/moddi3.o \ - quad/udivdi3.o \ - quad/umoddi3.o - -SEARCH_OBJECTS = \ - $(PATH_TO_MSVCRT)/search/lfind.o \ - $(PATH_TO_MSVCRT)/search/lsearch.o - -SETJMP_OBJECTS = \ - $(PATH_TO_MSVCRT)/setjmp/i386/setjmp.o - -SIGNAL_OBJECTS = \ - signal/xcptfil.o \ - signal/xcptinfo.o \ - $(PATH_TO_MSVCRT)/signal/signal.o - -STDIO_OBJECTS = \ - $(PATH_TO_MSVCRT)/stdio/allocfil.o \ - stdio/getenv.o \ - $(PATH_TO_MSVCRT)/stdio/clearerr.o \ - $(PATH_TO_MSVCRT)/stdio/fclose.o \ - $(PATH_TO_MSVCRT)/stdio/fdopen.o \ - $(PATH_TO_MSVCRT)/stdio/feof.o \ - stdio/ferror.o \ - stdio/fflush.o \ - $(PATH_TO_MSVCRT)/stdio/fgetc.o \ - stdio/fgetchar.o \ - $(PATH_TO_MSVCRT)/stdio/fgetpos.o \ - stdio/fgets.o \ - stdio/filbuf.o \ - stdio/fileno.o \ - $(PATH_TO_MSVCRT)/stdio/flsbuf.o \ - stdio/fopen.o \ - $(PATH_TO_MSVCRT)/stdio/fprintf.o \ - $(PATH_TO_MSVCRT)/stdio/fputc.o \ - stdio/fputchar.o\ - stdio/fputs.o \ - stdio/fread.o \ - stdio/freopen.o \ - stdio/fscanf.o \ - $(PATH_TO_MSVCRT)/stdio/fseek.o \ - $(PATH_TO_MSVCRT)/stdio/fsetpos.o \ - stdio/frlist.o \ - stdio/fsopen.o \ - stdio/ftell.o \ - $(PATH_TO_MSVCRT)/stdio/fwalk.o \ - stdio/fwrite.o \ - stdio/getc.o \ - stdio/getchar.o \ - stdio/gets.o \ - $(PATH_TO_MSVCRT)/stdio/getw.o \ - stdio/perror.o \ - stdio/popen.o \ - stdio/printf.o \ - stdio/putc.o \ - stdio/putchar.o \ - stdio/puts.o \ - $(PATH_TO_MSVCRT)/stdio/putw.o \ - stdio/remove.o \ - $(PATH_TO_MSVCRT)/stdio/rename.o \ - $(PATH_TO_MSVCRT)/stdio/rewind.o \ - $(PATH_TO_MSVCRT)/stdio/rmtmp.o \ - $(PATH_TO_MSVCRT)/stdio/scanf.o \ - $(PATH_TO_MSVCRT)/stdio/setbuf.o \ - stdio/setbuffe.o \ - stdio/setlineb.o \ - $(PATH_TO_MSVCRT)/stdio/setvbuf.o \ - $(PATH_TO_MSVCRT)/stdio/sprintf.o \ - $(PATH_TO_MSVCRT)/stdio/sscanf.o \ - $(PATH_TO_MSVCRT)/stdio/stdhnd.o \ - stdio/stdiohk.o \ - $(PATH_TO_MSVCRT)/stdio/tempnam.o \ - $(PATH_TO_MSVCRT)/stdio/tmpfile.o \ - $(PATH_TO_MSVCRT)/stdio/tmpnam.o \ - $(PATH_TO_MSVCRT)/stdio/ungetc.o \ - $(PATH_TO_MSVCRT)/stdio/vfprintf.o \ - $(PATH_TO_MSVCRT)/stdio/vfscanf.o \ - $(PATH_TO_MSVCRT)/stdio/vfwprint.o \ - $(PATH_TO_MSVCRT)/stdio/vprintf.o \ - $(PATH_TO_MSVCRT)/stdio/vscanf.o \ - $(PATH_TO_MSVCRT)/stdio/vsprintf.o \ - $(PATH_TO_MSVCRT)/stdio/vsscanf.o - -STDLIB_OBJECTS = \ - $(PATH_TO_MSVCRT)/stdlib/_exit.o \ - $(PATH_TO_MSVCRT)/stdlib/abort.o \ - $(PATH_TO_MSVCRT)/stdlib/abs.o \ - $(PATH_TO_MSVCRT)/stdlib/atexit.o \ - $(PATH_TO_MSVCRT)/stdlib/atof.o \ - $(PATH_TO_MSVCRT)/stdlib/atoi.o \ - $(PATH_TO_MSVCRT)/stdlib/atol.o \ - $(PATH_TO_MSVCRT)/stdlib/bsearch.o \ - $(PATH_TO_MSVCRT)/stdlib/div.o \ - $(PATH_TO_MSVCRT)/stdlib/ecvt.o \ - $(PATH_TO_MSVCRT)/stdlib/ecvtbuf.o \ - stdlib/errno.o \ - $(PATH_TO_MSVCRT)/stdlib/fcvt.o \ - $(PATH_TO_MSVCRT)/stdlib/fcvtbuf.o \ - stdlib/fullpath.o \ - $(PATH_TO_MSVCRT)/stdlib/gcvt.o \ - $(PATH_TO_MSVCRT)/stdlib/itoa.o \ - stdlib/itow.o \ - $(PATH_TO_MSVCRT)/stdlib/labs.o \ - $(PATH_TO_MSVCRT)/stdlib/ldiv.o \ - $(PATH_TO_MSVCRT)/stdlib/makepath.o \ - stdlib/malloc.o \ - stdlib/mbstowcs.o \ - $(PATH_TO_MSVCRT)/stdlib/obsol.o \ - stdlib/putenv.o \ - stdlib/qsort.o \ - stdlib/rand.o \ - $(PATH_TO_MSVCRT)/stdlib/rot.o \ - $(PATH_TO_MSVCRT)/stdlib/senv.o \ - $(PATH_TO_MSVCRT)/stdlib/splitp.o \ - $(PATH_TO_MSVCRT)/stdlib/strtod.o \ - $(PATH_TO_MSVCRT)/stdlib/strtol.o \ - $(PATH_TO_MSVCRT)/stdlib/strtoul.o \ - $(PATH_TO_MSVCRT)/stdlib/swab.o \ - $(PATH_TO_MSVCRT)/stdlib/wcstod.o \ - stdlib/wcstomb.o - -STRING_OBJECTS = \ - string/lasttok.o \ - $(PATH_TO_MSVCRT)/string/strcoll.o \ - $(PATH_TO_MSVCRT)/string/strdup.o \ - string/strerror.o \ - $(PATH_TO_MSVCRT)/string/strrev.o \ - $(PATH_TO_MSVCRT)/string/strset.o \ - $(PATH_TO_MSVCRT)/string/strtok.o \ - $(PATH_TO_MSVCRT)/string/strxfrm.o - -# string/str_old.o \ -# $(PATH_TO_MSVCRT)/string/memicmp.o \ -# $(PATH_TO_MSVCRT)/string/stricmp.o \ -# $(PATH_TO_MSVCRT)/string/strlwr.o \ -# $(PATH_TO_MSVCRT)/string/strnicmp.o \ -# $(PATH_TO_MSVCRT)/string/strpbrk.o \ -# $(PATH_TO_MSVCRT)/string/strstr.o \ -# $(PATH_TO_MSVCRT)/string/strupr.o \ - -SYS_STAT_OBJECTS = \ - sys_stat/fstat.o \ - $(PATH_TO_MSVCRT)/sys_stat/futime.o \ - sys_stat/ftime.o \ - sys_stat/systime.o \ - sys_stat/stat.o - -TCHAR_OBJECTS = \ - tchar/strdec.o \ - tchar/strinc.o \ - tchar/strninc.o \ - tchar/strncnt.o \ - tchar/strnextc.o \ - tchar/strspnp.o - -TIME_OBJECTS = \ - $(PATH_TO_MSVCRT)/time/time.o \ - $(PATH_TO_MSVCRT)/time/clock.o \ - $(PATH_TO_MSVCRT)/time/ctime.o \ - $(PATH_TO_MSVCRT)/time/difftime.o \ - $(PATH_TO_MSVCRT)/time/strdate.o \ - $(PATH_TO_MSVCRT)/time/strftime.o \ - $(PATH_TO_MSVCRT)/time/strtime.o \ - time/tz_vars.o - -WSTRING_OBJECTS = \ - wchar/wlasttok.o \ - wchar/wcscoll.o \ - $(PATH_TO_MSVCRT)/wstring/wcsdup.o \ - $(PATH_TO_MSVCRT)/wstring/wcsrev.o \ - $(PATH_TO_MSVCRT)/wstring/wcsset.o \ - $(PATH_TO_MSVCRT)/wstring/wcstok.o \ - $(PATH_TO_MSVCRT)/wstring/wcsxfrm.o - -# wchar/wcstod.o \ -# wchar/wcstok.o \ -# wchar/wcstol.o \ -# wchar/wtoi.o \ -# $(PATH_TO_MSVCRT)/wstring/wcscspn.o \ -# $(PATH_TO_MSVCRT)/wstring/wcsicmp.o \ -# $(PATH_TO_MSVCRT)/wstring/wcslwr.o \ -# $(PATH_TO_MSVCRT)/wstring/wcspbrk.o \ -# $(PATH_TO_MSVCRT)/wstring/wcsspn.o \ [truncated at 1000 lines; 35 more skipped]

19 years, 7 months

[gdalsnes] 13340: build msvcrt and crtdll from same source via lib\crt

by gdalsnes＠svn.reactos.com

build msvcrt and crtdll from same source via lib\crt fix problem with scanf/printf reading/printing doubles Modified: trunk/reactos/lib/msvcrt/Makefile Deleted: trunk/reactos/lib/msvcrt/README.txt Deleted: trunk/reactos/lib/msvcrt/conio/ Deleted: trunk/reactos/lib/msvcrt/ctype/ Deleted: trunk/reactos/lib/msvcrt/direct/ Added: trunk/reactos/lib/msvcrt/dllmain.c Deleted: trunk/reactos/lib/msvcrt/except/ Deleted: trunk/reactos/lib/msvcrt/float/ Deleted: trunk/reactos/lib/msvcrt/io/ Deleted: trunk/reactos/lib/msvcrt/locale/ Deleted: trunk/reactos/lib/msvcrt/math/ Deleted: trunk/reactos/lib/msvcrt/mbstring/ Deleted: trunk/reactos/lib/msvcrt/misc/ Modified: trunk/reactos/lib/msvcrt/msvcrt.def Deleted: trunk/reactos/lib/msvcrt/process/ Deleted: trunk/reactos/lib/msvcrt/search/ Deleted: trunk/reactos/lib/msvcrt/setjmp/ Deleted: trunk/reactos/lib/msvcrt/signal/ Deleted: trunk/reactos/lib/msvcrt/stdio/ Deleted: trunk/reactos/lib/msvcrt/stdlib/ Deleted: trunk/reactos/lib/msvcrt/string/ Deleted: trunk/reactos/lib/msvcrt/sys_stat/ Deleted: trunk/reactos/lib/msvcrt/time/ Deleted: trunk/reactos/lib/msvcrt/wine/ Deleted: trunk/reactos/lib/msvcrt/wstring/ _____ Modified: trunk/reactos/lib/msvcrt/Makefile --- trunk/reactos/lib/msvcrt/Makefile 2005-01-27 21:12:05 UTC (rev 13339) +++ trunk/reactos/lib/msvcrt/Makefile 2005-01-27 21:16:41 UTC (rev 13340) @@ -15,9 +15,9 @@ # don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports RM_AT_FROM_SYMBOLS = no -TARGET_LFLAGS = -nostartfiles --enable-stdcall-fixup +TARGET_LFLAGS = -nostartfiles -nostdlib --enable-stdcall-fixup -TARGET_SDKLIBS = wine.a string.a kernel32.a ntdll.a +TARGET_SDKLIBS = crt.a string.a kernel32.a ntdll.a wine.a TARGET_GCCLIBS = gcc @@ -35,473 +35,17 @@ TARGET_OBJECTS = $(TARGET_NAME).o -TARGET_CLEAN = \ - conio/*.o \ - ctype/*.o \ - direct/*.o \ - except/*.o \ - float/*.o \ - io/*.o \ - locale/*.o \ - math/*.o \ - mbstring/*.o \ - misc/*.o \ - process/*.o \ - search/*.o \ - setjmp/*.o \ - setjmp/i386/*.o \ - signal/*.o \ - stdio/*.o \ - stdlib/*.o \ - string/*.o \ - sys_stat/*.o \ - time/*.o \ - wine/*.o \ - wstring/*.o +TARGET_CLEAN = dllmain.o - include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk -CONIO_OBJECTS = \ - conio/cgets.o \ - conio/cprintf.o \ - conio/cputs.o \ - conio/cscanf.o \ - conio/getch.o \ - conio/getche.o \ - conio/kbhit.o \ - conio/putch.o \ - conio/ungetch.o -CTYPE_OBJECTS = \ - ctype/ctype.o \ - ctype/isalnum.o \ - ctype/isalpha.o \ - ctype/isascii.o \ - ctype/iscntrl.o \ - ctype/isdigit.o \ - ctype/isgraph.o \ - ctype/islower.o \ - ctype/isprint.o \ - ctype/ispunct.o \ - ctype/isspace.o \ - ctype/isupper.o \ - ctype/isxdigit.o \ - ctype/toascii.o \ - ctype/tolower.o \ - ctype/toupper.o \ - ctype/iscsym.o \ - ctype/isctype.o -DIRECT_OBJECTS = \ - direct/chdir.o \ - direct/chdrive.o \ - direct/getcwd.o \ - direct/getdcwd.o \ - direct/getdfree.o \ - direct/getdrive.o \ - direct/mkdir.o \ - direct/rmdir.o \ - direct/wchdir.o \ - direct/wgetcwd.o \ - direct/wgetdcwd.o \ - direct/wmkdir.o \ - direct/wrmdir.o +OBJECTS = dllmain.o -EXCEPT_OBJECTS = \ - except/seh.o \ - except/abnorter.o \ - except/exhand2.o \ - except/matherr.o \ - except/unwind.o \ - except/xcptfil.o - -FLOAT_OBJECTS = \ - float/chgsign.o \ - float/clearfp.o \ - float/cntrlfp.o \ - float/copysign.o \ - float/fpclass.o \ - float/fpecode.o \ - float/fpreset.o \ - float/isnan.o \ - float/logb.o \ - float/nafter.o \ - float/scalb.o \ - float/statfp.o - -IO_OBJECTS = \ - io/access.o \ - io/chmod.o \ - io/chsize.o \ - io/close.o \ - io/commit.o \ - io/create.o \ - io/dup.o \ - io/dup2.o \ - io/eof.o \ - io/filelen.o \ - io/fileleni.o \ - io/find.o \ - io/fmode.o \ - io/isatty.o \ - io/locking.o \ - io/lseek.o \ - io/lseeki64.o \ - io/mktemp.o \ - io/open.o \ - io/pipe.o \ - io/read.o \ - io/setmode.o \ - io/sopen.o \ - io/stubs.o \ - io/tell.o \ - io/telli64.o \ - io/umask.o \ - io/unlink.o \ - io/utime.o \ - io/waccess.o \ - io/wchmod.o \ - io/wcreate.o \ - io/wfind.o \ - io/wmktemp.o \ - io/wopen.o \ - io/write.o \ - io/wunlink.o \ - io/wutime.o - -LOCALE_OBJECTS = \ - locale/locale.o - -MATH_OBJECTS = \ - math/acos.o \ - math/adjust.o \ - math/asin.o \ - math/atan.o \ - math/atan2.o \ - math/cabs.o \ - math/ceil.o \ - math/cos.o \ - math/cosh.o \ - math/exp.o \ - math/fabs.o \ - math/floor.o \ - math/fmod.o \ - math/frexp.o \ - math/huge_val.o \ - math/hypot.o \ - math/j0_y0.o \ - math/j1_y1.o \ - math/jn_yn.o \ - math/ldexp.o \ - math/log.o \ - math/log10.o \ - math/modf.o \ - math/pow.o \ - math/sin.o \ - math/sinh.o \ - math/sqrt.o \ - math/stubs.o \ - math/tan.o \ - math/tanh.o - -MBSTRING_OBJECTS = \ - mbstring/hanzen.o \ - mbstring/ischira.o \ - mbstring/iskana.o \ - mbstring/iskpun.o \ - mbstring/islead.o \ - mbstring/islwr.o \ - mbstring/ismbal.o \ - mbstring/ismbaln.o \ - mbstring/ismbc.o \ - mbstring/ismbgra.o \ - mbstring/ismbkaln.o \ - mbstring/ismblead.o \ - mbstring/ismbpri.o \ - mbstring/ismbpun.o \ - mbstring/ismbtrl.o \ - mbstring/isuppr.o \ - mbstring/jistojms.o \ - mbstring/jmstojis.o \ - mbstring/mbbtype.o \ - mbstring/mbccpy.o \ - mbstring/mbclen.o \ - mbstring/mbscat.o \ - mbstring/mbschr.o \ - mbstring/mbscmp.o \ - mbstring/mbscoll.o \ - mbstring/mbscpy.o \ - mbstring/mbscspn.o \ - mbstring/mbsdec.o \ - mbstring/mbsdup.o \ - mbstring/mbsicmp.o \ - mbstring/mbsicoll.o \ - mbstring/mbsinc.o \ - mbstring/mbslen.o \ - mbstring/mbslwr.o \ - mbstring/mbsncat.o \ - mbstring/mbsnccnt.o \ - mbstring/mbsncmp.o \ - mbstring/mbsncoll.o \ - mbstring/mbsncpy.o \ - mbstring/mbsnextc.o \ - mbstring/mbsnicmp.o \ - mbstring/mbsnicoll.o \ - mbstring/mbsninc.o \ - mbstring/mbsnset.o \ - mbstring/mbspbrk.o \ - mbstring/mbsrchr.o \ - mbstring/mbsrev.o \ - mbstring/mbsset.o \ - mbstring/mbsspn.o \ - mbstring/mbsspnp.o \ - mbstring/mbsstr.o \ - mbstring/mbstok.o \ - mbstring/mbstrlen.o \ - mbstring/mbsupr.o - -MISC_OBJECTS = \ - misc/amsg.o \ - misc/assert.o \ - misc/crtmain.o \ - misc/dllmain.o \ - misc/environ.o \ - misc/getargs.o \ - misc/initterm.o \ - misc/lock.o \ - misc/purecall.o \ - misc/stubs.o \ - misc/tls.o - -PROCESS_OBJECTS = \ - process/_cwait.o \ - process/_system.o \ - process/dll.o \ - process/process.o \ - process/procid.o \ - process/thread.o \ - process/threadid.o \ - process/threadx.o - -SEARCH_OBJECTS = \ - search/lfind.o \ - search/lsearch.o - -SETJMP_OBJECTS = \ - setjmp/i386/setjmp.o - -SIGNAL_OBJECTS = \ - signal/signal.o - -STDIO_OBJECTS = \ - stdio/allocfil.o \ - stdio/clearerr.o \ - stdio/fclose.o \ - stdio/fdopen.o \ - stdio/feof.o \ - stdio/ferror.o \ - stdio/fflush.o \ - stdio/fgetc.o \ - stdio/fgetchar.o \ - stdio/fgetpos.o \ - stdio/fgets.o \ - stdio/fgetws.o \ - stdio/filbuf.o \ - stdio/fileno.o \ - stdio/flsbuf.o \ - stdio/fopen.o \ - stdio/fprintf.o \ - stdio/fputc.o \ - stdio/fputchar.o \ - stdio/fputs.o \ - stdio/fread.o \ - stdio/freopen.o \ - stdio/fscanf.o \ - stdio/fseek.o \ - stdio/fsetpos.o \ - stdio/fsopen.o \ - stdio/ftell.o \ - stdio/fwalk.o \ - stdio/fwrite.o \ - stdio/getc.o \ - stdio/getchar.o \ - stdio/gets.o \ - stdio/getw.o \ - stdio/perror.o \ - stdio/popen.o \ - stdio/printf.o \ - stdio/putc.o \ - stdio/putchar.o \ - stdio/puts.o \ - stdio/putw.o \ - stdio/remove.o \ - stdio/rename.o \ - stdio/rewind.o \ - stdio/rmtmp.o \ - stdio/scanf.o \ - stdio/setbuf.o \ - stdio/setvbuf.o \ - stdio/sprintf.o \ - stdio/sscanf.o \ - stdio/stdhnd.o \ - stdio/tempnam.o \ - stdio/tmpfile.o \ - stdio/tmpnam.o \ - stdio/ungetc.o \ - stdio/vfprintf.o \ - stdio/vfscanf.o \ - stdio/vfwprint.o \ - stdio/vprintf.o \ - stdio/vscanf.o \ - stdio/vsprintf.o \ - stdio/vsscanf.o \ - stdio/wfdopen.o \ - stdio/wrename.o \ - stdio/wtempnam.o \ - stdio/wtmpnam.o - -STDLIB_OBJECTS = \ - stdlib/_exit.o \ - stdlib/abort.o \ - stdlib/abs.o \ - stdlib/atexit.o \ - stdlib/atof.o \ - stdlib/atoi.o \ - stdlib/atoi64.o \ - stdlib/atol.o \ - stdlib/bsearch.o \ - stdlib/div.o \ - stdlib/ecvt.o \ - stdlib/ecvtbuf.o \ - stdlib/errno.o \ - stdlib/fcvt.o \ - stdlib/fcvtbuf.o \ - stdlib/fullpath.o \ - stdlib/gcvt.o \ - stdlib/getenv.o \ - stdlib/itoa.o \ - stdlib/itow.o \ - stdlib/labs.o \ - stdlib/ldiv.o \ - stdlib/makepath.o \ - stdlib/malloc.o \ - stdlib/mbstowcs.o \ - stdlib/mbtowc.o \ - stdlib/obsol.o \ - stdlib/putenv.o \ - stdlib/qsort.o \ - stdlib/rand.o \ - stdlib/rot.o \ - stdlib/senv.o \ - stdlib/splitp.o \ - stdlib/strtod.o \ - stdlib/strtol.o \ - stdlib/strtoul.o \ - stdlib/swab.o \ - stdlib/wcstod.o \ - stdlib/wcstol.o \ - stdlib/wcstombs.o \ - stdlib/wcstoul.o \ - stdlib/wctomb.o \ - stdlib/wfulpath.o \ - stdlib/witoa.o \ - stdlib/witow.o \ - stdlib/wputenv.o \ - stdlib/wsenv.o \ - stdlib/wsplitp.o \ - stdlib/wmakpath.o \ - stdlib/wtoi.o \ - stdlib/wtoi64.o - -STRING_OBJECTS = \ - string/lasttok.o \ - string/memicmp.o \ - string/strcoll.o \ - string/strdup.o \ - string/strerror.o \ - string/stricmp.o \ - string/strlwr.o \ - string/strncoll.o \ - string/strnicmp.o \ - string/strpbrk.o \ - string/strrev.o\ - string/strset.o \ - string/strstr.o \ - string/strtok.o \ - string/strupr.o \ - string/strxfrm.o - -SYS_STAT_OBJECTS = \ - sys_stat/fstat.o \ - sys_stat/fstati64.o \ - sys_stat/futime.o \ - sys_stat/stat.o \ - sys_stat/wstat.o - -TIME_OBJECTS = \ - time/clock.o \ - time/ctime.o \ - time/difftime.o \ - time/ftime.o \ - time/strdate.o \ - time/strftime.o \ - time/strtime.o \ - time/time.o \ - time/tz_vars.o \ - time/wctime.o \ - time/wstrdate.o \ - time/wstrtime.o - -WINE_OBJECTS = \ - wine/cpp.o \ - wine/cppexcept.o \ - wine/heap.o \ - wine/thread.o - -WSTRING_OBJECTS = \ - wstring/wcscoll.o \ - wstring/wcscspn.o \ - wstring/wcsdup.o \ - wstring/wcsicmp.o \ - wstring/wcslwr.o \ - wstring/wcsnicmp.o \ - wstring/wcspbrk.o \ - wstring/wcsrev.o \ - wstring/wcsset.o \ - wstring/wcsspn.o \ - wstring/wcsstr.o \ - wstring/wcstok.o \ - wstring/wcsupr.o \ - wstring/wcsxfrm.o \ - wstring/wlasttok.o - -OBJECTS = \ - $(CONIO_OBJECTS) \ - $(CTYPE_OBJECTS) \ - $(DIRECT_OBJECTS) \ - $(EXCEPT_OBJECTS) \ - $(FLOAT_OBJECTS) \ - $(IO_OBJECTS) \ - $(LOCALE_OBJECTS) \ - $(MATH_OBJECTS) \ - $(MBSTRING_OBJECTS) \ - $(MISC_OBJECTS) \ - $(PROCESS_OBJECTS) \ - $(SEARCH_OBJECTS) \ - $(SETJMP_OBJECTS) \ - $(SIGNAL_OBJECTS) \ - $(STDIO_OBJECTS) \ - $(STDLIB_OBJECTS) \ - $(STRING_OBJECTS) \ - $(SYS_STAT_OBJECTS) \ - $(TIME_OBJECTS) \ - $(WINE_OBJECTS) \ - $(WSTRING_OBJECTS) - $(TARGET_NAME).o: $(OBJECTS) $(LD) -r $(OBJECTS) -o $(TARGET_NAME).o _____ Deleted: trunk/reactos/lib/msvcrt/README.txt --- trunk/reactos/lib/msvcrt/README.txt 2005-01-27 21:12:05 UTC (rev 13339) +++ trunk/reactos/lib/msvcrt/README.txt 2005-01-27 21:16:41 UTC (rev 13340) @@ -1,13 +0,0 @@ -This file contains information about the status the MSVCRT runtime in ReactOS. - -Please note that all of the MSVCRT.DLL runtime sources are license GPL unless -otherwise noted. The sources from WINE are dual licensed GPL/LGPL. -If you update a function in the ~/wine directory please send a patch to wine-patches(a)winehq.com - -TODO List: -Implement the remaining functions that are commented out in the .def file -Update source code headers for the license information. -Compleate the W32API conversion for all source files. -Write a decent regression test suite. -Convert all C++ style comments to C style comments. -???? _____ Copied: trunk/reactos/lib/msvcrt/dllmain.c (from rev 13290, trunk/reactos/lib/msvcrt/misc/dllmain.c) --- trunk/reactos/lib/msvcrt/misc/dllmain.c 2005-01-25 22:58:47 UTC (rev 13290) +++ trunk/reactos/lib/msvcrt/dllmain.c 2005-01-27 21:16:41 UTC (rev 13340) @@ -0,0 +1,140 @@ +/* $Id$ + * + * dllmain.c + * + * ReactOS MSVCRT.DLL Compatibility Library + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAMED. This includes but is not limited to warrenties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * $Revision: 1.24 $ + * $Author$ + * $Date$ + * + */ + +#include "precomp.h" +#include <msvcrt/internal/tls.h> +#include <msvcrt/stdlib.h> +#include <msvcrt/wine/msvcrt.h> + +#define NDEBUG +#include <msvcrt/msvcrtdbg.h> + + +/* EXTERNAL PROTOTYPES ********************************************************/ + +//void __fileno_init(void); +extern BOOL __fileno_init(void); +extern int BlockEnvToEnvironA(void); +extern int BlockEnvToEnvironW(void); +extern void FreeEnvironment(char **environment); + +extern unsigned int _osver; +extern unsigned int _winminor; +extern unsigned int _winmajor; +extern unsigned int _winver; + +extern char* _acmdln; /* pointer to ascii command line */ +extern wchar_t* _wcmdln; /* pointer to wide character command line */ +#undef _environ +extern char** _environ; /* pointer to environment block */ +extern char** __initenv; /* pointer to initial environment block */ +extern wchar_t** _wenviron; /* pointer to environment block */ +extern wchar_t** __winitenv; /* pointer to initial environment block */ + + +/* LIBRARY GLOBAL VARIABLES ***************************************************/ + +HANDLE hHeap = NULL; /* handle for heap */ + + +/* LIBRARY ENTRY POINT ********************************************************/ + +BOOL +STDCALL +DllMain(PVOID hinstDll, ULONG dwReason, PVOID reserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH://1 + /* initialize version info */ + DPRINT("Attach %d\n", nAttachCount); + _osver = GetVersion(); + _winmajor = (_osver >> 8) & 0xFF; + _winminor = _osver & 0xFF; + _winver = (_winmajor << 8) + _winminor; + _osver = (_osver >> 16) & 0xFFFF; + hHeap = HeapCreate(0, 100000, 0); + if (hHeap == NULL) + return FALSE; + if (!__fileno_init()) + return FALSE; + + /* create tls stuff */ + if (!CreateThreadData()) + return FALSE; + + if (BlockEnvToEnvironA() < 0) + return FALSE; + + if (BlockEnvToEnvironW() < 0) + { + FreeEnvironment((char**)_wenviron); + return FALSE; + } + + _acmdln = _strdup(GetCommandLineA()); + _wcmdln = _wcsdup(GetCommandLineW()); + + /* FIXME: more initializations... */ + + /* FIXME: Initialization of the WINE code */ + msvcrt_init_mt_locks(); + + DPRINT("Attach done\n"); + break; + + case DLL_THREAD_ATTACH://2 + break; + + case DLL_THREAD_DETACH://4 + FreeThreadData(NULL); + break; + + case DLL_PROCESS_DETACH://0 + DPRINT("Detach %d\n", nAttachCount); + /* FIXME: more cleanup... */ + _fcloseall(); + + /* destroy tls stuff */ + DestroyThreadData(); + + if (__winitenv && __winitenv != _wenviron) + FreeEnvironment((char**)__winitenv); + if (_wenviron) + FreeEnvironment((char**)_wenviron); + + if (__initenv && __initenv != _environ) + FreeEnvironment(__initenv); + if (_environ) + FreeEnvironment(_environ); + + /* destroy heap */ + HeapDestroy(hHeap); + + DPRINT("Detach done\n"); + break; + } + + return TRUE; +} + +/* EOF */ _____ Modified: trunk/reactos/lib/msvcrt/msvcrt.def --- trunk/reactos/lib/msvcrt/msvcrt.def 2005-01-27 21:12:05 UTC (rev 13339) +++ trunk/reactos/lib/msvcrt/msvcrt.def 2005-01-27 21:16:41 UTC (rev 13340) @@ -108,7 +108,7 @@ __argc DATA __argv DATA __badioinfo DATA -__crtCompareStringA ;=NTDLL.RtlCompareString +;__crtCompareStringA ;=NTDLL.RtlCompareString ;__crtGetLocaleInfoW __crtLCMapStringA __dllonexit @@ -126,7 +126,7 @@ __mb_cur_max DATA __p___argc __p___argv -__p___wargv +;__p___wargv __p___initenv __p___mb_cur_max __p___winitenv @@ -154,14 +154,14 @@ __p__winver ;__p__wpgmptr __pioinfo -;__pxcptinfoptrs +__pxcptinfoptrs __set_app_type __setlc_active DATA __setusermatherr __threadhandle __threadid __toascii -__unDName +;__unDName ;__unDNameEx __unguarded_readlc_active DATA __wargv @@ -281,7 +281,7 @@ _finite _flsbuf _flushall -_fmode DATA +_fmode=__fmode DATA _fpclass _fpieee_flt _fpreset @@ -311,7 +311,7 @@ ;_getmaxstdio ;_getmbcp _getpid -;_getsystime +_getsystime _getw ;_getwch ;_getwche @@ -481,7 +481,7 @@ ;_scprintf ;_scwprintf _searchenv -_seh_longjmp_unwind +_seh_longjmp_unwind@4 ;_set_error_mode ;_set_SSE2_enable ;_set_sbh_threshold @@ -491,7 +491,7 @@ ;_setmaxstdio _setmbcp _setmode -;_setsystime +_setsystime _sleep _snprintf ;_snscanf

19 years, 7 months

[tamlin] 13339: Help freeloader stop crashing from divide-by-zero, provoked by drain-bamaged BIOS.

by tamlin＠svn.reactos.com

Help freeloader stop crashing from divide-by-zero, provoked by drain-bamaged BIOS. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c 2005-01-27 15:28:08 UTC (rev 13338) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c 2005-01-27 21:12:05 UTC (rev 13339) @@ -146,7 +146,9 @@ // // Get the drive geometry // - if (!MachDiskGetDriveGeometry(DriveNumber, &DriveGeometry)) + if (!MachDiskGetDriveGeometry(DriveNumber, &DriveGeometry) || + DriveGeometry.Sectors == 0 || + DriveGeometry.Heads == 0) { return FALSE; }

19 years, 7 months

[ekohl] 13338: CreateNamedPipeW(): Set access rights according to the given open mode.

by ekohl＠svn.reactos.com

CreateNamedPipeW(): Set access rights according to the given open mode. Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-01-27 14:11:19 UTC (rev 13337) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-01-27 15:28:08 UTC (rev 13338) @@ -123,14 +123,17 @@ if (dwOpenMode & PIPE_ACCESS_DUPLEX) { CreateOptions = CreateOptions | FILE_PIPE_FULL_DUPLEX; + DesiredAccess |= (FILE_GENERIC_READ | FILE_GENERIC_WRITE); } else if (dwOpenMode & PIPE_ACCESS_INBOUND) { CreateOptions = CreateOptions | FILE_PIPE_INBOUND; + DesiredAccess |= FILE_GENERIC_READ; } else if (dwOpenMode & PIPE_ACCESS_OUTBOUND) { CreateOptions = CreateOptions | FILE_PIPE_OUTBOUND; + DesiredAccess |= FILE_GENERIC_WRITE; } if (dwPipeMode & PIPE_TYPE_BYTE)

19 years, 7 months

[weiden] 13337: 1. fixed prototypes of NtQueryPerformanceCounter() and NtDelayExecution() and made them safely access buffers

by weiden＠svn.reactos.com

1. fixed prototypes of NtQueryPerformanceCounter() and NtDelayExecution() and made them safely access buffers 2. moved the implementation of Sleep(Ex)() into more a appropriate file Modified: trunk/reactos/drivers/net/afd/afd/main.c Modified: trunk/reactos/include/ntos/zw.h Modified: trunk/reactos/lib/kernel32/process/proc.c Modified: trunk/reactos/lib/kernel32/thread/thread.c Modified: trunk/reactos/ntoskrnl/ke/timer.c _____ Modified: trunk/reactos/drivers/net/afd/afd/main.c --- trunk/reactos/drivers/net/afd/afd/main.c 2005-01-27 08:16:42 UTC (rev 13336) +++ trunk/reactos/drivers/net/afd/afd/main.c 2005-01-27 14:11:19 UTC (rev 13337) @@ -19,8 +19,6 @@ #ifdef DBG -extern NTSTATUS DDKAPI MmCopyFromCaller( PVOID Dst, PVOID Src, UINT Size ); - /* See debug.h for debug/trace constants */ //DWORD DebugTraceLevel = DEBUG_ULTRA; DWORD DebugTraceLevel = 0; _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-01-27 08:16:42 UTC (rev 13336) +++ trunk/reactos/include/ntos/zw.h 2005-01-27 14:11:19 UTC (rev 13337) @@ -3014,8 +3014,8 @@ /* * FUNCTION: Queries the system ( high-resolution ) performance counter. * ARGUMENTS: - * Counter = Performance counter - * Frequency = Performance frequency + * PerformanceCounter = Performance counter + * PerformanceFrequency = Performance frequency * REMARKS: This procedure queries a tick count faster than 10ms ( The resolution for Intel«-based CPUs is about 0.8 microseconds.) This procedure maps to the win32 QueryPerformanceCounter, QueryPerformanceFrequency @@ -3025,15 +3025,15 @@ NTSTATUS STDCALL NtQueryPerformanceCounter( - IN PLARGE_INTEGER Counter, - IN PLARGE_INTEGER Frequency + OUT PLARGE_INTEGER PerformanceCounter, + OUT PLARGE_INTEGER PerformanceFrequency OPTIONAL ); NTSTATUS STDCALL ZwQueryPerformanceCounter( - IN PLARGE_INTEGER Counter, - IN PLARGE_INTEGER Frequency + OUT PLARGE_INTEGER PerformanceCounter, + OUT PLARGE_INTEGER PerformanceFrequency OPTIONAL ); /* @@ -5240,8 +5240,8 @@ NTSTATUS STDCALL NtDelayExecution( - IN ULONG Alertable, - IN LARGE_INTEGER *Interval + IN BOOLEAN Alertable, + IN PLARGE_INTEGER DelayInterval ); /* @@ -6439,7 +6439,7 @@ STDCALL ZwDelayExecution( IN BOOLEAN Alertable, - IN TIME *Interval + IN PLARGE_INTEGER DelayInterval ); /* _____ Modified: trunk/reactos/lib/kernel32/process/proc.c --- trunk/reactos/lib/kernel32/process/proc.c 2005-01-27 08:16:42 UTC (rev 13336) +++ trunk/reactos/lib/kernel32/process/proc.c 2005-01-27 14:11:19 UTC (rev 13337) @@ -442,51 +442,6 @@ * @implemented */ VOID STDCALL -Sleep(DWORD dwMilliseconds) -{ - SleepEx(dwMilliseconds, FALSE); - return; -} - - -/* - * @implemented - */ -DWORD STDCALL -SleepEx(DWORD dwMilliseconds, - BOOL bAlertable) -{ - LARGE_INTEGER Interval; - NTSTATUS errCode; - - if (dwMilliseconds != INFINITE) - { - /* - * System time units are 100 nanoseconds (a nanosecond is a billionth of - * a second). - */ - Interval.QuadPart = -((ULONGLONG)dwMilliseconds * 10000); - } - else - { - /* Approximately 292000 years hence */ - Interval.QuadPart = -0x7FFFFFFFFFFFFFFFLL; - } - - errCode = NtDelayExecution (bAlertable, &Interval); - if (!NT_SUCCESS(errCode)) - { - SetLastErrorByStatus (errCode); - return -1; - } - return 0; -} - - -/* - * @implemented - */ -VOID STDCALL GetStartupInfoW(LPSTARTUPINFOW lpStartupInfo) { PRTL_USER_PROCESS_PARAMETERS Params; _____ Modified: trunk/reactos/lib/kernel32/thread/thread.c --- trunk/reactos/lib/kernel32/thread/thread.c 2005-01-27 08:16:42 UTC (rev 13336) +++ trunk/reactos/lib/kernel32/thread/thread.c 2005-01-27 14:11:19 UTC (rev 13337) @@ -852,4 +852,49 @@ return FALSE; } + +/* + * @implemented + */ +VOID STDCALL +Sleep(DWORD dwMilliseconds) +{ + SleepEx(dwMilliseconds, FALSE); + return; +} + + +/* + * @implemented + */ +DWORD STDCALL +SleepEx(DWORD dwMilliseconds, + BOOL bAlertable) +{ + LARGE_INTEGER Interval; + NTSTATUS errCode; + + if (dwMilliseconds != INFINITE) + { + /* + * System time units are 100 nanoseconds (a nanosecond is a billionth of + * a second). + */ + Interval.QuadPart = -((ULONGLONG)dwMilliseconds * 10000); + } + else + { + /* Approximately 292000 years hence */ + Interval.QuadPart = -0x7FFFFFFFFFFFFFFFLL; + } + + errCode = NtDelayExecution ((bAlertable ? TRUE : FALSE), &Interval); + if (!NT_SUCCESS(errCode)) + { + SetLastErrorByStatus (errCode); + return -1; + } + return 0; +} + /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ke/timer.c --- trunk/reactos/ntoskrnl/ke/timer.c 2005-01-27 08:16:42 UTC (rev 13336) +++ trunk/reactos/ntoskrnl/ke/timer.c 2005-01-27 14:11:19 UTC (rev 13337) @@ -71,8 +71,6 @@ /* must raise IRQL to PROFILE_LEVEL and grab spin lock there, to sync with ISR */ -extern HANDLE PsIdleThreadHandle; - #define MICROSECONDS_PER_TICK (10000) #define TICKS_TO_CALIBRATE (1) #define CALIBRATE_PERIOD (MICROSECONDS_PER_TICK * TICKS_TO_CALIBRATE) @@ -104,58 +102,100 @@ NTSTATUS STDCALL -NtQueryPerformanceCounter(IN PLARGE_INTEGER Counter, - IN PLARGE_INTEGER Frequency) +NtQueryPerformanceCounter(OUT PLARGE_INTEGER PerformanceCounter, + OUT PLARGE_INTEGER PerformanceFrequency OPTIONAL) { LARGE_INTEGER PerfCounter; LARGE_INTEGER PerfFrequency; - NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(PerformanceCounter, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + if(PerformanceFrequency != NULL) + { + ProbeForWrite(PerformanceFrequency, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } PerfCounter = KeQueryPerformanceCounter(&PerfFrequency); - - if (Counter != NULL) + + _SEH_TRY + { + *PerformanceCounter = PerfCounter; + if(PerformanceFrequency != NULL) { - Status = MmCopyToCaller(&Counter->QuadPart, &PerfCounter.QuadPart, sizeof(PerfCounter.QuadPart)); - if (!NT_SUCCESS(Status)) - { - return(Status); - } + *PerformanceFrequency = PerfFrequency; } - - if (Frequency != NULL) + } + _SEH_HANDLE { - Status = MmCopyToCaller(&Frequency->QuadPart, &PerfFrequency.QuadPart, sizeof(PerfFrequency.QuadPart)); - if (!NT_SUCCESS(Status)) - { - return(Status); - } + Status = _SEH_GetExceptionCode(); } + _SEH_END; - return(STATUS_SUCCESS); + return Status; } NTSTATUS STDCALL -NtDelayExecution(IN ULONG Alertable, - IN LARGE_INTEGER* Interval) +NtDelayExecution(IN BOOLEAN Alertable, + IN PLARGE_INTEGER DelayInterval) { - NTSTATUS Status; - LARGE_INTEGER Timeout; - - Status = MmCopyFromCaller(&Timeout, Interval, sizeof(Timeout)); - if (!NT_SUCCESS(Status)) + KPROCESSOR_MODE PreviousMode; + LARGE_INTEGER SafeInterval; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY { - return(Status); + ProbeForRead(DelayInterval, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + /* make a copy on the kernel stack and let DelayInterval point to it so + we don't need to wrap KeDelayExecutionThread in SEH! */ + SafeInterval = *DelayInterval; + DelayInterval = &SafeInterval; } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } - Timeout = *((PLARGE_INTEGER)Interval); - DPRINT("NtDelayExecution(Alertable %d, Internal %x) IntervalP %x\n", - Alertable, Internal, Timeout); - - DPRINT("Execution delay is %d/%d\n", - Timeout.u.HighPart, Timeout.u.LowPart); - Status = KeDelayExecutionThread(UserMode, (BOOLEAN)Alertable, &Timeout); - return(Status); + return KeDelayExecutionThread(PreviousMode, + Alertable, + DelayInterval); }

19 years, 7 months

[arty] 13336: Suggested fix for atapi. The atapi driver wants whole sectors, but the

by arty＠svn.reactos.com

Suggested fix for atapi. The atapi driver wants whole sectors, but the ext2 driver sometimes attempts an incomplete write. Here we fill the remaineder of the sector with zeros. This isn't the most elegant way to do it but illustrates the problem. I'm committing this here because it's a branch. Modified: branches/ext2/reactos/drivers/storage/atapi/atapi.c _____ Modified: branches/ext2/reactos/drivers/storage/atapi/atapi.c --- branches/ext2/reactos/drivers/storage/atapi/atapi.c 2005-01-27 04:15:14 UTC (rev 13335) +++ branches/ext2/reactos/drivers/storage/atapi/atapi.c 2005-01-27 08:16:42 UTC (rev 13336) @@ -2000,12 +2000,12 @@ UCHAR CylinderLow; UCHAR DrvHead; UCHAR SectorNumber; - UCHAR Command; + UCHAR Command = 0; ULONG Retries; UCHAR Status; BOOLEAN FASTCALL (*Handler)(PATAPI_MINIPORT_EXTENSION DevExt); - DPRINT("AtapiReadWrite() called!\n"); + DPRINT("AtaiReadWrite() called!\n"); DPRINT("SCSIOP_WRITE: TargetId: %lu\n", Srb->TargetId); @@ -2144,13 +2144,16 @@ if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_MULTI_SECTOR_CMD) { Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_MULTIPLE : IDE_CMD_WRITE_MULTIPLE; + DPRINT("Command = %x\n", Command); } else { Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ : IDE_CMD_WRITE; + DPRINT("Command = %x\n", Command); } } + DPRINT("Executing Command = %x\n", Command); AtapiExecuteCommand(DeviceExtension, Command, Handler); #ifdef ENABLE_DMA @@ -2182,7 +2185,7 @@ } if (Retries >= IDE_MAX_WRITE_RETRIES) { - DPRINT1("Drive is BUSY for too long after sending write command\n"); + DPRINT("Drive is BUSY for too long after sending write command\n"); return(SRB_STATUS_BUSY); } @@ -2200,12 +2203,47 @@ /* Write data block */ if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_DWORD_IO) { - IDEWriteBlock32(DeviceExtension->CommandPortBase, - TargetAddress, - TransferSize); + UINT Temp = 0; + UINT ExtraWord = TransferSize & (sizeof(UINT)-1); + UINT EndOfBlock; + + DPRINT("IDEWriteBlock32(%x, %d)\n", + DeviceExtension->CommandPortBase, + TransferSize); + IDEWriteBlock32(DeviceExtension->CommandPortBase, + TargetAddress, + TransferSize); + if( ExtraWord ) { + RtlCopyMemory( &Temp, + TargetAddress + + (TransferSize & (sizeof(UINT)-1)), + ExtraWord ); + IDEWriteBlock32(DeviceExtension->CommandPortBase, + &Temp, + sizeof(Temp)); + TransferSize = (TransferSize + sizeof(UINT)) & + ~(sizeof(UINT) - 1); + } + + Temp = 0; + + DPRINT("TransferSize = %d (BPS %d)\n", + TransferSize, DeviceParams->BytesPerSector); + + EndOfBlock = DeviceParams->BytesPerSector - + (TransferSize & (DeviceParams->BytesPerSector - 1)); + + while( EndOfBlock ) { + DPRINT("Zeros Remaining %d\n", EndOfBlock); + IDEWriteBlock32(DeviceExtension->CommandPortBase, + &Temp, + sizeof(Temp)); + EndOfBlock -= sizeof(Temp); + } } else { + DPRINT1("IDEWriteBlock(%x)\n", DeviceExtension->CommandPortBase); IDEWriteBlock(DeviceExtension->CommandPortBase, TargetAddress, TransferSize);

19 years, 7 months

[arty] 13335: There is no WinSta in here.

by arty＠svn.reactos.com

There is no WinSta in here. Modified: trunk/reactos/subsys/win32k/eng/mouse.c _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2005-01-27 01:03:37 UTC (rev 13334) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2005-01-27 04:15:14 UTC (rev 13335) @@ -100,8 +100,6 @@ GDIDEVICE *ppdev; GDIPOINTER *pgp; - ASSERT(WinSta); - ASSERT(SurfObj != NULL); ppdev = GDIDEV(SurfObj);

19 years, 7 months

← Newer
1
2
3
4
5
6
7
...
71
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 January 2005