Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[tkreuzer] 49687: [SPEC2DEF] - Handle -i386 - Improve debug output
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 13:45:17 2010 New Revision: 49687 URL: http://svn.reactos.org/svn/reactos?rev=49687&view=rev Log: [SPEC2DEF] - Handle -i386 - Improve debug output Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Sun Nov 21 13:45:17 2010 @@ -294,7 +294,12 @@ while (*pc > ',') pc++; } } + else if (CompareToken(pc, "-i386")) + { + if (_stricmp(pszArchString, "i386") != 0) included = 0; + } else if (CompareToken(pc, "-noname") || + CompareToken(pc, "-norelay") || CompareToken(pc, "-ret64") || CompareToken(pc, "-private")) { @@ -302,7 +307,8 @@ } else { - fprintf(stderr, "info: ignored option: '%.10s'\n", pc); + fprintf(stderr, "info: ignored option: '%.*s'\n", + TokenLength(pc), pc); } /* Go to next token */

1 0

[tkreuzer] 49686: [MSVCRT] - Make stubs raise an exception like winestubs - Remove ugly wine-stubs
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 13:35:43 2010 New Revision: 49686 URL: http://svn.reactos.org/svn/reactos?rev=49686&view=rev Log: [MSVCRT] - Make stubs raise an exception like winestubs - Remove ugly wine-stubs Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] Sun Nov 21 13:35:43 2010 @@ -5,8 +5,16 @@ #include "wine/config.h" #include "wine/exception.h" -#define NDEBUG -#include <debug.h> +void __wine_spec_unimplemented_stub( const char *module, const char *function ) +{ + ULONG_PTR args[2]; + + args[0] = (ULONG_PTR)module; + args[1] = (ULONG_PTR)function; + RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); +} + +#define UNIMPLEMENTED __wine_spec_unimplemented_stub("msvcrt.dll", __FUNCTION__) int __get_app_type() { @@ -89,48 +97,3 @@ UNIMPLEMENTED; return 0; } - -void __wine_spec_unimplemented_stub( const char *module, const char *function ) -{ - ULONG_PTR args[2]; - - args[0] = (ULONG_PTR)module; - args[1] = (ULONG_PTR)function; - RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); -} - -static const char __wine_spec_file_name[] = "msvcrt.dll"; - -void __wine_stub_msvcrt_dll_115(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__lc_collate"); } -void __wine_stub_msvcrt_dll_140(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__p__pwctype"); } -void __wine_stub_msvcrt_dll_151(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__pxcptinfoptrs"); } -void __wine_stub_msvcrt_dll_267(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_fpieee_flt"); } -void __wine_stub_msvcrt_dll_288(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_get_terminate"); } -void __wine_stub_msvcrt_dll_289(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_get_unexpected"); } -void __wine_stub_msvcrt_dll_301(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_getsystime"); } -void __wine_stub_msvcrt_dll_311(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_heapused"); } -void __wine_stub_msvcrt_dll_323(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbalnum"); } -void __wine_stub_msvcrt_dll_324(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbalpha"); } -void __wine_stub_msvcrt_dll_325(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbgraph"); } -void __wine_stub_msvcrt_dll_326(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbkalnum"); } -void __wine_stub_msvcrt_dll_329(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbkpunct"); } -void __wine_stub_msvcrt_dll_331(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbprint"); } -void __wine_stub_msvcrt_dll_332(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbpunct"); } -void __wine_stub_msvcrt_dll_340(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbcl0"); } -void __wine_stub_msvcrt_dll_341(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbcl1"); } -void __wine_stub_msvcrt_dll_342(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbcl2"); } -void __wine_stub_msvcrt_dll_380(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbcjmstojis"); } -void __wine_stub_msvcrt_dll_382(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbctohira"); } -void __wine_stub_msvcrt_dll_383(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbctokata"); } -void __wine_stub_msvcrt_dll_405(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsnbcoll"); } -void __wine_stub_msvcrt_dll_409(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsnbicoll"); } -void __wine_stub_msvcrt_dll_414(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsncoll"); } -void __wine_stub_msvcrt_dll_418(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsnicoll"); } -void __wine_stub_msvcrt_dll_480(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_setsystime"); } -void __wine_stub_msvcrt_dll_505(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_strncoll"); } -void __wine_stub_msvcrt_dll_507(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_strnicoll"); } -void __wine_stub_msvcrt_dll_556(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_wcsncoll"); } -void __wine_stub_msvcrt_dll_558(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_wcsnicoll"); } -void __wine_stub_msvcrt_dll_598(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_wperror"); } -void __wine_stub_msvcrt_dll_625(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_wtmpnam"); } -void __wine_stub_msvcrt_dll_832(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "wcsxfrm"); }

1 0

[tkreuzer] 49685: [MSDMO] add proper stubs
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 13:21:05 2010 New Revision: 49685 URL: http://svn.reactos.org/svn/reactos?rev=49685&view=rev Log: [MSDMO] add proper stubs Added: branches/cmake-bringup/dll/directx/msdmo/stubs.c (with props) Modified: branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt branches/cmake-bringup/dll/directx/msdmo/msdmo.spec Modified: branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/msdmo… ============================================================================== --- branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] Sun Nov 21 13:21:05 2010 @@ -9,6 +9,7 @@ add_library(msdmo SHARED dmoreg.c dmort.c + stubs.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def) @@ -27,4 +28,4 @@ add_dependencies(msdmo dxsdk psdk buildno_header) -add_cab_target(msdmo 1) +add_cab_target(msdmo 1) Modified: branches/cmake-bringup/dll/directx/msdmo/msdmo.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/msdmo… ============================================================================== --- branches/cmake-bringup/dll/directx/msdmo/msdmo.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/msdmo/msdmo.spec [iso-8859-1] Sun Nov 21 13:21:05 2010 @@ -1,11 +1,11 @@ @ stdcall DMOEnum(ptr long long ptr long ptr ptr) @ stdcall DMOGetName(ptr wstr) @ stdcall DMOGetTypes(ptr long ptr ptr long ptr ptr) -@ stub DMOGuidToStrA -@ stub DMOGuidToStrW +@ stdcall DMOGuidToStrA(long long) +@ stdcall DMOGuidToStrW(long long) @ stdcall DMORegister(wstr ptr ptr long long ptr long ptr) -@ stub DMOStrToGuidA -@ stub DMOStrToGuidW +@ stdcall DMOStrToGuidA(long long) +@ stdcall DMOStrToGuidW(long long) @ stdcall DMOUnregister(ptr ptr) @ stdcall MoCopyMediaType(ptr ptr) @ stdcall MoCreateMediaType(ptr long) Added: branches/cmake-bringup/dll/directx/msdmo/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/msdmo… ============================================================================== --- branches/cmake-bringup/dll/directx/msdmo/stubs.c (added) +++ branches/cmake-bringup/dll/directx/msdmo/stubs.c [iso-8859-1] Sun Nov 21 13:21:05 2010 @@ -1,0 +1,32 @@ + +#include <windows.h> +#define NDEBUG +#include <debug.h> + +void +WINAPI +DMOGuidToStrA(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void +WINAPI +DMOGuidToStrW(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void +WINAPI +DMOStrToGuidA(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void +WINAPI +DMOStrToGuidW(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} Propchange: branches/cmake-bringup/dll/directx/msdmo/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 49684: [MSVCRT] - Add a number of stub functions to fix build - Comment out some exports that are probably 2k/nt4 only - don't set -u flag for MSVC
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 13:08:55 2010 New Revision: 49684 URL: http://svn.reactos.org/svn/reactos?rev=49684&view=rev Log: [MSVCRT] - Add a number of stub functions to fix build - Comment out some exports that are probably 2k/nt4 only - don't set -u flag for MSVC Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Sun Nov 21 13:08:55 2010 @@ -23,7 +23,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/msvcrt_precomp.h.gch ${SOURCE}) +if (NOT MSVC) set_target_properties(msvcrt PROPERTIES LINK_FLAGS "-u __seh_longjmp_unwind@4") +endif() set_module_type(msvcrt win32dll) target_link_libraries(msvcrt Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sun Nov 21 13:08:55 2010 @@ -144,7 +144,7 @@ @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() __doserrno @ cdecl __fpecode() -@ stub __get_app_type +@ cdecl __get_app_type() @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv __initenv @ cdecl __iob_func() __p__iob @@ -152,7 +152,7 @@ @ cdecl __iscsym(long) __iscsym @ cdecl __iscsymf(long) __iscsymf @ extern __lc_codepage MSVCRT___lc_codepage -@ stub __lc_collate +# @ stub __lc_collate # not in XP / 7 @ extern __lc_collate_cp MSVCRT___lc_collate_cp @ extern __lc_handle MSVCRT___lc_handle @ cdecl __lconv_init() @@ -190,10 +190,10 @@ @ cdecl -arch=i386 __p__daylight() @ cdecl -arch=i386 __p__dstbias() @ cdecl -arch=i386 __p__environ() -@ stub -arch=i386 __p__fileinfo #() +@ cdecl -arch=i386 __p__fileinfo() @ cdecl -arch=i386 __p__fmode() @ cdecl -arch=i386 __p__iob() -@ stub -arch=i386 __p__mbcasemap #() +@ cdecl -arch=i386 __p__mbcasemap() @ cdecl -arch=i386 __p__mbctype() @ cdecl -arch=i386 __p__osver() @ cdecl -arch=i386 __p__pctype() __pctype_func @@ -260,7 +260,7 @@ # stub _aligned_realloc_dbg @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) -@ stub _atodbl #(ptr str) +@ cdecl _atodbl(ptr str) # stub _atodbl_l # @ cdecl _atof_l(str ptr) # stub _atoflt_l @@ -365,7 +365,7 @@ @ cdecl _fgetchar() @ cdecl _fgetwchar() @ cdecl _filbuf(ptr) -# extern _fileinfo +@ extern _fileinfo @ cdecl _filelength(long) @ cdecl -ret64 _filelengthi64(long) @ cdecl _fileno(ptr) @@ -439,8 +439,8 @@ # stub _get_winminor # stub _get_winver # stub _get_wpgmptr -@ stub _get_terminate -@ stub _get_unexpected +# @ stub _get_terminate # not in XP / 7 +# @ stub _get_unexpected # not in XP / 7 @ cdecl _getch() @ cdecl _getche() @ cdecl _getcwd(str long) @@ -466,7 +466,7 @@ @ cdecl _heapchk() @ cdecl _heapmin() @ cdecl _heapset(long) -@ stub _heapused #(ptr ptr) +# @ stub _heapused #(ptr ptr) # not in XP / 7 @ cdecl _heapwalk(ptr) @ cdecl _hypot(double double) @ cdecl _i64toa(long long ptr long) @@ -475,10 +475,10 @@ # stub _i64tow_s @ cdecl _initterm(ptr ptr) # stub _initterm_e -@ stub _inp #(long) -i386 -@ stub _inpd #(long) -i386 -@ stub _inpw #(long) -i386 -# @ cdecl _invalid_parameter(wstr wstr wstr long long) +@ cdecl -arch=i386 _inp(long) +@ cdecl -arch=i386 _inpd(long) +@ cdecl -arch=i386 _inpw(long) +@ cdecl _invalid_parameter(wstr wstr wstr long long) @ extern _iob # stub _isalnum_l # stub _isalpha_l @@ -500,9 +500,9 @@ # stub _ismbbkalnum_l @ cdecl _ismbbkana(long) # stub _ismbbkana_l -@ stub _ismbbkprint #(long) +@ cdecl _ismbbkprint(long) # stub _ismbbkprint_l -@ stub _ismbbkpunct #(long) +@ cdecl _ismbbkpunct(long) # stub _ismbbkpunct_l @ cdecl _ismbblead(long) # stub _ismbblead_l @@ -602,7 +602,7 @@ @ cdecl _mbbtombc(long) # stub _mbbtombc_l @ cdecl _mbbtype(long long) -# extern _mbcasemap +@ extern _mbcasemap @ cdecl _mbccpy (str str) # stub _mbccpy_l # stub _mbccpy_s @@ -757,9 +757,9 @@ @ cdecl _open_osfhandle(long long) @ extern _osplatform _osplatform @ extern _osver _osver -@ stub _outp #(long long) -@ stub _outpd #(long long) -@ stub _outpw #(long long) +@ cdecl _outp(long long) +@ cdecl _outpd(long long) +@ cdecl _outpw(long long) @ cdecl _pclose (ptr) @ extern _pctype _pctype @ extern _pgmptr _pgmptr @@ -1091,7 +1091,7 @@ # stub _wmktemp_s @ varargs _wopen(wstr long) # stub _woutput_s -@ stub _wperror #(wstr) +@ cdecl _wperror(wstr) @ extern _wpgmptr @ cdecl _wpopen (wstr wstr) # stub _wprintf_l Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] Sun Nov 21 13:08:55 2010 @@ -4,6 +4,91 @@ #include "winbase.h" #include "wine/config.h" #include "wine/exception.h" + +#define NDEBUG +#include <debug.h> + +int __get_app_type() +{ + UNIMPLEMENTED; + return 0; +} + +int _fileinfo; + +void * +__p__fileinfo() +{ + return &_fileinfo; +} + +unsigned char _mbcasemap[1]; + +void * +__p__mbcasemap() +{ + return _mbcasemap; +} + +int _atodbl( + void * value, + char * str) +{ + UNIMPLEMENTED; + return 0; +} + +int _ismbbkprint( + unsigned int c) +{ + UNIMPLEMENTED; + return 0; +} + +int _inp( + unsigned short port) +{ + UNIMPLEMENTED; + return 0; +} + +unsigned short _inpw( + unsigned short port) +{ + UNIMPLEMENTED; + return 0; +} + +unsigned long _inpd( + unsigned short port) +{ + return 0; +} + + +int _outp( + unsigned short port, + int databyte) +{ + UNIMPLEMENTED; + return 0; +} + +unsigned short _outpw( + unsigned short port, + unsigned short dataword) +{ + UNIMPLEMENTED; + return 0; +} + +unsigned long _outpd( + unsigned short port, + unsigned long dataword) +{ + UNIMPLEMENTED; + return 0; +} void __wine_spec_unimplemented_stub( const char *module, const char *function ) { @@ -16,26 +101,18 @@ static const char __wine_spec_file_name[] = "msvcrt.dll"; -void __wine_stub_msvcrt_dll_107(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__get_app_type"); } void __wine_stub_msvcrt_dll_115(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__lc_collate"); } -void __wine_stub_msvcrt_dll_132(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__p__fileinfo"); } -void __wine_stub_msvcrt_dll_135(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__p__mbcasemap"); } void __wine_stub_msvcrt_dll_140(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__p__pwctype"); } void __wine_stub_msvcrt_dll_151(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__pxcptinfoptrs"); } -void __wine_stub_msvcrt_dll_189(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_atodbl"); } void __wine_stub_msvcrt_dll_267(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_fpieee_flt"); } void __wine_stub_msvcrt_dll_288(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_get_terminate"); } void __wine_stub_msvcrt_dll_289(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_get_unexpected"); } void __wine_stub_msvcrt_dll_301(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_getsystime"); } void __wine_stub_msvcrt_dll_311(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_heapused"); } -void __wine_stub_msvcrt_dll_317(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_inp"); } -void __wine_stub_msvcrt_dll_318(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_inpd"); } -void __wine_stub_msvcrt_dll_319(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_inpw"); } void __wine_stub_msvcrt_dll_323(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbalnum"); } void __wine_stub_msvcrt_dll_324(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbalpha"); } void __wine_stub_msvcrt_dll_325(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbgraph"); } void __wine_stub_msvcrt_dll_326(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbkalnum"); } -void __wine_stub_msvcrt_dll_328(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbkprint"); } void __wine_stub_msvcrt_dll_329(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbkpunct"); } void __wine_stub_msvcrt_dll_331(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbprint"); } void __wine_stub_msvcrt_dll_332(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbpunct"); } @@ -49,9 +126,6 @@ void __wine_stub_msvcrt_dll_409(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsnbicoll"); } void __wine_stub_msvcrt_dll_414(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsncoll"); } void __wine_stub_msvcrt_dll_418(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsnicoll"); } -void __wine_stub_msvcrt_dll_447(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_outp"); } -void __wine_stub_msvcrt_dll_448(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_outpd"); } -void __wine_stub_msvcrt_dll_449(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_outpw"); } void __wine_stub_msvcrt_dll_480(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_setsystime"); } void __wine_stub_msvcrt_dll_505(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_strncoll"); } void __wine_stub_msvcrt_dll_507(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_strnicoll"); }

1 0

[tkreuzer] 49683: [CMAKE] - Add /nologo, when preprocessing asm files - Move add_pch to compiler specific files (maybe someone can fix it for MSVC) - Update set_module_type for MSVC
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 12:32:03 2010 New Revision: 49683 URL: http://svn.reactos.org/svn/reactos?rev=49683&view=rev Log: [CMAKE] - Add /nologo, when preprocessing asm files - Move add_pch to compiler specific files (maybe someone can fix it for MSVC) - Update set_module_type for MSVC Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Sun Nov 21 12:32:03 2010 @@ -26,20 +26,6 @@ endif() ENDMACRO(_PCH_GET_COMPILE_FLAGS) - -MACRO(add_pch _target_name _header_filename _src_list) - - get_filename_component(FILE ${_header_filename} NAME) - set(_gch_filename "${_target_name}_${FILE}.gch") - list(APPEND ${_src_list} ${_gch_filename}) - _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename}) - file(REMOVE ${_gch_filename}) - add_custom_command( - OUTPUT ${_gch_filename} - COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args} - DEPENDS ${_header_filename}) - -ENDMACRO(add_pch _target_name _header_filename _src_list) if (NOT MSVC) MACRO(CreateBootSectorTarget _target_name _asm_file _object_file) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=496… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Nov 21 12:32:03 2010 @@ -33,6 +33,18 @@ add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) # Macros +MACRO(add_pch _target_name _header_filename _src_list) + get_filename_component(FILE ${_header_filename} NAME) + set(_gch_filename "${_target_name}_${FILE}.gch") + list(APPEND ${_src_list} ${_gch_filename}) + _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename}) + file(REMOVE ${_gch_filename}) + add_custom_command( + OUTPUT ${_gch_filename} + COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args} + DEPENDS ${_header_filename}) +ENDMACRO(add_pch _target_name _header_filename _src_list) + macro(add_linkerflag MODULE _flag) set(NEW_LINKER_FLAGS ${_flag}) get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=496… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sun Nov 21 12:32:03 2010 @@ -23,6 +23,18 @@ set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") +MACRO(add_pch _target_name _header_filename _src_list) + get_filename_component(FILE ${_header_filename} NAME) + set(_gch_filename "${_target_name}_${FILE}.gch") + list(APPEND ${_src_list} ${_gch_filename}) + _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename}) + file(REMOVE ${_gch_filename}) + add_custom_command( + OUTPUT ${_gch_filename} + COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args} + DEPENDS ${_header_filename}) +ENDMACRO(add_pch _target_name _header_filename _src_list) + macro(add_linkerflag MODULE _flag) set(NEW_LINKER_FLAGS ${_flag}) get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) @@ -52,17 +64,27 @@ add_dependencies(${MODULE} psdk buildno_header) if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) - add_importlibs(${MODULE} ntdll) + set_entrypoint(${MODULE} NtProcessStartup@4) endif() if (${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) set_entrypoint(${MODULE} WinMainCRTStartup) - target_link_libraries(${MODULE} mingw_common mingw_wmain) + if(IS_UNICODE) + target_link_libraries(${MODULE} mingw_wmain) + else() + target_link_libraries(${MODULE} mingw_main) + endif() + target_link_libraries(${MODULE} mingw_common) endif () if (${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) set_entrypoint(${MODULE} mainCRTStartup) - target_link_libraries(${MODULE} mingw_common mingw_wmain) + if(IS_UNICODE) + target_link_libraries(${MODULE} mingw_wmain) + else() + target_link_libraries(${MODULE} mingw_main) + endif() + target_link_libraries(${MODULE} mingw_common) endif () if(${TYPE} MATCHES win32dll) # Need this only because mingw library is broken @@ -75,6 +97,14 @@ target_link_libraries(${MODULE} mingw_common mingw_dllmain) add_linkerflag(${MODULE} "/DLL") endif() + if(${TYPE} MATCHES win32ocx) + set_entrypoint(${MODULE} DllMain@12) + set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") + endif() + if(${TYPE} MATCHES cpl) + set_entrypoint(${MODULE} DllMain@12) + set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") + endif() if(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") set_entrypoint(${MODULE} DriverEntry@8) @@ -86,7 +116,8 @@ endmacro() macro(set_unicode) - add_definitions(-DUNICODE -D_UNICODE) + add_definitions(-DUNICODE -D_UNICODE) + set(IS_UNICODE 1) endmacro() set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Sun Nov 21 12:32:03 2010 @@ -35,7 +35,7 @@ SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> /win32 /Dstrict_context_handle= /h <OBJECT> <SOURCE>") SET(CMAKE_ASM_COMPILE_OBJECT - "<CMAKE_C_COMPILER> /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Fo<OBJECT> /c /Ta <OBJECT>.tmp") set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000")

1 0

[tkreuzer] 49682: [MINGW] Remove alloca_probe_16 stub
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 12:29:35 2010 New Revision: 49682 URL: http://svn.reactos.org/svn/reactos?rev=49682&view=rev Log: [MINGW] Remove alloca_probe_16 stub Modified: branches/cmake-bringup/lib/3rdparty/mingw/mscmain.c Modified: branches/cmake-bringup/lib/3rdparty/mingw/mscmain.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/mscmain.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/mscmain.c [iso-8859-1] Sun Nov 21 12:29:35 2010 @@ -8,12 +8,6 @@ #include <stdlib.h> int _fltused; - -void -_cdecl -_alloca_probe_16(void) -{ -} void __do_global_dtors (void)

1 0

[tkreuzer] 49681: [HAL] Convert asm to new syntax, use spec file
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 10:10:38 2010 New Revision: 49681 URL: http://svn.reactos.org/svn/reactos?rev=49681&view=rev Log: [HAL] Convert asm to new syntax, use spec file Modified: branches/cmake-bringup/hal/CMakeLists.txt branches/cmake-bringup/hal/halx86/amd64/mps.S branches/cmake-bringup/hal/halx86/amd64/systimer.S branches/cmake-bringup/hal/halx86/generic/bios.c branches/cmake-bringup/hal/halx86/generic/i386/systimer.S branches/cmake-bringup/hal/halx86/generic/i386/trap.S branches/cmake-bringup/hal/halx86/mp/i386/mps.S Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -1,3 +1,5 @@ + +spec2def(hal.dll hal.spec) if(ARCH MATCHES i386) @@ -51,7 +53,8 @@ ${HAL_GENERIC_PCAT_SOURCE} ${HAL_GENERIC_UP_SOURCE} halx86/up/halinit_up.c - halx86/up/halup.rc) + halx86/up/halup.rc + ${CMAKE_CURRENT_BINARY_DIR}/hal.def) add_library(hal SHARED ${HAL_SOURCE}) add_pch(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_SOURCE}) @@ -63,9 +66,7 @@ add_importlibs(hal ntoskrnl) -target_link_libraries(hal - ${CMAKE_CURRENT_SOURCE_DIR}/halx86/hal_i386.def - libcntpr) +target_link_libraries(hal libcntpr) list(APPEND MINI_HAL_SOURCE halx86/generic/legacy/bus/bushndlr.c @@ -106,4 +107,4 @@ #TBD endif(ARCH MATCHES i386) -add_importlib_target(hal.spec) +add_importlib_target(hal.spec) Modified: branches/cmake-bringup/hal/halx86/amd64/mps.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/amd64/… ============================================================================== --- branches/cmake-bringup/hal/halx86/amd64/mps.S [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/amd64/mps.S [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -8,8 +8,9 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> + +#include <ksamd64.inc> /* FUNCTIONS *****************************************************************/ @@ -92,5 +93,5 @@ AFTER iret - +END /* EOF */ Modified: branches/cmake-bringup/hal/halx86/amd64/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/amd64/… ============================================================================== --- branches/cmake-bringup/hal/halx86/amd64/systimer.S [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/amd64/systimer.S [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -7,8 +7,9 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> + +#include <ksamd64.inc> /* GLOBALS *******************************************************************/ @@ -90,3 +91,4 @@ UNIMPLEMENTED _HalpClockInterrupt iret +END Modified: branches/cmake-bringup/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/generi… ============================================================================== --- branches/cmake-bringup/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/generic/bios.c [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -197,9 +197,9 @@ /* V86 TRAP HANDLERS **********************************************************/ #ifndef _MINIHAL_ +DECLSPEC_NORETURN VOID FASTCALL -DECLSPEC_NORETURN HalpTrap0DHandler(IN PKTRAP_FRAME TrapFrame) { /* Enter the trap */ Modified: branches/cmake-bringup/hal/halx86/generic/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/generi… ============================================================================== --- branches/cmake-bringup/hal/halx86/generic/i386/systimer.S [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/generic/i386/systimer.S [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -7,8 +7,9 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/asm.h> +#include <asm.inc> + +#include <ks386.inc> EXTERN _HalpAcquireSystemHardwareSpinLock@0:PROC EXTERN _HalpReleaseCmosSpinLock@0:PROC @@ -39,7 +40,7 @@ /* GLOBALS *******************************************************************/ .data -//ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING +ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING PUBLIC _HalpPerfCounter _HalpLastPerfCounterLow: .long 0 Modified: branches/cmake-bringup/hal/halx86/generic/i386/trap.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/generi… ============================================================================== --- branches/cmake-bringup/hal/halx86/generic/i386/trap.S [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/generic/i386/trap.S [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -8,12 +8,12 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/i386/asm.h> +#include <asm.inc> + +#include <ks386.inc> #include <internal/i386/asmmacro.S> -.code32 -.text +.code TRAP_ENTRY HalpTrap0D, 0 TRAP_ENTRY HalpApcInterrupt, KI_SOFTWARE_TRAP @@ -42,4 +42,6 @@ .space 2048 _HalpRealModeEnd: PUBLIC _HalpRealModeEnd +.endcode16 +END Modified: branches/cmake-bringup/hal/halx86/mp/i386/mps.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/mp/i38… ============================================================================== --- branches/cmake-bringup/hal/halx86/mp/i386/mps.S [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/mp/i386/mps.S [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -11,7 +11,9 @@ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> +#include <asm.inc> + +#include <ks386.inc> /* FUNCTIONS *****************************************************************/

1 0

[tkreuzer] 49680: [RTL] - Use portable interlocked functions in code, define them to intrinsics for x86 and x64 in the header
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 10:05:20 2010 New Revision: 49680 URL: http://svn.reactos.org/svn/reactos?rev=49680&view=rev Log: [RTL] - Use portable interlocked functions in code, define them to intrinsics for x86 and x64 in the header Modified: branches/cmake-bringup/lib/rtl/actctx.c branches/cmake-bringup/lib/rtl/critical.c branches/cmake-bringup/lib/rtl/rtl.h branches/cmake-bringup/lib/rtl/srw.c branches/cmake-bringup/lib/rtl/timerqueue.c branches/cmake-bringup/lib/rtl/vectoreh.c branches/cmake-bringup/lib/rtl/wait.c branches/cmake-bringup/lib/rtl/workitem.c Modified: branches/cmake-bringup/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/actctx.c?… ============================================================================== --- branches/cmake-bringup/lib/rtl/actctx.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/actctx.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -575,12 +575,12 @@ static inline void actctx_addref( ACTIVATION_CONTEXT *actctx ) { - _InterlockedExchangeAdd( &actctx->ref_count, 1 ); + InterlockedExchangeAdd( &actctx->ref_count, 1 ); } static void actctx_release( ACTIVATION_CONTEXT *actctx ) { - if (_InterlockedExchangeAdd( &actctx->ref_count, -1 ) == 1) + if (InterlockedExchangeAdd( &actctx->ref_count, -1 ) == 1) { unsigned int i, j; Modified: branches/cmake-bringup/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/critical.… ============================================================================== --- branches/cmake-bringup/lib/rtl/critical.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/critical.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -59,7 +59,7 @@ /* We failed, this is bad... */ DPRINT1("Failed to Create Event!\n"); - _InterlockedDecrement(&CriticalSection->LockCount); + InterlockedDecrement(&CriticalSection->LockCount); RtlRaiseStatus(Status); return; } @@ -437,7 +437,7 @@ HANDLE Thread = (HANDLE)NtCurrentTeb()->ClientId.UniqueThread; /* Try to Lock it */ - if (_InterlockedIncrement(&CriticalSection->LockCount) != 0) { + if (InterlockedIncrement(&CriticalSection->LockCount) != 0) { /* * We've failed to lock it! Does this thread @@ -621,7 +621,7 @@ if (--CriticalSection->RecursionCount) { /* Someone still owns us, but we are free. This needs to be done atomically. */ - _InterlockedDecrement(&CriticalSection->LockCount); + InterlockedDecrement(&CriticalSection->LockCount); } else { @@ -630,7 +630,7 @@ CriticalSection->OwningThread = 0; /* Was someone wanting us? This needs to be done atomically. */ - if (-1 != _InterlockedDecrement(&CriticalSection->LockCount)) { + if (-1 != InterlockedDecrement(&CriticalSection->LockCount)) { /* Let him have us */ RtlpUnWaitCriticalSection(CriticalSection); @@ -662,7 +662,7 @@ RtlTryEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { /* Try to take control */ - if (_InterlockedCompareExchange(&CriticalSection->LockCount, + if (InterlockedCompareExchange(&CriticalSection->LockCount, 0, -1) == -1) { @@ -674,7 +674,7 @@ } else if (CriticalSection->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { /* It's already ours */ - _InterlockedIncrement(&CriticalSection->LockCount); + InterlockedIncrement(&CriticalSection->LockCount); CriticalSection->RecursionCount++; return TRUE; } Modified: branches/cmake-bringup/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/rtl.h?rev… ============================================================================== --- branches/cmake-bringup/lib/rtl/rtl.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/rtl.h [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -32,6 +32,14 @@ #include <intrin.h> +/* Use intrinsics for x86 and x64 */ +#if defined(_M_IX86) || defined(_M_AMD64) +#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedIncrement _InterlockedIncrement +#define InterlockedDecrement _InterlockedDecrement +#define InterlockedExchangeAdd _InterlockedExchangeAdd +#endif + #endif /* RTL_H */ /* EOF */ Modified: branches/cmake-bringup/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/srw.c?rev… ============================================================================== --- branches/cmake-bringup/lib/rtl/srw.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/srw.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -131,7 +131,7 @@ } } - (void)_InterlockedExchange((PLONG)&SRWLock->Ptr, NewValue); + (void)InterlockedExchange((PLONG)&SRWLock->Ptr, NewValue); if (FirstWaitBlock->Exclusive) { @@ -186,7 +186,7 @@ NewValue = RTL_SRWLOCK_OWNED; } - (void)_InterlockedExchange((PLONG)&SRWLock->Ptr, NewValue); + (void)InterlockedExchange((PLONG)&SRWLock->Ptr, NewValue); (void)InterlockedOr(&FirstWaitBlock->Wake, TRUE); @@ -420,7 +420,7 @@ NewValue = (CurrentValue >> RTL_SRWLOCK_BITS) + 1; NewValue = (NewValue << RTL_SRWLOCK_BITS) | (CurrentValue & RTL_SRWLOCK_MASK); - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { @@ -499,7 +499,7 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { @@ -521,7 +521,7 @@ RTL_SRWLOCK_SHARED nor the RTL_SRWLOCK_OWNED bit is set */ ASSERT(!(CurrentValue & RTL_SRWLOCK_CONTENDED)); - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { @@ -580,7 +580,7 @@ NewValue = (NewValue << RTL_SRWLOCK_BITS) | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED; } - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { @@ -639,7 +639,7 @@ NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENDED | RTL_SRWLOCK_OWNED; - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { @@ -697,7 +697,7 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { @@ -767,7 +767,7 @@ ASSERT(!(CurrentValue & ~RTL_SRWLOCK_OWNED)); NewValue = 0; - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { Modified: branches/cmake-bringup/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/timerqueu… ============================================================================== --- branches/cmake-bringup/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/timerqueue.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -372,7 +372,7 @@ NTSTATUS status = RtlCreateTimerQueue(&q); if (status == STATUS_SUCCESS) { - PVOID p = _InterlockedCompareExchangePointer( + PVOID p = InterlockedCompareExchangePointer( (void **) &default_timer_queue, q, NULL); if (p) /* Got beat to the punch. */ Modified: branches/cmake-bringup/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/vectoreh.… ============================================================================== --- branches/cmake-bringup/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/vectoreh.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -61,7 +61,7 @@ if (--veh->Refs == 0) { RemoveEntryList (&veh->ListEntry); - _InterlockedDecrement (&RtlpVectoredExceptionsInstalled); + InterlockedDecrement (&RtlpVectoredExceptionsInstalled); Remove = TRUE; } Ret = TRUE; @@ -74,7 +74,7 @@ { CurrentEntry = veh->ListEntry.Flink; RemoveEntryList (&veh->ListEntry); - _InterlockedDecrement (&RtlpVectoredExceptionsInstalled); + InterlockedDecrement (&RtlpVectoredExceptionsInstalled); RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); RtlFreeHeap(RtlGetProcessHeap(), @@ -136,7 +136,7 @@ InsertTailList(&RtlpVectoredExceptionHead, &veh->ListEntry); } - _InterlockedIncrement (&RtlpVectoredExceptionsInstalled); + InterlockedIncrement (&RtlpVectoredExceptionsInstalled); RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); } Modified: branches/cmake-bringup/lib/rtl/wait.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/wait.c?re… ============================================================================== --- branches/cmake-bringup/lib/rtl/wait.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/wait.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -91,7 +91,7 @@ completion_event = Wait->CompletionEvent; if (completion_event) NtSetEvent( completion_event, NULL ); - if (_InterlockedIncrement( &Wait->DeleteCount ) == 2 ) + if (InterlockedIncrement( &Wait->DeleteCount ) == 2 ) { NtClose( Wait->CancelEvent ); RtlFreeHeap( RtlGetProcessHeap(), 0, Wait ); @@ -220,7 +220,7 @@ if (Status != STATUS_SUCCESS) return Status; - (void)_InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); + (void)InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); if (Wait->CallbackInProgress) NtWaitForSingleObject( CompletionEvent, FALSE, NULL ); @@ -229,7 +229,7 @@ } else { - (void)_InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); + (void)InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); if (Wait->CallbackInProgress) Status = STATUS_PENDING; @@ -239,7 +239,7 @@ Status = STATUS_PENDING; } - if (_InterlockedIncrement( &Wait->DeleteCount ) == 2 ) + if (InterlockedIncrement( &Wait->DeleteCount ) == 2 ) { Status = STATUS_SUCCESS; NtClose( Wait->CancelEvent ); Modified: branches/cmake-bringup/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/workitem.… ============================================================================== --- branches/cmake-bringup/lib/rtl/workitem.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/workitem.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -55,7 +55,7 @@ do { - InitStatus = _InterlockedCompareExchange(&ThreadPoolInitialized, + InitStatus = InterlockedCompareExchange(&ThreadPoolInitialized, 2, 0); if (InitStatus == 0) @@ -91,7 +91,7 @@ Finish: /* Initialization done */ - _InterlockedExchange(&ThreadPoolInitialized, + InterlockedExchange(&ThreadPoolInitialized, 1); break; } @@ -223,11 +223,11 @@ } /* update the requests counter */ - _InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); } } @@ -237,11 +237,11 @@ { NTSTATUS Status = STATUS_SUCCESS; - _InterlockedIncrement(&ThreadPoolWorkerThreadsRequests); + InterlockedIncrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedIncrement(&ThreadPoolWorkerThreadsLongRequests); + InterlockedIncrement(&ThreadPoolWorkerThreadsLongRequests); } if (WorkItem->Flags & WT_EXECUTEINPERSISTENTTHREAD) @@ -270,11 +270,11 @@ if (!NT_SUCCESS(Status)) { - _InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); } } @@ -351,11 +351,11 @@ } /* update the requests counter */ - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); } } @@ -461,14 +461,14 @@ ASSERT(IoThread != NULL); - _InterlockedIncrement(&ThreadPoolIOWorkerThreadsRequests); + InterlockedIncrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { /* We're about to queue a long function, mark the thread */ IoThread->Flags |= WT_EXECUTELONGFUNCTION; - _InterlockedIncrement(&ThreadPoolIOWorkerThreadsLongRequests); + InterlockedIncrement(&ThreadPoolIOWorkerThreadsLongRequests); } /* It's time to queue the work item */ @@ -480,11 +480,11 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to queue APC for work item 0x%p\n", WorkItem->Function); - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); } } @@ -543,7 +543,7 @@ BOOLEAN Terminate; NTSTATUS Status = STATUS_SUCCESS; - if (_InterlockedIncrement(&ThreadPoolIOWorkerThreads) > MAX_WORKERTHREADS) + if (InterlockedIncrement(&ThreadPoolIOWorkerThreads) > MAX_WORKERTHREADS) { /* Oops, too many worker threads... */ goto InitFailed; @@ -562,10 +562,10 @@ DPRINT1("Failed to create handle to own thread! Status: 0x%x\n", Status); InitFailed: - _InterlockedDecrement(&ThreadPoolIOWorkerThreads); + InterlockedDecrement(&ThreadPoolIOWorkerThreads); /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); RtlExitUserThread(Status); @@ -579,7 +579,7 @@ (PLIST_ENTRY)&ThreadInfo.ListEntry); /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); for (;;) @@ -626,7 +626,7 @@ if (Terminate) { /* Rundown the thread and unlink it from the list */ - _InterlockedDecrement(&ThreadPoolIOWorkerThreads); + InterlockedDecrement(&ThreadPoolIOWorkerThreads); RemoveEntryList((PLIST_ENTRY)&ThreadInfo.ListEntry); } @@ -663,10 +663,10 @@ PKNORMAL_ROUTINE ApcRoutine; NTSTATUS Status = STATUS_SUCCESS; - if (_InterlockedIncrement(&ThreadPoolWorkerThreads) > MAX_WORKERTHREADS) + if (InterlockedIncrement(&ThreadPoolWorkerThreads) > MAX_WORKERTHREADS) { /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); /* Oops, too many worker threads... */ @@ -675,7 +675,7 @@ } /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); for (;;) @@ -736,7 +736,7 @@ if (Terminate) { - _InterlockedDecrement(&ThreadPoolWorkerThreads); + InterlockedDecrement(&ThreadPoolWorkerThreads); Status = STATUS_SUCCESS; break; }

1 0

[tkreuzer] 49679: [CRT] - Use ___readcr4 instead of __readcr4, because MSVC doesn't like this intrinsic to be redefined. - Add _ftol2
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 09:36:26 2010 New Revision: 49679 URL: http://svn.reactos.org/svn/reactos?rev=49679&view=rev Log: [CRT] - Use ___readcr4 instead of __readcr4, because MSVC doesn't like this intrinsic to be redefined. - Add _ftol2 Added: branches/cmake-bringup/lib/sdk/crt/math/i386/ftol2_asm.s (with props) Modified: branches/cmake-bringup/include/crt/msc/intrin.h branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/misc/i386/readcr4.S Modified: branches/cmake-bringup/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/msc/i… ============================================================================== --- branches/cmake-bringup/include/crt/msc/intrin.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/msc/intrin.h [iso-8859-1] Sun Nov 21 09:36:26 2010 @@ -283,9 +283,12 @@ unsigned long __readcr0(void); unsigned long __readcr2(void); unsigned long __readcr3(void); -unsigned long __readcr4(void); +//unsigned long __readcr4(void); //#pragma intrinsic(__readcr4) -#pragma function(__readcr4) // HACK: MSVC is broken +// HACK: MSVC is broken +unsigned long ___readcr4(void); +#define __readcr4 ___readcr4 + unsigned int __readdr(unsigned int reg); void __writedr(unsigned reg, unsigned int value); #endif Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sun Nov 21 09:36:26 2010 @@ -486,12 +486,14 @@ math/i386/fabs_asm.s math/i386/floor_asm.s math/i386/ftol_asm.s + math/i386/ftol2_asm.s math/i386/log_asm.s math/i386/pow_asm.s math/i386/sin_asm.s math/i386/sqrt_asm.s math/i386/tan_asm.s - math/i386/ci.c) + math/i386/ci.c + misc/i386/readcr4.S) elseif(ARCH MATCHES amd64) list(APPEND LIBCNTPR_SOURCE math/cos.c Added: branches/cmake-bringup/lib/sdk/crt/math/i386/ftol2_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/ftol2_asm.s (added) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/ftol2_asm.s [iso-8859-1] Sun Nov 21 09:36:26 2010 @@ -1,0 +1,28 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Run-Time Library + * FILE: lib/rtl/i386/ftol2.S + * PROGRAMER: + * + */ + +#include <asm.inc> + +EXTERN __ftol:PROC +PUBLIC __ftol2 +PUBLIC __ftol2_sse + +/* FUNCTIONS ***************************************************************/ +.code + +/* + * This routine is called by MSVC-generated code to convert from floating point + * to integer representation. The floating point number to be converted is + * on the top of the floating point stack. + */ +__ftol2: +__ftol2_sse: + jmp __ftol + +END Propchange: branches/cmake-bringup/lib/sdk/crt/math/i386/ftol2_asm.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/lib/sdk/crt/misc/i386/readcr4.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/misc/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/misc/i386/readcr4.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/misc/i386/readcr4.S [iso-8859-1] Sun Nov 21 09:36:26 2010 @@ -3,8 +3,8 @@ .code -PUBLIC ___readcr4 -___readcr4: +PUBLIC ____readcr4 +____readcr4: mov eax, cr4 ret

1 0

[tkreuzer] 49678: [RTL] Don't use _InterlockedCompareExchangePointer, that function doesn't exist on x86
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 01:36:51 2010 New Revision: 49678 URL: http://svn.reactos.org/svn/reactos?rev=49678&view=rev Log: [RTL] Don't use _InterlockedCompareExchangePointer, that function doesn't exist on x86 Modified: branches/cmake-bringup/lib/rtl/critical.c Modified: branches/cmake-bringup/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/critical.… ============================================================================== --- branches/cmake-bringup/lib/rtl/critical.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/critical.c [iso-8859-1] Sun Nov 21 01:36:51 2010 @@ -65,9 +65,9 @@ } DPRINT("Created Event: %p \n", hNewEvent); - if (_InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, - (PVOID)hNewEvent, - 0)) { + if (InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, + (PVOID)hNewEvent, + 0)) { /* Some just created an event */ DPRINT("Closing already created event: %p\n", hNewEvent);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2010