Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 37820: add more stuff to x64 asm.h
by tkreuzer＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: tkreuzer Date: Wed Dec 3 10:39:26 2008 New Revision: 37820 URL: http://svn.reactos.org/svn/reactos?rev=37820&view=rev Log: add more stuff to x64 asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] Wed Dec 3 10:39:26 2008 @@ -50,6 +50,11 @@ #define KTHREAD_STACK_LIMIT 0x30 #define KTHREAD_WAIT_IRQL 0x156 +// +// KPRCB Offsets +// +#define KPRCB_CurrentThread 0x08 + // // KPCR Offsets @@ -57,10 +62,63 @@ #define KPCR_TSS_BASE 0x08 #define KPCR_SELF 0x18 #define KPCR_STALL_SCALE_FACTOR 0x64 - -// -// Trap Frame Offsets -// +#define KPCR_PRCB 0x180 + +// +// KTRAP_FRAME Offsets +// +#define KTRAP_FRAME_P1Home 0x00 +#define KTRAP_FRAME_P2Home 0x08 +#define KTRAP_FRAME_P3Home 0x10 +#define KTRAP_FRAME_P4Home 0x18 +#define KTRAP_FRAME_P5 0x20 +#define KTRAP_FRAME_PreviousMode 0x28 +#define KTRAP_FRAME_PreviousIrql 0x29 +#define KTRAP_FRAME_FaultIndicator 0x2A +#define KTRAP_FRAME_ExceptionActive 0x2B +#define KTRAP_FRAME_MxCsr 0x2C +#define KTRAP_FRAME_Rax 0x30 +#define KTRAP_FRAME_Rcx 0x38 +#define KTRAP_FRAME_Rdx 0x40 +#define KTRAP_FRAME_R8 0x48 +#define KTRAP_FRAME_R9 0x50 +#define KTRAP_FRAME_R10 0x58 +#define KTRAP_FRAME_R11 0x60 +#define KTRAP_FRAME_Spare0 0x68 +#define KTRAP_FRAME_Xmm0 0x70 +#define KTRAP_FRAME_Xmm1 0x80 +#define KTRAP_FRAME_Xmm2 0x90 +#define KTRAP_FRAME_Xmm3 0xA0 +#define KTRAP_FRAME_Xmm4 0xB0 +#define KTRAP_FRAME_Xmm5 0xC0 +#define KTRAP_FRAME_FaultAddress 0xD0 +#define KTRAP_FRAME_Dr0 0xD8 +#define KTRAP_FRAME_Dr1 0xE0 +#define KTRAP_FRAME_Dr2 0xE8 +#define KTRAP_FRAME_Dr3 0xF0 +#define KTRAP_FRAME_Dr6 0xF8 +#define KTRAP_FRAME_Dr7 0x100 +#define KTRAP_FRAME_DebugControl 0x108 +#define KTRAP_FRAME_LastBranchToRip 0x110 +#define KTRAP_FRAME_LastBranchFromRip 0x118 +#define KTRAP_FRAME_LastExceptionToRip 0x120 +#define KTRAP_FRAME_LastExceptionFromRip 0x128 +#define KTRAP_FRAME_SegDs 0x130 +#define KTRAP_FRAME_SegEs 0x132 +#define KTRAP_FRAME_SegFs 0x134 +#define KTRAP_FRAME_SegGs 0x136 +#define KTRAP_FRAME_TrapFrame 0x138 +#define KTRAP_FRAME_Rbx 0x140 +#define KTRAP_FRAME_Rdi 0x148 +#define KTRAP_FRAME_Rsi 0x150 +#define KTRAP_FRAME_Rbp 0x158 +#define KTRAP_FRAME_ErrorCode 0x160 +#define KTRAP_FRAME_Rip 0x168 +#define KTRAP_FRAME_SegCs 0x170 +#define KTRAP_FRAME_EFlags 0x178 +#define KTRAP_FRAME_Rsp 0x180 +#define KTRAP_FRAME_SegSs 0x188 +#define SIZE_KTRAP_FRAME 0x190 #define KTRAP_FRAME_ALIGN 0x10 #define KTRAP_FRAME_LENGTH 0x190 @@ -132,60 +190,15 @@ #define CONTEXT_LastExceptionFromRip 0x4c8 // -// KTRAP_FRAME Offsets -// -#define KTRAP_FRAME_P1Home 0x00 -#define KTRAP_FRAME_P2Home 0x08 -#define KTRAP_FRAME_P3Home 0x10 -#define KTRAP_FRAME_P4Home 0x18 -#define KTRAP_FRAME_P5 0x20 -#define KTRAP_FRAME_PreviousMode 0x28 -#define KTRAP_FRAME_PreviousIrql 0x29 -#define KTRAP_FRAME_FaultIndicator 0x2A -#define KTRAP_FRAME_ExceptionActive 0x2B -#define KTRAP_FRAME_MxCsr 0x2C -#define KTRAP_FRAME_Rax 0x30 -#define KTRAP_FRAME_Rcx 0x38 -#define KTRAP_FRAME_Rdx 0x40 -#define KTRAP_FRAME_R8 0x48 -#define KTRAP_FRAME_R9 0x50 -#define KTRAP_FRAME_R10 0x58 -#define KTRAP_FRAME_R11 0x60 -#define KTRAP_FRAME_Spare0 0x68 -#define KTRAP_FRAME_Xmm0 0x70 -#define KTRAP_FRAME_Xmm1 0x80 -#define KTRAP_FRAME_Xmm2 0x90 -#define KTRAP_FRAME_Xmm3 0xA0 -#define KTRAP_FRAME_Xmm4 0xB0 -#define KTRAP_FRAME_Xmm5 0xC0 -#define KTRAP_FRAME_FaultAddress 0xD0 -#define KTRAP_FRAME_Dr0 0xD8 -#define KTRAP_FRAME_Dr1 0xE0 -#define KTRAP_FRAME_Dr2 0xE8 -#define KTRAP_FRAME_Dr3 0xF0 -#define KTRAP_FRAME_Dr6 0xF8 -#define KTRAP_FRAME_Dr7 0x100 -#define KTRAP_FRAME_DebugControl 0x108 -#define KTRAP_FRAME_LastBranchToRip 0x110 -#define KTRAP_FRAME_LastBranchFromRip 0x118 -#define KTRAP_FRAME_LastExceptionToRip 0x120 -#define KTRAP_FRAME_LastExceptionFromRip 0x128 -#define KTRAP_FRAME_SegDs 0x130 -#define KTRAP_FRAME_SegEs 0x132 -#define KTRAP_FRAME_SegFs 0x134 -#define KTRAP_FRAME_SegGs 0x136 -#define KTRAP_FRAME_TrapFrame 0x138 -#define KTRAP_FRAME_Rbx 0x140 -#define KTRAP_FRAME_Rdi 0x148 -#define KTRAP_FRAME_Rsi 0x150 -#define KTRAP_FRAME_Rbp 0x158 -#define KTRAP_FRAME_ErrorCode 0x160 -#define KTRAP_FRAME_Rip 0x168 -#define KTRAP_FRAME_SegCs 0x170 -#define KTRAP_FRAME_EFlags 0x178 -#define KTRAP_FRAME_Rsp 0x180 -#define KTRAP_FRAME_SegSs 0x188 -#define SIZE_KTRAP_FRAME 0x190 +// EXCEPTION_RECORD Offsets +// +#define EXCEPTION_RECORD_ExceptionCode 0x00 +#define EXCEPTION_RECORD_ExceptionFlags 0x04 +#define EXCEPTION_RECORD_ExceptionRecord 0x08 +#define EXCEPTION_RECORD_ExceptionAddress 0x10 +#define EXCEPTION_RECORD_NumberParameters 0x18 +#define EXCEPTION_RECORD_ExceptionInformation 0x20 +#define SIZE_EXCEPTION_RECORD 0x98 // // CR0 @@ -203,6 +216,20 @@ #define CR0_PG 0x80000000 // +// CR4 +// +#define CR4_VME 0x1 +#define CR4_PVI 0x2 +#define CR4_TSD 0x4 +#define CR4_DE 0x8 +#define CR4_PSE 0x10 +#define CR4_PAE 0x20 +#define CR4_MCE 0x40 +#define CR4_PGE 0x80 +#define CR4_FXSR 0x200 +#define CR4_XMMEXCPT 0x400 + +// // Generic Definitions // #define PRIMARY_VECTOR_BASE 0x30 @@ -233,6 +260,43 @@ #define EFLAG_SELECT (EFLAG_SIGN + EFLAG_ZERO) #define EFLAGS_USER_SANITIZE 0x3F4DD7 +// +// NTSTATUS and Bugcheck Codes +// +#define STATUS_ACCESS_VIOLATION 0xC0000005 +#define STATUS_IN_PAGE_ERROR 0xC0000006 +#define STATUS_GUARD_PAGE_VIOLATION 0x80000001 +#define STATUS_PRIVILEGED_INSTRUCTION 0xC0000096 +#define STATUS_STACK_OVERFLOW 0xC00000FD +#define KI_EXCEPTION_ACCESS_VIOLATION 0x10000004 +#define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C +#define STATUS_NO_CALLBACK_ACTIVE 0xC0000258 +#define STATUS_CALLBACK_POP_STACK 0xC0000423 +#define STATUS_ARRAY_BOUNDS_EXCEEDED 0xC000008C +#define STATUS_ILLEGAL_INSTRUCTION 0xC000001D +#define STATUS_INVALID_LOCK_SEQUENCE 0xC000001E +#define STATUS_BREAKPOINT 0x80000003 +#define STATUS_SINGLE_STEP 0x80000004 +#define STATUS_INTEGER_DIVIDE_BY_ZERO 0xC0000094 +#define STATUS_INTEGER_OVERFLOW 0xC0000095 +#define STATUS_FLOAT_DENORMAL_OPERAND 0xC000008D +#define STATUS_FLOAT_DIVIDE_BY_ZERO 0xC000008E +#define STATUS_FLOAT_INEXACT_RESULT 0xC000008F +#define STATUS_FLOAT_INVALID_OPERATION 0xC0000090 +#define STATUS_FLOAT_OVERFLOW 0xC0000091 +#define STATUS_FLOAT_STACK_CHECK 0xC0000092 +#define STATUS_FLOAT_UNDERFLOW 0xC0000093 +#define STATUS_FLOAT_MULTIPLE_FAULTS 0xC00002B4 +#define STATUS_FLOAT_MULTIPLE_TRAPS 0xC00002B5 +#define APC_INDEX_MISMATCH 0x01 +#define IRQL_NOT_GREATER_OR_EQUAL 0x09 +#define IRQL_NOT_LESS_OR_EQUAL 0x0A +#define TRAP_CAUSE_UNKNOWN 0x12 +#define KMODE_EXCEPTION_NOT_HANDLED 0x13 +#define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A +#define UNEXPECTED_KERNEL_MODE_TRAP 0x7F +#define ATTEMPTED_SWITCH_FROM_DPC 0xB8 +#define HARDWARE_INTERRUPT_STORM 0xF2 // // IRQL Levels

1 0

[tkreuzer] 37819: Simplyfy KiGetFeatureBits
by tkreuzer＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: tkreuzer Date: Wed Dec 3 09:40:26 2008 New Revision: 37819 URL: http://svn.reactos.org/svn/reactos?rev=37819&view=rev Log: Simplyfy KiGetFeatureBits Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Wed Dec 3 09:40:26 2008 @@ -161,7 +161,6 @@ ULONG Vendor; ULONG FeatureBits = KF_WORKING_PTE; INT Reg[4]; - BOOLEAN ExtendedCPUID = TRUE; ULONG CpuFeatures = 0; /* Get the Vendor ID */ @@ -176,96 +175,8 @@ /* Set the initial APIC ID */ Prcb->InitialApicId = (UCHAR)(Reg[1] >> 24); - /* Check for AMD CPU */ - if (Vendor == CPU_AMD) - { - /* Check if this is a K5 or higher. */ - if ((Reg[0] & 0x0F00) >= 0x0500) - { - /* Check if this is a K5 specifically. */ - if ((Reg[0] & 0x0F00) == 0x0500) - { - /* Get the Model Number */ - switch (Reg[0] & 0x00F0) - { - /* Check if this is the Model 1 */ - case 0x0010: - - /* Check if this is Step 0 or 1. They don't support PGE */ - if ((Reg[0] & 0x000F) > 0x03) break; - - case 0x0000: - - /* Model 0 doesn't support PGE at all. */ - Reg[3] &= ~0x2000; - break; - - case 0x0080: - - /* K6-2, Step 8 and over have support for MTRR. */ - if ((Reg[0] & 0x000F) >= 0x8) FeatureBits |= KF_AMDK6MTRR; - break; - - case 0x0090: - - /* As does the K6-3 */ - FeatureBits |= KF_AMDK6MTRR; - break; - - default: - break; - } - } - } - else - { - /* Families below 5 don't support PGE, PSE or CMOV at all */ - Reg[3] &= ~(0x08 | 0x2000 | 0x8000); - - /* They also don't support advanced CPUID functions. */ - ExtendedCPUID = FALSE; - } - - /* Set the current features */ - CpuFeatures = Reg[3]; - } - - /* Now check if this is Intel */ - if (Vendor == CPU_INTEL) - { - /* Check if it's a P6 */ - if (Prcb->CpuType == 6) - { - /* Perform the special sequence to get the MicroCode Signature */ - __writemsr(0x8B, 0); - __cpuid(Reg, 1); - Prcb->UpdateSignature.QuadPart = __readmsr(0x8B); - } - else if (Prcb->CpuType == 5) - { - /* On P5, enable workaround for the LOCK errata. */ - KiI386PentiumLockErrataPresent = TRUE; - } - - /* Check for broken P6 with bad SMP PTE implementation */ - if (((Reg[0] & 0x0FF0) == 0x0610 && (Reg[0] & 0x000F) <= 0x9) || - ((Reg[0] & 0x0FF0) == 0x0630 && (Reg[0] & 0x000F) <= 0x4)) - { - /* Remove support for correct PTE support. */ - FeatureBits &= ~KF_WORKING_PTE; - } - - /* Check if the CPU is too old to support SYSENTER */ - if ((Prcb->CpuType < 6) || - ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0303))) - { - /* Disable it */ - Reg[3] &= ~0x800; - } - - /* Set the current features */ - CpuFeatures = Reg[3]; - } + /* Set the current features */ + CpuFeatures = Reg[3]; /* Convert all CPUID Feature bits into our format */ if (CpuFeatures & 0x00000002) FeatureBits |= KF_V86_VIS | KF_CR4; @@ -300,29 +211,25 @@ Prcb->LogicalProcessorsPerPhysicalProcessor = 1; } - /* Check if CPUID 0x80000000 is supported */ - if (ExtendedCPUID) - { - /* Do the call */ - __cpuid(Reg, 0x80000000); - if ((Reg[0] & 0xffffff00) == 0x80000000) + /* Check extended cpuid features */ + __cpuid(Reg, 0x80000000); + if ((Reg[0] & 0xffffff00) == 0x80000000) + { + /* Check if CPUID 0x80000001 is supported */ + if (Reg[0] >= 0x80000001) { - /* Check if CPUID 0x80000001 is supported */ - if (Reg[0] >= 0x80000001) + /* Check which extended features are available. */ + __cpuid(Reg, 0x80000001); + + /* Check if NX-bit is supported */ + if (Reg[3] & 0x00100000) FeatureBits |= KF_NX_BIT; + + /* Now handle each features for each CPU Vendor */ + switch (Vendor) { - /* Check which extended features are available. */ - __cpuid(Reg, 0x80000001); - - /* Check if NX-bit is supported */ - if (Reg[3] & 0x00100000) FeatureBits |= KF_NX_BIT; - - /* Now handle each features for each CPU Vendor */ - switch (Vendor) - { - case CPU_AMD: - if (Reg[3] & 0x80000000) FeatureBits |= KF_3DNOW; - break; - } + case CPU_AMD: + if (Reg[3] & 0x80000000) FeatureBits |= KF_3DNOW; + break; } } }

1 0

[tkreuzer] 37818: fix ULONG/ULONG_PTR issue
by tkreuzer＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: tkreuzer Date: Wed Dec 3 08:10:19 2008 New Revision: 37818 URL: http://svn.reactos.org/svn/reactos?rev=37818&view=rev Log: fix ULONG/ULONG_PTR issue Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c [iso-8859-1] Wed Dec 3 08:10:19 2008 @@ -135,7 +135,7 @@ ProcessBasicInfo->UniqueProcessId = (ULONG_PTR)Process-> UniqueProcessId; ProcessBasicInfo->InheritedFromUniqueProcessId = - (ULONG)Process->InheritedFromUniqueProcessId; + (ULONG_PTR)Process->InheritedFromUniqueProcessId; ProcessBasicInfo->BasePriority = Process->Pcb.BasePriority; } @@ -255,7 +255,7 @@ _SEH_TRY { /* Write back the Session ID */ - SessionInfo->SessionId = Process->Session; + SessionInfo->SessionId = PtrToUlong(Process->Session); /* Set the return length */ Length = sizeof(PROCESS_SESSION_INFORMATION); @@ -682,7 +682,7 @@ if (!NT_SUCCESS(Status)) break; /* Write the session ID in the EPROCESS */ - Process->Session = SessionInfo.SessionId; + Process->Session = UlongToPtr(SessionInfo.SessionId); /* Check if the process also has a PEB */ if (Process->Peb)

1 0

[sginsberg] 37817: - Make imagehlp compile warning free (don't mix Wine and ros debug style, add missing casts)
by sginsberg＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: sginsberg Date: Wed Dec 3 07:05:54 2008 New Revision: 37817 URL: http://svn.reactos.org/svn/reactos?rev=37817&view=rev Log: - Make imagehlp compile warning free (don't mix Wine and ros debug style, add missing casts) Modified: trunk/reactos/dll/win32/imagehlp/access.c trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild trunk/reactos/dll/win32/imagehlp/imagehlp_main.c trunk/reactos/dll/win32/imagehlp/integrity.c trunk/reactos/dll/win32/imagehlp/modify.c Modified: trunk/reactos/dll/win32/imagehlp/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/access.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/access.c [iso-8859-1] Wed Dec 3 07:05:54 2008 @@ -20,8 +20,6 @@ #include "precomp.h" -//#define NDEBUG -#include <debug.h> #define _WINNT_H #include "wine/debug.h" @@ -122,7 +120,7 @@ /* Move to the Next DLL */ Head = &ImageLoadListHead; Next = Head->Flink; - DPRINT("Trying to find library: %s in current ListHead \n", DllName); + TRACE("Trying to find library: %s in current ListHead \n", DllName); /* Split the path */ _splitpath(DllName, Drive, Dir, Filename, Ext); @@ -135,7 +133,7 @@ { /* Get the Loaded Image Structure */ LoadedImage = CONTAINING_RECORD(Next, LOADED_IMAGE, Links); - DPRINT("Found: %s in current ListHead \n", LoadedImage->ModuleName); + TRACE("Found: %s in current ListHead \n", LoadedImage->ModuleName); /* Check if we didn't have a complete name */ if (!CompleteName) @@ -156,7 +154,7 @@ /* Check if the Names Match */ if (!_stricmp(DllName, FullName)) { - DPRINT("Found it, returning it\n"); + TRACE("Found it, returning it\n"); return LoadedImage; } @@ -165,7 +163,7 @@ } /* Allocate memory for the Structure, and write the Module Name under */ - DPRINT("Didn't find it...allocating it for you now\n"); + TRACE("Didn't find it...allocating it for you now\n"); LoadedImage = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(*LoadedImage) + strlen(DllName) + 1); @@ -255,14 +253,14 @@ ImageName, DotDll ? ".dll" : ".exe", MAX_PATH, - Buffer, + (PSTR)Buffer, &FilePart); /* Check if it was successful */ if (Tried && (Tried < MAX_PATH)) { /* Change the filename to use, and try again */ - FileToOpen = Buffer; + FileToOpen = (PSTR)Buffer; continue; } } Modified: trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild [iso-8859-1] Wed Dec 3 07:05:54 2008 @@ -1,4 +1,4 @@ -<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll" allowwarnings="true"> +<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll"> <importlibrary definition="imagehlp.spec" /> <include base="imagehlp">.</include> <define name="_IMAGEHLP_SOURCE_"></define> Modified: trunk/reactos/dll/win32/imagehlp/imagehlp_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/imagehlp_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/imagehlp_main.c [iso-8859-1] Wed Dec 3 07:05:54 2008 @@ -24,8 +24,6 @@ #include "precomp.h" -//#define NDEBUG -#include <debug.h> #define _WINNT_H #include "wine/debug.h" Modified: trunk/reactos/dll/win32/imagehlp/integrity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/integri… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/integrity.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/integrity.c [iso-8859-1] Wed Dec 3 07:05:54 2008 @@ -28,8 +28,6 @@ #include "precomp.h" -//#define NDEBUG -#include <debug.h> #define _WINNT_H #include "wine/debug.h" @@ -293,7 +291,7 @@ const size_t cert_hdr_size = sizeof *Certificateheader - sizeof Certificateheader->bCertificate; - DPRINT("%p %ld %p\n", FileHandle, CertificateIndex, Certificateheader); + TRACE("%p %ld %p\n", FileHandle, CertificateIndex, Certificateheader); if( !IMAGEHLP_GetCertificateOffset( FileHandle, CertificateIndex, &ofs, &size ) ) return FALSE; @@ -354,7 +352,7 @@ PIMAGE_NT_HEADERS Header; DWORD CalcSum; DWORD HdrSum; - DPRINT("stub\n"); + TRACE("stub\n"); CalcSum = (DWORD)CalcCheckSum(0, BaseAddress, Modified: trunk/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/modify.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] Wed Dec 3 07:05:54 2008 @@ -21,8 +21,6 @@ #include "precomp.h" -//#define NDEBUG -#include <debug.h> #define _WINNT_H #include "wine/debug.h" @@ -159,12 +157,12 @@ strcat(DllName, ".DLL"); /* Load it */ - DPRINT("Loading the Thunk Library: %s \n", DllName); + TRACE("Loading the Thunk Library: %s \n", DllName); Library = ImageLoad(DllName, DllPath); if (!Library) return ForwarderString; /* Move past the name */ - DPRINT("It Loaded at: %p \n", Library->MappedAddress); + TRACE("It Loaded at: %p \n", Library->MappedAddress); FunctionName = TempDllName += 1; /* Load Exports */ @@ -275,7 +273,7 @@ ExportsBase += OptionalHeader->ImageBase; /* Is this yet another Forward? */ - DPRINT("I've thunked it\n"); + TRACE("I've thunked it\n"); if ((ForwardedAddress > ExportsBase) && (ForwardedAddress < (ExportsBase + ExportSize))) { @@ -289,7 +287,7 @@ else { /* Update the pointer and return success */ - ForwarderString = (PUCHAR)ForwardedAddress; + ForwarderString = (PCHAR)ForwardedAddress; *ForwarderBound = TRUE; } @@ -323,7 +321,7 @@ PIMAGE_OPTIONAL_HEADER LibraryOptionalHeader = NULL; BOOL ForwarderBound = FALSE; PUCHAR ForwarderName; - DPRINT("Binding a Thunk\n"); + TRACE("Binding a Thunk\n"); /* Get the Pointers to the Tables */ AddressOfNames = ImageRvaToVa(Library->FileHeader, @@ -351,7 +349,7 @@ ImportName = (PIMAGE_IMPORT_BY_NAME)NameBuffer; /* Setup the name for this ordinal */ - sprintf(ImportName->Name, "Ordinal%lx\n", OrdinalNumber); + sprintf((PCHAR)ImportName->Name, "Ordinal%lx\n", OrdinalNumber); } else { @@ -372,7 +370,7 @@ (ULONG)AddressOfNames[HintIndex], &Library->LastRvaSection); /* Check if it's the one we want */ - if (!strcmp(ImportName->Name, ExportName)) + if (!strcmp((PCHAR)ImportName->Name, ExportName)) { OrdinalNumber = AddressOfOrdinals[HintIndex]; } @@ -390,7 +388,7 @@ &Library->LastRvaSection); /* Check if it's the one we want */ - if (!strcmp(ImportName->Name, ExportName)) + if (!strcmp((PCHAR)ImportName->Name, ExportName)) { OrdinalNumber = AddressOfOrdinals[HintIndex]; break; @@ -423,7 +421,7 @@ /* Make sure we have a descriptor */ if (BoundImportDescriptor) { - DPRINT("This Thunk is a forward...calling forward thunk bounder\n"); + TRACE("This Thunk is a forward...calling forward thunk bounder\n"); /* Get the VA of the pointer containg the name */ ForwarderName = ImageRvaToVa(Library->FileHeader, @@ -434,10 +432,10 @@ /* Replace the Forwarder String by the actual name */ ThunkFunction->u1.ForwarderString = PtrToUlong(BindpAddForwarderReference(Image->ModuleName, - ImportName->Name, + (PCHAR)ImportName->Name, BoundImportDescriptor, DllPath, - ForwarderName, + (PCHAR)ForwarderName, &ForwarderBound)); } @@ -493,7 +491,7 @@ /* Add Terminator for PE Loader*/ BoundImportTableSize += sizeof(IMAGE_BOUND_IMPORT_DESCRIPTOR); - DPRINT("Table size: %lx\n", BoundImportTableSize); + TRACE("Table size: %lx\n", BoundImportTableSize); /* Name of Libraries Bound in Bound Import Table */ BoundLibraryNamesSize = (ULONG)((ULONG_PTR)BoundLibrariesPointer - @@ -521,7 +519,7 @@ { /* Copy the data */ BoundTableEntry->TimeDateStamp = Descriptor->TimeDateStamp; - BoundTableEntry->OffsetModuleName = (USHORT)(BoundImportTableSize + + BoundTableEntry->OffsetModuleName = (USHORT)(ULONG_PTR)(BoundImportTableSize + (Descriptor->ModuleName - (ULONG_PTR)BoundLibraries)); BoundTableEntry->NumberOfModuleForwarderRefs = Descriptor->ForwaderReferences; @@ -533,7 +531,7 @@ { /* Copy the data */ BoundForwarder->TimeDateStamp = Forwarder->TimeDateStamp; - BoundForwarder->OffsetModuleName = (USHORT)(BoundImportTableSize + + BoundForwarder->OffsetModuleName = (USHORT)(ULONG_PTR)(BoundImportTableSize + (Forwarder->ModuleName - (ULONG_PTR)BoundLibraries)); @@ -601,7 +599,7 @@ ULONG BoundImportTableSize, OldBoundImportTableSize; ULONG VirtBytesFree, HeaderBytesFree, FirstFreeByte, PhysBytesFree; BOOL ThunkStatus; - DPRINT("BindpWalkAndBindImports Called\n"); + TRACE("BindpWalkAndBindImports Called\n"); /* Assume untouched image */ *UpdateImage = FALSE; @@ -636,7 +634,7 @@ &File->LastRvaSection); if (ImportedLibrary) { - DPRINT("Loading Imported DLL: %s \n", ImportedLibrary); + TRACE("Loading Imported DLL: %s \n", ImportedLibrary); /* Load the DLL */ LoadedLibrary = ImageLoad(ImportedLibrary, DllPath); @@ -654,7 +652,7 @@ } /* Now load the Exports */ - DPRINT("DLL Loaded at: %p \n", LoadedLibrary->MappedAddress); + TRACE("DLL Loaded at: %p \n", LoadedLibrary->MappedAddress); Exports = ImageDirectoryEntryToData(LoadedLibrary->MappedAddress, FALSE, IMAGE_DIRECTORY_ENTRY_EXPORT, @@ -673,7 +671,7 @@ if (!(Thunks) || !(Thunks->u1.Function)) continue; /* Create Bound Import Descriptor */ - DPRINT("Creating Bound Descriptor for this DLL\n"); + TRACE("Creating Bound Descriptor for this DLL\n"); BoundImportDescriptor = BindpAddImportDescriptor(&TopBoundDescriptor, Imports, ImportedLibrary, @@ -695,7 +693,7 @@ SizeOfThunks); /* Setup the initial data pointers */ - DPRINT("Binding Thunks\n"); + TRACE("Binding Thunks\n"); TempThunk = Thunks; TempBoundThunk = BoundThunks; TopForwarderChain = -1; @@ -760,7 +758,7 @@ if (memcmp(TempThunk, BoundThunks, SizeOfThunks)) { /* Copy the Pointers and let caller know */ - DPRINT("Copying Bound Thunks\n"); + TRACE("Copying Bound Thunks\n"); RtlCopyMemory(TempThunk, BoundThunks, SizeOfThunks); *UpdateImage = TRUE; } @@ -786,13 +784,13 @@ /* Free the Allocated Memory */ HeapFree(IMAGEHLP_hHeap, 0, BoundThunks); - DPRINT("Moving to next File\n"); + TRACE("Moving to next File\n"); Imports++; } } /* Create the Bound Import Table */ - DPRINT("Creating Bound Import Section\n"); + TRACE("Creating Bound Import Section\n"); BoundImportTable = BindpCreateNewImportSection(&TopBoundDescriptor, &BoundImportTableSize); @@ -817,7 +815,7 @@ OptionalHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT].Size = 0; /* Check if we have enough space */ - DPRINT("Calculating Space\n"); + TRACE("Calculating Space\n"); FirstFreeByte = GetImageUnusedHeaderBytes(File, &VirtBytesFree); HeaderBytesFree = File->Sections->VirtualAddress - OptionalHeader->SizeOfHeaders + VirtBytesFree; @@ -830,7 +828,7 @@ /* Check if we have no space a tall */ if (BoundImportTableSize > HeaderBytesFree) { - DPRINT1("Not enough Space\n"); + ERR("Not enough Space\n"); return; /* Fail...not enough space */ } @@ -838,7 +836,7 @@ if (BoundImportTableSize <= PhysBytesFree) { /* We have enough NULLs to add it, simply enlarge header data */ - DPRINT("Header Recalculation\n"); + TRACE("Header Recalculation\n"); OptionalHeader->SizeOfHeaders = OptionalHeader->SizeOfHeaders - VirtBytesFree + BoundImportTableSize + @@ -848,7 +846,7 @@ else { /* Resize the Headers */ - DPRINT1("UNIMPLEMENTED: Header Resizing\n"); + FIXME("UNIMPLEMENTED: Header Resizing\n"); /* Recalculate Headers */ FileHeader = &File->FileHeader->FileHeader; @@ -863,7 +861,7 @@ [IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT].Size = BoundImportTableSize; /* Copy the Bound Import Table */ - DPRINT("Copying Bound Import Table\n"); + TRACE("Copying Bound Import Table\n"); RtlCopyMemory(File->MappedAddress + FirstFreeByte, BoundImportTable, BoundImportTableSize); @@ -890,7 +888,7 @@ FILETIME LastWriteTime; BOOLEAN UpdateImage; DWORD DataSize; - DPRINT("BindImageEx Called for: %s \n", ImageName); + TRACE("BindImageEx Called for: %s \n", ImageName); /* Set and Clear Buffer */ File = &FileData; @@ -900,7 +898,7 @@ if (MapAndLoad(ImageName, DllPath, File, TRUE, FALSE)) { /* Write the image's name */ - DPRINT("Image Mapped and Loaded\n"); + TRACE("Image Mapped and Loaded\n"); File->ModuleName = ImageName; /* Check if the image is valid and if it should be bound */ @@ -938,7 +936,7 @@ /* FIXME: Update symbols */ /* Update Checksum */ - DPRINT("Binding Completed, getting Checksum\n"); + TRACE("Binding Completed, getting Checksum\n"); OldChecksum = File->FileHeader->OptionalHeader.CheckSum; CheckSumMappedFile(File->MappedAddress, GetFileSize(File->hFile, NULL), @@ -947,11 +945,11 @@ File->FileHeader->OptionalHeader.CheckSum = CheckSum; /* Save Changes */ - DPRINT("Saving Changes to file\n"); + TRACE("Saving Changes to file\n"); FlushViewOfFile(File->MappedAddress, File->SizeOfImage); /* Save new Modified Time */ - DPRINT("Setting time\n"); + TRACE("Setting time\n"); GetSystemTime(&SystemTime); SystemTimeToFileTime(&SystemTime, &LastWriteTime); SetFileTime(File->hFile, NULL, NULL, &LastWriteTime); @@ -971,7 +969,7 @@ if (!(Flags & BIND_CACHE_IMPORT_DLLS)) UnloadAllImages(); /* Return success */ - DPRINT("Done\n"); + TRACE("Done\n"); return TRUE; }

1 0

[sginsberg] 37816: - Patch by hto: Correct definitions of PSN_* constants See issue #3925 for more details.
by sginsberg＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: sginsberg Date: Wed Dec 3 06:48:53 2008 New Revision: 37816 URL: http://svn.reactos.org/svn/reactos?rev=37816&view=rev Log: - Patch by hto: Correct definitions of PSN_* constants See issue #3925 for more details. Modified: trunk/reactos/include/psdk/prsht.h Modified: trunk/reactos/include/psdk/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/prsht.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/prsht.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/prsht.h [iso-8859-1] Wed Dec 3 06:48:53 2008 @@ -97,20 +97,22 @@ #define PSM_SETHEADERSUBTITLEA 1151 #define PSM_SETHEADERSUBTITLEW 1152 #endif -#define PSN_FIRST (-200) -#define PSN_LAST (-299) -#define PSN_APPLY (-202) -#define PSN_HELP (-205) -#define PSN_KILLACTIVE (-201) -#define PSN_QUERYCANCEL (-209) -#define PSN_GETOBJECT (PSN_FIRST-10) -#define PSN_TRANSLATEACCELERATOR (PSN_FIRST-12) -#define PSN_QUERYINITIALFOCUS (PSN_FIRST-13) -#define PSN_RESET (-203) -#define PSN_SETACTIVE (-200) -#define PSN_WIZBACK (-206) -#define PSN_WIZFINISH (-208) -#define PSN_WIZNEXT (-207) + +#define PSN_FIRST (0U - 200U) +#define PSN_SETACTIVE (PSN_FIRST - 0) +#define PSN_KILLACTIVE (PSN_FIRST - 1) +#define PSN_APPLY (PSN_FIRST - 2) +#define PSN_RESET (PSN_FIRST - 3) +#define PSN_HELP (PSN_FIRST - 5) +#define PSN_WIZBACK (PSN_FIRST - 6) +#define PSN_WIZNEXT (PSN_FIRST - 7) +#define PSN_WIZFINISH (PSN_FIRST - 8) +#define PSN_QUERYCANCEL (PSN_FIRST - 9) +#define PSN_GETOBJECT (PSN_FIRST - 10) +#define PSN_TRANSLATEACCELERATOR (PSN_FIRST - 12) +#define PSN_QUERYINITIALFOCUS (PSN_FIRST - 13) +#define PSN_LAST (PSN_FIRST - 99) + #define PSNRET_NOERROR 0 #define PSNRET_INVALID 1 #define PSNRET_INVALID_NOCHANGEPAGE 2

1 0

[ekohl] 37814: Sync to wine-1.1.1 (Patch 8 of 10): - Rob Shearman <robertshearman@gmail.com> Fri, 4 Jul 2008 widl: Remove some unnecessary calls to duptype.
by ekohl＠svn.reactos.org 02 Dec '08

02 Dec '08

Author: ekohl Date: Tue Dec 2 15:08:02 2008 New Revision: 37814 URL: http://svn.reactos.org/svn/reactos?rev=37814&view=rev Log: Sync to wine-1.1.1 (Patch 8 of 10): - Rob Shearman <robertshearman(a)gmail.com> Fri, 4 Jul 2008 widl: Remove some unnecessary calls to duptype. Modified: trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Tue Dec 2 15:08:02 2008 @@ -3635,7 +3635,7 @@ case 222: #line 822 "parser.y" - { (yyval.type) = duptype(find_type("float", 0), 1); ;} + { (yyval.type) = find_type("float", 0); ;} break; case 223: @@ -4065,7 +4065,7 @@ case 295: #line 1072 "parser.y" - { (yyval.type) = duptype(find_type_or_error("void", 0), 1); ;} + { (yyval.type) = find_type_or_error("void", 0); ;} break; case 296: @@ -5076,7 +5076,7 @@ static type_t *make_safearray(type_t *type) { - type_t *sa = duptype(find_type_or_error("SAFEARRAY", 0), 1); + type_t *sa = find_type_or_error("SAFEARRAY", 0); sa->ref = type; return make_type(pointer_default, sa); } Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37… ============================================================================== --- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Tue Dec 2 15:08:02 2008 @@ -819,7 +819,7 @@ } | tUNSIGNED { $$ = make_int(-1); } | tFLOAT { $$ = make_builtin($<str>1); } - | tSINGLE { $$ = duptype(find_type("float", 0), 1); } + | tSINGLE { $$ = find_type("float", 0); } | tDOUBLE { $$ = make_builtin($<str>1); } | tBOOLEAN { $$ = make_builtin($<str>1); } | tERRORSTATUST { $$ = make_builtin($<str>1); } @@ -1069,7 +1069,7 @@ } ; -type: tVOID { $$ = duptype(find_type_or_error("void", 0), 1); } +type: tVOID { $$ = find_type_or_error("void", 0); } | aKNOWNTYPE { $$ = find_type_or_error($1, 0); } | base_type { $$ = $1; } | enumdef { $$ = $1; } @@ -1761,7 +1761,7 @@ static type_t *make_safearray(type_t *type) { - type_t *sa = duptype(find_type_or_error("SAFEARRAY", 0), 1); + type_t *sa = find_type_or_error("SAFEARRAY", 0); sa->ref = type; return make_type(pointer_default, sa); }

1 0

[ekohl] 37813: Sync to wine-1.1.1 (Patch 7 of 10): - Rob Shearman <robertshearman@gmail.com> Fri, 4 Jul 2008 widl: Rename find_type_helper, find_type and find_type2 to find_type, find_type_error and find_type_error2 respectively.
by ekohl＠svn.reactos.org 02 Dec '08

02 Dec '08

Author: ekohl Date: Tue Dec 2 14:45:09 2008 New Revision: 37813 URL: http://svn.reactos.org/svn/reactos?rev=37813&view=rev Log: Sync to wine-1.1.1 (Patch 7 of 10): - Rob Shearman <robertshearman(a)gmail.com> Fri, 4 Jul 2008 widl: Rename find_type_helper, find_type and find_type2 to find_type, find_type_error and find_type_error2 respectively. Modified: trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Tue Dec 2 14:45:09 2008 @@ -501,7 +501,8 @@ static type_t *reg_type(type_t *type, const char *name, int t); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); -static type_t *find_type2(char *name, int t); +static type_t *find_type_or_error(const char *name, int t); +static type_t *find_type_or_error2(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_list_t *fields); @@ -529,7 +530,6 @@ static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(func_t *func); -static type_t *find_type_helper(const char *name, int t); static void check_def(const type_t *t); static statement_t *make_statement(enum statement_type type); @@ -3818,7 +3818,7 @@ case 253: #line 923 "parser.y" - { (yyval.type) = find_type2((yyvsp[0].str), 0); ;} + { (yyval.type) = find_type_or_error2((yyvsp[0].str), 0); ;} break; case 254: @@ -3864,7 +3864,7 @@ case 258: #line 959 "parser.y" { (yyval.type) = (yyvsp[-7].ifinfo).interface; - (yyval.type)->ref = find_type2((yyvsp[-5].str), 0); + (yyval.type)->ref = find_type_or_error2((yyvsp[-5].str), 0); if (!(yyval.type)->ref) error_loc("base class '%s' not found in import\n", (yyvsp[-5].str)); (yyval.type)->funcs = (yyvsp[-2].func_list); compute_method_indexes((yyval.type)); @@ -4065,12 +4065,12 @@ case 295: #line 1072 "parser.y" - { (yyval.type) = duptype(find_type("void", 0), 1); ;} + { (yyval.type) = duptype(find_type_or_error("void", 0), 1); ;} break; case 296: #line 1073 "parser.y" - { (yyval.type) = find_type((yyvsp[0].str), 0); ;} + { (yyval.type) = find_type_or_error((yyvsp[0].str), 0); ;} break; case 297: @@ -4085,7 +4085,7 @@ case 299: #line 1076 "parser.y" - { (yyval.type) = find_type2((yyvsp[0].str), tsENUM); ;} + { (yyval.type) = find_type_or_error2((yyvsp[0].str), tsENUM); ;} break; case 300: @@ -4105,7 +4105,7 @@ case 303: #line 1080 "parser.y" - { (yyval.type) = find_type2((yyvsp[0].str), tsUNION); ;} + { (yyval.type) = find_type_or_error2((yyvsp[0].str), tsUNION); ;} break; case 304: @@ -4443,14 +4443,14 @@ static type_t *make_builtin(char *name) { /* NAME is strdup'd in the lexer */ - type_t *t = duptype(find_type(name, 0), 0); + type_t *t = duptype(find_type_or_error(name, 0), 0); t->name = name; return t; } static type_t *make_int(int sign) { - type_t *t = duptype(find_type("int", 0), 1); + type_t *t = duptype(find_type_or_error("int", 0), 1); t->sign = sign; if (sign < 0) @@ -5076,7 +5076,7 @@ static type_t *make_safearray(type_t *type) { - type_t *sa = duptype(find_type("SAFEARRAY", 0), 1); + type_t *sa = duptype(find_type_or_error("SAFEARRAY", 0), 1); sa->ref = type; return make_type(pointer_default, sa); } @@ -5210,7 +5210,7 @@ if (name->name) { type_t *cur; - cur = find_type_helper(name->name, 0); + cur = find_type(name->name, 0); if (cur) error_loc("%s: redefinition error; original definition was at %s:%d\n", cur->name, cur->loc_info.input_name, @@ -5230,7 +5230,7 @@ return type; } -static type_t *find_type_helper(const char *name, int t) +type_t *find_type(const char *name, int t) { struct rtype *cur = type_hash[hash_ident(name)]; while (cur && (cur->t != t || strcmp(cur->name, name))) @@ -5238,9 +5238,9 @@ return cur ? cur->type : NULL; } -type_t *find_type(const char *name, int t) -{ - type_t *type = find_type_helper(name, t); +static type_t *find_type_or_error(const char *name, int t) +{ + type_t *type = find_type(name, t); if (!type) { error_loc("type '%s' not found\n", name); return NULL; @@ -5248,23 +5248,23 @@ return type; } -static type_t *find_type2(char *name, int t) -{ - type_t *tp = find_type(name, t); +static type_t *find_type_or_error2(char *name, int t) +{ + type_t *tp = find_type_or_error(name, t); free(name); return tp; } int is_type(const char *name) { - return find_type_helper(name, 0) != NULL; + return find_type(name, 0) != NULL; } static type_t *get_type(unsigned char type, char *name, int t) { type_t *tp; if (name) { - tp = find_type_helper(name, t); + tp = find_type(name, t); if (tp) { free(name); return tp; @@ -6020,7 +6020,7 @@ * function */ var_t *idl_handle = make_var(xstrdup("IDL_handle")); idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); - idl_handle->type = find_type("handle_t", 0); + idl_handle->type = find_type_or_error("handle_t", 0); if (!func->def->type->fields_or_args) { func->def->type->fields_or_args = xmalloc( sizeof(*func->def->type->fields_or_args) ); @@ -6175,7 +6175,7 @@ LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) { var_t *var = decl->var; - type_t *type = find_type(var->name, 0); + type_t *type = find_type_or_error(var->name, 0); *type_list = xmalloc(sizeof(type_list_t)); (*type_list)->type = type; (*type_list)->next = NULL; Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37… ============================================================================== --- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Tue Dec 2 14:45:09 2008 @@ -128,7 +128,8 @@ static type_t *reg_type(type_t *type, const char *name, int t); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); -static type_t *find_type2(char *name, int t); +static type_t *find_type_or_error(const char *name, int t); +static type_t *find_type_or_error2(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_list_t *fields); @@ -156,7 +157,6 @@ static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(func_t *func); -static type_t *find_type_helper(const char *name, int t); static void check_def(const type_t *t); static statement_t *make_statement(enum statement_type type); @@ -920,7 +920,7 @@ ; inherit: { $$ = NULL; } - | ':' aKNOWNTYPE { $$ = find_type2($2, 0); } + | ':' aKNOWNTYPE { $$ = find_type_or_error2($2, 0); } ; interface: tINTERFACE aIDENTIFIER { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_INTERFACE; } @@ -957,7 +957,7 @@ | interfacehdr ':' aIDENTIFIER '{' import int_statements '}' semicolon_opt { $$ = $1.interface; - $$->ref = find_type2($3, 0); + $$->ref = find_type_or_error2($3, 0); if (!$$->ref) error_loc("base class '%s' not found in import\n", $3); $$->funcs = $6; compute_method_indexes($$); @@ -1069,15 +1069,15 @@ } ; -type: tVOID { $$ = duptype(find_type("void", 0), 1); } - | aKNOWNTYPE { $$ = find_type($1, 0); } +type: tVOID { $$ = duptype(find_type_or_error("void", 0), 1); } + | aKNOWNTYPE { $$ = find_type_or_error($1, 0); } | base_type { $$ = $1; } | enumdef { $$ = $1; } - | tENUM aIDENTIFIER { $$ = find_type2($2, tsENUM); } + | tENUM aIDENTIFIER { $$ = find_type_or_error2($2, tsENUM); } | structdef { $$ = $1; } | tSTRUCT aIDENTIFIER { $$ = get_type(RPC_FC_STRUCT, $2, tsSTRUCT); } | uniondef { $$ = $1; } - | tUNION aIDENTIFIER { $$ = find_type2($2, tsUNION); } + | tUNION aIDENTIFIER { $$ = find_type_or_error2($2, tsUNION); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } ; @@ -1128,14 +1128,14 @@ static type_t *make_builtin(char *name) { /* NAME is strdup'd in the lexer */ - type_t *t = duptype(find_type(name, 0), 0); + type_t *t = duptype(find_type_or_error(name, 0), 0); t->name = name; return t; } static type_t *make_int(int sign) { - type_t *t = duptype(find_type("int", 0), 1); + type_t *t = duptype(find_type_or_error("int", 0), 1); t->sign = sign; if (sign < 0) @@ -1761,7 +1761,7 @@ static type_t *make_safearray(type_t *type) { - type_t *sa = duptype(find_type("SAFEARRAY", 0), 1); + type_t *sa = duptype(find_type_or_error("SAFEARRAY", 0), 1); sa->ref = type; return make_type(pointer_default, sa); } @@ -1895,7 +1895,7 @@ if (name->name) { type_t *cur; - cur = find_type_helper(name->name, 0); + cur = find_type(name->name, 0); if (cur) error_loc("%s: redefinition error; original definition was at %s:%d\n", cur->name, cur->loc_info.input_name, @@ -1915,7 +1915,7 @@ return type; } -static type_t *find_type_helper(const char *name, int t) +type_t *find_type(const char *name, int t) { struct rtype *cur = type_hash[hash_ident(name)]; while (cur && (cur->t != t || strcmp(cur->name, name))) @@ -1923,9 +1923,9 @@ return cur ? cur->type : NULL; } -type_t *find_type(const char *name, int t) -{ - type_t *type = find_type_helper(name, t); +static type_t *find_type_or_error(const char *name, int t) +{ + type_t *type = find_type(name, t); if (!type) { error_loc("type '%s' not found\n", name); return NULL; @@ -1933,23 +1933,23 @@ return type; } -static type_t *find_type2(char *name, int t) -{ - type_t *tp = find_type(name, t); +static type_t *find_type_or_error2(char *name, int t) +{ + type_t *tp = find_type_or_error(name, t); free(name); return tp; } int is_type(const char *name) { - return find_type_helper(name, 0) != NULL; + return find_type(name, 0) != NULL; } static type_t *get_type(unsigned char type, char *name, int t) { type_t *tp; if (name) { - tp = find_type_helper(name, t); + tp = find_type(name, t); if (tp) { free(name); return tp; @@ -2705,7 +2705,7 @@ * function */ var_t *idl_handle = make_var(xstrdup("IDL_handle")); idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); - idl_handle->type = find_type("handle_t", 0); + idl_handle->type = find_type_or_error("handle_t", 0); if (!func->def->type->fields_or_args) { func->def->type->fields_or_args = xmalloc( sizeof(*func->def->type->fields_or_args) ); @@ -2860,7 +2860,7 @@ LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) { var_t *var = decl->var; - type_t *type = find_type(var->name, 0); + type_t *type = find_type_or_error(var->name, 0); *type_list = xmalloc(sizeof(type_list_t)); (*type_list)->type = type; (*type_list)->next = NULL;

1 0

[cfinck] 37812: Revert r37802, which reverted r37801, which was previously reverted in r37477 reverting r37476. In other words: Reapply ekohl's widl change part 4, as the Release slave should build it properly now.
by cfinck＠svn.reactos.org 02 Dec '08

02 Dec '08

Author: cfinck Date: Tue Dec 2 13:17:32 2008 New Revision: 37812 URL: http://svn.reactos.org/svn/reactos?rev=37812&view=rev Log: Revert r37802, which reverted r37801, which was previously reverted in r37477 reverting r37476. In other words: Reapply ekohl's widl change part 4, as the Release slave should build it properly now. Modified: trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/widltypes.h Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Tue Dec 2 13:17:32 2008 @@ -529,6 +529,8 @@ static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(func_t *func); +static type_t *find_type_helper(const char *name, int t); +static void check_def(const type_t *t); static statement_t *make_statement(enum statement_type type); static statement_t *make_statement_type_decl(type_t *type); @@ -567,7 +569,7 @@ #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 177 "parser.y" +#line 179 "parser.y" typedef union YYSTYPE { attr_t *attr; attr_list_t *attr_list; @@ -597,7 +599,7 @@ enum storage_class stgclass; } YYSTYPE; /* Line 196 of yacc.c. */ -#line 601 "parser.tab.c" +#line 603 "parser.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -609,7 +611,7 @@ /* Line 219 of yacc.c. */ -#line 613 "parser.tab.c" +#line 615 "parser.tab.c" #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -964,37 +966,37 @@ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 349, 349, 358, 359, 360, 361, 365, 370, 373, - 374, 377, 378, 379, 380, 381, 386, 387, 388, 389, - 392, 393, 396, 397, 401, 402, 408, 411, 412, 416, - 417, 418, 421, 423, 431, 438, 442, 444, 451, 459, - 460, 463, 466, 467, 468, 472, 479, 487, 488, 491, - 492, 496, 502, 503, 504, 507, 508, 511, 512, 513, - 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, - 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, - 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, - 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, - 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, - 564, 568, 569, 570, 571, 572, 573, 574, 575, 576, - 577, 578, 579, 580, 581, 582, 583, 584, 588, 589, - 594, 595, 596, 597, 600, 601, 604, 608, 614, 615, - 616, 619, 623, 632, 636, 641, 650, 651, 664, 665, - 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, - 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, - 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, - 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, - 710, 711, 714, 720, 726, 727, 730, 735, 742, 743, - 746, 747, 751, 752, 755, 763, 772, 778, 784, 785, - 788, 789, 790, 793, 795, 798, 799, 800, 801, 802, - 818, 819, 820, 821, 822, 823, 824, 827, 828, 831, - 832, 833, 834, 835, 836, 837, 840, 841, 847, 856, - 863, 864, 868, 871, 872, 875, 889, 890, 893, 894, - 897, 907, 917, 918, 921, 922, 925, 938, 952, 965, - 969, 970, 973, 974, 977, 982, 990, 991, 992, 996, - 1000, 1003, 1004, 1007, 1008, 1012, 1013, 1017, 1018, 1019, - 1023, 1025, 1026, 1030, 1031, 1032, 1033, 1040, 1041, 1045, - 1046, 1050, 1051, 1052, 1055, 1066, 1067, 1068, 1069, 1070, - 1071, 1072, 1073, 1074, 1075, 1078, 1084, 1090, 1107, 1108 + 0, 351, 351, 360, 361, 362, 363, 367, 372, 375, + 376, 379, 380, 381, 382, 383, 388, 389, 390, 391, + 394, 395, 398, 399, 403, 404, 410, 413, 414, 418, + 419, 420, 423, 425, 433, 440, 444, 446, 453, 461, + 462, 465, 468, 469, 470, 474, 481, 489, 490, 493, + 494, 498, 504, 505, 506, 509, 510, 513, 514, 515, + 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, + 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, + 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, + 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, + 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, + 566, 570, 571, 572, 573, 574, 575, 576, 577, 578, + 579, 580, 581, 582, 583, 584, 585, 586, 590, 591, + 596, 597, 598, 599, 602, 603, 606, 610, 616, 617, + 618, 621, 625, 634, 638, 643, 652, 653, 666, 667, + 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, + 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, + 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, + 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, + 712, 713, 716, 722, 728, 729, 732, 737, 744, 745, + 748, 749, 753, 754, 757, 765, 774, 780, 786, 787, + 790, 791, 792, 795, 797, 800, 801, 802, 803, 804, + 820, 821, 822, 823, 824, 825, 826, 829, 830, 833, + 834, 835, 836, 837, 838, 839, 842, 843, 851, 861, + 868, 869, 873, 876, 877, 880, 894, 895, 898, 899, + 902, 912, 922, 923, 926, 927, 930, 943, 957, 970, + 974, 975, 978, 979, 982, 987, 995, 996, 997, 1001, + 1005, 1008, 1009, 1012, 1013, 1017, 1018, 1022, 1023, 1024, + 1028, 1030, 1031, 1035, 1036, 1037, 1038, 1045, 1046, 1050, + 1051, 1055, 1056, 1057, 1060, 1072, 1073, 1074, 1075, 1076, + 1077, 1078, 1079, 1080, 1081, 1084, 1090, 1097, 1115, 1116 }; #endif @@ -2466,7 +2468,7 @@ switch (yyn) { case 2: -#line 349 "parser.y" +#line 351 "parser.y" { fix_incomplete(); check_all_user_types((yyvsp[0].stmt_list)); write_proxies((yyvsp[0].stmt_list)); @@ -2477,22 +2479,22 @@ break; case 3: -#line 358 "parser.y" +#line 360 "parser.y" { (yyval.stmt_list) = NULL; ;} break; case 4: -#line 359 "parser.y" +#line 361 "parser.y" { (yyval.stmt_list) = (yyvsp[-1].stmt_list); ;} break; case 5: -#line 360 "parser.y" +#line 362 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_type_decl((yyvsp[0].type))); ;} break; case 6: -#line 361 "parser.y" +#line 363 "parser.y" { (yyval.stmt_list) = (yyvsp[-2].stmt_list); reg_type((yyvsp[-1].type), (yyvsp[-1].type)->name, 0); if (!parse_only && do_header) write_coclass_forward((yyvsp[-1].type)); @@ -2500,7 +2502,7 @@ break; case 7: -#line 365 "parser.y" +#line 367 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_type_decl((yyvsp[0].type))); add_typelib_entry((yyvsp[0].type)); reg_type((yyvsp[0].type), (yyvsp[0].type)->name, 0); @@ -2509,44 +2511,44 @@ break; case 8: -#line 370 "parser.y" +#line 372 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_module((yyvsp[0].type))); add_typelib_entry((yyvsp[0].type)); ;} break; case 9: -#line 373 "parser.y" +#line 375 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_library((yyvsp[0].typelib))); ;} break; case 10: -#line 374 "parser.y" +#line 376 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), (yyvsp[0].statement)); ;} break; case 11: -#line 377 "parser.y" +#line 379 "parser.y" { (yyval.stmt_list) = NULL; ;} break; case 12: -#line 378 "parser.y" +#line 380 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_reference((yyvsp[0].type))); if (!parse_only) add_typelib_entry((yyvsp[0].type)); ;} break; case 13: -#line 379 "parser.y" +#line 381 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_type_decl((yyvsp[0].type))); if (!parse_only) add_typelib_entry((yyvsp[0].type)); ;} break; case 14: -#line 380 "parser.y" +#line 382 "parser.y" { (yyval.stmt_list) = (yyvsp[-2].stmt_list); reg_type((yyvsp[-1].type), (yyvsp[-1].type)->name, 0); if (!parse_only && do_header) write_coclass_forward((yyvsp[-1].type)); ;} break; case 15: -#line 381 "parser.y" +#line 383 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_type_decl((yyvsp[0].type))); if (!parse_only) add_typelib_entry((yyvsp[0].type)); reg_type((yyvsp[0].type), (yyvsp[0].type)->name, 0); @@ -2555,42 +2557,42 @@ break; case 16: -#line 386 "parser.y" +#line 388 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_module((yyvsp[0].type))); if (!parse_only) add_typelib_entry((yyvsp[0].type)); ;} break; case 17: -#line 387 "parser.y" +#line 389 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), (yyvsp[0].statement)); ;} break; case 18: -#line 388 "parser.y" +#line 390 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_importlib((yyvsp[0].str))); ;} break; case 19: -#line 389 "parser.y" +#line 391 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_library((yyvsp[0].typelib))); ;} break; case 20: -#line 392 "parser.y" +#line 394 "parser.y" { (yyval.func_list) = NULL; ;} break; case 21: -#line 393 "parser.y" +#line 395 "parser.y" { (yyval.func_list) = append_func_from_statement( (yyvsp[-1].func_list), (yyvsp[0].statement) ); ;} break; case 24: -#line 401 "parser.y" +#line 403 "parser.y" { (yyval.statement) = make_statement_cppquote((yyvsp[0].str)); ;} break; case 25: -#line 402 "parser.y" +#line 404 "parser.y" { (yyval.statement) = make_statement_type_decl((yyvsp[-1].type)); if (!parse_only && do_header) { write_type_def_or_decl(header, (yyvsp[-1].type), FALSE, NULL); @@ -2600,29 +2602,29 @@ break; case 26: -#line 408 "parser.y" +#line 410 "parser.y" { (yyval.statement) = make_statement_declaration((yyvsp[-1].var)); if (!parse_only && do_header) write_declaration((yyvsp[-1].var), is_in_interface); ;} break; case 27: -#line 411 "parser.y" +#line 413 "parser.y" { (yyval.statement) = make_statement_import((yyvsp[0].str)); ;} break; case 28: -#line 412 "parser.y" +#line 414 "parser.y" { (yyval.statement) = (yyvsp[-1].statement); ;} break; case 32: -#line 421 "parser.y" +#line 423 "parser.y" { (yyval.str) = (yyvsp[-1].str); if (!parse_only && do_header) fprintf(header, "%s\n", (yyvsp[-1].str)); ;} break; case 33: -#line 423 "parser.y" +#line 425 "parser.y" { assert(yychar == YYEMPTY); (yyval.import) = xmalloc(sizeof(struct _import_t)); (yyval.import)->name = (yyvsp[-1].str); @@ -2632,7 +2634,7 @@ break; case 34: -#line 431 "parser.y" +#line 433 "parser.y" { (yyval.str) = (yyvsp[-2].import)->name; if ((yyvsp[-2].import)->import_performed) pop_import(); free((yyvsp[-2].import)); @@ -2641,17 +2643,17 @@ break; case 35: -#line 439 "parser.y" +#line 441 "parser.y" { (yyval.str) = (yyvsp[-2].str); if(!parse_only) add_importlib((yyvsp[-2].str)); ;} break; case 36: -#line 442 "parser.y" +#line 444 "parser.y" { (yyval.str) = (yyvsp[0].str); ;} break; case 37: -#line 444 "parser.y" +#line 446 "parser.y" { (yyval.typelib) = make_library((yyvsp[-1].str), check_library_attrs((yyvsp[-1].str), (yyvsp[-2].attr_list))); if (!parse_only) start_typelib((yyval.typelib)); if (!parse_only && do_header) write_library((yyval.typelib)); @@ -2661,7 +2663,7 @@ break; case 38: -#line 452 "parser.y" +#line 454 "parser.y" { (yyval.typelib) = (yyvsp[-3].typelib); (yyval.typelib)->stmts = (yyvsp[-2].stmt_list); if (!parse_only) end_typelib(); @@ -2670,27 +2672,27 @@ break; case 39: -#line 459 "parser.y" +#line 461 "parser.y" { (yyval.var_list) = NULL; ;} break; case 41: -#line 463 "parser.y" +#line 465 "parser.y" { (yyval.var_list) = NULL; ;} break; case 42: -#line 466 "parser.y" +#line 468 "parser.y" { check_arg((yyvsp[0].var)); (yyval.var_list) = append_var( NULL, (yyvsp[0].var) ); ;} break; case 43: -#line 467 "parser.y" +#line 469 "parser.y" { check_arg((yyvsp[0].var)); (yyval.var_list) = append_var( (yyvsp[-2].var_list), (yyvsp[0].var)); ;} break; case 45: -#line 472 "parser.y" +#line 474 "parser.y" { (yyval.var) = (yyvsp[0].declarator)->var; (yyval.var)->attrs = (yyvsp[-2].attr_list); if ((yyvsp[-1].declspec)->stgclass != STG_NONE && (yyvsp[-1].declspec)->stgclass != STG_REGISTER) @@ -2701,7 +2703,7 @@ break; case 46: -#line 479 "parser.y" +#line 481 "parser.y" { (yyval.var) = (yyvsp[0].declarator)->var; if ((yyvsp[-1].declspec)->stgclass != STG_NONE && (yyvsp[-1].declspec)->stgclass != STG_REGISTER) error_loc("invalid storage class for function parameter\n"); @@ -2711,22 +2713,22 @@ break; case 47: -#line 487 "parser.y" +#line 489 "parser.y" { (yyval.expr) = (yyvsp[-1].expr); ;} break; case 48: -#line 488 "parser.y" +#line 490 "parser.y" { (yyval.expr) = make_expr(EXPR_VOID); ;} break; case 49: -#line 491 "parser.y" +#line 493 "parser.y" { (yyval.attr_list) = NULL; ;} break; case 51: -#line 496 "parser.y" +#line 498 "parser.y" { (yyval.attr_list) = (yyvsp[-1].attr_list); if (!(yyval.attr_list)) error_loc("empty attribute lists unsupported\n"); @@ -2734,426 +2736,426 @@ break; case 52: -#line 502 "parser.y" +#line 504 "parser.y" { (yyval.attr_list) = append_attr( NULL, (yyvsp[0].attr) ); ;} break; case 53: -#line 503 "parser.y" +#line 505 "parser.y" { (yyval.attr_list) = append_attr( (yyvsp[-2].attr_list), (yyvsp[0].attr) ); ;} break; case 54: -#line 504 "parser.y" +#line 506 "parser.y" { (yyval.attr_list) = append_attr( (yyvsp[-3].attr_list), (yyvsp[0].attr) ); ;} break; case 55: -#line 507 "parser.y" +#line 509 "parser.y" { (yyval.str_list) = append_str( NULL, (yyvsp[0].str) ); ;} break; case 56: -#line 508 "parser.y" +#line 510 "parser.y" { (yyval.str_list) = append_str( (yyvsp[-2].str_list), (yyvsp[0].str) ); ;} break; case 57: -#line 511 "parser.y" +#line 513 "parser.y" { (yyval.attr) = NULL; ;} break; case 58: -#line 512 "parser.y" +#line 514 "parser.y" { (yyval.attr) = make_attr(ATTR_AGGREGATABLE); ;} break; case 59: -#line 513 "parser.y" +#line 515 "parser.y" { (yyval.attr) = make_attr(ATTR_APPOBJECT); ;} break; case 60: -#line 514 "parser.y" +#line 516 "parser.y" { (yyval.attr) = make_attr(ATTR_ASYNC); ;} break; case 61: -#line 515 "parser.y" +#line 517 "parser.y" { (yyval.attr) = make_attr(ATTR_AUTO_HANDLE); ;} break; case 62: -#line 516 "parser.y" +#line 518 "parser.y" { (yyval.attr) = make_attr(ATTR_BINDABLE); ;} break; case 63: -#line 517 "parser.y" +#line 519 "parser.y" { (yyval.attr) = make_attr(ATTR_BROADCAST); ;} break; case 64: -#line 518 "parser.y" +#line 520 "parser.y" { (yyval.attr) = make_attrp(ATTR_CALLAS, (yyvsp[-1].var)); ;} break; case 65: -#line 519 "parser.y" +#line 521 "parser.y" { (yyval.attr) = make_attrp(ATTR_CASE, (yyvsp[-1].expr_list)); ;} break; case 66: -#line 520 "parser.y" +#line 522 "parser.y" { (yyval.attr) = make_attrv(ATTR_CONTEXTHANDLE, 0); ;} break; case 67: -#line 521 "parser.y" +#line 523 "parser.y" { (yyval.attr) = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ ;} break; case 68: -#line 522 "parser.y" +#line 524 "parser.y" { (yyval.attr) = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ ;} break; case 69: -#line 523 "parser.y" +#line 525 "parser.y" { (yyval.attr) = make_attr(ATTR_CONTROL); ;} break; case 70: -#line 524 "parser.y" +#line 526 "parser.y" { (yyval.attr) = make_attr(ATTR_DEFAULT); ;} break; case 71: -#line 525 "parser.y" +#line 527 "parser.y" { (yyval.attr) = make_attr(ATTR_DEFAULTCOLLELEM); ;} break; case 72: -#line 526 "parser.y" +#line 528 "parser.y" { (yyval.attr) = make_attrp(ATTR_DEFAULTVALUE, (yyvsp[-1].expr)); ;} break; case 73: -#line 527 "parser.y" +#line 529 "parser.y" { (yyval.attr) = make_attr(ATTR_DEFAULTVTABLE); ;} break; case 74: -#line 528 "parser.y" +#line 530 "parser.y" { (yyval.attr) = make_attr(ATTR_DISPLAYBIND); ;} break; case 75: -#line 529 "parser.y" +#line 531 "parser.y" { (yyval.attr) = make_attrp(ATTR_DLLNAME, (yyvsp[-1].str)); ;} break; case 76: -#line 530 "parser.y" +#line 532 "parser.y" { (yyval.attr) = make_attr(ATTR_DUAL); ;} break; case 77: -#line 531 "parser.y" +#line 533 "parser.y" { (yyval.attr) = make_attrp(ATTR_ENDPOINT, (yyvsp[-1].str_list)); ;} break; case 78: -#line 532 "parser.y" +#line 534 "parser.y" { (yyval.attr) = make_attrp(ATTR_ENTRY, (yyvsp[-1].expr)); ;} break; case 79: -#line 533 "parser.y" +#line 535 "parser.y" { (yyval.attr) = make_attr(ATTR_EXPLICIT_HANDLE); ;} break; case 80: -#line 534 "parser.y" +#line 536 "parser.y" { (yyval.attr) = make_attr(ATTR_HANDLE); ;} break; case 81: -#line 535 "parser.y" +#line 537 "parser.y" { (yyval.attr) = make_attrp(ATTR_HELPCONTEXT, (yyvsp[-1].expr)); ;} break; case 82: -#line 536 "parser.y" +#line 538 "parser.y" { (yyval.attr) = make_attrp(ATTR_HELPFILE, (yyvsp[-1].str)); ;} break; case 83: -#line 537 "parser.y" +#line 539 "parser.y" { (yyval.attr) = make_attrp(ATTR_HELPSTRING, (yyvsp[-1].str)); ;} break; case 84: -#line 538 "parser.y" +#line 540 "parser.y" { (yyval.attr) = make_attrp(ATTR_HELPSTRINGCONTEXT, (yyvsp[-1].expr)); ;} break; case 85: -#line 539 "parser.y" +#line 541 "parser.y" { (yyval.attr) = make_attrp(ATTR_HELPSTRINGDLL, (yyvsp[-1].str)); ;} break; case 86: -#line 540 "parser.y" +#line 542 "parser.y" { (yyval.attr) = make_attr(ATTR_HIDDEN); ;} break; case 87: -#line 541 "parser.y" +#line 543 "parser.y" { (yyval.attr) = make_attrp(ATTR_ID, (yyvsp[-1].expr)); ;} break; case 88: -#line 542 "parser.y" +#line 544 "parser.y" { (yyval.attr) = make_attr(ATTR_IDEMPOTENT); ;} break; case 89: -#line 543 "parser.y" +#line 545 "parser.y" { (yyval.attr) = make_attrp(ATTR_IIDIS, (yyvsp[-1].expr)); ;} break; case 90: -#line 544 "parser.y" +#line 546 "parser.y" { (yyval.attr) = make_attr(ATTR_IMMEDIATEBIND); ;} break; case 91: -#line 545 "parser.y" +#line 547 "parser.y" { (yyval.attr) = make_attrp(ATTR_IMPLICIT_HANDLE, (yyvsp[-1].str)); ;} break; case 92: -#line 546 "parser.y" +#line 548 "parser.y" { (yyval.attr) = make_attr(ATTR_IN); ;} break; case 93: -#line 547 "parser.y" +#line 549 "parser.y" { (yyval.attr) = make_attr(ATTR_INPUTSYNC); ;} break; case 94: -#line 548 "parser.y" +#line 550 "parser.y" { (yyval.attr) = make_attrp(ATTR_LENGTHIS, (yyvsp[-1].expr_list)); ;} break; case 95: -#line 549 "parser.y" +#line 551 "parser.y" { (yyval.attr) = make_attrp(ATTR_LIBLCID, (yyvsp[-1].expr)); ;} break; case 96: -#line 550 "parser.y" +#line 552 "parser.y" { (yyval.attr) = make_attr(ATTR_LOCAL); ;} break; case 97: -#line 551 "parser.y" +#line 553 "parser.y" { (yyval.attr) = make_attr(ATTR_NONBROWSABLE); ;} break; case 98: -#line 552 "parser.y" +#line 554 "parser.y" { (yyval.attr) = make_attr(ATTR_NONCREATABLE); ;} break; case 99: -#line 553 "parser.y" +#line 555 "parser.y" { (yyval.attr) = make_attr(ATTR_NONEXTENSIBLE); ;} break; case 100: -#line 554 "parser.y" +#line 556 "parser.y" { (yyval.attr) = make_attr(ATTR_OBJECT); ;} break; case 101: -#line 555 "parser.y" +#line 557 "parser.y" { (yyval.attr) = make_attr(ATTR_ODL); ;} break; case 102: -#line 556 "parser.y" +#line 558 "parser.y" { (yyval.attr) = make_attr(ATTR_OLEAUTOMATION); ;} break; case 103: -#line 557 "parser.y" +#line 559 "parser.y" { (yyval.attr) = make_attr(ATTR_OPTIONAL); ;} break; case 104: -#line 558 "parser.y" +#line 560 "parser.y" { (yyval.attr) = make_attr(ATTR_OUT); ;} break; case 105: -#line 559 "parser.y" +#line 561 "parser.y" { (yyval.attr) = make_attrv(ATTR_POINTERDEFAULT, (yyvsp[-1].num)); ;} break; case 106: -#line 560 "parser.y" +#line 562 "parser.y" { (yyval.attr) = make_attr(ATTR_PROPGET); ;} break; case 107: -#line 561 "parser.y" +#line 563 "parser.y" { (yyval.attr) = make_attr(ATTR_PROPPUT); ;} break; case 108: -#line 562 "parser.y" +#line 564 "parser.y" { (yyval.attr) = make_attr(ATTR_PROPPUTREF); ;} break; case 109: -#line 563 "parser.y" +#line 565 "parser.y" { (yyval.attr) = make_attr(ATTR_PUBLIC); ;} break; case 110: -#line 565 "parser.y" +#line 567 "parser.y" { expr_list_t *list = append_expr( NULL, (yyvsp[-3].expr) ); list = append_expr( list, (yyvsp[-1].expr) ); (yyval.attr) = make_attrp(ATTR_RANGE, list); ;} break; case 111: -#line 568 "parser.y" +#line 570 "parser.y" { (yyval.attr) = make_attr(ATTR_READONLY); ;} break; case 112: -#line 569 "parser.y" +#line 571 "parser.y" { (yyval.attr) = make_attr(ATTR_REQUESTEDIT); ;} break; case 113: -#line 570 "parser.y" +#line 572 "parser.y" { (yyval.attr) = make_attr(ATTR_RESTRICTED); ;} break; case 114: -#line 571 "parser.y" +#line 573 "parser.y" { (yyval.attr) = make_attr(ATTR_RETVAL); ;} break; case 115: -#line 572 "parser.y" +#line 574 "parser.y" { (yyval.attr) = make_attrp(ATTR_SIZEIS, (yyvsp[-1].expr_list)); ;} break; case 116: -#line 573 "parser.y" +#line 575 "parser.y" { (yyval.attr) = make_attr(ATTR_SOURCE); ;} break; case 117: -#line 574 "parser.y" +#line 576 "parser.y" { (yyval.attr) = make_attr(ATTR_STRICTCONTEXTHANDLE); ;} break; case 118: -#line 575 "parser.y" +#line 577 "parser.y" { (yyval.attr) = make_attr(ATTR_STRING); ;} break; case 119: -#line 576 "parser.y" +#line 578 "parser.y" { (yyval.attr) = make_attrp(ATTR_SWITCHIS, (yyvsp[-1].expr)); ;} break; case 120: -#line 577 "parser.y" +#line 579 "parser.y" { (yyval.attr) = make_attrp(ATTR_SWITCHTYPE, (yyvsp[-1].type)); ;} break; case 121: -#line 578 "parser.y" +#line 580 "parser.y" { (yyval.attr) = make_attrp(ATTR_TRANSMITAS, (yyvsp[-1].type)); ;} break; case 122: -#line 579 "parser.y" +#line 581 "parser.y" { (yyval.attr) = make_attrp(ATTR_UUID, (yyvsp[-1].uuid)); ;} break; case 123: -#line 580 "parser.y" +#line 582 "parser.y" { (yyval.attr) = make_attr(ATTR_V1ENUM); ;} break; case 124: -#line 581 "parser.y" +#line 583 "parser.y" { (yyval.attr) = make_attr(ATTR_VARARG); ;} break; case 125: -#line 582 "parser.y" +#line 584 "parser.y" { (yyval.attr) = make_attrv(ATTR_VERSION, (yyvsp[-1].num)); ;} break; case 126: -#line 583 "parser.y" +#line 585 "parser.y" { (yyval.attr) = make_attrp(ATTR_WIREMARSHAL, (yyvsp[-1].type)); ;} break; case 127: -#line 584 "parser.y" +#line 586 "parser.y" { (yyval.attr) = make_attrv(ATTR_POINTERTYPE, (yyvsp[0].num)); ;} break; case 129: -#line 589 "parser.y" +#line 591 "parser.y" { if (!is_valid_uuid((yyvsp[0].str))) error_loc("invalid UUID: %s\n", (yyvsp[0].str)); (yyval.uuid) = parse_uuid((yyvsp[0].str)); ;} break; case 130: -#line 594 "parser.y" - { (yyval.str) = (yyvsp[0].str); ;} - break; - - case 131: -#line 595 "parser.y" - { (yyval.str) = (yyvsp[0].str); ;} - break; - - case 132: #line 596 "parser.y" { (yyval.str) = (yyvsp[0].str); ;} break; - case 133: + case 131: #line 597 "parser.y" { (yyval.str) = (yyvsp[0].str); ;} break; + case 132: +#line 598 "parser.y" + { (yyval.str) = (yyvsp[0].str); ;} + break; + + case 133: +#line 599 "parser.y" + { (yyval.str) = (yyvsp[0].str); ;} + break; + case 134: -#line 600 "parser.y" +#line 602 "parser.y" { (yyval.var_list) = NULL; ;} break; case 135: -#line 601 "parser.y" +#line 603 "parser.y" { (yyval.var_list) = append_var( (yyvsp[-1].var_list), (yyvsp[0].var) ); ;} break; case 136: -#line 604 "parser.y" +#line 606 "parser.y" { attr_t *a = make_attrp(ATTR_CASE, append_expr( NULL, (yyvsp[-2].expr) )); (yyval.var) = (yyvsp[0].var); if (!(yyval.var)) (yyval.var) = make_var(NULL); (yyval.var)->attrs = append_attr( (yyval.var)->attrs, a ); @@ -3161,7 +3163,7 @@ break; case 137: -#line 608 "parser.y" +#line 610 "parser.y" { attr_t *a = make_attr(ATTR_DEFAULT); (yyval.var) = (yyvsp[0].var); if (!(yyval.var)) (yyval.var) = make_var(NULL); (yyval.var)->attrs = append_attr( (yyval.var)->attrs, a ); @@ -3169,17 +3171,17 @@ break; case 138: -#line 614 "parser.y" +#line 616 "parser.y" { (yyval.var_list) = NULL; ;} break; case 139: -#line 615 "parser.y" +#line 617 "parser.y" { (yyval.var_list) = (yyvsp[-1].var_list); ;} break; case 141: -#line 619 "parser.y" +#line 621 "parser.y" { if (!(yyvsp[0].var)->eval) (yyvsp[0].var)->eval = make_exprl(EXPR_NUM, 0 /* default for first enum entry */); (yyval.var_list) = append_var( NULL, (yyvsp[0].var) ); @@ -3187,7 +3189,7 @@ break; case 142: -#line 623 "parser.y" +#line 625 "parser.y" { if (!(yyvsp[0].var)->eval) { var_t *last = LIST_ENTRY( list_tail((yyval.var_list)), var_t, entry ); @@ -3198,7 +3200,7 @@ break; case 143: -#line 632 "parser.y" +#line 634 "parser.y" { (yyval.var) = reg_const((yyvsp[-2].var)); (yyval.var)->eval = (yyvsp[0].expr); (yyval.var)->type = make_int(0); @@ -3206,14 +3208,14 @@ break; case 144: -#line 636 "parser.y" +#line 638 "parser.y" { (yyval.var) = reg_const((yyvsp[0].var)); (yyval.var)->type = make_int(0); ;} break; case 145: -#line 641 "parser.y" +#line 643 "parser.y" { (yyval.type) = get_typev(RPC_FC_ENUM16, (yyvsp[-3].var), tsENUM); (yyval.type)->kind = TKIND_ENUM; (yyval.type)->fields_or_args = (yyvsp[-1].var_list); @@ -3224,232 +3226,232 @@ break; case 146: -#line 650 "parser.y" +#line 652 "parser.y" { (yyval.expr_list) = append_expr( NULL, (yyvsp[0].expr) ); ;} break; case 147: -#line 651 "parser.y" +#line 653 "parser.y" { (yyval.expr_list) = append_expr( (yyvsp[-2].expr_list), (yyvsp[0].expr) ); ;} break; case 148: -#line 664 "parser.y" +#line 666 "parser.y" { (yyval.expr) = make_expr(EXPR_VOID); ;} break; case 150: -#line 668 "parser.y" +#line 670 "parser.y" { (yyval.expr) = make_exprl(EXPR_NUM, (yyvsp[0].num)); ;} break; case 151: -#line 669 "parser.y" +#line 671 "parser.y" { (yyval.expr) = make_exprl(EXPR_HEXNUM, (yyvsp[0].num)); ;} break; case 152: -#line 670 "parser.y" +#line 672 "parser.y" { (yyval.expr) = make_exprd(EXPR_DOUBLE, (yyvsp[0].dbl)); ;} break; case 153: -#line 671 "parser.y" +#line 673 "parser.y" { (yyval.expr) = make_exprl(EXPR_TRUEFALSE, 0); ;} break; case 154: -#line 672 "parser.y" +#line 674 "parser.y" { (yyval.expr) = make_exprl(EXPR_NUM, 0); ;} break; case 155: -#line 673 "parser.y" +#line 675 "parser.y" { (yyval.expr) = make_exprl(EXPR_TRUEFALSE, 1); ;} break; case 156: -#line 674 "parser.y" +#line 676 "parser.y" { (yyval.expr) = make_exprs(EXPR_STRLIT, (yyvsp[0].str)); ;} break; case 157: -#line 675 "parser.y" +#line 677 "parser.y" { (yyval.expr) = make_exprs(EXPR_WSTRLIT, (yyvsp[0].str)); ;} break; case 158: -#line 676 "parser.y" +#line 678 "parser.y" { (yyval.expr) = make_exprs(EXPR_IDENTIFIER, (yyvsp[0].str)); ;} break; case 159: -#line 677 "parser.y" +#line 679 "parser.y" { (yyval.expr) = make_expr3(EXPR_COND, (yyvsp[-4].expr), (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 160: -#line 678 "parser.y" +#line 680 "parser.y" { (yyval.expr) = make_expr2(EXPR_LOGOR, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 161: -#line 679 "parser.y" +#line 681 "parser.y" { (yyval.expr) = make_expr2(EXPR_LOGAND, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 162: -#line 680 "parser.y" +#line 682 "parser.y" { (yyval.expr) = make_expr2(EXPR_OR , (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 163: -#line 681 "parser.y" +#line 683 "parser.y" { (yyval.expr) = make_expr2(EXPR_XOR, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 164: -#line 682 "parser.y" +#line 684 "parser.y" { (yyval.expr) = make_expr2(EXPR_AND, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 165: -#line 683 "parser.y" +#line 685 "parser.y" { (yyval.expr) = make_expr2(EXPR_EQUALITY, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 166: -#line 684 "parser.y" +#line 686 "parser.y" { (yyval.expr) = make_expr2(EXPR_INEQUALITY, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 167: -#line 685 "parser.y" +#line 687 "parser.y" { (yyval.expr) = make_expr2(EXPR_GTR, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 168: -#line 686 "parser.y" +#line 688 "parser.y" { (yyval.expr) = make_expr2(EXPR_LESS, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 169: -#line 687 "parser.y" +#line 689 "parser.y" { (yyval.expr) = make_expr2(EXPR_GTREQL, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 170: -#line 688 "parser.y" +#line 690 "parser.y" { (yyval.expr) = make_expr2(EXPR_LESSEQL, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 171: -#line 689 "parser.y" +#line 691 "parser.y" { (yyval.expr) = make_expr2(EXPR_SHL, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 172: -#line 690 "parser.y" +#line 692 "parser.y" { (yyval.expr) = make_expr2(EXPR_SHR, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 173: -#line 691 "parser.y" +#line 693 "parser.y" { (yyval.expr) = make_expr2(EXPR_ADD, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 174: -#line 692 "parser.y" +#line 694 "parser.y" { (yyval.expr) = make_expr2(EXPR_SUB, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 175: -#line 693 "parser.y" +#line 695 "parser.y" { (yyval.expr) = make_expr2(EXPR_MOD, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 176: -#line 694 "parser.y" +#line 696 "parser.y" { (yyval.expr) = make_expr2(EXPR_MUL, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 177: -#line 695 "parser.y" +#line 697 "parser.y" { (yyval.expr) = make_expr2(EXPR_DIV, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; case 178: -#line 696 "parser.y" +#line 698 "parser.y" { (yyval.expr) = make_expr1(EXPR_LOGNOT, (yyvsp[0].expr)); ;} break; case 179: -#line 697 "parser.y" +#line 699 "parser.y" { (yyval.expr) = make_expr1(EXPR_NOT, (yyvsp[0].expr)); ;} break; case 180: -#line 698 "parser.y" +#line 700 "parser.y" { (yyval.expr) = make_expr1(EXPR_POS, (yyvsp[0].expr)); ;} break; case 181: -#line 699 "parser.y" +#line 701 "parser.y" { (yyval.expr) = make_expr1(EXPR_NEG, (yyvsp[0].expr)); ;} break; case 182: -#line 700 "parser.y" +#line 702 "parser.y" { (yyval.expr) = make_expr1(EXPR_ADDRESSOF, (yyvsp[0].expr)); ;} break; case 183: -#line 701 "parser.y" +#line 703 "parser.y" { (yyval.expr) = make_expr1(EXPR_PPTR, (yyvsp[0].expr)); ;} break; case 184: -#line 702 "parser.y" +#line 704 "parser.y" { (yyval.expr) = make_expr2(EXPR_MEMBER, make_expr1(EXPR_PPTR, (yyvsp[-2].expr)), make_exprs(EXPR_IDENTIFIER, (yyvsp[0].str))); ;} break; case 185: -#line 703 "parser.y" +#line 705 "parser.y" { (yyval.expr) = make_expr2(EXPR_MEMBER, (yyvsp[-2].expr), make_exprs(EXPR_IDENTIFIER, (yyvsp[0].str))); ;} break; case 186: -#line 704 "parser.y" +#line 706 "parser.y" { (yyval.expr) = make_exprt(EXPR_CAST, (yyvsp[-2].type), (yyvsp[0].expr)); ;} break; case 187: -#line 705 "parser.y" +#line 707 "parser.y" { (yyval.expr) = make_exprt(EXPR_SIZEOF, (yyvsp[-1].type), NULL); ;} break; case 188: -#line 706 "parser.y" +#line 708 "parser.y" { (yyval.expr) = make_expr2(EXPR_ARRAY, (yyvsp[-3].expr), (yyvsp[-1].expr)); ;} break; case 189: -#line 707 "parser.y" +#line 709 "parser.y" { (yyval.expr) = (yyvsp[-1].expr); ;} break; case 190: -#line 710 "parser.y" +#line 712 "parser.y" { (yyval.expr_list) = append_expr( NULL, (yyvsp[0].expr) ); ;} break; case 191: -#line 711 "parser.y" +#line 713 "parser.y" { (yyval.expr_list) = append_expr( (yyvsp[-2].expr_list), (yyvsp[0].expr) ); ;} break; case 192: -#line 714 "parser.y" +#line 716 "parser.y" { (yyval.expr) = (yyvsp[0].expr); if (!(yyval.expr)->is_const) error_loc("expression is not an integer constant\n"); @@ -3457,7 +3459,7 @@ break; case 193: -#line 720 "parser.y" +#line 722 "parser.y" { (yyval.expr) = (yyvsp[0].expr); if (!(yyval.expr)->is_const && (yyval.expr)->type != EXPR_STRLIT && (yyval.expr)->type != EXPR_WSTRLIT) error_loc("expression is not constant\n"); @@ -3465,17 +3467,17 @@ break; case 194: -#line 726 "parser.y" +#line 728 "parser.y" { (yyval.var_list) = NULL; ;} break; case 195: -#line 727 "parser.y" +#line 729 "parser.y" { (yyval.var_list) = append_var_list((yyvsp[-1].var_list), (yyvsp[0].var_list)); ;} break; case 196: -#line 731 "parser.y" +#line 733 "parser.y" { const char *first = LIST_ENTRY(list_head((yyvsp[-1].declarator_list)), declarator_t, entry)->var->name; check_field_attrs(first, (yyvsp[-3].attr_list)); (yyval.var_list) = set_var_types((yyvsp[-3].attr_list), (yyvsp[-2].declspec), (yyvsp[-1].declarator_list)); @@ -3483,7 +3485,7 @@ break; case 197: -#line 735 "parser.y" +#line 737 "parser.y" { var_t *v = make_var(NULL); v->type = (yyvsp[-1].type); v->attrs = (yyvsp[-2].attr_list); (yyval.var_list) = append_var(NULL, v); @@ -3491,37 +3493,37 @@ break; case 198: -#line 742 "parser.y" +#line 744 "parser.y" { (yyval.var) = (yyvsp[-1].var); ;} break; case 199: -#line 743 "parser.y" +#line 745 "parser.y" { (yyval.var) = make_var(NULL); (yyval.var)->attrs = (yyvsp[-1].attr_list); ;} break; case 200: -#line 746 "parser.y" +#line 748 "parser.y" { (yyval.var_list) = NULL; ;} break; case 201: -#line 747 "parser.y" +#line 749 "parser.y" { (yyval.var_list) = append_var( (yyvsp[-1].var_list), (yyvsp[0].var) ); ;} break; case 202: -#line 751 "parser.y" +#line 753 "parser.y" { (yyval.var) = (yyvsp[-1].var); ;} break; case 203: -#line 752 "parser.y" +#line 754 "parser.y" { (yyval.var) = NULL; ;} break; case 204: -#line 755 "parser.y" +#line 757 "parser.y" { (yyval.var) = (yyvsp[0].declarator)->var; (yyval.var)->attrs = check_field_attrs((yyval.var)->name, (yyvsp[-2].attr_list)); set_type((yyval.var), (yyvsp[-1].declspec), (yyvsp[0].declarator), FALSE); @@ -3530,7 +3532,7 @@ break; case 205: -#line 763 "parser.y" +#line 765 "parser.y" { var_t *v = (yyvsp[0].declarator)->var; v->attrs = check_function_attrs(v->name, (yyvsp[-2].attr_list)); set_type(v, (yyvsp[-1].declspec), (yyvsp[0].declarator), FALSE); @@ -3540,7 +3542,7 @@ break; case 206: -#line 773 "parser.y" +#line 775 "parser.y" { (yyval.var) = (yyvsp[0].declarator)->var; (yyval.var)->attrs = (yyvsp[-2].attr_list); set_type((yyval.var), (yyvsp[-1].declspec), (yyvsp[0].declarator), FALSE); @@ -3549,7 +3551,7 @@ break; case 207: -#line 778 "parser.y" +#line 780 "parser.y" { (yyval.var) = (yyvsp[0].declarator)->var; set_type((yyval.var), (yyvsp[-1].declspec), (yyvsp[0].declarator), FALSE); free((yyvsp[0].declarator)); @@ -3557,52 +3559,52 @@ break; case 208: -#line 784 "parser.y" +#line 786 "parser.y" { (yyval.var) = NULL; ;} break; case 210: -#line 788 "parser.y" +#line 790 "parser.y" { (yyval.var) = NULL; ;} break; case 211: -#line 789 "parser.y" +#line 791 "parser.y" { (yyval.var) = make_var((yyvsp[0].str)); ;} break; case 212: -#line 790 "parser.y" +#line 792 "parser.y" { (yyval.var) = make_var((yyvsp[0].str)); ;} break; case 213: -#line 793 "parser.y" - { (yyval.var) = make_var((yyvsp[0].str)); ;} - break; - - case 214: #line 795 "parser.y" { (yyval.var) = make_var((yyvsp[0].str)); ;} break; + case 214: +#line 797 "parser.y" + { (yyval.var) = make_var((yyvsp[0].str)); ;} + break; + case 215: -#line 798 "parser.y" +#line 800 "parser.y" { (yyval.type) = make_builtin((yyvsp[0].str)); ;} break; case 216: -#line 799 "parser.y" +#line 801 "parser.y" { (yyval.type) = make_builtin((yyvsp[0].str)); ;} break; case 218: -#line 801 "parser.y" +#line 803 "parser.y" { (yyval.type) = (yyvsp[0].type); (yyval.type)->sign = 1; ;} break; case 219: -#line 802 "parser.y" +#line 804 "parser.y" { (yyval.type) = (yyvsp[0].type); (yyval.type)->sign = -1; switch ((yyval.type)->type) { case RPC_FC_CHAR: break; @@ -3622,91 +3624,94 @@ break; case 220: -#line 818 "parser.y" +#line 820 "parser.y" { (yyval.type) = make_int(-1); ;} break; case 221: -#line 819 "parser.y" - { (yyval.type) = make_builtin((yyvsp[0].str)); ;} - break; - - case 222: -#line 820 "parser.y" - { (yyval.type) = duptype(find_type("float", 0), 1); ;} - break; - - case 223: #line 821 "parser.y" { (yyval.type) = make_builtin((yyvsp[0].str)); ;} break; - case 224: + case 222: #line 822 "parser.y" - { (yyval.type) = make_builtin((yyvsp[0].str)); ;} - break; - - case 225: + { (yyval.type) = duptype(find_type("float", 0), 1); ;} + break; + + case 223: #line 823 "parser.y" { (yyval.type) = make_builtin((yyvsp[0].str)); ;} break; - case 226: + case 224: #line 824 "parser.y" { (yyval.type) = make_builtin((yyvsp[0].str)); ;} break; + case 225: +#line 825 "parser.y" + { (yyval.type) = make_builtin((yyvsp[0].str)); ;} + break; + + case 226: +#line 826 "parser.y" + { (yyval.type) = make_builtin((yyvsp[0].str)); ;} + break; + case 229: -#line 831 "parser.y" - { (yyval.type) = make_builtin((yyvsp[0].str)); ;} - break; - - case 230: -#line 832 "parser.y" - { (yyval.type) = make_builtin((yyvsp[-1].str)); ;} - break; - - case 231: #line 833 "parser.y" { (yyval.type) = make_builtin((yyvsp[0].str)); ;} break; - case 232: + case 230: #line 834 "parser.y" { (yyval.type) = make_builtin((yyvsp[-1].str)); ;} break; + case 231: +#line 835 "parser.y" + { (yyval.type) = make_builtin((yyvsp[0].str)); ;} + break; + + case 232: +#line 836 "parser.y" + { (yyval.type) = make_builtin((yyvsp[-1].str)); ;} + break; + case 233: -#line 835 "parser.y" +#line 837 "parser.y" { (yyval.type) = make_builtin((yyvsp[-1].str)); ;} break; case 234: -#line 836 "parser.y" +#line 838 "parser.y" { (yyval.type) = make_builtin((yyvsp[0].str)); ;} break; case 235: -#line 837 "parser.y" +#line 839 "parser.y" { (yyval.type) = make_builtin((yyvsp[0].str)); ;} break; case 236: -#line 840 "parser.y" +#line 842 "parser.y" { (yyval.type) = make_class((yyvsp[0].str)); ;} break; case 237: -#line 841 "parser.y" +#line 843 "parser.y" { (yyval.type) = find_type((yyvsp[0].str), 0); - if ((yyval.type)->defined) error_loc("multiple definition error\n"); - if ((yyval.type)->kind != TKIND_COCLASS) error_loc("%s was not declared a coclass\n", (yyvsp[0].str)); + if ((yyval.type)->kind != TKIND_COCLASS) + error_loc("%s was not declared a coclass at %s:%d\n", + (yyvsp[0].str), (yyval.type)->loc_info.input_name, + (yyval.type)->loc_info.line_number); ;} break; case 238: -#line 847 "parser.y" +#line 851 "parser.y" { (yyval.type) = (yyvsp[0].type); + check_def((yyval.type)); (yyval.type)->attrs = check_coclass_attrs((yyvsp[0].type)->name, (yyvsp[-1].attr_list)); if (!parse_only && do_header) write_coclass((yyval.type)); @@ -3716,7 +3721,7 @@ break; case 239: -#line 857 "parser.y" +#line 862 "parser.y" { (yyval.type) = (yyvsp[-4].type); (yyval.type)->ifaces = (yyvsp[-2].ifref_list); (yyval.type)->defined = TRUE; @@ -3724,37 +3729,37 @@ break; case 240: -#line 863 "parser.y" +#line 868 "parser.y" { (yyval.ifref_list) = NULL; ;} break; case 241: -#line 864 "parser.y" +#line 869 "parser.y" { (yyval.ifref_list) = append_ifref( (yyvsp[-1].ifref_list), (yyvsp[0].ifref) ); ;} break; case 242: -#line 868 "parser.y" +#line 873 "parser.y" { (yyval.ifref) = make_ifref((yyvsp[0].type)); (yyval.ifref)->attrs = (yyvsp[-1].attr_list); ;} break; case 243: -#line 871 "parser.y" +#line 876 "parser.y" { (yyval.type) = get_type(RPC_FC_IP, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_DISPATCH; ;} break; case 244: -#line 872 "parser.y" +#line 877 "parser.y" { (yyval.type) = get_type(RPC_FC_IP, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_DISPATCH; ;} break; case 245: -#line 875 "parser.y" +#line 880 "parser.y" { attr_t *attrs; is_in_interface = TRUE; is_object_interface = TRUE; (yyval.type) = (yyvsp[0].type); - if ((yyval.type)->defined) error_loc("multiple definition error\n"); + check_def((yyval.type)); attrs = make_attr(ATTR_DISPINTERFACE); (yyval.type)->attrs = append_attr( check_dispiface_attrs((yyvsp[0].type)->name, (yyvsp[-1].attr_list)), attrs ); (yyval.type)->ref = find_type("IDispatch", 0); @@ -3765,27 +3770,27 @@ break; case 246: -#line 889 "parser.y" +#line 894 "parser.y" { (yyval.var_list) = NULL; ;} break; case 247: -#line 890 "parser.y" +#line 895 "parser.y" { (yyval.var_list) = append_var( (yyvsp[-2].var_list), (yyvsp[-1].var) ); ;} break; case 248: -#line 893 "parser.y" +#line 898 "parser.y" { (yyval.func_list) = NULL; ;} break; case 249: -#line 894 "parser.y" +#line 899 "parser.y" { (yyval.func_list) = append_func( (yyvsp[-2].func_list), (yyvsp[-1].func) ); ;} break; case 250: -#line 900 "parser.y" +#line 905 "parser.y" { (yyval.type) = (yyvsp[-4].type); (yyval.type)->fields_or_args = (yyvsp[-2].var_list); (yyval.type)->funcs = (yyvsp[-1].func_list); @@ -3796,7 +3801,7 @@ break; case 251: -#line 908 "parser.y" +#line 913 "parser.y" { (yyval.type) = (yyvsp[-4].type); (yyval.type)->fields_or_args = (yyvsp[-2].type)->fields_or_args; (yyval.type)->funcs = (yyvsp[-2].type)->funcs; @@ -3807,34 +3812,34 @@ break; case 252: -#line 917 "parser.y" +#line 922 "parser.y" { (yyval.type) = NULL; ;} break; case 253: -#line 918 "parser.y" +#line 923 "parser.y" { (yyval.type) = find_type2((yyvsp[0].str), 0); ;} break; case 254: -#line 921 "parser.y" +#line 926 "parser.y" { (yyval.type) = get_type(RPC_FC_IP, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_INTERFACE; ;} break; case 255: -#line 922 "parser.y" +#line 927 "parser.y" { (yyval.type) = get_type(RPC_FC_IP, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_INTERFACE; ;} break; case 256: -#line 925 "parser.y" +#line 930 "parser.y" { (yyval.ifinfo).interface = (yyvsp[0].type); (yyval.ifinfo).old_pointer_default = pointer_default; if (is_attr((yyvsp[-1].attr_list), ATTR_POINTERDEFAULT)) pointer_default = get_attrv((yyvsp[-1].attr_list), ATTR_POINTERDEFAULT); is_object_interface = is_object((yyvsp[-1].attr_list)); is_in_interface = TRUE; - if ((yyvsp[0].type)->defined) error_loc("multiple definition error\n"); + check_def((yyvsp[0].type)); (yyvsp[0].type)->attrs = check_iface_attrs((yyvsp[0].type)->name, (yyvsp[-1].attr_list)); (yyvsp[0].type)->defined = TRUE; if (!parse_only && do_header) write_forward((yyvsp[0].type)); @@ -3842,7 +3847,7 @@ break; case 257: -#line 939 "parser.y" +#line 944 "parser.y" { (yyval.type) = (yyvsp[-5].ifinfo).interface; (yyval.type)->ref = (yyvsp[-4].type); (yyval.type)->funcs = (yyvsp[-2].func_list); @@ -3857,7 +3862,7 @@ break; case 258: -#line 954 "parser.y" +#line 959 "parser.y" { (yyval.type) = (yyvsp[-7].ifinfo).interface; (yyval.type)->ref = find_type2((yyvsp[-5].str), 0); if (!(yyval.type)->ref) error_loc("base class '%s' not found in import\n", (yyvsp[-5].str)); @@ -3872,39 +3877,39 @@ break; case 259: -#line 965 "parser.y" +#line 970 "parser.y" { (yyval.type) = (yyvsp[-1].type); ;} break; case 260: -#line 969 "parser.y" +#line 974 "parser.y" { (yyval.type) = (yyvsp[-1].type); if (!parse_only && do_header) write_forward((yyval.type)); ;} break; case 261: -#line 970 "parser.y" +#line 975 "parser.y" { (yyval.type) = (yyvsp[-1].type); if (!parse_only && do_header) write_forward((yyval.type)); ;} break; case 262: -#line 973 "parser.y" +#line 978 "parser.y" { (yyval.type) = make_type(0, NULL); (yyval.type)->name = (yyvsp[0].str); (yyval.type)->kind = TKIND_MODULE; ;} break; case 263: -#line 974 "parser.y" +#line 979 "parser.y" { (yyval.type) = make_type(0, NULL); (yyval.type)->name = (yyvsp[0].str); (yyval.type)->kind = TKIND_MODULE; ;} break; case 264: -#line 977 "parser.y" +#line 982 "parser.y" { (yyval.type) = (yyvsp[0].type); (yyval.type)->attrs = check_module_attrs((yyvsp[0].type)->name, (yyvsp[-1].attr_list)); ;} break; case 265: -#line 983 "parser.y" +#line 988 "parser.y" { (yyval.type) = (yyvsp[-4].type); (yyval.type)->funcs = (yyvsp[-2].func_list); /* FIXME: if (!parse_only && do_header) write_module($$); */ @@ -3912,97 +3917,97 @@ break; case 266: -#line 990 "parser.y" +#line 995 "parser.y" { (yyval.stgclass) = STG_EXTERN; ;} break; case 267: -#line 991 "parser.y" +#line 996 "parser.y" { (yyval.stgclass) = STG_STATIC; ;} break; case 268: -#line 992 "parser.y" +#line 997 "parser.y" { (yyval.stgclass) = STG_REGISTER; ;} break; case 269: -#line 996 "parser.y" +#line 1001 "parser.y" { (yyval.attr) = make_attr(ATTR_INLINE); ;} break; case 270: -#line 1000 "parser.y" +#line 1005 "parser.y" { (yyval.attr) = make_attr(ATTR_CONST); ;} break; case 271: -#line 1003 "parser.y" +#line 1008 "parser.y" { (yyval.attr_list) = NULL; ;} break; case 272: -#line 1004 "parser.y" +#line 1009 "parser.y" { (yyval.attr_list) = append_attr((yyvsp[-1].attr_list), (yyvsp[0].attr)); ;} break; case 273: -#line 1007 "parser.y" +#line 1012 "parser.y" { (yyval.declspec) = make_decl_spec((yyvsp[-1].type), (yyvsp[0].declspec), NULL, NULL, STG_NONE); ;} break; case 274: -#line 1009 "parser.y" +#line 1014 "parser.y" { (yyval.declspec) = make_decl_spec((yyvsp[-1].type), (yyvsp[-2].declspec), (yyvsp[0].declspec), NULL, STG_NONE); ;} break; case 275: -#line 1012 "parser.y" +#line 1017 "parser.y" { (yyval.declspec) = NULL; ;} break; case 277: -#line 1017 "parser.y" +#line 1022 "parser.y" { (yyval.declspec) = make_decl_spec(NULL, (yyvsp[0].declspec), NULL, (yyvsp[-1].attr), STG_NONE); ;} break; case 278: -#line 1018 "parser.y" +#line 1023 "parser.y" { (yyval.declspec) = make_decl_spec(NULL, (yyvsp[0].declspec), NULL, (yyvsp[-1].attr), STG_NONE); ;} break; case 279: -#line 1019 "parser.y" +#line 1024 "parser.y" { (yyval.declspec) = make_decl_spec(NULL, (yyvsp[0].declspec), NULL, NULL, (yyvsp[-1].stgclass)); ;} break; case 280: -#line 1024 "parser.y" +#line 1029 "parser.y" { (yyval.declarator) = (yyvsp[0].declarator); (yyval.declarator)->type = append_ptrchain_type((yyval.declarator)->type, make_pointer_type(NULL, (yyvsp[-1].attr_list))); ;} break; case 281: -#line 1025 "parser.y" +#line 1030 "parser.y" { (yyval.declarator) = (yyvsp[0].declarator); (yyval.declarator)->type->attrs = append_attr((yyval.declarator)->type->attrs, make_attrp(ATTR_CALLCONV, (yyvsp[-1].str))); ;} break; case 283: -#line 1030 "parser.y" +#line 1035 "parser.y" { (yyval.declarator) = make_declarator((yyvsp[0].var)); ;} break; case 284: -#line 1031 "parser.y" +#line 1036 "parser.y" { (yyval.declarator) = (yyvsp[-1].declarator); ;} break; case 285: -#line 1032 "parser.y" +#line 1037 "parser.y" { (yyval.declarator) = (yyvsp[-1].declarator); (yyval.declarator)->array = append_array((yyval.declarator)->array, (yyvsp[0].expr)); ;} break; case 286: -#line 1033 "parser.y" +#line 1038 "parser.y" { (yyval.declarator) = (yyvsp[-3].declarator); (yyval.declarator)->func_type = append_ptrchain_type((yyval.declarator)->type, make_func_type((yyvsp[-1].var_list))); (yyval.declarator)->type = NULL; @@ -4010,44 +4015,45 @@ break; case 287: -#line 1040 "parser.y" +#line 1045 "parser.y" { (yyval.declarator_list) = append_declarator( NULL, (yyvsp[0].declarator) ); ;} break; case 288: -#line 1041 "parser.y" +#line 1046 "parser.y" { (yyval.declarator_list) = append_declarator( (yyvsp[-2].declarator_list), (yyvsp[0].declarator) ); ;} break; case 289: -#line 1045 "parser.y" +#line 1050 "parser.y" { (yyval.declarator) = (yyvsp[0].declarator); ;} break; case 290: -#line 1046 "parser.y" +#line 1051 "parser.y" { (yyval.declarator) = (yyvsp[-2].declarator); (yyvsp[-2].declarator)->var->eval = (yyvsp[0].expr); ;} break; case 291: -#line 1050 "parser.y" +#line 1055 "parser.y" { (yyval.num) = RPC_FC_RP; ;} break; case 292: -#line 1051 "parser.y" +#line 1056 "parser.y" { (yyval.num) = RPC_FC_UP; ;} break; case 293: -#line 1052 "parser.y" +#line 1057 "parser.y" { (yyval.num) = RPC_FC_FP; ;} break; case 294: -#line 1055 "parser.y" +#line 1060 "parser.y" { (yyval.type) = get_typev(RPC_FC_STRUCT, (yyvsp[-3].var), tsSTRUCT); /* overwrite RPC_FC_STRUCT with a more exact type */ + check_def((yyval.type)); (yyval.type)->type = get_struct_type( (yyvsp[-1].var_list) ); (yyval.type)->kind = TKIND_RECORD; (yyval.type)->fields_or_args = (yyvsp[-1].var_list); @@ -4058,65 +4064,66 @@ break; case 295: -#line 1066 "parser.y" +#line 1072 "parser.y" { (yyval.type) = duptype(find_type("void", 0), 1); ;} break; case 296: -#line 1067 "parser.y" +#line 1073 "parser.y" { (yyval.type) = find_type((yyvsp[0].str), 0); ;} break; case 297: -#line 1068 "parser.y" +#line 1074 "parser.y" { (yyval.type) = (yyvsp[0].type); ;} break; case 298: -#line 1069 "parser.y" +#line 1075 "parser.y" { (yyval.type) = (yyvsp[0].type); ;} break; case 299: -#line 1070 "parser.y" +#line 1076 "parser.y" { (yyval.type) = find_type2((yyvsp[0].str), tsENUM); ;} break; case 300: -#line 1071 "parser.y" +#line 1077 "parser.y" { (yyval.type) = (yyvsp[0].type); ;} break; case 301: -#line 1072 "parser.y" +#line 1078 "parser.y" { (yyval.type) = get_type(RPC_FC_STRUCT, (yyvsp[0].str), tsSTRUCT); ;} break; case 302: -#line 1073 "parser.y" +#line 1079 "parser.y" { (yyval.type) = (yyvsp[0].type); ;} break; case 303: -#line 1074 "parser.y" +#line 1080 "parser.y" { (yyval.type) = find_type2((yyvsp[0].str), tsUNION); ;} break; case 304: -#line 1075 "parser.y" +#line 1081 "parser.y" { (yyval.type) = make_safearray((yyvsp[-1].type)); ;} break; case 305: -#line 1079 "parser.y" +#line 1085 "parser.y" { reg_typedefs((yyvsp[-1].declspec), (yyvsp[0].declarator_list), check_typedef_attrs((yyvsp[-2].attr_list))); (yyval.statement) = process_typedefs((yyvsp[0].declarator_list)); ;} break; case 306: -#line 1085 "parser.y" +#line 1091 "parser.y" { (yyval.type) = get_typev(RPC_FC_NON_ENCAPSULATED_UNION, (yyvsp[-3].var), tsUNION); + check_def((yyval.type)); (yyval.type)->kind = TKIND_UNION; (yyval.type)->fields_or_args = (yyvsp[-1].var_list); (yyval.type)->defined = TRUE; @@ -4124,9 +4131,10 @@ break; case 307: -#line 1092 "parser.y" +#line 1099 "parser.y" { var_t *u = (yyvsp[-3].var); (yyval.type) = get_typev(RPC_FC_ENCAPSULATED_UNION, (yyvsp[-8].var), tsUNION); + check_def((yyval.type)); (yyval.type)->kind = TKIND_UNION; if (!u) u = make_var( xstrdup("tagged_union") ); u->type = make_type(RPC_FC_NON_ENCAPSULATED_UNION, NULL); @@ -4140,12 +4148,12 @@ break; case 308: -#line 1107 "parser.y" +#line 1115 "parser.y" { (yyval.num) = MAKEVERSION((yyvsp[0].num), 0); ;} break; case 309: -#line 1108 "parser.y" +#line 1116 "parser.y" { (yyval.num) = MAKEVERSION((yyvsp[-2].num), (yyvsp[0].num)); ;} break; @@ -4154,7 +4162,7 @@ } /* Line 1126 of yacc.c. */ -#line 4158 "parser.tab.c" +#line 4166 "parser.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -4422,7 +4430,7 @@ } -#line 1111 "parser.y" +#line 1119 "parser.y" static void decl_builtin(const char *name, unsigned char type) @@ -4699,6 +4707,7 @@ t->tfswrite = FALSE; t->checked = FALSE; t->typelib_idx = -1; + init_loc_info(&t->loc_info); return t; } @@ -5010,9 +5019,7 @@ v->attrs = NULL; v->eval = NULL; v->stgclass = STG_NONE; - v->loc_info.input_name = input_name ? input_name : "stdin"; - v->loc_info.line_number = line_number; - v->loc_info.near_text = parser_text; + init_loc_info(&v->loc_info); return v; } @@ -5202,6 +5209,12 @@ if (name->name) { type_t *cur; + + cur = find_type_helper(name->name, 0); + if (cur) + error_loc("%s: redefinition error; original definition was at %s:%d\n", + cur->name, cur->loc_info.input_name, + cur->loc_info.line_number); /* set the attributes to allow set_type to do some checks on them */ name->attrs = attrs; @@ -6206,3 +6219,17 @@ return list; } +void init_loc_info(loc_info_t *i) +{ + i->input_name = input_name ? input_name : "stdin"; + i->line_number = line_number; + i->near_text = parser_text; +} + +static void check_def(const type_t *t) +{ + if (t->defined) + error_loc("%s: redefinition error; original definition was at %s:%d\n", + t->name, t->loc_info.input_name, t->loc_info.line_number); +} + Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.tab.h [iso-8859-1] Tue Dec 2 13:17:32 2008 @@ -335,7 +335,7 @@ #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 177 "parser.y" +#line 179 "parser.y" typedef union YYSTYPE { attr_t *attr; attr_list_t *attr_list; Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37… ============================================================================== --- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Tue Dec 2 13:17:32 2008 @@ -156,6 +156,8 @@ static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(func_t *func); +static type_t *find_type_helper(const char *name, int t); +static void check_def(const type_t *t); static statement_t *make_statement(enum statement_type type); static statement_t *make_statement_type_decl(type_t *type); @@ -839,12 +841,15 @@ coclass: tCOCLASS aIDENTIFIER { $$ = make_class($2); } | tCOCLASS aKNOWNTYPE { $$ = find_type($2, 0); - if ($$->defined) error_loc("multiple definition error\n"); - if ($$->kind != TKIND_COCLASS) error_loc("%s was not declared a coclass\n", $2); + if ($$->kind != TKIND_COCLASS) + error_loc("%s was not declared a coclass at %s:%d\n", + $2, $$->loc_info.input_name, + $$->loc_info.line_number); } ; coclasshdr: attributes coclass { $$ = $2; + check_def($$); $$->attrs = check_coclass_attrs($2->name, $1); if (!parse_only && do_header) write_coclass($$); @@ -876,7 +881,7 @@ is_in_interface = TRUE; is_object_interface = TRUE; $$ = $2; - if ($$->defined) error_loc("multiple definition error\n"); + check_def($$); attrs = make_attr(ATTR_DISPINTERFACE); $$->attrs = append_attr( check_dispiface_attrs($2->name, $1), attrs ); $$->ref = find_type("IDispatch", 0); @@ -928,7 +933,7 @@ pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); is_object_interface = is_object($1); is_in_interface = TRUE; - if ($2->defined) error_loc("multiple definition error\n"); + check_def($2); $2->attrs = check_iface_attrs($2->name, $1); $2->defined = TRUE; if (!parse_only && do_header) write_forward($2); @@ -1054,6 +1059,7 @@ structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, tsSTRUCT); /* overwrite RPC_FC_STRUCT with a more exact type */ + check_def($$); $$->type = get_struct_type( $4 ); $$->kind = TKIND_RECORD; $$->fields_or_args = $4; @@ -1083,6 +1089,7 @@ uniondef: tUNION t_ident '{' ne_union_fields '}' { $$ = get_typev(RPC_FC_NON_ENCAPSULATED_UNION, $2, tsUNION); + check_def($$); $$->kind = TKIND_UNION; $$->fields_or_args = $4; $$->defined = TRUE; @@ -1091,6 +1098,7 @@ tSWITCH '(' s_field ')' m_ident '{' cases '}' { var_t *u = $7; $$ = get_typev(RPC_FC_ENCAPSULATED_UNION, $2, tsUNION); + check_def($$); $$->kind = TKIND_UNION; if (!u) u = make_var( xstrdup("tagged_union") ); u->type = make_type(RPC_FC_NON_ENCAPSULATED_UNION, NULL); @@ -1384,6 +1392,7 @@ t->tfswrite = FALSE; t->checked = FALSE; t->typelib_idx = -1; + init_loc_info(&t->loc_info); return t; } @@ -1695,9 +1704,7 @@ v->attrs = NULL; v->eval = NULL; v->stgclass = STG_NONE; - v->loc_info.input_name = input_name ? input_name : "stdin"; - v->loc_info.line_number = line_number; - v->loc_info.near_text = parser_text; + init_loc_info(&v->loc_info); return v; } @@ -1887,6 +1894,12 @@ if (name->name) { type_t *cur; + + cur = find_type_helper(name->name, 0); + if (cur) + error_loc("%s: redefinition error; original definition was at %s:%d\n", + cur->name, cur->loc_info.input_name, + cur->loc_info.line_number); /* set the attributes to allow set_type to do some checks on them */ name->attrs = attrs; @@ -2890,3 +2903,17 @@ } return list; } + +void init_loc_info(loc_info_t *i) +{ + i->input_name = input_name ? input_name : "stdin"; + i->line_number = line_number; + i->near_text = parser_text; +} + +static void check_def(const type_t *t) +{ + if (t->defined) + error_loc("%s: redefinition error; original definition was at %s:%d\n", + t->name, t->loc_info.input_name, t->loc_info.line_number); +} Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typelib.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typelib.c [iso-8859-1] Tue Dec 2 13:17:32 2008 @@ -69,6 +69,7 @@ a->kind = TKIND_ALIAS; a->attrs = NULL; a->declarray = FALSE; + init_loc_info(&a->loc_info); return a; } Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… ============================================================================== --- trunk/reactos/tools/widl/widltypes.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/widltypes.h [iso-8859-1] Tue Dec 2 13:17:32 2008 @@ -283,6 +283,7 @@ unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */ int typelib_idx; + loc_info_t loc_info; unsigned int declarray : 1; /* if declared as an array */ unsigned int ignore : 1; unsigned int defined : 1; @@ -419,6 +420,8 @@ type_t *find_type(const char *name, int t); type_t *make_type(unsigned char type, type_t *ref); +void init_loc_info(loc_info_t *); + static inline type_t *get_func_return_type(const func_t *func) { return func->def->type->ref;

1 0

[cfinck] 37811: Revert my changes in r37808. Reenable testing on undefined properties, they are treated as being empty now. This feature got lost when moving the <if> block parsing entirely to rbuild in r34852. Should fix the Release build properly _with_ touching rbuild :-)
by cfinck＠svn.reactos.org 02 Dec '08

02 Dec '08

Author: cfinck Date: Tue Dec 2 13:05:11 2008 New Revision: 37811 URL: http://svn.reactos.org/svn/reactos?rev=37811&view=rev Log: Revert my changes in r37808. Reenable testing on undefined properties, they are treated as being empty now. This feature got lost when moving the <if> block parsing entirely to rbuild in r34852. Should fix the Release build properly _with_ touching rbuild :-) Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/ReactOS-generic.rbuild trunk/reactos/config.template.rbuild trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=378… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Tue Dec 2 13:05:11 2008 @@ -17,10 +17,11 @@ <if property="DBG" value="1"> <define name="DBG">1</define> <define name="_SEH_ENABLE_TRACE" /> - - <if property="KDBG" value="1"> - <define name="KDBG">1</define> - </if> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="KDBG" value="1"> + <define name="KDBG">1</define> + <property name="DBG_OR_KDBG" value="true" /> </if> <include>.</include> Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Tue Dec 2 13:05:11 2008 @@ -9,10 +9,11 @@ <if property="DBG" value="1"> <define name="DBG">1</define> <define name="_SEH_ENABLE_TRACE" /> - - <if property="KDBG" value="1"> - <define name="KDBG">1</define> - </if> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="KDBG" value="1"> + <define name="KDBG">1</define> + <property name="DBG_OR_KDBG" value="true" /> </if>  Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config.template.rbuild [iso-8859-1] Tue Dec 2 13:05:11 2008 @@ -43,7 +43,7 @@  <property name="KDBG" value="1" /> Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Dec 2 13:05:11 2008 @@ -302,7 +302,7 @@ <file>kdb_keyboard.c</file> <file>kdb_serial.c</file> </if> - <if property="DBG" value="1"> + <if property="DBG_OR_KDBG" value="true"> <file>kdb_symbols.c</file> </if> </directory> Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Tue Dec 2 13:05:11 2008 @@ -745,13 +745,17 @@ name = e.GetAttribute ( "property", true ); assert( name ); const Property *property = project.LookupProperty( name->value ); - if ( !property ) - { - // Property not found - throw InvalidOperationException ( __FILE__, - __LINE__, - "Test on unknown property '%s' at %s", - name->value.c_str (), e.location.c_str () ); + const string *PropertyValue; + const string EmptyString; + + if (property) + { + PropertyValue = &property->value; + } + else + { + // Property does not exist, treat it as being empty + PropertyValue = &EmptyString; } const XMLAttribute* value; @@ -759,7 +763,7 @@ assert( value ); bool negate = ( e.name == "ifnot" ); - bool equality = ( property->value == value->value ); + bool equality = ( *PropertyValue == value->value ); if ( equality == negate ) { // Failed, skip this element Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] Tue Dec 2 13:05:11 2008 @@ -399,13 +399,17 @@ name = e.GetAttribute ( "property", true ); assert( name ); const Property *property = LookupProperty( name->value ); - if ( !property ) - { - // Property not found - throw InvalidOperationException ( __FILE__, - __LINE__, - "Test on unknown property '%s' at %s", - name->value.c_str (), e.location.c_str () ); + const string *PropertyValue; + const string EmptyString; + + if (property) + { + PropertyValue = &property->value; + } + else + { + // Property does not exist, treat it as being empty + PropertyValue = &EmptyString; } const XMLAttribute* value; @@ -413,7 +417,7 @@ assert( value ); bool negate = ( e.name == "ifnot" ); - bool equality = ( property->value == value->value ); + bool equality = ( *PropertyValue == value->value ); if ( equality == negate ) { // Failed, skip this element

1 0

[khornicek] 37810: - don't set DDCAPS2_CERTIFIED, ddraw refuses to believe us
by khornicek＠svn.reactos.org 02 Dec '08

02 Dec '08

Author: khornicek Date: Tue Dec 2 10:04:56 2008 New Revision: 37810 URL: http://svn.reactos.org/svn/reactos?rev=37810&view=rev Log: - don't set DDCAPS2_CERTIFIED, ddraw refuses to believe us Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Tue Dec 2 10:04:56 2008 @@ -1972,8 +1972,7 @@ DDCAPS_3D; /* See msdn what pHalInfo->ddCaps.dwCaps2 does not support */ - pHalInfo->ddCaps.dwCaps2 = DDCAPS2_CERTIFIED | - DDCAPS2_NOPAGELOCKREQUIRED | + pHalInfo->ddCaps.dwCaps2 = DDCAPS2_NOPAGELOCKREQUIRED | DDCAPS2_PRIMARYGAMMA | DDCAPS2_WIDESURFACES | DDCAPS2_CANRENDERWINDOWED;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs