From b9472583c6c14b976950691a76c7b7993ee0bd1d Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Mon, 20 Jun 2011 12:41:32 +0000 Subject: [PATCH] [CRTDLL] - don't forward _fileinfo_dll to MSVCRT, this doesn't work and its not what MS crtdll does. - don't define _CRTIMP to _declspec(dllexport) - link to MSVCRT when compiling with MSVC - remove def file svn path=/trunk/; revision=52380 --- reactos/dll/win32/crtdll/CMakeLists.txt | 1 + reactos/dll/win32/crtdll/crtdll.def | 530 ------------------------ reactos/dll/win32/crtdll/crtdll.spec | 2 +- reactos/dll/win32/crtdll/dllmain.c | 1 + reactos/include/crt/crtdefs.h | 2 +- reactos/include/crt/excpt.h | 5 +- 6 files changed, 6 insertions(+), 535 deletions(-) delete mode 100644 reactos/dll/win32/crtdll/crtdll.def diff --git a/reactos/dll/win32/crtdll/CMakeLists.txt b/reactos/dll/win32/crtdll/CMakeLists.txt index 38fed08d65f..3bc01d6a721 100644 --- a/reactos/dll/win32/crtdll/CMakeLists.txt +++ b/reactos/dll/win32/crtdll/CMakeLists.txt @@ -26,6 +26,7 @@ set_entrypoint(crtdll DllMain@12) target_link_libraries(crtdll wine crt) if(MSVC) + add_importlibs(crtdll msvcrt) target_link_libraries(crtdll oldnames) endif() diff --git a/reactos/dll/win32/crtdll/crtdll.def b/reactos/dll/win32/crtdll/crtdll.def deleted file mode 100644 index 73e6ad1f60e..00000000000 --- a/reactos/dll/win32/crtdll/crtdll.def +++ /dev/null @@ -1,530 +0,0 @@ - -LIBRARY crtdll.dll - -EXPORTS - ??2@YAPAXI@Z=msvcrt.??2@YAPAXI@Z @1 - ??3@YAXPAX@Z=msvcrt.??3@YAXPAX@Z @2 - ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z=msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z @3 - _CIacos=msvcrt._CIacos @4 - _CIasin=msvcrt._CIasin @5 - _CIatan=msvcrt._CIatan @6 - _CIatan2=msvcrt._CIatan2 @7 - _CIcos=msvcrt._CIcos @8 - _CIcosh=msvcrt._CIcosh @9 - _CIexp=msvcrt._CIexp @10 - _CIfmod=msvcrt._CIfmod @11 - _CIlog=msvcrt._CIlog @12 - _CIlog10=msvcrt._CIlog10 @13 - _CIpow=msvcrt._CIpow @14 - _CIsin=msvcrt._CIsin @15 - _CIsinh=msvcrt._CIsinh @16 - _CIsqrt=msvcrt._CIsqrt @17 - _CItan=msvcrt._CItan @18 - _CItanh=msvcrt._CItanh @19 - _HUGE_dll=msvcrt._HUGE @20 DATA - _XcptFilter=msvcrt._XcptFilter @21 - __GetMainArgs @22 - __argc_dll=msvcrt.__argc @23 DATA - __argv_dll=msvcrt.__argv @24 DATA - __dllonexit=msvcrt.__dllonexit @25 - __doserrno=msvcrt.__doserrno @26 - __fpecode=msvcrt.__fpecode @27 - __isascii=msvcrt.__isascii @28 - __iscsym=msvcrt.__iscsym @29 - __iscsymf=msvcrt.__iscsymf @30 - __mb_cur_max_dll=msvcrt.__mb_cur_max @31 DATA - __pxcptinfoptrs=msvcrt.__pxcptinfoptrs @32 - __threadhandle=msvcrt.__threadhandle @33 - __threadid=msvcrt.__threadid @34 - __toascii=msvcrt.__toascii @35 - _abnormal_termination=msvcrt._abnormal_termination @36 - _access=msvcrt._access @37 - _acmdln_dll=msvcrt._acmdln @38 DATA - _aexit_rtn_dll=msvcrt._aexit_rtn @39 DATA - _amsg_exit=msvcrt._amsg_exit @40 - _assert=msvcrt._assert @41 - _basemajor_dll=CRTDLL__basemajor_dll @42 DATA - _baseminor_dll=CRTDLL__baseminor_dll @43 DATA - _baseversion_dll=CRTDLL__baseversion_dll @44 DATA - _beep=msvcrt._beep @45 - _beginthread=msvcrt._beginthread @46 - _c_exit=msvcrt._c_exit @47 - _cabs=msvcrt._cabs @48 - _cexit=msvcrt._cexit @49 - _cgets=msvcrt._cgets @50 - _chdir=msvcrt._chdir @51 - _chdrive=msvcrt._chdrive @52 - _chgsign=msvcrt._chgsign @53 - _chmod=msvcrt._chmod @54 - _chsize=msvcrt._chsize @55 - _clearfp=msvcrt._clearfp @56 - _close=msvcrt._close @57 - _commit=msvcrt._commit @58 - _commode_dll=msvcrt._commode @59 DATA - _control87=msvcrt._control87 @60 - _controlfp=msvcrt._controlfp @61 - _copysign=msvcrt._copysign @62 - _cprintf=msvcrt._cprintf @63 - _cpumode_dll=CRTDLL__cpumode_dll @64 DATA - _cputs=msvcrt._cputs @65 - _creat=msvcrt._creat @66 - _cscanf=msvcrt._cscanf @67 - _ctype=msvcrt._ctype @68 DATA - _cwait=msvcrt._cwait @69 - _daylight_dll=msvcrt._daylight @70 DATA - _dup=msvcrt._dup @71 - _dup2=msvcrt._dup2 @72 - _ecvt=msvcrt._ecvt @73 - _endthread=msvcrt._endthread @74 - _environ_dll=msvcrt._environ @75 DATA - _eof=msvcrt._eof @76 - _errno=msvcrt._errno @77 - _except_handler2=msvcrt._except_handler2 @78 - _execl=msvcrt._execl @79 - _execle=msvcrt._execle @80 - _execlp=msvcrt._execlp @81 - _execlpe=msvcrt._execlpe @82 - _execv=msvcrt._execv @83 - _execve=msvcrt._execve @84 - _execvp=msvcrt._execvp @85 - _execvpe=msvcrt._execvpe @86 - _exit=msvcrt._exit @87 - _expand=msvcrt._expand @88 - _fcloseall=msvcrt._fcloseall @89 - _fcvt=msvcrt._fcvt @90 - _fdopen=msvcrt._fdopen @91 - _fgetchar=msvcrt._fgetchar @92 - _fgetwchar=msvcrt._fgetwchar @93 - _filbuf=msvcrt._filbuf @94 - _fileinfo_dll=msvcrt._fileinfo @95 DATA - _filelength=msvcrt._filelength @96 - _fileno=msvcrt._fileno @97 - _findclose=msvcrt._findclose @98 - _findfirst=msvcrt._findfirst @99 - _findnext=msvcrt._findnext @100 - _finite=msvcrt._finite @101 - _flsbuf=msvcrt._flsbuf @102 - _flushall=msvcrt._flushall @103 - _fmode_dll=msvcrt._fmode @104 DATA - _fpclass=msvcrt._fpclass @105 - _fpieee_flt=msvcrt._fpieee_flt @106 - _fpreset=msvcrt._fpreset @107 - _fputchar=msvcrt._fputchar @108 - _fputwchar=msvcrt._fputwchar @109 - _fsopen=msvcrt._fsopen @110 - _fstat=CRTDLL__fstat @111 - _ftime=msvcrt._ftime @112 - _ftol=msvcrt._ftol @113 - _fullpath=msvcrt._fullpath @114 - _futime=msvcrt._futime @115 - _gcvt=msvcrt._gcvt @116 - _get_osfhandle=msvcrt._get_osfhandle @117 - _getch=msvcrt._getch @118 - _getche=msvcrt._getche @119 - _getcwd=msvcrt._getcwd @120 - _getdcwd=msvcrt._getdcwd @121 - _getdiskfree=msvcrt._getdiskfree @122 - _getdllprocaddr=msvcrt._getdllprocaddr @123 - _getdrive=msvcrt._getdrive @124 - _getdrives=msvcrt._getdrives @125 - _getpid=msvcrt._getpid @126 - _getsystime=msvcrt._getsystime @127 - _getw=msvcrt._getw @128 - _global_unwind2=msvcrt._global_unwind2 @129 - _heapchk=msvcrt._heapchk @130 - _heapmin=msvcrt._heapmin @131 - _heapset=msvcrt._heapset @132 - _heapwalk=msvcrt._heapwalk @133 - _hypot=msvcrt._hypot @134 - _initterm=msvcrt._initterm @135 - _iob=msvcrt._iob @136 DATA - _isatty=msvcrt._isatty @137 - _isctype=msvcrt._isctype @138 - _ismbbalnum=msvcrt._ismbbalnum @139 - _ismbbalpha=msvcrt._ismbbalpha @140 - _ismbbgraph=msvcrt._ismbbgraph @141 - _ismbbkalnum=msvcrt._ismbbkalnum @142 - _ismbbkana=msvcrt._ismbbkana @143 - _ismbbkpunct=msvcrt._ismbbkpunct @144 - _ismbblead=msvcrt._ismbblead @145 - _ismbbprint=msvcrt._ismbbprint @146 - _ismbbpunct=msvcrt._ismbbpunct @147 - _ismbbtrail=msvcrt._ismbbtrail @148 - _ismbcalpha=msvcrt._ismbcalpha @149 - _ismbcdigit=msvcrt._ismbcdigit @150 - _ismbchira=msvcrt._ismbchira @151 - _ismbckata=msvcrt._ismbckata @152 - _ismbcl0=msvcrt._ismbcl0 @153 - _ismbcl1=msvcrt._ismbcl1 @154 - _ismbcl2=msvcrt._ismbcl2 @155 - _ismbclegal=msvcrt._ismbclegal @156 - _ismbclower=msvcrt._ismbclower @157 - _ismbcprint=msvcrt._ismbcprint @158 - _ismbcspace=msvcrt._ismbcspace @159 - _ismbcsymbol=msvcrt._ismbcsymbol @160 - _ismbcupper=msvcrt._ismbcupper @161 - _ismbslead=msvcrt._ismbslead @162 - _ismbstrail=msvcrt._ismbstrail @163 - _isnan=msvcrt._isnan @164 - _itoa=msvcrt._itoa @165 - _itow=msvcrt._itow @166 - _j0=msvcrt._j0 @167 - _j1=msvcrt._j1 @168 - _jn=msvcrt._jn @169 - _kbhit=msvcrt._kbhit @170 - _lfind=msvcrt._lfind @171 - _loaddll=msvcrt._loaddll @172 - _local_unwind2=msvcrt._local_unwind2 @173 - _locking=msvcrt._locking @174 - _logb=msvcrt._logb @175 - _lrotl=msvcrt._lrotl @176 - _lrotr=msvcrt._lrotr @177 - _lsearch=msvcrt._lsearch @178 - _lseek=msvcrt._lseek @179 - _ltoa=msvcrt._ltoa @180 - _ltow=msvcrt._ltow @181 - _makepath=msvcrt._makepath @182 - _matherr=msvcrt._matherr @183 - _mbbtombc=msvcrt._mbbtombc @184 - _mbbtype=msvcrt._mbbtype @185 - _mbccpy=msvcrt._mbccpy @186 - _mbcjistojms=msvcrt._mbcjistojms @187 - _mbcjmstojis=msvcrt._mbcjmstojis @188 - _mbclen=msvcrt._mbclen @189 - _mbctohira=msvcrt._mbctohira @190 - _mbctokata=msvcrt._mbctokata @191 - _mbctolower=msvcrt._mbctolower @192 - _mbctombb=msvcrt._mbctombb @193 - _mbctoupper=msvcrt._mbctoupper @194 - _mbctype=msvcrt._mbctype @195 DATA - _mbsbtype=msvcrt._mbsbtype @196 - _mbscat=msvcrt._mbscat @197 - _mbschr=msvcrt._mbschr @198 - _mbscmp=msvcrt._mbscmp @199 - _mbscpy=msvcrt._mbscpy @200 - _mbscspn=msvcrt._mbscspn @201 - _mbsdec=msvcrt._mbsdec @202 - _mbsdup=msvcrt._mbsdup @203 - _mbsicmp=msvcrt._mbsicmp @204 - _mbsinc=msvcrt._mbsinc @205 - _mbslen=msvcrt._mbslen @206 - _mbslwr=msvcrt._mbslwr @207 - _mbsnbcat=msvcrt._mbsnbcat @208 - _mbsnbcmp=msvcrt._mbsnbcmp @209 - _mbsnbcnt=msvcrt._mbsnbcnt @210 - _mbsnbcpy=msvcrt._mbsnbcpy @211 - _mbsnbicmp=msvcrt._mbsnbicmp @212 - _mbsnbset=msvcrt._mbsnbset @213 - _mbsncat=msvcrt._mbsncat @214 - _mbsnccnt=msvcrt._mbsnccnt @215 - _mbsncmp=msvcrt._mbsncmp @216 - _mbsncpy=msvcrt._mbsncpy @217 - _mbsnextc=msvcrt._mbsnextc @218 - _mbsnicmp=msvcrt._mbsnicmp @219 - _mbsninc=msvcrt._mbsninc @220 - _mbsnset=msvcrt._mbsnset @221 - _mbspbrk=msvcrt._mbspbrk @222 - _mbsrchr=msvcrt._mbsrchr @223 - _mbsrev=msvcrt._mbsrev @224 - _mbsset=msvcrt._mbsset @225 - _mbsspn=msvcrt._mbsspn @226 - _mbsspnp=msvcrt._mbsspnp @227 - _mbsstr=msvcrt._mbsstr @228 - _mbstok=msvcrt._mbstok @229 - _mbstrlen=msvcrt._mbstrlen @230 - _mbsupr=msvcrt._mbsupr @231 - _memccpy=msvcrt._memccpy @232 - _memicmp=msvcrt._memicmp @233 - _mkdir=msvcrt._mkdir @234 - _mktemp=msvcrt._mktemp @235 - _msize=msvcrt._msize @236 - _nextafter=msvcrt._nextafter @237 - _onexit=msvcrt._onexit @238 - _open=msvcrt._open @239 - _open_osfhandle=msvcrt._open_osfhandle @240 - _osmajor_dll=CRTDLL__osmajor_dll @241 DATA - _osminor_dll=CRTDLL__osminor_dll @242 DATA - _osmode_dll=CRTDLL__osmode_dll @243 DATA - _osver_dll=msvcrt._osver @244 DATA - _osversion_dll=CRTDLL__osversion_dll @245 DATA - _pclose=msvcrt._pclose @246 - _pctype_dll=msvcrt._pctype @247 DATA - _pgmptr_dll=msvcrt._pgmptr @248 DATA - _pipe=msvcrt._pipe @249 - _popen=msvcrt._popen @250 - _purecall=msvcrt._purecall @251 - _putch=msvcrt._putch @252 - _putenv=msvcrt._putenv @253 - _putw=msvcrt._putw @254 - _pwctype_dll=msvcrt._pwctype @255 DATA - _read=msvcrt._read @256 - _rmdir=msvcrt._rmdir @257 - _rmtmp=msvcrt._rmtmp @258 - _rotl=msvcrt._rotl @259 - _rotr=msvcrt._rotr @260 - _scalb=msvcrt._scalb @261 - _searchenv=msvcrt._searchenv @262 - _seterrormode=msvcrt._seterrormode @263 - _setjmp=msvcrt._setjmp @264 - _setmode=msvcrt._setmode @265 - _setsystime=msvcrt._setsystime @266 - _sleep=msvcrt._sleep @267 - _snprintf=msvcrt._snprintf @268 - _snwprintf=msvcrt._snwprintf @269 - _sopen=msvcrt._sopen @270 - _spawnl=msvcrt._spawnl @271 - _spawnle=msvcrt._spawnle @272 - _spawnlp=msvcrt._spawnlp @273 - _spawnlpe=msvcrt._spawnlpe @274 - _spawnv=msvcrt._spawnv @275 - _spawnve=msvcrt._spawnve @276 - _spawnvp=msvcrt._spawnvp @277 - _spawnvpe=msvcrt._spawnvpe @278 - _splitpath=msvcrt._splitpath @279 - _stat=CRTDLL__stat @280 - _statusfp=msvcrt._statusfp @281 - _strcmpi=msvcrt._strcmpi @282 - _strdate=msvcrt._strdate @283 - _strdec @284 - _strdup=msvcrt._strdup @285 - _strerror=msvcrt._strerror @286 - _stricmp=msvcrt._stricmp @287 - _stricoll=msvcrt._stricoll @288 - _strinc @289 - _strlwr=msvcrt._strlwr @290 - _strncnt @291 - _strnextc @292 - _strnicmp=msvcrt._strnicmp @293 - _strninc @294 - _strnset=msvcrt._strnset @295 - _strrev=msvcrt._strrev @296 - _strset=msvcrt._strset @297 - _strspnp @298 - _strtime=msvcrt._strtime @299 - _strupr=msvcrt._strupr @300 - _swab=msvcrt._swab @301 - _sys_errlist=msvcrt._sys_errlist @302 DATA - _sys_nerr_dll=msvcrt._sys_nerr @303 DATA - _tell=msvcrt._tell @304 - _tempnam=msvcrt._tempnam @305 - _timezone_dll=msvcrt._timezone @306 DATA - _tolower=msvcrt._tolower @307 - _toupper=msvcrt._toupper @308 - _tzname=msvcrt._tzname @309 DATA - _tzset=msvcrt._tzset @310 - _ultoa=msvcrt._ultoa @311 - _ultow=msvcrt._ultow @312 - _umask=msvcrt._umask @313 - _ungetch=msvcrt._ungetch @314 - _unlink=msvcrt._unlink @315 - _unloaddll=msvcrt._unloaddll @316 - _utime=msvcrt._utime @317 - _vsnprintf=msvcrt._vsnprintf @318 - _vsnwprintf=msvcrt._vsnwprintf @319 - _wcsdup=msvcrt._wcsdup @320 - _wcsicmp=msvcrt._wcsicmp @321 - _wcsicoll=msvcrt._wcsicoll @322 - _wcslwr=msvcrt._wcslwr @323 - _wcsnicmp=msvcrt._wcsnicmp @324 - _wcsnset=msvcrt._wcsnset @325 - _wcsrev=msvcrt._wcsrev @326 - _wcsset=msvcrt._wcsset @327 - _wcsupr=msvcrt._wcsupr @328 - _winmajor_dll=msvcrt._winmajor @329 DATA - _winminor_dll=msvcrt._winminor @330 DATA - _winver_dll=msvcrt._winver @331 DATA - _write=msvcrt._write @332 - _wtoi=msvcrt._wtoi @333 - _wtol=msvcrt._wtol @334 - _y0=msvcrt._y0 @335 - _y1=msvcrt._y1 @336 - _yn=msvcrt._yn @337 - abort=msvcrt.abort @338 - abs=msvcrt.abs @339 - acos=msvcrt.acos @340 - asctime=msvcrt.asctime @341 - asin=msvcrt.asin @342 - atan=msvcrt.atan @343 - atan2=msvcrt.atan2 @344 - atexit=msvcrt.atexit @345 - atof=msvcrt.atof @346 - atoi=msvcrt.atoi @347 - atol=msvcrt.atol @348 - bsearch=msvcrt.bsearch @349 - calloc=msvcrt.calloc @350 - ceil=msvcrt.ceil @351 - clearerr=msvcrt.clearerr @352 - clock=msvcrt.clock @353 - cos=msvcrt.cos @354 - cosh=msvcrt.cosh @355 - ctime=msvcrt.ctime @356 - difftime=msvcrt.difftime @357 - div=msvcrt.div @358 - exit=msvcrt.exit @359 - exp=msvcrt.exp @360 - fabs=msvcrt.fabs @361 - fclose=msvcrt.fclose @362 - feof=msvcrt.feof @363 - ferror=msvcrt.ferror @364 - fflush=msvcrt.fflush @365 - fgetc=msvcrt.fgetc @366 - fgetpos=msvcrt.fgetpos @367 - fgets=msvcrt.fgets @368 - fgetwc=msvcrt.fgetwc @369 - floor=msvcrt.floor @370 - fmod=msvcrt.fmod @371 - fopen=msvcrt.fopen @372 - fprintf=msvcrt.fprintf @373 - fputc=msvcrt.fputc @374 - fputs=msvcrt.fputs @375 - fputwc=msvcrt.fputwc @376 - fread=msvcrt.fread @377 - free=msvcrt.free @378 - freopen=msvcrt.freopen @379 - frexp=msvcrt.frexp @380 - fscanf=msvcrt.fscanf @381 - fseek=msvcrt.fseek @382 - fsetpos=msvcrt.fsetpos @383 - ftell=msvcrt.ftell @384 - fwprintf=msvcrt.fwprintf @385 - fwrite=msvcrt.fwrite @386 - fwscanf=msvcrt.fwscanf @387 - getc=msvcrt.getc @388 - getchar=msvcrt.getchar @389 - getenv=msvcrt.getenv @390 - gets=msvcrt.gets @391 - gmtime=msvcrt.gmtime @392 - is_wctype=msvcrt.is_wctype @393 - isalnum=msvcrt.isalnum @394 - isalpha=msvcrt.isalpha @395 - iscntrl=msvcrt.iscntrl @396 - isdigit=msvcrt.isdigit @397 - isgraph=msvcrt.isgraph @398 - isleadbyte=msvcrt.isleadbyte @399 - islower=msvcrt.islower @400 - isprint=msvcrt.isprint @401 - ispunct=msvcrt.ispunct @402 - isspace=msvcrt.isspace @403 - isupper=msvcrt.isupper @404 - iswalnum=msvcrt.iswalnum @405 - iswalpha=msvcrt.iswalpha @406 - iswascii=msvcrt.iswascii @407 - iswcntrl=msvcrt.iswcntrl @408 - iswctype=msvcrt.iswctype @409 - iswdigit=msvcrt.iswdigit @410 - iswgraph=msvcrt.iswgraph @411 - iswlower=msvcrt.iswlower @412 - iswprint=msvcrt.iswprint @413 - iswpunct=msvcrt.iswpunct @414 - iswspace=msvcrt.iswspace @415 - iswupper=msvcrt.iswupper @416 - iswxdigit=msvcrt.iswxdigit @417 - isxdigit=msvcrt.isxdigit @418 - labs=msvcrt.labs @419 - ldexp=msvcrt.ldexp @420 - ldiv=msvcrt.ldiv @421 - localeconv=msvcrt.localeconv @422 - localtime=msvcrt.localtime @423 - log=msvcrt.log @424 - log10=msvcrt.log10 @425 - longjmp=msvcrt.longjmp @426 - malloc=msvcrt.malloc @427 - mblen=msvcrt.mblen @428 - mbstowcs=msvcrt.mbstowcs @429 - mbtowc=msvcrt.mbtowc @430 - memchr=msvcrt.memchr @431 - memcmp=msvcrt.memcmp @432 - memcpy=msvcrt.memcpy @433 - memmove=msvcrt.memmove @434 - memset=msvcrt.memset @435 - mktime=msvcrt.mktime @436 - modf=msvcrt.modf @437 - perror=msvcrt.perror @438 - pow=msvcrt.pow @439 - printf=msvcrt.printf @440 - putc=msvcrt.putc @441 - putchar=msvcrt.putchar @442 - puts=msvcrt.puts @443 - qsort=msvcrt.qsort @444 - raise=msvcrt.raise @445 - rand=msvcrt.rand @446 - realloc=msvcrt.realloc @447 - remove=msvcrt.remove @448 - rename=msvcrt.rename @449 - rewind=msvcrt.rewind @450 - scanf=msvcrt.scanf @451 - setbuf=msvcrt.setbuf @452 - setlocale=msvcrt.setlocale @453 - setvbuf=msvcrt.setvbuf @454 - signal=msvcrt.signal @455 - sin=msvcrt.sin @456 - sinh=msvcrt.sinh @457 - sprintf=msvcrt.sprintf @458 - sqrt=msvcrt.sqrt @459 - srand=msvcrt.srand @460 - sscanf=msvcrt.sscanf @461 - strcat=msvcrt.strcat @462 - strchr=msvcrt.strchr @463 - strcmp=msvcrt.strcmp @464 - strcoll=msvcrt.strcoll @465 - strcpy=msvcrt.strcpy @466 - strcspn=msvcrt.strcspn @467 - strerror=msvcrt.strerror @468 - strftime=msvcrt.strftime @469 - strlen=msvcrt.strlen @470 - strncat=msvcrt.strncat @471 - strncmp=msvcrt.strncmp @472 - strncpy=msvcrt.strncpy @473 - strpbrk=msvcrt.strpbrk @474 - strrchr=msvcrt.strrchr @475 - strspn=msvcrt.strspn @476 - strstr=msvcrt.strstr @477 - strtod=msvcrt.strtod @478 - strtok=msvcrt.strtok @479 - strtol=msvcrt.strtol @480 - strtoul=msvcrt.strtoul @481 - strxfrm=msvcrt.strxfrm @482 - swprintf=msvcrt.swprintf @483 - swscanf=msvcrt.swscanf @484 - system=msvcrt.system @485 - tan=msvcrt.tan @486 - tanh=msvcrt.tanh @487 - time=msvcrt.time @488 - tmpfile=msvcrt.tmpfile @489 - tmpnam=msvcrt.tmpnam @490 - tolower=msvcrt.tolower @491 - toupper=msvcrt.toupper @492 - towlower=msvcrt.towlower @493 - towupper=msvcrt.towupper @494 - ungetc=msvcrt.ungetc @495 - ungetwc=msvcrt.ungetwc @496 - vfprintf=msvcrt.vfprintf @497 - vfwprintf=msvcrt.vfwprintf @498 - vprintf=msvcrt.vprintf @499 - vsprintf=msvcrt.vsprintf @500 - vswprintf=msvcrt.vswprintf @501 - vwprintf=msvcrt.vwprintf @502 - wcscat=msvcrt.wcscat @503 - wcschr=msvcrt.wcschr @504 - wcscmp=msvcrt.wcscmp @505 - wcscoll=msvcrt.wcscoll @506 - wcscpy=msvcrt.wcscpy @507 - wcscspn=msvcrt.wcscspn @508 - wcsftime=msvcrt.wcsftime @509 - wcslen=msvcrt.wcslen @510 - wcsncat=msvcrt.wcsncat @511 - wcsncmp=msvcrt.wcsncmp @512 - wcsncpy=msvcrt.wcsncpy @513 - wcspbrk=msvcrt.wcspbrk @514 - wcsrchr=msvcrt.wcsrchr @515 - wcsspn=msvcrt.wcsspn @516 - wcsstr=msvcrt.wcsstr @517 - wcstod=msvcrt.wcstod @518 - wcstok=msvcrt.wcstok @519 - wcstol=msvcrt.wcstol @520 - wcstombs=msvcrt.wcstombs @521 - wcstoul=msvcrt.wcstoul @522 - wcsxfrm=msvcrt.wcsxfrm @523 - wctomb=msvcrt.wctomb @524 - wprintf=msvcrt.wprintf @525 - wscanf=msvcrt.wscanf @526 diff --git a/reactos/dll/win32/crtdll/crtdll.spec b/reactos/dll/win32/crtdll/crtdll.spec index 7a7bdfdd553..38f2fb36b7b 100644 --- a/reactos/dll/win32/crtdll/crtdll.spec +++ b/reactos/dll/win32/crtdll/crtdll.spec @@ -94,7 +94,7 @@ @ cdecl _fgetchar() msvcrt._fgetchar @ cdecl _fgetwchar() msvcrt._fgetwchar @ cdecl _filbuf(ptr) msvcrt._filbuf - @ extern _fileinfo_dll msvcrt._fileinfo + @ extern _fileinfo_dll @ cdecl _filelength(long) msvcrt._filelength @ cdecl _fileno(ptr) msvcrt._fileno @ cdecl _findclose(long) msvcrt._findclose diff --git a/reactos/dll/win32/crtdll/dllmain.c b/reactos/dll/win32/crtdll/dllmain.c index 8af185b01c1..9565def92f4 100644 --- a/reactos/dll/win32/crtdll/dllmain.c +++ b/reactos/dll/win32/crtdll/dllmain.c @@ -46,6 +46,7 @@ unsigned int CRTDLL__osmajor_dll; unsigned int CRTDLL__osminor_dll; unsigned int CRTDLL__osmode_dll; unsigned int CRTDLL__osversion_dll; +int _fileinfo_dll; extern char* _acmdln; /* pointer to ascii command line */ extern wchar_t* _wcmdln; /* pointer to wide character command line */ diff --git a/reactos/include/crt/crtdefs.h b/reactos/include/crt/crtdefs.h index 832769e12d4..e43972ec9aa 100644 --- a/reactos/include/crt/crtdefs.h +++ b/reactos/include/crt/crtdefs.h @@ -52,7 +52,7 @@ #ifndef _CRTIMP #ifdef CRTDLL /* Defined for ntdll, crtdll, msvcrt, etc */ - #define _CRTIMP __declspec(dllexport) + #define _CRTIMP #elif defined(_DLL) #define _CRTIMP __declspec(dllimport) #else /* !CRTDLL && !_DLL */ diff --git a/reactos/include/crt/excpt.h b/reactos/include/crt/excpt.h index d0d3ef077de..456e20c3cde 100644 --- a/reactos/include/crt/excpt.h +++ b/reactos/include/crt/excpt.h @@ -44,18 +44,17 @@ typedef enum _EXCEPTION_DISPOSITION _CRTIMP EXCEPTION_DISPOSITION __cdecl __C_specific_handler (struct _EXCEPTION_RECORD *_ExceptionRecord,void *_EstablisherFrame,struct _CONTEXT *_ContextRecord,struct _DISPATCHER_CONTEXT *_DispatcherContext); #endif -#ifdef _MSC_VER // HACK!!! +#ifdef _MSC_VER #define GetExceptionCode _exception_code #define exception_code _exception_code #define GetExceptionInformation (struct _EXCEPTION_POINTERS *)_exception_info #define exception_info (struct _EXCEPTION_POINTERS *)_exception_info #define AbnormalTermination _abnormal_termination #define abnormal_termination _abnormal_termination -#endif - unsigned long __cdecl _exception_code(void); void *__cdecl _exception_info(void); int __cdecl _abnormal_termination(void); +#endif #define EXCEPTION_EXECUTE_HANDLER 1 #define EXCEPTION_CONTINUE_SEARCH 0