Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[ion] 17811: Major refactoring of the exception handling code + misc fixes:

by ion＠svn.reactos.com

Major refactoring of the exception handling code + misc fixes: - Fix/add prototypes for RtlCaptureContext, RtlDispatchException and RtlUnwind - Fix EXCEPTION_REGISTRATION_RECORD structure and PEXCEPTION_ROUTINE - Add w32api excpt.h (based on mingw) with PSDK compatibility fixes - Fix seriously broken User-Mode Ldr thunk and APC Callback prototypes - Fix KiUserExceptionDispatcher - Remove useless NTDLL entrypoint - Implement NTDLL Ki* callbacks in ASM - Implement RtlCaptureContext - Fix RtlRaiseException to handle cases when a user-mode debugger is present - Fix RtlRaiseStatus as above, plus set the exception address and capture context - Little cleanup of RTL headers - Implement RtlpGetStackLimits, RtlpGetExceptionList, RtlpSetExceptionList, RtlpGetExceptionAddress in ASM - Fix RtlDispatchException, add cases for exceptions in the DPC stack and validate the validity of the exception frames. Add support for exception logging by the global flag. Use TRAP_FRAME/EXCPETION_FRAME instead of Context. - Fix RtlUnwind logic, support cases where it's called with custom arguments instead of NULL. - Reimplement RtlpCaptureContext to work properly, convert exception handler calling functions to INTEL syntax and fix some bugs (like checking for the right unwind flag, clearing volatile register values, etc. Also use some optimizations to increase speed. - Modify some kernel functions (like KeContextToTrapFrame, KiDispatchException, KiInitializeUserApc, etc.) to support a PKEXCEPTION_FRAME for future PPC compatibility. - Reimplement RtlCaptureUnicodeString/FreeUnicodeString as inlined probe macros and optimize them. - Export ExRaiseStatus/Exception as Rtl* - Reimplement NtContinue to have more platform-independent code, and to protect and validate user-mode context and parameters with SEH. - Implement KiRaiseException, add SEH to all user-mode parameters and when copying data to the user-mode stack. - Fix KiInitializeUserApc to use KeTrapFrameToContext, to save the debug registers, not to deliver APCs during v86 mode, and to protect user-mode stack operations in SEH and probing. Also make it generate the proper stack for the user-mode callback. - Implement KiUnexpectedInterrupt and KiCoprocessorError - Reimplement NtRaiseException in ASM to take advantage of optimizations due to the trap frame being in the stack when called through System call interface. - Fix Ntcontinue to respect AlertThread paramter - Fix some functiosn to return with KiServiceExit2 instead of KiServiceExit when required/needed - Fix KiDispatchException's logic, fix hacks when calling KeUserExceptionDispatcher, use correct context flags,... - Make NTDLL Ki* callbacks have SEH to protect them and return to kernel-mode with notification of any exceptions (the kernel-mode code to handle this isn't written yet though) Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/wine/exception.h Modified: trunk/reactos/lib/crt/except/unwind.c Modified: trunk/reactos/lib/crt/wine/scanf.c Modified: trunk/reactos/lib/dbghelp/stack.c Modified: trunk/reactos/lib/dbghelp/stackframe.h Modified: trunk/reactos/lib/dbghelp/thread.h Modified: trunk/reactos/lib/ntdll/def/ntdll.def Deleted: trunk/reactos/lib/ntdll/ldr/entry.S Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/lib/ntdll/main/dispatch.c Deleted: trunk/reactos/lib/ntdll/main/dllmain.c Added: trunk/reactos/lib/ntdll/main/i386/ Added: trunk/reactos/lib/ntdll/main/i386/dispatch.S Modified: trunk/reactos/lib/ntdll/ntdll.xml Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Modified: trunk/reactos/lib/rtl/exception.c Modified: trunk/reactos/lib/rtl/i386/except.s Modified: trunk/reactos/lib/rtl/i386/exception.c Modified: trunk/reactos/lib/rtl/rtl.h Added: trunk/reactos/lib/rtl/rtlp.h Modified: trunk/reactos/ntoskrnl/ex/error.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/ntoskrnl/ke/apc.c Added: trunk/reactos/ntoskrnl/ke/exception.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml Modified: trunk/reactos/ntoskrnl/ob/symlink.c Modified: trunk/reactos/ntoskrnl/ps/debug.c Deleted: trunk/reactos/ntoskrnl/rtl/capture.c Modified: trunk/reactos/ntoskrnl/rtl/i386/exception.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/w32api/include/ddk/ntddk.h Added: trunk/reactos/w32api/include/excpt.h _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/include/ndk/asm.h 2005-09-11 22:32:20 UTC (rev 17811) @@ -144,6 +144,10 @@ #define CONTEXT_FLAGS 0x0 #define CONTEXT_DR6 0x14 #define CONTEXT_FLOAT_SAVE 0x1C +#define CONTEXT_SEGGS 0x8C +#define CONTEXT_SEGFS 0x90 +#define CONTEXT_SEGES 0x94 +#define CONTEXT_SEGDS 0x98 #define CONTEXT_EDI 0x9C #define CONTEXT_ESI 0xA0 #define CONTEXT_EBX 0xA4 @@ -152,21 +156,37 @@ #define CONTEXT_EAX 0xB0 #define CONTEXT_EBP 0xB4 #define CONTEXT_EIP 0xB8 +#define CONTEXT_SEGCS 0xBC +#define CONTEXT_EFLAGS 0xC0 #define CONTEXT_ESP 0xC4 +#define CONTEXT_SEGSS 0xC8 #define CONTEXT_FLOAT_SAVE_CONTROL_WORD CONTEXT_FLOAT_SAVE + FN_CONTROL_WORD #define CONTEXT_FLOAT_SAVE_STATUS_WORD CONTEXT_FLOAT_SAVE + FN_STATUS_WORD #define CONTEXT_FLOAT_SAVE_TAG_WORD CONTEXT_FLOAT_SAVE + FN_TAG_WORD +/* EXCEPTION_RECORD Constants */ +#define EXCEPTION_RECORD_EXCEPTION_CODE 0x0 +#define EXCEPTION_RECORD_EXCEPTION_FLAGS 0x4 +#define EXCEPTION_RECORD_EXCEPTION_RECORD 0x8 +#define EXCEPTION_RECORD_EXCEPTION_ADDRESS 0xC +#define EXCEPTION_RECORD_NUMBER_PARAMETERS 0x10 +#define SIZEOF_EXCEPTION_RECORD 0x14 + /* TEB CONSTANTS */ #define TEB_EXCEPTION_LIST 0x0 #define TEB_STACK_BASE 0x4 #define TEB_STACK_LIMIT 0x8 #define TEB_FIBER_DATA 0x10 +#define TEB_PEB 0x30 +#define TEB_EXCEPTION_CODE 0x1A4 #define TEB_ACTIVATION_CONTEXT_STACK_POINTER 0x1A8 #define TEB_DEALLOCATION_STACK 0xE0C #define TEB_GUARANTEED_STACK_BYTES 0xF78 #define TEB_FLS_DATA 0xFB4 +/* PEB CONSTANTS */ +#define PEB_KERNEL_CALLBACK_TABLE 0x2C + /* FIBER CONSTANTS */ #define FIBER_PARAMETER 0x0 #define FIBER_EXCEPTION_LIST 0x4 _____ Modified: trunk/reactos/include/ndk/ntndk.h --- trunk/reactos/include/ndk/ntndk.h 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/include/ndk/ntndk.h 2005-09-11 22:32:20 UTC (rev 17811) @@ -11,7 +11,6 @@ /* C Standard Headers */ #include <stdarg.h> -#include <excpt.h> /* Helper Header */ #include <helper.h> _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-09-11 22:32:20 UTC (rev 17811) @@ -38,6 +38,11 @@ ); NTSYSAPI +VOID +NTAPI +RtlCaptureContext(OUT PCONTEXT ContextRecord); + +NTSYSAPI PVOID NTAPI RtlEncodePointer(IN PVOID Pointer); @@ -48,6 +53,14 @@ RtlDecodePointer(IN PVOID Pointer); NTSYSAPI +BOOLEAN +NTAPI +RtlDispatchException( + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context +); + +NTSYSAPI ULONG NTAPI RtlNtStatusToDosError(IN NTSTATUS Status); @@ -71,10 +84,10 @@ VOID NTAPI RtlUnwind( - PEXCEPTION_REGISTRATION RegistrationFrame, - PVOID ReturnAddress, - PEXCEPTION_RECORD ExceptionRecord, - ULONG EaxValue + IN PVOID TargetFrame OPTIONAL, + IN PVOID TargetIp OPTIONAL, + IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL, + IN PVOID ReturnValue ); /* _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/include/ndk/rtltypes.h 2005-09-11 22:32:20 UTC (rev 17811) @@ -10,7 +10,6 @@ #define _RTLTYPES_H /* DEPENDENCIES **************************************************************/ -#include "excpt.h" /* CONSTANTS *****************************************************************/ #define MAXIMUM_LEADBYTES 12 @@ -27,6 +26,7 @@ #define PEB_BASE (0x7FFDF000) +#define EXCEPTION_CHAIN_END ((PEXCEPTION_REGISTRATION_RECORD)-1) #define EXCEPTION_CONTINUE_SEARCH 0 #define EXCEPTION_EXECUTE_HANDLER 1 @@ -292,11 +292,11 @@ ); typedef EXCEPTION_DISPOSITION -(*PEXCEPTION_HANDLER)( - struct _EXCEPTION_RECORD*, - PVOID, - struct _CONTEXT*, - PVOID +(NTAPI *PEXCEPTION_ROUTINE)( + IN struct _EXCEPTION_RECORD *ExceptionRecord, + IN PVOID EstablisherFrame, + IN OUT struct _CONTEXT *ContextRecord, + IN OUT PVOID DispatcherContext ); typedef LONG (NTAPI *PVECTORED_EXCEPTION_HANDLER)( @@ -634,17 +634,12 @@ } MODULE_INFORMATION, *PMODULE_INFORMATION; /* END REVIEW AREA */ -#ifdef _INC_EXCPT -typedef struct _EXCEPTION_REGISTRATION +typedef struct _EXCEPTION_REGISTRATION_RECORD { - struct _EXCEPTION_REGISTRATION *prev; - PEXCEPTION_HANDLER handler; -} EXCEPTION_REGISTRATION, *PEXCEPTION_REGISTRATION; -#endif + struct _EXCEPTION_REGISTRATION_RECORD *Next; + PEXCEPTION_HANDLER Handler; +} EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; -typedef EXCEPTION_REGISTRATION EXCEPTION_REGISTRATION_RECORD; -typedef PEXCEPTION_REGISTRATION PEXCEPTION_REGISTRATION_RECORD; - typedef struct _CURDIR { UNICODE_STRING DosPath; _____ Modified: trunk/reactos/include/wine/exception.h --- trunk/reactos/include/wine/exception.h 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/include/wine/exception.h 2005-09-11 22:32:20 UTC (rev 17811) @@ -63,6 +63,12 @@ * -- AJ */ +typedef struct _EXCEPTION_REGISTRATION_RECORD +{ + struct _EXCEPTION_REGISTRATION_RECORD *prev; + PEXCEPTION_HANDLER handler; +} EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; + /* Define this if you want to use your compiler built-in __try/__except support. * This is only useful when compiling to a native Windows binary, as the built-in * compiler exceptions will most certainly not work under Winelib. _____ Modified: trunk/reactos/lib/crt/except/unwind.c --- trunk/reactos/lib/crt/except/unwind.c 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/crt/except/unwind.c 2005-09-11 22:32:20 UTC (rev 17811) @@ -1,11 +1,15 @@ #include "precomp.h" -#include <winternl.h> +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/umtypes.h> +#include <ndk/extypes.h> +#include <ndk/rtlfuncs.h> /* * @implemented */ void __cdecl -_global_unwind2(PEXCEPTION_REGISTRATION RegistrationFrame) +_global_unwind2(PEXCEPTION_REGISTRATION_RECORD RegistrationFrame) { #ifdef __GNUC__ RtlUnwind(RegistrationFrame, &&__ret_label, NULL, 0); @@ -17,14 +21,6 @@ } -// This is dragged over from WINE: - -typedef struct __EXCEPTION_FRAME -{ - struct __EXCEPTION_FRAME *Prev; - PEXCEPTION_HANDLER Handler; -} EXCEPTION_FRAME, *PEXCEPTION_FRAME; - /* VC++ extensions to Win32 SEH */ typedef struct _SCOPETABLE { @@ -35,8 +31,8 @@ typedef struct _MSVCRT_EXCEPTION_FRAME { - EXCEPTION_FRAME *prev; - void (*handler)(PEXCEPTION_RECORD, PEXCEPTION_FRAME, + PEXCEPTION_REGISTRATION_RECORD *prev; + void (*handler)(PEXCEPTION_RECORD, PEXCEPTION_REGISTRATION_RECORD, PCONTEXT, PEXCEPTION_RECORD); PSCOPETABLE scopetable; int trylevel; _____ Modified: trunk/reactos/lib/crt/wine/scanf.c --- trunk/reactos/lib/crt/wine/scanf.c 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/crt/wine/scanf.c 2005-09-11 22:32:20 UTC (rev 17811) @@ -41,8 +41,11 @@ #include <ctype.h> #include <internal/file.h> +#include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/umtypes.h> +#include <ndk/extypes.h> +#include <ndk/rtlfuncs.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/dbghelp/stack.c --- trunk/reactos/lib/dbghelp/stack.c 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/dbghelp/stack.c 2005-09-11 22:32:20 UTC (rev 17811) @@ -31,7 +31,6 @@ #include "winreg.h" #include "ntstatus.h" #include "thread.h" /* FIXME: must be included before winternl.h */ -#include "winternl.h" #include "wine/debug.h" #include "stackframe.h" @@ -127,10 +126,11 @@ /* cur_switch holds address of curr_stack's field in TEB in debuggee * address space */ + /* if (NtQueryInformationThread(hThread, ThreadBasicInformation, &info, sizeof(info), NULL) != STATUS_SUCCESS) goto done_err; - curr_switch = (unsigned long)info.TebBaseAddress + FIELD_OFFSET(TEB, cur_stack); + curr_switch = (unsigned long)info.TebBaseAddress + FIELD_OFFSET(TEB, cur_stack); */ if (!f_read_mem(hProcess, (void*)curr_switch, &next_switch, sizeof(next_switch), NULL)) { _____ Modified: trunk/reactos/lib/dbghelp/stackframe.h --- trunk/reactos/lib/dbghelp/stackframe.h 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/dbghelp/stackframe.h 2005-09-11 22:32:20 UTC (rev 17811) @@ -23,7 +23,10 @@ #include <string.h> #include <winnt.h> -#include <excpt.h> +#define NTOS_MODE_USER +#include <ndk/umtypes.h> +#include <ndk/extypes.h> +#include <ndk/rtlfuncs.h> #define SELECTOROF(ptr) (HIWORD(ptr)) #define OFFSETOF(ptr) (LOWORD(ptr)) @@ -77,23 +80,5 @@ #define CURRENT_STACK16 ((STACK16FRAME*)MapSL(NtCurrentTeb()->cur_stack)) #define CURRENT_DS (CURRENT_STACK16->ds) -/* Push bytes on the 16-bit stack of a thread; - * return a segptr to the first pushed byte - */ -static inline SEGPTR stack16_push( int size ) -{ - STACK16FRAME *frame = CURRENT_STACK16; - memmove( (char*)frame - size, frame, sizeof(*frame) ); - NtCurrentTeb()->cur_stack -= size; - return (SEGPTR)(NtCurrentTeb()->cur_stack + sizeof(*frame)); -} -/* Pop bytes from the 16-bit stack of a thread */ -static inline void stack16_pop( int size ) -{ - STACK16FRAME *frame = CURRENT_STACK16; - memmove( (char*)frame + size, frame, sizeof(*frame) ); - NtCurrentTeb()->cur_stack += size; -} - #endif /* __WINE_STACKFRAME_H */ _____ Modified: trunk/reactos/lib/dbghelp/thread.h --- trunk/reactos/lib/dbghelp/thread.h 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/dbghelp/thread.h 2005-09-11 22:32:20 UTC (rev 17811) @@ -26,7 +26,6 @@ #include <winbase.h> #include <winreg.h> #define WINE_NO_TEB -#include <winternl.h> #include <wine/windef16.h> struct _SECURITY_ATTRIBUTES; @@ -42,114 +41,4 @@ char output[1024]; /* current output line */ }; -/* Thread exception block - - flags in the comment: - 1-- win95 field - d-- win95 debug version - -2- nt field - --3 wine special - --n wine unused - !-- or -!- likely or observed collision - more problems (collected from mailing list): - psapi.dll 0x10/0x30 (expects nt fields) - ie4 0x40 - PESHiELD 0x23/0x30 (win95) -*/ -#ifndef WINE_TEB_DEFINED -#define WINE_TEB_DEFINED -typedef struct _TEB -{ - NT_TIB Tib; /* 12- 00 Thread information block */ - PVOID EnvironmentPointer; /* 12- 1c EnvironmentPointer (win95: tib flags + win16 mutex count) */ - CLIENT_ID ClientId; /* -2- 20 Process and thread id (win95: debug context) */ - HQUEUE16 queue; /* 1!- 28 Message queue (NT: DWORD ActiveRpcHandle)*/ - WORD pad1; /* --n 2a */ - PVOID ThreadLocalStoragePointer; /* 1-- 2c Pointer to TLS array */ - PEB *Peb; /* 12- 30 owning process PEB */ - DWORD LastErrorValue; /* -2- 34 Last error code */ - DWORD exit_code; /* 1-- 38 Termination status */ - WORD teb_sel; /* 1-- 3c Selector to TEB */ - WORD emu_sel; /* 1-n 3e 80387 emulator selector */ - DWORD unknown1; /* --n 40 */ - DWORD unknown2; /* --n 44 */ - DWORD unknown3; /* --n 48 */ - int thread_errno; /* --3 4c Per-thread errno (was: ring0_thread) */ - int thread_h_errno; /* --3 50 Per-thread h_errno (was: ptr to tdbx structure) */ - void *stack_base; /* 1-n 54 Stack base (unused) */ - void *exit_stack; /* 1-n 58 Exit stack */ - void *emu_data; /* --n 5c Related to 80387 emulation */ - DWORD last_error; /* 1-- 60 Last error code */ - HANDLE debug_cb; /* 1-n 64 Debugger context block */ - DWORD debug_thread; /* 1-n 68 Thread debugging this one (?) */ - void *pcontext; /* 1-n 6c Thread register context */ - DWORD cur_stack; /* --3 70 Current stack (was: unknown) */ - DWORD ThunkConnect; /* 1-n 74 */ - DWORD NegStackBase; /* 1-n 78 */ - WORD current_ss; /* 1-n 7c Another 16-bit stack selector */ - WORD pad2; /* --n 7e */ - void *ss_table; /* --n 80 Pointer to info about 16-bit stack */ - WORD stack_sel; /* --3 84 16-bit stack selector */ - HTASK16 htask16; /* --3 86 Win16 task handle */ - DWORD pad4[15]; /* --n 88 */ - ULONG CurrentLocale; /* -2- C4 */ - DWORD pad5[48]; /* --n C8 */ - DWORD delta_priority; /* 1-n 188 Priority delta */ - DWORD unknown4[7]; /* d-n 18c Unknown */ - void *create_data; /* d-n 1a8 Pointer to creation structure */ - DWORD suspend_count; /* d-n 1ac SuspendThread() counter */ - DWORD unknown5[6]; /* --n 1b0 Unknown */ - DWORD sys_count[4]; /* --3 1c8 Syslevel mutex entry counters */ - struct tagSYSLEVEL *sys_mutex[4]; /* --3 1d8 Syslevel mutex pointers */ - DWORD unknown6[5]; /* --n 1e8 Unknown */ - - /* The following are Wine-specific fields (NT: GDI stuff) */ - UINT code_page; /* --3 1fc Thread code page */ - DWORD unused[2]; /* --3 200 Was server buffer */ - DWORD gs_sel; /* --3 208 %gs selector for this thread */ - int request_fd; /* --3 20c fd for sending server requests */ - int reply_fd; /* --3 210 fd for receiving server replies */ - int wait_fd[2]; /* --3 214 fd for sleeping server requests */ - struct debug_info *debug_info; /* --3 21c Info for debugstr functions */ - void *pthread_data; /* --3 220 Data for pthread emulation */ - struct async_private *pending_list; /* --3 224 list of pending async operations */ - void *driver_data; /* --3 228 Graphics driver private data */ - DWORD dpmi_vif; /* --3 22c Protected mode virtual interrupt flag */ - DWORD vm86_pending; /* --3 230 Data for vm86 mode */ - void *vm86_ptr; /* --3 234 Data for vm86 mode */ - /* here is plenty space for wine specific fields (don't forget to change pad6!!) */ - - /* the following are nt specific fields */ - DWORD pad6[624]; /* --n 238 */ - UNICODE_STRING StaticUnicodeString; /* -2- bf8 used by advapi32 */ - WCHAR StaticUnicodeBuffer[261]; /* -2- c00 used by advapi32 */ - PVOID DeallocationStack; /* -2- e0c Base of the stack */ - LPVOID TlsSlots[64]; /* -2- e10 Thread local storage */ - LIST_ENTRY TlsLinks; /* -2- f10 */ - DWORD pad8[1]; /* --n f18 */ - PVOID ReservedForNtRpc; /* -2- f1c used by rpcrt4 */ - DWORD pad9[24]; /* --n f20 */ - PVOID ReservedForOle; /* -2- f80 used by ole32 (IErrorInfo*) */ - PVOID pad10[4]; /* --n f84 */ - PVOID TlsExpansionSlots; /* -2- f94 */ -} TEB; -#endif /* WINE_TEB_DEFINED */ - - -/* The thread information for 16-bit threads */ -/* NtCurrentTeb()->SubSystemTib points to this */ -typedef struct -{ - void *unknown; /* 00 unknown */ - UNICODE_STRING *exe_name; /* 04 exe module name */ - - /* the following fields do not exist under Windows */ - UNICODE_STRING exe_str; /* exe name string pointed to by exe_name */ - CURDIR curdir; /* current directory */ - WCHAR curdir_buffer[MAX_PATH]; -} WIN16_SUBSYSTEM_TIB; - -/* scheduler/thread.c */ -extern TEB *THREAD_InitStack( TEB *teb, DWORD stack_size ); - #endif /* __WINE_THREAD_H */ _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-09-11 22:32:20 UTC (rev 17811) @@ -33,7 +33,7 @@ DbgUiWaitStateChange@8 DbgUserBreakPoint@0 KiRaiseUserExceptionDispatcher@0 -KiUserApcDispatcher@20 +KiUserApcDispatcher@16 KiUserCallbackDispatcher@12 KiUserExceptionDispatcher@8 LdrAccessResource@16 _____ Deleted: trunk/reactos/lib/ntdll/ldr/entry.S --- trunk/reactos/lib/ntdll/ldr/entry.S 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/ntdll/ldr/entry.S 2005-09-11 22:32:20 UTC (rev 17811) @@ -1,18 +0,0 @@ -#include <roscfg.h> - -.extern ___true_LdrInitializeThunk@16 - -.globl _LdrInitializeThunk@16 -_LdrInitializeThunk@16: -#if defined(_M_IX86) - nop /* breakin overwrites this with "int 3" */ - jmp ___true_LdrInitializeThunk@16 -#elif defined(_M_ALPHA) - nop /* breakin overwrites this with "call_pal bpt" */ - br ___true_LdrInitializeThunk@16 -#elif defined(_M_MIPS) - nop /* breakin overwrites this with "break" */ - j ___true_LdrInitializeThunk@16 -#else -#error Unsupported architecture. -#endif _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-09-11 22:32:20 UTC (rev 17811) @@ -239,11 +239,11 @@ /* FUNCTIONS *****************************************************************/ -VOID STDCALL -__true_LdrInitializeThunk (ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4) +VOID +STDCALL +LdrpInit(PCONTEXT Context, + PVOID SystemArgument1, + PVOID SystemArgument2) { PIMAGE_NT_HEADERS NTHeaders; PEPFUNC EntryPoint; @@ -256,7 +256,7 @@ SYSTEM_BASIC_INFORMATION SystemInformation; NTSTATUS Status; - DPRINT("LdrInitializeThunk()\n"); + DPRINT("LdrpInit()\n"); if (NtCurrentPeb()->Ldr == NULL || NtCurrentPeb()->Ldr->Initialized == FALSE) { Peb = (PPEB)(PEB_BASE); _____ Modified: trunk/reactos/lib/ntdll/main/dispatch.c --- trunk/reactos/lib/ntdll/main/dispatch.c 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/ntdll/main/dispatch.c 2005-09-11 22:32:20 UTC (rev 17811) @@ -1,8 +1,9 @@ /* COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: User-mode APC support + * PROJECT: ReactOS NT Library * FILE: lib/ntdll/main/dispatch.c - * PROGRAMER: David Welch <welch(a)cwcom.net> + * PURPOSE: User-Mode NT Dispatchers + * PROGRAMERS: Alex Ionescu (alex(a)relsoft.net) + * David Welch <welch(a)cwcom.net> */ /* INCLUDES *****************************************************************/ @@ -11,16 +12,8 @@ #define NDEBUG #include <debug.h> -typedef NTSTATUS (STDCALL *KERNEL_CALLBACK_FUNCTION)(PVOID Argument, - ULONG ArgumentLength); +typedef NTSTATUS (STDCALL *USER_CALL)(PVOID Argument, ULONG ArgumentLength); -EXCEPTION_DISPOSITION -RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context); - -ULONG -RtlpDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context); /* FUNCTIONS ****************************************************************/ /* @@ -28,60 +21,32 @@ */ VOID STDCALL -KiUserApcDispatcher(PIO_APC_ROUTINE ApcRoutine, - PVOID ApcContext, - PIO_STATUS_BLOCK Iosb, - ULONG Reserved, - PCONTEXT Context) -{ - /* - * Call the APC - */ - //DPRINT1("ITS ME\n"); - ApcRoutine(ApcContext, - Iosb, - Reserved); - /* - * Switch back to the interrupted context - */ - //DPRINT1("switch back\n"); - NtContinue(Context, 1); -} - -/* - * @implemented - */ -VOID -STDCALL KiUserExceptionDispatcher(PEXCEPTION_RECORD ExceptionRecord, - PCONTEXT Context) + PCONTEXT Context) { - EXCEPTION_RECORD NestedExceptionRecord; - NTSTATUS Status; + EXCEPTION_RECORD NestedExceptionRecord; + NTSTATUS Status; - if(RtlpExecuteVectoredExceptionHandlers(ExceptionRecord, - Context) != ExceptionContinueExecution) + /* Dispatch the exception and check the result */ + if(RtlDispatchException(ExceptionRecord, Context)) { - Status = NtContinue(Context, FALSE); + /* Continue executing */ + Status = NtContinue(Context, FALSE); } - else + else { - if(RtlpDispatchException(ExceptionRecord, Context) != ExceptionContinueExecution) - { - Status = NtContinue(Context, FALSE); - } - else - { - Status = NtRaiseException(ExceptionRecord, Context, FALSE); - } + /* Raise an exception */ + Status = NtRaiseException(ExceptionRecord, Context, FALSE); } - NestedExceptionRecord.ExceptionCode = Status; - NestedExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - NestedExceptionRecord.ExceptionRecord = ExceptionRecord; - NestedExceptionRecord.NumberParameters = Status; + /* Setup the Exception record */ + NestedExceptionRecord.ExceptionCode = Status; + NestedExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; + NestedExceptionRecord.ExceptionRecord = ExceptionRecord; + NestedExceptionRecord.NumberParameters = Status; - RtlRaiseException(&NestedExceptionRecord); + /* Raise the exception */ + RtlRaiseException(&NestedExceptionRecord); } /* @@ -91,14 +56,16 @@ STDCALL KiRaiseUserExceptionDispatcher(VOID) { - EXCEPTION_RECORD ExceptionRecord; + EXCEPTION_RECORD ExceptionRecord; - ExceptionRecord.ExceptionCode = ((PTEB)NtCurrentTeb())->ExceptionCode; - ExceptionRecord.ExceptionFlags = 0; - ExceptionRecord.ExceptionRecord = NULL; - ExceptionRecord.NumberParameters = 0; + /* Setup the exception record */ + ExceptionRecord.ExceptionCode = ((PTEB)NtCurrentTeb())->ExceptionCode; + ExceptionRecord.ExceptionFlags = 0; + ExceptionRecord.ExceptionRecord = NULL; + ExceptionRecord.NumberParameters = 0; - RtlRaiseException(&ExceptionRecord); + /* Raise the exception */ + RtlRaiseException(&ExceptionRecord); } /* @@ -106,16 +73,13 @@ */ VOID STDCALL -KiUserCallbackDispatcher(ULONG RoutineIndex, - PVOID Argument, - ULONG ArgumentLength) +KiUserCallbackDispatcher(ULONG Index, + PVOID Argument, + ULONG ArgumentLength) { - PPEB Peb; - NTSTATUS Status; - KERNEL_CALLBACK_FUNCTION Callback; - - Peb = NtCurrentPeb(); - Callback = (KERNEL_CALLBACK_FUNCTION)Peb->KernelCallbackTable[RoutineIndex]; - Status = Callback(Argument, ArgumentLength); - ZwCallbackReturn(NULL, 0, Status); + /* Return with the result of the callback function */ + ZwCallbackReturn(NULL, + 0, + ((USER_CALL)(NtCurrentPeb()->KernelCallbackTable[Index])) + (Argument, ArgumentLength)); } _____ Deleted: trunk/reactos/lib/ntdll/main/dllmain.c --- trunk/reactos/lib/ntdll/main/dllmain.c 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/ntdll/main/dllmain.c 2005-09-11 22:32:20 UTC (rev 17811) @@ -1,21 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/ntdll/main/dllmain.c - * PURPOSE: - * PROGRAMMER: - */ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -BOOL WINAPI DllMainCRTStartup(HINSTANCE hinstDll, - DWORD fdwReason, - LPVOID fImpLoad) -{ - return TRUE; -} - -/* EOF */ _____ Added: trunk/reactos/lib/ntdll/main/i386/dispatch.S --- trunk/reactos/lib/ntdll/main/i386/dispatch.S 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/ntdll/main/i386/dispatch.S 2005-09-11 22:32:20 UTC (rev 17811) @@ -0,0 +1,186 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NT Library + * FILE: lib/ntdll/main/i386/dispatch.S + * PURPOSE: User-Mode NT Dispatchers + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#include <ndk/asm.h> +#include <ndk/i386/segment.h> +.intel_syntax noprefix + +#define EXCEPTION_NONCONTINUABLE 1 +#define EXCEPTION_UNWINDING 2 +#define EXCEPTION_EXIT_UNWIND 4 +#define EXCEPTION_UNWIND (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND) + +#define STATUS_CALLBACK_POP_STACK 0xC0000423 + +#define ExceptionContinueSearch 1 + +/* FUNCTIONS ****************************************************************/ + +.globl _LdrInitializeThunk@16 +_LdrInitializeThunk@16: + + /* Get the APC Context */ + lea eax, [esp+16] + + /* Send it as the first parameter */ + mov [esp+4], eax + + /* Terminate the frame list */ + xor ebp, ebp + + /* Jump into the C initialization routine */ + jmp _LdrpInit@12 + +.globl _KiUserExceptionApcHandler@16 +_KiUserApcExceptionHandler@16: + + /* Put the exception record in ECX and check the Flags */ + mov ecx, [esp+4] + test dword ptr [ecx+EXCEPTION_RECORD_EXCEPTION_FLAGS], EXCEPTION_UNWIND + jz .return + + /* Test alert the thread */ + call _NtTestAlert@0 + +.return: + /* We'll continue */ + mov eax, ExceptionContinueSearch + ret 16 + +.globl _KiUserApcDispatcher@16 +_KiUserApcDispatcher@16: + + /* Put the Context in EDI */ + lea edi, [esp+16] + + /* Get the ApcRoutine and call it */ + pop eax + call eax + + /* Switch back to the context */ + push 1 + push edi + call _ZwContinue@8 + +.globl _KiUserCallbackExceptionHandler@16 +_KiUserCallbackExceptionHandler@16: + + /* Put the exception record in ECX and check the Flags */ + mov ecx, [esp+4] + test dword ptr [ecx+EXCEPTION_RECORD_EXCEPTION_FLAGS], EXCEPTION_UNWIND + jz return + + /* Tell the kernel to invalidate the stack */ + push STATUS_CALLBACK_POP_STACK + push 0 + push 0 + call _ZwCallbackReturn@12 + +return: + /* We'll continue */ + mov eax, ExceptionContinueSearch + ret 16 + +.globl _KiUserCallbackDispatcher@12 +_KiUserCallbackDispatcher@12: + + /* Get the callback Index */ + add esp, 4 + pop edx + + /* Get the callback table */ + mov eax, [fs:TEB_PEB] + mov eax, [eax+PEB_KERNEL_CALLBACK_TABLE] + + /* Call the routine */ + call [eax+edx*4] + + /* Return from callback */ + push eax + push 0 + push 0 + call _ZwCallbackReturn@12 + +.globl _KiRaiseUserExceptionDispatcher@0 +_KiRaiseUserExceptionDispatcher@0: + + /* Setup stack for EXCEPTION_RECORD */ + push ebp + mov ebp, esp + sub esp, SIZEOF_EXCEPTION_RECORD + + /* Fill out the record */ + mov eax, [fs:TEB_SELECTOR] + mov eax, [eax+TEB_EXCEPTION_CODE] + mov [esp+EXCEPTION_RECORD_EXCEPTION_CODE], eax + mov dword ptr [esp+EXCEPTION_RECORD_EXCEPTION_FLAGS], 0 + mov dword ptr [esp+EXCEPTION_RECORD_EXCEPTION_RECORD], 0 + mov dword ptr [esp+EXCEPTION_RECORD_NUMBER_PARAMETERS], 0 + + /* Raise the exception */ + push esp + call _RtlRaiseException@4 + + /* Return exception code */ + mov eax, [esp+EXCEPTION_RECORD_EXCEPTION_CODE] + mov esp, ebp + pop ebp + ret + +.globl _KiUserExceptionDispatcher@8 +_KiUserExceptionDispatcher@8: + + /* Save the Context and Exception Records */ + mov ecx, [esp+4] + mov ebx, [esp] + + /* Dispatch the exception */ + push ecx + push ebx + call _RtlDispatchException@8 + + /* Check for success */ + or al, al + jz RaiseException + + /* We're fine, continue execution */ + push 0 + push ecx + call _ZwContinue@8 + + /* Exit */ + jmp Exit + +RaiseException: + /* Pop off the records */ + pop ebx + pop ecx + + /* Raise the exception */ + push 0 + push ecx + push ebx + call _ZwRaiseException@12 + +Exit: + /* Allocate space for the nested exception record */ + add esp, -SIZEOF_EXCEPTION_RECORD + + /* Set it up */ + mov [esp+EXCEPTION_RECORD_EXCEPTION_CODE], eax + mov dword ptr [esp+EXCEPTION_RECORD_EXCEPTION_FLAGS], EXCEPTION_NONCONTINUABLE + mov [esp+EXCEPTION_RECORD_EXCEPTION_RECORD], ebx + mov dword ptr [esp+EXCEPTION_RECORD_NUMBER_PARAMETERS], 0 + + /* Raise the exception */ + push esp + call _RtlRaiseException@4 + ret 8 + _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-09-11 22:32:20 UTC (rev 17811) @@ -24,14 +24,19 @@ <file>print.c</file> </directory> <directory name="ldr"> - <file>entry.S</file> <file>res.c</file> <file>startup.c</file> <file>utils.c</file> </directory> <directory name="main"> - <file>dispatch.c</file> - <file>dllmain.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>dispatch.S</file> + </directory> + </if> + <ifnot property="ARCH" value="i386"> + <file>dispatch.c</file> + </ifnot> </directory> <directory name="rtl"> <file>libsupp.c</file> _____ Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c --- trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-09-11 21:19:32 UTC (rev 17810) +++ trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-09-11 22:32:20 UTC (rev 17811) @@ -1,9 +1,10 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS NT User-Mode DLL * FILE: lib/ntdll/rtl/libsup.c - * PURPOSE: Rtl library support routines - * PROGRAMMER: Gunnar Dalsnes + * PURPOSE: RTL Support Routines + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * Gunnar Dalsnes */ /* INCLUDES *****************************************************************/ @@ -14,6 +15,13 @@ /* FUNCTIONS ***************************************************************/ +BOOLEAN +NTAPI +RtlpCheckForActiveDebugger(VOID) +{ + return (NtCurrentPeb()->BeingDebugged); +} + KPROCESSOR_MODE STDCALL RtlpGetMode() @@ -28,7 +36,6 @@ return NtCurrentPeb(); } - /* * @implemented */ @@ -39,7 +46,6 @@ Peb->FastPebLockRoutine (Peb->FastPebLock); } - /* * @implemented */ @@ -57,8 +63,8 @@ STDCALL RtlGetNtGlobalFlags(VOID) { - PPEB pPeb = NtCurrentPeb(); - return pPeb->NtGlobalFlag; + PPEB pPeb = NtCurrentPeb(); + return pPeb->NtGlobalFlag; } NTSTATUS @@ -82,7 +88,7 @@ RtlInitializeHeapLock( PRTL_CRITICAL_SECTION CriticalSection) { - return RtlInitializeCriticalSection(CriticalSection ); + return RtlInitializeCriticalSection(CriticalSection); } NTSTATUS @@ -127,6 +133,27 @@ } #endif +BOOLEAN +NTAPI +RtlpHandleDpcStackException(IN PEXCEPTION_REGISTRATION_RECORD RegistrationFrame, + IN ULONG_PTR RegistrationFrameEnd, + IN OUT PULONG_PTR StackLow, + IN OUT PULONG_PTR StackHigh) +{ + /* There's no such thing as a DPC stack in user-mode */ + return FALSE; +} + +VOID +NTAPI [truncated at 1000 lines; 3094 more skipped]

19 years

[greatlrd] 17810: Do not compile cmd to unicode, if we do pipe will be 100% broken then.

by greatlrd＠svn.reactos.com

Do not compile cmd to unicode, if we do pipe will be 100% broken then. Modified: trunk/reactos/subsys/system/cmd/cmd.xml _____ Modified: trunk/reactos/subsys/system/cmd/cmd.xml --- trunk/reactos/subsys/system/cmd/cmd.xml 2005-09-11 21:05:32 UTC (rev 17809) +++ trunk/reactos/subsys/system/cmd/cmd.xml 2005-09-11 21:19:32 UTC (rev 17810) @@ -4,8 +4,6 @@ <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> - <define name="UNICODE" /> - <define name="_UNICODE" /> <pch>precomp.h</pch> <file>alias.c</file> <file>attrib.c</file> @@ -67,8 +65,6 @@ <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>kernel32</library> <library>cmd_base</library> <file>main.c</file>

19 years

[gdalsnes] 17809: fix referencing bug (ros crashed during setup if mousemove) in co_WinPosSearchChildren

by gdalsnes＠svn.reactos.com

fix referencing bug (ros crashed during setup if mousemove) in co_WinPosSearchChildren Modified: trunk/reactos/subsys/win32k/include/userfuncs.h Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/object.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/include/userfuncs.h --- trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-11 20:41:39 UTC (rev 17808) +++ trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-11 21:05:32 UTC (rev 17809) @@ -14,14 +14,15 @@ DPRINT1("obj 0x%x dereffed to %i refs\n",_obj_, USER_BODY_TO_HEADER(_obj_)->RefCount-1); \ ObmDereferenceObject2(_obj_); \ } + #endif +#define ObmDereferenceObject(_obj_) ObmDereferenceObject2(_obj_) - #define ASSERT_REFS_CO(_obj_) \ { \ LONG ref = USER_BODY_TO_HEADER(_obj_)->RefCount;\ @@ -59,7 +60,7 @@ VOID FASTCALL ObmReferenceObject(PVOID obj); -BOOL FASTCALL ObmDereferenceObject(PVOID obj); +BOOL FASTCALL ObmDereferenceObject2(PVOID obj); PWINDOW_OBJECT FASTCALL IntGetWindowObject(HWND hWnd); PVOID FASTCALL _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-09-11 20:41:39 UTC (rev 17808) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-09-11 21:05:32 UTC (rev 17809) @@ -773,7 +773,7 @@ USHORT HitTest; UserRefObjectCo(MsgWindow); - + if(co_IntTranslateMouseMessage(ThreadQueue, &Msg->Msg, &HitTest, TRUE)) /* FIXME - check message filter again, if the message doesn't match anymore, search again */ @@ -782,7 +782,7 @@ /* eat the message, search again */ goto CheckMessages; } - + if(ThreadQueue->CaptureWindow == NULL) { co_IntSendHitTestMessages(ThreadQueue, &Msg->Msg); _____ Modified: trunk/reactos/subsys/win32k/ntuser/object.c --- trunk/reactos/subsys/win32k/ntuser/object.c 2005-09-11 20:41:39 UTC (rev 17808) +++ trunk/reactos/subsys/win32k/ntuser/object.c 2005-09-11 21:05:32 UTC (rev 17809) @@ -275,7 +275,7 @@ } -BOOL FASTCALL ObmDereferenceObject(PVOID obj) +BOOL FASTCALL ObmDereferenceObject2(PVOID obj) { PUSER_OBJECT_HEADER hdr = USER_BODY_TO_HEADER(obj); _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-11 20:41:39 UTC (rev 17808) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-11 21:05:32 UTC (rev 17809) @@ -1483,20 +1483,23 @@ } #endif +/* wine server: child_window_from_point +Caller must dereference the "returned" Window +*/ static VOID FASTCALL co_WinPosSearchChildren( PWINDOW_OBJECT ScopeWin, PUSER_MESSAGE_QUEUE OnlyHitTests, POINT *Point, - PWINDOW_OBJECT* Window, + PWINDOW_OBJECT* Window, USHORT *HitTest ) { PWINDOW_OBJECT Current; HWND *List, *phWnd; - + ASSERT_REFS_CO(ScopeWin); if ((List = IntWinListChildren(ScopeWin))) @@ -1517,24 +1520,24 @@ continue; } - if (!IntPtInWindow(Current, Point->x, Point->y)) + if (!IntPtInWindow(Current, Point->x, Point->y)) { - continue; + continue; } - + + if (*Window) UserDerefObject(*Window); *Window = Current; + UserRefObject(*Window); if (Current->Style & WS_MINIMIZE) { *HitTest = HTCAPTION; - UserRefObject(Current); break; } if (Current->Style & WS_DISABLED) { *HitTest = HTERROR; - UserRefObject(Current); break; } @@ -1561,13 +1564,12 @@ co_WinPosSearchChildren(Current, OnlyHitTests, Point, Window, HitTest); } - UserRefObject(Current); UserDerefObjectCo(Current); break; } ExFreePool(List); - } + } } /* wine: WINPOS_WindowFromPoint */

19 years

[greatlrd] 17808: Make some more dymatic buffer and correct some free()

by greatlrd＠svn.reactos.com

Make some more dymatic buffer and correct some free() Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-11 20:26:36 UTC (rev 17807) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-11 20:41:39 UTC (rev 17808) @@ -295,7 +295,7 @@ static VOID Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest) { - TCHAR szFullName[CMDLINE_LENGTH]; + TCHAR *szFullName=NULL; TCHAR *first = NULL; TCHAR *rest = NULL; TCHAR *full = NULL; @@ -321,7 +321,7 @@ rest = malloc ( (_tcslen(Rest) + 512) * sizeof(TCHAR)); if (rest == NULL) { - free (full); + free (first); error_out_of_memory(); return ; } @@ -329,13 +329,23 @@ full = malloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); if (full == NULL) { - free (full); + free (first); free (rest); error_out_of_memory(); return ; } + szFullName = malloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); + if (full == NULL) + { + free (first); + free (rest); + free (full); + error_out_of_memory(); + return ; + } + /* Though it was already parsed once, we have a different set of rules for parsing before we pass to CreateProccess */ if(!_tcschr(Full,_T('\"'))) @@ -398,6 +408,11 @@ if (!working) ConErrResPuts (STRING_FREE_ERROR1); + free (first); + free (rest); + free (full); + free (szFullName); + return; } @@ -406,6 +421,11 @@ if (!SearchForExecutable (first, szFullName)) { error_bad_command (); + + free (first); + free (rest); + free (full); + free (szFullName); return; } @@ -495,7 +515,8 @@ free(first); free(rest); - free(full); + free(full); + free (szFullName); }

19 years

[turner] 17807: simple fix for 'del foo' where foo is a folder.

by turner＠svn.reactos.com

simple fix for 'del foo' where foo is a folder. Modified: trunk/reactos/subsys/system/cmd/del.c _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-09-11 20:16:37 UTC (rev 17806) +++ trunk/reactos/subsys/system/cmd/del.c 2005-09-11 20:26:36 UTC (rev 17807) @@ -201,7 +201,7 @@ } } - GetFullPathName (FileName, + GetFullPathName (szFileName, MAX_PATH, szFullPath, &pFilePart);

19 years

[greatlrd] 17806: Do not crash if the prompt command name are binger that 260char or the command line.

by greatlrd＠svn.reactos.com

Do not crash if the prompt command name are binger that 260char or the command line. Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/start.c Modified: trunk/reactos/subsys/system/cmd/where.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-11 19:40:45 UTC (rev 17805) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-11 20:16:37 UTC (rev 17806) @@ -295,7 +295,7 @@ static VOID Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest) { - TCHAR szFullName[MAX_PATH]; + TCHAR szFullName[CMDLINE_LENGTH]; TCHAR *first = NULL; TCHAR *rest = NULL; TCHAR *full = NULL; _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-09-11 19:40:45 UTC (rev 17805) +++ trunk/reactos/subsys/system/cmd/start.c 2005-09-11 20:16:37 UTC (rev 17806) @@ -19,7 +19,7 @@ INT cmd_start (LPTSTR First, LPTSTR Rest) { - TCHAR szFullName[MAX_PATH]; + TCHAR szFullName[CMDLINE_LENGTH]; TCHAR first[CMDLINE_LENGTH]; TCHAR *rest = NULL; TCHAR *param = NULL; @@ -117,12 +117,12 @@ if (!_tcscmp (first + 1, _T(":")) && _istalpha (*first)) { - TCHAR szPath[MAX_PATH]; + TCHAR szPath[CMDLINE_LENGTH]; _tcscpy (szPath, _T("A:")); szPath[0] = _totupper (*first); SetCurrentDirectory (szPath); - GetCurrentDirectory (MAX_PATH, szPath); + GetCurrentDirectory (CMDLINE_LENGTH, szPath); if (szPath[0] != (TCHAR)_totupper (*first)) ConErrResPuts (STRING_FREE_ERROR1); _____ Modified: trunk/reactos/subsys/system/cmd/where.c --- trunk/reactos/subsys/system/cmd/where.c 2005-09-11 19:40:45 UTC (rev 17805) +++ trunk/reactos/subsys/system/cmd/where.c 2005-09-11 20:16:37 UTC (rev 17806) @@ -86,7 +86,7 @@ BOOL SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pExtension) { - TCHAR szPathBuffer[MAX_PATH]; + TCHAR szPathBuffer[CMDLINE_LENGTH]; LPTSTR pszBuffer = NULL; DWORD dwBuffer, len; LPTSTR s,f; @@ -106,7 +106,7 @@ #endif if (GetFullPathName (pFileName, - MAX_PATH, + CMDLINE_LENGTH, szPathBuffer, &pFilePart) ==0) return FALSE; @@ -129,7 +129,7 @@ } /* search in current directory */ - len = GetCurrentDirectory (MAX_PATH, szPathBuffer); + len = GetCurrentDirectory (CMDLINE_LENGTH, szPathBuffer); if (szPathBuffer[len - 1] != _T('\\')) { szPathBuffer[len] = _T('\\');

19 years

[turner] 17805: Windows style auto complete should only return folders then the preceding command is cd or rd.

by turner＠svn.reactos.com

Windows style auto complete should only return folders then the preceding command is cd or rd. Modified: trunk/reactos/subsys/system/cmd/filecomp.c _____ Modified: trunk/reactos/subsys/system/cmd/filecomp.c --- trunk/reactos/subsys/system/cmd/filecomp.c 2005-09-11 17:59:52 UTC (rev 17804) +++ trunk/reactos/subsys/system/cmd/filecomp.c 2005-09-11 19:40:45 UTC (rev 17805) @@ -541,7 +541,14 @@ static INT Sel; BOOL NeededQuote = FALSE; strOut[0] = _T('\0'); + BOOL ShowAll = TRUE; + TCHAR * line = strIN; + while (_istspace (*line)) + line++; + if(!_tcsncmp (line, _T("rd "), 3) || !_tcsncmp (line, _T("cd "), 3)) + ShowAll = FALSE; + /* Copy the string, str can be edited and orginal should not be */ _tcscpy(str,strIN); _tcscpy(szOrginal,strIN); @@ -615,6 +622,15 @@ if(!_tcscmp (file.cFileName, _T(".")) || !_tcscmp (file.cFileName, _T(".."))) continue; + + /* Don't show files when they are doing 'cd' or 'rd' */ + if(!ShowAll) + { + DWORD attr = GetFileAttributes (file.cFileName); + if(attr != 0xFFFFFFFF && (!(attr & FILE_ATTRIBUTE_DIRECTORY))) + continue; + } + /* Add the file to the list of files */ if(FileList == NULL) {

19 years

[gvg] 17804: The system menu is allowed to have an unnamed entry which is not a separator

by gvg＠svn.reactos.com

The system menu is allowed to have an unnamed entry which is not a separator Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-09-11 17:47:00 UTC (rev 17803) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-09-11 17:59:52 UTC (rev 17804) @@ -824,7 +824,10 @@ } else { - MenuItem->fType |= MF_SEPARATOR; + if (0 == (MenuObject->MenuInfo.Flags & MF_SYSMENU)) + { + MenuItem->fType |= MF_SEPARATOR; + } RtlInitUnicodeString(&MenuItem->Text, NULL); } }

19 years

[greatlrd] 17803: Update the swedish translation by Harteex

by greatlrd＠svn.reactos.com

Update the swedish translation by Harteex Modified: trunk/reactos/lib/cpl/desk/sv.rc _____ Modified: trunk/reactos/lib/cpl/desk/sv.rc --- trunk/reactos/lib/cpl/desk/sv.rc 2005-09-11 14:48:32 UTC (rev 17802) +++ trunk/reactos/lib/cpl/desk/sv.rc 2005-09-11 17:47:00 UTC (rev 17803) @@ -1,4 +1,5 @@ -/* Swedish resources by David Nordenberg */ +/* Swedish resources by David Nordenberg + Updated 2005-07-09 by Andreas Bjerkeholt */ LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT @@ -26,8 +27,32 @@ CAPTION "Skõrmslõckare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Det hõr utrymmet õr avsiktligt lõmnats tomt",IDC_STATIC,66, - 110,112,8 + GROUPBOX "&Skõrmslõckare",IDC_SCREENS_DUMMY, 5, 7, 238, 176 + + LTEXT "Skõrmslõckare:",IDC_STATIC,13, 24, 71, 9 + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,13, 34, 171, 109 + PUSHBUTTON "&Ta bort",IDC_SCREENS_DELETE, 189,47,39,10 + PUSHBUTTON "&Lõgg till",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + + PUSHBUTTON "&Instõllningar",IDC_SCREENS_SETTINGS,138, 164, 48, 12,WS_GROUP + PUSHBUTTON "&F÷rhandsvisa",IDC_SCREENS_TESTSC,190, 164, 48, 12 + + CONTROL "&Krõv l÷senord f÷r att Õtervõnda.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 + + LTEXT "&Võnta:",IDC_STATIC,13, 150, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,52, 149, 12, 12 + LTEXT "minuter innan skõrmslõckaren visas.",IDC_STATIC,70, 151, 147, 9 + + GROUPBOX "&Energisparfunktioner f÷r din bildskõrm",IDC_SCREENS_DUMMY,5, 186, 238, 35 + LTEXT "F÷r att õndra energisparfunktionerna f÷r din bildskõrm,\nklicka pÕ Instõllningar.", + IDC_STATIC,16, 199, 155, 19 + PUSHBUTTON "Ins&tõllningar",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -35,13 +60,13 @@ CAPTION "Utseende" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Det hõr utrymmet õr avsiktligt lõmnats tomt",IDC_STATIC,66, - 110,112,8 + LTEXT "Det hõr utrymmet har avsiktligt\nlõmnats tomt",IDC_STATIC,66, + 110,112,20 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Bildskõrmsinstõllningar" +CAPTION "Instõllningar" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Bild:",1820,3,140,30,8 @@ -49,13 +74,13 @@ GROUPBOX "&Bildyta",1818,3,160,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 30,170,58,17 - LTEXT "Mindre",1815,9,170,15,8,NOT WS_GROUP - LTEXT "Mer",1816,93,170,21,8,NOT WS_GROUP + LTEXT "Lõgre",1815,9,170,19,8,NOT WS_GROUP + LTEXT "H÷gre",1816,93,170,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Fõrger",1817,125,160,115,43 COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Statisk",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,188,103,9 PUSHBUTTON "&Avancerat...",IDC_SETTINGS_ADVANCED,306,205,56,14 END

19 years

[gdalsnes] 17802: -refcount reworking (simplification & improvement)

by gdalsnes＠svn.reactos.com

-refcount reworking (simplification & improvement) -make functions deal with pointers, not handles -misc formatting Modified: trunk/reactos/subsys/win32k/eng/window.c Modified: trunk/reactos/subsys/win32k/include/userfuncs.h Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/ntuser/object.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/timer.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/objects/color.c _____ Modified: trunk/reactos/subsys/win32k/eng/window.c --- trunk/reactos/subsys/win32k/eng/window.c 2005-09-11 14:38:57 UTC (rev 17801) +++ trunk/reactos/subsys/win32k/eng/window.c 2005-09-11 14:48:32 UTC (rev 17802) @@ -287,7 +287,7 @@ } /* Get window object */ - Window = IntGetWindowObject(WndObjInt->Hwnd); + Window = UserGetWindowObject(WndObjInt->Hwnd); if (Window == NULL) { DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); @@ -297,7 +297,6 @@ { /* Remove object from window */ RemoveEntryList(&WndObjInt->ListEntry); - IntReleaseWindowObject(Window); } if (!calledFromUser){ _____ Modified: trunk/reactos/subsys/win32k/include/userfuncs.h --- trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-11 14:38:57 UTC (rev 17801) +++ trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-11 14:48:32 UTC (rev 17802) @@ -2,15 +2,57 @@ #define _WIN32K_USERFUNCS_H -#define ASSERT_REFS_CO(obj) \ + + + +PMENU_OBJECT FASTCALL UserGetMenuObject(HMENU hMenu); + + +#if 0 +#define ObmDereferenceObject(_obj_) \ { \ - LONG ref = USER_BODY_TO_HEADER(obj)->RefCount;\ + DPRINT1("obj 0x%x dereffed to %i refs\n",_obj_, USER_BODY_TO_HEADER(_obj_)->RefCount-1); \ + ObmDereferenceObject2(_obj_); \ +} +#endif + + + + + + + +#define ASSERT_REFS_CO(_obj_) \ +{ \ + LONG ref = USER_BODY_TO_HEADER(_obj_)->RefCount;\ if (!(ref >= 1)){ \ - DPRINT1("obj 0x%x, refs %i\n", obj, ref); \ + DPRINT1("ASSERT: obj 0x%x, refs %i\n", _obj_, ref); \ ASSERT(FALSE); \ } \ } +#if 0 +#define ASSERT_REFS_CO(_obj_) \ +{ \ + PSINGLE_LIST_ENTRY e; \ + BOOL gotit=FALSE; \ + LONG ref = USER_BODY_TO_HEADER(_obj_)->RefCount;\ + if (!(ref >= 1)){ \ + DPRINT1("obj 0x%x, refs %i\n", _obj_, ref); \ + ASSERT(FALSE); \ + } \ + \ + e = PsGetWin32Thread()->ReferencesList.Next; \ + while (e) \ + { \ + PUSER_REFERENCE_ENTRY ref = CONTAINING_RECORD(e, USER_REFERENCE_ENTRY, Entry); \ + if (ref->obj == _obj_){ gotit=TRUE; break; } \ + e = e->Next; \ + } \ + ASSERT(gotit); \ +} +#endif + #define DUMP_REFS(obj) DPRINT1("obj 0x%x, refs %i\n",obj, USER_BODY_TO_HEADER(obj)->RefCount) @@ -19,11 +61,6 @@ VOID FASTCALL ObmReferenceObject(PVOID obj); BOOL FASTCALL ObmDereferenceObject(PVOID obj); -#define IntReferenceWindowObject(o) ObmReferenceObject(o) - -#define UserDerefObject(o) ObmReferenceObject(o) - -VOID FASTCALL IntReleaseWindowObject(PWINDOW_OBJECT Window); PWINDOW_OBJECT FASTCALL IntGetWindowObject(HWND hWnd); PVOID FASTCALL ObmCreateObject(PUSER_HANDLE_TABLE ht, HANDLE* h,USER_OBJECT_TYPE type , ULONG size); @@ -31,8 +68,8 @@ BOOL FASTCALL ObmDeleteObject(HANDLE h, USER_OBJECT_TYPE type ); -//#define UserRefObjectCo(o) ObmReferenceObject(o) -//#define UserDerefObjectCo(o) ObmDereferenceObject(o) +#define UserRefObject(o) ObmReferenceObject(o) +#define UserDerefObject(o) ObmDereferenceObject(o) BOOL FASTCALL ObmCreateHandleTable(); _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-09-11 14:38:57 UTC (rev 17801) +++ trunk/reactos/subsys/win32k/include/window.h 2005-09-11 14:48:32 UTC (rev 17802) @@ -157,7 +157,7 @@ IntIsWindowVisible (PWINDOW_OBJECT Window); BOOL FASTCALL -IntIsChildWindow (HWND Parent, HWND Child); +IntIsChildWindow (PWINDOW_OBJECT Parent, PWINDOW_OBJECT Child); VOID FASTCALL IntUnlinkWindow(PWINDOW_OBJECT Wnd); @@ -174,8 +174,6 @@ PWINDOW_OBJECT FASTCALL IntGetOwner(PWINDOW_OBJECT Wnd); -PWINDOW_OBJECT FASTCALL -IntGetParentObject(PWINDOW_OBJECT Wnd); INT FASTCALL IntGetWindowRgn(PWINDOW_OBJECT Window, HRGN hRgn); _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-11 14:38:57 UTC (rev 17801) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-11 14:48:32 UTC (rev 17802) @@ -559,8 +559,6 @@ void FASTCALL co_IntSetClassLong(PWINDOW_OBJECT Window, ULONG Offset, LONG dwNewLong, BOOL Ansi) { - PWINDOW_OBJECT Parent, Owner; - ASSERT_REFS_CO(Window); if ((int)Offset >= 0) @@ -591,25 +589,11 @@ break; case GCL_HICON: Window->Class->hIcon = (HICON)dwNewLong; - Owner = IntGetOwner(Window); - Parent = IntGetParent(Window); - if ((!Owner) && (!Parent)) + if (!IntGetOwner(Window) && !IntGetParent(Window)) { co_IntShellHookNotify(HSHELL_REDRAW, (LPARAM) Window->hSelf); } - - if (Parent) - { - IntReleaseWindowObject(Parent); - } - - if (Owner) - { - IntReleaseWindowObject(Owner); - } - - break; case GCL_HICONSM: Window->Class->hIconSm = (HICON)dwNewLong; _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-09-11 14:38:57 UTC (rev 17801) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-09-11 14:48:32 UTC (rev 17802) @@ -463,7 +463,6 @@ PWINDOW_OBJECT FASTCALL UserGetDesktopWindow(VOID) { PDESKTOP_OBJECT pdo = IntGetActiveDesktop(); - PWINDOW_OBJECT DeskWnd; if (!pdo) { @@ -471,11 +470,7 @@ return NULL; } - //temp hack - DeskWnd = IntGetWindowObject(pdo->DesktopWindow); - if (DeskWnd) - IntReleaseWindowObject(DeskWnd); - return DeskWnd; + return UserGetWindowObject(pdo->DesktopWindow); } @@ -1190,15 +1185,12 @@ IntGdiGetClipBox(hDC, &Rect); hWndDesktop = IntGetDesktopWindow(); - if (!(WndDesktop = IntGetWindowObject(hWndDesktop))) + if (!(WndDesktop = UserGetWindowObject(hWndDesktop))) return FALSE; DesktopBrush = (HBRUSH)IntGetClassLong(WndDesktop, GCL_HBRBACKGROUND, FALSE); //fixme: verify retval - //temp hack - IntReleaseWindowObject(WndDesktop); - /* * Paint desktop background */ @@ -1207,7 +1199,7 @@ { PWINDOW_OBJECT DeskWin; - if((DeskWin = IntGetWindowObject(hWndDesktop))) + if((DeskWin = UserGetWindowObject(hWndDesktop))) { SIZE sz; int x, y; @@ -1215,8 +1207,8 @@ sz.cx = DeskWin->WindowRect.right - DeskWin->WindowRect.left; sz.cy = DeskWin->WindowRect.bottom - DeskWin->WindowRect.top; - IntReleaseWindowObject(DeskWin); + x = (sz.cx / 2) - (WinSta->cxWallpaper / 2); y = (sz.cy / 2) - (WinSta->cyWallpaper / 2); _____ Modified: trunk/reactos/subsys/win32k/ntuser/focus.c --- trunk/reactos/subsys/win32k/ntuser/focus.c 2005-09-11 14:38:57 UTC (rev 17801) +++ trunk/reactos/subsys/win32k/ntuser/focus.c 2005-09-11 14:48:32 UTC (rev 17802) @@ -61,10 +61,13 @@ VOID FASTCALL co_IntSendActivateMessages(HWND hWndPrev, HWND hWnd, BOOL MouseActivate) { - PWINDOW_OBJECT Window, Owner, Parent; - - if (hWnd && (Window = IntGetWindowObject(hWnd))) + PWINDOW_OBJECT Window; + + if ((Window = UserGetWindowObject(hWnd))) { + + UserRefObjectCo(Window); + /* Send palette messages */ if (co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) { @@ -76,22 +79,12 @@ co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOSENDCHANGING); - - Owner = IntGetOwner(Window); - if (!Owner) + if (!IntGetOwner(Window) && !IntGetParent(Window)) { - Parent = IntGetParent(Window); - if (!Parent) - co_IntShellHookNotify(HSHELL_WINDOWACTIVATED, (LPARAM) hWnd); - else - IntReleaseWindowObject(Parent); + co_IntShellHookNotify(HSHELL_WINDOWACTIVATED, (LPARAM) hWnd); } - else - { - IntReleaseWindowObject(Owner); - } - IntReleaseWindowObject(Window); + UserDerefObjectCo(Window); /* FIXME: IntIsWindow */ @@ -130,17 +123,15 @@ for(Child = Root->FirstChild; Child; Child = Child->NextSibling) { - OwnerWnd = IntGetWindowObject(Child->hOwner); + OwnerWnd = UserGetWindowObject(Child->hOwner); if(!OwnerWnd) continue; if(OwnerWnd == Owner) { Ret = Child->hSelf; - IntReleaseWindowObject(OwnerWnd); return Ret; } - IntReleaseWindowObject(OwnerWnd); } return NULL; @@ -215,9 +206,9 @@ } BOOL FASTCALL -co_IntSetForegroundWindow(PWINDOW_OBJECT Window) +co_IntSetForegroundWindow(PWINDOW_OBJECT Window)//FIXME: can Window be NULL?? { - ASSERT_REFS_CO(Window); + /*if (Window)*/ ASSERT_REFS_CO(Window); return co_IntSetForegroundAndFocusWindow(Window, Window, FALSE); } @@ -234,18 +225,18 @@ { BOOL Ret; PWINDOW_OBJECT TopWnd; - PWINDOW_OBJECT DesktopWindow = IntGetWindowObject(IntGetDesktopWindow()); + PWINDOW_OBJECT DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); if(DesktopWindow) { Top = IntFindChildWindowToOwner(DesktopWindow, Window); - if((TopWnd = IntGetWindowObject(Top))) + if((TopWnd = UserGetWindowObject(Top))) { + UserRefObjectCo(TopWnd); Ret = co_IntMouseActivateWindow(TopWnd); - IntReleaseWindowObject(TopWnd); - IntReleaseWindowObject(DesktopWindow); + UserDerefObjectCo(TopWnd); + return Ret; } - IntReleaseWindowObject(DesktopWindow); } return FALSE; } @@ -253,23 +244,6 @@ TopWindow = UserGetAncestor(Window, GA_ROOT); if (!TopWindow) return FALSE; -// if (TopWindow != Window) -// { - -// Top = UserGetAncestor(Window, GA_ROOT); -// if (Top != Window->hSelf) -// { -// TopWindow = IntGetWindowObject(Top); -// if (TopWindow == NULL) -// { -// SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); -// return FALSE; -// } -// } -// else -// { -// TopWindow = Window; -// } /* TMN: Check return valud from this function? */ UserRefObjectCo(TopWindow); @@ -278,10 +252,6 @@ UserDerefObjectCo(TopWindow); -// if (TopWindow != Window) -// { -// IntReleaseWindowObject(TopWindow); -// } return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-09-11 14:38:57 UTC (rev 17801) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-09-11 14:48:32 UTC (rev 17802) @@ -318,7 +318,6 @@ { NTSTATUS Status; NTUSERDISPATCHMESSAGEINFO MsgInfo; - PWINDOW_OBJECT WindowObject; LRESULT Result = TRUE; DECLARE_RETURN(LRESULT); @@ -352,19 +351,19 @@ } else { + PWINDOW_OBJECT Window; + /* Get the window object. */ - WindowObject = IntGetWindowObject(MsgInfo.Msg.hwnd); - if (NULL == WindowObject) + Window = UserGetWindowObject(MsgInfo.Msg.hwnd); + if (NULL == Window) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); MsgInfo.HandledByKernel = TRUE; Result = 0; } else { - if (WindowObject->OwnerThread != PsGetCurrentThread()) + if (Window->OwnerThread != PsGetCurrentThread()) { - IntReleaseWindowObject(WindowObject); DPRINT1("Window doesn't belong to the calling thread!\n"); MsgInfo.HandledByKernel = TRUE; Result = 0; @@ -375,30 +374,29 @@ MsgInfo.HandledByKernel = FALSE; Result = 0; - if (0xFFFF0000 != ((DWORD) WindowObject->WndProcW & 0xFFFF0000)) + if (0xFFFF0000 != ((DWORD) Window->WndProcW & 0xFFFF0000)) { - if (0xFFFF0000 != ((DWORD) WindowObject->WndProcA & 0xFFFF0000)) + if (0xFFFF0000 != ((DWORD) Window->WndProcA & 0xFFFF0000)) { /* Both Unicode and Ansi winprocs are real, use whatever usermode prefers */ - MsgInfo.Proc = (MsgInfo.Ansi ? WindowObject->WndProcA - : WindowObject->WndProcW); + MsgInfo.Proc = (MsgInfo.Ansi ? Window->WndProcA + : Window->WndProcW); } else { /* Real Unicode winproc */ MsgInfo.Ansi = FALSE; - MsgInfo.Proc = WindowObject->WndProcW; + MsgInfo.Proc = Window->WndProcW; } } else { /* Must have real Ansi winproc */ MsgInfo.Ansi = TRUE; - MsgInfo.Proc = WindowObject->WndProcA; + MsgInfo.Proc = Window->WndProcA; } } - IntReleaseWindowObject(WindowObject); } } Status = MmCopyToCaller(UnsafeMsgInfo, &MsgInfo, sizeof(NTUSERDISPATCHMESSAGEINFO)); @@ -511,13 +509,15 @@ ULONG Result; PWINDOW_OBJECT Parent; + ASSERT_REFS_CO(MsgWindow); + if(*HitTest == (USHORT)HTTRANSPARENT) { /* eat the message, search again! */ return TRUE; } - Parent = IntGetParent(MsgWindow); + Parent = IntGetParent(MsgWindow);//fixme: deref retval? /* fixme: abort if no parent ? */ Result = co_IntSendMessage(MsgWindow->hSelf, WM_MOUSEACTIVATE, @@ -548,12 +548,14 @@ { PWINDOW_OBJECT Window; - if(!(Window = IntGetWindowObject(Msg->hwnd))) + if(!(Window = UserGetWindowObject(Msg->hwnd))) { /* let's just eat the message?! */ return TRUE; } + UserRefObjectCo(Window); + if(ThreadQueue == Window->MessageQueue && ThreadQueue->CaptureWindow != Window->hSelf) { @@ -566,10 +568,12 @@ PWINDOW_OBJECT DesktopWindow; HWND hDesktop = IntGetDesktopWindow(); - if((DesktopWindow = IntGetWindowObject(hDesktop))) + if((DesktopWindow = UserGetWindowObject(hDesktop))) { PWINDOW_OBJECT Wnd; - + + UserRefObjectCo(DesktopWindow); + co_WinPosWindowFromPoint(DesktopWindow, Window->MessageQueue, &Msg->pt, &Wnd); if(Wnd) { @@ -585,15 +589,15 @@ } /* eat the message */ - IntReleaseWindowObject(Wnd); - IntReleaseWindowObject(Window); - IntReleaseWindowObject(DesktopWindow); + UserDerefObject(Wnd); + UserDerefObjectCo(DesktopWindow); + UserDerefObjectCo(Window); return TRUE; } - IntReleaseWindowObject(Wnd); + UserDerefObject(Wnd); } - IntReleaseWindowObject(DesktopWindow); + UserDerefObjectCo(DesktopWindow); } } } @@ -641,7 +645,7 @@ } } - IntReleaseWindowObject(Window); + UserDerefObjectCo(Window); return FALSE; } @@ -651,7 +655,7 @@ */ BOOL FASTCALL co_IntPeekMessage(PUSER_MESSAGE Msg, - HWND Wnd, + HWND hWnd, UINT MsgFilterMin, UINT MsgFilterMax, UINT RemoveMsg) @@ -703,7 +707,7 @@ Present = co_MsqFindMessage(ThreadQueue, FALSE, RemoveMessages, - Wnd, + hWnd, MsgFilterMin, MsgFilterMax, &Message); @@ -721,7 +725,7 @@ Present = co_MsqFindMessage(ThreadQueue, TRUE, RemoveMessages, - Wnd, + hWnd, MsgFilterMin, MsgFilterMax, &Message); @@ -740,14 +744,14 @@ ; /* Check for paint messages. */ - if (IntGetPaintMessage(Wnd, MsgFilterMin, MsgFilterMax, PsGetWin32Thread(), &Msg->Msg, RemoveMessages)) + if (IntGetPaintMessage(hWnd, MsgFilterMin, MsgFilterMax, PsGetWin32Thread(), &Msg->Msg, RemoveMessages)) { Msg->FreeLParam = FALSE; return TRUE; } /* Check for WM_(SYS)TIMER messages */ - Present = MsqGetTimerMessage(ThreadQueue, Wnd, MsgFilterMin, MsgFilterMax, + Present = MsqGetTimerMessage(ThreadQueue, hWnd, MsgFilterMin, MsgFilterMax, &Msg->Msg, RemoveMessages); if (Present) { @@ -763,19 +767,22 @@ { PWINDOW_OBJECT MsgWindow = NULL; - if(Msg->Msg.hwnd && (MsgWindow = IntGetWindowObject(Msg->Msg.hwnd)) && + if(Msg->Msg.hwnd && (MsgWindow = UserGetWindowObject(Msg->Msg.hwnd)) && Msg->Msg.message >= WM_MOUSEFIRST && Msg->Msg.message <= WM_MOUSELAST) { USHORT HitTest; + UserRefObjectCo(MsgWindow); + if(co_IntTranslateMouseMessage(ThreadQueue, &Msg->Msg, &HitTest, TRUE)) /* FIXME - check message filter again, if the message doesn't match anymore, search again */ { - IntReleaseWindowObject(MsgWindow); + UserDerefObjectCo(MsgWindow); /* eat the message, search again */ goto CheckMessages; } + if(ThreadQueue->CaptureWindow == NULL) { co_IntSendHitTestMessages(ThreadQueue, &Msg->Msg); @@ -783,21 +790,23 @@ IS_BTN_MESSAGE(Msg->Msg.message, DOWN) && co_IntActivateWindowMouse(ThreadQueue, &Msg->Msg, MsgWindow, &HitTest)) { - IntReleaseWindowObject(MsgWindow); + UserDerefObjectCo(MsgWindow); /* eat the message, search again */ goto CheckMessages; } } + + UserDerefObjectCo(MsgWindow); } else { co_IntSendHitTestMessages(ThreadQueue, &Msg->Msg); } - if(MsgWindow) - { - IntReleaseWindowObject(MsgWindow); - } +// if(MsgWindow) +// { +// UserDerefObject(MsgWindow); +// } return TRUE; } @@ -820,7 +829,7 @@ BOOL STDCALL NtUserPeekMessage(PNTUSERGETMESSAGEINFO UnsafeInfo, - HWND Wnd, + HWND hWnd, UINT MsgFilterMin, UINT MsgFilterMax, UINT RemoveMsg) @@ -839,17 +848,12 @@ UserEnterExclusive(); /* Validate input */ - if (NULL != Wnd) + if (hWnd && hWnd != INVALID_HANDLE_VALUE) { - Window = IntGetWindowObject(Wnd); - if (NULL == Window) + if (!(Window = UserGetWindowObject(hWnd))) { - Wnd = NULL; + RETURN(-1); } - else - { - IntReleaseWindowObject(Window); - } } if (MsgFilterMax < MsgFilterMin) @@ -858,7 +862,7 @@ MsgFilterMax = 0; } - Present = co_IntPeekMessage(&Msg, Wnd, MsgFilterMin, MsgFilterMax, RemoveMsg); + Present = co_IntPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, RemoveMsg); if (Present) { Info.Msg = Msg.Msg; @@ -945,7 +949,7 @@ BOOL STDCALL NtUserGetMessage(PNTUSERGETMESSAGEINFO UnsafeInfo, - HWND Wnd, + HWND hWnd, UINT MsgFilterMin, UINT MsgFilterMax) /* @@ -962,7 +966,7 @@ BOOL GotMessage; NTUSERGETMESSAGEINFO Info; NTSTATUS Status; - PWINDOW_OBJECT Window; + PWINDOW_OBJECT Window = NULL; PMSGMEMORY MsgMemoryEntry; PVOID UserMem; UINT Size; @@ -973,14 +977,13 @@ UserEnterExclusive(); /* Validate input */ - if (NULL != Wnd) + if (hWnd && !(Window = UserGetWindowObject(hWnd))) { - Window = IntGetWindowObject(Wnd); - if(!Window) - Wnd = NULL; - else - IntReleaseWindowObject(Window); + RETURN(-1); } + +// if (Window) UserRefObjectCo(Window); + if (MsgFilterMax < MsgFilterMin) { MsgFilterMin = 0; @@ -989,7 +992,7 @@ do { - GotMessage = co_IntPeekMessage(&Msg, Wnd, MsgFilterMin, MsgFilterMax, PM_REMOVE); + GotMessage = co_IntPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, PM_REMOVE); if (GotMessage) { Info.Msg = Msg.Msg; @@ -1038,7 +1041,7 @@ RETURN( (BOOL) -1); } } - else if (! co_IntWaitMessage(Wnd, MsgFilterMin, MsgFilterMax)) + else if (! co_IntWaitMessage(hWnd, MsgFilterMin, MsgFilterMax)) { RETURN( (BOOL) -1); } @@ -1048,6 +1051,8 @@ RETURN( WM_QUIT != Info.Msg.message); CLEANUP: +// if (Window) UserDerefObjectCo(Window); + DPRINT("Leave NtUserGetMessage\n"); UserLeave(); END_CLEANUP; @@ -1169,7 +1174,6 @@ WPARAM wParam, LPARAM lParam) { - PWINDOW_OBJECT Window; MSG UserModeMsg, KernelModeMsg; LARGE_INTEGER LargeTickCount; NTSTATUS Status; @@ -1185,9 +1189,9 @@ PWINDOW_OBJECT DesktopWindow; ULONG i; - DesktopWindow = IntGetWindowObject(IntGetDesktopWindow()); + DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); List = IntWinListChildren(DesktopWindow); - IntReleaseWindowObject(DesktopWindow); + if (List != NULL) { for (i = 0; List[i]; i++) @@ -1197,15 +1201,15 @@ } else { - Window = IntGetWindowObject(Wnd); + PWINDOW_OBJECT Window; + + Window = UserGetWindowObject(Wnd); if (NULL == Window) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); return FALSE; } if(Window->Status & WINDOWSTATUS_DESTROYING) { - IntReleaseWindowObject(Window); DPRINT1("Attempted to post message to window 0x%x that is being destroyed!\n", Wnd); /* FIXME - last error code? */ return FALSE; @@ -1229,7 +1233,6 @@ MsqPostMessage(Window->MessageQueue, &KernelModeMsg, NULL != MsgMemoryEntry && 0 != KernelModeMsg.lParam, QS_POSTMESSAGE); - IntReleaseWindowObject(Window); } return TRUE; @@ -1336,7 +1339,8 @@ return 0; } -static LRESULT FASTCALL +static +LRESULT FASTCALL co_IntSendMessageTimeoutSingle(HWND hWnd, UINT Msg, WPARAM wParam, @@ -1347,19 +1351,20 @@ { ULONG_PTR Result; NTSTATUS Status; - PWINDOW_OBJECT Window; + PWINDOW_OBJECT Window = NULL; PMSGMEMORY MsgMemoryEntry; INT lParamBufferSize; LPARAM lParamPacked; PW32THREAD Win32Thread; + DECLARE_RETURN(LRESULT); /* FIXME: Call hooks. */ - Window = IntGetWindowObject(hWnd); - if (!Window) + if (!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); - return FALSE; + RETURN( FALSE); } + + UserRefObjectCo(Window); Win32Thread = PsGetWin32Thread(); @@ -1369,8 +1374,7 @@ if (Win32Thread->IsExiting) { /* Never send messages to exiting threads */ - IntReleaseWindowObject(Window); - return FALSE; + RETURN( FALSE); } /* See if this message type is present in the table */ @@ -1386,9 +1390,8 @@ if (! NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam))) { - IntReleaseWindowObject(Window); DPRINT1("Failed to pack message parameters\n"); - return FALSE; + RETURN( FALSE); } if (0xFFFF0000 != ((DWORD) Window->WndProcW & 0xFFFF0000)) { @@ -1408,46 +1411,47 @@ if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam))) { - IntReleaseWindowObject(Window); DPRINT1("Failed to unpack message parameters\n"); - return TRUE; + RETURN( TRUE); } - IntReleaseWindowObject(Window); - return TRUE; + RETURN( TRUE); } if(uFlags & SMTO_ABORTIFHUNG && MsqIsHung(Window->MessageQueue)) { - IntReleaseWindowObject(Window); /* FIXME - Set a LastError? */ - return FALSE; + RETURN( FALSE); } if(Window->Status & WINDOWSTATUS_DESTROYING) { - IntReleaseWindowObject(Window); /* FIXME - last error? */ DPRINT1("Attempted to send message to window 0x%x that is being destroyed!\n", hWnd); - return FALSE; + RETURN( FALSE); } Status = co_MsqSendMessage(Window->MessageQueue, hWnd, Msg, wParam, lParam, uTimeout, (uFlags & SMTO_BLOCK), FALSE, uResult); - IntReleaseWindowObject(Window); + + if (STATUS_TIMEOUT == Status) { /* MSDN says GetLastError() should return 0 after timeout */ SetLastWin32Error(0); - return FALSE; + RETURN( FALSE); } else if (! NT_SUCCESS(Status)) { SetLastNtError(Status); - return FALSE; + RETURN( FALSE); } - return TRUE; + RETURN( TRUE); + +CLEANUP: + if (Window) UserDerefObjectCo(Window); + END_CLEANUP; } LRESULT FASTCALL @@ -1468,14 +1472,14 @@ return co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, uFlags, uTimeout, uResult); } - DesktopWindow = IntGetWindowObject(IntGetDesktopWindow()); + DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); if (NULL == DesktopWindow) { SetLastWin32Error(ERROR_INTERNAL_ERROR); return 0; } + Children = IntWinListChildren(DesktopWindow); - IntReleaseWindowObject(DesktopWindow); if (NULL == Children) { return 0; @@ -1509,10 +1513,8 @@ return 0; } - Window = IntGetWindowObject(hWnd); - if(!Window) + if(!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); return 0; } @@ -1528,13 +1530,11 @@ } } - IntReleaseWindowObject(Window); - return (LRESULT)Result; } LRESULT FASTCALL -co_IntDoSendMessage(HWND Wnd, +co_IntDoSendMessage(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, @@ -1552,15 +1552,14 @@ RtlZeroMemory(&Info, sizeof(NTUSERSENDMESSAGEINFO)); /* FIXME: Call hooks. */ - if (HWND_BROADCAST != Wnd) + if (HWND_BROADCAST != hWnd) { - Window = IntGetWindowObject(Wnd); + Window = UserGetWindowObject(hWnd); if (NULL == Window) { /* Tell usermode to not touch this one */ Info.HandledByKernel = TRUE; MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); return 0; } } @@ -1568,7 +1567,7 @@ /* FIXME: Check for an exiting window. */ /* See if the current thread can handle the message */ - if (HWND_BROADCAST != Wnd && NULL != PsGetWin32Thread() && + if (HWND_BROADCAST != hWnd && NULL != PsGetWin32Thread() && Window->MessageQueue == PsGetWin32Thread()->MessageQueue) { /* Gather the information usermode needs to call the window proc directly */ @@ -1599,17 +1598,16 @@ Info.Ansi = TRUE; Info.Proc = Window->WndProcA; } - IntReleaseWindowObject(Window); } else { /* Must be handled by other thread */ - if (HWND_BROADCAST != Wnd) - { - IntReleaseWindowObject(Window); - } +// if (HWND_BROADCAST != hWnd) +// { +// UserDerefObject(Window); +// } Info.HandledByKernel = TRUE; - UserModeMsg.hwnd = Wnd; + UserModeMsg.hwnd = hWnd; UserModeMsg.message = Msg; UserModeMsg.wParam = wParam; UserModeMsg.lParam = lParam; _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-09-11 14:38:57 UTC (rev 17801) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-09-11 14:48:32 UTC (rev 17802) @@ -182,35 +182,30 @@ { case ONEPARAM_ROUTINE_GETMENU: { - PWINDOW_OBJECT WindowObject; + PWINDOW_OBJECT Window; DWORD Result; - WindowObject = IntGetWindowObject((HWND)Param); - if(!WindowObject) + if(!(Window = UserGetWindowObject((HWND)Param))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN( FALSE); } [truncated at 1000 lines; 2536 more skipped]

19 years

← Newer
1
...
35
36
37
38
39
40
41
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005