Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

by ion＠svn.reactos.com

Fix compilation problem.. Modified: trunk/reactos/ntoskrnl/include/internal/dbg.h Modified: trunk/reactos/ntoskrnl/include/internal/kdb.h Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/include/internal/dbg.h --- trunk/reactos/ntoskrnl/include/internal/dbg.h 2005-04-25 17:57:57 UTC (rev 14803) +++ trunk/reactos/ntoskrnl/include/internal/dbg.h 2005-04-25 18:29:16 UTC (rev 14804) @@ -7,12 +7,53 @@ #define KdPrintEx(_x_) DbgPrintEx _x_ #if defined(KDBG) || defined(DBG) + +VOID +KdbSymLoadUserModuleSymbols(IN PLDR_MODULE LdrModule); + +VOID +KdbSymFreeProcessSymbols(IN PEPROCESS Process); + +VOID +KdbSymLoadDriverSymbols(IN PUNICODE_STRING Filename, + IN PMODULE_OBJECT Module); + +VOID +KdbSymUnloadDriverSymbols(IN PMODULE_OBJECT ModuleObject); + +VOID +KdbSymProcessBootSymbols(IN PCHAR FileName); + +VOID +KdbSymInit(IN PMODULE_TEXT_SECTION NtoskrnlTextSection, + IN PMODULE_TEXT_SECTION LdrHalTextSection); + +BOOLEAN +KdbSymPrintAddress(IN PVOID Address); + +VOID +KdbDeleteProcessHook(IN PEPROCESS Process); + +NTSTATUS +KdbSymGetAddressInformation(IN PROSSYM_INFO RosSymInfo, + IN ULONG_PTR RelativeAddress, + OUT PULONG LineNumber OPTIONAL, + OUT PCH FileName OPTIONAL, + OUT PCH FunctionName OPTIONAL); + +typedef struct _KDB_MODULE_INFO +{ + WCHAR Name[256]; + ULONG_PTR Base; + ULONG Size; + PROSSYM_INFO RosSymInfo; +} KDB_MODULE_INFO, *PKDB_MODULE_INFO; + # define KDB_LOADUSERMODULE_HOOK(LDRMOD) KdbSymLoadUserModuleSymbols(LDRMOD) # define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) KdbSymLoadDriverSymbols(FILENAME, MODULE) # define KDB_UNLOADDRIVER_HOOK(MODULE) KdbSymUnloadDriverSymbols(MODULE) # define KDB_LOADERINIT_HOOK(NTOS, HAL) KdbSymInit(NTOS, HAL) # define KDB_SYMBOLFILE_HOOK(FILENAME) KdbSymProcessBootSymbols(FILENAME) -# define KDB_DELETEPROCESS_HOOK(PROCESS) KdbDeleteProcessHook(PROCESS) #else # define KDB_LOADUSERMODULE_HOOK(LDRMOD) do { } while (0) # define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) do { } while (0) @@ -20,21 +61,20 @@ # define KDB_LOADERINIT_HOOK(NTOS, HAL) do { } while (0) # define KDB_SYMBOLFILE_HOOK(FILENAME) do { } while (0) # define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0) -# define KDB_DELETEPROCESS_HOOK(PROCESS) do { } while (0) #endif #ifdef KDBG # define KeRosPrintAddress(ADDRESS) KdbSymPrintAddress(ADDRESS) # define KdbInit() KdbpCliInit() # define KdbModuleLoaded(FILENAME) KdbpCliModuleLoaded(FILENAME) -//# define KdbBreak() KdbBreak() +# define KDB_DELETEPROCESS_HOOK(PROCESS) KdbDeleteProcessHook(PROCESS) #else # define KeRosPrintAddress(ADDRESS) KiRosPrintAddress(ADDRESS) # define KdbEnterDebuggerException(ER, PM, C, TF, F) kdHandleException # define KdbInit() do { } while (0) # define KdbEnter() do { } while (0) # define KdbModuleLoaded(X) do { } while (0) -//# define KdbBreak() do { } while (0) +# define KDB_DELETEPROCESS_HOOK(PROCESS) do { } while (0) #endif #endif /* __INCLUDE_INTERNAL_DBG_H */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/kdb.h --- trunk/reactos/ntoskrnl/include/internal/kdb.h 2005-04-25 17:57:57 UTC (rev 14803) +++ trunk/reactos/ntoskrnl/include/internal/kdb.h 2005-04-25 18:29:16 UTC (rev 14804) @@ -80,16 +80,6 @@ KD_DEBUG_KDNOECHO } KDB_OUTPUT_SETTINGS; -/* from kdb_symbols.c */ -typedef struct _KDB_MODULE_INFO -{ - WCHAR Name[256]; - ULONG_PTR Base; - ULONG Size; - PROSSYM_INFO RosSymInfo; -} KDB_MODULE_INFO, *PKDB_MODULE_INFO; - - /* FUNCTIONS *****************************************************************/ /* from i386/i386-dis.c */ @@ -171,50 +161,6 @@ KdbpSymFindModuleByIndex(IN INT Index, OUT PKDB_MODULE_INFO pInfo); -BOOLEAN -KdbSymPrintAddress(IN PVOID Address); - -NTSTATUS -KdbSymGetAddressInformation(IN PROSSYM_INFO RosSymInfo, - IN ULONG_PTR RelativeAddress, - OUT PULONG LineNumber OPTIONAL, - OUT PCH FileName OPTIONAL, - OUT PCH FunctionName OPTIONAL); - -VOID -KdbSymLoadUserModuleSymbols(IN PLDR_MODULE LdrModule); - -VOID -KdbSymFreeProcessSymbols(IN PEPROCESS Process); - -VOID -KdbSymLoadDriverSymbols(IN PUNICODE_STRING Filename, - IN PMODULE_OBJECT Module); - -VOID -KdbSymUnloadDriverSymbols(IN PMODULE_OBJECT ModuleObject); - -VOID -KdbSymProcessBootSymbols(IN PCHAR FileName); - -VOID -KdbSymInit(IN PMODULE_TEXT_SECTION NtoskrnlTextSection, - IN PMODULE_TEXT_SECTION LdrHalTextSection); - - -BOOLEAN -KdbSymPrintAddress(IN PVOID Address); - -KD_CONTINUE_TYPE -KdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord, - KPROCESSOR_MODE PreviousMode, - PCONTEXT Context, - PKTRAP_FRAME TrapFrame, - BOOLEAN FirstChance); - -VOID -KdbDeleteProcessHook(IN PEPROCESS Process); - /* from kdb.c */ extern PEPROCESS KdbCurrentProcess; @@ -291,6 +237,12 @@ STDCALL KdbpGetCommandLineSettings(PCHAR p1); +KD_CONTINUE_TYPE +KdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord, + KPROCESSOR_MODE PreviousMode, + PCONTEXT Context, + PKTRAP_FRAME TrapFrame, + BOOLEAN FirstChance); /* other functions */ #define KdbpSafeReadMemory(dst, src, size) MmSafeCopyFromUser(dst, src, size) _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-04-25 17:57:57 UTC (rev 14803) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-04-25 18:29:16 UTC (rev 14804) @@ -11,25 +11,12 @@ #include <ddk/ntddk.h> #include <roscfg.h> -#include <internal/ntoskrnl.h> -#include <internal/ke.h> -#include <internal/i386/segment.h> -#include <internal/i386/mm.h> -#include <internal/module.h> -#include <internal/mm.h> -#include <internal/ps.h> -#include <internal/trap.h> -#include <ntdll/ldr.h> -#include <internal/safe.h> -#include <internal/kd.h> -#include <rosrtl/string.h> +#include <ntoskrnl.h> #include <reactos/rossym.h> #define NDEBUG #include <internal/debug.h> -#include <internal/kdb.h> - /* GLOBALS ******************************************************************/ #define TAG_KDBS TAG('K', 'D', 'B', 'S') _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-04-25 17:57:57 UTC (rev 14803) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-04-25 18:29:16 UTC (rev 14804) @@ -97,7 +97,7 @@ pushl %gs // + 0x48 sub $0x28, %esp // + 0x70 -#ifdef GDB +#ifdef DBG /* Trick gdb 6 into backtracing over the system call */ mov 0x6c(%esp), %ebx pushl 4(%ebx) /* DebugEIP */ // + 0x74 @@ -124,7 +124,7 @@ CheckValidCall: -#ifdef GDB +#ifdef DBG /* * GDB thinks the function starts here and * wants a standard prolog, so let's give it

19 years, 4 months

[ion] 14802: Simplify and correct KiDebugService

by ion＠svn.reactos.com

Simplify and correct KiDebugService Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-04-25 15:20:15 UTC (rev 14801) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-04-25 16:17:35 UTC (rev 14802) @@ -401,20 +401,40 @@ .intel_syntax noprefix _KiDebugService: - /* Save the user context */ + + /* Create the Trap Frame */ + push 0 push ebp - push eax - push ecx - push edx push ebx push esi push edi + push fs + + /* Switch to correct FS */ + mov bx, PCR_SELECTOR + mov fs, bx + + /* Save Exception List */ + push fs:[KPCR_EXCEPTION_LIST] + + /* Use Old Previous Mode */ + mov ebx, fs:[KPCR_CURRENT_THREAD] + push [ebx+KTHREAD_PREVIOUS_MODE] + + /* Continue building the Trap Frame */ + push eax + push ecx + push edx push ds push es - push fs push gs - sub esp, 112 /* FloatSave */ - + + /* Switch Segments to Kernel */ + mov bx, KERNEL_DS + mov ds, bx + mov es, bx + + /* Save Debug Registers */ mov ebx, eax mov eax, dr7 push eax @@ -429,48 +449,15 @@ mov eax, dr0 push eax mov eax, ebx + + /* Skip useless debug data */ + sub esp, 0x18 - push 0 /* ContextFlags */ - - /* Set ES to kernel segment */ - mov bx, KERNEL_DS - mov es, bx - - /* FIXME: check to see if SS is valid/inrange */ - - mov ds, bx /* DS is now also kernel segment */ - /* Call debug service dispatcher */ push edx push ecx push eax call _KdpServiceDispatcher@12 - /* Restore the user context */ - add esp, 4 /* UserContext */ - pop eax - mov dr0, eax - pop eax - mov dr1, eax - pop eax - mov dr2, eax - pop eax - mov dr3, eax - pop eax - mov dr6, eax - pop eax - mov dr7, eax - add esp, 112 /* FloatingSave */ - pop gs - pop fs - pop es - pop ds - pop edi - pop esi - pop ebx - pop edx - pop ecx - add esp, 4 /* Eax Not restored */ - pop ebp - - iretd + /* Exit through common routine */ + jmp _KiServiceExit2

19 years, 4 months

[ion] 14801: Add GDB = 1 to makefile to compile-in the GDB Wrapper. These options will be better manged with rbuild

by ion＠svn.reactos.com

Add GDB = 1 to makefile to compile-in the GDB Wrapper. These options will be better manged with rbuild Modified: trunk/reactos/config _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-04-25 15:02:11 UTC (rev 14800) +++ trunk/reactos/config 2005-04-25 15:20:15 UTC (rev 14801) @@ -25,6 +25,7 @@ # Whether to compile for debugging # DBG := 0 +GDB := 1 # # Whether to compile a multiprocessor or single processor version

19 years, 4 months

[ion] 14800: Added KiDebugService. Will optimize soon to use common Exit code

by ion＠svn.reactos.com

Added KiDebugService. Will optimize soon to use common Exit code Modified: trunk/reactos/ntoskrnl/Makefile Deleted: trunk/reactos/ntoskrnl/kd/service.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-04-25 14:44:48 UTC (rev 14799) +++ trunk/reactos/ntoskrnl/Makefile 2005-04-25 15:02:11 UTC (rev 14800) @@ -332,7 +332,6 @@ kd/kdinit.o \ kd/kdmain.o \ kd/kdio.o \ - kd/service.o \ kd/wrappers/gdbstub.o \ kd/wrappers/bochs.o _____ Deleted: trunk/reactos/ntoskrnl/kd/service.c --- trunk/reactos/ntoskrnl/kd/service.c 2005-04-25 14:44:48 UTC (rev 14799) +++ trunk/reactos/ntoskrnl/kd/service.c 2005-04-25 15:02:11 UTC (rev 14800) @@ -1,170 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/kd/service.c - * PURPOSE: Debug service dispatcher - * - * PROGRAMMERS: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) - */ - -#include <ntoskrnl.h> - - -/* FUNCTIONS ***************************************************************/ - -#define _STR(x) #x -#define STR(x) _STR(x) - -#if defined(__GNUC__) - -void interrupt_handler2d(void); - __asm__("\n\t.global _interrupt_handler2d\n\t" - "_interrupt_handler2d:\n\t" - - /* Save the user context */ - "pushl %ebp\n\t" /* Ebp */ - - "pushl %eax\n\t" /* Eax */ - "pushl %ecx\n\t" /* Ecx */ - "pushl %edx\n\t" /* Edx */ - "pushl %ebx\n\t" /* Ebx */ - "pushl %esi\n\t" /* Esi */ - "pushl %edi\n\t" /* Edi */ - - "pushl %ds\n\t" /* SegDs */ - "pushl %es\n\t" /* SegEs */ - "pushl %fs\n\t" /* SegFs */ - "pushl %gs\n\t" /* SegGs */ - - "subl $112,%esp\n\t" /* FloatSave */ - - "pushl $0\n\t" /* Dr7 */ - "pushl $0\n\t" /* Dr6 */ - "pushl $0\n\t" /* Dr3 */ - "pushl $0\n\t" /* Dr2 */ - "pushl $0\n\t" /* Dr1 */ - "pushl $0\n\t" /* Dr0 */ - - "pushl $0\n\t" /* ContextFlags */ - - /* Set ES to kernel segment */ - "movw $"STR(KERNEL_DS)",%bx\n\t" - "movw %bx,%es\n\t" - - /* FIXME: check to see if SS is valid/inrange */ - - /* DS and GS are now also kernel segments */ - "movw %bx,%ds\n\t" - "movw %bx,%gs\n\t" - - /* Set FS to the PCR */ - "movw $"STR(PCR_SELECTOR)",%bx\n\t" - "movw %bx,%fs\n\t" - - /* Call debug service dispatcher */ - "pushl %edx\n\t" - "pushl %ecx\n\t" - "pushl %eax\n\t" - "call _KdpServiceDispatcher@12\n\t" - - /* Restore the user context */ - "addl $4,%esp\n\t" /* UserContext */ - "addl $24,%esp\n\t" /* Dr[0-3,6-7] */ - "addl $112,%esp\n\t" /* FloatingSave */ - "popl %gs\n\t" /* SegGs */ - "popl %fs\n\t" /* SegFs */ - "popl %es\n\t" /* SegEs */ - "popl %ds\n\t" /* SegDs */ - - "popl %edi\n\t" /* Edi */ - "popl %esi\n\t" /* Esi */ - "popl %ebx\n\t" /* Ebx */ - "popl %edx\n\t" /* Edx */ - "popl %ecx\n\t" /* Ecx */ - "addl $4,%esp\n\t" /* Eax (Not restored) */ - - "popl %ebp\n\t" /* Ebp */ - - "iret\n\t"); - -#elif defined(_MSC_VER) - -__declspec(naked) -void interrupt_handler2d() -{ - __asm - { - /* Save the user context */ - push ebp - push eax - push ecx - push edx - push ebx - push esi - push edi - - push ds - push es - push fs - push gs - - sub esp, 112 /* FloatSave */ - - mov ebx, eax - mov eax, dr7 __asm push eax - mov eax, dr6 __asm push eax - mov eax, dr3 __asm push eax - mov eax, dr2 __asm push eax - mov eax, dr1 __asm push eax - mov eax, dr0 __asm push eax - mov eax, ebx - - push 0 /* ContextFlags */ - - /* Set ES to kernel segment */ - mov bx, KERNEL_DS - mov es, bx - - /* FIXME: check to see if SS is valid/inrange */ - - mov ds, bx /* DS is now also kernel segment */ - - /* Call debug service dispatcher */ - push edx - push ecx - push eax - call KdpServiceDispatcher - add esp, 12 /* restore stack pointer */ - - /* Restore the user context */ - add esp, 4 /* UserContext */ - pop eax __asm mov dr0, eax - pop eax __asm mov dr1, eax - pop eax __asm mov dr2, eax - pop eax __asm mov dr3, eax - pop eax __asm mov dr6, eax - pop eax __asm mov dr7, eax - add esp, 112 /* FloatingSave */ - pop gs - pop fs - pop es - pop ds - - pop edi - pop esi - pop ebx - pop edx - pop ecx - add esp, 4 /* Eax Not restored */ - - pop ebp - - iretd - } -} - -#else -#error Unknown compiler for inline assembler -#endif - -/* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-04-25 14:44:48 UTC (rev 14799) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-04-25 15:02:11 UTC (rev 14800) @@ -27,7 +27,7 @@ #endif extern void KiSystemService(void); -extern void interrupt_handler2d(void); +extern void KiDebugService(void); extern VOID KiTrap0(VOID); extern VOID KiTrap1(VOID); @@ -928,7 +928,7 @@ set_trap_gate(i,(int)KiTrapUnknown, 0); } - set_system_call_gate(0x2d,(int)interrupt_handler2d); + set_system_call_gate(0x2d,(int)KiDebugService); set_system_call_gate(0x2e,(int)KiSystemService); } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-04-25 14:44:48 UTC (rev 14799) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-04-25 15:02:11 UTC (rev 14800) @@ -25,6 +25,7 @@ .globl _KiServiceExit2 .globl _KiFastCallEntry .globl _KiSystemService +.globl _KiDebugService _KiFastCallEntry: @@ -397,3 +398,79 @@ /* Return to user-mode */ iret + +.intel_syntax noprefix +_KiDebugService: + /* Save the user context */ + push ebp + push eax + push ecx + push edx + push ebx + push esi + push edi + push ds + push es + push fs + push gs + sub esp, 112 /* FloatSave */ + + mov ebx, eax + mov eax, dr7 + push eax + mov eax, dr6 + push eax + mov eax, dr3 + push eax + mov eax, dr2 + push eax + mov eax, dr1 + push eax + mov eax, dr0 + push eax + mov eax, ebx + + push 0 /* ContextFlags */ + + /* Set ES to kernel segment */ + mov bx, KERNEL_DS + mov es, bx + + /* FIXME: check to see if SS is valid/inrange */ + + mov ds, bx /* DS is now also kernel segment */ + + /* Call debug service dispatcher */ + push edx + push ecx + push eax + call _KdpServiceDispatcher@12 + + /* Restore the user context */ + add esp, 4 /* UserContext */ + pop eax + mov dr0, eax + pop eax + mov dr1, eax + pop eax + mov dr2, eax + pop eax + mov dr3, eax + pop eax + mov dr6, eax + pop eax + mov dr7, eax + add esp, 112 /* FloatingSave */ + pop gs + pop fs + pop es + pop ds + pop edi + pop esi + pop ebx + pop edx + pop ecx + add esp, 4 /* Eax Not restored */ + pop ebp + + iretd

19 years, 4 months

[ion] 14799: KD System Rewrite:

by ion＠svn.reactos.com

KD System Rewrite: - Totally dynamic based on the principle of Native Providers built-in the Kernel (like Screen, FileLog and Serial) and a pluggable Wrapper which is optionally compiled (Bochs, GDB) - Nothing changed in KDBG, except for that its settings (KDSERIAL/KDNOECHO) are now stored in KdbDebugState instead. - Wrappers are currently built uncondtionally. With rbuild, I'll make them easily removable. - Debug Log code simplified greatly, sped up and now supports printing even the first boot messages, which wasn't supported before. - Removed most of KDBG compile-time settings, ones which are needed are in include/dbg as macros now. - Left in some kdbg init code and break code, but it could be made to be used as a 'wrapper' for those functions. I will do it later. - Made a hack for KdpEnterDebuggerException..it seems to be called differently and at different times for GDB vs KDBG and I couldn't unite them. - KdpServiceDispatcher now does both the documented and ros-internal debug functions and will eventually be called through INT2D from keyboard.sys instead of as an API. All in all, this patch makes KD separated from KDBG and creates a pluggable architecture for creating future wrappers that don't require changing tons of code in the future. It improves the debug log by printing even the earliest debug messages to it and it removes many of the manual ifdef(KDBG) but making them automatic though a single macro file. It makes extra debugging functionality optional and it allows removal of a private API from our exports. Modified: trunk/reactos/drivers/input/keyboard/keyboard.c Modified: trunk/reactos/include/ddk/kefuncs.h Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/include/internal/dbg.h Modified: trunk/reactos/ntoskrnl/include/internal/kd.h Modified: trunk/reactos/ntoskrnl/include/internal/kdb.h Added: trunk/reactos/ntoskrnl/include/internal/kdbochs.h Added: trunk/reactos/ntoskrnl/include/internal/kdgdb.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/module.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/pnpreport.c Deleted: trunk/reactos/ntoskrnl/kd/dlog.c Deleted: trunk/reactos/ntoskrnl/kd/gdbstub.c Deleted: trunk/reactos/ntoskrnl/kd/kdebug.c Added: trunk/reactos/ntoskrnl/kd/kdinit.c Added: trunk/reactos/ntoskrnl/kd/kdio.c Added: trunk/reactos/ntoskrnl/kd/kdmain.c Modified: trunk/reactos/ntoskrnl/kd/service.c Added: trunk/reactos/ntoskrnl/kd/wrappers/ Added: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c Added: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_serial.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/catch.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ldr/loader.c Modified: trunk/reactos/ntoskrnl/mm/RPoolMgr.h Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/drivers/input/keyboard/keyboard.c --- trunk/reactos/drivers/input/keyboard/keyboard.c 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/drivers/input/keyboard/keyboard.c 2005-04-25 14:44:48 UTC (rev 14799) @@ -114,7 +114,7 @@ }; VOID STDCALL -KdSystemDebugControl(ULONG Code); +KdpServiceDispatcher(ULONG Code, PVOID Context1, PVOID Context2); static LONG DoSystemDebug = -1; static BOOLEAN InSysRq = FALSE; @@ -421,7 +421,7 @@ Debug = InterlockedExchange(&DoSystemDebug, -1); if (Debug != -1) { - KdSystemDebugControl(Debug); + KdpServiceDispatcher(TAG('R', 'o', 's', ' '), (PVOID)Debug, NULL); } } @@ -447,7 +447,7 @@ } else { - KdSystemDebugControl(DoSystemDebug); + KdpServiceDispatcher(TAG('R', 'o', 's', ' '), (PVOID)DoSystemDebug, NULL); DoSystemDebug = -1; } return; _____ Modified: trunk/reactos/include/ddk/kefuncs.h --- trunk/reactos/include/ddk/kefuncs.h 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/include/ddk/kefuncs.h 2005-04-25 14:44:48 UTC (rev 14799) @@ -22,6 +22,10 @@ VOID STDCALL KeAttachProcess(struct _KPROCESS *Process); +BOOLEAN +STDCALL +KeIsAttachedProcess(VOID); + VOID FASTCALL KiAcquireSpinLock(PKSPIN_LOCK SpinLock); VOID FASTCALL KiReleaseSpinLock(PKSPIN_LOCK SpinLock); @@ -379,9 +383,6 @@ ULONG STDCALL KeRosGetStackFrames ( PULONG Frames, ULONG FrameCount ); -BOOLEAN STDCALL -KeRosPrintAddress(PVOID address); - NTSTATUS STDCALL KeSetAffinityThread(PKTHREAD Thread, KAFFINITY Affinity); _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/Makefile 2005-04-25 14:44:48 UTC (rev 14799) @@ -329,11 +329,13 @@ # Kernel Debugger Support (Kd) OBJECTS_KD = \ - kd/dlog.o \ - kd/gdbstub.o \ - kd/kdebug.o \ - kd/service.o - + kd/kdinit.o \ + kd/kdmain.o \ + kd/kdio.o \ + kd/service.o \ + kd/wrappers/gdbstub.o \ + kd/wrappers/bochs.o + # User-Mode Debugging (Dbgk) OBJECTS_DBGK = \ dbgk/dbgkutil.o \ _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-04-25 14:44:48 UTC (rev 14799) @@ -11,7 +11,6 @@ #include <ntoskrnl.h> #include <ntos/bootvid.h> -#include <internal/kdb.h> #define NDEBUG #include <internal/debug.h> @@ -416,8 +415,8 @@ /* Parse the Loaded Modules (by FreeLoader) and cache the ones we'll need */ ParseAndCacheLoadedModules(&SetupBoot); - /* Initialize the kernel debugger */ - KdInitSystem (1, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); + /* Initialize the kernel debugger parameters */ + KdInitSystem(0, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); /* Initialize the Dispatcher, Clock and Bug Check Mechanisms. */ KeInit2(); @@ -489,8 +488,8 @@ /* initialize callbacks */ ExpInitializeCallbacks(); - /* Initialize the GDB Stub and break */ - KdInit1(); + /* Call KD Providers at Phase 1 */ + KdInitSystem(1, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); /* Initialize I/O Objects, Filesystems, Error Logging and Shutdown */ IoInit(); @@ -506,9 +505,6 @@ /* Initialize Cache Views */ CcInit(); - - /* Hook System Interrupt for the Debugger */ - KdInit2(); /* Initialize File Locking */ FsRtlpInitFileLockingImplementation(); @@ -537,8 +533,8 @@ (KeLoaderBlock.MemHigher + 1088)/ 1024); HalDisplayString(str); - /* Print which Debugger is being used */ - KdInit3(); + /* Call KD Providers at Phase 2 */ + KdInitSystem(2, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); /* Import and create NLS Data and Sections */ RtlpInitNls(); @@ -549,10 +545,8 @@ /* Initialize the time zone information from the registry */ ExpInitTimeZoneInfo(); - /* Enter the kernel debugger before starting up the boot drivers */ -#ifdef KDBG + /* Enter the kernel debugger before starting up the boot drivers */ KdbEnter(); -#endif /* KDBG */ /* Setup Drivers and Root Device Node */ IoInit2(BootLog); _____ Modified: trunk/reactos/ntoskrnl/include/internal/dbg.h --- trunk/reactos/ntoskrnl/include/internal/dbg.h 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/include/internal/dbg.h 2005-04-25 14:44:48 UTC (rev 14799) @@ -6,9 +6,35 @@ #define KdPrintEx(_x_) DbgPrintEx _x_ -NTSTATUS STDCALL -LpcSendDebugMessagePort(PEPORT Port, - PLPC_DBG_MESSAGE Message, - PLPC_DBG_MESSAGE Reply); +#if defined(KDBG) || defined(DBG) +# define KDB_LOADUSERMODULE_HOOK(LDRMOD) KdbSymLoadUserModuleSymbols(LDRMOD) +# define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) KdbSymLoadDriverSymbols(FILENAME, MODULE) +# define KDB_UNLOADDRIVER_HOOK(MODULE) KdbSymUnloadDriverSymbols(MODULE) +# define KDB_LOADERINIT_HOOK(NTOS, HAL) KdbSymInit(NTOS, HAL) +# define KDB_SYMBOLFILE_HOOK(FILENAME) KdbSymProcessBootSymbols(FILENAME) +# define KDB_DELETEPROCESS_HOOK(PROCESS) KdbDeleteProcessHook(PROCESS) +#else +# define KDB_LOADUSERMODULE_HOOK(LDRMOD) do { } while (0) +# define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) do { } while (0) +# define KDB_UNLOADDRIVER_HOOK(MODULE) do { } while (0) +# define KDB_LOADERINIT_HOOK(NTOS, HAL) do { } while (0) +# define KDB_SYMBOLFILE_HOOK(FILENAME) do { } while (0) +# define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0) +# define KDB_DELETEPROCESS_HOOK(PROCESS) do { } while (0) +#endif +#ifdef KDBG +# define KeRosPrintAddress(ADDRESS) KdbSymPrintAddress(ADDRESS) +# define KdbInit() KdbpCliInit() +# define KdbModuleLoaded(FILENAME) KdbpCliModuleLoaded(FILENAME) +//# define KdbBreak() KdbBreak() +#else +# define KeRosPrintAddress(ADDRESS) KiRosPrintAddress(ADDRESS) +# define KdbEnterDebuggerException(ER, PM, C, TF, F) kdHandleException +# define KdbInit() do { } while (0) +# define KdbEnter() do { } while (0) +# define KdbModuleLoaded(X) do { } while (0) +//# define KdbBreak() do { } while (0) +#endif + #endif /* __INCLUDE_INTERNAL_DBG_H */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/kd.h --- trunk/reactos/ntoskrnl/include/internal/kd.h 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/include/internal/kd.h 2005-04-25 14:44:48 UTC (rev 14799) @@ -10,160 +10,169 @@ #include <internal/ldr.h> #include <ntdll/ldr.h> -#define KD_DEBUG_DISABLED 0x00 -#define KD_DEBUG_GDB 0x01 -#define KD_DEBUG_PICE 0x02 -#define KD_DEBUG_SCREEN 0x04 -#define KD_DEBUG_SERIAL 0x08 -#define KD_DEBUG_BOCHS 0x10 -#define KD_DEBUG_FILELOG 0x20 -#define KD_DEBUG_MDA 0x40 -#define KD_DEBUG_KDB 0x80 -#define KD_DEBUG_KDSERIAL 0x100 -#define KD_DEBUG_KDNOECHO 0x200 +struct _KD_DISPATCH_TABLE; -extern ULONG KdDebugState; +#ifdef GDB +#include "kdgdb.h" +#endif +#ifdef BOCHS +#include "kdbochs.h" +#endif -KD_PORT_INFORMATION GdbPortInfo; -KD_PORT_INFORMATION LogPortInfo; +/* KD ROUTINES ***************************************************************/ typedef enum _KD_CONTINUE_TYPE { - kdContinue = 0, - kdDoNotHandleException, - kdHandleException + kdContinue = 0, + kdDoNotHandleException, + kdHandleException } KD_CONTINUE_TYPE; +typedef VOID -KbdDisableMouse(); +STDCALL +(*PKDP_INIT_ROUTINE)(struct _KD_DISPATCH_TABLE *DispatchTable, + ULONG BootPhase); +typedef VOID -KbdEnableMouse(); - -ULONG -KdpPrintString (PANSI_STRING String); - -VOID -DebugLogWrite(PCH String); -VOID -DebugLogInit(VOID); -VOID -DebugLogInit2(VOID); - -VOID STDCALL -KdDisableDebugger( - VOID - ); +(*PKDP_PRINT_ROUTINE)(PCH String); +typedef VOID STDCALL -KdEnableDebugger( - VOID - ); +(*PKDP_PROMPT_ROUTINE)(PCH String); -NTSTATUS +typedef +KD_CONTINUE_TYPE STDCALL -KdPowerTransition( - ULONG PowerState - ); +(*PKDP_EXCEPTION_ROUTINE)(PEXCEPTION_RECORD ExceptionRecord, + PCONTEXT Context, + PKTRAP_FRAME TrapFrame); -BOOLEAN -STDCALL -KeIsAttachedProcess( - VOID - ); +/* INIT ROUTINES *************************************************************/ VOID -KdInit1(VOID); - +STDCALL +KdpScreenInit(struct _KD_DISPATCH_TABLE *DispatchTable, + ULONG BootPhase); + VOID -KdInit2(VOID); - +STDCALL +KdpSerialInit(struct _KD_DISPATCH_TABLE *DispatchTable, + ULONG BootPhase); + VOID -KdInit3(VOID); +STDCALL +KdpInitDebugLog(struct _KD_DISPATCH_TABLE *DispatchTable, + ULONG BootPhase); + +/* KD ROUTINES ***************************************************************/ -VOID -KdPutChar(UCHAR Value); - -UCHAR -KdGetChar(VOID); - -VOID -KdGdbStubInit(ULONG Phase); - -VOID -KdGdbDebugPrint (LPSTR Message); - -VOID -KdDebugPrint (LPSTR Message); - KD_CONTINUE_TYPE -KdEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord, - PCONTEXT Context, - PKTRAP_FRAME TrapFrame); -VOID KdInitializeMda(VOID); -VOID KdPrintMda(PCH pch); +STDCALL +KdpEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord, + KPROCESSOR_MODE PreviousMode, + PCONTEXT Context, + PKTRAP_FRAME TrapFrame, + BOOLEAN FirstChance, + BOOLEAN Gdb); + +ULONG +STDCALL +KdpPrintString(PANSI_STRING String); -#if !defined(KDBG) && !defined(DBG) -# define KDB_LOADUSERMODULE_HOOK(LDRMOD) do { } while (0) -# define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) do { } while (0) -# define KDB_UNLOADDRIVER_HOOK(MODULE) do { } while (0) -# define KDB_LOADERINIT_HOOK(NTOS, HAL) do { } while (0) -# define KDB_SYMBOLFILE_HOOK(FILENAME) do { } while (0) -# define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0) -#else -# define KDB_LOADUSERMODULE_HOOK(LDRMOD) KdbSymLoadUserModuleSymbols(LDRMOD) -# define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) KdbSymLoadDriverSymbols(FILENAME, MODULE) -# define KDB_UNLOADDRIVER_HOOK(MODULE) KdbSymUnloadDriverSymbols(MODULE) -# define KDB_LOADERINIT_HOOK(NTOS, HAL) KdbSymInit(NTOS, HAL) -# define KDB_SYMBOLFILE_HOOK(FILENAME) KdbSymProcessBootSymbols(FILENAME) -/*#define KDB_CREATE_THREAD_HOOK(CONTEXT) \ - KdbCreateThreadHook(CONTEXT) -*/ +BOOLEAN +STDCALL +KdpDetectConflicts(PCM_RESOURCE_LIST DriverList); + +/* KD GLOBALS ***************************************************************/ -VOID -KdbSymLoadUserModuleSymbols(IN PLDR_MODULE LdrModule); +/* serial debug connection */ +#define DEFAULT_DEBUG_PORT 2 /* COM2 */ +#define DEFAULT_DEBUG_COM1_IRQ 4 /* COM1 IRQ */ +#define DEFAULT_DEBUG_COM2_IRQ 3 /* COM2 IRQ */ +#define DEFAULT_DEBUG_BAUD_RATE 115200 /* 115200 Baud */ -VOID -KdbSymFreeProcessSymbols(IN PEPROCESS Process); +/* KD Native Modes */ +#define KdScreen 0 +#define KdSerial 1 +#define KdFile 2 +#define KdMax 3 -VOID -KdbSymLoadDriverSymbols(IN PUNICODE_STRING Filename, - IN PMODULE_OBJECT Module); +/* KD Private Debug Modes */ +typedef struct _KDP_DEBUG_MODE +{ + union { + struct { + /* Native Modes */ + UCHAR Screen :1; + UCHAR Serial :1; + UCHAR File :1; + + /* Currently Supported Wrappers */ + UCHAR Pice :1; + UCHAR Gdb :1; + UCHAR Bochs :1; + }; + + /* Generic Value */ + ULONG Value; + }; +} KDP_DEBUG_MODE; -VOID -KdbSymUnloadDriverSymbols(IN PMODULE_OBJECT ModuleObject); +/* KD Internal Debug Services */ +typedef enum _KDP_DEBUG_SERVICE +{ + DumpNonPagedPool = 0, + ManualBugCheck, + DumpNonPagedPoolStats, + DumpNewNonPagedPool, + DumpNewNonPagedPoolStats, + DumpAllThreads, + DumpUserThreads, + KdSpare1, + KdSpare2, + KdSpare3, + EnterDebugger +} KDP_DEBUG_SERVICE; -VOID -KdbSymProcessBootSymbols(IN PCHAR FileName); +/* Dispatch Table for Wrapper Functions */ +typedef struct _KD_DISPATCH_TABLE +{ + LIST_ENTRY KdProvidersList; + PKDP_INIT_ROUTINE KdpInitRoutine; + PKDP_PRINT_ROUTINE KdpPrintRoutine; + PKDP_PROMPT_ROUTINE KdpPromptRoutine; + PKDP_EXCEPTION_ROUTINE KdpExceptionRoutine; +} KD_DISPATCH_TABLE, *PKD_DISPATCH_TABLE; -VOID -KdbSymInit(IN PMODULE_TEXT_SECTION NtoskrnlTextSection, - IN PMODULE_TEXT_SECTION LdrHalTextSection); +/* The current Debugging Mode */ +extern KDP_DEBUG_MODE KdpDebugMode; +/* The current Port IRQ */ +extern ULONG KdpPortIrq; -BOOLEAN -KdbSymPrintAddress(IN PVOID Address); +/* The current Port */ +extern ULONG KdpPort; -KD_CONTINUE_TYPE -KdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord, - KPROCESSOR_MODE PreviousMode, - PCONTEXT Context, - PKTRAP_FRAME TrapFrame, - BOOLEAN FirstChance); +/* Port Information for the Serial Native Mode */ +extern KD_PORT_INFORMATION SerialPortInfo; -#endif /* KDBG || DBG */ +/* Init Functions for Native Providers */ +extern PKDP_INIT_ROUTINE InitRoutines[KdMax]; -#if !defined(KDBG) -# define KDB_DELETEPROCESS_HOOK(PROCESS) do { } while (0) -#else -# define KDB_DELETEPROCESS_HOOK(PROCESS) KdbDeleteProcessHook(PROCESS) -VOID -KdbDeleteProcessHook(IN PEPROCESS Process); -#endif /* KDBG */ +/* Wrapper Init Function */ +extern PKDP_INIT_ROUTINE WrapperInitRoutine; + +/* Dispatch Tables for Native Providers */ +extern KD_DISPATCH_TABLE DispatchTable[KdMax]; -VOID -DebugLogDumpMessages(VOID); +/* Dispatch Table for the Wrapper */ +extern KD_DISPATCH_TABLE WrapperTable; + +/* The KD Native Provider List */ +extern LIST_ENTRY KdProviders; #endif /* __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/kdb.h --- trunk/reactos/ntoskrnl/include/internal/kdb.h 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/include/internal/kdb.h 2005-04-25 14:44:48 UTC (rev 14799) @@ -16,7 +16,6 @@ # define RTL_NUMBER_OF(x) (sizeof(x) / sizeof((x)[0])) #endif - /* TYPES *********************************************************************/ /* from kdb.c */ @@ -75,6 +74,11 @@ KdbEnterFromUmode } KDB_ENTER_CONDITION; +typedef enum _KDB_OUTPUT_SETTINGS +{ + KD_DEBUG_KDSERIAL, + KD_DEBUG_KDNOECHO +} KDB_OUTPUT_SETTINGS; /* from kdb_symbols.c */ typedef struct _KDB_MODULE_INFO @@ -176,7 +180,41 @@ OUT PULONG LineNumber OPTIONAL, OUT PCH FileName OPTIONAL, OUT PCH FunctionName OPTIONAL); + +VOID +KdbSymLoadUserModuleSymbols(IN PLDR_MODULE LdrModule); +VOID +KdbSymFreeProcessSymbols(IN PEPROCESS Process); + +VOID +KdbSymLoadDriverSymbols(IN PUNICODE_STRING Filename, + IN PMODULE_OBJECT Module); + +VOID +KdbSymUnloadDriverSymbols(IN PMODULE_OBJECT ModuleObject); + +VOID +KdbSymProcessBootSymbols(IN PCHAR FileName); + +VOID +KdbSymInit(IN PMODULE_TEXT_SECTION NtoskrnlTextSection, + IN PMODULE_TEXT_SECTION LdrHalTextSection); + + +BOOLEAN +KdbSymPrintAddress(IN PVOID Address); + +KD_CONTINUE_TYPE +KdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord, + KPROCESSOR_MODE PreviousMode, + PCONTEXT Context, + PKTRAP_FRAME TrapFrame, + BOOLEAN FirstChance); + +VOID +KdbDeleteProcessHook(IN PEPROCESS Process); + /* from kdb.c */ extern PEPROCESS KdbCurrentProcess; @@ -185,14 +223,8 @@ extern ULONG KdbNumSingleSteps; extern BOOLEAN KdbSingleStepOver; extern PKDB_KTRAP_FRAME KdbCurrentTrapFrame; +extern ULONG KdbDebugState; -VOID -KdbInit(); - -VOID -KdbModuleLoaded( - IN PUNICODE_STRING Name); - LONG KdbpGetNextBreakPointNr( IN ULONG Start OPTIONAL); @@ -255,6 +287,10 @@ KdbpAttachToProcess( PVOID ProcessId); +VOID +STDCALL +KdbpGetCommandLineSettings(PCHAR p1); + /* other functions */ #define KdbpSafeReadMemory(dst, src, size) MmSafeCopyFromUser(dst, src, size) @@ -278,7 +314,10 @@ DbgEnableFile(PCH Filename); VOID DbgDisableFile(PCH Filename); +VOID +KbdDisableMouse(); +VOID +KbdEnableMouse(); - #endif /* NTOSKRNL_KDB_H */ _____ Added: trunk/reactos/ntoskrnl/include/internal/kdbochs.h --- trunk/reactos/ntoskrnl/include/internal/kdbochs.h 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/include/internal/kdbochs.h 2005-04-25 14:44:48 UTC (rev 14799) @@ -0,0 +1,18 @@ +/* $Id: kd.h 13948 2005-03-12 01:11:06Z navaraf $ + * + * kernel debugger prototypes + */ + +#ifndef __INCLUDE_INTERNAL_KD_BOCHS_H +#define __INCLUDE_INTERNAL_KD_BOCHS_H + +#include <internal/ke.h> +#include <internal/ldr.h> +#include <ntdll/ldr.h> + +VOID +STDCALL +KdpBochsInit(struct _KD_DISPATCH_TABLE *DispatchTable, + ULONG BootPhase); + +#endif /* __INCLUDE_INTERNAL_KD_BOCHS_H */ _____ Added: trunk/reactos/ntoskrnl/include/internal/kdgdb.h --- trunk/reactos/ntoskrnl/include/internal/kdgdb.h 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/include/internal/kdgdb.h 2005-04-25 14:44:48 UTC (rev 14799) @@ -0,0 +1,20 @@ +/* $Id: kd.h 13948 2005-03-12 01:11:06Z navaraf $ + * + * kernel debugger prototypes + */ + +#ifndef __INCLUDE_INTERNAL_KD_GDB_H +#define __INCLUDE_INTERNAL_KD_GDB_H + +#include <internal/ke.h> +#include <internal/ldr.h> +#include <ntdll/ldr.h> + +VOID +STDCALL +KdpGdbStubInit(struct _KD_DISPATCH_TABLE *DispatchTable, + ULONG BootPhase); + +extern KD_PORT_INFORMATION GdbPortInfo; + +#endif /* __INCLUDE_INTERNAL_KD_BOCHS_H */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-04-25 14:44:48 UTC (rev 14799) @@ -231,6 +231,9 @@ IN KPROFILE_SOURCE Source ); +BOOLEAN +STDCALL +KiRosPrintAddress(PVOID Address); VOID STDCALL KeUpdateSystemTime(PKTRAP_FRAME TrapFrame, KIRQL Irql); VOID STDCALL KeUpdateRunTime(PKTRAP_FRAME TrapFrame, KIRQL Irql); _____ Modified: trunk/reactos/ntoskrnl/include/internal/module.h --- trunk/reactos/ntoskrnl/include/internal/module.h 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/include/internal/module.h 2005-04-25 14:44:48 UTC (rev 14799) @@ -14,9 +14,7 @@ LIST_ENTRY ListEntry; PWCH Name; PIMAGE_OPTIONAL_HEADER OptionalHeader; -#if defined(DBG) || defined(KDBG) PROSSYM_INFO RosSymInfo; -#endif /* KDBG */ } MODULE_TEXT_SECTION, *PMODULE_TEXT_SECTION; typedef struct _MODULE_OBJECT _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-04-25 14:44:48 UTC (rev 14799) @@ -54,6 +54,9 @@ #include <internal/port.h> #include <internal/nls.h> #include <internal/dbg.h> +#ifdef KDBG +#include <internal/kdb.h> +#endif #include <internal/dbgk.h> #include <internal/trap.h> #include <internal/safe.h> _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-04-25 14:44:48 UTC (rev 14799) @@ -11,7 +11,6 @@ /* INCLUDES ****************************************************************/ #include <ntoskrnl.h> -#include <internal/kdb.h> #define NDEBUG #include <internal/debug.h> @@ -645,13 +644,11 @@ KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE); } - /* Start Profiling on a Debug Build */ -#if defined(KDBG) + /* Read KDB Data */ KdbInit(); -#endif /* KDBG */ - /* I/O is now setup for disk access, so start the debugging logger thread. */ - if (KdDebugState & KD_DEBUG_FILELOG) DebugLogInit2(); + /* I/O is now setup for disk access, so phase 3 */ + KdInitSystem(3, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); /* Load services for devices found by PnP manager */ IopInitializePnpServices(IopRootDeviceNode, FALSE); _____ Modified: trunk/reactos/ntoskrnl/io/pnpreport.c --- trunk/reactos/ntoskrnl/io/pnpreport.c 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/io/pnpreport.c 2005-04-25 14:44:48 UTC (rev 14799) @@ -83,70 +83,16 @@ *ConflictDetected = FALSE; DPRINT1("IoReportResourceForDetection partly implemented\n"); - /* HACK: check if serial debug output is enabled. If yes, - * prevent serial port driver to detect this serial port - * by indicating a conflict - */ - if ((KdDebugState & KD_DEBUG_SERIAL) && DriverList != NULL) + /* FIXME: Manually indicate conflicts with KD Ports */ + if (DriverList) { - ULONG ComPortBase = 0; - ULONG i; - PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; - - switch (LogPortInfo.ComPort) - { - case 1: ComPortBase = 0x3f8; break; - case 2: ComPortBase = 0x2f8; break; - case 3: ComPortBase = 0x3e8; break; - case 4: ComPortBase = 0x2e8; break; - } - - /* search for this port address in DriverList */ - for (i = 0; i < DriverList->List[0].PartialResourceList.Count; i++) - { - ResourceDescriptor = &DriverList->List[0].PartialResourceList.PartialDescriptors[i]; - if (ResourceDescriptor->Type == CmResourceTypePort) + if (KdpDetectConflicts(DriverList)) { - if (ResourceDescriptor->u.Port.Start.u.LowPart <= ComPortBase - && ResourceDescriptor->u.Port.Start.u.LowPart + ResourceDescriptor->u.Port.Length > ComPortBase) - { - *ConflictDetected = TRUE; - return STATUS_CONFLICTING_ADDRESSES; - } + *ConflictDetected = TRUE; + return STATUS_CONFLICTING_ADDRESSES; } - } } - - if ((KdDebugState & KD_DEBUG_GDB) && DriverList != NULL) - { - ULONG ComPortBase = 0; - ULONG i; - PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; - switch (GdbPortInfo.ComPort) - { - case 1: ComPortBase = 0x3f8; break; - case 2: ComPortBase = 0x2f8; break; - case 3: ComPortBase = 0x3e8; break; - case 4: ComPortBase = 0x2e8; break; - } - - /* search for this port address in DriverList */ - for (i = 0; i < DriverList->List[0].PartialResourceList.Count; i++) - { - ResourceDescriptor = &DriverList->List[0].PartialResourceList.PartialDescriptors[i]; - if (ResourceDescriptor->Type == CmResourceTypePort) - { - if (ResourceDescriptor->u.Port.Start.u.LowPart <= ComPortBase - && ResourceDescriptor->u.Port.Start.u.LowPart + ResourceDescriptor->u.Port.Length > ComPortBase) - { - *ConflictDetected = TRUE; - return STATUS_CONFLICTING_ADDRESSES; - } - } - } - } - if (PopSystemPowerDeviceNode != NULL && DriverListSize > 0) { /* We hope legacy devices will be enumerated by ACPI */ _____ Deleted: trunk/reactos/ntoskrnl/kd/dlog.c --- trunk/reactos/ntoskrnl/kd/dlog.c 2005-04-25 10:58:34 UTC (rev 14798) +++ trunk/reactos/ntoskrnl/kd/dlog.c 2005-04-25 14:44:48 UTC (rev 14799) @@ -1,230 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/kd/kdebug.c - * PURPOSE: Kernel debugger - * - * PROGRAMMERS: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> - -/* GLOBALS *******************************************************************/ - -#define DEBUGLOG_SIZE (32*1024) - -static CHAR DebugLog[DEBUGLOG_SIZE]; -static ULONG DebugLogStart; -static ULONG DebugLogEnd; -static ULONG DebugLogCount; -static KSPIN_LOCK DebugLogLock; -static ULONG DebugLogOverflow; -static HANDLE DebugLogThreadHandle; -static CLIENT_ID DebugLogThreadCid; -static HANDLE DebugLogFile; -static KEVENT DebugLogEvent; - -/* FUNCTIONS *****************************************************************/ - -VOID -DebugLogDumpMessages(VOID) -{ - static CHAR Buffer[256]; - ULONG Offset; - ULONG Length; - - if (!(KdDebugState & KD_DEBUG_FILELOG)) - { - return; - } - KdDebugState &= ~KD_DEBUG_FILELOG; - - Offset = (DebugLogEnd + 1) % DEBUGLOG_SIZE; - do - { - if (Offset <= DebugLogEnd) - { - Length = min(255, DebugLogEnd - Offset); - } - else - { - Length = min(255, DEBUGLOG_SIZE - Offset); - } - memcpy(Buffer, DebugLog + Offset, Length); - Buffer[Length] = 0; - DbgPrint(Buffer); - Offset = (Offset + Length) % DEBUGLOG_SIZE; - } - while (Length > 0); -} - -VOID INIT_FUNCTION -DebugLogInit(VOID) -{ - KeInitializeSpinLock(&DebugLogLock); - DebugLogStart = 0; - DebugLogEnd = 0; - DebugLogOverflow = 0; - DebugLogCount = 0; - KeInitializeEvent(&DebugLogEvent, NotificationEvent, FALSE); -} - -VOID STDCALL -DebugLogThreadMain(PVOID Context) -{ - KIRQL oldIrql; - IO_STATUS_BLOCK Iosb; - static CHAR Buffer[256]; - ULONG WLen; - - for (;;) - { - LARGE_INTEGER TimeOut; - TimeOut.QuadPart = -5000000; /* Half a second. */ - KeWaitForSingleObject(&DebugLogEvent, - 0, - KernelMode, - FALSE, - &TimeOut); - KeAcquireSpinLock(&DebugLogLock, &oldIrql); - while (DebugLogCount > 0) - { - if (DebugLogStart > DebugLogEnd) - { - WLen = min(256, DEBUGLOG_SIZE - DebugLogStart); - memcpy(Buffer, &DebugLog[DebugLogStart], WLen); - Buffer[WLen + 1] = '\n'; - DebugLogStart = - (DebugLogStart + WLen) % DEBUGLOG_SIZE; - DebugLogCount = DebugLogCount - WLen; - KeReleaseSpinLock(&DebugLogLock, oldIrql); - NtWriteFile(DebugLogFile, - NULL, - NULL, - NULL, - &Iosb, - Buffer, - WLen + 1, - NULL, - NULL); - } - else - { - WLen = min(255, DebugLogEnd - DebugLogStart); - memcpy(Buffer, &DebugLog[DebugLogStart], WLen); - DebugLogStart = - (DebugLogStart + WLen) % DEBUGLOG_SIZE; - DebugLogCount = DebugLogCount - WLen; - KeReleaseSpinLock(&DebugLogLock, oldIrql); - NtWriteFile(DebugLogFile, - NULL, - NULL, - NULL, - &Iosb, - Buffer, - WLen, - NULL, - NULL); - } - KeAcquireSpinLock(&DebugLogLock, &oldIrql); - } - KeResetEvent(&DebugLogEvent); - KeReleaseSpinLock(&DebugLogLock, oldIrql); - } -} - -VOID INIT_FUNCTION -DebugLogInit2(VOID) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING FileName; - IO_STATUS_BLOCK Iosb; - - RtlInitUnicodeString(&FileName, L"\\SystemRoot\\debug.log"); - InitializeObjectAttributes(&ObjectAttributes, - &FileName, - 0, - NULL, - NULL); - - Status = NtCreateFile(&DebugLogFile, - FILE_ALL_ACCESS, - &ObjectAttributes, - &Iosb, - NULL, - FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ, - FILE_SUPERSEDE, - FILE_WRITE_THROUGH | FILE_SYNCHRONOUS_IO_NONALERT, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Failed to create debug log file\n"); - return; - } - - Status = PsCreateSystemThread(&DebugLogThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &DebugLogThreadCid, - DebugLogThreadMain, - NULL); -} - -VOID -DebugLogWrite(PCH String) -{ - KIRQL oldIrql; - - if (KeGetCurrentIrql() > DISPATCH_LEVEL) - { - DebugLogOverflow++; - return; - } - - KeAcquireSpinLock(&DebugLogLock, &oldIrql); - - if (DebugLogCount == DEBUGLOG_SIZE) - { - DebugLogOverflow++; - KeReleaseSpinLock(&DebugLogLock, oldIrql); - if (oldIrql < DISPATCH_LEVEL) - { - KeSetEvent(&DebugLogEvent, IO_NO_INCREMENT, FALSE); - } - return; - } - - while ((*String) != 0) - { - DebugLog[DebugLogEnd] = *String; - String++; - DebugLogCount++; [truncated at 1000 lines; 5130 more skipped]

19 years, 4 months

[gvg] 14798: Sync to Wine-20050419:

by gvg＠svn.reactos.com

Sync to Wine-20050419: Juan Lang <juan_lang(a)yahoo.com> - Always initialize header file name, to prevent "#include (null)" statements in generated files. - Put space between include directive and include file. - Add proxy/stub options to widl man page. Vincent Beron <vberon(a)mecano.gme.usherb.ca> - Add support for single in idl files. - Keep types sorted in alphabetical order. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/lex.yy.c Modified: trunk/reactos/tools/widl/parser.l Modified: trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/server.c Modified: trunk/reactos/tools/widl/typelib_struct.h Modified: trunk/reactos/tools/widl/widl.c Modified: trunk/reactos/tools/widl/widl.man Modified: trunk/reactos/tools/widl/widltypes.h Modified: trunk/reactos/tools/widl/y.tab.c Modified: trunk/reactos/tools/widl/y.tab.h _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-04-25 09:12:35 UTC (rev 14797) +++ trunk/reactos/tools/widl/client.c 2005-04-25 10:58:34 UTC (rev 14798) @@ -1714,12 +1714,12 @@ error("Could not open %s for output\n", client_name); print_client("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", WIDL_FULLVERSION, input_name); - print_client("#include<string.h>\n"); + print_client("#include <string.h>\n"); print_client("#ifdef _ALPHA_\n"); - print_client("#include<stdarg.h>\n"); + print_client("#include <stdarg.h>\n"); print_client("#endif\n"); fprintf(client, "\n"); - print_client("#include\"%s\"\n", header_name); + print_client("#include \"%s\"\n", header_name); fprintf(client, "\n"); } _____ Modified: trunk/reactos/tools/widl/lex.yy.c --- trunk/reactos/tools/widl/lex.yy.c 2005-04-25 09:12:35 UTC (rev 14797) +++ trunk/reactos/tools/widl/lex.yy.c 2005-04-25 10:58:34 UTC (rev 14798) @@ -1,4 +1,3 @@ -#line 2 "lex.yy.c" /* A lexical scanner generated by flex */ /* Scanner skeleton version: @@ -10,6 +9,7 @@ #define YY_FLEX_MINOR_VERSION 5 #include <stdio.h> +#include <unistd.h> /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ @@ -23,7 +23,6 @@ #ifdef __cplusplus #include <stdlib.h> -#include <unistd.h> /* Use prototypes in function declarations. */ #define YY_USE_PROTOS @@ -3088,7 +3087,7 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "parser.l" +#line 1 "./parser.l" #define INITIAL 0 /* * IDL Compiler @@ -3115,7 +3114,7 @@ #define pp_line 2 -#line 36 "parser.l" +#line 36 "./parser.l" #include "config.h" @@ -3186,7 +3185,7 @@ * The flexer starts here ************************************************************************ ** */ -#line 3190 "lex.yy.c" +#line 3189 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -3337,12 +3336,12 @@ YY_DECL { register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; + register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 108 "parser.l" +#line 108 "./parser.l" -#line 3346 "lex.yy.c" +#line 3345 "lex.yy.c" if ( yy_init ) { @@ -3431,12 +3430,12 @@ case 1: YY_RULE_SETUP -#line 109 "parser.l" +#line 109 "./parser.l" yy_push_state(pp_line); YY_BREAK case 2: YY_RULE_SETUP -#line 110 "parser.l" +#line 110 "./parser.l" { int lineno; char *cptr, *fname; @@ -3459,12 +3458,12 @@ YY_BREAK case 3: YY_RULE_SETUP -#line 129 "parser.l" +#line 129 "./parser.l" yy_push_state(QUOTE); cbufidx = 0; YY_BREAK case 4: YY_RULE_SETUP -#line 130 "parser.l" +#line 130 "./parser.l" { yy_pop_state(); yylval.str = get_buffered_cstring(); @@ -3472,25 +3471,25 @@ } YY_BREAK case 5: -#line 136 "parser.l" +#line 136 "./parser.l" case 6: YY_RULE_SETUP -#line 136 "parser.l" +#line 136 "./parser.l" addcchar(yytext[1]); YY_BREAK case 7: YY_RULE_SETUP -#line 137 "parser.l" +#line 137 "./parser.l" addcchar('\\'); addcchar(yytext[1]); YY_BREAK case 8: YY_RULE_SETUP -#line 138 "parser.l" +#line 138 "./parser.l" addcchar(yytext[0]); YY_BREAK case 9: YY_RULE_SETUP -#line 139 "parser.l" +#line 139 "./parser.l" { yylval.uuid = parse_uuid(yytext); return aUUID; @@ -3498,7 +3497,7 @@ YY_BREAK case 10: YY_RULE_SETUP -#line 143 "parser.l" +#line 143 "./parser.l" { yylval.num = strtoul(yytext, NULL, 0); return aHEXNUM; @@ -3506,7 +3505,7 @@ YY_BREAK case 11: YY_RULE_SETUP -#line 147 "parser.l" +#line 147 "./parser.l" { yylval.num = strtoul(yytext, NULL, 0); return aNUM; @@ -3514,38 +3513,38 @@ YY_BREAK case 12: YY_RULE_SETUP -#line 151 "parser.l" +#line 151 "./parser.l" return kw_token(yytext); YY_BREAK case 13: YY_RULE_SETUP -#line 152 "parser.l" +#line 152 "./parser.l" line_number++; YY_BREAK case 14: YY_RULE_SETUP -#line 153 "parser.l" +#line 153 "./parser.l" YY_BREAK case 15: YY_RULE_SETUP -#line 154 "parser.l" +#line 154 "./parser.l" return SHL; YY_BREAK case 16: YY_RULE_SETUP -#line 155 "parser.l" +#line 155 "./parser.l" return SHR; YY_BREAK case 17: YY_RULE_SETUP -#line 156 "parser.l" +#line 156 "./parser.l" return yytext[0]; YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(QUOTE): case YY_STATE_EOF(pp_line): -#line 157 "parser.l" +#line 157 "./parser.l" { if (import_stack_ptr) { pop_import(); @@ -3556,10 +3555,10 @@ YY_BREAK case 18: YY_RULE_SETUP -#line 164 "parser.l" +#line 164 "./parser.l" ECHO; YY_BREAK -#line 3563 "lex.yy.c" +#line 3562 "lex.yy.c" case YY_END_OF_BUFFER: { @@ -3935,6 +3934,7 @@ #endif /* ifndef YY_NO_UNPUT */ +#ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput() #else @@ -4007,8 +4007,8 @@ return c; } +#endif /* YY_NO_INPUT */ - #ifdef YY_USE_PROTOS void yyrestart( FILE *input_file ) #else @@ -4118,11 +4118,6 @@ } -#ifndef YY_ALWAYS_INTERACTIVE -#ifndef YY_NEVER_INTERACTIVE -extern int isatty YY_PROTO(( int )); -#endif -#endif #ifdef YY_USE_PROTOS void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) @@ -4440,7 +4435,7 @@ return 0; } #endif -#line 164 "parser.l" +#line 164 "./parser.l" #ifndef yywrap @@ -4566,6 +4561,7 @@ /* ... */ {"short", tSHORT}, {"signed", tSIGNED}, + {"single", tSINGLE}, {"size_is", tSIZEIS}, {"sizeof", tSIZEOF}, /* ... */ _____ Modified: trunk/reactos/tools/widl/parser.l --- trunk/reactos/tools/widl/parser.l 2005-04-25 09:12:35 UTC (rev 14797) +++ trunk/reactos/tools/widl/parser.l 2005-04-25 10:58:34 UTC (rev 14798) @@ -286,6 +286,7 @@ /* ... */ {"short", tSHORT}, {"signed", tSIGNED}, + {"single", tSINGLE}, {"size_is", tSIZEIS}, {"sizeof", tSIZEOF}, /* ... */ _____ Modified: trunk/reactos/tools/widl/parser.y --- trunk/reactos/tools/widl/parser.y 2005-04-25 09:12:35 UTC (rev 14797) +++ trunk/reactos/tools/widl/parser.y 2005-04-25 10:58:34 UTC (rev 14798) @@ -169,6 +169,7 @@ %token tRETVAL %token tSHORT %token tSIGNED +%token tSINGLE %token tSIZEIS tSIZEOF %token tSMALL %token tSOURCE @@ -565,9 +566,9 @@ default: break; } } - | tUNSIGNED { $$ = make_type(RPC_FC_ULONG, &std_int); - $$->sign = -1; } + | tUNSIGNED { $$ = make_type(RPC_FC_ULONG, &std_int); $$->sign = -1; } | tFLOAT { $$ = make_type(RPC_FC_FLOAT, NULL); } + | tSINGLE { $$ = make_type(RPC_FC_FLOAT, NULL); } | tDOUBLE { $$ = make_type(RPC_FC_DOUBLE, NULL); } | tBOOLEAN { $$ = make_type(RPC_FC_SMALL, &std_bool); } | tERRORSTATUST { $$ = make_type(RPC_FC_ERROR_STATUS_T, NULL); } _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-04-25 09:12:35 UTC (rev 14797) +++ trunk/reactos/tools/widl/server.c 2005-04-25 10:58:34 UTC (rev 14798) @@ -1665,9 +1665,9 @@ error("Could not open %s for output\n", server_name); print_server("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", WIDL_FULLVERSION, input_name); - print_server("#include<string.h>\n"); + print_server("#include <string.h>\n"); fprintf(server, "\n"); - print_server("#include\"%s\"\n", header_name); + print_server("#include \"%s\"\n", header_name); fprintf(server, "\n"); } _____ Modified: trunk/reactos/tools/widl/typelib_struct.h --- trunk/reactos/tools/widl/typelib_struct.h 2005-04-25 09:12:35 UTC (rev 14797) +++ trunk/reactos/tools/widl/typelib_struct.h 2005-04-25 10:58:34 UTC (rev 14798) @@ -165,7 +165,7 @@ /* function description data */ typedef struct { /* INT recsize; record size including some xtra stuff */ - INT DataType; /* data type of the memeber, eg return of function */ + INT DataType; /* data type of the member, eg return of function */ INT Flags; /* something to do with attribute flags (LOWORD) */ #ifdef WORDS_BIGENDIAN INT16 funcdescsize; /* size of reconstituted FUNCDESC and related structs */ _____ Modified: trunk/reactos/tools/widl/widl.c --- trunk/reactos/tools/widl/widl.c 2005-04-25 09:12:35 UTC (rev 14797) +++ trunk/reactos/tools/widl/widl.c 2005-04-25 10:58:34 UTC (rev 14798) @@ -236,7 +236,7 @@ (debuglevel & DEBUGLEVEL_PPTRACE) != 0, (debuglevel & DEBUGLEVEL_PPMSG) != 0 ); - if (!header_name && do_header) { + if (!header_name) { header_name = dup_basename(input_name, ".idl"); strcat(header_name, ".h"); } _____ Modified: trunk/reactos/tools/widl/widl.man --- trunk/reactos/tools/widl/widl.man 2005-04-25 09:12:35 UTC (rev 14797) +++ trunk/reactos/tools/widl/widl.man 2005-04-25 10:58:34 UTC (rev 14798) @@ -31,6 +31,20 @@ Define the name of the type library to be generated. The default filename is infile.tlb. .PP +.B Proxy/stub generation options: +.IP \fB-c\fR +Generate client stub. +.IP \fB-C \fIfile\fR +Name of client stub file (default is infile_c.c) +.IP \fB-c\fR +Generate proxy. +.IP \fB-P \fIfile\fR +Name of proxy file (default is infile_p.c) +.IP \fB-s\fR +Generate server stub. +.IP \fB-S \fIfile\fR +Name of server stub file (default is infile_s.c) +.PP .B Preprocessor options: .IP "\fB-I \fIpath\fR" Add a header search dir to path. Multiple search _____ Modified: trunk/reactos/tools/widl/widltypes.h --- trunk/reactos/tools/widl/widltypes.h 2005-04-25 09:12:35 UTC (rev 14797) +++ trunk/reactos/tools/widl/widltypes.h 2005-04-25 10:58:34 UTC (rev 14798) @@ -66,11 +66,12 @@ ATTR_DEFAULT, ATTR_DEFAULTVALUE_EXPR, ATTR_DEFAULTVALUE_STRING, + ATTR_DISPINTERFACE, ATTR_DLLNAME, ATTR_DUAL, ATTR_ENDPOINT, + ATTR_ENTRY_ORDINAL, ATTR_ENTRY_STRING, - ATTR_ENTRY_ORDINAL, ATTR_EXPLICIT_HANDLE, ATTR_HANDLE, ATTR_HELPCONTEXT, @@ -115,8 +116,7 @@ ATTR_V1ENUM, ATTR_VARARG, ATTR_VERSION, - ATTR_WIREMARSHAL, - ATTR_DISPINTERFACE + ATTR_WIREMARSHAL }; enum expr_type _____ Modified: trunk/reactos/tools/widl/y.tab.c --- trunk/reactos/tools/widl/y.tab.c 2005-04-25 09:12:35 UTC (rev 14797) +++ trunk/reactos/tools/widl/y.tab.c 2005-04-25 10:58:34 UTC (rev 14798) @@ -1,3968 +1,3471 @@ -/* A Bison parser, made by GNU Bison 1.875. */ - -/* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ - -/* Written by Richard Stallman by simplifying the original so called - ``semantic'' parser. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output. */ -#define YYBISON 1 - -/* Skeleton name. */ -#define YYSKELETON_NAME "yacc.c" - -/* Pure parsers. */ -#define YYPURE 0 - -/* Using locations. */ -#define YYLSP_NEEDED 0 - - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - aIDENTIFIER = 258, - aKNOWNTYPE = 259, - aNUM = 260, - aHEXNUM = 261, - aSTRING = 262, - aUUID = 263, - aEOF = 264, - SHL = 265, - SHR = 266, - tAGGREGATABLE = 267, - tALLOCATE = 268, - tAPPOBJECT = 269, - tARRAYS = 270, - tASYNC = 271, - tASYNCUUID = 272, - tAUTOHANDLE = 273, - tBINDABLE = 274, - tBOOLEAN = 275, - tBROADCAST = 276, - tBYTE = 277, - tBYTECOUNT = 278, - tCALLAS = 279, - tCALLBACK = 280, - tCASE = 281, - tCDECL = 282, - tCHAR = 283, - tCOCLASS = 284, - tCODE = 285, - tCOMMSTATUS = 286, - tCONST = 287, - tCONTEXTHANDLE = 288, - tCONTEXTHANDLENOSERIALIZE = 289, - tCONTEXTHANDLESERIALIZE = 290, - tCONTROL = 291, - tCPPQUOTE = 292, - tDEFAULT = 293, - tDEFAULTVALUE = 294, - tDISPINTERFACE = 295, - tDLLNAME = 296, - tDOUBLE = 297, - tDUAL = 298, - tENDPOINT = 299, - tENTRY = 300, - tENUM = 301, - tERRORSTATUST = 302, - tEXPLICITHANDLE = 303, - tEXTERN = 304, - tFLOAT = 305, - tHANDLE = 306, - tHANDLET = 307, - tHELPCONTEXT = 308, - tHELPFILE = 309, - tHELPSTRING = 310, - tHELPSTRINGCONTEXT = 311, - tHELPSTRINGDLL = 312, - tHIDDEN = 313, - tHYPER = 314, - tID = 315, - tIDEMPOTENT = 316, - tIIDIS = 317, - tIMPLICITHANDLE = 318, - tIMPORT = 319, - tIMPORTLIB = 320, - tIN = 321, - tINCLUDE = 322, - tINLINE = 323, - tINPUTSYNC = 324, - tINT = 325, - tINT64 = 326, - tINTERFACE = 327, - tLENGTHIS = 328, - tLIBRARY = 329, - tLOCAL = 330, - tLONG = 331, - tMETHODS = 332, - tMODULE = 333, - tNONCREATABLE = 334, - tOBJECT = 335, - tODL = 336, - tOLEAUTOMATION = 337, - tOPTIONAL = 338, - tOUT = 339, - tPOINTERDEFAULT = 340, - tPROPERTIES = 341, - tPROPGET = 342, - tPROPPUT = 343, - tPROPPUTREF = 344, - tPTR = 345, - tPUBLIC = 346, - tREADONLY = 347, - tREF = 348, - tRESTRICTED = 349, - tRETVAL = 350, - tSHORT = 351, - tSIGNED = 352, - tSIZEIS = 353, - tSIZEOF = 354, - tSMALL = 355, - tSOURCE = 356, - tSTDCALL = 357, - tSTRING = 358, - tSTRUCT = 359, - tSWITCH = 360, - tSWITCHIS = 361, - tSWITCHTYPE = 362, - tTRANSMITAS = 363, - tTYPEDEF = 364, - tUNION = 365, - tUNIQUE = 366, - tUNSIGNED = 367, - tUUID = 368, - tV1ENUM = 369, - tVARARG = 370, - tVERSION = 371, - tVOID = 372, - tWCHAR = 373, - tWIREMARSHAL = 374, - tPOINTERTYPE = 375, - COND = 376, - CAST = 377, - PPTR = 378, - NEG = 379 - }; -#endif -#define aIDENTIFIER 258 -#define aKNOWNTYPE 259 -#define aNUM 260 -#define aHEXNUM 261 -#define aSTRING 262 -#define aUUID 263 -#define aEOF 264 -#define SHL 265 -#define SHR 266 -#define tAGGREGATABLE 267 -#define tALLOCATE 268 -#define tAPPOBJECT 269 -#define tARRAYS 270 -#define tASYNC 271 -#define tASYNCUUID 272 -#define tAUTOHANDLE 273 -#define tBINDABLE 274 -#define tBOOLEAN 275 -#define tBROADCAST 276 -#define tBYTE 277 -#define tBYTECOUNT 278 -#define tCALLAS 279 -#define tCALLBACK 280 -#define tCASE 281 -#define tCDECL 282 -#define tCHAR 283 -#define tCOCLASS 284 -#define tCODE 285 -#define tCOMMSTATUS 286 -#define tCONST 287 -#define tCONTEXTHANDLE 288 -#define tCONTEXTHANDLENOSERIALIZE 289 -#define tCONTEXTHANDLESERIALIZE 290 -#define tCONTROL 291 -#define tCPPQUOTE 292 -#define tDEFAULT 293 -#define tDEFAULTVALUE 294 -#define tDISPINTERFACE 295 -#define tDLLNAME 296 -#define tDOUBLE 297 -#define tDUAL 298 -#define tENDPOINT 299 -#define tENTRY 300 -#define tENUM 301 -#define tERRORSTATUST 302 -#define tEXPLICITHANDLE 303 -#define tEXTERN 304 -#define tFLOAT 305 -#define tHANDLE 306 -#define tHANDLET 307 -#define tHELPCONTEXT 308 -#define tHELPFILE 309 -#define tHELPSTRING 310 -#define tHELPSTRINGCONTEXT 311 -#define tHELPSTRINGDLL 312 -#define tHIDDEN 313 -#define tHYPER 314 -#define tID 315 -#define tIDEMPOTENT 316 -#define tIIDIS 317 -#define tIMPLICITHANDLE 318 -#define tIMPORT 319 -#define tIMPORTLIB 320 -#define tIN 321 -#define tINCLUDE 322 -#define tINLINE 323 -#define tINPUTSYNC 324 -#define tINT 325 -#define tINT64 326 -#define tINTERFACE 327 -#define tLENGTHIS 328 -#define tLIBRARY 329 -#define tLOCAL 330 -#define tLONG 331 -#define tMETHODS 332 -#define tMODULE 333 -#define tNONCREATABLE 334 -#define tOBJECT 335 -#define tODL 336 -#define tOLEAUTOMATION 337 -#define tOPTIONAL 338 -#define tOUT 339 -#define tPOINTERDEFAULT 340 -#define tPROPERTIES 341 -#define tPROPGET 342 -#define tPROPPUT 343 -#define tPROPPUTREF 344 -#define tPTR 345 -#define tPUBLIC 346 -#define tREADONLY 347 -#define tREF 348 -#define tRESTRICTED 349 -#define tRETVAL 350 -#define tSHORT 351 -#define tSIGNED 352 -#define tSIZEIS 353 -#define tSIZEOF 354 -#define tSMALL 355 -#define tSOURCE 356 -#define tSTDCALL 357 -#define tSTRING 358 -#define tSTRUCT 359 -#define tSWITCH 360 -#define tSWITCHIS 361 -#define tSWITCHTYPE 362 -#define tTRANSMITAS 363 -#define tTYPEDEF 364 -#define tUNION 365 -#define tUNIQUE 366 -#define tUNSIGNED 367 -#define tUUID 368 -#define tV1ENUM 369 -#define tVARARG 370 -#define tVERSION 371 -#define tVOID 372 -#define tWCHAR 373 -#define tWIREMARSHAL 374 -#define tPOINTERTYPE 375 -#define COND 376 -#define CAST 377 -#define PPTR 378 -#define NEG 379 - - - - -/* Copy the first part of user declarations. */ -#line 1 "parser.y" - -/* - * IDL Compiler - * - * Copyright 2002 Ove Kaaven - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <stdarg.h> -#include <assert.h> -#include <ctype.h> -#include <string.h> -#ifdef HAVE_ALLOCA_H -#include <alloca.h> -#endif - -#include "widl.h" -#include "utils.h" -#include "parser.h" -#include "header.h" -#include "typelib.h" - -#if defined(YYBYACC) - /* Berkeley yacc (byacc) doesn't seem to know about these */ - /* Some *BSD supplied versions do define these though */ -# ifndef YYEMPTY -# define YYEMPTY (-1) /* Empty lookahead value of yychar */ -# endif -# ifndef YYLEX -# define YYLEX yylex() -# endif - -#elif defined(YYBISON) - /* Bison was used for original development */ - /* #define YYEMPTY -2 */ - /* #define YYLEX yylex() */ - -#else - /* No yacc we know yet */ -# if !defined(YYEMPTY) || !defined(YYLEX) -# error Yacc version/type unknown. This version needs to be verified for settings of YYEMPTY and YYLEX. -# elif defined(__GNUC__) /* gcc defines the #warning directive */ -# warning Yacc version/type unknown. It defines YYEMPTY and YYLEX, but is not tested - /* #else we just take a chance that it works... */ -# endif -#endif - -static attr_t *make_attr(enum attr_type type); -static attr_t *make_attrv(enum attr_type type, unsigned long val); -static attr_t *make_attrp(enum attr_type type, void *val); -static expr_t *make_expr(enum expr_type type); -static expr_t *make_exprl(enum expr_type type, long val); -static expr_t *make_exprs(enum expr_type type, char *val); -static expr_t *make_exprt(enum expr_type type, typeref_t *tref, expr_t *expr); -static expr_t *make_expr1(enum expr_type type, expr_t *expr); -static expr_t *make_expr2(enum expr_type type, expr_t *exp1, expr_t *exp2); -static expr_t *make_expr3(enum expr_type type, expr_t *expr1, expr_t *expr2, expr_t *expr3); -static type_t *make_type(unsigned char type, type_t *ref); -static typeref_t *make_tref(char *name, type_t *ref); -static typeref_t *uniq_tref(typeref_t *ref); -static type_t *type_ref(typeref_t *ref); -static void set_type(var_t *v, typeref_t *ref, expr_t *arr); -static ifref_t *make_ifref(type_t *iface); -static var_t *make_var(char *name); -static func_t *make_func(var_t *def, var_t *args); -static class_t *make_class(char *name); - -static type_t *reg_type(type_t *type, char *name, int t); -static type_t *reg_types(type_t *type, var_t *names, int t); -static type_t *find_type(char *name, int t); -static type_t *find_type2(char *name, int t); -static type_t *get_type(unsigned char type, char *name, int t); -static type_t *get_typev(unsigned char type, var_t *name, int t); -static int get_struct_type(var_t *fields); - -static var_t *reg_const(var_t *var); -static var_t *find_const(char *name, int f); - -#define tsENUM 1 -#define tsSTRUCT 2 -#define tsUNION 3 - -static type_t std_bool = { "boolean" }; -static type_t std_int = { "int" }; -static type_t std_int64 = { "__int64" }; -static type_t std_uhyper = { "MIDL_uhyper" }; - - - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 -#endif - -#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 106 "parser.y" -typedef union YYSTYPE { - attr_t *attr; - expr_t *expr; - type_t *type; - typeref_t *tref; - var_t *var; - func_t *func; - ifref_t *ifref; - class_t *clas; - char *str; - UUID *uuid; - unsigned int num; -} YYSTYPE; -/* Line 191 of yacc.c. */ -#line 443 "y.tab.c" -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 -#endif - - - -/* Copy the second part of user declarations. */ - - -/* Line 214 of yacc.c. */ -#line 455 "y.tab.c" - -#if ! defined (yyoverflow) || YYERROR_VERBOSE - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -# else -# ifndef YYSTACK_USE_ALLOCA -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# endif -# endif -# endif -# endif - -# ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# else -# if defined (__STDC__) || defined (__cplusplus) -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -# define YYSTACK_ALLOC malloc -# define YYSTACK_FREE free -# endif -#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ - - -#if (! defined (yyoverflow) \ - && (! defined (__cplusplus) \ - || (YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - short yyss; - YYSTYPE yyvs; - }; - -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ - + YYSTACK_GAP_MAXIMUM) - -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - register YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (0) -# endif -# endif - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (0) - -#endif - -#if defined (__STDC__) || defined (__cplusplus) - typedef signed char yysigned_char; -#else - typedef short yysigned_char; -#endif - -/* YYFINAL -- State number of the termination state. */ -#define YYFINAL 3 -/* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 917 - -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 144 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 73 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 249 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 462 - -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -#define YYUNDEFTOK 2 -#define YYMAXUTOK 379 - -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) - -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const unsigned char yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 124, 2, - 134, 135, 127, 126, 121, 125, 143, 128, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 140, 133, - 2, 141, 2, 142, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 138, 2, 139, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 136, 123, 137, 129, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, [truncated at 1000 lines; 7308 more skipped]

19 years, 4 months

[gvg] 14797: Sync to Wine-20050419:

by gvg＠svn.reactos.com

Sync to Wine-20050419: Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Michael Lin <mlin(a)corvu.com.au> - Change menu item options to use optional comma. Modified: trunk/reactos/tools/wrc/lex.yy.c Modified: trunk/reactos/tools/wrc/newstruc.c Modified: trunk/reactos/tools/wrc/parser.y Modified: trunk/reactos/tools/wrc/y.tab.c Modified: trunk/reactos/tools/wrc/y.tab.h _____ Modified: trunk/reactos/tools/wrc/lex.yy.c --- trunk/reactos/tools/wrc/lex.yy.c 2005-04-25 08:26:29 UTC (rev 14796) +++ trunk/reactos/tools/wrc/lex.yy.c 2005-04-25 09:12:35 UTC (rev 14797) @@ -9,8 +9,9 @@ #define YY_FLEX_MINOR_VERSION 5 #include <stdio.h> -#include <errno.h> +#include <unistd.h> + /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ #ifdef c_plusplus #ifndef __cplusplus @@ -22,9 +23,6 @@ #ifdef __cplusplus #include <stdlib.h> -#ifndef _WIN32 -#include <unistd.h> -#endif /* Use prototypes in function declarations. */ #define YY_USE_PROTOS @@ -64,7 +62,6 @@ #define YY_PROTO(proto) () #endif - /* Returned upon end-of-file. */ #define YY_NULL 0 @@ -6887,7 +6884,7 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "parser.l" +#line 1 "./parser.l" #define INITIAL 0 /* -*-C-*- * @@ -6989,7 +6986,7 @@ #define YY_STACK_USED 1 #define YY_NEVER_INTERACTIVE 1 /* Some shortcut definitions */ -#line 97 "parser.l" +#line 97 "./parser.l" /*#define LEX_DEBUG*/ @@ -7197,7 +7194,7 @@ * The flexer starts here ************************************************************************ ** */ -#line 7201 "lex.yy.c" +#line 7198 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -7297,20 +7294,9 @@ YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ - else \ - { \ - errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - } + else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ + && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - @@ -7359,10 +7345,10 @@ YY_DECL { register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; + register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 306 "parser.l" +#line 306 "./parser.l" /* * Catch the GCC-style line statements here and parse them. @@ -7382,7 +7368,7 @@ * because we only want to know the linenumber and * filename. */ -#line 7386 "lex.yy.c" +#line 7372 "lex.yy.c" if ( yy_init ) { @@ -7471,17 +7457,17 @@ case 1: YY_RULE_SETUP -#line 325 "parser.l" +#line 325 "./parser.l" yy_push_state(pp_pragma); YY_BREAK case 2: YY_RULE_SETUP -#line 326 "parser.l" +#line 326 "./parser.l" yy_push_state(pp_line); YY_BREAK case 3: YY_RULE_SETUP -#line 327 "parser.l" +#line 327 "./parser.l" { int lineno; char *cptr; @@ -7504,22 +7490,22 @@ YY_BREAK case 4: YY_RULE_SETUP -#line 347 "parser.l" +#line 347 "./parser.l" yyless(9); yy_pop_state(); yy_push_state(pp_code_page); YY_BREAK case 5: YY_RULE_SETUP -#line 348 "parser.l" +#line 348 "./parser.l" yy_pop_state(); if (pedantic) yywarning("Unrecognized #pragma directive '%s'",yytext); YY_BREAK case 6: YY_RULE_SETUP -#line 350 "parser.l" +#line 350 "./parser.l" current_codepage = -1; yy_pop_state(); YY_BREAK case 7: YY_RULE_SETUP -#line 351 "parser.l" +#line 351 "./parser.l" { char *p = yytext; yy_pop_state(); @@ -7534,7 +7520,7 @@ YY_BREAK case 8: YY_RULE_SETUP -#line 362 "parser.l" +#line 362 "./parser.l" yy_pop_state(); yyerror("Malformed #pragma code_page directive"); YY_BREAK /* @@ -7544,42 +7530,42 @@ */ case 9: YY_RULE_SETUP -#line 369 "parser.l" +#line 369 "./parser.l" stripslevel++; YY_BREAK case 10: YY_RULE_SETUP -#line 370 "parser.l" +#line 370 "./parser.l" stripslevel--; YY_BREAK case 11: YY_RULE_SETUP -#line 371 "parser.l" +#line 371 "./parser.l" if(!stripslevel) yy_pop_state(); YY_BREAK case 12: YY_RULE_SETUP -#line 372 "parser.l" +#line 372 "./parser.l" ; /* To catch comments */ YY_BREAK case 13: YY_RULE_SETUP -#line 373 "parser.l" +#line 373 "./parser.l" ; /* Ignore rest */ YY_BREAK case 14: YY_RULE_SETUP -#line 374 "parser.l" +#line 374 "./parser.l" line_number++; char_number = 1; YY_BREAK case 15: YY_RULE_SETUP -#line 376 "parser.l" +#line 376 "./parser.l" stripplevel++; YY_BREAK case 16: YY_RULE_SETUP -#line 377 "parser.l" +#line 377 "./parser.l" { stripplevel--; if(!stripplevel) @@ -7591,62 +7577,62 @@ YY_BREAK case 17: YY_RULE_SETUP -#line 385 "parser.l" +#line 385 "./parser.l" ; /* To catch comments */ YY_BREAK case 18: YY_RULE_SETUP -#line 386 "parser.l" +#line 386 "./parser.l" ; /* Ignore rest */ YY_BREAK case 19: YY_RULE_SETUP -#line 387 "parser.l" +#line 387 "./parser.l" line_number++; char_number = 1; YY_BREAK case 20: YY_RULE_SETUP -#line 389 "parser.l" +#line 389 "./parser.l" ; /* Ignore */ YY_BREAK case 21: YY_RULE_SETUP -#line 390 "parser.l" +#line 390 "./parser.l" yy_pop_state(); /* Kill the semicolon */ YY_BREAK case 22: YY_RULE_SETUP -#line 391 "parser.l" +#line 391 "./parser.l" line_number++; char_number = 1; yy_pop_state(); YY_BREAK case 23: YY_RULE_SETUP -#line 392 "parser.l" +#line 392 "./parser.l" yyless(0); yy_pop_state(); YY_BREAK case 24: YY_RULE_SETUP -#line 394 "parser.l" +#line 394 "./parser.l" return tBEGIN; YY_BREAK case 25: YY_RULE_SETUP -#line 395 "parser.l" +#line 395 "./parser.l" return tEND; YY_BREAK case 26: YY_RULE_SETUP -#line 397 "parser.l" +#line 397 "./parser.l" { yylval.num = strtoul(yytext, 0, 10); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } YY_BREAK case 27: YY_RULE_SETUP -#line 398 "parser.l" +#line 398 "./parser.l" { yylval.num = strtoul(yytext, 0, 16); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } YY_BREAK case 28: YY_RULE_SETUP -#line 399 "parser.l" +#line 399 "./parser.l" { yylval.num = strtoul(yytext+2, 0, 8); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } YY_BREAK /* @@ -7658,7 +7644,7 @@ */ case 29: YY_RULE_SETUP -#line 408 "parser.l" +#line 408 "./parser.l" { struct keyword *tok = iskeyword(yytext); @@ -7681,7 +7667,7 @@ YY_BREAK case 30: YY_RULE_SETUP -#line 427 "parser.l" +#line 427 "./parser.l" yylval.str = make_string(yytext); return tFILENAME; YY_BREAK /* @@ -7689,7 +7675,7 @@ */ case 31: YY_RULE_SETUP -#line 432 "parser.l" +#line 432 "./parser.l" { yy_push_state(yylstr); wbufidx = 0; @@ -7698,10 +7684,10 @@ } YY_BREAK case 32: -#line 439 "parser.l" +#line 439 "./parser.l" case 33: YY_RULE_SETUP -#line 439 "parser.l" +#line 439 "./parser.l" { yy_pop_state(); yylval.str = get_buffered_wstring(); @@ -7710,7 +7696,7 @@ YY_BREAK case 34: YY_RULE_SETUP -#line 444 "parser.l" +#line 444 "./parser.l" { /* octal escape sequence */ unsigned int result; result = strtoul(yytext+1, 0, 8); @@ -7721,7 +7707,7 @@ YY_BREAK case 35: YY_RULE_SETUP -#line 451 "parser.l" +#line 451 "./parser.l" { /* hex escape sequence */ unsigned int result; result = strtoul(yytext+2, 0, 16); @@ -7730,82 +7716,82 @@ YY_BREAK case 36: YY_RULE_SETUP -#line 456 "parser.l" +#line 456 "./parser.l" { yyerror("Invalid hex escape sequence '%s'", yytext); } YY_BREAK case 37: YY_RULE_SETUP -#line 458 "parser.l" +#line 458 "./parser.l" yyerror("Bad escape sequence"); YY_BREAK case 38: YY_RULE_SETUP -#line 459 "parser.l" +#line 459 "./parser.l" line_number++; char_number = 1; /* backslash at EOL continues string after leading whitespace on next line */ YY_BREAK case 39: YY_RULE_SETUP -#line 460 "parser.l" +#line 460 "./parser.l" addwchar('\a'); YY_BREAK case 40: YY_RULE_SETUP -#line 461 "parser.l" +#line 461 "./parser.l" addwchar('\b'); YY_BREAK case 41: YY_RULE_SETUP -#line 462 "parser.l" +#line 462 "./parser.l" addwchar('\f'); YY_BREAK case 42: YY_RULE_SETUP -#line 463 "parser.l" +#line 463 "./parser.l" addwchar('\n'); YY_BREAK case 43: YY_RULE_SETUP -#line 464 "parser.l" +#line 464 "./parser.l" addwchar('\r'); YY_BREAK case 44: YY_RULE_SETUP -#line 465 "parser.l" +#line 465 "./parser.l" addwchar('\t'); YY_BREAK case 45: YY_RULE_SETUP -#line 466 "parser.l" +#line 466 "./parser.l" addwchar('\v'); YY_BREAK case 46: YY_RULE_SETUP -#line 467 "parser.l" +#line 467 "./parser.l" addwchar(yytext[1]); YY_BREAK case 47: YY_RULE_SETUP -#line 468 "parser.l" +#line 468 "./parser.l" addwchar(yytext[2]); line_number++; char_number = 1; YY_BREAK case 48: YY_RULE_SETUP -#line 469 "parser.l" +#line 469 "./parser.l" addwchar('\"'); /* "bla""bla" -> "bla\"bla" */ YY_BREAK case 49: YY_RULE_SETUP -#line 470 "parser.l" +#line 470 "./parser.l" addwchar('\"'); /* "bla\""bla" -> "bla\"bla" */ YY_BREAK case 50: YY_RULE_SETUP -#line 471 "parser.l" +#line 471 "./parser.l" ; /* "bla" "bla" -> "blabla" */ YY_BREAK case 51: YY_RULE_SETUP -#line 472 "parser.l" +#line 472 "./parser.l" { char *yptr = yytext; while(*yptr) /* FIXME: codepage translation */ @@ -7814,7 +7800,7 @@ YY_BREAK case 52: YY_RULE_SETUP -#line 477 "parser.l" +#line 477 "./parser.l" yyerror("Unterminated string"); YY_BREAK /* @@ -7822,14 +7808,14 @@ */ case 53: YY_RULE_SETUP -#line 482 "parser.l" +#line 482 "./parser.l" yy_push_state(yystr); cbufidx = 0; YY_BREAK case 54: -#line 484 "parser.l" +#line 484 "./parser.l" case 55: YY_RULE_SETUP -#line 484 "parser.l" +#line 484 "./parser.l" { yy_pop_state(); yylval.str = get_buffered_cstring(); @@ -7838,7 +7824,7 @@ YY_BREAK case 56: YY_RULE_SETUP -#line 489 "parser.l" +#line 489 "./parser.l" { /* octal escape sequence */ int result; result = strtol(yytext+1, 0, 8); @@ -7849,7 +7835,7 @@ YY_BREAK case 57: YY_RULE_SETUP -#line 496 "parser.l" +#line 496 "./parser.l" { /* hex escape sequence */ int result; result = strtol(yytext+2, 0, 16); @@ -7858,67 +7844,67 @@ YY_BREAK case 58: YY_RULE_SETUP -#line 501 "parser.l" +#line 501 "./parser.l" { yyerror("Invalid hex escape sequence '%s'", yytext); } YY_BREAK case 59: YY_RULE_SETUP -#line 503 "parser.l" +#line 503 "./parser.l" yyerror("Bad escape sequence"); YY_BREAK case 60: YY_RULE_SETUP -#line 504 "parser.l" +#line 504 "./parser.l" line_number++; char_number = 1; /* backslash at EOL continues string after leading whitespace on next line */ YY_BREAK case 61: YY_RULE_SETUP -#line 505 "parser.l" +#line 505 "./parser.l" addcchar('\a'); YY_BREAK case 62: YY_RULE_SETUP -#line 506 "parser.l" +#line 506 "./parser.l" addcchar('\b'); YY_BREAK case 63: YY_RULE_SETUP -#line 507 "parser.l" +#line 507 "./parser.l" addcchar('\f'); YY_BREAK case 64: YY_RULE_SETUP -#line 508 "parser.l" +#line 508 "./parser.l" addcchar('\n'); YY_BREAK case 65: YY_RULE_SETUP -#line 509 "parser.l" +#line 509 "./parser.l" addcchar('\r'); YY_BREAK case 66: YY_RULE_SETUP -#line 510 "parser.l" +#line 510 "./parser.l" addcchar('\t'); YY_BREAK case 67: YY_RULE_SETUP -#line 511 "parser.l" +#line 511 "./parser.l" addcchar('\v'); YY_BREAK case 68: YY_RULE_SETUP -#line 512 "parser.l" +#line 512 "./parser.l" addcchar(yytext[1]); YY_BREAK case 69: YY_RULE_SETUP -#line 513 "parser.l" +#line 513 "./parser.l" addcchar(yytext[2]); line_number++; char_number = 1; YY_BREAK case 70: YY_RULE_SETUP -#line 514 "parser.l" +#line 514 "./parser.l" { char *yptr = yytext; while(*yptr) @@ -7927,22 +7913,22 @@ YY_BREAK case 71: YY_RULE_SETUP -#line 519 "parser.l" +#line 519 "./parser.l" addcchar('\"'); /* "bla""bla" -> "bla\"bla" */ YY_BREAK case 72: YY_RULE_SETUP -#line 520 "parser.l" +#line 520 "./parser.l" addcchar('\"'); /* "bla\""bla" -> "bla\"bla" */ YY_BREAK case 73: YY_RULE_SETUP -#line 521 "parser.l" +#line 521 "./parser.l" ; /* "bla" "bla" -> "blabla" */ YY_BREAK case 74: YY_RULE_SETUP -#line 522 "parser.l" +#line 522 "./parser.l" yyerror("Unterminated string"); YY_BREAK /* @@ -7950,12 +7936,12 @@ */ case 75: YY_RULE_SETUP -#line 527 "parser.l" +#line 527 "./parser.l" yy_push_state(yyrcd); cbufidx = 0; YY_BREAK case 76: YY_RULE_SETUP -#line 528 "parser.l" +#line 528 "./parser.l" { yy_pop_state(); yylval.raw = new_raw_data(); @@ -7967,7 +7953,7 @@ YY_BREAK case 77: YY_RULE_SETUP -#line 536 "parser.l" +#line 536 "./parser.l" { int result; result = strtol(yytext, 0, 16); @@ -7976,17 +7962,17 @@ YY_BREAK case 78: YY_RULE_SETUP -#line 541 "parser.l" +#line 541 "./parser.l" ; /* Ignore space */ YY_BREAK case 79: YY_RULE_SETUP -#line 542 "parser.l" +#line 542 "./parser.l" line_number++; char_number = 1; YY_BREAK case 80: YY_RULE_SETUP -#line 543 "parser.l" +#line 543 "./parser.l" yyerror("Malformed data-line"); YY_BREAK /* @@ -7995,7 +7981,7 @@ */ case 81: YY_RULE_SETUP -#line 549 "parser.l" +#line 549 "./parser.l" { yy_push_state(comment); save_wanted_id = wanted_id; @@ -8005,37 +7991,37 @@ YY_BREAK case 82: YY_RULE_SETUP -#line 555 "parser.l" +#line 555 "./parser.l" ; YY_BREAK case 83: YY_RULE_SETUP -#line 556 "parser.l" +#line 556 "./parser.l" ; YY_BREAK case 84: YY_RULE_SETUP -#line 557 "parser.l" +#line 557 "./parser.l" line_number++; char_number = 1; YY_BREAK case 85: YY_RULE_SETUP -#line 558 "parser.l" +#line 558 "./parser.l" yy_pop_state(); want_id = save_wanted_id; YY_BREAK case 86: YY_RULE_SETUP -#line 560 "parser.l" +#line 560 "./parser.l" want_id = wanted_id; /* not really comment, but left-over c-junk */ YY_BREAK case 87: YY_RULE_SETUP -#line 561 "parser.l" +#line 561 "./parser.l" want_id = wanted_id; if(!no_preprocess) yywarning("Found comments after preprocessing, please report"); YY_BREAK case 88: YY_RULE_SETUP -#line 563 "parser.l" +#line 563 "./parser.l" { want_id = wanted_id; line_number++; @@ -8049,12 +8035,12 @@ YY_BREAK case 89: YY_RULE_SETUP -#line 573 "parser.l" +#line 573 "./parser.l" want_id = wanted_id; /* Eat whitespace */ YY_BREAK case 90: YY_RULE_SETUP -#line 575 "parser.l" +#line 575 "./parser.l" return yytext[0]; YY_BREAK case YY_STATE_EOF(INITIAL): @@ -8069,7 +8055,7 @@ case YY_STATE_EOF(pp_line): case YY_STATE_EOF(pp_pragma): case YY_STATE_EOF(pp_code_page): -#line 577 "parser.l" +#line 577 "./parser.l" { if(YY_START == pp_strips || YY_START == pp_stripe || YY_START == pp_stripp || YY_START == pp_stripp_final) yyerror("Unexpected end of file during c-junk scanning (started at %d)", cjunk_tagline); @@ -8079,7 +8065,7 @@ YY_BREAK case 91: YY_RULE_SETUP -#line 584 "parser.l" +#line 584 "./parser.l" { /* Catch all rule to find any unmatched text */ if(*yytext == '\n') @@ -8093,10 +8079,10 @@ YY_BREAK case 92: YY_RULE_SETUP -#line 595 "parser.l" +#line 595 "./parser.l" ECHO; YY_BREAK -#line 8100 "lex.yy.c" +#line 8086 "lex.yy.c" case YY_END_OF_BUFFER: { @@ -8472,6 +8458,7 @@ #endif /* ifndef YY_NO_UNPUT */ +#ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput() #else @@ -8544,8 +8531,8 @@ return c; } +#endif /* YY_NO_INPUT */ - #ifdef YY_USE_PROTOS void yyrestart( FILE *input_file ) #else @@ -8655,15 +8642,6 @@ } -#ifndef _WIN32 -#include <unistd.h> -#else -#ifndef YY_ALWAYS_INTERACTIVE -#ifndef YY_NEVER_INTERACTIVE -extern int isatty YY_PROTO(( int )); -#endif -#endif -#endif #ifdef YY_USE_PROTOS void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) @@ -8981,7 +8959,7 @@ return 0; } #endif -#line 595 "parser.l" +#line 595 "./parser.l" #ifndef yywrap _____ Modified: trunk/reactos/tools/wrc/newstruc.c --- trunk/reactos/tools/wrc/newstruc.c 2005-04-25 08:26:29 UTC (rev 14796) +++ trunk/reactos/tools/wrc/newstruc.c 2005-04-25 09:12:35 UTC (rev 14797) @@ -858,8 +858,8 @@ /* We only go through the RIFF file if we need to swap * bytes in words/dwords. Else we couldn't care less * what the file contains. This is consistent with - * MS' rc.exe, which doesn't complain at all, eventhough - * the fileformat might not be entirely correct. + * MS' rc.exe, which doesn't complain at all, even though + * the file format might not be entirely correct. */ rtp++; /* Skip the "RIFF" tag */ _____ Modified: trunk/reactos/tools/wrc/parser.y --- trunk/reactos/tools/wrc/parser.y 2005-04-25 08:26:29 UTC (rev 14796) +++ trunk/reactos/tools/wrc/parser.y 2005-04-25 09:12:35 UTC (rev 14797) @@ -1283,12 +1283,12 @@ */ item_options : /* Empty */ { $$ = 0; } - | ',' tCHECKED item_options { $$ = $3 | MF_CHECKED; } - | ',' tGRAYED item_options { $$ = $3 | MF_GRAYED; } - | ',' tHELP item_options { $$ = $3 | MF_HELP; } - | ',' tINACTIVE item_options { $$ = $3 | MF_DISABLED; } - | ',' tMENUBARBREAK item_options { $$ = $3 | MF_MENUBARBREAK; } - | ',' tMENUBREAK item_options { $$ = $3 | MF_MENUBREAK; } + | opt_comma tCHECKED item_options { $$ = $3 | MF_CHECKED; } + | opt_comma tGRAYED item_options { $$ = $3 | MF_GRAYED; } + | opt_comma tHELP item_options { $$ = $3 | MF_HELP; } + | opt_comma tINACTIVE item_options { $$ = $3 | MF_DISABLED; } + | opt_comma tMENUBARBREAK item_options { $$ = $3 | MF_MENUBARBREAK; } + | opt_comma tMENUBREAK item_options { $$ = $3 | MF_MENUBREAK; } ; /* ------------------------------ MenuEx ------------------------------ */ _____ Modified: trunk/reactos/tools/wrc/y.tab.c --- trunk/reactos/tools/wrc/y.tab.c 2005-04-25 08:26:29 UTC (rev 14796) +++ trunk/reactos/tools/wrc/y.tab.c 2005-04-25 09:12:35 UTC (rev 14797) @@ -1,231 +1,93 @@ -/* A Bison parser, made by GNU Bison 1.875b. */ +/* A Bison parser, made from ./parser.y + by GNU bison 1.35. */ -/* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +#define YYBISON 1 /* Identify Bison output. */ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. +# define tNL 257 +# define tNUMBER 258 +# define tLNUMBER 259 +# define tSTRING 260 +# define tIDENT 261 +# define tFILENAME 262 +# define tRAWDATA 263 +# define tACCELERATORS 264 +# define tBITMAP 265 +# define tCURSOR 266 +# define tDIALOG 267 +# define tDIALOGEX 268 +# define tMENU 269 +# define tMENUEX 270 +# define tMESSAGETABLE 271 +# define tRCDATA 272 +# define tVERSIONINFO 273 +# define tSTRINGTABLE 274 +# define tFONT 275 +# define tFONTDIR 276 +# define tICON 277 +# define tAUTO3STATE 278 +# define tAUTOCHECKBOX 279 +# define tAUTORADIOBUTTON 280 +# define tCHECKBOX 281 +# define tDEFPUSHBUTTON 282 +# define tPUSHBUTTON 283 +# define tRADIOBUTTON 284 +# define tSTATE3 285 +# define tGROUPBOX 286 +# define tCOMBOBOX 287 +# define tLISTBOX 288 +# define tSCROLLBAR 289 +# define tCONTROL 290 +# define tEDITTEXT 291 +# define tRTEXT 292 +# define tCTEXT 293 +# define tLTEXT 294 +# define tBLOCK 295 +# define tVALUE 296 +# define tSHIFT 297 +# define tALT 298 +# define tASCII 299 +# define tVIRTKEY 300 +# define tGRAYED 301 +# define tCHECKED 302 +# define tINACTIVE 303 +# define tNOINVERT 304 +# define tPURE 305 +# define tIMPURE 306 +# define tDISCARDABLE 307 +# define tLOADONCALL 308 +# define tPRELOAD 309 +# define tFIXED 310 +# define tMOVEABLE 311 +# define tCLASS 312 +# define tCAPTION 313 +# define tCHARACTERISTICS 314 +# define tEXSTYLE 315 +# define tSTYLE 316 +# define tVERSION 317 +# define tLANGUAGE 318 +# define tFILEVERSION 319 +# define tPRODUCTVERSION 320 +# define tFILEFLAGSMASK 321 +# define tFILEOS 322 +# define tFILETYPE 323 +# define tFILEFLAGS 324 +# define tFILESUBTYPE 325 +# define tMENUBARBREAK 326 +# define tMENUBREAK 327 +# define tMENUITEM 328 +# define tPOPUP 329 +# define tSEPARATOR 330 +# define tHELP 331 +# define tTOOLBAR 332 +# define tBUTTON 333 +# define tBEGIN 334 +# define tEND 335 +# define tDLGINIT 336 +# define tNOT 337 +# define pUPM 338 - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +#line 1 "./parser.y" - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ - -/* Written by Richard Stallman by simplifying the original so called - ``semantic'' parser. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output. */ -#define YYBISON 1 - -/* Skeleton name. */ -#define YYSKELETON_NAME "yacc.c" - -/* Pure parsers. */ -#define YYPURE 0 - -/* Using locations. */ -#define YYLSP_NEEDED 0 - - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - tNL = 258, - tNUMBER = 259, - tLNUMBER = 260, - tSTRING = 261, - tIDENT = 262, - tFILENAME = 263, - tRAWDATA = 264, - tACCELERATORS = 265, - tBITMAP = 266, - tCURSOR = 267, - tDIALOG = 268, - tDIALOGEX = 269, - tMENU = 270, - tMENUEX = 271, - tMESSAGETABLE = 272, - tRCDATA = 273, - tVERSIONINFO = 274, - tSTRINGTABLE = 275, - tFONT = 276, - tFONTDIR = 277, - tICON = 278, - tAUTO3STATE = 279, - tAUTOCHECKBOX = 280, - tAUTORADIOBUTTON = 281, - tCHECKBOX = 282, - tDEFPUSHBUTTON = 283, - tPUSHBUTTON = 284, - tRADIOBUTTON = 285, - tSTATE3 = 286, [truncated at 1000 lines; 5552 more skipped]

19 years, 4 months

[gvg] 14796: Sync to Wine-20040419:

by gvg＠svn.reactos.com

Sync to Wine-20040419: Jon Griffiths <jon_p_griffiths(a)yahoo.com> - -Wunsigned fixes. Alexandre Julliard <julliard(a)winehq.org> - Use the correct file name in the "generated automatically" comments. - Don't crash on xrealloc(0) (found by Jon Griffiths). Marcus Meissner <meissner(a)suse.de> - Use correct movw instead of movl when handling segment registers. Modified: trunk/reactos/tools/winebuild/build.h Modified: trunk/reactos/tools/winebuild/main.c Modified: trunk/reactos/tools/winebuild/relay.c Modified: trunk/reactos/tools/winebuild/res16.c Modified: trunk/reactos/tools/winebuild/res32.c Modified: trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/tools/winebuild/utils.c _____ Modified: trunk/reactos/tools/winebuild/build.h --- trunk/reactos/tools/winebuild/build.h 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/build.h 2005-04-25 08:26:29 UTC (rev 14796) @@ -98,7 +98,7 @@ int nb_entry_points; /* number of used entry points */ int alloc_entry_points; /* number of allocated entry points */ int nb_names; /* number of entry points with names */ - int nb_resources; /* number of resources */ + unsigned int nb_resources; /* number of resources */ int characteristics; /* characteristics for the PE header */ int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ @@ -203,6 +203,7 @@ extern int kill_at; extern char *input_file_name; +extern char *spec_file_name; extern const char *output_file_name; extern char **debug_channels; extern char **lib_path; _____ Modified: trunk/reactos/tools/winebuild/main.c --- trunk/reactos/tools/winebuild/main.c 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/main.c 2005-04-25 08:26:29 UTC (rev 14796) @@ -56,6 +56,7 @@ char **lib_path = NULL; char *input_file_name = NULL; +char *spec_file_name = NULL; const char *output_file_name = NULL; char *ld_command = "ld"; @@ -65,7 +66,6 @@ static const char *current_src_dir; static int nb_res_files; static char **res_files; -static char *spec_file_name; /* execution mode */ enum exec_mode_values _____ Modified: trunk/reactos/tools/winebuild/relay.c --- trunk/reactos/tools/winebuild/relay.c 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/relay.c 2005-04-25 08:26:29 UTC (rev 14796) @@ -171,7 +171,7 @@ else fprintf( outfile, "\tmovw " __ASM_NAME("CallTo16_TebSelector") ", %%fs\n" ); - fprintf( outfile, "\t.byte 0x64\n\tmovl (%d),%%gs\n", STRUCTOFFSET(TEB,gs_sel) ); + fprintf( outfile, "\t.byte 0x64\n\tmov (%d),%%gs\n", STRUCTOFFSET(TEB,gs_sel) ); /* Get address of wine_ldt_copy array into %ecx */ if ( UsePIC ) @@ -481,7 +481,7 @@ fprintf( outfile, "\tpushl %%ebx\n" ); fprintf( outfile, "\tpushl %%esi\n" ); fprintf( outfile, "\tpushl %%edi\n" ); - fprintf( outfile, "\t.byte 0x64\n\tmovl %%gs,(%d)\n", STRUCTOFFSET(TEB,gs_sel) ); + fprintf( outfile, "\t.byte 0x64\n\tmov %%gs,(%d)\n", STRUCTOFFSET(TEB,gs_sel) ); /* Setup exception frame */ fprintf( outfile, "\t.byte 0x64\n\tpushl (%d)\n", STACKOFFSET ); @@ -635,9 +635,9 @@ #endif fprintf( outfile, "\tmovw %%di,%%es\n" ); - fprintf( outfile, "\t.byte 0x2e\n\tmovl " __ASM_NAME("CallTo16_TebSelector") "-" __ASM_NAME("Call16_Ret_Start") ",%%fs\n" ); + fprintf( outfile, "\t.byte 0x2e\n\tmov " __ASM_NAME("CallTo16_TebSelector") "-" __ASM_NAME("Call16_Ret_Start") ",%%fs\n" ); - fprintf( outfile, "\t.byte 0x64\n\tmovl (%d),%%gs\n", STRUCTOFFSET(TEB,gs_sel) ); + fprintf( outfile, "\t.byte 0x64\n\tmov (%d),%%gs\n", STRUCTOFFSET(TEB,gs_sel) ); /* Restore the 32-bit stack */ _____ Modified: trunk/reactos/tools/winebuild/res16.c --- trunk/reactos/tools/winebuild/res16.c 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/res16.c 2005-04-25 08:26:29 UTC (rev 14796) @@ -215,7 +215,7 @@ /* build the 2-level (type,name) resource tree */ static struct res_tree *build_resource_tree( DLLSPEC *spec ) { - int i; + unsigned int i; struct res_tree *tree; struct res_type *type = NULL; @@ -270,7 +270,8 @@ { const struct resource *res; unsigned char *buffer, *p; - int i, total; + unsigned int i; + int total; if (!spec->nb_resources) return 0; @@ -292,8 +293,8 @@ /* output the resource definitions */ int output_res16_directory( unsigned char *buffer, DLLSPEC *spec ) { - int i, offset, res_offset = 0; - unsigned int j; + int offset, res_offset = 0; + unsigned int i, j; struct res_tree *tree; const struct res_type *type; const struct resource *res; _____ Modified: trunk/reactos/tools/winebuild/res32.c --- trunk/reactos/tools/winebuild/res32.c 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/res32.c 2005-04-25 08:26:29 UTC (rev 14796) @@ -267,7 +267,7 @@ /* build the 3-level (type,name,language) resource tree */ static struct res_tree *build_resource_tree( DLLSPEC *spec ) { - int i; + unsigned int i; struct res_tree *tree; struct res_type *type = NULL; struct res_name *name = NULL; @@ -297,7 +297,7 @@ /* free the resource tree */ static void free_resource_tree( struct res_tree *tree ) { - int i; + unsigned int i; for (i = 0; i < tree->nb_types; i++) free( tree->types[i].names ); free( tree->types ); @@ -318,8 +318,8 @@ /* output the resource definitions */ void output_resources( FILE *outfile, DLLSPEC *spec ) { - int i, j, k, nb_id_types; - unsigned int n, offset, data_offset; + int j, k, nb_id_types; + unsigned int i, n, offset, data_offset; struct res_tree *tree; struct res_type *type; struct res_name *name; _____ Modified: trunk/reactos/tools/winebuild/spec32.c --- trunk/reactos/tools/winebuild/spec32.c 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/spec32.c 2005-04-25 08:26:29 UTC (rev 14796) @@ -846,8 +846,11 @@ const char *name; int i; - fprintf(outfile, "; File generated automatically from %s; do not edit!\n\n", - input_file_name ); + if (spec_file_name) + fprintf( outfile, "; File generated automatically from %s; do not edit!\n\n", + spec_file_name ); + else + fprintf( outfile, "; File generated automatically; do not edit!\n\n" ); fprintf(outfile, "LIBRARY %s\n\n", spec->file_name); _____ Modified: trunk/reactos/tools/winebuild/utils.c --- trunk/reactos/tools/winebuild/utils.c 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/utils.c 2005-04-25 08:26:29 UTC (rev 14796) @@ -48,7 +48,7 @@ void *xrealloc (void *ptr, size_t size) { void *res = realloc (ptr, size); - if (res == NULL) + if (size && res == NULL) { fprintf (stderr, "Virtual memory exhausted.\n"); exit (1); @@ -145,9 +145,9 @@ /* output a standard header for generated files */ void output_standard_file_header( FILE *outfile ) { - if (input_file_name) + if (spec_file_name) fprintf( outfile, "/* File generated automatically from %s; do not edit! */\n", - input_file_name ); + spec_file_name ); else fprintf( outfile, "/* File generated automatically; do not edit! */\n" ); fprintf( outfile,

19 years, 4 months

[gvg] 14795: SVN maintenance

by gvg＠svn.reactos.com

SVN maintenance Property changes on: trunk/reactos/drivers/video/miniport/xboxvmp ___________________________________________________________________ Name: svn:ignore - junk.tmp base.tmp temp.exp xboxvmp.coff *.o *.sym *.sys *.map + junk.tmp base.tmp temp.exp xboxvmp.coff xboxvmp.a *.o *.sym *.sys *.map .*.d

19 years, 4 months

[gvg] 14794: SVN maintenance

by gvg＠svn.reactos.com

SVN maintenance Property changes on: trunk/reactos/ntoskrnl/dbgk ___________________________________________________________________ Name: svn:ignore + *.d *.o *.sym Property changes on: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/dbgk/debug.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

19 years, 4 months

← Newer
1
...
6
7
8
9
10
11
12
...
48
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 April 2005