Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 38340: This is why we can't have nice things. Fixes r38338 build regression
by hyperion＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: hyperion Date: Wed Dec 24 17:31:09 2008 New Revision: 38340 URL: http://svn.reactos.org/svn/reactos?rev=38340&view=rev Log: This is why we can't have nice things. Fixes r38338 build regression Modified: trunk/reactos/include/ddk/ntdef.h trunk/reactos/include/psdk/windef.h Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=38… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Wed Dec 24 17:31:09 2008 @@ -11,7 +11,7 @@ // FIXME: Should we include these here? #include <stdarg.h> -#include <string.h> +#include <string.h> typedef unsigned long POINTER_64; // FIXME! HACK!!! @@ -225,12 +225,14 @@ #endif #endif +#ifndef DECLSPEC_NOINLINE #if (_MSC_VER >= 1300) #define DECLSPEC_NOINLINE __declspec(noinline) #elif defined(__GNUC__) #define DECLSPEC_NOINLINE __attribute__((noinline)) #else #define DECLSPEC_NOINLINE +#endif #endif #if !defined(_M_CEE_PURE) @@ -255,7 +257,7 @@ // -// Use to silence unused variable warnings when it is intentional +// Use to silence unused variable warnings when it is intentional // #define UNREFERENCED_PARAMETER(P) {(P)=(P);} #define UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);} @@ -290,7 +292,7 @@ // Void Pointers // typedef void *PVOID; -//typedef void * POINTER_64 PVOID64; +//typedef void * POINTER_64 PVOID64; typedef PVOID PVOID64; // FIXME! // Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Wed Dec 24 17:31:09 2008 @@ -141,7 +141,15 @@ #define DECLSPEC_IMPORT __declspec(dllimport) #define DECLSPEC_EXPORT __declspec(dllexport) -#define DECLSPEC_NOINLINE __declspec(noinline) +#ifndef DECLSPEC_NOINLINE +#if (_MSC_VER >= 1300) +#define DECLSPEC_NOINLINE __declspec(noinline) +#elif defined(__GNUC__) +#define DECLSPEC_NOINLINE __attribute__((noinline)) +#else +#define DECLSPEC_NOINLINE +#endif +#endif #ifdef __GNUC__ #define DECLSPEC_NORETURN __declspec(noreturn) #define DECLARE_STDCALL_P( type ) __stdcall type

1 0

[hyperion] 38339: Now a single test suite with 89 tests, instead of 89 test suites with 1 test each Added dummy implementations of sanity checks for compilers/architectures I didn't write them for yet. Long story short: now compiles and runs with Visual C++, both x86 and x64 Added copyright/license header
by hyperion＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: hyperion Date: Wed Dec 24 17:22:04 2008 New Revision: 38339 URL: http://svn.reactos.org/svn/reactos?rev=38339&view=rev Log: Now a single test suite with 89 tests, instead of 89 test suites with 1 test each Added dummy implementations of sanity checks for compilers/architectures I didn't write them for yet. Long story short: now compiles and runs with Visual C++, both x86 and x64 Added copyright/license header Modified: trunk/rostests/tests/pseh2/psehtest.c trunk/rostests/tests/pseh2/psehtest2.c Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Wed Dec 24 17:22:04 2008 @@ -1,3 +1,25 @@ +/* + Copyright (c) 2008 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + #include <stddef.h> #include <stdio.h> #include <stdlib.h> @@ -42,12 +64,7 @@ static int call_test(int (*)(void)); -#define DEFINE_TEST(NAME_) \ - static int test_ ## NAME_(void); \ - \ - static void NAME_(void) { ok(call_test(test_ ## NAME_), "test failed\n"); } \ - \ - static int test_ ## NAME_(void) +#define DEFINE_TEST(NAME_) static int test_ ## NAME_(void) /* Empty statements *///{{{ DEFINE_TEST(empty_1) @@ -2240,121 +2257,6 @@ // TODO //}}} -#define USE_TEST_NAME_(NAME_) # NAME_ -#define USE_TEST_NAME(NAME_) USE_TEST_NAME_(NAME_) -#define USE_TEST(NAME_) { USE_TEST_NAME(NAME_), NAME_ } - -const struct test winetest_testlist[] = -{ - USE_TEST(empty_1), - USE_TEST(empty_2), - USE_TEST(empty_3), - USE_TEST(empty_4), - USE_TEST(empty_5), - USE_TEST(empty_6), - USE_TEST(empty_7), - USE_TEST(empty_8), - - USE_TEST(execute_handler_1), - USE_TEST(continue_execution_1), - USE_TEST(continue_search_1), - USE_TEST(execute_handler_2), - USE_TEST(continue_execution_2), - - USE_TEST(execute_handler_3), - USE_TEST(continue_execution_3), - USE_TEST(continue_search_2), - USE_TEST(execute_handler_4), - USE_TEST(continue_execution_4), - - USE_TEST(execute_handler_5), - USE_TEST(continue_execution_5), - USE_TEST(continue_search_3), - USE_TEST(execute_handler_6), - USE_TEST(continue_execution_6), - - USE_TEST(execute_handler_7), - USE_TEST(continue_execution_7), - USE_TEST(continue_search_4), - USE_TEST(execute_handler_8), - USE_TEST(continue_execution_8), - - USE_TEST(execute_handler_9), - USE_TEST(continue_execution_9), - USE_TEST(continue_search_5), - USE_TEST(execute_handler_10), - USE_TEST(continue_execution_10), - - USE_TEST(execute_handler_11), - USE_TEST(continue_execution_11), - USE_TEST(continue_search_6), - USE_TEST(execute_handler_12), - USE_TEST(continue_execution_12), - - USE_TEST(leave_1), - USE_TEST(leave_2), - USE_TEST(leave_3), - USE_TEST(leave_4), - USE_TEST(leave_5), - USE_TEST(leave_6), - - USE_TEST(yield_1), - USE_TEST(yield_2), - USE_TEST(yield_3), - USE_TEST(yield_4), - USE_TEST(yield_5), - USE_TEST(yield_6), - - USE_TEST(finally_1), - USE_TEST(finally_2), - USE_TEST(finally_3), - USE_TEST(finally_4), - USE_TEST(finally_5), - USE_TEST(finally_6), - USE_TEST(finally_7), - USE_TEST(finally_8), - USE_TEST(finally_9), - USE_TEST(finally_10), - USE_TEST(finally_11), - USE_TEST(finally_12), -#if 0 - USE_TEST(finally_13), - USE_TEST(finally_14), -#endif - - USE_TEST(xpointers_1), - USE_TEST(xpointers_2), - USE_TEST(xpointers_3), - USE_TEST(xpointers_4), - USE_TEST(xpointers_5), - USE_TEST(xpointers_6), - USE_TEST(xpointers_7), - USE_TEST(xpointers_8), - USE_TEST(xpointers_9), - USE_TEST(xpointers_10), - USE_TEST(xpointers_11), - USE_TEST(xpointers_12), - USE_TEST(xpointers_13), - USE_TEST(xpointers_14), - USE_TEST(xpointers_15), - USE_TEST(xpointers_16), - - USE_TEST(xcode_1), - USE_TEST(xcode_2), - USE_TEST(xcode_3), - - USE_TEST(abnorm_1), - USE_TEST(abnorm_2), - USE_TEST(abnorm_3), - USE_TEST(abnorm_4), - USE_TEST(abnorm_5), - USE_TEST(abnorm_6), - USE_TEST(abnorm_7), - USE_TEST(abnorm_8), - - { 0, 0 } -}; - static LONG WINAPI unhandled_exception(PEXCEPTION_POINTERS ExceptionInfo) { @@ -2372,12 +2274,14 @@ void * edi; }; #else -#error TODO +struct volatile_context +{ + int _ignore; +}; #endif -#if defined(__GNUC__) static -__attribute__((noinline)) +DECLSPEC_NOINLINE int sanity_check(int ret, struct volatile_context * before, struct volatile_context * after) { if(ret && memcmp(before, after, sizeof(before))) @@ -2387,17 +2291,16 @@ } static -__attribute__((noinline)) +DECLSPEC_NOINLINE int call_test(int (* func)(void)) { static int ret; + static struct volatile_context before, after; static LPTOP_LEVEL_EXCEPTION_FILTER prev_unhandled_exception; prev_unhandled_exception = SetUnhandledExceptionFilter(&unhandled_exception); -#if defined(__i386__) - static struct volatile_context before, after; - +#if defined(__GNUC__) && defined(__i386__) __asm__ __volatile__ ( "mov %%esp, 0x00 + %c[before]\n" @@ -2423,14 +2326,143 @@ "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" ); #else -#error TODO + ret = func(); #endif SetUnhandledExceptionFilter(prev_unhandled_exception); return ret; } -#else -#error TODO -#endif + +#define USE_TEST_NAME_(NAME_) # NAME_ +#define USE_TEST_NAME(NAME_) USE_TEST_NAME_(NAME_) +#define USE_TEST(NAME_) { USE_TEST_NAME(test_ ## NAME_), test_ ## NAME_ } + +struct subtest +{ + const char * name; + int (* func)(void); +}; + +void testsuite_syntax(void) +{ + const struct subtest testsuite[] = + { + USE_TEST(empty_1), + USE_TEST(empty_2), + USE_TEST(empty_3), + USE_TEST(empty_4), + USE_TEST(empty_5), + USE_TEST(empty_6), + USE_TEST(empty_7), + USE_TEST(empty_8), + + USE_TEST(execute_handler_1), + USE_TEST(continue_execution_1), + USE_TEST(continue_search_1), + USE_TEST(execute_handler_2), + USE_TEST(continue_execution_2), + + USE_TEST(execute_handler_3), + USE_TEST(continue_execution_3), + USE_TEST(continue_search_2), + USE_TEST(execute_handler_4), + USE_TEST(continue_execution_4), + + USE_TEST(execute_handler_5), + USE_TEST(continue_execution_5), + USE_TEST(continue_search_3), + USE_TEST(execute_handler_6), + USE_TEST(continue_execution_6), + + USE_TEST(execute_handler_7), + USE_TEST(continue_execution_7), + USE_TEST(continue_search_4), + USE_TEST(execute_handler_8), + USE_TEST(continue_execution_8), + + USE_TEST(execute_handler_9), + USE_TEST(continue_execution_9), + USE_TEST(continue_search_5), + USE_TEST(execute_handler_10), + USE_TEST(continue_execution_10), + + USE_TEST(execute_handler_11), + USE_TEST(continue_execution_11), + USE_TEST(continue_search_6), + USE_TEST(execute_handler_12), + USE_TEST(continue_execution_12), + + USE_TEST(leave_1), + USE_TEST(leave_2), + USE_TEST(leave_3), + USE_TEST(leave_4), + USE_TEST(leave_5), + USE_TEST(leave_6), + + USE_TEST(yield_1), + USE_TEST(yield_2), + USE_TEST(yield_3), + USE_TEST(yield_4), + USE_TEST(yield_5), + USE_TEST(yield_6), + + USE_TEST(finally_1), + USE_TEST(finally_2), + USE_TEST(finally_3), + USE_TEST(finally_4), + USE_TEST(finally_5), + USE_TEST(finally_6), + USE_TEST(finally_7), + USE_TEST(finally_8), + USE_TEST(finally_9), + USE_TEST(finally_10), + USE_TEST(finally_11), + USE_TEST(finally_12), + #if 0 + USE_TEST(finally_13), + USE_TEST(finally_14), + #endif + + USE_TEST(xpointers_1), + USE_TEST(xpointers_2), + USE_TEST(xpointers_3), + USE_TEST(xpointers_4), + USE_TEST(xpointers_5), + USE_TEST(xpointers_6), + USE_TEST(xpointers_7), + USE_TEST(xpointers_8), + USE_TEST(xpointers_9), + USE_TEST(xpointers_10), + USE_TEST(xpointers_11), + USE_TEST(xpointers_12), + USE_TEST(xpointers_13), + USE_TEST(xpointers_14), + USE_TEST(xpointers_15), + USE_TEST(xpointers_16), + + USE_TEST(xcode_1), + USE_TEST(xcode_2), + USE_TEST(xcode_3), + + USE_TEST(abnorm_1), + USE_TEST(abnorm_2), + USE_TEST(abnorm_3), + USE_TEST(abnorm_4), + USE_TEST(abnorm_5), + USE_TEST(abnorm_6), + USE_TEST(abnorm_7), + USE_TEST(abnorm_8), + }; + + size_t i; + + for(i = 0; i < sizeof(testsuite) / sizeof(testsuite[0]); ++ i) + ok(call_test(testsuite[i].func), "%s failed\n", testsuite[i].name); +} + +const struct test winetest_testlist[] = { + { "pseh2_syntax", testsuite_syntax }, + { 0, 0 } +}; /* EOF */ Modified: trunk/rostests/tests/pseh2/psehtest2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest2.c?r… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest2.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest2.c [iso-8859-1] Wed Dec 24 17:22:04 2008 @@ -1,3 +1,25 @@ +/* + Copyright (c) 2008 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + extern int return_arg(int arg) {

1 0

[hyperion] 38338: The macro fairy left a DECLSPEC_NOINLINE under my pillow
by hyperion＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: hyperion Date: Wed Dec 24 17:18:55 2008 New Revision: 38338 URL: http://svn.reactos.org/svn/reactos?rev=38338&view=rev Log: The macro fairy left a DECLSPEC_NOINLINE under my pillow Modified: trunk/reactos/include/psdk/windef.h Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Wed Dec 24 17:18:55 2008 @@ -141,6 +141,7 @@ #define DECLSPEC_IMPORT __declspec(dllimport) #define DECLSPEC_EXPORT __declspec(dllexport) +#define DECLSPEC_NOINLINE __declspec(noinline) #ifdef __GNUC__ #define DECLSPEC_NORETURN __declspec(noreturn) #define DECLARE_STDCALL_P( type ) __stdcall type

1 0

[jimtabor] 38337: - Someone needs to wine they are using the wrong ACP. They might not care since wine is not an OS but just a hacky add on.
by jimtabor＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: jimtabor Date: Wed Dec 24 17:07:13 2008 New Revision: 38337 URL: http://svn.reactos.org/svn/reactos?rev=38337&view=rev Log: - Someone needs to wine they are using the wrong ACP. They might not care since wine is not an OS but just a hacky add on. Modified: trunk/reactos/dll/win32/wininet/internet.h Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] Wed Dec 24 17:07:13 2008 @@ -52,6 +52,10 @@ #define ioctlsocket ioctl #endif /* __MINGW32__ */ +/* ReactOS-specific definitions */ +#undef CP_UNIXCP +#define CP_UNIXCP CP_THREAD_ACP + /* used for netconnection.c stuff */ typedef struct {

1 0

[jimtabor] 38336: [sginsberg] fixed some warnings.
by jimtabor＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: jimtabor Date: Wed Dec 24 16:58:21 2008 New Revision: 38336 URL: http://svn.reactos.org/svn/reactos?rev=38336&view=rev Log: [sginsberg] fixed some warnings. Modified: trunk/reactos/dll/win32/wininet/internet.h Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] Wed Dec 24 16:58:21 2008 @@ -23,9 +23,6 @@ #ifndef _WINE_INTERNET_H_ #define _WINE_INTERNET_H_ -/* ReactOS-specific definitions */ -#define CP_UNIXCP CP_THREAD_ACP - #ifndef __WINE_CONFIG_H # error You must include config.h to use this header #endif

1 0

[sserapion] 38335: From MSDN "If you are retrieving a pointer or a handle, this function supersedes the GetWindowLong function. To write code that is compatible with both 32-bit and 64-bit versions of Windows, use Get/SetWindowLongPtr."
by sserapion＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: sserapion Date: Wed Dec 24 16:05:17 2008 New Revision: 38335 URL: http://svn.reactos.org/svn/reactos?rev=38335&view=rev Log: >From MSDN "If you are retrieving a pointer or a handle, this function supersedes the GetWindowLong function. To write code that is compatible with both 32-bit and 64-bit versions of Windows, use Get/SetWindowLongPtr." Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/dialogs.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Wed Dec 24 16:05:17 2008 @@ -109,13 +109,13 @@ WCHAR szText[MAX_PATH], szTitle[100], szFilter[100]; OPENFILENAMEW ofn = {0}; - PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLong(hwndDlg, DWLP_USER); + PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); switch(uMsg) { case WM_INITDIALOG: pIconContext = (PPICK_ICON_CONTEXT)lParam; - SetWindowLong(hwndDlg, DWLP_USER, (LONG)pIconContext); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pIconContext); pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH))

1 0

[sserapion] 38334: Re-add telnet since it builds(or will build).
by sserapion＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: sserapion Date: Wed Dec 24 16:01:45 2008 New Revision: 38334 URL: http://svn.reactos.org/svn/reactos?rev=38334&view=rev Log: Re-add telnet since it builds(or will build). Modified: branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild Modified: branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild [iso-8859-1] Wed Dec 24 16:01:45 2008 @@ -28,7 +28,9 @@ <directory name="route"> <xi:include href="route/route.rbuild" /> </directory> - + <directory name="telnet"> + <xi:include href="telnet/telnet.rbuild" /> + </directory> <directory name="tracert"> <xi:include href="tracert/tracert.rbuild" /> </directory>

1 0

[tkreuzer] 38333: #define _alloca() to __builtin_alloca(), that's the only way it will work properly on x64 anyway.
by tkreuzer＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: tkreuzer Date: Wed Dec 24 14:55:01 2008 New Revision: 38333 URL: http://svn.reactos.org/svn/reactos?rev=38333&view=rev Log: #define _alloca() to __builtin_alloca(), that's the only way it will work properly on x64 anyway. Modified: branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Wed Dec 24 14:55:01 2008 @@ -70,6 +70,10 @@ #define _AddressOfReturnAddress() (&(((void **)(__builtin_frame_address(0)))[1])) /* TODO: __getcallerseflags but how??? */ +/* Maybe the same for x86? */ +#ifdef _x86_64 +#define _alloca(s) __builtin_alloca(s) +#endif /*** Atomic operations ***/

1 0

[tkreuzer] 38332: Delete broken _alloca implementation, before someone actually starts using it ; -)
by tkreuzer＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: tkreuzer Date: Wed Dec 24 14:26:23 2008 New Revision: 38332 URL: http://svn.reactos.org/svn/reactos?rev=38332&view=rev Log: Delete broken _alloca implementation, before someone actually starts using it ;-) Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/_alloca.S Removed: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/_alloca.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/_alloca.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/_alloca.S (removed) @@ -1,36 +1,0 @@ -/* stuff needed for libgcc on win32. */ -.intel_syntax noprefix - -/*#ifdef L_chkstk*/ -#ifdef WIN32 - - .global ___chkstk - .global __alloca -___chkstk: -__alloca: - push rcx /* save temp */ - mov rcx, rsp /* get sp */ - add rcx, 8 /* and point to return addr */ - -probe: - cmp rax, 0x1000 /* > 4k ?*/ - jb done - - sub rcx, 0x1000 /* yes, move pointer down 4k*/ - or qword ptr [rcx], 0x0 /* probe there */ - sub rax, 0x1000 /* decrement count */ - jmp probe /* and do it again */ - -done: - sub rcx, rax - or qword ptr [rcx], 0x0 /* less that 4k, just peek here */ - - mov rax, rsp - mov rsp, rcx /* decrement stack */ - - mov rcx, [rax] /* recover saved temp */ - mov rax, [rax + 8]/* get return address */ - jmp [rax] - - -#endif

1 0

[tkreuzer] 38331: Add more IMAGE_SCN_ flags
by tkreuzer＠svn.reactos.org 24 Dec '08

24 Dec '08

Author: tkreuzer Date: Wed Dec 24 12:03:55 2008 New Revision: 38331 URL: http://svn.reactos.org/svn/reactos?rev=38331&view=rev Log: Add more IMAGE_SCN_ flags Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h [iso-8859-1] Wed Dec 24 12:03:55 2008 @@ -14,9 +14,26 @@ #define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 #define IMAGE_SCN_TYPE_NOLOAD 0x00000002 +#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 +#define IMAGE_SCN_CNT_CODE 0x00000020 +#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 +#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 +#define IMAGE_SCN_LNK_OTHER 0x00000100 +#define IMAGE_SCN_LNK_INFO 0x00000200 #define IMAGE_SCN_LNK_REMOVE 0x00000800 +#define IMAGE_SCN_NO_DEFER_SPEC_EXC 0x00004000 +#define IMAGE_SCN_GPREL 0x00008000 +#define IMAGE_SCN_MEM_PURGEABLE 0x00020000 +#define IMAGE_SCN_MEM_LOCKED 0x00040000 +#define IMAGE_SCN_MEM_PRELOAD 0x00080000 +#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 +#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 +#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 +#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 +#define IMAGE_SCN_MEM_SHARED 0x10000000 +#define IMAGE_SCN_MEM_EXECUTE 0x20000000 #define IMAGE_SCN_MEM_READ 0x40000000 -#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 +#define IMAGE_SCN_MEM_WRITE 0x80000000 #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs