Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50492: [PSDK] Include pseh.h not only for gcc
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 18:58:21 2011 New Revision: 50492 URL: http://svn.reactos.org/svn/reactos?rev=50492&view=rev Log: [PSDK] Include pseh.h not only for gcc Modified: branches/cmake-bringup/include/psdk/rpc.h Modified: branches/cmake-bringup/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpc.… ============================================================================== --- branches/cmake-bringup/include/psdk/rpc.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/rpc.h [iso-8859-1] Tue Jan 25 18:58:21 2011 @@ -11,10 +11,8 @@ #endif #endif -#ifdef __GNUC__ #ifndef RC_INVOKED #include <pseh/pseh2.h> -#endif #endif #ifndef __RPC_H__

1 0

[tkreuzer] 50491: [RTL] Add InterlockedBitTestAndSet* defines
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 18:48:26 2011 New Revision: 50491 URL: http://svn.reactos.org/svn/reactos?rev=50491&view=rev Log: [RTL] Add InterlockedBitTestAndSet* defines Modified: branches/cmake-bringup/lib/rtl/rtl.h 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] Tue Jan 25 18:48:26 2011 @@ -39,6 +39,8 @@ #define InterlockedDecrement _InterlockedDecrement #define InterlockedExchangeAdd _InterlockedExchangeAdd #define InterlockedExchange _InterlockedExchange +#define InterlockedBitTestAndSet _interlockedbittestandset +#define InterlockedBitTestAndSet64 _interlockedbittestandset64 #endif #endif /* RTL_H */

1 0

[tkreuzer] 50490: [CMAKE] - Fix mc command - temporary disable optimization settings to prevent warning
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 18:09:29 2011 New Revision: 50490 URL: http://svn.reactos.org/svn/reactos?rev=50490&view=rev Log: [CMAKE] - Fix mc command - temporary disable optimization settings to prevent warning Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=504… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Tue Jan 25 18:09:29 2011 @@ -1,4 +1,5 @@ +if(0) # Fixme redefinition warning if(OPTIMIZE STREQUAL "1") add_definitions(/O1) elseif(OPTIMIZE STREQUAL "2") @@ -9,6 +10,7 @@ add_definitions(/Os /Ox /GS-) elseif(OPTIMIZE STREQUAL "5") add_definitions(/GF /Gy /Ob2 /Os /Ox /GS-) +endif() endif() add_definitions(/GS- /Zl /Zi) @@ -189,7 +191,7 @@ endmacro() macro(macro_mc FILE) - set(COMMAND_MC mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc) + set(COMMAND_MC mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) endmacro() file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)

1 0

[tkreuzer] 50489: [CMAKE] Don't include resources twice in findstr, remove rbuild file
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 17:00:43 2011 New Revision: 50489 URL: http://svn.reactos.org/svn/reactos?rev=50489&view=rev Log: [CMAKE] Don't include resources twice in findstr, remove rbuild file Removed: branches/cmake-bringup/base/applications/findstr/findstr.rbuild Modified: branches/cmake-bringup/base/applications/findstr/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/findstr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/CMakeLists.txt [iso-8859-1] Tue Jan 25 17:00:43 2011 @@ -3,8 +3,7 @@ add_executable(findstr findstr.c - findstr.rc - rsrc.rc) + findstr.rc) set_module_type(findstr win32cui) add_importlibs(findstr user32 msvcrt kernel32) Removed: branches/cmake-bringup/base/applications/findstr/findstr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/findstr/findstr.rbuild [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/findstr/findstr.rbuild (removed) @@ -1,8 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="findstr" type="win32cui" installbase="system32" installname="findstr.exe"> - <library>user32</library> - <file>findstr.c</file> - <file>findstr.rc</file> - <file>rsrc.rc</file> -</module>

1 0

[tkreuzer] 50488: [CMAKE] msc.cmake: fix spec2def invocation, add pseh library, remove set_export_spec
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 16:31:04 2011 New Revision: 50488 URL: http://svn.reactos.org/svn/reactos?rev=50488&view=rev Log: [CMAKE] msc.cmake: fix spec2def invocation, add pseh library, remove set_export_spec Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=504… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Tue Jan 25 16:31:04 2011 @@ -140,7 +140,7 @@ # Generate the asm stub file and the export def file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def - COMMAND native-spec2def --kill-at -r -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND native-spec2def --ms --kill-at -r -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) # Assemble the stub file @@ -181,22 +181,11 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - COMMAND native-spec2def --kill-at -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def --ms --kill-at -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c) -endmacro() - -# Optional 3rd parameter: dllname -macro(set_export_spec _module _spec_file) - get_filename_component(_file ${_spec_file} NAME_WE) - if (${ARGC} GREATER 2) - set(_dllname ${ARGV2}) - else() - set(_dllname ${_file}.dll) - endif() - spec2def(${_dllname} ${_spec_file}) endmacro() macro(macro_mc FILE) @@ -206,5 +195,5 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) #pseh workaround -set(PSEH_LIB "") +set(PSEH_LIB "pseh")

1 0

[tkreuzer] 50487: [CMAKE] Fix spec2def on MSVC builds (added --ms flag)
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 16:28:54 2011 New Revision: 50487 URL: http://svn.reactos.org/svn/reactos?rev=50487&view=rev Log: [CMAKE] Fix spec2def on MSVC builds (added --ms flag) 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] Tue Jan 25 16:28:54 2011 @@ -24,6 +24,7 @@ typedef int (*PFNOUTLINE)(FILE *, EXPORT *); int gbKillAt = 0; int gbUseDeco = 0; +int gbMSComp = 0; int no_redirections = 0; char *pszArchString = "i386"; char *pszArchString2; @@ -305,9 +306,9 @@ int fDeco = (gbUseDeco && !ScanToken(pexp->pcRedirection, '.')); fprintf(fileDest, "="); - PrintName(fileDest, pexp, 1, fDeco); - } - else if (gbUseDeco && gbKillAt && + PrintName(fileDest, pexp, 1, fDeco && !gbMSComp); + } + else if (gbUseDeco && gbKillAt && !gbMSComp && (pexp->nCallingConvention == CC_STDCALL || pexp->nCallingConvention == CC_FASTCALL)) { @@ -624,6 +625,7 @@ " -l=<file> generates an asm lib stub\n" " -d=<file> generates a def file\n" " -s=<file> generates a stub file\n" + " --ms msvc compatibility\n" " -n=<name> name of the dll\n" " --kill-at removes @xx decorations from exports\n" " -r removes redirections from def file\n" @@ -673,6 +675,10 @@ { gbKillAt = 1; } + else if ((strcasecmp(argv[i], "--ms") == 0)) + { + gbMSComp = 1; + } else if ((strcasecmp(argv[i], "-r") == 0)) { no_redirections = 1;

1 0

[tkreuzer] 50486: [CMAKE] On MSVC builds, compile native SEH support into PSEH library. This should be part of the crt, but our crt is too disorganized to handle that. The empty C file is for cmake...
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 16:26:54 2011 New Revision: 50486 URL: http://svn.reactos.org/svn/reactos?rev=50486&view=rev Log: [CMAKE] On MSVC builds, compile native SEH support into PSEH library. This should be part of the crt, but our crt is too disorganized to handle that. The empty C file is for cmake to get the library right. Added: branches/cmake-bringup/lib/pseh/dummy.c (with props) branches/cmake-bringup/lib/pseh/i386/seh.s (with props) branches/cmake-bringup/lib/pseh/i386/seh_prolog.s (with props) Modified: branches/cmake-bringup/lib/pseh/CMakeLists.txt Modified: branches/cmake-bringup/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/pseh/CMakeLis… ============================================================================== --- branches/cmake-bringup/lib/pseh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/pseh/CMakeLists.txt [iso-8859-1] Tue Jan 25 16:26:54 2011 @@ -16,4 +16,14 @@ add_library(pseh ${SOURCE}) add_dependencies(pseh psdk) +else() + + list(APPEND SOURCE + dummy.c + i386/seh.s + i386/seh_prolog.s) + + add_library(pseh ${SOURCE}) + add_dependencies(pseh asm) + endif() Added: branches/cmake-bringup/lib/pseh/dummy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/pseh/dummy.c?… ============================================================================== --- branches/cmake-bringup/lib/pseh/dummy.c (added) +++ branches/cmake-bringup/lib/pseh/dummy.c [iso-8859-1] Tue Jan 25 16:26:54 2011 @@ -1,0 +1,2 @@ + /* intentionally empty file */ + Propchange: branches/cmake-bringup/lib/pseh/dummy.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/pseh/i386/seh.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/pseh/i386/seh… ============================================================================== --- branches/cmake-bringup/lib/pseh/i386/seh.s (added) +++ branches/cmake-bringup/lib/pseh/i386/seh.s [iso-8859-1] Tue Jan 25 16:26:54 2011 @@ -1,0 +1,441 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT + * FILE: lib/crt/misc/i386/seh.S + * PURPOSE: SEH Support for the CRT + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> + +#define DISPOSITION_DISMISS 0 +#define DISPOSITION_CONTINUE_SEARCH 1 +#define DISPOSITION_COLLIDED_UNWIND 3 + +#define EXCEPTION_EXIT_UNWIND 4 +#define EXCEPTION_UNWINDING 2 + + +EXTERN _RtlUnwind@16:PROC + +/* GLOBALS *******************************************************************/ + +PUBLIC __global_unwind2 +PUBLIC __local_unwind2 +PUBLIC __abnormal_termination +PUBLIC __except_handler2 +PUBLIC __except_handler3 + +/* FUNCTIONS *****************************************************************/ + +.code +_unwind_handler: + + /* Check if we were unwinding and continue search if not */ + mov ecx, [esp+4] + test dword ptr [ecx+4], EXCEPTION_EXIT_UNWIND + EXCEPTION_UNWINDING + mov eax, DISPOSITION_CONTINUE_SEARCH + jz unwind_handler_return + + /* We have a collision, do a local unwind */ + mov eax, [esp+20] + push ebp + mov ebp, [eax+16] + mov edx, [eax+40] + push edx + mov edx, [eax+36] + push edx + call __local_unwind2 + add esp, 8 + pop ebp + + /* Set new try level */ + mov eax, [esp+8] + mov edx, [esp+16] + mov [edx], eax + + /* Return collided unwind */ + mov eax, DISPOSITION_COLLIDED_UNWIND + +unwind_handler_return: + ret + + +__global_unwind2: + + /* Create stack and save all registers */ + push ebp + mov ebp, esp + push ebx + push esi + push edi + push ebp + + /* Call unwind */ + push 0 + push 0 + push glu_return + push [ebp+8] + call _RtlUnwind@16 + +glu_return: + /* Restore registers and return */ + pop ebp + pop edi + pop esi + pop ebx + mov esp, ebp + pop ebp + ret + + +__abnormal_termination: + + /* Assume false */ + xor eax, eax + + /* Check if the handler is the unwind handler */ + mov ecx, fs:0 + cmp dword ptr [ecx+4], offset _unwind_handler + jne short ab_return + + /* Get the try level */ + mov edx, [ecx+12] + mov edx, [edx+12] + + /* Compare it */ + cmp [ecx+8], edx + jne ab_return + + /* Return true */ + mov eax, 1 + + /* Return */ +ab_return: + ret + + +__local_unwind2: + + /* Save volatiles */ + push ebx + push esi + push edi + + /* Get the exception registration */ + mov eax, [esp+16] + + /* Setup SEH to protect the unwind */ + push ebp + push eax + push -2 + push offset _unwind_handler + push fs:0 + mov fs:0, esp + +unwind_loop: + /* Get the exception registration and try level */ + mov eax, [esp+36] + mov ebx, [eax+8] + mov esi, [eax+12] + + /* Validate the unwind */ + cmp esi, -1 + je unwind_return + cmp dword ptr [esp+40], -1 + je unwind_ok + cmp esi, [esp+40] + jbe unwind_return + +unwind_ok: + /* Get the new enclosing level and save it */ + lea esi, [esi+esi*2] + mov ecx, [ebx+esi*4] + mov [esp+8], ecx + mov [eax+12], ecx + + /* Check the filter type */ + cmp dword ptr [ebx+esi*4+4], 0 + jnz __NLG_Return2 + + /* FIXME: NLG Notification */ + + /* Call the handler */ + call dword ptr [ebx+esi*4+8] + +__NLG_Return2: + /* Unwind again */ + jmp unwind_loop + +unwind_return: + /* Cleanup SEH */ + pop fs:0 + add esp, 16 + pop edi + pop esi + pop ebx + ret + + +__except_handler2: + + /* Setup stack and save volatiles */ + push ebp + mov ebp, esp + sub esp, 8 + push ebx + push esi + push edi + push ebp + + /* Clear direction flag */ + cld + + /* Get exception registration and record */ + mov ebx, [ebp+12] + mov eax, [ebp+8] + + /* Check if this is an unwind */ + test dword ptr [eax+4], EXCEPTION_EXIT_UNWIND + EXCEPTION_UNWINDING + jnz except_unwind2 + + /* Save exception pointers structure */ + mov [ebp-8], eax + mov eax, [ebp+16] + mov [ebp-4], eax + lea eax, [ebp-8] + mov [ebx+20], eax + + /* Get the try level and scope table */ + mov esi, [ebx+12] + mov edi, [ebx+8] + +except_loop2: + /* Validate try level */ + cmp esi, -1 + je except_search2 + + /* Check if this is the termination handler */ + lea ecx, [esi+esi*2] + cmp dword ptr [edi+ecx*4+4], 0 + jz except_continue2 + + /* Save registers and call filter, then restore them */ + push esi + push ebp + mov ebp, [ebx+16] + call dword ptr [edi+ecx*4+4] + pop ebp + pop esi + + /* Restore ebx and check the result */ + mov ebx, [ebp+12] + or eax, eax + jz except_continue2 + js except_dismiss2 + + /* So this is an accept, call the termination handlers */ + mov edi, [ebx+8] + push ebx + call __global_unwind2 + add esp, 4 + + /* Restore ebp */ + mov ebp, [ebx+16] + + /* Do local unwind */ + push esi + push ebx + call __local_unwind2 + add esp, 8 + + /* Set new try level */ + lea ecx, [esi+esi*2] + mov eax, [edi+ecx*4] + mov [ebx+12], eax + + /* Call except handler */ + call dword ptr [edi+ecx*4+8] + +except_continue2: + /* Reload try level and except again */ + mov edi, [ebx+8] + lea ecx, [esi+esi*2] + mov esi, [edi+ecx*4] + jmp except_loop2 + +except_dismiss2: + /* Dismiss it */ + mov eax, DISPOSITION_DISMISS + jmp except_return2 + +except_search2: + /* Continue searching */ + mov eax, DISPOSITION_CONTINUE_SEARCH + jmp except_return2 + + /* Do local unwind */ +except_unwind2: + push ebp + mov ebp, [ebx+16] + push -1 + push ebx + call __local_unwind2 + add esp, 8 + + /* Retore EBP and set return disposition */ + pop ebp + mov eax, DISPOSITION_CONTINUE_SEARCH + +except_return2: + /* Restore registers and stack */ + pop ebp + pop edi + pop esi + pop ebx + mov esp, ebp + pop ebp + ret + + +__except_handler3: + + /* Setup stack and save volatiles */ + push ebp + mov ebp, esp + sub esp, 8 + push ebx + push esi + push edi + push ebp + + /* Clear direction flag */ + cld + + /* Get exception registration and record */ + mov ebx, [ebp+12] + mov eax, [ebp+8] + + /* Check if this is an unwind */ + test dword ptr [eax+4], EXCEPTION_EXIT_UNWIND + EXCEPTION_UNWINDING + jnz except_unwind3 + + /* Save exception pointers structure */ + mov [ebp-8], eax + mov eax, [ebp+16] + mov [ebp-4], eax + lea eax, [ebp-8] + mov [ebx-4], eax + + /* Get the try level and scope table */ + mov esi, [ebx+12] + mov edi, [ebx+8] + + /* FIXME: Validate the SEH exception */ + +except_loop3: + /* Validate try level */ + cmp esi, -1 + je except_search3 + + /* Check if this is the termination handler */ + lea ecx, [esi+esi*2] + mov eax, [edi+ecx*4+4] + or eax, eax + jz except_continue3 + + /* Save registers clear them all */ + push esi + push ebp + lea ebp, [ebx+16] + xor ebx, ebx + xor ecx, ecx + xor edx, edx + xor esi, esi + xor edi, edi + + /* Call the filter and restore our registers */ + call eax + pop ebp + pop esi + + /* Restore ebx and check the result */ + mov ebx, [ebp+12] + or eax, eax + jz except_continue3 + js except_dismiss3 + + /* So this is an accept, call the termination handlers */ + mov edi, [ebx+8] + push ebx + call __global_unwind2 + add esp, 4 + + /* Restore ebp */ + lea ebp, [ebx+16] + + /* Do local unwind */ + push esi + push ebx + call __local_unwind2 + add esp, 8 + + /* FIXME: Do NLG Notification */ + + /* Set new try level */ + lea ecx, [esi+esi*2] + mov eax, [edi+ecx*4] + mov [ebx+12], eax + + /* Clear registers and call except handler */ + mov eax, [edi+ecx*4+8] + xor ebx, ebx + xor ecx, ecx + xor edx, edx + xor esi, esi + xor edi, edi + call eax + +except_continue3: + /* Reload try level and except again */ + mov edi, [ebx+8] + lea ecx, [esi+esi*2] + mov esi, [edi+ecx*4] + jmp except_loop3 + +except_dismiss3: + /* Dismiss it */ + mov eax, DISPOSITION_DISMISS + jmp except_return3 + +except_search3: + /* Continue searching */ + mov eax, DISPOSITION_CONTINUE_SEARCH + jmp except_return3 + + /* Do local unwind */ +except_unwind3: + push ebp + mov ebp, [ebx+16] + push -1 + push ebx + call __local_unwind2 + add esp, 8 + + /* Retore EBP and set return disposition */ + pop ebp + mov eax, DISPOSITION_CONTINUE_SEARCH + +except_return3: + /* Restore registers and stack */ + pop ebp + pop edi + pop esi + pop ebx + mov esp, ebp + pop ebp + ret + +END Propchange: branches/cmake-bringup/lib/pseh/i386/seh.s ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/pseh/i386/seh_prolog.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/pseh/i386/seh… ============================================================================== --- branches/cmake-bringup/lib/pseh/i386/seh_prolog.s (added) +++ branches/cmake-bringup/lib/pseh/i386/seh_prolog.s [iso-8859-1] Tue Jan 25 16:26:54 2011 @@ -1,0 +1,152 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS CRT + * FILE: lib/crt/misc/i386/seh_prolog.S + * PURPOSE: SEH Support for MSVC + * PROGRAMMERS: Timo Kreuzer + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> + +EXTERN __except_handler3:PROC + +/* The very first thing a function compiled with MSVC containing SEH + * will do is call __SEH_prolog like this: + * + * push <Number of stackbytes> + * push <Address of exception handler> + * call __SEH_prolog + * + * When entering the function the stack layout is like this: + * + * esp + 08: OLDFRAME.StackBytes + * esp + 04: OLDFRAME.SEHTable + * esp + 00: OLDFRAME.ReturnAddress + * + * __SEH_prolog will now setup the stack to the following layout: + * + * esp + N + 24: SEH_FRAME.OriginalEbp OLDFRAME.StackBytes + * esp + N + 20: SEH_FRAME.Disable OLDFRAME.SEHTable + * esp + N + 1C: SEH_FRAME.SEHTable OLDFRAME.ReturnAddress + * esp + N + 18: SEH_FRAME.Handler + * esp + N + 14: SEH_FRAME.PreviousRecord + * esp + N + 10: SEH_FRAME.unused + * esp + N + 0c: SEH_FRAME.NewEsp + * + * N bytes local variables + * ... + * esp + 08: SAFE_AREA.Ebx + * esp + 04: SAFE_AREA.Esi + * esp + 00: SAFE_AREA.Edi + * + * all this is documented here (with some minor errors): + * http://reactos-blog.blogspot.com/2009/08/inside-mind-of-reactos-developer.h… + */ + +OLDFRAME_ReturnAddress = 0 /* 0x00 */ +OLDFRAME_SEHTable = 4 /* 0x04 */ +OLDFRAME_StackBytes = 8 /* 0x08 */ +OLDFRAME_Size = 12 /* 0x0c */ + +SEH_FRAME_NewEsp = 0 /* 0x00 */ +SEH_FRAME_unused = 4 /* 0x04 */ +SEH_FRAME_PreviousRecord = 8 /* 0x08 */ +SEH_FRAME_Handler = 12 /* 0x0c */ +SEH_FRAME_SEHTable = 16 /* 0x10 */ +SEH_FRAME_Disable = 20 /* 0x14 */ +SEH_FRAME_OriginalEbp = 24 /* 0x18 */ +SEH_FRAME_Size = 28 /* 0x1c */ + +SAFE_AREA_Edi = 0 /* 0x00 */ +SAFE_AREA_Esi = 4 /* 0x04 */ +SAFE_AREA_Ebx = 8 /* 0x08 */ +SAFE_AREA_Size = 12 /* 0x0c */ + + +.code + +PUBLIC __SEH_prolog +__SEH_prolog: + + /* Get the number of stack bytes to reserve */ + mov eax, [esp + OLDFRAME_StackBytes] + + /* Push address of __except_handler3 on the stack */ + push offset __except_handler3 + + /* Push the old exception record on the stack */ + push dword ptr fs:0 + + /* Adjust stack allocation, add size of the stack frame minus 2 pushes */ + add eax, SEH_FRAME_Size + SAFE_AREA_Size - OLDFRAME_Size - 8 + + /* Save old ebp, overwriting OLDFRAME.StackBytes */ + mov [esp + 8 + OLDFRAME_StackBytes], ebp + + /* Load new ebp, pointing to OLDFRAME.StackBytes */ + lea ebp, [esp + 8 + OLDFRAME_StackBytes] + + /* Allocate stack space */ + sub esp, eax + + /* Push the return address on the stack */ + push dword ptr [ebp - OLDFRAME_StackBytes + OLDFRAME_ReturnAddress] + + /* Get address of the SEH table */ + mov eax, [ebp + OLDFRAME_SEHTable] + + /* Save new esp */ + mov [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_NewEsp], esp + + /* Safe SEH table, overwriting OLDFRAME.ReturnAddress */ + mov [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_SEHTable], eax + + /* Safe the disable value, overwriting OLDFRAME.SEHTable */ + mov dword ptr [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_Disable], -1 + + /* Load the address of the new registration record */ + lea eax, [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_PreviousRecord] + + /* Save registers */ + mov [esp + SAFE_AREA_Edi], edi + mov [esp + SAFE_AREA_Esi], esi + mov [esp + SAFE_AREA_Ebx], ebx + + /* Enqueue the new record */ + mov fs:[0], eax + + /* Return to the caller */ + ret + + +PUBLIC __SEH_epilog +__SEH_epilog: + + /* Restore the previous exception registration record */ + mov ecx, [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_PreviousRecord] + mov fs:[0], ecx + + /* Restore saved registers */ + mov edi, [esp + 4 + SAFE_AREA_Edi] + mov esi, [esp + 4 + SAFE_AREA_Esi] + mov ebx, [esp + 4 + SAFE_AREA_Ebx] + + /* Get the return address */ + mov ecx, [esp] + + /* Clean up stack */ + mov esp, ebp + + /* Get previous ebp */ + mov ebp, [esp] + + /* Save return address */ + mov [esp], ecx + + /* Return to the caller */ + ret + + +END Propchange: branches/cmake-bringup/lib/pseh/i386/seh_prolog.s ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 50485: [KERNEL32] Escape some characters in nls files for MSVC compatibility
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 14:40:32 2011 New Revision: 50485 URL: http://svn.reactos.org/svn/reactos?rev=50485&view=rev Log: [KERNEL32] Escape some characters in nls files for MSVC compatibility Modified: branches/cmake-bringup/dll/win32/kernel32/nls/azl.nls branches/cmake-bringup/dll/win32/kernel32/nls/far.nls branches/cmake-bringup/dll/win32/kernel32/nls/fos.nls Modified: branches/cmake-bringup/dll/win32/kernel32/nls/azl.nls URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/nls/azl.nls [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/nls/azl.nls [iso-8859-1] Tue Jan 25 14:40:32 2011 @@ -68,7 +68,7 @@ LOCALE_SABBREVDAYNAME3 "\x00c7" LOCALE_SABBREVDAYNAME4 "Ca" LOCALE_SABBREVDAYNAME5 "C" - LOCALE_SABBREVDAYNAME6 "Þ" + LOCALE_SABBREVDAYNAME6 "\x00de" LOCALE_SABBREVDAYNAME7 "B" LOCALE_SABBREVLANGNAME "AZE" LOCALE_SABBREVMONTHNAME1 "Yan" @@ -112,8 +112,8 @@ LOCALE_SMONTHNAME3 "Mart" LOCALE_SMONTHNAME4 "Aprel" LOCALE_SMONTHNAME5 "May" - LOCALE_SMONTHNAME6 "Ýyun" - LOCALE_SMONTHNAME7 "Ýyul" + LOCALE_SMONTHNAME6 "\x00ddyun" + LOCALE_SMONTHNAME7 "\x00ddyul" LOCALE_SMONTHNAME8 "Avgust" LOCALE_SMONTHNAME9 "Sentyabr" LOCALE_SMONTHNAME10 "Oktyabr" Modified: branches/cmake-bringup/dll/win32/kernel32/nls/far.nls URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/nls/far.nls [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/nls/far.nls [iso-8859-1] Tue Jan 25 14:40:32 2011 @@ -60,8 +60,8 @@ LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1" - LOCALE_S1159 "\x00DE.Ù" - LOCALE_S2359 "\x00C8.Ù" + LOCALE_S1159 "\x00DE.\x00D9" + LOCALE_S2359 "\x00C8.\x00D9" LOCALE_SABBREVCTRYNAME "IRN" LOCALE_SABBREVDAYNAME1 "\x00CF\x00E6\x00D4\x00E4\x00C8\x00E5" LOCALE_SABBREVDAYNAME2 "\x00D3\x00E5\x00A0\x00D4\x00E4\x00C8\x00E5" Modified: branches/cmake-bringup/dll/win32/kernel32/nls/fos.nls URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/nls/fos.nls [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/nls/fos.nls [iso-8859-1] Tue Jan 25 14:40:32 2011 @@ -110,7 +110,7 @@ LOCALE_SMONTHNAME1 "januar" LOCALE_SMONTHNAME2 "februar" LOCALE_SMONTHNAME3 "mars" - LOCALE_SMONTHNAME4 "apríl" + LOCALE_SMONTHNAME4 "apr\x00EDl" LOCALE_SMONTHNAME5 "mai" LOCALE_SMONTHNAME6 "juni" LOCALE_SMONTHNAME7 "juli" @@ -148,7 +148,7 @@ LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian"

1 0

[tkreuzer] 50484: [CMAKE] Fix return type of NdrClientCall*
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 11:55:45 2011 New Revision: 50484 URL: http://svn.reactos.org/svn/reactos?rev=50484&view=rev Log: [CMAKE] Fix return type of NdrClientCall* Modified: branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c branches/cmake-bringup/include/psdk/rpcndr.h Modified: branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c [iso-8859-1] Tue Jan 25 11:55:45 2011 @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * + * * TODO: Handle non-i386 architectures */ @@ -96,7 +96,7 @@ args[0] = *(const WORD*)(fs + 8); TRACE("(%p)->(%d)([%d bytes]) ret=%08x\n", iface, index, args[0], args[1]); - return NdrClientCall2(stubless->pStubDesc, fs, args + 2); + return NdrClientCall2(stubless->pStubDesc, fs, args + 2).Simple; } #define BLOCK_SIZE 1024 Modified: branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] Tue Jan 25 11:55:45 2011 @@ -510,7 +510,7 @@ } else { - const NDR_PARAM_OI_OTHER *pParamOther = + const NDR_PARAM_OI_OTHER *pParamOther = (const NDR_PARAM_OI_OTHER *)&pFormat[current_offset]; const unsigned char *pTypeFormat = @@ -548,10 +548,7 @@ } } -/* the return type should be CLIENT_CALL_RETURN, but this is incompatible - * with the way gcc returns structures. "void *" should be the largest type - * that MIDL should allow you to return anyway */ -LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, ...) +CLIENT_CALL_RETURN WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, ...) { /* pointer to start of stack where arguments start */ RPC_MESSAGE rpcMsg; @@ -574,7 +571,7 @@ /* -Oif or -Oicf generated format */ BOOL bV2Format = FALSE; /* the value to return to the client from the remote procedure */ - LONG_PTR RetVal = 0; + CLIENT_CALL_RETURN RetVal = {0}; /* the pointer to the object when in OLE mode */ void * This = NULL; PFORMAT_STRING pHandleFormat; @@ -630,7 +627,7 @@ if (!(pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)) { pFormat = client_get_handle(&stubMsg, pProcHeader, pHandleFormat, &hBinding); - if (!pFormat) return 0; + if (!pFormat) return RetVal; } bV2Format = (pStubDesc->Version >= 0x20000); @@ -729,7 +726,7 @@ } __EXCEPT_ALL { - RetVal = NdrProxyErrorHandler(GetExceptionCode()); + RetVal.Simple = NdrProxyErrorHandler(GetExceptionCode()); } __ENDTRY } @@ -830,7 +827,7 @@ client_free_handle(&stubMsg, pProcHeader, pHandleFormat, hBinding); } - TRACE("RetVal = 0x%lx\n", RetVal); + TRACE("RetVal = 0x%p\n", RetVal.Pointer); return RetVal; } @@ -1465,7 +1462,7 @@ pRpcMsg->BufferLength = stubMsg.BufferLength; /* allocate buffer for [out] and [ret] params */ - Status = I_RpcGetBuffer(pRpcMsg); + Status = I_RpcGetBuffer(pRpcMsg); if (Status) RpcRaiseException(Status); stubMsg.Buffer = pRpcMsg->Buffer; Modified: branches/cmake-bringup/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpcn… ============================================================================== --- branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] Tue Jan 25 11:55:45 2011 @@ -650,15 +650,13 @@ RPCRTAPI unsigned char* RPC_ENTRY NdrUserMarshalSimpleTypeConvert( ULONG *pFlags, unsigned char *pBuffer, unsigned char FormatChar ); -/* Note: this should return a CLIENT_CALL_RETURN, but calling convention for - * returning structures/unions is different between Windows and gcc on i386. */ -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall2( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrDcomAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); RPCRTAPI void RPC_ENTRY

1 0

[tkreuzer] 50483: [CRT] Implement __SEH_epilog
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 09:33:37 2011 New Revision: 50483 URL: http://svn.reactos.org/svn/reactos?rev=50483&view=rev Log: [CRT] Implement __SEH_epilog Modified: branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s Modified: branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s [iso-8859-1] Tue Jan 25 09:33:37 2011 @@ -103,16 +103,16 @@ /* Safe SEH table, overwriting OLDFRAME.ReturnAddress */ mov [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_SEHTable], eax + /* Safe the disable value, overwriting OLDFRAME.SEHTable */ + mov dword ptr [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_Disable], -1 + + /* Load the address of the new registration record */ + lea eax, [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_PreviousRecord] + /* Save registers */ mov [esp + SAFE_AREA_Edi], edi mov [esp + SAFE_AREA_Esi], esi mov [esp + SAFE_AREA_Ebx], ebx - - /* Load the address of the new registration record */ - lea eax, [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_PreviousRecord] - - /* Safe the disable value, overwriting OLDFRAME.SEHTable */ - mov dword ptr [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_Disable], -1 /* Enqueue the new record */ mov fs:[0], eax @@ -120,4 +120,33 @@ /* Return to the caller */ ret + +PUBLIC __SEH_epilog +__SEH_epilog: + + /* Restore the previous exception registration record */ + mov ecx, [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_PreviousRecord] + mov fs:[0], ecx + + /* Restore saved registers */ + mov edi, [esp + 4 + SAFE_AREA_Edi] + mov esi, [esp + 4 + SAFE_AREA_Esi] + mov ebx, [esp + 4 + SAFE_AREA_Ebx] + + /* Get the return address */ + mov ecx, [esp] + + /* Clean up stack */ + mov esp, ebp + + /* Get previous ebp */ + mov ebp, [esp] + + /* Save return address */ + mov [esp], ecx + + /* Return to the caller */ + ret + + END

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