ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
October 2020
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
22 participants
156 discussions
Start a n
N
ew thread
[reactos] 01/05: [CRTDLL] Make this a stand-alone CRT DLL
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c321d3e88bdd5400285f0…
commit c321d3e88bdd5400285f0610067f97d2c176addf Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Oct 22 12:25:19 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Oct 22 18:07:27 2020 +0200 [CRTDLL] Make this a stand-alone CRT DLL Because CRTs must be isolated from each other. This basically reverts commit f0c91ae --- dll/win32/crtdll/CMakeLists.txt | 7 +- dll/win32/crtdll/crtdll.spec | 1054 +++++++++++++++++++-------------------- 2 files changed, 528 insertions(+), 533 deletions(-) diff --git a/dll/win32/crtdll/CMakeLists.txt b/dll/win32/crtdll/CMakeLists.txt index c40dda200e5..b2d01cc5a4b 100644 --- a/dll/win32/crtdll/CMakeLists.txt +++ b/dll/win32/crtdll/CMakeLists.txt @@ -19,12 +19,7 @@ list(APPEND SOURCE add_library(crtdll MODULE ${SOURCE}) set_module_type(crtdll win32dll ENTRYPOINT DllMain 12) -target_link_libraries(crtdll crt wine) - -if(MSVC) - add_importlibs(crtdll msvcrt) - target_link_libraries(crtdll oldnames) -endif() +target_link_libraries(crtdll crt wine ${PSEH_LIB}) add_importlibs(crtdll kernel32 ntdll) add_cd_file(TARGET crtdll DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/crtdll/crtdll.spec b/dll/win32/crtdll/crtdll.spec index 749140e7faa..0b8e0f74225 100644 --- a/dll/win32/crtdll/crtdll.spec +++ b/dll/win32/crtdll/crtdll.spec @@ -1,528 +1,528 @@ -# Old C runtime library. All functions provided by msvcrt +# Old C runtime library. - @ cdecl ??2@YAPAXI@Z(long) msvcrt.??2@YAPAXI@Z - @ cdecl ??3@YAXPAX@Z(ptr) msvcrt.??3@YAXPAX@Z - @ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z - @ cdecl _CIacos() msvcrt._CIacos - @ cdecl _CIasin() msvcrt._CIasin - @ cdecl _CIatan() msvcrt._CIatan - @ cdecl _CIatan2() msvcrt._CIatan2 - @ cdecl _CIcos() msvcrt._CIcos - @ cdecl _CIcosh() msvcrt._CIcosh - @ cdecl _CIexp() msvcrt._CIexp - @ cdecl _CIfmod() msvcrt._CIfmod - @ cdecl _CIlog() msvcrt._CIlog - @ cdecl _CIlog10() msvcrt._CIlog10 - @ cdecl _CIpow() msvcrt._CIpow - @ cdecl _CIsin() msvcrt._CIsin - @ cdecl _CIsinh() msvcrt._CIsinh - @ cdecl _CIsqrt() msvcrt._CIsqrt - @ cdecl _CItan() msvcrt._CItan - @ cdecl _CItanh() msvcrt._CItanh - @ extern _HUGE_dll msvcrt._HUGE - @ cdecl _XcptFilter() msvcrt._XcptFilter - @ cdecl __GetMainArgs(ptr ptr ptr long) - @ extern __argc_dll msvcrt.__argc - @ extern __argv_dll msvcrt.__argv - @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit - @ cdecl __doserrno() msvcrt.__doserrno - @ cdecl __fpecode() msvcrt.__fpecode - @ cdecl __isascii(long) msvcrt.__isascii - @ cdecl __iscsym(long) msvcrt.__iscsym - @ cdecl __iscsymf(long) msvcrt.__iscsymf - @ extern __mb_cur_max_dll msvcrt.__mb_cur_max - @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs - @ cdecl __threadhandle() msvcrt.__threadhandle - @ cdecl __threadid() msvcrt.__threadid - @ cdecl __toascii(long) msvcrt.__toascii - @ cdecl _abnormal_termination() msvcrt._abnormal_termination - @ cdecl _access(str long) msvcrt._access - @ extern _acmdln_dll msvcrt._acmdln - @ extern _aexit_rtn_dll msvcrt._aexit_rtn - @ cdecl _amsg_exit(long) msvcrt._amsg_exit - @ cdecl _assert(str str long) msvcrt._assert - @ extern _basemajor_dll CRTDLL__basemajor_dll - @ extern _baseminor_dll CRTDLL__baseminor_dll - @ extern _baseversion_dll CRTDLL__baseversion_dll - @ cdecl _beep(long long) msvcrt._beep - @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread - @ cdecl _c_exit() msvcrt._c_exit - @ cdecl _cabs(long) msvcrt._cabs - @ cdecl _cexit() msvcrt._cexit - @ cdecl _cgets(str) msvcrt._cgets - @ cdecl _chdir(str) msvcrt._chdir - @ cdecl _chdrive(long) msvcrt._chdrive - @ cdecl _chgsign( double ) msvcrt._chgsign - @ cdecl _chmod(str long) msvcrt._chmod - @ cdecl _chsize(long long) msvcrt._chsize - @ cdecl _clearfp() msvcrt._clearfp - @ cdecl _close(long) msvcrt._close - @ cdecl _commit(long) msvcrt._commit - @ extern _commode_dll msvcrt._commode - @ cdecl _control87(long long) msvcrt._control87 - @ cdecl _controlfp(long long) msvcrt._controlfp - @ cdecl _copysign( double double ) msvcrt._copysign - @ varargs _cprintf(str) msvcrt._cprintf - @ extern _cpumode_dll CRTDLL__cpumode_dll - @ cdecl _cputs(str) msvcrt._cputs - @ cdecl _creat(str long) msvcrt._creat - @ varargs _cscanf(str) msvcrt._cscanf - @ extern _ctype msvcrt._ctype - @ cdecl _cwait(ptr long long) msvcrt._cwait - @ extern _daylight_dll msvcrt._daylight - @ cdecl _dup(long) msvcrt._dup - @ cdecl _dup2(long long) msvcrt._dup2 - @ cdecl _ecvt( double long ptr ptr) msvcrt._ecvt - @ cdecl _endthread() msvcrt._endthread - @ extern _environ_dll msvcrt._environ - @ cdecl _eof(long) msvcrt._eof - @ cdecl _errno() msvcrt._errno - @ cdecl _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2 - @ varargs _execl(str str) msvcrt._execl - @ varargs _execle(str str) msvcrt._execle - @ varargs _execlp(str str) msvcrt._execlp - @ varargs _execlpe(str str) msvcrt._execlpe - @ cdecl _execv(str str) msvcrt._execv - @ cdecl _execve(str str str) msvcrt._execve - @ cdecl _execvp(str str) msvcrt._execvp - @ cdecl _execvpe(str str str) msvcrt._execvpe - @ cdecl _exit(long) msvcrt._exit - @ cdecl _expand(ptr long) msvcrt._expand - @ cdecl _fcloseall() msvcrt._fcloseall - @ cdecl _fcvt( double long ptr ptr) msvcrt._fcvt - @ cdecl _fdopen(long str) msvcrt._fdopen - @ cdecl _fgetchar() msvcrt._fgetchar - @ cdecl _fgetwchar() msvcrt._fgetwchar - @ cdecl _filbuf(ptr) msvcrt._filbuf - @ extern _fileinfo_dll - @ cdecl _filelength(long) msvcrt._filelength - @ cdecl _fileno(ptr) msvcrt._fileno - @ cdecl _findclose(long) msvcrt._findclose - @ cdecl _findfirst(str ptr) msvcrt._findfirst - @ cdecl _findnext(long ptr) msvcrt._findnext - @ cdecl _finite( double ) msvcrt._finite - @ cdecl _flsbuf(long ptr) msvcrt._flsbuf - @ cdecl _flushall() msvcrt._flushall - @ extern _fmode_dll msvcrt._fmode - @ cdecl _fpclass(double) msvcrt._fpclass - @ cdecl _fpieee_flt(long ptr ptr) msvcrt._fpieee_flt - @ cdecl _fpreset() msvcrt._fpreset - @ cdecl _fputchar(long) msvcrt._fputchar - @ cdecl _fputwchar(long) msvcrt._fputwchar - @ cdecl _fsopen(str str long) msvcrt._fsopen - @ cdecl _fstat(long ptr) CRTDLL__fstat - @ cdecl _ftime(ptr) msvcrt._ftime - @ cdecl -ret64 _ftol() msvcrt._ftol - @ cdecl _fullpath(ptr str long) msvcrt._fullpath - @ cdecl _futime(long ptr) msvcrt._futime - @ cdecl _gcvt( double long str) msvcrt._gcvt - @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle - @ cdecl _getch() msvcrt._getch - @ cdecl _getche() msvcrt._getche - @ cdecl _getcwd(str long) msvcrt._getcwd - @ cdecl _getdcwd(long str long) msvcrt._getdcwd - @ cdecl _getdiskfree(long ptr) msvcrt._getdiskfree - @ cdecl _getdllprocaddr(long str long) msvcrt._getdllprocaddr - @ cdecl _getdrive() msvcrt._getdrive - @ cdecl _getdrives() msvcrt._getdrives - @ cdecl _getpid() msvcrt._getpid - @ cdecl _getsystime(ptr) msvcrt._getsystime - @ cdecl _getw(ptr) msvcrt._getw - @ cdecl _global_unwind2(ptr) msvcrt._global_unwind2 - @ cdecl _heapchk() msvcrt._heapchk - @ cdecl _heapmin() msvcrt._heapmin - @ cdecl _heapset(long) msvcrt._heapset - @ cdecl _heapwalk(ptr) msvcrt._heapwalk - @ cdecl _hypot(double double) msvcrt._hypot - @ cdecl _initterm(ptr ptr) msvcrt._initterm - @ extern _iob msvcrt._iob - @ cdecl _isatty(long) msvcrt._isatty - @ cdecl _isctype(long long) msvcrt._isctype - @ cdecl _ismbbalnum(long) msvcrt._ismbbalnum - @ cdecl _ismbbalpha(long) msvcrt._ismbbalpha - @ cdecl _ismbbgraph(long) msvcrt._ismbbgraph - @ cdecl _ismbbkalnum(long) msvcrt._ismbbkalnum - @ cdecl _ismbbkana(long) msvcrt._ismbbkana - @ cdecl _ismbbkpunct(long) msvcrt._ismbbkpunct - @ cdecl _ismbblead(long) msvcrt._ismbblead - @ cdecl _ismbbprint(long) msvcrt._ismbbprint - @ cdecl _ismbbpunct(long) msvcrt._ismbbpunct - @ cdecl _ismbbtrail(long) msvcrt._ismbbtrail - @ cdecl _ismbcalpha(long) msvcrt._ismbcalpha - @ cdecl _ismbcdigit(long) msvcrt._ismbcdigit - @ cdecl _ismbchira(long) msvcrt._ismbchira - @ cdecl _ismbckata(long) msvcrt._ismbckata - @ cdecl _ismbcl0(long) msvcrt._ismbcl0 - @ cdecl _ismbcl1(long) msvcrt._ismbcl1 - @ cdecl _ismbcl2(long) msvcrt._ismbcl2 - @ cdecl _ismbclegal(long) msvcrt._ismbclegal - @ cdecl _ismbclower(long) msvcrt._ismbclower - @ cdecl _ismbcprint(long) msvcrt._ismbcprint - @ cdecl _ismbcspace(long) msvcrt._ismbcspace - @ cdecl _ismbcsymbol(long) msvcrt._ismbcsymbol - @ cdecl _ismbcupper(long) msvcrt._ismbcupper - @ cdecl _ismbslead(ptr ptr) msvcrt._ismbslead - @ cdecl _ismbstrail(ptr ptr) msvcrt._ismbstrail - @ cdecl _isnan( double ) msvcrt._isnan - @ cdecl _itoa(long ptr long) msvcrt._itoa - @ cdecl _itow(long ptr long) msvcrt._itow -# @ cdecl _j0(double) msvcrt._j0 -# @ cdecl _j1(double) msvcrt._j1 -# @ cdecl _jn(long double) msvcrt._jn - @ cdecl _kbhit() msvcrt._kbhit - @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind - @ cdecl _loaddll(str) msvcrt._loaddll - @ cdecl _local_unwind2(ptr long) msvcrt._local_unwind2 - @ cdecl _locking(long long long) msvcrt._locking - @ cdecl _logb( double ) msvcrt._logb - @ cdecl _lrotl(long long) msvcrt._lrotl - @ cdecl _lrotr(long long) msvcrt._lrotr - @ cdecl _lsearch(ptr ptr long long ptr) msvcrt._lsearch - @ cdecl _lseek(long long long) msvcrt._lseek - @ cdecl _ltoa(long ptr long) msvcrt._ltoa - @ cdecl _ltow(long ptr long) msvcrt._ltow - @ cdecl _makepath(str str str str str) msvcrt._makepath - @ cdecl _matherr(ptr) msvcrt._matherr - @ cdecl _mbbtombc(long) msvcrt._mbbtombc - @ cdecl _mbbtype(long long) msvcrt._mbbtype - @ cdecl _mbccpy(str str) msvcrt._mbccpy - @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms - @ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis - @ cdecl _mbclen(ptr) msvcrt._mbclen - @ cdecl _mbctohira(long) msvcrt._mbctohira - @ cdecl _mbctokata(long) msvcrt._mbctokata - @ cdecl _mbctolower(long) msvcrt._mbctolower - @ cdecl _mbctombb(long) msvcrt._mbctombb - @ cdecl _mbctoupper(long) msvcrt._mbctoupper - @ extern _mbctype msvcrt._mbctype - @ cdecl _mbsbtype(str long) msvcrt._mbsbtype - @ cdecl _mbscat(str str) msvcrt._mbscat - @ cdecl _mbschr(str long) msvcrt._mbschr - @ cdecl _mbscmp(str str) msvcrt._mbscmp - @ cdecl _mbscpy(ptr str) msvcrt._mbscpy - @ cdecl _mbscspn(str str) msvcrt._mbscspn - @ cdecl _mbsdec(ptr ptr) msvcrt._mbsdec - @ cdecl _mbsdup(str) msvcrt._mbsdup - @ cdecl _mbsicmp(str str) msvcrt._mbsicmp - @ cdecl _mbsinc(str) msvcrt._mbsinc - @ cdecl _mbslen(str) msvcrt._mbslen - @ cdecl _mbslwr(str) msvcrt._mbslwr - @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat - @ cdecl _mbsnbcmp(str str long) msvcrt._mbsnbcmp - @ cdecl _mbsnbcnt(ptr long) msvcrt._mbsnbcnt - @ cdecl _mbsnbcpy(ptr str long) msvcrt._mbsnbcpy - @ cdecl _mbsnbicmp(str str long) msvcrt._mbsnbicmp - @ cdecl _mbsnbset(str long long) msvcrt._mbsnbset - @ cdecl _mbsncat(str str long) msvcrt._mbsncat - @ cdecl _mbsnccnt(str long) msvcrt._mbsnccnt - @ cdecl _mbsncmp(str str long) msvcrt._mbsncmp - @ cdecl _mbsncpy(str str long) msvcrt._mbsncpy - @ cdecl _mbsnextc(str) msvcrt._mbsnextc - @ cdecl _mbsnicmp(str str long) msvcrt._mbsnicmp - @ cdecl _mbsninc(str long) msvcrt._mbsninc - @ cdecl _mbsnset(str long long) msvcrt._mbsnset - @ cdecl _mbspbrk(str str) msvcrt._mbspbrk - @ cdecl _mbsrchr(str long) msvcrt._mbsrchr - @ cdecl _mbsrev(str) msvcrt._mbsrev - @ cdecl _mbsset(str long) msvcrt._mbsset - @ cdecl _mbsspn(str str) msvcrt._mbsspn - @ cdecl _mbsspnp(str str) msvcrt._mbsspnp - @ cdecl _mbsstr(str str) msvcrt._mbsstr - @ cdecl _mbstok(str str) msvcrt._mbstok - @ cdecl _mbstrlen(str) msvcrt._mbstrlen - @ cdecl _mbsupr(str) msvcrt._mbsupr - @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy - @ cdecl _memicmp(str str long) msvcrt._memicmp - @ cdecl _mkdir(str) msvcrt._mkdir - @ cdecl _mktemp(str) msvcrt._mktemp - @ cdecl _msize(ptr) msvcrt._msize - @ cdecl _nextafter(double double) msvcrt._nextafter - @ cdecl _onexit(ptr) msvcrt._onexit - @ varargs _open(str long) msvcrt._open - @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle - @ extern _osmajor_dll CRTDLL__osmajor_dll - @ extern _osminor_dll CRTDLL__osminor_dll - @ extern _osmode_dll CRTDLL__osmode_dll - @ extern _osver_dll msvcrt._osver - @ extern _osversion_dll CRTDLL__osversion_dll - @ cdecl _pclose(ptr) msvcrt._pclose - @ extern _pctype_dll msvcrt._pctype - @ extern _pgmptr_dll msvcrt._pgmptr - @ cdecl _pipe(ptr long long) msvcrt._pipe - @ cdecl _popen(str str) msvcrt._popen - @ cdecl _purecall() msvcrt._purecall - @ cdecl _putch(long) msvcrt._putch - @ cdecl _putenv(str) msvcrt._putenv - @ cdecl _putw(long ptr) msvcrt._putw - @ extern _pwctype_dll msvcrt._pwctype - @ cdecl _read(long ptr long) msvcrt._read - @ cdecl _rmdir(str) msvcrt._rmdir - @ cdecl _rmtmp() msvcrt._rmtmp - @ cdecl _rotl(long long) msvcrt._rotl - @ cdecl _rotr(long long) msvcrt._rotr - @ cdecl _scalb( double long) msvcrt._scalb - @ cdecl _searchenv(str str ptr) msvcrt._searchenv - @ cdecl _seterrormode(long) msvcrt._seterrormode - @ cdecl -i386 _setjmp(ptr) msvcrt._setjmp - @ cdecl _setmode(long long) msvcrt._setmode - @ cdecl _setsystime(ptr long) msvcrt._setsystime - @ cdecl _sleep(long) msvcrt._sleep - @ varargs _snprintf(str long str) msvcrt._snprintf - @ varargs _snwprintf(wstr long wstr) msvcrt._snwprintf - @ varargs _sopen(str long long) msvcrt._sopen - @ varargs _spawnl(long str str) msvcrt._spawnl - @ varargs _spawnle(long str str) msvcrt._spawnle - @ varargs _spawnlp(long str str) msvcrt._spawnlp - @ varargs _spawnlpe(long str str) msvcrt._spawnlpe - @ cdecl _spawnv(long str ptr) msvcrt._spawnv - @ cdecl _spawnve(long str ptr ptr) msvcrt._spawnve - @ cdecl _spawnvp(long str ptr) msvcrt._spawnvp - @ cdecl _spawnvpe(long str ptr ptr) msvcrt._spawnvpe - @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath - @ cdecl _stat(str ptr) CRTDLL__stat - @ cdecl _statusfp() msvcrt._statusfp - @ cdecl _strcmpi(str str) msvcrt._strcmpi - @ cdecl _strdate(ptr) msvcrt._strdate - @ cdecl _strdec(str str) - @ cdecl _strdup(str) msvcrt._strdup - @ cdecl _strerror(long) msvcrt._strerror - @ cdecl _stricmp(str str) msvcrt._stricmp - @ cdecl _stricoll(str str) msvcrt._stricoll - @ cdecl _strinc(str) - @ cdecl _strlwr(str) msvcrt._strlwr - @ cdecl _strncnt(str long) - @ cdecl _strnextc(str) - @ cdecl _strnicmp(str str long) msvcrt._strnicmp - @ cdecl _strninc(str long) - @ cdecl _strnset(str long long) msvcrt._strnset - @ cdecl _strrev(str) msvcrt._strrev - @ cdecl _strset(str long) msvcrt._strset - @ cdecl _strspnp(str str) - @ cdecl _strtime(ptr) msvcrt._strtime - @ cdecl _strupr(str) msvcrt._strupr - @ cdecl _swab(str str long) msvcrt._swab - @ extern _sys_errlist msvcrt._sys_errlist - @ extern _sys_nerr_dll msvcrt._sys_nerr - @ cdecl _tell(long) msvcrt._tell - @ cdecl _tempnam(str str) msvcrt._tempnam - @ extern _timezone_dll msvcrt._timezone - @ cdecl _tolower(long) msvcrt._tolower - @ cdecl _toupper(long) msvcrt._toupper - @ extern _tzname msvcrt._tzname - @ cdecl _tzset() msvcrt._tzset - @ cdecl _ultoa(long ptr long) msvcrt._ultoa - @ cdecl _ultow(long ptr long) msvcrt._ultow - @ cdecl _umask(long) msvcrt._umask - @ cdecl _ungetch(long) msvcrt._ungetch - @ cdecl _unlink(str) msvcrt._unlink - @ cdecl _unloaddll(long) msvcrt._unloaddll - @ cdecl _utime(str ptr) msvcrt._utime - @ cdecl _vsnprintf(ptr long ptr ptr) msvcrt._vsnprintf - @ cdecl _vsnwprintf(ptr long wstr long) msvcrt._vsnwprintf - @ cdecl _wcsdup(wstr) msvcrt._wcsdup - @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp - @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll - @ cdecl _wcslwr(wstr) msvcrt._wcslwr - @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp - @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset - @ cdecl _wcsrev(wstr) msvcrt._wcsrev - @ cdecl _wcsset(wstr long) msvcrt._wcsset - @ cdecl _wcsupr(wstr) msvcrt._wcsupr - @ extern _winmajor_dll msvcrt._winmajor - @ extern _winminor_dll msvcrt._winminor - @ extern _winver_dll msvcrt._winver - @ cdecl _write(long ptr long) msvcrt._write - @ cdecl _wtoi(wstr) msvcrt._wtoi - @ cdecl _wtol(wstr) msvcrt._wtol -# @ cdecl _y0(double) msvcrt._y0 -# @ cdecl _y1(double) msvcrt._y1 -# @ cdecl _yn(long double ) msvcrt._yn - @ cdecl abort() msvcrt.abort - @ cdecl abs(long) msvcrt.abs - @ cdecl acos(double) msvcrt.acos - @ cdecl asctime(ptr) msvcrt.asctime - @ cdecl asin(double) msvcrt.asin - @ cdecl atan(double) msvcrt.atan - @ cdecl atan2(double double) msvcrt.atan2 - @ cdecl atexit(ptr) msvcrt.atexit - @ cdecl atof(str) msvcrt.atof - @ cdecl atoi(str) msvcrt.atoi - @ cdecl atol(str) msvcrt.atol - @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch - @ cdecl calloc(long long) msvcrt.calloc - @ cdecl ceil(double) msvcrt.ceil - @ cdecl clearerr(ptr) msvcrt.clearerr - @ cdecl clock() msvcrt.clock - @ cdecl cos(double) msvcrt.cos - @ cdecl cosh(double) msvcrt.cosh - @ cdecl ctime(ptr) msvcrt.ctime - @ cdecl difftime(long long) msvcrt.difftime - @ cdecl div(long long) msvcrt.div - @ cdecl exit(long) msvcrt.exit - @ cdecl exp(double) msvcrt.exp - @ cdecl fabs(double) msvcrt.fabs - @ cdecl fclose(ptr) msvcrt.fclose - @ cdecl feof(ptr) msvcrt.feof - @ cdecl ferror(ptr) msvcrt.ferror - @ cdecl fflush(ptr) msvcrt.fflush - @ cdecl fgetc(ptr) msvcrt.fgetc - @ cdecl fgetpos(ptr ptr) msvcrt.fgetpos - @ cdecl fgets(ptr long ptr) msvcrt.fgets - @ cdecl fgetwc(ptr) msvcrt.fgetwc - @ cdecl floor(double) msvcrt.floor - @ cdecl fmod(double double) msvcrt.fmod - @ cdecl fopen(str str) msvcrt.fopen - @ varargs fprintf(ptr str) msvcrt.fprintf - @ cdecl fputc(long ptr) msvcrt.fputc - @ cdecl fputs(str ptr) msvcrt.fputs - @ cdecl fputwc(long ptr) msvcrt.fputwc - @ cdecl fread(ptr long long ptr) msvcrt.fread - @ cdecl free(ptr) msvcrt.free - @ cdecl freopen(str str ptr) msvcrt.freopen - @ cdecl frexp(double ptr) msvcrt.frexp - @ varargs fscanf(ptr str) msvcrt.fscanf - @ cdecl fseek(ptr long long) msvcrt.fseek - @ cdecl fsetpos(ptr ptr) msvcrt.fsetpos - @ cdecl ftell(ptr) msvcrt.ftell - @ varargs fwprintf(ptr wstr) msvcrt.fwprintf - @ cdecl fwrite(ptr long long ptr) msvcrt.fwrite - @ varargs fwscanf(ptr wstr) msvcrt.fwscanf - @ cdecl getc(ptr) msvcrt.getc - @ cdecl getchar() msvcrt.getchar - @ cdecl getenv(str) msvcrt.getenv - @ cdecl gets(str) msvcrt.gets - @ cdecl gmtime(ptr) msvcrt.gmtime - @ cdecl is_wctype(long long) msvcrt.is_wctype - @ cdecl isalnum(long) msvcrt.isalnum - @ cdecl isalpha(long) msvcrt.isalpha - @ cdecl iscntrl(long) msvcrt.iscntrl - @ cdecl isdigit(long) msvcrt.isdigit - @ cdecl isgraph(long) msvcrt.isgraph - @ cdecl isleadbyte(long) msvcrt.isleadbyte - @ cdecl islower(long) msvcrt.islower - @ cdecl isprint(long) msvcrt.isprint - @ cdecl ispunct(long) msvcrt.ispunct - @ cdecl isspace(long) msvcrt.isspace - @ cdecl isupper(long) msvcrt.isupper - @ cdecl iswalnum(long) msvcrt.iswalnum - @ cdecl iswalpha(long) msvcrt.iswalpha - @ cdecl iswascii(long) msvcrt.iswascii - @ cdecl iswcntrl(long) msvcrt.iswcntrl - @ cdecl iswctype(long long) msvcrt.iswctype - @ cdecl iswdigit(long) msvcrt.iswdigit - @ cdecl iswgraph(long) msvcrt.iswgraph - @ cdecl iswlower(long) msvcrt.iswlower - @ cdecl iswprint(long) msvcrt.iswprint - @ cdecl iswpunct(long) msvcrt.iswpunct - @ cdecl iswspace(long) msvcrt.iswspace - @ cdecl iswupper(long) msvcrt.iswupper - @ cdecl iswxdigit(long) msvcrt.iswxdigit - @ cdecl isxdigit(long) msvcrt.isxdigit - @ cdecl labs(long) msvcrt.labs - @ cdecl ldexp( double long) msvcrt.ldexp - @ cdecl ldiv(long long) msvcrt.ldiv - @ cdecl localeconv() msvcrt.localeconv - @ cdecl localtime(ptr) msvcrt.localtime - @ cdecl log(double) msvcrt.log - @ cdecl log10(double) msvcrt.log10 - @ cdecl -i386 longjmp(ptr long) msvcrt.longjmp - @ cdecl malloc(long) msvcrt.malloc - @ cdecl mblen(ptr long) msvcrt.mblen - @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs - @ cdecl mbtowc(wstr str long) msvcrt.mbtowc - @ cdecl memchr(ptr long long) msvcrt.memchr - @ cdecl memcmp(ptr ptr long) msvcrt.memcmp - @ cdecl memcpy(ptr ptr long) msvcrt.memcpy - @ cdecl memmove(ptr ptr long) msvcrt.memmove - @ cdecl memset(ptr long long) msvcrt.memset - @ cdecl mktime(ptr) msvcrt.mktime - @ cdecl modf(double ptr) msvcrt.modf - @ cdecl perror(str) msvcrt.perror - @ cdecl pow(double double) msvcrt.pow - @ varargs printf(str) msvcrt.printf - @ cdecl putc(long ptr) msvcrt.putc - @ cdecl putchar(long) msvcrt.putchar - @ cdecl puts(str) msvcrt.puts - @ cdecl qsort(ptr long long ptr) msvcrt.qsort - @ cdecl raise(long) msvcrt.raise - @ cdecl rand() msvcrt.rand - @ cdecl realloc(ptr long) msvcrt.realloc - @ cdecl remove(str) msvcrt.remove - @ cdecl rename(str str) msvcrt.rename - @ cdecl rewind(ptr) msvcrt.rewind - @ varargs scanf(str) msvcrt.scanf - @ cdecl setbuf(ptr ptr) msvcrt.setbuf - @ cdecl setlocale(long str) msvcrt.setlocale - @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf - @ cdecl signal(long long) msvcrt.signal - @ cdecl sin(double) msvcrt.sin - @ cdecl sinh(double) msvcrt.sinh - @ varargs sprintf(ptr str) msvcrt.sprintf - @ cdecl sqrt(double) msvcrt.sqrt - @ cdecl srand(long) msvcrt.srand - @ varargs sscanf(str str) msvcrt.sscanf - @ cdecl strcat(str str) msvcrt.strcat - @ cdecl strchr(str long) msvcrt.strchr - @ cdecl strcmp(str str) msvcrt.strcmp - @ cdecl strcoll(str str) msvcrt.strcoll - @ cdecl strcpy(ptr str) msvcrt.strcpy - @ cdecl strcspn(str str) msvcrt.strcspn - @ cdecl strerror(long) msvcrt.strerror - @ cdecl strftime(str long str ptr) msvcrt.strftime - @ cdecl strlen(str) msvcrt.strlen - @ cdecl strncat(str str long) msvcrt.strncat - @ cdecl strncmp(str str long) msvcrt.strncmp - @ cdecl strncpy(ptr str long) msvcrt.strncpy - @ cdecl strpbrk(str str) msvcrt.strpbrk - @ cdecl strrchr(str long) msvcrt.strrchr - @ cdecl strspn(str str) msvcrt.strspn - @ cdecl strstr(str str) msvcrt.strstr - @ cdecl strtod(str ptr) msvcrt.strtod - @ cdecl strtok(str str) msvcrt.strtok - @ cdecl strtol(str ptr long) msvcrt.strtol - @ cdecl strtoul(str ptr long) msvcrt.strtoul - @ cdecl strxfrm(ptr str long) msvcrt.strxfrm - @ varargs swprintf(wstr wstr) msvcrt.swprintf - @ varargs swscanf(wstr wstr) msvcrt.swscanf - @ cdecl system(str) msvcrt.system - @ cdecl tan(double) msvcrt.tan - @ cdecl tanh(double) msvcrt.tanh - @ cdecl time(ptr) msvcrt.time - @ cdecl tmpfile() msvcrt.tmpfile - @ cdecl tmpnam(str) msvcrt.tmpnam - @ cdecl tolower(long) msvcrt.tolower - @ cdecl toupper(long) msvcrt.toupper - @ cdecl towlower(long) msvcrt.towlower - @ cdecl towupper(long) msvcrt.towupper - @ cdecl ungetc(long ptr) msvcrt.ungetc - @ cdecl ungetwc(long ptr) msvcrt.ungetwc - @ cdecl vfprintf(ptr str long) msvcrt.vfprintf - @ cdecl vfwprintf(ptr wstr long) msvcrt.vfwprintf - @ cdecl vprintf(str long) msvcrt.vprintf - @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf - @ cdecl vswprintf(ptr wstr long) msvcrt.vswprintf - @ cdecl vwprintf(wstr long) msvcrt.vwprintf - @ cdecl wcscat(wstr wstr) msvcrt.wcscat - @ cdecl wcschr(wstr long) msvcrt.wcschr - @ cdecl wcscmp(wstr wstr) msvcrt.wcscmp - @ cdecl wcscoll(wstr wstr) msvcrt.wcscoll - @ cdecl wcscpy(ptr wstr) msvcrt.wcscpy - @ cdecl wcscspn(wstr wstr) msvcrt.wcscspn - @ cdecl wcsftime(ptr long wstr ptr) msvcrt.wcsftime - @ cdecl wcslen(wstr) msvcrt.wcslen - @ cdecl wcsncat(wstr wstr long) msvcrt.wcsncat - @ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp - @ cdecl wcsncpy(ptr wstr long) msvcrt.wcsncpy - @ cdecl wcspbrk(wstr wstr) msvcrt.wcspbrk - @ cdecl wcsrchr(wstr long) msvcrt.wcsrchr - @ cdecl wcsspn(wstr wstr) msvcrt.wcsspn - @ cdecl wcsstr(wstr wstr) msvcrt.wcsstr - @ cdecl wcstod(wstr ptr) msvcrt.wcstod - @ cdecl wcstok(wstr wstr) msvcrt.wcstok - @ cdecl wcstol(wstr ptr long) msvcrt.wcstol - @ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs - @ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul - @ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm - @ cdecl wctomb(ptr long) msvcrt.wctomb - @ varargs wprintf(wstr) msvcrt.wprintf - @ varargs wscanf(wstr) msvcrt.wscanf +@ cdecl ??2@YAPAXI@Z(long) MSVCRT_operator_new # void * __cdecl operator new(unsigned int) +@ cdecl ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete # void __cdecl operator delete(void *) +@ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int) +@ cdecl _CIacos() +@ cdecl _CIasin() +@ cdecl _CIatan() +@ cdecl _CIatan2() +@ cdecl _CIcos() +@ cdecl _CIcosh() +@ cdecl _CIexp() +@ cdecl _CIfmod() +@ cdecl _CIlog() +@ cdecl _CIlog10() +@ cdecl _CIpow() +@ cdecl _CIsin() +@ cdecl _CIsinh() +@ cdecl _CIsqrt() +@ cdecl _CItan() +@ cdecl _CItanh() +@ extern _HUGE_dll _HUGE +@ cdecl _XcptFilter() +@ cdecl __GetMainArgs(ptr ptr ptr long) +@ extern __argc_dll __argc +@ extern __argv_dll __argv +@ cdecl __dllonexit(ptr ptr ptr) +@ cdecl __doserrno() +@ cdecl __fpecode() +@ cdecl __isascii(long) +@ cdecl __iscsym(long) +@ cdecl __iscsymf(long) +@ extern __mb_cur_max_dll __mb_cur_max +@ cdecl __pxcptinfoptrs() +@ cdecl __threadhandle() +@ cdecl __threadid() +@ cdecl __toascii(long) +@ cdecl _abnormal_termination() +@ cdecl _access(str long) +@ extern _acmdln_dll _acmdln +@ extern _aexit_rtn_dll _aexit_rtn +@ cdecl _amsg_exit(long) +@ cdecl _assert(str str long) +@ extern _basemajor_dll CRTDLL__basemajor_dll +@ extern _baseminor_dll CRTDLL__baseminor_dll +@ extern _baseversion_dll CRTDLL__baseversion_dll +@ cdecl _beep(long long) +@ cdecl _beginthread(ptr long ptr) +@ cdecl _c_exit() +@ cdecl _cabs(long) +@ cdecl _cexit() +@ cdecl _cgets(str) +@ cdecl _chdir(str) +@ cdecl _chdrive(long) +@ cdecl _chgsign( double ) +@ cdecl _chmod(str long) +@ cdecl _chsize(long long) +@ cdecl _clearfp() +@ cdecl _close(long) +@ cdecl _commit(long) +@ extern _commode_dll _commode +@ cdecl _control87(long long) +@ cdecl _controlfp(long long) +@ cdecl _copysign( double double ) +@ varargs _cprintf(str) +@ extern _cpumode_dll CRTDLL__cpumode_dll +@ cdecl _cputs(str) +@ cdecl _creat(str long) +@ varargs _cscanf(str) +@ extern _ctype +@ cdecl _cwait(ptr long long) +@ extern _daylight_dll _daylight +@ cdecl _dup(long) +@ cdecl _dup2(long long) +@ cdecl _ecvt( double long ptr ptr) +@ cdecl _endthread() +@ extern _environ_dll _environ +@ cdecl _eof(long) +@ cdecl _errno() +@ cdecl _except_handler2(ptr ptr ptr ptr) +@ varargs _execl(str str) +@ varargs _execle(str str) +@ varargs _execlp(str str) +@ varargs _execlpe(str str) +@ cdecl _execv(str str) +@ cdecl _execve(str str str) +@ cdecl _execvp(str str) +@ cdecl _execvpe(str str str) +@ cdecl _exit(long) +@ cdecl _expand(ptr long) +@ cdecl _fcloseall() +@ cdecl _fcvt( double long ptr ptr) +@ cdecl _fdopen(long str) +@ cdecl _fgetchar() +@ cdecl _fgetwchar() +@ cdecl _filbuf(ptr) +@ extern _fileinfo_dll +@ cdecl _filelength(long) +@ cdecl _fileno(ptr) +@ cdecl _findclose(long) +@ cdecl _findfirst(str ptr) +@ cdecl _findnext(long ptr) +@ cdecl _finite( double ) +@ cdecl _flsbuf(long ptr) +@ cdecl _flushall() +@ extern _fmode_dll _fmode +@ cdecl _fpclass(double) +@ cdecl _fpieee_flt(long ptr ptr) +@ cdecl _fpreset() +@ cdecl _fputchar(long) +@ cdecl _fputwchar(long) +@ cdecl _fsopen(str str long) +@ cdecl _fstat(long ptr) CRTDLL__fstat +@ cdecl _ftime(ptr) +@ cdecl -ret64 _ftol() +@ cdecl _fullpath(ptr str long) +@ cdecl _futime(long ptr) +@ cdecl _gcvt( double long str) +@ cdecl _get_osfhandle(long) +@ cdecl _getch() +@ cdecl _getche() +@ cdecl _getcwd(str long) +@ cdecl _getdcwd(long str long) +@ cdecl _getdiskfree(long ptr) +@ cdecl _getdllprocaddr(long str long) +@ cdecl _getdrive() +@ cdecl _getdrives() +@ cdecl _getpid() +@ cdecl _getsystime(ptr) +@ cdecl _getw(ptr) +@ cdecl _global_unwind2(ptr) +@ cdecl _heapchk() +@ cdecl _heapmin() +@ cdecl _heapset(long) +@ cdecl _heapwalk(ptr) +@ cdecl _hypot(double double) +@ cdecl _initterm(ptr ptr) +@ extern _iob +@ cdecl _isatty(long) +@ cdecl _isctype(long long) +@ cdecl _ismbbalnum(long) +@ cdecl _ismbbalpha(long) +@ cdecl _ismbbgraph(long) +@ cdecl _ismbbkalnum(long) +@ cdecl _ismbbkana(long) +@ cdecl _ismbbkpunct(long) +@ cdecl _ismbblead(long) +@ cdecl _ismbbprint(long) +@ cdecl _ismbbpunct(long) +@ cdecl _ismbbtrail(long) +@ cdecl _ismbcalpha(long) +@ cdecl _ismbcdigit(long) +@ cdecl _ismbchira(long) +@ cdecl _ismbckata(long) +@ cdecl _ismbcl0(long) +@ cdecl _ismbcl1(long) +@ cdecl _ismbcl2(long) +@ cdecl _ismbclegal(long) +@ cdecl _ismbclower(long) +@ cdecl _ismbcprint(long) +@ cdecl _ismbcspace(long) +@ cdecl _ismbcsymbol(long) +@ cdecl _ismbcupper(long) +@ cdecl _ismbslead(ptr ptr) +@ cdecl _ismbstrail(ptr ptr) +@ cdecl _isnan( double ) +@ cdecl _itoa(long ptr long) +@ cdecl _itow(long ptr long) +# @ cdecl _j0(double) +# @ cdecl _j1(double) +# @ cdecl _jn(long double) +@ cdecl _kbhit() +@ cdecl _lfind(ptr ptr ptr long ptr) +@ cdecl _loaddll(str) +@ cdecl _local_unwind2(ptr long) +@ cdecl _locking(long long long) +@ cdecl _logb( double ) +@ cdecl _lrotl(long long) +@ cdecl _lrotr(long long) +@ cdecl _lsearch(ptr ptr long long ptr) +@ cdecl _lseek(long long long) +@ cdecl _ltoa(long ptr long) +@ cdecl _ltow(long ptr long) +@ cdecl _makepath(str str str str str) +@ cdecl _matherr(ptr) +@ cdecl _mbbtombc(long) +@ cdecl _mbbtype(long long) +@ cdecl _mbccpy(str str) +@ cdecl _mbcjistojms(long) +@ cdecl _mbcjmstojis(long) +@ cdecl _mbclen(ptr) +@ cdecl _mbctohira(long) +@ cdecl _mbctokata(long) +@ cdecl _mbctolower(long) +@ cdecl _mbctombb(long) +@ cdecl _mbctoupper(long) +@ extern _mbctype +@ cdecl _mbsbtype(str long) +@ cdecl _mbscat(str str) +@ cdecl _mbschr(str long) +@ cdecl _mbscmp(str str) +@ cdecl _mbscpy(ptr str) +@ cdecl _mbscspn(str str) +@ cdecl _mbsdec(ptr ptr) +@ cdecl _mbsdup(str) +@ cdecl _mbsicmp(str str) +@ cdecl _mbsinc(str) +@ cdecl _mbslen(str) +@ cdecl _mbslwr(str) +@ cdecl _mbsnbcat(str str long) +@ cdecl _mbsnbcmp(str str long) +@ cdecl _mbsnbcnt(ptr long) +@ cdecl _mbsnbcpy(ptr str long) +@ cdecl _mbsnbicmp(str str long) +@ cdecl _mbsnbset(str long long) +@ cdecl _mbsncat(str str long) +@ cdecl _mbsnccnt(str long) +@ cdecl _mbsncmp(str str long) +@ cdecl _mbsncpy(str str long) +@ cdecl _mbsnextc(str) +@ cdecl _mbsnicmp(str str long) +@ cdecl _mbsninc(str long) +@ cdecl _mbsnset(str long long) +@ cdecl _mbspbrk(str str) +@ cdecl _mbsrchr(str long) +@ cdecl _mbsrev(str) +@ cdecl _mbsset(str long) +@ cdecl _mbsspn(str str) +@ cdecl _mbsspnp(str str) +@ cdecl _mbsstr(str str) +@ cdecl _mbstok(str str) +@ cdecl _mbstrlen(str) +@ cdecl _mbsupr(str) +@ cdecl _memccpy(ptr ptr long long) +@ cdecl _memicmp(str str long) +@ cdecl _mkdir(str) +@ cdecl _mktemp(str) +@ cdecl _msize(ptr) +@ cdecl _nextafter(double double) +@ cdecl _onexit(ptr) +@ varargs _open(str long) +@ cdecl _open_osfhandle(long long) +@ extern _osmajor_dll CRTDLL__osmajor_dll +@ extern _osminor_dll CRTDLL__osminor_dll +@ extern _osmode_dll CRTDLL__osmode_dll +@ extern _osver_dll _osver +@ extern _osversion_dll CRTDLL__osversion_dll +@ cdecl _pclose(ptr) +@ extern _pctype_dll _pctype +@ extern _pgmptr_dll _pgmptr +@ cdecl _pipe(ptr long long) +@ cdecl _popen(str str) +@ cdecl _purecall() +@ cdecl _putch(long) +@ cdecl _putenv(str) +@ cdecl _putw(long ptr) +@ extern _pwctype_dll _pwctype +@ cdecl _read(long ptr long) +@ cdecl _rmdir(str) +@ cdecl _rmtmp() +@ cdecl _rotl(long long) +@ cdecl _rotr(long long) +@ cdecl _scalb( double long) +@ cdecl _searchenv(str str ptr) +@ cdecl _seterrormode(long) +@ cdecl -i386 _setjmp(ptr) +@ cdecl _setmode(long long) +@ cdecl _setsystime(ptr long) +@ cdecl _sleep(long) +@ varargs _snprintf(str long str) +@ varargs _snwprintf(wstr long wstr) +@ varargs _sopen(str long long) +@ varargs _spawnl(long str str) +@ varargs _spawnle(long str str) +@ varargs _spawnlp(long str str) +@ varargs _spawnlpe(long str str) +@ cdecl _spawnv(long str ptr) +@ cdecl _spawnve(long str ptr ptr) +@ cdecl _spawnvp(long str ptr) +@ cdecl _spawnvpe(long str ptr ptr) +@ cdecl _splitpath(str ptr ptr ptr ptr) +@ cdecl _stat(str ptr) CRTDLL__stat +@ cdecl _statusfp() +@ cdecl _strcmpi(str str) +@ cdecl _strdate(ptr) +@ cdecl _strdec(str str) +@ cdecl _strdup(str) +@ cdecl _strerror(long) +@ cdecl _stricmp(str str) +@ cdecl _stricoll(str str) +@ cdecl _strinc(str) +@ cdecl _strlwr(str) +@ cdecl _strncnt(str long) +@ cdecl _strnextc(str) +@ cdecl _strnicmp(str str long) +@ cdecl _strninc(str long) +@ cdecl _strnset(str long long) +@ cdecl _strrev(str) +@ cdecl _strset(str long) +@ cdecl _strspnp(str str) +@ cdecl _strtime(ptr) +@ cdecl _strupr(str) +@ cdecl _swab(str str long) +@ extern _sys_errlist +@ extern _sys_nerr_dll _sys_nerr +@ cdecl _tell(long) +@ cdecl _tempnam(str str) +@ extern _timezone_dll _timezone +@ cdecl _tolower(long) +@ cdecl _toupper(long) +@ extern _tzname +@ cdecl _tzset() +@ cdecl _ultoa(long ptr long) +@ cdecl _ultow(long ptr long) +@ cdecl _umask(long) +@ cdecl _ungetch(long) +@ cdecl _unlink(str) +@ cdecl _unloaddll(long) +@ cdecl _utime(str ptr) +@ cdecl _vsnprintf(ptr long ptr ptr) +@ cdecl _vsnwprintf(ptr long wstr long) +@ cdecl _wcsdup(wstr) +@ cdecl _wcsicmp(wstr wstr) +@ cdecl _wcsicoll(wstr wstr) +@ cdecl _wcslwr(wstr) +@ cdecl _wcsnicmp(wstr wstr long) +@ cdecl _wcsnset(wstr long long) +@ cdecl _wcsrev(wstr) +@ cdecl _wcsset(wstr long) +@ cdecl _wcsupr(wstr) +@ extern _winmajor_dll _winmajor +@ extern _winminor_dll _winminor +@ extern _winver_dll _winver +@ cdecl _write(long ptr long) +@ cdecl _wtoi(wstr) +@ cdecl _wtol(wstr) +# @ cdecl _y0(double) +# @ cdecl _y1(double) +# @ cdecl _yn(long double ) +@ cdecl abort() +@ cdecl abs(long) +@ cdecl acos(double) +@ cdecl asctime(ptr) +@ cdecl asin(double) +@ cdecl atan(double) +@ cdecl atan2(double double) +@ cdecl atexit(ptr) +@ cdecl atof(str) +@ cdecl atoi(str) +@ cdecl atol(str) +@ cdecl bsearch(ptr ptr long long ptr) +@ cdecl calloc(long long) +@ cdecl ceil(double) +@ cdecl clearerr(ptr) +@ cdecl clock() +@ cdecl cos(double) +@ cdecl cosh(double) +@ cdecl ctime(ptr) +@ cdecl difftime(long long) +@ cdecl div(long long) +@ cdecl exit(long) +@ cdecl exp(double) +@ cdecl fabs(double) +@ cdecl fclose(ptr) +@ cdecl feof(ptr) +@ cdecl ferror(ptr) +@ cdecl fflush(ptr) +@ cdecl fgetc(ptr) +@ cdecl fgetpos(ptr ptr) +@ cdecl fgets(ptr long ptr) +@ cdecl fgetwc(ptr) +@ cdecl floor(double) +@ cdecl fmod(double double) +@ cdecl fopen(str str) +@ varargs fprintf(ptr str) +@ cdecl fputc(long ptr) +@ cdecl fputs(str ptr) +@ cdecl fputwc(long ptr) +@ cdecl fread(ptr long long ptr) +@ cdecl free(ptr) +@ cdecl freopen(str str ptr) +@ cdecl frexp(double ptr) +@ varargs fscanf(ptr str) +@ cdecl fseek(ptr long long) +@ cdecl fsetpos(ptr ptr) +@ cdecl ftell(ptr) +@ varargs fwprintf(ptr wstr) +@ cdecl fwrite(ptr long long ptr) +@ varargs fwscanf(ptr wstr) +@ cdecl getc(ptr) +@ cdecl getchar() +@ cdecl getenv(str) +@ cdecl gets(str) +@ cdecl gmtime(ptr) +@ cdecl is_wctype(long long) +@ cdecl isalnum(long) +@ cdecl isalpha(long) +@ cdecl iscntrl(long) +@ cdecl isdigit(long) +@ cdecl isgraph(long) +@ cdecl isleadbyte(long) +@ cdecl islower(long) +@ cdecl isprint(long) +@ cdecl ispunct(long) +@ cdecl isspace(long) +@ cdecl isupper(long) +@ cdecl iswalnum(long) +@ cdecl iswalpha(long) +@ cdecl iswascii(long) +@ cdecl iswcntrl(long) +@ cdecl iswctype(long long) +@ cdecl iswdigit(long) +@ cdecl iswgraph(long) +@ cdecl iswlower(long) +@ cdecl iswprint(long) +@ cdecl iswpunct(long) +@ cdecl iswspace(long) +@ cdecl iswupper(long) +@ cdecl iswxdigit(long) +@ cdecl isxdigit(long) +@ cdecl labs(long) +@ cdecl ldexp( double long) +@ cdecl ldiv(long long) +@ cdecl localeconv() +@ cdecl localtime(ptr) +@ cdecl log(double) +@ cdecl log10(double) +@ cdecl -i386 longjmp(ptr long) +@ cdecl malloc(long) +@ cdecl mblen(ptr long) +@ cdecl mbstowcs(ptr str long) +@ cdecl mbtowc(wstr str long) +@ cdecl memchr(ptr long long) +@ cdecl memcmp(ptr ptr long) +@ cdecl memcpy(ptr ptr long) +@ cdecl memmove(ptr ptr long) +@ cdecl memset(ptr long long) +@ cdecl mktime(ptr) +@ cdecl modf(double ptr) +@ cdecl perror(str) +@ cdecl pow(double double) +@ varargs printf(str) +@ cdecl putc(long ptr) +@ cdecl putchar(long) +@ cdecl puts(str) +@ cdecl qsort(ptr long long ptr) +@ cdecl raise(long) +@ cdecl rand() +@ cdecl realloc(ptr long) +@ cdecl remove(str) +@ cdecl rename(str str) +@ cdecl rewind(ptr) +@ varargs scanf(str) +@ cdecl setbuf(ptr ptr) +@ cdecl setlocale(long str) +@ cdecl setvbuf(ptr str long long) +@ cdecl signal(long long) +@ cdecl sin(double) +@ cdecl sinh(double) +@ varargs sprintf(ptr str) +@ cdecl sqrt(double) +@ cdecl srand(long) +@ varargs sscanf(str str) +@ cdecl strcat(str str) +@ cdecl strchr(str long) +@ cdecl strcmp(str str) +@ cdecl strcoll(str str) +@ cdecl strcpy(ptr str) +@ cdecl strcspn(str str) +@ cdecl strerror(long) +@ cdecl strftime(str long str ptr) +@ cdecl strlen(str) +@ cdecl strncat(str str long) +@ cdecl strncmp(str str long) +@ cdecl strncpy(ptr str long) +@ cdecl strpbrk(str str) +@ cdecl strrchr(str long) +@ cdecl strspn(str str) +@ cdecl strstr(str str) +@ cdecl strtod(str ptr) +@ cdecl strtok(str str) +@ cdecl strtol(str ptr long) +@ cdecl strtoul(str ptr long) +@ cdecl strxfrm(ptr str long) +@ varargs swprintf(wstr wstr) +@ varargs swscanf(wstr wstr) +@ cdecl system(str) +@ cdecl tan(double) +@ cdecl tanh(double) +@ cdecl time(ptr) +@ cdecl tmpfile() +@ cdecl tmpnam(str) +@ cdecl tolower(long) +@ cdecl toupper(long) +@ cdecl towlower(long) +@ cdecl towupper(long) +@ cdecl ungetc(long ptr) +@ cdecl ungetwc(long ptr) +@ cdecl vfprintf(ptr str long) +@ cdecl vfwprintf(ptr wstr long) +@ cdecl vprintf(str long) +@ cdecl vsprintf(ptr str ptr) +@ cdecl vswprintf(ptr wstr long) +@ cdecl vwprintf(wstr long) +@ cdecl wcscat(wstr wstr) +@ cdecl wcschr(wstr long) +@ cdecl wcscmp(wstr wstr) +@ cdecl wcscoll(wstr wstr) +@ cdecl wcscpy(ptr wstr) +@ cdecl wcscspn(wstr wstr) +@ cdecl wcsftime(ptr long wstr ptr) +@ cdecl wcslen(wstr) +@ cdecl wcsncat(wstr wstr long) +@ cdecl wcsncmp(wstr wstr long) +@ cdecl wcsncpy(ptr wstr long) +@ cdecl wcspbrk(wstr wstr) +@ cdecl wcsrchr(wstr long) +@ cdecl wcsspn(wstr wstr) +@ cdecl wcsstr(wstr wstr) +@ cdecl wcstod(wstr ptr) +@ cdecl wcstok(wstr wstr) +@ cdecl wcstol(wstr ptr long) +@ cdecl wcstombs(ptr ptr long) +@ cdecl wcstoul(wstr ptr long) +@ cdecl wcsxfrm(ptr wstr long) +@ cdecl wctomb(ptr long) +@ varargs wprintf(wstr) +@ varargs wscanf(wstr)
4 years, 2 months
1
0
0
0
[reactos] 01/01: [DEVMGR] Avoid buffer overflow when device reg key size is > 100 chars
by Victor Perevertkin
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=953c03c336a762f3b4fd6…
commit 953c03c336a762f3b4fd672a546c4c0986dfab1c Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Oct 22 14:38:55 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Oct 22 14:38:55 2020 +0300 [DEVMGR] Avoid buffer overflow when device reg key size is > 100 chars --- dll/win32/devmgr/properties/hwresource.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dll/win32/devmgr/properties/hwresource.cpp b/dll/win32/devmgr/properties/hwresource.cpp index 76879042415..a3e1a88b65e 100644 --- a/dll/win32/devmgr/properties/hwresource.cpp +++ b/dll/win32/devmgr/properties/hwresource.cpp @@ -357,13 +357,15 @@ PVOID GetResourceList( LPWSTR pszDeviceID) { - WCHAR szBuffer[100]; PCM_RESOURCE_LIST pResourceList = NULL; HKEY hKey = NULL; DWORD dwError, dwSize; - wsprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Enum\\%s\\LogConf", pszDeviceID); - dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_READ, &hKey); + CStringW keyName = L"SYSTEM\\CurrentControlSet\\Enum\\"; + keyName += pszDeviceID; + keyName += L"\\LogConf"; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &hKey); if (dwError != ERROR_SUCCESS) { /* failed to open device instance log conf dir */
4 years, 2 months
1
0
0
0
[reactos] 01/01: |CMAKE] Use ExternalProject for host-tools build
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbe47e61b180c1ce19ece…
commit bbe47e61b180c1ce19ecea57ebd852f3434d2207 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Oct 22 08:47:06 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Oct 22 09:31:11 2020 +0200 |CMAKE] Use ExternalProject for host-tools build --- CMakeLists.txt | 4 +- modules/rostests/tests/spec2def/CMakeLists.txt | 2 +- sdk/cmake/gcc.cmake | 9 ++- sdk/cmake/host-tools.cmake | 91 +++++++------------------- 4 files changed, 31 insertions(+), 75 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed703c8145c..e0ffe31e9d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,9 +95,7 @@ if(NOT CMAKE_CROSSCOMPILING) list(APPEND NATIVE_TARGETS rsym pefixup) endif() - export(TARGETS ${NATIVE_TARGETS} FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) - configure_file(sdk/cmake/host-tools.in ${CMAKE_BINARY_DIR}/TargetList.cmake) - + install(TARGETS ${NATIVE_TARGETS}) else() # Add host tools target include(sdk/cmake/host-tools.cmake) diff --git a/modules/rostests/tests/spec2def/CMakeLists.txt b/modules/rostests/tests/spec2def/CMakeLists.txt index 9553930a3a4..61ee5fbc309 100644 --- a/modules/rostests/tests/spec2def/CMakeLists.txt +++ b/modules/rostests/tests/spec2def/CMakeLists.txt @@ -1,3 +1,3 @@ add_custom_target(spec2def_test - py -3 ${CMAKE_CURRENT_SOURCE_DIR}/test.py $<TARGET_FILE:native-spec2def>) + py -3 ${CMAKE_CURRENT_SOURCE_DIR}/test.py $<TARGET_PROPERTY:native-spec2def,IMPORTED_LOCATION>) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index d20abb20473..216c24c54a4 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -213,7 +213,7 @@ elseif(NO_ROSSYM) set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") else() # Normal rsym build - get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG) + get_target_property(RSYM native-rsym IMPORTED_LOCATION) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" @@ -309,11 +309,10 @@ if(NOT ARCH STREQUAL "i386") endif() function(fixup_load_config _target) - get_target_property(PEFIXUP native-pefixup IMPORTED_LOCATION_NOCONFIG) add_custom_command(TARGET ${_target} POST_BUILD - COMMAND "${PEFIXUP}" - "$<TARGET_FILE:${_target}>" - COMMENT "Patching in LOAD_CONFIG") + COMMAND native-pefixup "$<TARGET_FILE:${_target}>" + COMMENT "Patching in LOAD_CONFIG" + DEPENDS native-pefixup) endfunction() function(generate_import_lib _libname _dllname _spec_file) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 92eb199df77..dedcb11a4c5 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -1,72 +1,31 @@ -function(configure_host_tools HOST_TOOLS_DIR) - file(MAKE_DIRECTORY ${HOST_TOOLS_DIR}) - - message(STATUS "Configuring host tools...") - # cmake sets CC and CXX when those languages are enabled - # so we need to clear them here - execute_process(COMMAND - ${CMAKE_COMMAND} - -E env --unset=CC --unset=CXX - ${CMAKE_COMMAND} - -G "${CMAKE_GENERATOR}" - -DARCH:STRING=${ARCH} - ${USE_CLANG_CL_ARG} - ${REACTOS_SOURCE_DIR} - WORKING_DIRECTORY ${HOST_TOOLS_DIR} - RESULT_VARIABLE _host_config_result - OUTPUT_VARIABLE _host_config_log - ERROR_VARIABLE _host_config_log) - - # Show cmake output only if host-tools breaks - if(NOT _host_config_result EQUAL 0) - message("\nHost tools log:") - message("${_host_config_log}") - message(FATAL_ERROR "Failed to configure host tools") - endif() - - set_property(SOURCE host_tools PROPERTY SYMBOLIC 1) - - include(${HOST_TOOLS_DIR}/ImportExecutables.cmake) - include(${HOST_TOOLS_DIR}/TargetList.cmake) - - foreach(_target ${NATIVE_TARGETS}) - get_target_property(_target_location native-${_target} LOCATION) - list(APPEND _target_locations ${_target_location}) - endforeach() - - # Make a host-tools target so it'll be built when needed - # custom target + symbolic output prevents cmake from running - # the command multiple times per build - # Specify the --config option, so the Release/Debug setting from the IDE can be used - add_custom_command( - COMMAND ${CMAKE_COMMAND} --build ${HOST_TOOLS_DIR} --config $<CONFIG> - OUTPUT host_tools - BYPRODUCTS ${_target_locations}) - add_custom_target(build-host-tools ALL DEPENDS host_tools) - - foreach(_target ${NATIVE_TARGETS}) - add_dependencies(native-${_target} build-host-tools) - endforeach() - -endfunction() +include(ExternalProject) function(setup_host_tools) - if(WITH_HOST_TOOLS) - # Use pre-built tools, required for cross compiling with msvc - # as only one target architecture is available at a time - find_path(HOST_TOOLS_DIR - NAMES ImportExecutables.cmake - HINTS ${WITH_HOST_TOOLS} ${REACTOS_SOURCE_DIR}/${WITH_HOST_TOOLS} - NO_CMAKE_PATH - NO_CMAKE_ENVIRONMENT_PATH) - message(STATUS "Using prebuilt host tools: ${HOST_TOOLS_DIR}") - include(${HOST_TOOLS_DIR}/ImportExecutables.cmake) - else() - # Build host-tools. Changes to tool sources will rebuild targets - # using that tool - set(HOST_TOOLS_DIR ${REACTOS_BINARY_DIR}/host-tools) - configure_host_tools(${HOST_TOOLS_DIR}) + list(APPEND HOST_TOOLS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb) + if(NOT MSVC) + list(APPEND HOST_TOOLS rsym pefixup) + endif() + list(TRANSFORM HOST_TOOLS PREPEND "${REACTOS_BINARY_DIR}/host-tools/bin/" OUTPUT_VARIABLE HOST_TOOLS_OUTPUT) + if (CMAKE_HOST_WIN32) + list(TRANSFORM HOST_TOOLS_OUTPUT APPEND ".exe") + set(HOST_EXE_SUFFIX ".exe") endif() + ExternalProject_Add(host-tools + SOURCE_DIR ${REACTOS_SOURCE_DIR} + PREFIX ${REACTOS_BINARY_DIR}/host-tools + INSTALL_DIR ${REACTOS_BINARY_DIR}/host-tools + CMAKE_ARGS -UCMAKE_TOOLCHAIN_FILE -DARCH:STRING=${ARCH} -DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools + BUILD_ALWAYS TRUE + BUILD_BYPRODUCTS ${HOST_TOOLS_OUTPUT} + ) + + ExternalProject_Get_Property(host-tools INSTALL_DIR) + + foreach(_tool ${HOST_TOOLS}) + add_executable(native-${_tool} IMPORTED) + set_target_properties(native-${_tool} PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/bin/${_tool}${HOST_EXE_SUFFIX}) + add_dependencies(native-${_tool} host-tools) + endforeach() endfunction()
4 years, 2 months
1
0
0
0
[reactos] 01/01: [APISETS] Revert 'Try to fix build of both case of MSVC AND CLANG'
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cb3b62b4c5b6f8fd1c28…
commit 6cb3b62b4c5b6f8fd1c28b9f46f30c211c070ec3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 22 09:18:32 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 22 09:18:32 2020 +0900 [APISETS] Revert 'Try to fix build of both case of MSVC AND CLANG' --- dll/apisets/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/apisets/CMakeLists.txt b/dll/apisets/CMakeLists.txt index acd16ab3433..27b82d2a281 100644 --- a/dll/apisets/CMakeLists.txt +++ b/dll/apisets/CMakeLists.txt @@ -24,9 +24,7 @@ function (add_apiset apiset_name baseaddress) add_dependencies(${apiset_name} xdk) set_module_type(${apiset_name} win32dll ENTRYPOINT 0 UNICODE IMAGEBASE ${baseaddress}) - if(MSVC AND CLANG) - target_compile_options(${apiset_name} PRIVATE -fno-builtin) - elseif(NOT MSVC) + if(NOT MSVC) target_compile_options(${apiset_name} PRIVATE -fno-builtin) else() target_compile_options(${apiset_name} PRIVATE /wd4026 /wd4273)
4 years, 2 months
1
0
0
0
[reactos] 01/01: [APISETS] Try to fix build of both case of MSVC AND CLANG
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=926ada989c8c9f6e8b205…
commit 926ada989c8c9f6e8b20554cead6d475a4ce1126 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 22 09:07:15 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 22 09:07:15 2020 +0900 [APISETS] Try to fix build of both case of MSVC AND CLANG --- dll/apisets/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/apisets/CMakeLists.txt b/dll/apisets/CMakeLists.txt index 27b82d2a281..acd16ab3433 100644 --- a/dll/apisets/CMakeLists.txt +++ b/dll/apisets/CMakeLists.txt @@ -24,7 +24,9 @@ function (add_apiset apiset_name baseaddress) add_dependencies(${apiset_name} xdk) set_module_type(${apiset_name} win32dll ENTRYPOINT 0 UNICODE IMAGEBASE ${baseaddress}) - if(NOT MSVC) + if(MSVC AND CLANG) + target_compile_options(${apiset_name} PRIVATE -fno-builtin) + elseif(NOT MSVC) target_compile_options(${apiset_name} PRIVATE -fno-builtin) else() target_compile_options(${apiset_name} PRIVATE /wd4026 /wd4273)
4 years, 2 months
1
0
0
0
[reactos] 01/01: [INCLUDE] Use HeapAlloc/HeapFree in layout.h
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89bd2d12daa7dcc48513b…
commit 89bd2d12daa7dcc48513b226506537e42a5003c5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 22 08:07:32 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 22 08:07:32 2020 +0900 [INCLUDE] Use HeapAlloc/HeapFree in layout.h CORE-17341 --- sdk/include/reactos/layout.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/include/reactos/layout.h b/sdk/include/reactos/layout.h index 4e1bebe02be..5b310716168 100644 --- a/sdk/include/reactos/layout.h +++ b/sdk/include/reactos/layout.h @@ -193,7 +193,7 @@ static __inline LAYOUT_DATA * LayoutInit(HWND hwndParent, const LAYOUT_INFO *pLayouts, UINT cLayouts) { SIZE_T cb; - LAYOUT_DATA *pData = (LAYOUT_DATA *)SHAlloc(sizeof(LAYOUT_DATA)); + LAYOUT_DATA *pData = (LAYOUT_DATA *)HeapAlloc(GetProcessHeap(), 0, sizeof(LAYOUT_DATA)); if (pData == NULL) { assert(0); @@ -202,11 +202,11 @@ LayoutInit(HWND hwndParent, const LAYOUT_INFO *pLayouts, UINT cLayouts) cb = cLayouts * sizeof(LAYOUT_INFO); pData->m_cLayouts = cLayouts; - pData->m_pLayouts = (LAYOUT_INFO *)SHAlloc(cb); + pData->m_pLayouts = (LAYOUT_INFO *)HeapAlloc(GetProcessHeap(), 0, cb); if (pData->m_pLayouts == NULL) { assert(0); - SHFree(pData); + HeapFree(GetProcessHeap(), 0, pData); return NULL; } memcpy(pData->m_pLayouts, pLayouts, cb); @@ -227,6 +227,6 @@ LayoutDestroy(LAYOUT_DATA *pData) { if (!pData) return; - SHFree(pData->m_pLayouts); - SHFree(pData); + HeapFree(GetProcessHeap(), 0, pData->m_pLayouts); + HeapFree(GetProcessHeap(), 0, pData); }
4 years, 2 months
1
0
0
0
[reactos] 01/01: [SHELL32] Resizable for SHBrowseForFolder (#3299)
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de8d156e2cfa43e07c7ae…
commit de8d156e2cfa43e07c7ae07176e52b90ad7b5a95 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 21 22:25:16 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 21 22:25:16 2020 +0900 [SHELL32] Resizable for SHBrowseForFolder (#3299) Make the dialog box of SHBrowseForFolder function resizable. CORE-17341 --- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 2 +- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/id-ID.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ja-JP.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- dll/win32/shell32/wine/brsfolder.c | 22 ++++ sdk/include/reactos/layout.h | 232 +++++++++++++++++++++++++++++++++++++ 36 files changed, 288 insertions(+), 34 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index f256ece6cae..a4189880a22 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -102,7 +102,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Търсене на папка" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index ff4656cd30c..c4a7f66b1ce 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 490b68aa090..4776320d3c0 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -107,7 +107,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Procházet pro složku" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 0f86d9a3c26..18825835a7f 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -107,7 +107,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 6e94e825518..841973d5b28 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Verzeichnis auswählen" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index ba7f4182855..4513166c9a9 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Αναζήτηση φακέλου" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 63424343e74..576daf044ab 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index ef2dcf0590e..ddcedb8b2ea 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 41adf26c018..acef0a2aa29 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -110,7 +110,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Buscar carpeta" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 4b308e77c23..1f9497e51b4 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -108,7 +108,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Vali kaust" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 30071a27944..322457ad802 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index f709c10405e..108872f06d8 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Rechercher un dossier" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index b27f62e4bdc..669b3e827c8 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -103,7 +103,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "בחירת תיקיה" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index d3cac589e6e..79ee61403d2 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "फोल्डर खोंजे" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 7c47db6fe45..dfd77d701be 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Mappák böngészése" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index d48846edb55..d8506fbe52c 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Jelajah Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 8572685eda1..3a537c8a81d 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Selezione cartella" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index d1c420ecf1a..a0ca7140350 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "フォルダの参照" FONT 9, "MS UI Gothic" BEGIN diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 0c0fd22d783..2fc91428a2d 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Browse for Folder" FONT 9, "굴림" BEGIN diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 0871a744914..9e1434b5f06 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 1b159361977..07dd8b29350 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Bla etter mappe" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index beb02fd2ba6..46403617508 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -107,7 +107,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Wybierz katalog" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index f9d40a365da..36af8175910 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Procurar por Pasta" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 82ca880f830..a7940d3176a 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Procurar pastas" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index bad12b2d015..3b3e965ffce 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -103,7 +103,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Specificare dosar" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 0b73dc46b94..2983cf2e9d3 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -108,7 +108,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Обзор" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index b7c2c68873e..02ec1c7f2d4 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 25bb2407df3..0e7e5215a94 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index f555196609d..22f4fd02397 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -105,7 +105,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Shfleto për Dosje" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 89ece721224..e4c7d0192ea 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Bläddra efter mapp" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 8ba5645ac0f..cf7bb2e7111 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -103,7 +103,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Dizin İçin Göz At" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index b8c7c952a33..e1ff4ace012 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "Огляд папок" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index b93b3a389ab..da607ce1762 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -111,7 +111,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "浏览文件夹" FONT 9, "宋体" BEGIN diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index dbe437c0ea9..33dcb7ff313 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -111,7 +111,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX CAPTION "瀏覽資料夾" FONT 9, "新細明體" BEGIN diff --git a/dll/win32/shell32/wine/brsfolder.c b/dll/win32/shell32/wine/brsfolder.c index 1b11b812981..74c0f2f42b6 100644 --- a/dll/win32/shell32/wine/brsfolder.c +++ b/dll/win32/shell32/wine/brsfolder.c @@ -40,18 +40,21 @@ #include "shresdef.h" #ifdef __REACTOS__ #include <shlwapi.h> + #include "layout.h" /* Resizable window */ #endif WINE_DEFAULT_DEBUG_CHANNEL(shell); #define SHV_CHANGE_NOTIFY (WM_USER + 0x1111) +#ifndef __REACTOS__ /* Defined in "layout.h" */ /* original margins and control size */ typedef struct tagLAYOUT_DATA { LONG left, width, right; LONG top, height, bottom; } LAYOUT_DATA; +#endif typedef struct tagbrowse_info { @@ -72,17 +75,21 @@ typedef struct tagTV_ITEMDATA IEnumIDList* pEnumIL; /* Children iterator */ } TV_ITEMDATA, *LPTV_ITEMDATA; +#ifndef __REACTOS__ /* Defined in "layout.h" */ typedef struct tagLAYOUT_INFO { int iItemId; /* control id */ DWORD dwAnchor; /* BF_* flags specifying which margins should remain constant */ } LAYOUT_INFO; +#endif static const LAYOUT_INFO g_layout_info[] = { {IDC_BROWSE_FOR_FOLDER_TITLE, BF_TOP|BF_LEFT|BF_RIGHT}, {IDC_BROWSE_FOR_FOLDER_STATUS, BF_TOP|BF_LEFT|BF_RIGHT}, +#ifndef __REACTOS__ /* Duplicated */ {IDC_BROWSE_FOR_FOLDER_FOLDER, BF_TOP|BF_LEFT|BF_RIGHT}, +#endif {IDC_BROWSE_FOR_FOLDER_TREEVIEW, BF_TOP|BF_BOTTOM|BF_LEFT|BF_RIGHT}, {IDC_BROWSE_FOR_FOLDER_FOLDER, BF_BOTTOM|BF_LEFT}, {IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, BF_BOTTOM|BF_LEFT|BF_RIGHT}, @@ -125,6 +132,7 @@ static void browsefolder_callback( LPBROWSEINFOW lpBrowseInfo, HWND hWnd, lpBrowseInfo->lpfn( hWnd, msg, param, lpBrowseInfo->lParam ); } +#ifndef __REACTOS__ /* Defined in "layout.h" */ static LAYOUT_DATA *LayoutInit(HWND hwnd, const LAYOUT_INFO *layout_info, int layout_count) { LAYOUT_DATA *data; @@ -185,6 +193,7 @@ static void LayoutUpdate(HWND hwnd, LAYOUT_DATA *data, const LAYOUT_INFO *layout SetWindowPos(hItem, NULL, r.left, r.top, r.right - r.left, r.bottom - r.top, SWP_NOZORDER); } } +#endif /****************************************************************************** @@ -1127,6 +1136,7 @@ static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL return result; } +#ifndef __REACTOS__ /* This is a buggy way (resize on title bar) */ static LRESULT BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos) { if ((info->lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) && !(pos->flags & SWP_NOSIZE)) @@ -1138,12 +1148,17 @@ static LRESULT BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos) } return 0; } +#endif static INT BrsFolder_OnDestroy(browse_info *info) { if (info->layout) { +#ifdef __REACTOS__ + LayoutDestroy(info->layout); +#else SHFree(info->layout); +#endif info->layout = NULL; } @@ -1226,8 +1241,15 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, case WM_COMMAND: return BrsFolder_OnCommand( info, wParam ); +#ifdef __REACTOS__ + case WM_GETMINMAXINFO: + ((LPMINMAXINFO)lParam)->ptMinTrackSize.x = info->szMin.cx; + ((LPMINMAXINFO)lParam)->ptMinTrackSize.y = info->szMin.cy; + return 0; +#else /* This is a buggy way (resize on title bar) */ case WM_WINDOWPOSCHANGING: return BrsFolder_OnWindowPosChanging( info, (WINDOWPOS *)lParam); +#endif case WM_SIZE: if (info->layout) /* new style dialogs */ diff --git a/sdk/include/reactos/layout.h b/sdk/include/reactos/layout.h new file mode 100644 index 00000000000..4e1bebe02be --- /dev/null +++ b/sdk/include/reactos/layout.h @@ -0,0 +1,232 @@ +/* + * PROJECT: ReactOS headers + * LICENSE: LGPL-2.0-or-later (
https://spdx.org/licenses/LGPL-2.0-or-later
) + * PURPOSE: The layout engine of resizable dialog boxes / windows + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#pragma once +#include <assert.h> + +typedef struct LAYOUT_INFO { + UINT m_nCtrlID; + UINT m_uEdges; /* BF_* flags */ + HWND m_hwndCtrl; + SIZE m_margin1; + SIZE m_margin2; +} LAYOUT_INFO; + +typedef struct LAYOUT_DATA { + HWND m_hwndParent; + HWND m_hwndGrip; + LAYOUT_INFO *m_pLayouts; + UINT m_cLayouts; +} LAYOUT_DATA; + +static __inline void +_layout_ModifySystemMenu(LAYOUT_DATA *pData, BOOL bEnableResize) +{ + if (bEnableResize) + { + GetSystemMenu(pData->m_hwndParent, TRUE); /* revert */ + } + else + { + HMENU hSysMenu = GetSystemMenu(pData->m_hwndParent, FALSE); + RemoveMenu(hSysMenu, SC_MAXIMIZE, MF_BYCOMMAND); + RemoveMenu(hSysMenu, SC_SIZE, MF_BYCOMMAND); + RemoveMenu(hSysMenu, SC_RESTORE, MF_BYCOMMAND); + } +} + +static __inline HDWP +_layout_MoveGrip(LAYOUT_DATA *pData, HDWP hDwp OPTIONAL) +{ + SIZE size = { GetSystemMetrics(SM_CXVSCROLL), GetSystemMetrics(SM_CYHSCROLL) }; + const UINT uFlags = SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER; + RECT rcClient; + GetClientRect(pData->m_hwndParent, &rcClient); + + if (hDwp) + { + hDwp = DeferWindowPos(hDwp, pData->m_hwndGrip, NULL, + rcClient.right - size.cx, rcClient.bottom - size.cy, + size.cx, size.cy, uFlags); + } + else + { + SetWindowPos(pData->m_hwndGrip, NULL, + rcClient.right - size.cx, rcClient.bottom - size.cy, + size.cx, size.cy, uFlags); + } + return hDwp; +} + +static __inline void +_layout_ShowGrip(LAYOUT_DATA *pData, BOOL bShow) +{ + if (!bShow) + { + ShowWindow(pData->m_hwndGrip, SW_HIDE); + return; + } + + if (pData->m_hwndGrip == NULL) + { + DWORD style = WS_CHILD | WS_CLIPSIBLINGS | SBS_SIZEGRIP; + pData->m_hwndGrip = CreateWindowExW(0, L"SCROLLBAR", NULL, style, + 0, 0, 0, 0, pData->m_hwndParent, + NULL, GetModuleHandleW(NULL), NULL); + } + _layout_MoveGrip(pData, NULL); + ShowWindow(pData->m_hwndGrip, SW_SHOWNOACTIVATE); +} + +static __inline void +_layout_GetPercents(LPRECT prcPercents, UINT uEdges) +{ + prcPercents->left = (uEdges & BF_LEFT) ? 0 : 100; + prcPercents->right = (uEdges & BF_RIGHT) ? 100 : 0; + prcPercents->top = (uEdges & BF_TOP) ? 0 : 100; + prcPercents->bottom = (uEdges & BF_BOTTOM) ? 100 : 0; +} + +static __inline HDWP +_layout_DoMoveItem(LAYOUT_DATA *pData, HDWP hDwp, const LAYOUT_INFO *pLayout, + const RECT *rcClient) +{ + RECT rcChild, NewRect, rcPercents; + LONG nWidth, nHeight; + + if (!GetWindowRect(pLayout->m_hwndCtrl, &rcChild)) + return hDwp; + MapWindowPoints(NULL, pData->m_hwndParent, (LPPOINT)&rcChild, 2); + + nWidth = rcClient->right - rcClient->left; + nHeight = rcClient->bottom - rcClient->top; + + _layout_GetPercents(&rcPercents, pLayout->m_uEdges); + NewRect.left = pLayout->m_margin1.cx + nWidth * rcPercents.left / 100; + NewRect.top = pLayout->m_margin1.cy + nHeight * rcPercents.top / 100; + NewRect.right = pLayout->m_margin2.cx + nWidth * rcPercents.right / 100; + NewRect.bottom = pLayout->m_margin2.cy + nHeight * rcPercents.bottom / 100; + + if (!EqualRect(&NewRect, &rcChild)) + { + hDwp = DeferWindowPos(hDwp, pLayout->m_hwndCtrl, NULL, NewRect.left, NewRect.top, + NewRect.right - NewRect.left, NewRect.bottom - NewRect.top, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + } + return hDwp; +} + +static __inline void +_layout_ArrangeLayout(LAYOUT_DATA *pData) +{ + RECT rcClient; + UINT iItem; + HDWP hDwp = BeginDeferWindowPos(pData->m_cLayouts + 1); + if (hDwp == NULL) + return; + + GetClientRect(pData->m_hwndParent, &rcClient); + + for (iItem = 0; iItem < pData->m_cLayouts; ++iItem) + hDwp = _layout_DoMoveItem(pData, hDwp, &pData->m_pLayouts[iItem], &rcClient); + + hDwp = _layout_MoveGrip(pData, hDwp); + EndDeferWindowPos(hDwp); +} + +static __inline void +_layout_InitLayouts(LAYOUT_DATA *pData) +{ + RECT rcClient, rcChild, rcPercents; + LONG nWidth, nHeight; + UINT iItem; + + GetClientRect(pData->m_hwndParent, &rcClient); + nWidth = rcClient.right - rcClient.left; + nHeight = rcClient.bottom - rcClient.top; + + for (iItem = 0; iItem < pData->m_cLayouts; ++iItem) + { + LAYOUT_INFO *pInfo = &pData->m_pLayouts[iItem]; + if (pInfo->m_hwndCtrl == NULL) + { + pInfo->m_hwndCtrl = GetDlgItem(pData->m_hwndParent, pInfo->m_nCtrlID); + if (pInfo->m_hwndCtrl == NULL) + continue; + } + + GetWindowRect(pInfo->m_hwndCtrl, &rcChild); + MapWindowPoints(NULL, pData->m_hwndParent, (LPPOINT)&rcChild, 2); + + _layout_GetPercents(&rcPercents, pInfo->m_uEdges); + pInfo->m_margin1.cx = rcChild.left - nWidth * rcPercents.left / 100; + pInfo->m_margin1.cy = rcChild.top - nHeight * rcPercents.top / 100; + pInfo->m_margin2.cx = rcChild.right - nWidth * rcPercents.right / 100; + pInfo->m_margin2.cy = rcChild.bottom - nHeight * rcPercents.bottom / 100; + } +} + +/* NOTE: Please call LayoutUpdate on parent's WM_SIZE. */ +static __inline void +LayoutUpdate(HWND ignored1, LAYOUT_DATA *pData, LPCVOID ignored2, UINT ignored3) +{ + UNREFERENCED_PARAMETER(ignored1); + UNREFERENCED_PARAMETER(ignored2); + UNREFERENCED_PARAMETER(ignored3); + if (pData == NULL) + return; + assert(IsWindow(pData->m_hwndParent)); + _layout_ArrangeLayout(pData); +} + +static __inline void +LayoutEnableResize(LAYOUT_DATA *pData, BOOL bEnable) +{ + _layout_ShowGrip(pData, bEnable); + _layout_ModifySystemMenu(pData, bEnable); +} + +static __inline LAYOUT_DATA * +LayoutInit(HWND hwndParent, const LAYOUT_INFO *pLayouts, UINT cLayouts) +{ + SIZE_T cb; + LAYOUT_DATA *pData = (LAYOUT_DATA *)SHAlloc(sizeof(LAYOUT_DATA)); + if (pData == NULL) + { + assert(0); + return NULL; + } + + cb = cLayouts * sizeof(LAYOUT_INFO); + pData->m_cLayouts = cLayouts; + pData->m_pLayouts = (LAYOUT_INFO *)SHAlloc(cb); + if (pData->m_pLayouts == NULL) + { + assert(0); + SHFree(pData); + return NULL; + } + memcpy(pData->m_pLayouts, pLayouts, cb); + + /* NOTE: The parent window must have initially WS_SIZEBOX style. */ + assert(IsWindow(hwndParent)); + assert(GetWindowLongPtrW(hwndParent, GWL_STYLE) & WS_SIZEBOX); + + pData->m_hwndParent = hwndParent; + pData->m_hwndGrip = NULL; + LayoutEnableResize(pData, TRUE); + _layout_InitLayouts(pData); + return pData; +} + +static __inline void +LayoutDestroy(LAYOUT_DATA *pData) +{ + if (!pData) + return; + SHFree(pData->m_pLayouts); + SHFree(pData); +}
4 years, 2 months
1
0
0
0
[reactos] 01/01: [PARPORT] Fix I/O port length check The Standard Parallel Port (SPP) has 3 registers, not 4: data, status, control This fixes the driver on the Compaq N600c laptop
by Victor Perevertkin
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba09834c5ebdaf8d3e2a5…
commit ba09834c5ebdaf8d3e2a518c7fb78eaa7d89bb50 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Oct 21 15:24:10 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Oct 21 15:24:10 2020 +0300 [PARPORT] Fix I/O port length check The Standard Parallel Port (SPP) has 3 registers, not 4: data, status, control This fixes the driver on the Compaq N600c laptop --- drivers/parallel/parport/fdo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/parallel/parport/fdo.c b/drivers/parallel/parport/fdo.c index 82590607f48..deb9b63ba7e 100644 --- a/drivers/parallel/parport/fdo.c +++ b/drivers/parallel/parport/fdo.c @@ -161,7 +161,7 @@ FdoStartDevice(IN PDEVICE_OBJECT DeviceObject, if (DeviceExtension->BaseAddress == 0) { - if (PartialDescriptor->u.Port.Length < 4) + if (PartialDescriptor->u.Port.Length < 3) return STATUS_INSUFFICIENT_RESOURCES; DeviceExtension->BaseAddress = PartialDescriptor->u.Port.Start.u.LowPart;
4 years, 2 months
1
0
0
0
[reactos] 01/01: [NTOSKRNL] Completely disable optimizations when using GDB
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f26754e6dd25738522d5e…
commit f26754e6dd25738522d5e1fe468e74cc398b9f47 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Oct 21 12:32:54 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Oct 21 13:11:20 2020 +0200 [NTOSKRNL] Completely disable optimizations when using GDB --- ntoskrnl/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index 57a387ffa23..e1823f70019 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -39,6 +39,8 @@ if(MSVC) add_target_link_flags(ntoskrnl "/SECTION:INIT,D") else() if(GDB) + # Completely disable optimizations when debugging the kernel + target_compile_options(ntoskrnl PRIVATE -O0) set_image_base(ntoskrnl 0x00800000) else() set_image_base(ntoskrnl 0x80800000)
4 years, 2 months
1
0
0
0
[reactos] 12/12: Apply suggestions from code review
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab825334dd321e24338c5…
commit ab825334dd321e24338c583835eb7b0b9e9add2d Author: Jérôme Gardou <zefklop(a)users.noreply.github.com> AuthorDate: Fri Oct 16 15:57:20 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Oct 20 21:44:54 2020 +0200 Apply suggestions from code review Beautification and clarity Co-authored-by: Victor Perevertkin <victor(a)perevertkin.ru> Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/services/tftpd/CMakeLists.txt | 2 +- dll/3rdparty/libxslt/CMakeLists.txt | 3 +-- sdk/lib/crt/msvcrtex.cmake | 6 +++--- sdk/lib/drivers/lwip/CMakeLists.txt | 2 +- sdk/tools/wpp/CMakeLists.txt | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/base/services/tftpd/CMakeLists.txt b/base/services/tftpd/CMakeLists.txt index fb6ab01c67d..1b10567bd7f 100644 --- a/base/services/tftpd/CMakeLists.txt +++ b/base/services/tftpd/CMakeLists.txt @@ -4,6 +4,6 @@ set_module_type(tftpd win32cui) add_importlibs(tftpd advapi32 ws2_32 iphlpapi msvcrt kernel32) add_cd_file(TARGET tftpd DESTINATION reactos/system32 FOR all) -if((NOT MSVC) OR USE_CLANG_CL) +if(GCC OR CLANG) target_compile_options(tftpd PRIVATE -Wno-format-overflow) endif() diff --git a/dll/3rdparty/libxslt/CMakeLists.txt b/dll/3rdparty/libxslt/CMakeLists.txt index 5247b3efb7a..5a4910b6f3d 100644 --- a/dll/3rdparty/libxslt/CMakeLists.txt +++ b/dll/3rdparty/libxslt/CMakeLists.txt @@ -43,10 +43,9 @@ if(MSVC) add_importlibs(libxslt ntdll) endif() -if ((NOT MSVC) OR USE_CLANG_CL) +if(GCC OR CLANG) target_compile_options(libxslt PRIVATE -Wno-misleading-indentation -Wno-pointer-sign -Wno-unused-function) endif() add_pch(libxslt precomp.h SOURCE) add_cd_file(TARGET libxslt DESTINATION reactos/system32 FOR all) - diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index b55f53ce659..9d4182ffb4d 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -96,9 +96,9 @@ add_asm_files(msvcrtex_asm ${MSVCRTEX_ASM_SOURCE}) add_library(msvcrtex ${MSVCRTEX_SOURCE} ${msvcrtex_asm}) target_compile_definitions(msvcrtex PRIVATE _DLL _MSVCRTEX_) -if ((NOT MSVC) OR USE_CLANG_CL) +if(GCC OR CLANG) target_compile_options(msvcrtex PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wno-main>) - if (LTCG) + if(LTCG) target_compile_options(msvcrtex PRIVATE -fno-lto) endif() endif() @@ -107,7 +107,7 @@ set_source_files_properties(startup/crtdll.c PROPERTIES COMPILE_DEFINITIONS CRTD set_source_files_properties(startup/crtexe.c startup/wcrtexe.c PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) -if (NOT MSVC) +if(NOT MSVC) target_link_libraries(msvcrtex oldnames) endif() diff --git a/sdk/lib/drivers/lwip/CMakeLists.txt b/sdk/lib/drivers/lwip/CMakeLists.txt index 4b70c3c472c..f2faa8db92e 100644 --- a/sdk/lib/drivers/lwip/CMakeLists.txt +++ b/sdk/lib/drivers/lwip/CMakeLists.txt @@ -62,6 +62,6 @@ add_library(lwip ${SOURCE}) add_dependencies(lwip bugcodes xdk) add_pch(lwip precomp.h SOURCE) -if((NOT MSVC) AND LTCG) +if((NOT MSVC) AND LTCG) target_compile_options(lwip PRIVATE -fno-builtin-malloc -fno-builtin-free) endif() diff --git a/sdk/tools/wpp/CMakeLists.txt b/sdk/tools/wpp/CMakeLists.txt index 0b68ae806cc..389b0c5130f 100644 --- a/sdk/tools/wpp/CMakeLists.txt +++ b/sdk/tools/wpp/CMakeLists.txt @@ -14,7 +14,7 @@ if(MSVC) # Disable warnings add_compile_options( - /wd4146 # " unary minus operator applied to unsigned type, result still unsigned" + /wd4146 # "unary minus operator applied to unsigned type, result still unsigned" /wd4244) # "'=': conversion from 'a' to 'b', possible loss of data" endif()
4 years, 2 months
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
9
...
16
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
Results per page:
10
25
50
100
200