Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[janderwald] 47774: [BDAPLGIN, MSDVBNP, MSVIDCTL, BDASUP] - Disable building dvb stack untill ks has the required functionality
by janderwald＠svn.reactos.org 13 Jun '10

13 Jun '10

Author: janderwald Date: Sun Jun 13 13:08:15 2010 New Revision: 47774 URL: http://svn.reactos.org/svn/reactos?rev=47774&view=rev Log: [BDAPLGIN, MSDVBNP, MSVIDCTL, BDASUP] - Disable building dvb stack untill ks has the required functionality Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/directx/directx.rbuild trunk/reactos/drivers/multimedia/directory.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Jun 13 13:08:15 2010 @@ -150,7 +150,7 @@ ;dll\cpl\usrmgr\usrmgr.cpl 1 dll\directx\amstream\amstream.dll 1 -dll\directx\bdaplgin\bdaplgin.ax 1 +;dll\directx\bdaplgin\bdaplgin.ax 1 dll\directx\dinput\dinput.dll 1 dll\directx\dinput8\dinput8.dll 1 dll\directx\dmusic\dmusic.dll 1 @@ -164,8 +164,8 @@ dll\directx\ksproxy\ksproxy.ax 1 dll\directx\ksuser\ksuser.dll 1 dll\directx\msdmo\msdmo.dll 1 -dll\directx\msdvbnp\msdvbnp.ax 1 -dll\directx\msvidctl\msvidctl.dll 1 +;dll\directx\msdvbnp\msdvbnp.ax 1 +;dll\directx\msvidctl\msvidctl.dll 1 dll\directx\quartz\quartz.dll 1 dll\directx\qedit\qedit.dll 1 dll\directx\wine\d3d8\d3d8.dll 1 @@ -504,7 +504,7 @@ drivers\input\sermouse\sermouse.sys 2 drivers\ksfilter\ks\ks.sys 2 -drivers\multimedia\bdasup\bdasup.sys 2 +;drivers\multimedia\bdasup\bdasup.sys 2 drivers\network\afd\afd.sys 2 drivers\network\ndis\ndis.sys 2 Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… ============================================================================== --- trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] Sun Jun 13 13:08:15 2010 @@ -4,9 +4,9 @@ <directory name="amstream"> <xi:include href="amstream/amstream.rbuild" /> </directory> - <directory name="bdaplgin"> +  <directory name="d3d8thk"> <xi:include href="d3d8thk/d3d8thk.rbuild" /> </directory> @@ -43,12 +43,12 @@ <directory name="msdmo"> <xi:include href="msdmo/msdmo.rbuild" /> </directory> - <directory name="msdvbnp"> +  +  <directory name="qedit"> <xi:include href="qedit/qedit.rbuild" /> </directory> Modified: trunk/reactos/drivers/multimedia/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/directo… ============================================================================== --- trunk/reactos/drivers/multimedia/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/directory.rbuild [iso-8859-1] Sun Jun 13 13:08:15 2010 @@ -4,7 +4,7 @@ <directory name="audio"> <xi:include href="audio/directory.rbuild" /> </directory> - <directory name="bdasup"> +  </group>

1 0

[janderwald] 47773: [SNDBLST_SYS] - Disable building
by janderwald＠svn.reactos.org 13 Jun '10

13 Jun '10

Author: janderwald Date: Sun Jun 13 12:54:16 2010 New Revision: 47773 URL: http://svn.reactos.org/svn/reactos?rev=47773&view=rev Log: [SNDBLST_SYS] - Disable building Modified: trunk/reactos/drivers/multimedia/audio/directory.rbuild Modified: trunk/reactos/drivers/multimedia/audio/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/d… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/directory.rbuild [iso-8859-1] Sun Jun 13 12:54:16 2010 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="sndblst_sys"> +  <!--directory name="mpu401_nt4"> <xi:include href="mpu401_nt4/mpu401.rbuild" /> </directory>

1 0

[janderwald] 47772: [DRIVERS] - Disable building of SWENUM, MPU401, CMIDriver, SPLITTER, STREAM to reduce build time - Those modules are either unused or don't work yet due to missing functionality
by janderwald＠svn.reactos.org 13 Jun '10

13 Jun '10

Author: janderwald Date: Sun Jun 13 12:49:04 2010 New Revision: 47772 URL: http://svn.reactos.org/svn/reactos?rev=47772&view=rev Log: [DRIVERS] - Disable building of SWENUM, MPU401, CMIDriver, SPLITTER, STREAM to reduce build time - Those modules are either unused or don't work yet due to missing functionality Modified: trunk/reactos/drivers/ksfilter/directory.rbuild trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild trunk/reactos/drivers/wdm/audio/filters/directory.rbuild trunk/reactos/drivers/wdm/audio/legacy/directory.rbuild Modified: trunk/reactos/drivers/ksfilter/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/directory… ============================================================================== --- trunk/reactos/drivers/ksfilter/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/directory.rbuild [iso-8859-1] Sun Jun 13 12:49:04 2010 @@ -4,8 +4,8 @@ <directory name="ks"> <xi:include href="ks/ks.rbuild" /> </directory> - <directory name="swenum"> +  </group> Modified: trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild [iso-8859-1] Sun Jun 13 12:49:04 2010 @@ -1,13 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="mpu401"> +  +   Modified: trunk/reactos/drivers/wdm/audio/filters/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/directory.rbuild [iso-8859-1] Sun Jun 13 12:49:04 2010 @@ -4,7 +4,7 @@ <directory name="kmixer"> <xi:include href="kmixer/kmixer.rbuild" /> </directory> - <directory name="splitter"> +  </group> Modified: trunk/reactos/drivers/wdm/audio/legacy/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/d… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/directory.rbuild [iso-8859-1] Sun Jun 13 12:49:04 2010 @@ -4,8 +4,7 @@ <directory name="wdmaud"> <xi:include href="wdmaud/wdmaud.rbuild" /> </directory> - <directory name="stream"> +  </group>

1 0

[tkreuzer] 47771: Add missing file
by tkreuzer＠svn.reactos.org 13 Jun '10

13 Jun '10

Author: tkreuzer Date: Sun Jun 13 01:32:13 2010 New Revision: 47771 URL: http://svn.reactos.org/svn/reactos?rev=47771&view=rev Log: Add missing file Added: trunk/reactos/lib/sdk/crt/include/internal/safecrt.h (with props) Added: trunk/reactos/lib/sdk/crt/include/internal/safecrt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/safecrt.h (added) +++ trunk/reactos/lib/sdk/crt/include/internal/safecrt.h [iso-8859-1] Sun Jun 13 01:32:13 2010 @@ -1,0 +1,10 @@ + +extern void * __pInvalidArgHandler; + +void _invalid_parameter( + const wchar_t * expression, + const wchar_t * function, + const wchar_t * file, + unsigned int line, + uintptr_t pReserved); + Propchange: trunk/reactos/lib/sdk/crt/include/internal/safecrt.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 47770: [CRT] - CRT update part 1/x - sync C++ / exception related CRT code with wine - add support for non-underscored symbols - Patch by Samuel Serapion, slightly modified by me
by tkreuzer＠svn.reactos.org 13 Jun '10

13 Jun '10

Author: tkreuzer Date: Sun Jun 13 01:24:42 2010 New Revision: 47770 URL: http://svn.reactos.org/svn/reactos?rev=47770&view=rev Log: [CRT] - CRT update part 1/x - sync C++ / exception related CRT code with wine - add support for non-underscored symbols - Patch by Samuel Serapion, slightly modified by me Added: trunk/reactos/lib/sdk/crt/except/except.c (with props) Modified: trunk/reactos/ReactOS-amd64.rbuild trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/exception.h trunk/reactos/include/reactos/wine/windef16.h trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/except/amd64/seh.s trunk/reactos/lib/sdk/crt/except/cpp.c trunk/reactos/lib/sdk/crt/except/cppexcept.c trunk/reactos/lib/sdk/crt/except/xcptfil.c trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h trunk/reactos/lib/sdk/crt/precomp.h Modified: trunk/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-amd64.rbuild?rev=4… ============================================================================== --- trunk/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sun Jun 13 01:24:42 2010 @@ -18,6 +18,7 @@ <define name="TARGET_amd64" host="true" /> <define name="USE_COMPILER_EXCEPTIONS" /> + <define name ="NO_UNDERSCORE_PREFIX" /> <property name="PLATFORM" value="PC"/> <property name="usewrc" value="false"/> Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Sun Jun 13 01:24:42 2010 @@ -988,7 +988,11 @@ #define __ASM_CFI(str) str /* Define to a macro to define an assembly function */ +#ifndef NO_UNDERSCORE_PREFIX #define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl _" #name suffix "\n\t.def _" #name suffix "; .scl 2; .type 32; .endef\n_" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); +#else +#define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl " #name suffix "\n\t.def " #name suffix "; .scl 2; .type 32; .endef\n" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); +#endif /* Define to a macro to generate an assembly function directive */ #define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef" @@ -998,7 +1002,11 @@ #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(name,"",code) /* Define to a macro to generate an assembly name from a C symbol */ +#ifndef NO_UNDERSCORE_PREFIX #define __ASM_NAME(name) "_" name +#else +#define __ASM_NAME(name) name +#endif /* Define to a macro to generate an stdcall suffix */ #define __ASM_STDCALL(args) "@" #args Modified: trunk/reactos/include/reactos/wine/exception.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/excep… ============================================================================== --- trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] Sun Jun 13 01:24:42 2010 @@ -1,6 +1,7 @@ #ifndef __WINE_WINE_EXCEPTION_H #define __WINE_WINE_EXCEPTION_H +#include <setjmp.h> #include <intrin.h> #include <pseh/pseh2.h> #include <pseh/excpt.h> @@ -9,6 +10,21 @@ extern "C" { #endif +/* Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD */ +#define EH_NONCONTINUABLE 0x01 +#define EH_UNWINDING 0x02 +#define EH_EXIT_UNWIND 0x04 +#define EH_STACK_INVALID 0x08 +#define EH_NESTED_CALL 0x10 + +#define EXCEPTION_WINE_STUB 0x80000100 +#define EXCEPTION_WINE_ASSERTION 0x80000101 + +#define EXCEPTION_VM86_INTx 0x80000110 +#define EXCEPTION_VM86_STI 0x80000111 +#define EXCEPTION_VM86_PICRETURN 0x80000112 + +#ifndef _RTLTYPES_H typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER) (struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*); @@ -20,6 +36,17 @@ struct _EXCEPTION_REGISTRATION_RECORD * Prev; PEXCEPTION_HANDLER Handler; }; +#else +typedef struct _WINE_EXCEPTION_REGISTRATION_RECORD +{ + PVOID Prev; + PEXCEPTION_ROUTINE Handler; +} WINE_EXCEPTION_REGISTRATION_RECORD, *PWINE_EXCEPTION_REGISTRATION_RECORD; + +#define _EXCEPTION_REGISTRATION_RECORD _WINE_EXCEPTION_REGISTRATION_RECORD +#define EXCEPTION_REGISTRATION_RECORD WINE_EXCEPTION_REGISTRATION_RECORD +#define PEXCEPTION_REGISTRATION_RECORD PWINE_EXCEPTION_REGISTRATION_RECORD +#endif #define __TRY _SEH2_TRY #define __EXCEPT(func) _SEH2_EXCEPT(func(_SEH2_GetExceptionInformation())) @@ -40,31 +67,38 @@ #define AbnormalTermination() _SEH2_AbnormalTermination() #endif -/* Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD */ -#define EH_NONCONTINUABLE 0x01 -#define EH_UNWINDING 0x02 -#define EH_EXIT_UNWIND 0x04 -#define EH_STACK_INVALID 0x08 -#define EH_NESTED_CALL 0x10 -#define EXCEPTION_WINE_STUB 0x80000100 -#define EXCEPTION_WINE_ASSERTION 0x80000101 - -#define EXCEPTION_VM86_INTx 0x80000110 -#define EXCEPTION_VM86_STI 0x80000111 -#define EXCEPTION_VM86_PICRETURN 0x80000112 +#if defined(__MINGW32__) || defined(__CYGWIN__) +#define sigjmp_buf jmp_buf +#define sigsetjmp(buf,sigs) setjmp(buf) +#define siglongjmp(buf,val) longjmp(buf,val) +#endif static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { +#ifdef __i386__ frame->Prev = (struct _EXCEPTION_REGISTRATION_RECORD *)__readfsdword(0); __writefsdword(0, (unsigned long)frame); return frame->Prev; +#else + NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); + frame->Prev = teb->ExceptionList; + teb->ExceptionList = frame; + return frame->Prev; +#endif } static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { +#ifdef __i386__ __writefsdword(0, (unsigned long)frame->Prev); return frame->Prev; +#else + NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); + frame->Prev = teb->ExceptionList; + teb->ExceptionList = frame; + return frame->Prev; +#endif } extern void __wine_enter_vm86( CONTEXT *context ); Modified: trunk/reactos/include/reactos/wine/windef16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winde… ============================================================================== --- trunk/reactos/include/reactos/wine/windef16.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/windef16.h [iso-8859-1] Sun Jun 13 01:24:42 2010 @@ -28,7 +28,7 @@ #endif #include <windef.h> #include <winbase.h> -#include <exception.h> // ROS Hack +#include <wine/exception.h> /* Standard data types */ typedef unsigned short BOOL16; Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sun Jun 13 01:24:42 2010 @@ -56,6 +56,7 @@ <file>checkesp.c</file> <file>cpp.c</file> <file>cppexcept.c</file> + <file>except.c</file> <file>matherr.c</file> <if property="ARCH" value="i386"> <directory name="i386"> Modified: trunk/reactos/lib/sdk/crt/except/amd64/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/s… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] Sun Jun 13 01:24:42 2010 @@ -17,11 +17,11 @@ /* GLOBALS *******************************************************************/ -.globl __global_unwind2 -.globl __local_unwind2 -.globl __abnormal_termination -.globl __except_handler2 -.globl __except_handler3 +.globl _global_unwind2 +.globl _local_unwind2 +.globl _abnormal_termination +.globl _except_handler2 +.globl _except_handler3 /* FUNCTIONS *****************************************************************/ @@ -31,26 +31,26 @@ .endfunc .func _global_unwind2 -__global_unwind2: +_global_unwind2: ret .endfunc .func _abnormal_termination -__abnormal_termination: +_abnormal_termination: ret .endfunc .func _local_unwind2 -__local_unwind2: +_local_unwind2: ret .endfunc .func _except_handler2 -__except_handler2: +_except_handler2: ret .endfunc .func _except_handler3 -__except_handler3: +_except_handler3: ret .endfunc Modified: trunk/reactos/lib/sdk/crt/except/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cpp.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] Sun Jun 13 01:24:42 2010 @@ -21,6 +21,7 @@ #include <precomp.h> +#include <wine/exception.h> #include <internal/wine/msvcrt.h> #include <internal/wine/cppexcept.h> @@ -62,18 +63,18 @@ #define THISCALL(func) __thiscall_ ## func #define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) -#define DEFINE_THISCALL_WRAPPER(func) \ - extern void THISCALL(func)(); \ +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void THISCALL(func)(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) ) + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) #else /* __i386__ */ #define THISCALL(func) func #define THISCALL_NAME(func) __ASM_NAME(#func) -#define DEFINE_THISCALL_WRAPPER(func) /* nothing */ +#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ #endif /* __i386__ */ @@ -125,7 +126,7 @@ _this->vtable = &MSVCRT_exception_vtable; if (*name) { - size_t name_len = strlen(*name) + 1; + unsigned int name_len = strlen(*name) + 1; _this->name = MSVCRT_malloc(name_len); memcpy(_this->name, *name, name_len); _this->do_free = TRUE; @@ -140,7 +141,7 @@ /****************************************************************** * ??0exception@@QAE@ABQBD@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_exception_ctor) +DEFINE_THISCALL_WRAPPER(MSVCRT_exception_ctor,8) exception * __stdcall MSVCRT_exception_ctor(exception * _this, const char ** name) { TRACE("(%p,%s)\n", _this, *name); @@ -149,9 +150,22 @@ } /****************************************************************** + * ??0exception@@QAE@ABQBDH@Z (MSVCRT.@) + */ +DEFINE_THISCALL_WRAPPER(MSVCRT_exception_ctor_noalloc,12) +exception * __stdcall MSVCRT_exception_ctor_noalloc(exception * _this, char ** name, int noalloc) +{ + TRACE("(%p,%s)\n", _this, *name); + _this->vtable = &MSVCRT_exception_vtable; + _this->name = *name; + _this->do_free = FALSE; + return _this; +} + +/****************************************************************** * ??0exception@@QAE@ABV0@@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_exception_copy_ctor) +DEFINE_THISCALL_WRAPPER(MSVCRT_exception_copy_ctor,8) exception * __stdcall MSVCRT_exception_copy_ctor(exception * _this, const exception * rhs) { TRACE("(%p,%p)\n", _this, rhs); @@ -171,7 +185,7 @@ /****************************************************************** * ??0exception@@QAE@XZ (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_exception_default_ctor) +DEFINE_THISCALL_WRAPPER(MSVCRT_exception_default_ctor,4) exception * __stdcall MSVCRT_exception_default_ctor(exception * _this) { static const char* empty = NULL; @@ -184,7 +198,7 @@ /****************************************************************** * ??1exception@@UAE@XZ (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_exception_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT_exception_dtor,4) void __stdcall MSVCRT_exception_dtor(exception * _this) { TRACE("(%p)\n", _this); @@ -195,7 +209,7 @@ /****************************************************************** * ??4exception@@QAEAAV0@ABV0@@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_exception_opequals) +DEFINE_THISCALL_WRAPPER(MSVCRT_exception_opequals,8) exception * __stdcall MSVCRT_exception_opequals(exception * _this, const exception * rhs) { TRACE("(%p %p)\n", _this, rhs); @@ -211,7 +225,7 @@ /****************************************************************** * ??_Eexception@@UAEPAXI@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_exception_vector_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT_exception_vector_dtor,8) void * __stdcall MSVCRT_exception_vector_dtor(exception * _this, unsigned int flags) { TRACE("(%p %x)\n", _this, flags); @@ -234,7 +248,7 @@ /****************************************************************** * ??_Gexception@@UAEPAXI@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_exception_scalar_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT_exception_scalar_dtor,8) void * __stdcall MSVCRT_exception_scalar_dtor(exception * _this, unsigned int flags) { TRACE("(%p %x)\n", _this, flags); @@ -246,7 +260,7 @@ /****************************************************************** * ?what@exception@@UBEPBDXZ (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_what_exception) +DEFINE_THISCALL_WRAPPER(MSVCRT_what_exception,4) const char * __stdcall MSVCRT_what_exception(exception * _this) { TRACE("(%p) returning %s\n", _this, _this->name); @@ -256,7 +270,7 @@ /****************************************************************** * ??0bad_typeid@@QAE@ABV0@@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_copy_ctor) +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_copy_ctor,8) bad_typeid * __stdcall MSVCRT_bad_typeid_copy_ctor(bad_typeid * _this, const bad_typeid * rhs) { TRACE("(%p %p)\n", _this, rhs); @@ -268,7 +282,7 @@ /****************************************************************** * ??0bad_typeid@@QAE@PBD@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_ctor) +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_ctor,8) bad_typeid * __stdcall MSVCRT_bad_typeid_ctor(bad_typeid * _this, const char * name) { TRACE("(%p %s)\n", _this, name); @@ -278,9 +292,18 @@ } /****************************************************************** + * ??_Fbad_typeid@@QAEXXZ (MSVCRT.@) + */ +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_default_ctor,4) +bad_typeid * __stdcall MSVCRT_bad_typeid_default_ctor(bad_typeid * _this) +{ + return MSVCRT_bad_typeid_ctor( _this, "bad typeid" ); +} + +/****************************************************************** * ??1bad_typeid@@UAE@XZ (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_dtor,4) void __stdcall MSVCRT_bad_typeid_dtor(bad_typeid * _this) { TRACE("(%p)\n", _this); @@ -290,7 +313,7 @@ /****************************************************************** * ??4bad_typeid@@QAEAAV0@ABV0@@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_opequals) +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_opequals,8) bad_typeid * __stdcall MSVCRT_bad_typeid_opequals(bad_typeid * _this, const bad_typeid * rhs) { TRACE("(%p %p)\n", _this, rhs); @@ -301,7 +324,7 @@ /****************************************************************** * ??_Ebad_typeid@@UAEPAXI@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_vector_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_vector_dtor,8) void * __stdcall MSVCRT_bad_typeid_vector_dtor(bad_typeid * _this, unsigned int flags) { TRACE("(%p %x)\n", _this, flags); @@ -324,7 +347,7 @@ /****************************************************************** * ??_Gbad_typeid@@UAEPAXI@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_scalar_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_scalar_dtor,8) void * __stdcall MSVCRT_bad_typeid_scalar_dtor(bad_typeid * _this, unsigned int flags) { TRACE("(%p %x)\n", _this, flags); @@ -336,7 +359,7 @@ /****************************************************************** * ??0__non_rtti_object@@QAE@ABV0@@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_copy_ctor) +DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_copy_ctor,8) __non_rtti_object * __stdcall MSVCRT___non_rtti_object_copy_ctor(__non_rtti_object * _this, const __non_rtti_object * rhs) { @@ -349,7 +372,7 @@ /****************************************************************** * ??0__non_rtti_object@@QAE@PBD@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_ctor) +DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_ctor,8) __non_rtti_object * __stdcall MSVCRT___non_rtti_object_ctor(__non_rtti_object * _this, const char * name) { @@ -362,7 +385,7 @@ /****************************************************************** * ??1__non_rtti_object@@UAE@XZ (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_dtor,4) void __stdcall MSVCRT___non_rtti_object_dtor(__non_rtti_object * _this) { TRACE("(%p)\n", _this); @@ -372,7 +395,7 @@ /****************************************************************** * ??4__non_rtti_object@@QAEAAV0@ABV0@@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_opequals) +DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_opequals,8) __non_rtti_object * __stdcall MSVCRT___non_rtti_object_opequals(__non_rtti_object * _this, const __non_rtti_object *rhs) { @@ -384,7 +407,7 @@ /****************************************************************** * ??_E__non_rtti_object@@UAEPAXI@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_vector_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_vector_dtor,8) void * __stdcall MSVCRT___non_rtti_object_vector_dtor(__non_rtti_object * _this, unsigned int flags) { TRACE("(%p %x)\n", _this, flags); @@ -407,7 +430,7 @@ /****************************************************************** * ??_G__non_rtti_object@@UAEPAXI@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_scalar_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_scalar_dtor,8) void * __stdcall MSVCRT___non_rtti_object_scalar_dtor(__non_rtti_object * _this, unsigned int flags) { TRACE("(%p %x)\n", _this, flags); @@ -417,9 +440,10 @@ } /****************************************************************** + * ??0bad_cast@@AAE@PBQBD@Z (MSVCRT.@) * ??0bad_cast@@QAE@ABQBD@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_ctor) +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_ctor,8) bad_cast * __stdcall MSVCRT_bad_cast_ctor(bad_cast * _this, const char ** name) { TRACE("(%p %s)\n", _this, *name); @@ -431,7 +455,7 @@ /****************************************************************** * ??0bad_cast@@QAE@ABV0@@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_copy_ctor) +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_copy_ctor,8) bad_cast * __stdcall MSVCRT_bad_cast_copy_ctor(bad_cast * _this, const bad_cast * rhs) { TRACE("(%p %p)\n", _this, rhs); @@ -441,9 +465,30 @@ } /****************************************************************** + * ??0bad_cast@@QAE@PBD@Z (MSVCRT.@) + */ +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_ctor_charptr,8) +bad_cast * __stdcall MSVCRT_bad_cast_ctor_charptr(bad_cast * _this, const char * name) +{ + TRACE("(%p %s)\n", _this, name); + EXCEPTION_ctor(_this, &name); + _this->vtable = &MSVCRT_bad_cast_vtable; + return _this; +} + +/****************************************************************** + * ??_Fbad_cast@@QAEXXZ (MSVCRT.@) + */ +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_default_ctor,4) +bad_cast * __stdcall MSVCRT_bad_cast_default_ctor(bad_cast * _this) +{ + return MSVCRT_bad_cast_ctor_charptr( _this, "bad cast" ); +} + +/****************************************************************** * ??1bad_cast@@UAE@XZ (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_dtor,4) void __stdcall MSVCRT_bad_cast_dtor(bad_cast * _this) { TRACE("(%p)\n", _this); @@ -453,7 +498,7 @@ /****************************************************************** * ??4bad_cast@@QAEAAV0@ABV0@@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_opequals) +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_opequals,8) bad_cast * __stdcall MSVCRT_bad_cast_opequals(bad_cast * _this, const bad_cast * rhs) { TRACE("(%p %p)\n", _this, rhs); @@ -464,7 +509,7 @@ /****************************************************************** * ??_Ebad_cast@@UAEPAXI@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_vector_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_vector_dtor,8) void * __stdcall MSVCRT_bad_cast_vector_dtor(bad_cast * _this, unsigned int flags) { TRACE("(%p %x)\n", _this, flags); @@ -487,7 +532,7 @@ /****************************************************************** * ??_Gbad_cast@@UAEPAXI@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_scalar_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_scalar_dtor,8) void * __stdcall MSVCRT_bad_cast_scalar_dtor(bad_cast * _this, unsigned int flags) { TRACE("(%p %x)\n", _this, flags); @@ -499,7 +544,7 @@ /****************************************************************** * ??8type_info@@QBEHABV0@@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_opequals_equals) +DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_opequals_equals,8) int __stdcall MSVCRT_type_info_opequals_equals(type_info * _this, const type_info * rhs) { int ret = !strcmp(_this->mangled + 1, rhs->mangled + 1); @@ -510,7 +555,7 @@ /****************************************************************** * ??9type_info@@QBEHABV0@@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_opnot_equals) +DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_opnot_equals,8) int __stdcall MSVCRT_type_info_opnot_equals(type_info * _this, const type_info * rhs) { int ret = !!strcmp(_this->mangled + 1, rhs->mangled + 1); @@ -521,7 +566,7 @@ /****************************************************************** * ?before@type_info@@QBEHABV1@@Z (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_before) +DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_before,8) int __stdcall MSVCRT_type_info_before(type_info * _this, const type_info * rhs) { int ret = strcmp(_this->mangled + 1, rhs->mangled + 1) < 0; @@ -532,7 +577,7 @@ /****************************************************************** * ??1type_info@@UAE@XZ (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_dtor,4) void __stdcall MSVCRT_type_info_dtor(type_info * _this) { TRACE("(%p)\n", _this); @@ -542,7 +587,7 @@ /****************************************************************** * ?name@type_info@@QBEPBDXZ (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_name) +DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_name,4) const char * __stdcall MSVCRT_type_info_name(type_info * _this) { if (!_this->name) @@ -583,7 +628,7 @@ /****************************************************************** * ?raw_name@type_info@@QBEPBDXZ (MSVCRT.@) */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_raw_name) +DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_raw_name,4) const char * __stdcall MSVCRT_type_info_raw_name(type_info * _this) { TRACE("(%p) returning %s\n", _this, _this->mangled); @@ -591,7 +636,7 @@ } /* Unexported */ -DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_vector_dtor) +DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_vector_dtor,8) void * __stdcall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int flags) { TRACE("(%p %x)\n", _this, flags); @@ -612,6 +657,22 @@ } /* vtables */ + +#ifdef _WIN64 + +#define __ASM_VTABLE(name,funcs) \ + __asm__(".data\n" \ + "\t.align 8\n" \ + "\t.quad " __ASM_NAME(#name "_rtti") "\n" \ + "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \ + __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \ + "\t.quad " THISCALL_NAME(MSVCRT_ ## name ## _vector_dtor) "\n" \ + funcs "\n\t.text"); + +#define __ASM_EXCEPTION_VTABLE(name) \ + __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCRT_what_exception) ) + +#else #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ @@ -624,6 +685,8 @@ #define __ASM_EXCEPTION_VTABLE(name) \ __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCRT_what_exception) ) + +#endif /* _WIN64 */ #ifndef __GNUC__ void __asm_dummy_vtables(void) { Modified: trunk/reactos/lib/sdk/crt/except/cppexcept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cppexce… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Sun Jun 13 01:24:42 2010 @@ -27,6 +27,7 @@ #include <precomp.h> #include <stdarg.h> +#include <wine/exception.h> #include <internal/wine/msvcrt.h> #include <internal/wine/cppexcept.h> @@ -123,7 +124,6 @@ descr->tryblock[i].start_level, descr->tryblock[i].end_level, descr->tryblock[i].catch_level, descr->tryblock[i].catchblock, descr->tryblock[i].catchblock_count ); - for (j = 0; j < descr->tryblock[i].catchblock_count; j++) { const catchblock_info *ptr = &descr->tryblock[i].catchblock[j]; @@ -133,6 +133,10 @@ } } #endif + if (descr->magic <= CXX_FRAME_MAGIC_VC6) return; + TRACE( "expect list: %p\n", descr->expect_list ); + if (descr->magic <= CXX_FRAME_MAGIC_VC7) return; + TRACE( "flags: %08x\n", descr->flags ); } /* check if the exception type is caught by a given catch block, and return the type that matched */ @@ -194,7 +198,7 @@ /* unwind the local function up to a given trylevel */ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_descr *descr, int last_level) { - void (*handler)(); + void (*handler)(void); int trylevel = frame->trylevel; while (trylevel != last_level) @@ -358,11 +362,16 @@ { cxx_exception_type *exc_type; - if (descr->magic != CXX_FRAME_MAGIC) + if (descr->magic < CXX_FRAME_MAGIC_VC6 || descr->magic > CXX_FRAME_MAGIC_VC8) { ERR( "invalid frame magic %x\n", descr->magic ); return ExceptionContinueSearch; } + if (descr->magic >= CXX_FRAME_MAGIC_VC8 && + (descr->flags & FUNC_DESCR_SYNCHRONOUS) && + (rec->ExceptionCode != CXX_EXCEPTION)) + return ExceptionContinueSearch; /* handle only c++ exceptions */ + if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { if (descr->unwind_count && !nested_trylevel) cxx_local_unwind( frame, descr, -1 ); @@ -374,7 +383,7 @@ { exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; - if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC && + if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 && exc_type->custom_handler) { return exc_type->custom_handler( rec, frame, context, dispatch, @@ -408,14 +417,22 @@ PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ); __ASM_GLOBAL_FUNC( __CxxFrameHandler, "pushl $0\n\t" /* nested_trylevel */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl $0\n\t" /* nested_frame */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl %eax\n\t" /* descr */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl 28(%esp)\n\t" /* dispatch */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl 28(%esp)\n\t" /* context */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl 28(%esp)\n\t" /* frame */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl 28(%esp)\n\t" /* rec */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "call " __ASM_NAME("cxx_frame_handler") "\n\t" "add $28,%esp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -28\n\t") "ret" ) @@ -435,6 +452,17 @@ #endif /* __i386__ */ + +/********************************************************************* + * __CppXcptFilter (MSVCRT.@) + */ +int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) +{ + /* only filter c++ exceptions */ + if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; + return _XcptFilter( ex, ptr ); +} + /********************************************************************* * _CxxThrowException (MSVCRT.@) */ @@ -442,7 +470,7 @@ { ULONG_PTR args[3]; - args[0] = CXX_FRAME_MAGIC; + args[0] = CXX_FRAME_MAGIC_VC6; args[1] = (ULONG_PTR)object; args[2] = (ULONG_PTR)type; RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args ); @@ -462,7 +490,7 @@ if (rec->ExceptionCode == CXX_EXCEPTION && rec->NumberParameters == 3 && - rec->ExceptionInformation[0] == CXX_FRAME_MAGIC && + rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && rec->ExceptionInformation[2]) { ptrs->ExceptionRecord = msvcrt_get_thread_data()->exc_record; Added: trunk/reactos/lib/sdk/crt/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/except.… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/except.c (added) +++ trunk/reactos/lib/sdk/crt/except/except.c [iso-8859-1] Sun Jun 13 01:24:42 2010 @@ -1,0 +1,220 @@ +/* + * msvcrt.dll exception handling + * + * Copyright 2000 Jon Griffiths + * Copyright 2005 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + * + * FIXME: Incomplete support for nested exceptions/try block cleanup. + */ + +#include <precomp.h> +#include "excpt.h" +#include <wine/exception.h> + +void CDECL _global_unwind2(EXCEPTION_REGISTRATION_RECORD* frame); + +/* VC++ extensions to Win32 SEH */ +typedef struct _SCOPETABLE +{ + int previousTryLevel; + int (*lpfnFilter)(PEXCEPTION_POINTERS); + int (*lpfnHandler)(void); +} SCOPETABLE, *PSCOPETABLE; + +typedef struct _MSVCRT_EXCEPTION_FRAME +{ + EXCEPTION_REGISTRATION_RECORD *prev; + void (*handler)(PEXCEPTION_RECORD, EXCEPTION_REGISTRATION_RECORD*, + PCONTEXT, PEXCEPTION_RECORD); + PSCOPETABLE scopetable; + int trylevel; + int _ebp; + PEXCEPTION_POINTERS xpointers; +} MSVCRT_EXCEPTION_FRAME; + +typedef struct +{ + int gs_cookie_offset; + ULONG gs_cookie_xor; + int eh_cookie_offset; + ULONG eh_cookie_xor; + SCOPETABLE entries[1]; +} SCOPETABLE_V4; + +#ifdef __i386__ + +static const SCOPETABLE_V4 *get_scopetable_v4( MSVCRT_EXCEPTION_FRAME *frame, ULONG_PTR cookie ) +{ + return (const SCOPETABLE_V4 *)((ULONG_PTR)frame->scopetable ^ cookie); +} + +#if defined(__GNUC__) +static inline void call_finally_block( void *code_block, void *base_ptr ) +{ + __asm__ __volatile__ ("movl %1,%%ebp; call *%%eax" + : : "a" (code_block), "g" (base_ptr)); +} + +static inline int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ) +{ + int ret; + __asm__ __volatile__ ("pushl %%ebp; pushl %3; movl %2,%%ebp; call *%%eax; popl %%ebp; popl %%ebp" + : "=a" (ret) + : "0" (func), "r" (ebp), "r" (arg) + : "ecx", "edx", "memory" ); + return ret; +} +static inline int call_unwind_func( int (*func)(void), void *ebp ) +{ + int ret; + __asm__ __volatile__ ("pushl %%ebp\n\t" + "pushl %%ebx\n\t" + "pushl %%esi\n\t" + "pushl %%edi\n\t" + "movl %2,%%ebp\n\t" + "call *%0\n\t" + "popl %%edi\n\t" + "popl %%esi\n\t" + "popl %%ebx\n\t" + "popl %%ebp" + : "=a" (ret) + : "0" (func), "r" (ebp) + : "ecx", "edx", "memory" ); + return ret; +} +#endif + +static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec, + EXCEPTION_REGISTRATION_RECORD* frame, + PCONTEXT context, + EXCEPTION_REGISTRATION_RECORD** dispatch) +{ + if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + return ExceptionContinueSearch; + *dispatch = frame; + return ExceptionCollidedUnwind; +} + +void msvcrt_local_unwind4( ULONG *cookie, MSVCRT_EXCEPTION_FRAME* frame, int trylevel, void *ebp ) +{ + EXCEPTION_REGISTRATION_RECORD reg; + const SCOPETABLE_V4 *scopetable = get_scopetable_v4( frame, *cookie ); + + TRACE("(%p,%d,%d)\n",frame, frame->trylevel, trylevel); + + /* Register a handler in case of a nested exception */ + reg.Handler = (PEXCEPTION_ROUTINE)MSVCRT_nested_handler; + reg.Prev = NtCurrentTeb()->NtTib.ExceptionList; + __wine_push_frame(&reg); + + while (frame->trylevel != -2 && frame->trylevel != trylevel) + { + int level = frame->trylevel; + frame->trylevel = scopetable->entries[level].previousTryLevel; + if (!scopetable->entries[level].lpfnFilter) + { + TRACE( "__try block cleanup level %d handler %p ebp %p\n", + level, scopetable->entries[level].lpfnHandler, ebp ); + call_unwind_func( scopetable->entries[level].lpfnHandler, ebp ); + } + } + __wine_pop_frame(&reg); + TRACE("unwound OK\n"); +} + +/********************************************************************* + * _except_handler4_common (MSVCRT.@) + */ +int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void), + EXCEPTION_RECORD *rec, MSVCRT_EXCEPTION_FRAME *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + int retval, trylevel; + EXCEPTION_POINTERS exceptPtrs; + const SCOPETABLE_V4 *scope_table = get_scopetable_v4( frame, *cookie ); + + TRACE( "exception %x flags=%x at %p handler=%p %p %p cookie=%x scope table=%p cookies=%d/%x,%d/%x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, + frame->handler, context, dispatcher, *cookie, scope_table, + scope_table->gs_cookie_offset, scope_table->gs_cookie_xor, + scope_table->eh_cookie_offset, scope_table->eh_cookie_xor ); + + /* FIXME: no cookie validation yet */ + + if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + { + /* Unwinding the current frame */ + msvcrt_local_unwind4( cookie, frame, -2, &frame->_ebp ); + TRACE("unwound current frame, returning ExceptionContinueSearch\n"); + return ExceptionContinueSearch; + } + else + { + /* Hunting for handler */ + exceptPtrs.ExceptionRecord = rec; + exceptPtrs.ContextRecord = context; + *((DWORD *)frame-1) = (DWORD)&exceptPtrs; + trylevel = frame->trylevel; + + while (trylevel != -2) + { + TRACE( "level %d prev %d filter %p\n", trylevel, + scope_table->entries[trylevel].previousTryLevel, + scope_table->entries[trylevel].lpfnFilter ); + if (scope_table->entries[trylevel].lpfnFilter) + { + retval = call_filter( scope_table->entries[trylevel].lpfnFilter, &exceptPtrs, &frame->_ebp ); + + TRACE("filter returned %s\n", retval == EXCEPTION_CONTINUE_EXECUTION ? + "CONTINUE_EXECUTION" : retval == EXCEPTION_EXECUTE_HANDLER ? + "EXECUTE_HANDLER" : "CONTINUE_SEARCH"); + + if (retval == EXCEPTION_CONTINUE_EXECUTION) + return ExceptionContinueExecution; + + if (retval == EXCEPTION_EXECUTE_HANDLER) + { + /* Unwind all higher frames, this one will handle the exception */ + _global_unwind2((EXCEPTION_REGISTRATION_RECORD*)frame); + msvcrt_local_unwind4( cookie, frame, trylevel, &frame->_ebp ); + + /* Set our trylevel to the enclosing block, and call the __finally + * code, which won't return + */ + frame->trylevel = scope_table->entries[trylevel].previousTryLevel; + TRACE("__finally block %p\n",scope_table->entries[trylevel].lpfnHandler); + call_finally_block(scope_table->entries[trylevel].lpfnHandler, &frame->_ebp); + ERR("Returned from __finally block - expect crash!\n"); + } + } + trylevel = scope_table->entries[trylevel].previousTryLevel; + } + } + TRACE("reached -2, returning ExceptionContinueSearch\n"); + return ExceptionContinueSearch; +} + +#endif + +/****************************************************************** + * __uncaught_exception + */ +BOOL CDECL __uncaught_exception(void) +{ + return FALSE; +} + Propchange: trunk/reactos/lib/sdk/crt/except/except.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/except/xcptfil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/xcptfil… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/xcptfil.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/xcptfil.c [iso-8859-1] Sun Jun 13 01:24:42 2010 @@ -23,8 +23,8 @@ /* * @implemented */ -int -_XcptFilter(DWORD ExceptionCode, +int CDECL +_XcptFilter(NTSTATUS ExceptionCode, struct _EXCEPTION_POINTERS * except) { LONG ret = EXCEPTION_CONTINUE_SEARCH; @@ -61,7 +61,8 @@ { if (handler != SIG_IGN) { - int i, float_signal = _FPE_INVALID; + unsigned int i; + int float_signal = _FPE_INVALID; sighandlers[SIGFPE] = SIG_DFL; for (i = 0; i < sizeof(float_exception_map) / @@ -80,6 +81,7 @@ } break; case EXCEPTION_ILLEGAL_INSTRUCTION: + case EXCEPTION_PRIV_INSTRUCTION: if ((handler = sighandlers[SIGILL]) != SIG_DFL) { if (handler != SIG_IGN) @@ -94,14 +96,3 @@ return ret; } -int CDECL __CppXcptFilter(unsigned long ex, PEXCEPTION_POINTERS ptr) -{ - /* only filter c++ exceptions */ - if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; - return _XcptFilter( ex, ptr ); -} - - - - - Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Sun Jun 13 01:24:42 2010 @@ -15,7 +15,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 Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __MSVCRT_CPPEXCEPT_H @@ -23,70 +23,18 @@ #include <pseh/pseh2.h> +#define CXX_FRAME_MAGIC_VC6 0x19930520 +#define CXX_FRAME_MAGIC_VC7 0x19930521 +#define CXX_FRAME_MAGIC_VC8 0x19930522 +#define CXX_EXCEPTION 0xe06d7363 + /* Macros to define assembler functions somewhat portably */ - -#define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef" -#define __ASM_NAME(name) "_" name - -#ifdef __GNUC__ -# define __ASM_GLOBAL_FUNC(name,code) \ - __asm__( ".align 4\n\t" \ - ".globl " __ASM_NAME(#name) "\n\t" \ - __ASM_FUNC(#name) "\n" \ - __ASM_NAME(#name) ":\n\t" \ - code ); -#else /* __GNUC__ */ -# define __ASM_GLOBAL_FUNC(name,code) \ - void __asm_dummy_##name(void) { \ - asm( ".align 4\n\t" \ - ".globl " __ASM_NAME(#name) "\n\t" \ - __ASM_FUNC(#name) "\n" \ - __ASM_NAME(#name) ":\n\t" \ - code ); \ - } -#endif /* __GNUC__ */ #define EH_NONCONTINUABLE 0x01 #define EH_UNWINDING 0x02 #define EH_EXIT_UNWIND 0x04 #define EH_STACK_INVALID 0x08 #define EH_NESTED_CALL 0x10 - -#ifndef _M_ARM - -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable:4733) -#endif - -static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) -{ - frame->Next = (struct _EXCEPTION_REGISTRATION_RECORD *)__readfsdword(0); - __writefsdword(0, (unsigned long)frame); - return frame->Next; -} - -static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame ) -{ - __writefsdword(0, (unsigned long)frame->Next); - return frame->Next; -} - -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -#endif - -#define __TRY _SEH2_TRY -#define __EXCEPT(func) _SEH2_EXCEPT(func(_SEH2_GetExceptionInformation())) -#define __EXCEPT_PAGE_FAULT _SEH2_EXCEPT(_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) -#define __EXCEPT_ALL _SEH2_EXCEPT(_SEH_EXECUTE_HANDLER) -#define __ENDTRY _SEH2_END -#define __FINALLY(func) _SEH2_FINALLY { func(!_SEH2_AbnormalTermination()); } - -#define CXX_FRAME_MAGIC 0x19930520 -#define CXX_EXCEPTION 0xe06d7363 typedef void (*vtable_ptr)(); @@ -117,10 +65,10 @@ /* info about a single catch {} block */ typedef struct __catchblock_info { - UINT flags; /* flags (see below) */ - type_info *type_info; /* C++ type caught by this block */ - int offset; /* stack offset to copy exception object to */ - void (*handler)(); /* catch block handler code */ + UINT flags; /* flags (see below) */ + const type_info *type_info; /* C++ type caught by this block */ + int offset; /* stack offset to copy exception object to */ + void (*handler)(void);/* catch block handler code */ } catchblock_info; #define TYPE_FLAG_CONST 1 #define TYPE_FLAG_VOLATILE 2 @@ -129,30 +77,35 @@ /* info about a single try {} block */ typedef struct __tryblock_info { - int start_level; /* start trylevel of that block */ - int end_level; /* end trylevel of that block */ - int catch_level; /* initial trylevel of the catch block */ - int catchblock_count; /* count of catch blocks in array */ - catchblock_info *catchblock; /* array of catch blocks */ + int start_level; /* start trylevel of that block */ + int end_level; /* end trylevel of that block */ + int catch_level; /* initial trylevel of the catch block */ + int catchblock_count; /* count of catch blocks in array */ + const catchblock_info *catchblock; /* array of catch blocks */ } tryblock_info; /* info about the unwind handler for a given trylevel */ typedef struct __unwind_info { int prev; /* prev trylevel unwind handler, to run after this one */ - void (*handler)(); /* unwind handler */ + void (*handler)(void);/* unwind handler */ } unwind_info; /* descriptor of all try blocks of a given function */ typedef struct __cxx_function_descr { - UINT magic; /* must be CXX_FRAME_MAGIC */ - UINT unwind_count; /* number of unwind handlers */ - unwind_info *unwind_table; /* array of unwind handlers */ - UINT tryblock_count; /* number of try blocks */ - tryblock_info *tryblock; /* array of try blocks */ - UINT unknown[3]; + UINT magic; /* must be CXX_FRAME_MAGIC */ + UINT unwind_count; /* number of unwind handlers */ + const unwind_info *unwind_table; /* array of unwind handlers */ + UINT tryblock_count; /* number of try blocks */ + const tryblock_info *tryblock; /* array of try blocks */ + UINT ipmap_count; + const void *ipmap; + const void *expect_list; /* expected exceptions list when magic >= VC7 */ + UINT flags; /* flags when magic >= VC8 */ } cxx_function_descr; + +#define FUNC_DESCR_SYNCHRONOUS 1 /* synchronous exceptions only (built with /EHs) */ typedef void (*cxx_copy_ctor)(void); @@ -192,18 +145,20 @@ typedef struct __cxx_exception_type { UINT flags; /* TYPE_FLAG flags */ - void (*destructor)(); /* exception object destructor */ + void (*destructor)(void);/* exception object destructor */ cxx_exc_custom_handler custom_handler; /* custom handler for this exception */ const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; -void _CxxThrowException(exception*,const cxx_exception_type*); +void CDECL _CxxThrowException(exception*,const cxx_exception_type*); +int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS); +int CDECL __CppXcptFilter(NTSTATUS, PEXCEPTION_POINTERS); static inline const char *dbgstr_type_info( const type_info *info ) { if (!info) return "{}"; - return "{}";/*sprintf( "{vtable=%p name=%s (%s)}", - info->vtable, info->mangled, info->name ? info->name : "" );*/ + return wine_dbg_sprintf( "{vtable=%p name=%s (%s)}", + info->vtable, info->mangled, info->name ? info->name : "" ); } /* compute the this pointer for a base class of a given type */ Modified: trunk/reactos/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/precomp.h?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] Sun Jun 13 01:24:42 2010 @@ -34,6 +34,7 @@ #endif #include "wine/unicode.h" +#include "wine/config.h" /* kernelmode libcnt should not include Wine-debugging crap */ #ifndef _LIBCNT_ @@ -58,6 +59,7 @@ #include <internal/mbstring.h> #include <internal/mtdll.h> #include <internal/rterror.h> +#include <internal/safecrt.h> #include <internal/time.h> #include <internal/tls.h> #include <internal/printf.h>

1 0

[spetreolle] 47769: [fbtusb] Fix include casing.
by spetreolle＠svn.reactos.org 12 Jun '10

12 Jun '10

Author: spetreolle Date: Sat Jun 12 20:08:29 2010 New Revision: 47769 URL: http://svn.reactos.org/svn/reactos?rev=47769&view=rev Log: [fbtusb] Fix include casing. Modified: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciCmds.h Modified: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciCmds.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciCmds.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/include/fbtHciCmds.h [iso-8859-1] Sat Jun 12 20:08:29 2010 @@ -1,7 +1,7 @@ #ifndef _FBT_HCI_COMMANDS_H #define _FBT_HCI_COMMANDS_H -#include "fbtHciOpcodes.h" +#include "fbtHciOpCodes.h" #include "fbtHciSizes.h" #include "fbtHciCmdStructs.h" @@ -150,4 +150,4 @@ #define FBT_HCI_MAX_ALLOWED_ACL_HANDLES 32 #define FBT_HCI_MAX_ALLOWED_SCO_HANDLES 4 -#endif // _FBT_HCI_COMMANDS_H +#endif // _FBT_HCI_COMMANDS_H

1 0

[tkreuzer] 47768: [PSDK] - ntstatus.h: add STATUS_INVALID_CRUNTIME_PARAMETER - winnt.h: fix 64 bit definition of SLIST_ENTRY
by tkreuzer＠svn.reactos.org 12 Jun '10

12 Jun '10

Author: tkreuzer Date: Sat Jun 12 15:09:34 2010 New Revision: 47768 URL: http://svn.reactos.org/svn/reactos?rev=47768&view=rev Log: [PSDK] - ntstatus.h: add STATUS_INVALID_CRUNTIME_PARAMETER - winnt.h: fix 64 bit definition of SLIST_ENTRY Modified: trunk/reactos/include/psdk/ntstatus.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntstatus.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntstatus.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntstatus.h [iso-8859-1] Sat Jun 12 15:09:34 2010 @@ -938,6 +938,7 @@ #define STATUS_AUTHENTICATION_FIREWALL_FAILED ((NTSTATUS)0xC0000413) #define STATUS_VDM_DISALLOWED ((NTSTATUS)0xC0000414) #define STATUS_HUNG_DISPLAY_DRIVER_THREAD ((NTSTATUS)0xC0000415) +#define STATUS_INVALID_CRUNTIME_PARAMETER ((NTSTATUS)0xC0000417) #define STATUS_ASSERTION_FAILURE ((NTSTATUS)0xC0000420L) #define STATUS_CALLBACK_POP_STACK ((NTSTATUS)0xC0000423) #define STATUS_WOW_ASSERTION ((NTSTATUS)0xC0009898) Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Jun 12 15:09:34 2010 @@ -3335,11 +3335,9 @@ #if defined(_WIN64) -typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY *PSLIST_ENTRY; - typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY { - PSLIST_ENTRY Next; -} SLIST_ENTRY; + struct _SLIST_ENTRY *Next; +} SLIST_ENTRY, *PSLIST_ENTRY; typedef struct _SLIST_ENTRY32 { DWORD Next;

1 0

[akhaldi] 47767: - Add some missing file-headers.
by akhaldi＠svn.reactos.org 12 Jun '10

12 Jun '10

Author: akhaldi Date: Sat Jun 12 14:55:02 2010 New Revision: 47767 URL: http://svn.reactos.org/svn/reactos?rev=47767&view=rev Log: - Add some missing file-headers. Modified: trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/reactos/mc/bugcodes.mc Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Sat Jun 12 14:55:02 2010 @@ -1,3 +1,23 @@ +/* + * ntdef.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #ifndef _NTDEF_ #define _NTDEF_ Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Sat Jun 12 14:55:02 2010 @@ -1,3 +1,8 @@ +; +; Created by : Marc Piulachs. +; This source code is offered for use in the public domain. +; + ; ; ntoskrnl.exe bug codes ;

1 0

[ekohl] 47766: [USBD] Replace DWORD by ULONG to make usbd.sys build without errors.
by ekohl＠svn.reactos.org 12 Jun '10

12 Jun '10

Author: ekohl Date: Sat Jun 12 12:20:41 2010 New Revision: 47766 URL: http://svn.reactos.org/svn/reactos?rev=47766&view=rev Log: [USBD] Replace DWORD by ULONG to make usbd.sys build without errors. Modified: trunk/reactos/drivers/usb/usbd/usbd.c Modified: trunk/reactos/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.c?re… ============================================================================== --- trunk/reactos/drivers/usb/usbd/usbd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbd/usbd.c [iso-8859-1] Sat Jun 12 12:20:41 2010 @@ -51,8 +51,8 @@ /* * @implemented */ -DWORD NTAPI -DllInitialize(DWORD Unknown) +ULONG NTAPI +DllInitialize(ULONG Unknown) { return 0; } @@ -60,7 +60,7 @@ /* * @implemented */ -DWORD NTAPI +ULONG NTAPI DllUnload(VOID) { return 0; @@ -70,7 +70,7 @@ * @implemented */ PVOID NTAPI -USBD_Debug_GetHeap(DWORD Unknown1, POOL_TYPE PoolType, ULONG NumberOfBytes, +USBD_Debug_GetHeap(ULONG Unknown1, POOL_TYPE PoolType, ULONG NumberOfBytes, ULONG Tag) { return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); @@ -80,7 +80,7 @@ * @implemented */ VOID NTAPI -USBD_Debug_RetHeap(PVOID Heap, DWORD Unknown2, DWORD Unknown3) +USBD_Debug_RetHeap(PVOID Heap, ULONG Unknown2, ULONG Unknown3) { ExFreePool(Heap); } @@ -98,7 +98,7 @@ * @implemented */ PVOID NTAPI -USBD_AllocateDeviceName(DWORD Unknown) +USBD_AllocateDeviceName(ULONG Unknown) { return NULL; } @@ -106,20 +106,20 @@ /* * @implemented */ -DWORD NTAPI +ULONG NTAPI USBD_CalculateUsbBandwidth( ULONG MaxPacketSize, UCHAR EndpointType, BOOLEAN LowSpeed ) { - DWORD OverheadTable[] = { + ULONG OverheadTable[] = { 0x00, /* UsbdPipeTypeControl */ 0x09, /* UsbdPipeTypeIsochronous */ 0x00, /* UsbdPipeTypeBulk */ 0x0d /* UsbdPipeTypeInterrupt */ }; - DWORD Result; + ULONG Result; if (OverheadTable[EndpointType] != 0) { @@ -134,8 +134,8 @@ /* * @implemented */ -DWORD NTAPI -USBD_Dispatch(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4) +ULONG NTAPI +USBD_Dispatch(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, ULONG Unknown4) { return 1; } @@ -167,8 +167,8 @@ /* * @implemented */ -DWORD NTAPI -USBD_GetSuspendPowerState(DWORD Unknown1) +ULONG NTAPI +USBD_GetSuspendPowerState(ULONG Unknown1) { return 0; } @@ -177,56 +177,56 @@ * @implemented */ NTSTATUS NTAPI -USBD_InitializeDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, - DWORD Unknown4, DWORD Unknown5, DWORD Unknown6) -{ - return STATUS_NOT_SUPPORTED; -} - -/* - * @implemented - */ -NTSTATUS NTAPI -USBD_RegisterHostController(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, - DWORD Unknown4, DWORD Unknown5, DWORD Unknown6, DWORD Unknown7, - DWORD Unknown8, DWORD Unknown9, DWORD Unknown10) -{ - return STATUS_NOT_SUPPORTED; -} - -/* - * @implemented - */ -NTSTATUS NTAPI -USBD_GetDeviceInformation(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) -{ - return STATUS_NOT_SUPPORTED; -} - -/* - * @implemented - */ -NTSTATUS NTAPI -USBD_CreateDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, - DWORD Unknown4, DWORD Unknown5) -{ - return STATUS_NOT_SUPPORTED; -} - -/* - * @implemented - */ -NTSTATUS NTAPI -USBD_RemoveDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) -{ - return STATUS_NOT_SUPPORTED; -} - -/* - * @implemented - */ -VOID NTAPI -USBD_CompleteRequest(DWORD Unknown1, DWORD Unknown2) +USBD_InitializeDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, + ULONG Unknown4, ULONG Unknown5, ULONG Unknown6) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS NTAPI +USBD_RegisterHostController(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, + ULONG Unknown4, ULONG Unknown5, ULONG Unknown6, ULONG Unknown7, + ULONG Unknown8, ULONG Unknown9, ULONG Unknown10) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS NTAPI +USBD_GetDeviceInformation(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS NTAPI +USBD_CreateDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, + ULONG Unknown4, ULONG Unknown5) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS NTAPI +USBD_RemoveDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +VOID NTAPI +USBD_CompleteRequest(ULONG Unknown1, ULONG Unknown2) { } @@ -245,15 +245,15 @@ * @implemented */ VOID NTAPI -USBD_SetSuspendPowerState(DWORD Unknown1, DWORD Unknown2) -{ -} - -/* - * @implemented - */ -NTSTATUS NTAPI -USBD_MakePdoName(DWORD Unknown1, DWORD Unknown2) +USBD_SetSuspendPowerState(ULONG Unknown1, ULONG Unknown2) +{ +} + +/* + * @implemented + */ +NTSTATUS NTAPI +USBD_MakePdoName(ULONG Unknown1, ULONG Unknown2) { return STATUS_NOT_SUPPORTED; } @@ -289,17 +289,17 @@ * @implemented */ NTSTATUS NTAPI -USBD_RestoreDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) -{ - return STATUS_NOT_SUPPORTED; -} - -/* - * @implemented - */ -VOID NTAPI -USBD_RegisterHcDeviceCapabilities(DWORD Unknown1, DWORD Unknown2, - DWORD Unknown3) +USBD_RestoreDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +VOID NTAPI +USBD_RegisterHcDeviceCapabilities(ULONG Unknown1, ULONG Unknown2, + ULONG Unknown3) { } @@ -315,8 +315,8 @@ ) { PURB Urb; - DWORD UrbSize; - DWORD InterfaceCount; + ULONG UrbSize; + ULONG InterfaceCount; for (InterfaceCount = 0; InterfaceList[InterfaceCount].InterfaceDescriptor != NULL; @@ -363,7 +363,7 @@ { ULONG_PTR Current; PUSB_INTERFACE_DESCRIPTOR CurrentDescriptor = InterfaceDescriptor; - DWORD Length = CurrentDescriptor->bLength; + ULONG Length = CurrentDescriptor->bLength; // USB_ENDPOINT_DESCRIPTOR_TYPE if (CurrentDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) @@ -478,7 +478,7 @@ /* * @implemented */ -DWORD NTAPI +ULONG NTAPI USBD_GetPdoRegistryParameter( PDEVICE_OBJECT PhysicalDeviceObject, PVOID Parameter,

1 0

[ekohl] 47765: [VFATLIB] - Get rid of the hard-coded sector size as large sector (4KB) harddisks are already available. - When a partition is formatted, choose the FAT type according to the partition type. The size of the partition does not matter here as it is up to the caller to set the right partition type according to its size.
by ekohl＠svn.reactos.org 12 Jun '10

12 Jun '10

Author: ekohl Date: Sat Jun 12 11:20:58 2010 New Revision: 47765 URL: http://svn.reactos.org/svn/reactos?rev=47765&view=rev Log: [VFATLIB] - Get rid of the hard-coded sector size as large sector (4KB) harddisks are already available. - When a partition is formatted, choose the FAT type according to the partition type. The size of the partition does not matter here as it is up to the caller to set the right partition type according to its size. Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c trunk/reactos/lib/fslib/vfatlib/fat16.c trunk/reactos/lib/fslib/vfatlib/fat32.c trunk/reactos/lib/fslib/vfatlib/vfatlib.c trunk/reactos/lib/fslib/vfatlib/vfatlib.h Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Sat Jun 12 11:20:58 2010 @@ -62,12 +62,12 @@ /* Allocate buffer for new bootsector */ NewBootSector = (PUCHAR)RtlAllocateHeap(RtlGetProcessHeap (), 0, - SECTORSIZE); + BootSector->BytesPerSector); if (NewBootSector == NULL) return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new bootsector */ - memset(NewBootSector, 0, SECTORSIZE); + memset(NewBootSector, 0, BootSector->BytesPerSector); /* Copy FAT16 BPB to new bootsector */ memcpy((NewBootSector + 3), @@ -82,7 +82,7 @@ NULL, &IoStatusBlock, NewBootSector, - SECTORSIZE, + BootSector->BytesPerSector, &FileOffset, NULL); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat16.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] Sat Jun 12 11:20:58 2010 @@ -62,12 +62,12 @@ /* Allocate buffer for new bootsector */ NewBootSector = (PUCHAR)RtlAllocateHeap(RtlGetProcessHeap(), 0, - SECTORSIZE); + BootSector->BytesPerSector); if (NewBootSector == NULL) return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new bootsector */ - memset(NewBootSector, 0, SECTORSIZE); + memset(NewBootSector, 0, BootSector->BytesPerSector); /* Copy FAT16 BPB to new bootsector */ memcpy((NewBootSector + 3), @@ -82,7 +82,7 @@ NULL, &IoStatusBlock, NewBootSector, - SECTORSIZE, + BootSector->BytesPerSector, &FileOffset, NULL); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Sat Jun 12 11:20:58 2010 @@ -62,12 +62,12 @@ /* Allocate buffer for new bootsector */ NewBootSector = (PUCHAR)RtlAllocateHeap(RtlGetProcessHeap(), 0, - SECTORSIZE); + BootSector->BytesPerSector); if (NewBootSector == NULL) return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new bootsector */ - memset(NewBootSector, 0, SECTORSIZE); + memset(NewBootSector, 0, BootSector->BytesPerSector); /* Copy FAT32 BPB to new bootsector */ memcpy((NewBootSector + 3), @@ -82,7 +82,7 @@ NULL, &IoStatusBlock, NewBootSector, - SECTORSIZE, + BootSector->BytesPerSector, &FileOffset, NULL); if (!NT_SUCCESS(Status)) @@ -97,14 +97,14 @@ /* Write backup boot sector */ if (BootSector->BootBackup != 0x0000) { - FileOffset.QuadPart = (ULONGLONG)((ULONG) BootSector->BootBackup * SECTORSIZE); + FileOffset.QuadPart = (ULONGLONG)((ULONG)BootSector->BootBackup * BootSector->BytesPerSector); Status = NtWriteFile(FileHandle, NULL, NULL, NULL, &IoStatusBlock, NewBootSector, - SECTORSIZE, + BootSector->BytesPerSector, &FileOffset, NULL); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Sat Jun 12 11:20:58 2010 @@ -143,9 +143,9 @@ Callback (PROGRESS, 0, (PVOID)&Context.Percent); } - if (PartitionInfo.PartitionLength.QuadPart < (4200LL * 1024LL)) - { - /* FAT12 (volume is smaller than 4.1MB) */ + if (PartitionInfo.PartitionType == PARTITION_FAT_12) + { + /* FAT12 */ Status = Fat12Format(FileHandle, &PartitionInfo, &DiskGeometry, @@ -154,9 +154,11 @@ ClusterSize, &Context); } - else if (PartitionInfo.PartitionLength.QuadPart < (512LL * 1024LL * 1024LL)) - { - /* FAT16 (volume is smaller than 512MB) */ + else if (PartitionInfo.PartitionType == PARTITION_FAT_16 || + PartitionInfo.PartitionType == PARTITION_HUGE || + PartitionInfo.PartitionType == PARTITION_XINT13) + { + /* FAT16 */ Status = Fat16Format(FileHandle, &PartitionInfo, &DiskGeometry, @@ -165,9 +167,10 @@ ClusterSize, &Context); } - else - { - /* FAT32 (volume is 512MB or larger) */ + else if (PartitionInfo.PartitionType == PARTITION_FAT32 || + PartitionInfo.PartitionType == PARTITION_FAT32_XINT13) + { + /* FAT32 */ Status = Fat32Format(FileHandle, &PartitionInfo, &DiskGeometry, @@ -175,6 +178,10 @@ QuickFormat, ClusterSize, &Context); + } + else + { + Status = STATUS_INVALID_PARAMETER; } NtClose(FileHandle); Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] Sat Jun 12 11:20:58 2010 @@ -18,8 +18,6 @@ #include "check/fat.h" #include "check/file.h" #include "check/check.h" - -#define SECTORSIZE 512 #include <pshpack1.h> typedef struct _FAT16_BOOT_SECTOR

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
41
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 June 2010