Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 38200: - Revert r37479
by cgutman＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: cgutman Date: Sat Dec 20 14:08:53 2008 New Revision: 38200 URL: http://svn.reactos.org/svn/reactos?rev=38200&view=rev Log: - Revert r37479 Modified: branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] Sat Dec 20 14:08:53 2008 @@ -22,6 +22,7 @@ KSPIN_LOCK LoopWorkLock; LIST_ENTRY LoopWorkList; WORK_QUEUE_ITEM LoopWorkItem; +BOOLEAN LoopReceiveWorkerBusy = FALSE; VOID STDCALL LoopReceiveWorker( PVOID Context ) { PLIST_ENTRY ListEntry; @@ -34,43 +35,46 @@ TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); - ListEntry = ExInterlockedRemoveHeadList( &LoopWorkList, &LoopWorkLock ); - WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - - TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); - - Packet = WorkItem->Packet; - Adapter = WorkItem->Adapter; - BytesTransferred = WorkItem->BytesTransferred; - - ExFreePool( WorkItem ); - - IPPacket.NdisPacket = Packet; - - TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n", - Packet, Adapter, BytesTransferred)); - - NdisGetFirstBufferFromPacket(Packet, - &NdisBuffer, - &IPPacket.Header, - &IPPacket.ContigSize, - &IPPacket.TotalSize); - - IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; - /* Determine which upper layer protocol that should receive - this packet and pass it to the correct receive handler */ - - TI_DbgPrint(MID_TRACE, - ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", - IPPacket.ContigSize, IPPacket.TotalSize, - BytesTransferred)); - - IPPacket.Position = 0; - - IPReceive(Loopback, &IPPacket); - - FreeNdisPacket( Packet ); + while( (ListEntry = + ExInterlockedRemoveHeadList( &LoopWorkList, &LoopWorkLock )) ) { + WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); + + TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); + + Packet = WorkItem->Packet; + Adapter = WorkItem->Adapter; + BytesTransferred = WorkItem->BytesTransferred; + + ExFreePool( WorkItem ); + + IPPacket.NdisPacket = Packet; + + TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n", + Packet, Adapter, BytesTransferred)); + + NdisGetFirstBufferFromPacket(Packet, + &NdisBuffer, + &IPPacket.Header, + &IPPacket.ContigSize, + &IPPacket.TotalSize); + + IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; + /* Determine which upper layer protocol that should receive + this packet and pass it to the correct receive handler */ + + TI_DbgPrint(MID_TRACE, + ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", + IPPacket.ContigSize, IPPacket.TotalSize, + BytesTransferred)); + + IPPacket.Position = 0; + + IPReceive(Loopback, &IPPacket); + + FreeNdisPacket( Packet ); + } TI_DbgPrint(DEBUG_DATALINK, ("Leaving\n")); + LoopReceiveWorkerBusy = FALSE; } VOID LoopSubmitReceiveWork( @@ -80,19 +84,34 @@ UINT BytesTransferred) { PLAN_WQ_ITEM WQItem; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; + KIRQL OldIrql; + + TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); WQItem = ExAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); - if( !WQItem ) return; + if( !WQItem ) { + TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); + return; + } WQItem->Packet = Packet; WQItem->Adapter = Adapter; WQItem->BytesTransferred = BytesTransferred; - ExInterlockedInsertTailList( &LoopWorkList, &WQItem->ListEntry, &LoopWorkLock ); + InsertTailList( &LoopWorkList, &WQItem->ListEntry ); TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x BytesTrans %x\n", Packet, Adapter, BytesTransferred)); - ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue ); + if( !LoopReceiveWorkerBusy ) { + LoopReceiveWorkerBusy = TRUE; + ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue ); + TI_DbgPrint(DEBUG_DATALINK, + ("Work item inserted %x %x\n", &LoopWorkItem, WQItem)); + } else { + TI_DbgPrint(DEBUG_DATALINK, + ("LOOP WORKER BUSY %x %x\n", &LoopWorkItem, WQItem)); + } + TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); } VOID LoopTransmit(

1 0

[tkreuzer] 38199: [FORMATTING] Fix indentation. No code change.
by tkreuzer＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: tkreuzer Date: Sat Dec 20 13:43:11 2008 New Revision: 38199 URL: http://svn.reactos.org/svn/reactos?rev=38199&view=rev Log: [FORMATTING] Fix indentation. No code change. Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…

1 0

[sginsberg] 38198: - Revert 38116 -- the SEH issues should be gone now
by sginsberg＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: sginsberg Date: Sat Dec 20 07:48:35 2008 New Revision: 38198 URL: http://svn.reactos.org/svn/reactos?rev=38198&view=rev Log: - Revert 38116 -- the SEH issues should be gone now Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sat Dec 20 07:48:35 2008 @@ -78,11 +78,10 @@ NTSTATUS WINAPI LsaClose(LSA_HANDLE ObjectHandle) { - //NTSTATUS Status; + NTSTATUS Status; TRACE("LsaClose(0x%p) called\n", ObjectHandle); -#if 0 _SEH2_TRY { Status = LsarClose((PLSAPR_HANDLE)&ObjectHandle); @@ -94,15 +93,6 @@ _SEH2_END; return Status; -#else - - /* This is our fake handle, don't go too much long way */ - if (ObjectHandle == (LSA_HANDLE)0xcafe) - return STATUS_SUCCESS; - - return LsarClose((PLSAPR_HANDLE)&ObjectHandle); - -#endif } @@ -395,13 +385,12 @@ IN ACCESS_MASK DesiredAccess, IN OUT PLSA_HANDLE PolicyHandle) { - //NTSTATUS Status; + NTSTATUS Status; TRACE("LsaOpenPolicy (%s,%p,0x%08x,%p)\n", SystemName?debugstr_w(SystemName->Buffer):"(null)", ObjectAttributes, DesiredAccess, PolicyHandle); -#if 0 _SEH2_TRY { *PolicyHandle = NULL; @@ -420,12 +409,6 @@ TRACE("LsaOpenPolicy() done (Status: 0x%08lx)\n", Status); return Status; -#else - - if(PolicyHandle) *PolicyHandle = (LSA_HANDLE)0xcafe; - return STATUS_SUCCESS; - -#endif }

1 0

[hyperion] 38197: Supersedes r38084. Take three modified include/reactos/libs/pseh/pseh2.h modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S Disassemble trampolines in the library, instead of the macros. Results in better, smaller code. As a side effect, PSEH no longer requires a trampoline for nested functions - which results in even better, even smaller code in many common cases where the nested functions don't use any variables from the containing function Sim
by hyperion＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: hyperion Date: Sat Dec 20 07:05:57 2008 New Revision: 38197 URL: http://svn.reactos.org/svn/reactos?rev=38197&view=rev Log: Supersedes r38084. Take three modified include/reactos/libs/pseh/pseh2.h modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S Disassemble trampolines in the library, instead of the macros. Results in better, smaller code. As a side effect, PSEH no longer requires a trampoline for nested functions - which results in even better, even smaller code in many common cases where the nested functions don't use any variables from the containing function Simulate a no-op setjmp so that GCC correctly handles variables in registers, instead of surprise-corrupting random variables in random conditions Save EBP and ESP every time a _SEH2_TRY/_SEH2_EXCEPT is entered, instead of only the first time. Probably not entirely correct yet Don't generate a nested function for a _SEH2_EXCEPT() filter expression if the value is a compile-time constant: convert the value to (void *)0, (void *)1 or (void *)-1, and set that as the filter, instead (like Visual C++ does, incidentally) If a _SEH2_EXCEPT() filter expression is a compile-time constant evaluating to EXCEPTION_CONTINUE_EXECUTION or EXCEPTION_CONTINUE_SEARCH, allow GCC to optimize out the body of the _SEH2_EXCEPT (because it'd be unreachable). This should really result in a compile-time warning, but #pragma message is unsupported in GCC 4.1.3 Let _SEH2_EXCEPT() accept a comma expression as filter expression (e.g. _SEH2_EXCEPT(MessageBox(...), EXCEPTION_EXECUTE_HANDLER) instead of _SEH2_EXCEPT((MessageBox(...), EXCEPTION_EXECUTE_HANDLER))) Small optimizations in PSEH library Clean up GCC hacks Remove currently unused PSEH 3 hacks Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h trunk/reactos/lib/pseh/framebased-gcchack.c trunk/reactos/lib/pseh/i386/framebased-gcchack.S Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sat Dec 20 07:05:57 2008 @@ -46,8 +46,7 @@ { _SEH2Registration_t SF_Registration; volatile struct __SEH2TryLevel * volatile SF_TopTryLevel; - void * volatile SF_FramePointer; - void * volatile SF_StackPointer; + struct _EXCEPTION_POINTERS * volatile SF_ExceptionInformation; volatile unsigned long SF_Code; } _SEH2Frame_t; @@ -55,9 +54,10 @@ typedef struct __SEH2TryLevel { volatile struct __SEH2TryLevel * ST_Next; - void * ST_FramePointer; void * ST_Filter; void * ST_Body; + void * volatile ST_Ebp; + void * volatile ST_Esp; } _SEH2TryLevel_t; @@ -120,32 +120,40 @@ #define __SEH_PRETEND_SIDE_EFFECT (void)0 /* Forces GCC to consider the specified label reachable */ -#define __SEH_USE_LABEL(L_) __asm__ __volatile__("# %0\n" : : "i" (&&L_)) +#define __SEH_USE_LABEL(L_) if(__SEH_VOLATILE_FALSE) goto L_; /* Makes GCC pretend the specified label is reachable, to silence warnings */ #define __SEH_PRETEND_USE_LABEL(L_) (void)(&&L_) -/* Forces GCC to emit the specified nested function as a function */ -#define __SEH_USE_NESTED_FUNCTION(F_) (void)(&F_) /* __attribute__((noinline)) seems to do the trick */ - /* Soft memory barrier */ #define __SEH_BARRIER __asm__ __volatile__("#":::"memory") /* GCC doesn't know that this equals zero */ -#define __SEH_ZERO ({ int zero = 0; __asm__ __volatile__("#" : "+g" (zero)); zero; }) - -#define __SEH_FALSE __builtin_expect(__SEH_ZERO, 0) -#define __SEH_TRUE __builtin_expect(!__SEH_ZERO, 1) +#define __SEH_VOLATILE_ZERO ({ int zero = 0; __asm__ __volatile__("#" : "+g" (zero)); zero; }) + +/* GCC believes this is setjmp */ +#define __SEH_PRETEND_SETJMP() (_SEH2PretendSetjmp(), 0) + +#define __SEH_VOLATILE_FALSE __builtin_expect(__SEH_VOLATILE_ZERO, 0) +#define __SEH_VOLATILE_TRUE __builtin_expect(!__SEH_VOLATILE_ZERO, 1) + +#define ___SEH_STRINGIFY(X_) # X_ +#define __SEH_STRINGIFY(X_) ___SEH_STRINGIFY(X_) + +static +__inline__ +__attribute__((returns_twice)) +__attribute__((always_inline)) +void _SEH2PretendSetjmp(void) +{ +} #define __SEH_FORCE_NEST \ __asm__ __volatile__("#%0" : : "r" (&_SEHFrame)) -#define __SEH_NESTED_PROLOG \ - __SEH_FORCE_NEST; - -#define __SEH_DECLARE_EXCEPT_PFN(NAME_) int (__cdecl * NAME_)(void *) -#define __SEH_DECLARE_EXCEPT(NAME_) int __cdecl NAME_(void *) -#define __SEH_DEFINE_EXCEPT(NAME_) int __cdecl NAME_(void * _SEHExceptionPointers) +#define __SEH_DECLARE_EXCEPT_PFN(NAME_) int (__cdecl * NAME_)(void) +#define __SEH_DECLARE_EXCEPT(NAME_) int __cdecl NAME_(void) +#define __SEH_DEFINE_EXCEPT(NAME_) int __cdecl NAME_(void) #define __SEH_DECLARE_FINALLY_PFN(NAME_) void (__cdecl * NAME_)(void) #define __SEH_DECLARE_FINALLY(NAME_) void __cdecl NAME_(void) @@ -155,21 +163,19 @@ #define __SEH_RETURN_FINALLY() return #define __SEH_BEGIN_TRY \ + if(!__SEH_PRETEND_SETJMP()) \ { \ - __label__ _SEHBeginTry; \ __label__ _SEHEndTry; \ - \ - __SEH_USE_LABEL(_SEHBeginTry); \ - __SEH_USE_LABEL(_SEHEndTry); \ - \ - _SEHBeginTry: __SEH_SIDE_EFFECT; \ + \ + __SEH_PRETEND_USE_LABEL(_SEHEndTry); \ + \ { \ __SEH_BARRIER; #define __SEH_END_TRY \ __SEH_BARRIER; \ } \ - _SEHEndTry: __SEH_SIDE_EFFECT; \ + _SEHEndTry:; \ } #define __SEH_SET_TRYLEVEL(TRYLEVEL_) \ @@ -188,21 +194,14 @@ #define __SEH_BEGIN_SCOPE \ for(;;) \ { \ - __label__ _SEHBeginScope; \ - __label__ _SEHEndScope; \ - \ - _SEHBeginScope: __SEH_SIDE_EFFECT; \ - \ const int _SEHTopTryLevel = (_SEH2ScopeKind != 0); \ _SEH2Frame_t * const _SEHCurFrameP = _SEH2FrameP; \ volatile _SEH2TryLevel_t * const _SEHPrevTryLevelP = _SEH2TryLevelP; \ + __attribute__((unused)) int _SEHAbnormalTermination; \ \ (void)_SEHTopTryLevel; \ (void)_SEHCurFrameP; \ (void)_SEHPrevTryLevelP; \ - \ - __SEH_USE_LABEL(_SEHBeginScope); \ - __SEH_USE_LABEL(_SEHEndScope); \ \ { \ __label__ _SEHBeforeTry; \ @@ -227,15 +226,10 @@ __SEH_ENTER_TRYLEVEL(); \ \ if(_SEHTopTryLevel) \ - { \ - __SEH_BARRIER; __asm__ __volatile__("mov %%ebp, %0\n#%1" : "=m" (_SEHFrame.SF_FramePointer) : "r" (__builtin_frame_address(0))); __SEH_BARRIER; \ _SEH2EnterFrame(&_SEHFrame); \ - } \ #define __SEH_END_SCOPE \ } \ - \ - _SEHEndScope: __SEH_SIDE_EFFECT; \ \ break; \ } @@ -244,14 +238,13 @@ __label__ _SEHBeginExcept; \ __label__ _SEHEndExcept; \ \ - auto __SEH_DECLARE_EXCEPT(_SEHExcept); \ auto __SEH_DECLARE_FINALLY(_SEHFinally); #define _SEH2_TRY \ __SEH_BEGIN_SCOPE \ { \ __SEH_SCOPE_LOCALS; \ -\ + \ __SEH_BEGIN_TRY \ { @@ -265,14 +258,15 @@ __SEH_PRETEND_USE_LABEL(_SEHBeginExcept); \ __SEH_PRETEND_USE_LABEL(_SEHEndExcept); \ \ - __SEH_USE_NESTED_FUNCTION(_SEHFinally); \ - \ - _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ _SEHTryLevel.ST_Filter = 0; \ - _SEHTryLevel.ST_Body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ + _SEHTryLevel.ST_Body = &_SEHFinally; \ + \ + _SEHAbnormalTermination = 1; \ \ goto _SEHDoTry; \ _SEHAfterTry:; \ + \ + _SEHAbnormalTermination = 0; \ \ if(_SEHTopTryLevel) \ _SEH2LeaveFrame(); \ @@ -284,10 +278,9 @@ _SEHFinally(); \ goto _SEHEndExcept; \ \ - _SEHBeginExcept: __SEH_PRETEND_SIDE_EFFECT; \ - __attribute__((unused)) __SEH_DEFINE_EXCEPT(_SEHExcept) { __SEH_RETURN_EXCEPT(0); } \ - \ - __attribute__((noinline)) __attribute__((used)) __SEH_DEFINE_FINALLY(_SEHFinally) \ + _SEHBeginExcept:; \ + \ + __attribute__((noinline)) __SEH_DEFINE_FINALLY(_SEHFinally) \ { \ __SEH_END_SCOPE_CHAIN; \ \ @@ -295,39 +288,64 @@ (void)_SEH2FrameP; \ (void)_SEH2TryLevelP; \ \ - __SEH_NESTED_PROLOG; \ - \ for(;; ({ __SEH_RETURN_FINALLY(); })) \ { -#define _SEH2_EXCEPT(E_) \ +#define _SEH2_EXCEPT(...) \ } \ __SEH_END_TRY; \ \ goto _SEHAfterTry; \ \ _SEHBeforeTry:; \ -\ - __SEH_USE_LABEL(_SEHBeginExcept); \ - __SEH_USE_LABEL(_SEHEndExcept); \ -\ - __SEH_USE_NESTED_FUNCTION(_SEHExcept); \ - \ - _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ - _SEHTryLevel.ST_Filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ - _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ - __SEH_BARRIER; __asm__ __volatile__("mov %%esp, %0" : "=m" (_SEH2FrameP->SF_StackPointer)); __SEH_BARRIER; \ -\ + \ + if(__builtin_constant_p((__VA_ARGS__))) \ + { \ + if((__VA_ARGS__) > 0) \ + { \ + _SEHTryLevel.ST_Filter = (void *)1; \ + _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ + __SEH_USE_LABEL(_SEHBeginExcept); \ + } \ + else if((__VA_ARGS__) < 0) \ + { \ + _SEHTryLevel.ST_Filter = (void *)-1; \ + _SEHTryLevel.ST_Body = NULL; \ + } \ + else \ + { \ + _SEHTryLevel.ST_Filter = (void *)0; \ + _SEHTryLevel.ST_Body = NULL; \ + } \ + } \ + else \ + { \ + __SEH_DEFINE_EXCEPT(_SEHExcept) \ + { \ + __SEH_RETURN_EXCEPT((__VA_ARGS__)); \ + } \ + \ + _SEHTryLevel.ST_Filter = &_SEHExcept; \ + _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ + __SEH_USE_LABEL(_SEHBeginExcept); \ + } \ + \ + __SEH_BARRIER; \ + \ + __asm__ __volatile__ \ + ( \ + "mov %%ebp, %0\n" \ + "mov %%esp, %1" : \ + "=m" (_SEHTryLevel.ST_Ebp), \ + "=m" (_SEHTryLevel.ST_Esp) \ + ); \ + \ + __SEH_BARRIER; \ + \ goto _SEHDoTry; \ -\ - __attribute__((noinline)) __attribute__((used)) __SEH_DEFINE_EXCEPT(_SEHExcept) \ - { \ - __SEH_NESTED_PROLOG; \ - __SEH_RETURN_EXCEPT(E_); \ - } \ -\ + \ __attribute__((unused)) __SEH_DEFINE_FINALLY(_SEHFinally) { __SEH_RETURN_FINALLY(); } \ -\ + \ _SEHAfterTry:; \ if(_SEHTopTryLevel) \ _SEH2LeaveFrame(); \ @@ -336,12 +354,9 @@ __SEH_LEAVE_TRYLEVEL(); \ } \ \ - if(__SEH_FALSE) \ - goto _SEHBeginExcept; \ - else \ - goto _SEHEndExcept; \ -\ - _SEHBeginExcept: __SEH_SIDE_EFFECT; \ + goto _SEHEndExcept; \ + \ + _SEHBeginExcept:; \ { \ { \ _SEH2Frame_t * const _SEH2FrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ @@ -352,13 +367,14 @@ __SEH_BARRIER; \ } \ } \ - _SEHEndExcept: __SEH_SIDE_EFFECT; \ + \ + _SEHEndExcept:; \ } \ __SEH_END_SCOPE; -#define _SEH2_GetExceptionInformation() ((struct _EXCEPTION_POINTERS *)_SEHExceptionPointers) +#define _SEH2_GetExceptionInformation() ((_SEH2FrameP)->SF_ExceptionInformation) #define _SEH2_GetExceptionCode() ((_SEH2FrameP)->SF_Code) -#define _SEH2_AbnormalTermination() (!!_SEH2_GetExceptionCode()) +#define _SEH2_AbnormalTermination() (_SEHAbnormalTermination) #define _SEH2_YIELD(STMT_) \ for(;;) \ @@ -379,7 +395,7 @@ #define _SEH2_TRY __try #define _SEH2_FINALLY __finally -#define _SEH2_EXCEPT(E_) __except((E_)) +#define _SEH2_EXCEPT(...) __except(__VA_ARGS__) #define _SEH2_END #define _SEH2_GetExceptionInformation() (GetExceptionInformation()) Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Sat Dec 20 07:05:57 2008 @@ -40,7 +40,7 @@ extern _SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void); extern void _SEH2GlobalUnwind(void *); -extern int __SEH2Except(void *, void *, void *); +extern int __SEH2Except(void *, void *); extern void __SEH2Finally(void *, void *); extern DECLSPEC_NORETURN int __SEH2Handle(void *, void *, void *); @@ -51,18 +51,45 @@ extern int __cdecl __SEH2NestedHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); FORCEINLINE -int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel, EXCEPTION_POINTERS * ep) -{ - return __SEH2Except(trylevel->ST_Filter, trylevel->ST_FramePointer, ep); -} - -static -#if defined(__GNUC__) -__attribute__((noinline)) -#endif +int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) +{ + void * filter = trylevel->ST_Filter; + void * context = NULL; + + if(filter == (void *)0) + return 0; + + if(filter == (void *)1) + return 1; + + if(filter == (void *)-1) + return -1; + + if(_SEHIsTrampoline((_SEHTrampoline_t *)filter)) + { + context = _SEHClosureFromTrampoline((_SEHTrampoline_t *)filter); + filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)filter); + } + + return __SEH2Except(filter, context); +} + +FORCEINLINE void _SEH2Finally(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { - __SEH2Finally(trylevel->ST_Body, trylevel->ST_FramePointer); + if(trylevel->ST_Filter == NULL && trylevel->ST_Body != NULL) + { + void * body = trylevel->ST_Body; + void * context = NULL; + + if(_SEHIsTrampoline((_SEHTrampoline_t *)body)) + { + context = _SEHClosureFromTrampoline((_SEHTrampoline_t *)body); + body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)body); + } + + __SEH2Finally(body, context); + } } extern @@ -91,10 +118,7 @@ __SEH2EnterFrame(&nestedframe); for(trylevel = frame->SF_TopTryLevel; trylevel && trylevel != dsttrylevel; trylevel = trylevel->ST_Next) - { - if(!trylevel->ST_Filter) - _SEH2Finally(frame, trylevel); - } + _SEH2Finally(frame, trylevel); frame->SF_TopTryLevel = dsttrylevel; @@ -106,7 +130,7 @@ { _SEH2GlobalUnwind(frame); _SEH2LocalUnwind(frame, trylevel); - __SEH2Handle(trylevel->ST_Body, frame->SF_FramePointer, frame->SF_StackPointer); + __SEH2Handle(trylevel->ST_Body, trylevel->ST_Ebp, trylevel->ST_Esp); } extern @@ -132,25 +156,22 @@ { int ret = 0; volatile _SEH2TryLevel_t * trylevel; + EXCEPTION_POINTERS ep; + + ep.ExceptionRecord = ExceptionRecord; + ep.ContextRecord = ContextRecord; frame->SF_Code = ExceptionRecord->ExceptionCode; + frame->SF_ExceptionInformation = &ep; for(trylevel = frame->SF_TopTryLevel; trylevel != NULL; trylevel = trylevel->ST_Next) { - if(trylevel->ST_Filter) - { - EXCEPTION_POINTERS ep; - - ep.ExceptionRecord = ExceptionRecord; - ep.ContextRecord = ContextRecord; - - ret = _SEH2Except(frame, trylevel, &ep); - - if(ret < 0) - return ExceptionContinueExecution; - else if(ret > 0) - _SEH2Handle(frame, trylevel); - } + ret = _SEH2Except(frame, trylevel); + + if(ret < 0) + return ExceptionContinueExecution; + else if(ret > 0) + _SEH2Handle(frame, trylevel); } } Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] Sat Dec 20 07:05:57 2008 @@ -49,18 +49,8 @@ jmp eax .globl ___SEH2Except +.globl ___SEH2Finally ___SEH2Except: - mov eax, [esp+4] - mov ecx, [esp+8] - - push [esp+12] - call eax - - pop ecx - - ret - -.globl ___SEH2Finally ___SEH2Finally: mov eax, [esp+4] mov ecx, [esp+8]

1 0

[dgorbachev] 38196: - Do not use pGlobalData after freeing, - do not load color spectrum bitmaps if no adapter found, - do not use HEAP_ZERO_MEMORY, use memset(), - check SelectObject() result, - fix indentation.
by dgorbachev＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: dgorbachev Date: Sat Dec 20 05:06:21 2008 New Revision: 38196 URL: http://svn.reactos.org/svn/reactos?rev=38196&view=rev Log: - Do not use pGlobalData after freeing, - do not load color spectrum bitmaps if no adapter found, - do not use HEAP_ZERO_MEMORY, use memset(), - check SelectObject() result, - fix indentation. Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Sat Dec 20 05:06:21 2008 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel - * FILE: lib/cpl/desk/settings.c + * FILE: dll/cpl/desk/settings.c * PURPOSE: Settings property page * * PROGRAMMERS: Trevor McCort (lycan359(a)gmail.com) @@ -286,13 +286,14 @@ DISPLAY_DEVICE displayDevice; PGLOBAL_DATA pGlobalData; - pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + pGlobalData = HeapAlloc(GetProcessHeap(), 0, sizeof(GLOBAL_DATA)); if (pGlobalData == NULL) return; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); /* Get video cards list */ + pGlobalData->DisplayDeviceList = NULL; displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE); while (EnumDisplayDevices(NULL, iDevNum, &displayDevice, 0x1)) { @@ -303,6 +304,7 @@ } iDevNum++; } + if (Result == 0) { /* No adapter found */ @@ -311,6 +313,10 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_RESOLUTION_TEXT), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_ADVANCED), FALSE); ShowWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_SPECTRUM), SW_HIDE); + + /* Do not initialize the color spectrum bitmaps */ + memset(pGlobalData->hSpectrumBitmaps, 0, sizeof(pGlobalData->hSpectrumBitmaps)); + return; } else if (Result == 1) { @@ -325,10 +331,10 @@ monitors.Size.cy = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; monitors.Flags = 0; SendDlgItemMessage(hwndDlg, - IDC_SETTINGS_MONSEL, - MSLM_SETMONITORSINFO, - 1, - (LPARAM)&monitors); + IDC_SETTINGS_MONSEL, + MSLM_SETMONITORSINFO, + 1, + (LPARAM)&monitors); } else /* FIXME: incomplete! */ { @@ -352,10 +358,10 @@ } SendDlgItemMessage(hwndDlg, - IDC_SETTINGS_MONSEL, - MSLM_SETMONITORSINFO, - Result, - (LPARAM)pMonitors); + IDC_SETTINGS_MONSEL, + MSLM_SETMONITORSINFO, + Result, + (LPARAM)pMonitors); HeapFree(GetProcessHeap(), 0, pMonitors); } @@ -401,12 +407,17 @@ default: iBitmap = 2; } - SelectObject(hdcMem, pGlobalData->hSpectrumBitmaps[iBitmap]); - StretchBlt(hDC, - client->left, client->top, client->right - client->left, client->bottom - client->top, - hdcMem, 0, 0, - pGlobalData->cxSource[iBitmap], - pGlobalData->cySource[iBitmap], SRCCOPY); + if (SelectObject(hdcMem, pGlobalData->hSpectrumBitmaps[iBitmap])) + { + StretchBlt(hDC, + client->left, client->top, + client->right - client->left, + client->bottom - client->top, + hdcMem, 0, 0, + pGlobalData->cxSource[iBitmap], + pGlobalData->cySource[iBitmap], SRCCOPY); + } + DeleteDC(hdcMem); } @@ -631,7 +642,6 @@ if (lpDrawItem->CtlID == IDC_SETTINGS_SPECTRUM) ShowColorSpectrum(lpDrawItem->hDC, &lpDrawItem->rcItem, pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel, pGlobalData); - break; } case WM_COMMAND: @@ -834,13 +844,13 @@ Current = Next; } - HeapFree(GetProcessHeap(), 0, pGlobalData); - for (i = 0; i < NUM_SPECTRUM_BITMAPS; i++) { if (pGlobalData->hSpectrumBitmaps[i]) DeleteObject(pGlobalData->hSpectrumBitmaps[i]); } + + HeapFree(GetProcessHeap(), 0, pGlobalData); } } return FALSE;

1 0

[janderwald] 38195: - Fix parameters for CreateService
by janderwald＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: janderwald Date: Sat Dec 20 04:09:25 2008 New Revision: 38195 URL: http://svn.reactos.org/svn/reactos?rev=38195&view=rev Log: - Fix parameters for CreateService Modified: trunk/reactos/base/applications/sc/create.c Modified: trunk/reactos/base/applications/sc/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/creat… ============================================================================== --- trunk/reactos/base/applications/sc/create.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/create.c [iso-8859-1] Sat Dec 20 04:09:25 2008 @@ -20,7 +20,7 @@ DWORD dwErrorControl = SERVICE_ERROR_NORMAL; LPCTSTR lpBinaryPathName = NULL; LPCTSTR lpLoadOrderGroup = NULL; - LPDWORD lpdwTagId = NULL; + DWORD dwTagId = 0; LPCTSTR lpDependencies = NULL; LPCTSTR lpServiceStartName = NULL; LPCTSTR lpPassword = NULL; @@ -36,7 +36,7 @@ _tprintf(_T("error control - %lu\n"), dwErrorControl); _tprintf(_T("Binary path - %s\n"), lpBinaryPathName); _tprintf(_T("load order group - %s\n"), lpLoadOrderGroup); - _tprintf(_T("tag - %lu\n"), lpdwTagId); + _tprintf(_T("tag - %lu\n"), dwTagId); _tprintf(_T("dependincies - %s\n"), lpDependencies); _tprintf(_T("account start name - %s\n"), lpServiceStartName); _tprintf(_T("account password - %s\n"), lpPassword); @@ -66,7 +66,7 @@ dwErrorControl, lpBinaryPathName, lpLoadOrderGroup, - lpdwTagId, + &dwTagId, lpDependencies, lpServiceStartName, lpPassword);

1 0

[dchapyshev] 38194: - Fix all wine tests for MoveFileA/W
by dchapyshev＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: dchapyshev Date: Sat Dec 20 04:08:11 2008 New Revision: 38194 URL: http://svn.reactos.org/svn/reactos?rev=38194&view=rev Log: - Fix all wine tests for MoveFileA/W Modified: trunk/reactos/dll/win32/kernel32/file/move.c Modified: trunk/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] Sat Dec 20 04:08:11 2008 @@ -235,8 +235,9 @@ DWORD dwFlags ) { - HANDLE hFile = NULL; + HANDLE hFile = NULL, hNewFile = NULL; IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; PFILE_RENAME_INFORMATION FileRename; NTSTATUS errCode; BOOL Result; @@ -247,6 +248,48 @@ if (dwFlags & MOVEFILE_DELAY_UNTIL_REBOOT) return add_boot_rename_entry( lpExistingFileName, lpNewFileName, dwFlags ); + + if (dwFlags & MOVEFILE_WRITE_THROUGH) + FIXME("MOVEFILE_WRITE_THROUGH unimplemented\n"); + + if (!lpNewFileName) + return DeleteFileW(lpExistingFileName); + + /* validate & translate the filename */ + if (!RtlDosPathNameToNtPathName_U (lpNewFileName, + &DstPathU, + NULL, + NULL)) + { + WARN("Invalid destination path\n"); + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + InitializeObjectAttributes(&ObjectAttributes, + &DstPathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + errCode = NtOpenFile(&hNewFile, GENERIC_READ | GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, 0, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + + if (NT_SUCCESS(errCode)) /* Destination exists */ + { + NtClose(hNewFile); + + if (!(dwFlags & MOVEFILE_REPLACE_EXISTING)) + { + SetLastError(ERROR_ALREADY_EXISTS); + return FALSE; + } + else if (GetFileAttributesW(lpNewFileName) & FILE_ATTRIBUTE_DIRECTORY) + { + SetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + } hFile = CreateFileW (lpExistingFileName, GENERIC_ALL, @@ -258,21 +301,8 @@ if (hFile == INVALID_HANDLE_VALUE) { - return FALSE; + return FALSE; } - - - /* validate & translate the filename */ - if (!RtlDosPathNameToNtPathName_U (lpNewFileName, - &DstPathU, - NULL, - NULL)) - { - WARN("Invalid destination path\n"); - CloseHandle(hFile); - SetLastError(ERROR_PATH_NOT_FOUND); - return FALSE; - } FileRename = RtlAllocateHeap( RtlGetProcessHeap(),

1 0

[amunger] 38193: Null dereference FTL.
by amunger＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: amunger Date: Sat Dec 20 03:30:12 2008 New Revision: 38193 URL: http://svn.reactos.org/svn/reactos?rev=38193&view=rev Log: Null dereference FTL. Modified: trunk/reactos/base/applications/sc/create.c Modified: trunk/reactos/base/applications/sc/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/creat… ============================================================================== --- trunk/reactos/base/applications/sc/create.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/create.c [iso-8859-1] Sat Dec 20 03:30:12 2008 @@ -36,7 +36,7 @@ _tprintf(_T("error control - %lu\n"), dwErrorControl); _tprintf(_T("Binary path - %s\n"), lpBinaryPathName); _tprintf(_T("load order group - %s\n"), lpLoadOrderGroup); - _tprintf(_T("tag - %lu\n"), *lpdwTagId); + _tprintf(_T("tag - %lu\n"), lpdwTagId); _tprintf(_T("dependincies - %s\n"), lpDependencies); _tprintf(_T("account start name - %s\n"), lpServiceStartName); _tprintf(_T("account password - %s\n"), lpPassword);

1 0

[dchapyshev] 38192: - Formatting fix
by dchapyshev＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: dchapyshev Date: Sat Dec 20 02:07:10 2008 New Revision: 38192 URL: http://svn.reactos.org/svn/reactos?rev=38192&view=rev Log: - Formatting fix Modified: trunk/reactos/dll/win32/kernel32/file/lfile.c Modified: trunk/reactos/dll/win32/kernel32/file/lfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lf… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/lfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/lfile.c [iso-8859-1] Sat Dec 20 02:07:10 2008 @@ -19,24 +19,19 @@ */ long WINAPI -_hread( - HFILE hFile, - LPVOID lpBuffer, - long lBytes - ) +_hread(HFILE hFile, LPVOID lpBuffer, long lBytes) { - DWORD NumberOfBytesRead; + DWORD NumberOfBytesRead; - if ( !ReadFile( - LongToHandle(hFile), - lpBuffer, - (DWORD) lBytes, - & NumberOfBytesRead, - NULL) ) - { - return HFILE_ERROR; - } - return NumberOfBytesRead; + if (!ReadFile(LongToHandle(hFile), + lpBuffer, + (DWORD) lBytes, + &NumberOfBytesRead, + NULL)) + { + return HFILE_ERROR; + } + return NumberOfBytesRead; } @@ -45,32 +40,27 @@ */ long WINAPI -_hwrite ( - HFILE hFile, - LPCSTR lpBuffer, - long lBytes - ) +_hwrite(HFILE hFile, LPCSTR lpBuffer, long lBytes) { - DWORD NumberOfBytesWritten; + DWORD NumberOfBytesWritten; - if (lBytes == 0) - { - if ( !SetEndOfFile((HANDLE) hFile ) ) - { - return HFILE_ERROR; - } - return 0; - } - if ( !WriteFile( - (HANDLE) hFile, - (LPVOID) lpBuffer, - (DWORD) lBytes, - & NumberOfBytesWritten, - NULL) ) - { - return HFILE_ERROR; - } - return NumberOfBytesWritten; + if (lBytes == 0) + { + if (!SetEndOfFile((HANDLE) hFile)) + { + return HFILE_ERROR; + } + return 0; + } + if (!WriteFile(LongToHandle(hFile), + (LPVOID) lpBuffer, + (DWORD) lBytes, + &NumberOfBytesWritten, + NULL)) + { + return HFILE_ERROR; + } + return NumberOfBytesWritten; } @@ -79,10 +69,7 @@ */ HFILE WINAPI -_lopen ( - LPCSTR lpPathName, - int iReadWrite - ) +_lopen(LPCSTR lpPathName, int iReadWrite) { DWORD dwAccess, dwSharing, dwCreation; @@ -128,10 +115,7 @@ */ HFILE WINAPI -_lcreat ( - LPCSTR lpPathName, - int iAttribute - ) +_lcreat(LPCSTR lpPathName, int iAttribute) { HANDLE hFile; @@ -153,11 +137,9 @@ */ int WINAPI -_lclose ( - HFILE hFile - ) +_lclose(HFILE hFile) { - return CloseHandle(LongToHandle(hFile)) ? 0 : HFILE_ERROR; + return CloseHandle(LongToHandle(hFile)) ? 0 : HFILE_ERROR; } @@ -166,11 +148,7 @@ */ LONG WINAPI -_llseek( - HFILE hFile, - LONG lOffset, - int iOrigin - ) +_llseek(HFILE hFile, LONG lOffset, int iOrigin) { return SetFilePointer(LongToHandle(hFile), lOffset,

1 0

[dchapyshev] 38191: - Fix 2 winetests
by dchapyshev＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: dchapyshev Date: Sat Dec 20 02:02:25 2008 New Revision: 38191 URL: http://svn.reactos.org/svn/reactos?rev=38191&view=rev Log: - Fix 2 winetests Modified: trunk/reactos/dll/win32/kernel32/file/lfile.c Modified: trunk/reactos/dll/win32/kernel32/file/lfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lf… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/lfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/lfile.c [iso-8859-1] Sat Dec 20 02:02:25 2008 @@ -28,8 +28,8 @@ DWORD NumberOfBytesRead; if ( !ReadFile( - (HANDLE) hFile, - (LPVOID) lpBuffer, + LongToHandle(hFile), + lpBuffer, (DWORD) lBytes, & NumberOfBytesRead, NULL) ) @@ -84,34 +84,42 @@ int iReadWrite ) { - DWORD dwAccessMask = 0; - DWORD dwShareMode = 0; + DWORD dwAccess, dwSharing, dwCreation; - if ( (iReadWrite & OF_READWRITE ) == OF_READWRITE ) - dwAccessMask = GENERIC_READ | GENERIC_WRITE; - else if ( (iReadWrite & OF_READ ) == OF_READ ) - dwAccessMask = GENERIC_READ; - else if ( (iReadWrite & OF_WRITE ) == OF_WRITE ) - dwAccessMask = GENERIC_WRITE; + if (iReadWrite & OF_CREATE) + { + dwCreation = CREATE_ALWAYS; + dwAccess = GENERIC_READ | GENERIC_WRITE; + } + else + { + dwCreation = OPEN_EXISTING; + switch(iReadWrite & 0x03) + { + case OF_READ: dwAccess = GENERIC_READ; break; + case OF_WRITE: dwAccess = GENERIC_WRITE; break; + case OF_READWRITE: dwAccess = GENERIC_READ | GENERIC_WRITE; break; + default: dwAccess = 0; break; + } + } - if ((iReadWrite & OF_SHARE_DENY_READ) == OF_SHARE_DENY_READ) - dwShareMode = FILE_SHARE_WRITE; - else if ((iReadWrite & OF_SHARE_DENY_WRITE) == OF_SHARE_DENY_WRITE ) - dwShareMode = FILE_SHARE_READ; - else if ((iReadWrite & OF_SHARE_EXCLUSIVE) == OF_SHARE_EXCLUSIVE) - dwShareMode = 0; - else - /* OF_SHARE_DENY_NONE, OF_SHARE_COMPAT and everything else */ - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + switch(iReadWrite & 0x70) + { + case OF_SHARE_EXCLUSIVE: dwSharing = 0; break; + case OF_SHARE_DENY_WRITE: dwSharing = FILE_SHARE_READ; break; + case OF_SHARE_DENY_READ: dwSharing = FILE_SHARE_WRITE; break; + case OF_SHARE_DENY_NONE: + case OF_SHARE_COMPAT: + default: dwSharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; + } - return (HFILE) CreateFileA( - lpPathName, - dwAccessMask, - dwShareMode, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); + return (HFILE) CreateFileA(lpPathName, + dwAccess, + dwSharing, + NULL, + dwCreation, + FILE_ATTRIBUTE_NORMAL, + NULL); } @@ -125,15 +133,18 @@ int iAttribute ) { - iAttribute &= FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; - return (HFILE) CreateFileA( - lpPathName, - GENERIC_READ | GENERIC_WRITE, - (FILE_SHARE_READ | FILE_SHARE_WRITE), - NULL, - CREATE_ALWAYS, - iAttribute, - NULL); + HANDLE hFile; + + iAttribute &= FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; + hFile = CreateFileA(lpPathName, + GENERIC_READ | GENERIC_WRITE, + (FILE_SHARE_READ | FILE_SHARE_WRITE), + NULL, + CREATE_ALWAYS, + iAttribute, + NULL); + + return HandleToLong(hFile); } @@ -146,11 +157,7 @@ HFILE hFile ) { - if (CloseHandle ((HANDLE)hFile)) - { - return 0; - } - return HFILE_ERROR; + return CloseHandle(LongToHandle(hFile)) ? 0 : HFILE_ERROR; } @@ -165,11 +172,10 @@ int iOrigin ) { - return SetFilePointer ( - (HANDLE) hFile, - lOffset, - NULL, - (DWORD) iOrigin); + return SetFilePointer(LongToHandle(hFile), + lOffset, + NULL, + (DWORD) iOrigin); } /* EOF */

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