From d0c8725360678c2b4a7b75348064f030130c2891 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 23 Jul 2002 02:08:12 +0000 Subject: [PATCH] Fixed broken forwards reported by Patrik Stridvall. --- dlls/crtdll/crtdll.spec | 12 ++++---- dlls/crtdll/crtdll_main.c | 56 +++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 72 ++++++++++++++++++++++----------------------- dlls/shell32/shell32.spec | 2 +- 4 files changed, 99 insertions(+), 43 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 8920b149608..f0428956fc3 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -282,21 +282,21 @@ init CRTDLL_Init @ forward _statusfp msvcrt._statusfp @ forward _strcmpi msvcrt._strcmpi @ forward _strdate msvcrt._strdate -@ forward _strdec msvcrt._strdec +@ cdecl _strdec(str str) _strdec @ forward _strdup msvcrt._strdup @ forward _strerror msvcrt._strerror @ forward _stricmp msvcrt._stricmp @ forward _stricoll msvcrt._stricoll -@ forward _strinc msvcrt._strinc +@ cdecl _strinc(str) _strinc @ forward _strlwr msvcrt._strlwr -@ forward _strncnt msvcrt._strncnt -@ forward _strnextc msvcrt._strnextc +@ cdecl _strncnt(str long) _strncnt +@ cdecl _strnextc(str) _strnextc @ forward _strnicmp msvcrt._strnicmp -@ forward _strninc msvcrt._strninc +@ cdecl _strninc(str long) _strninc @ forward _strnset msvcrt._strnset @ forward _strrev msvcrt._strrev @ forward _strset msvcrt._strset -@ forward _strspnp msvcrt._strspnp +@ cdecl _strspnp(str str) _strspnp @ forward _strtime msvcrt._strtime @ forward _strupr msvcrt._strupr @ forward _swab msvcrt._swab diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c index b83acd1e6e8..2c4205d2ec6 100644 --- a/dlls/crtdll/crtdll_main.c +++ b/dlls/crtdll/crtdll_main.c @@ -133,3 +133,59 @@ int CRTDLL__stat(const char* path, struct crtdll_stat * buf) 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; +} diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index c8bada084a9..e21f65dc076 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -735,8 +735,8 @@ @ forward -noimport _mkdir msvcrt._mkdir @ forward -noimport _mktemp msvcrt._mktemp @ forward -noimport _msize msvcrt._msize -@ forward -noimport _mtlock msvcrt._mtlock -@ forward -noimport _mtunlock msvcrt._mtunlock +@ stub _mtlock +@ stub _mtunlock @ forward -noimport _nextafter msvcrt._nextafter @ forward -noimport _onexit msvcrt._onexit @ forward -noimport _open msvcrt._open @@ -764,7 +764,7 @@ @ forward -noimport _safe_fprem1 msvcrt._safe_fprem1 @ forward -noimport _scalb msvcrt._scalb @ forward -noimport _searchenv msvcrt._searchenv -@ forward -noimport __seh_longjmp_unwind@4 msvcrt.__seh_longjmp_unwind +@ forward -noimport __seh_longjmp_unwind msvcrt._seh_longjmp_unwind @ forward -noimport _seterrormode msvcrt._seterrormode @ forward -noimport _setjmp msvcrt._setjmp @ forward -noimport _setjmp3 msvcrt._setjmp3 @@ -804,39 +804,39 @@ @ forward -noimport _swab msvcrt._swab @ forward -noimport _sys_errlist msvcrt._sys_errlist @ forward -noimport _sys_nerr msvcrt._sys_nerr -@ forward -noimport _tccpy msvcrt._tccpy -@ forward -noimport _tclen msvcrt._tclen -@ forward -noimport _tcschr msvcrt._tcschr -@ forward -noimport _tcsclen msvcrt._tcsclen -@ forward -noimport _tcscmp msvcrt._tcscmp -@ forward -noimport _tcscspn msvcrt._tcscspn -@ forward -noimport _tcsdec msvcrt._tcsdec -@ forward -noimport _tcsicmp msvcrt._tcsicmp -@ forward -noimport _tcsinc msvcrt._tcsinc -@ forward -noimport _tcslwr msvcrt._tcslwr -@ forward -noimport _tcsnbcnt msvcrt._tcsnbcnt -@ forward -noimport _tcsncat msvcrt._tcsncat -@ forward -noimport _tcsnccat msvcrt._tcsnccat -@ forward -noimport _tcsnccmp msvcrt._tcsnccmp -@ forward -noimport _tcsnccnt msvcrt._tcsnccnt -@ forward -noimport _tcsnccpy msvcrt._tcsnccpy -@ forward -noimport _tcsncicmp msvcrt._tcsncicmp -@ forward -noimport _tcsncmp msvcrt._tcsncmp -@ forward -noimport _tcsncpy msvcrt._tcsncpy -@ forward -noimport _tcsncset msvcrt._tcsncset -@ forward -noimport _tcsnextc msvcrt._tcsnextc -@ forward -noimport _tcsnicmp msvcrt._tcsnicmp -@ forward -noimport _tcsninc msvcrt._tcsninc -@ forward -noimport _tcsnset msvcrt._tcsnset -@ forward -noimport _tcspbrk msvcrt._tcspbrk -@ forward -noimport _tcsrchr msvcrt._tcsrchr -@ forward -noimport _tcsrev msvcrt._tcsrev -@ forward -noimport _tcsset msvcrt._tcsset -@ forward -noimport _tcsspn msvcrt._tcsspn -@ forward -noimport _tcsspnp msvcrt._tcsspnp -@ forward -noimport _tcsstr msvcrt._tcsstr -@ forward -noimport _tcstok msvcrt._tcstok -@ forward -noimport _tcsupr msvcrt._tcsupr +@ forward -noimport _tccpy msvcrt._mbccpy +@ forward -noimport _tclen msvcrt._mbclen +@ forward -noimport _tcschr msvcrt._mbschr +@ forward -noimport _tcsclen msvcrt._mbslen +@ forward -noimport _tcscmp msvcrt._mbscmp +@ forward -noimport _tcscspn msvcrt._mbscspn +@ forward -noimport _tcsdec msvcrt._mbsdec +@ forward -noimport _tcsicmp msvcrt._mbsicmp +@ forward -noimport _tcsinc msvcrt._mbsinc +@ forward -noimport _tcslwr msvcrt._mbslwr +@ forward -noimport _tcsnbcnt msvcrt._mbsnbcnt +@ forward -noimport _tcsncat msvcrt._mbsnbcat +@ forward -noimport _tcsnccat msvcrt._mbsncat +@ forward -noimport _tcsnccmp msvcrt._mbsncmp +@ forward -noimport _tcsnccnt msvcrt._mbsnccnt +@ forward -noimport _tcsnccpy msvcrt._mbsncpy +@ forward -noimport _tcsncicmp msvcrt._mbsnicmp +@ forward -noimport _tcsncmp msvcrt._mbsnbcmp +@ forward -noimport _tcsncpy msvcrt._mbsnbcpy +@ forward -noimport _tcsncset msvcrt._mbsnset +@ forward -noimport _tcsnextc msvcrt._mbsnextc +@ forward -noimport _tcsnicmp msvcrt._mbsnbicmp +@ forward -noimport _tcsninc msvcrt._mbsninc +@ forward -noimport _tcsnset msvcrt._mbsnbset +@ forward -noimport _tcspbrk msvcrt._mbspbrk +@ forward -noimport _tcsrchr msvcrt._mbsrchr +@ forward -noimport _tcsrev msvcrt._mbsrev +@ forward -noimport _tcsset msvcrt._mbsset +@ forward -noimport _tcsspn msvcrt._mbsspn +@ forward -noimport _tcsspnp msvcrt._mbsspnp +@ forward -noimport _tcsstr msvcrt._mbsstr +@ forward -noimport _tcstok msvcrt._mbstok +@ forward -noimport _tcsupr msvcrt._mbsupr @ forward -noimport _tell msvcrt._tell @ forward -noimport _tempnam msvcrt._tempnam @ forward -noimport _timezone msvcrt._timezone diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 9227bf265ee..1f5aa63cc1d 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -247,7 +247,7 @@ init Shell32LibMain 313 forward StrNCmpIW shlwapi.StrCmpNIW 314 forward StrNCmpW shlwapi.StrCmpNW 315 stdcall StrNCpyA (ptr str long) lstrcpynA - 316 forward StrNCpyW shlwapi.StrNCpyW + 316 forward StrNCpyW shlwapi.StrCpyNW 317 forward StrRChrA shlwapi.StrRChrA 318 forward StrRChrIA shlwapi.StrRChrIA 319 forward StrRChrIW shlwapi.StrRChrIW -- 2.11.4.GIT