Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[arty] 22593: Add ARCH=powerpc, for initial build.

by arty＠svn.reactos.org

Author: arty Date: Sun Jun 25 01:52:03 2006 New Revision: 22593 URL: http://svn.reactos.org/svn/reactos?rev=22593&view=rev Log: Add ARCH=powerpc, for initial build. Modified: branches/powerpc/reactos/tools/ppc.lost+found/pmake Modified: branches/powerpc/reactos/tools/ppc.lost+found/pmake URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/pmake (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/pmake Sun Jun 25 01:52:03 2006 @@ -2,6 +2,7 @@ export PATH=$PATH:/usr/local/pkg/reactos-powerpc/bin make \ + ARCH=powerpc \ HOST=mingw32-linux \ ROS_INTERMEDIATE=obj-ppc \ ROS_OUTPUT=output-ppc \

18 years, 4 months

[arty] 22592: ReactOS PowerPC WIP. This will be edited and merged, and likely shrunk. Hacks will be removed and indeed your favorite assembly snippet will eventually not be just 'blr', so please *don't panic*.

by arty＠svn.reactos.org

Author: arty Date: Sun Jun 25 01:34:12 2006 New Revision: 22592 URL: http://svn.reactos.org/svn/reactos?rev=22592&view=rev Log: ReactOS PowerPC WIP. This will be edited and merged, and likely shrunk. Hacks will be removed and indeed your favorite assembly snippet will eventually not be just 'blr', so please *don't panic*. Modified: branches/powerpc/reactos/Makefile branches/powerpc/reactos/ReactOS-ppc.rbuild branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/powerpc/reactos/boot/freeldr/freeldr/drivemap.c branches/powerpc/reactos/boot/freeldr/freeldr/include/freeldr.h branches/powerpc/reactos/hal/hal/hal.c branches/powerpc/reactos/include/ddk/ndis.h branches/powerpc/reactos/include/ddk/winddk.h branches/powerpc/reactos/include/ndk/mmtypes.h branches/powerpc/reactos/include/ndk/powerpc/ketypes.h branches/powerpc/reactos/include/ndk/pstypes.h branches/powerpc/reactos/include/reactos/debug.h branches/powerpc/reactos/include/reactos/elf/machine.h branches/powerpc/reactos/include/reactos/libs/pseh/setjmp.h branches/powerpc/reactos/include/reactos/probe.h branches/powerpc/reactos/include/winnt.h branches/powerpc/reactos/lib/kjs/ksrc/longjmp.S branches/powerpc/reactos/lib/kjs/ksrc/setjmp.S branches/powerpc/reactos/lib/pseh/pseh.rbuild branches/powerpc/reactos/lib/rossym/find.c branches/powerpc/reactos/lib/rtl/heap.c branches/powerpc/reactos/lib/rtl/nls.c branches/powerpc/reactos/ntoskrnl/ex/init.c branches/powerpc/reactos/ntoskrnl/ex/power.c branches/powerpc/reactos/ntoskrnl/ex/sysinfo.c branches/powerpc/reactos/ntoskrnl/include/internal/arch/ke.h branches/powerpc/reactos/ntoskrnl/include/internal/arch/mm.h branches/powerpc/reactos/ntoskrnl/include/internal/arch/ps.h branches/powerpc/reactos/ntoskrnl/include/internal/ex.h branches/powerpc/reactos/ntoskrnl/include/internal/ntoskrnl.h branches/powerpc/reactos/ntoskrnl/include/internal/powerpc/ke.h branches/powerpc/reactos/ntoskrnl/io/pnpmgr.c branches/powerpc/reactos/ntoskrnl/kd/kdmain.c branches/powerpc/reactos/ntoskrnl/kd/wrappers/gdbstub.c branches/powerpc/reactos/ntoskrnl/ke/apc.c branches/powerpc/reactos/ntoskrnl/ke/bug.c branches/powerpc/reactos/ntoskrnl/ke/clock.c branches/powerpc/reactos/ntoskrnl/ke/dpc.c branches/powerpc/reactos/ntoskrnl/ke/ipi.c branches/powerpc/reactos/ntoskrnl/ke/kthread.c branches/powerpc/reactos/ntoskrnl/ke/main.c branches/powerpc/reactos/ntoskrnl/ke/process.c branches/powerpc/reactos/ntoskrnl/ke/profile.c branches/powerpc/reactos/ntoskrnl/mm/pagefile.c branches/powerpc/reactos/ntoskrnl/ntoskrnl.def branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild branches/powerpc/reactos/ntoskrnl/ps/debug.c branches/powerpc/reactos/ntoskrnl/ps/idle.c branches/powerpc/reactos/ntoskrnl/ps/psmgr.c Modified: branches/powerpc/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/Makefile?rev=22… ============================================================================== --- branches/powerpc/reactos/Makefile (original) +++ branches/powerpc/reactos/Makefile Sun Jun 25 01:34:12 2006 @@ -376,7 +376,13 @@ $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw -world: all bootcd livecd +world: all + $(MAKE) KDBG=$(KDBG) DBG=$(DBG) \ + ROS_AUTOMAKE=$(ROS_AUTOMAKE) \ + ROS_INSTALL=$(ROS_INSTALL) \ + ROS_INTERMEDIATE=$(ROS_INTERMEDIATE) \ + ROS_OUTPUT=$(ROS_OUTPUT) \ + bootcd livecd universe: $(MAKE) KDBG=1 DBG=1 \ Modified: branches/powerpc/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ReactOS-ppc.rbu… ============================================================================== --- branches/powerpc/reactos/ReactOS-ppc.rbuild (original) +++ branches/powerpc/reactos/ReactOS-ppc.rbuild Sun Jun 25 01:34:12 2006 @@ -18,14 +18,14 @@ <define name="_PPC_" /> <define name="__PowerPC__" /> <define name="_REACTOS_" /> - <define name="__MINGW_IMPORT" empty="true" /> + <define name="__MINGW_IMPORT">extern</define> <define name="stdcall" empty="true" /> <define name="__stdcall__" empty="true" /> <define name="fastcall" empty="true" /> <define name="cdecl" empty="true" /> <define name="__cdecl__" empty="true" /> <define name="dllimport" empty="true" /> - <compilerflag>-v</compilerflag> + <define name="WORDS_BIGENDIAN" empty="true" /> <if property="MP" value="1"> <define name="CONFIG_SMP" value="1" /> </if> @@ -41,18 +41,15 @@ <define name="KDBG" value="1" /> <property name="DBG_OR_KDBG" value="true" /> </if> - <compilerflag>-Wpointer-arith</compilerflag> <include>.</include> <include>include</include> - <include>include/reactos</include> - <include>include/libs</include> - <include>include/drivers</include> - <include>include/subsys</include> - <include>include/ndk</include> - <include>include</include> <include>include/crt</include> <include>include/ddk</include> + <include>include/GL</include> + <include>include/ndk</include> + <include>include/reactos</include> + <include>include/reactos/libs</include> <directory name="base"> <xi:include href="base/base.rbuild" /> Modified: branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/bo… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s (original) +++ branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s Sun Jun 25 01:34:12 2006 @@ -6,6 +6,7 @@ .long 0 .long 0 + .globl _begin _begin: sync isync @@ -19,16 +20,18 @@ mtmsr %r0 isync - bl setup_bats - - li %r8,0x3030 - mtmsr %r8 - /* Store ofw call addr */ mr %r21,%r5 lis %r10,0xe00000@ha stw %r5,ofw_call_addr - _start@l(%r10) + bl setup_bats + + li %r8,0x3030 + mtmsr %r8 + + bl ofw_print_regs + lis %r4,_binary_freeldr_tmp_end@ha addi %r4,%r4,_binary_freeldr_tmp_end@l lis %r3,_binary_freeldr_tmp_start@ha @@ -61,7 +64,7 @@ lis %r3,call_ofw@ha addi %r3,%r3,call_ofw - _start - b call_freeldr + blr /* * lifted from ppc/boot/openfirmware/misc.S Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Sun Jun 25 01:34:12 2006 @@ -11,6 +11,11 @@ #define NDEBUG #include <debug.h> + +int xstrnicmp( const char *a, const char *b, int n ) { + while( n-- && *a && (*a++ == *b++) ); + return *a - *b; +} /* Base Addres of Kernel in Physical Memory */ #define KERNEL_BASE_PHYS 0x200000 @@ -131,7 +136,7 @@ while ((p = strchr(p, '/')) != NULL) { /* Find "/3GB" */ - if (!strnicmp(p + 1, "3GB", 3)) { + if (!xstrnicmp(p + 1, "3GB", 3)) { /* Make sure there's nothing following it */ if (p[4] == ' ' || p[4] == 0) { Modified: branches/powerpc/reactos/boot/freeldr/freeldr/drivemap.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/drivemap.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/drivemap.c Sun Jun 25 01:34:12 2006 @@ -171,6 +171,7 @@ VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap) { +#ifdef _M_IX86 ULONG* RealModeIVT = (ULONG*)0x00000000; USHORT* BiosLowMemorySize = (USHORT*)0x00000413; @@ -202,6 +203,7 @@ RealModeIVT[0x13] = DriveMapHandlerSegOff; CacheInvalidateCacheData(); +#endif DriveMapInstalled = TRUE; } Modified: branches/powerpc/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/include/freeldr.h (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/include/freeldr.h Sun Jun 25 01:34:12 2006 @@ -61,6 +61,8 @@ #include <arch/i386/machpc.h> #include <arch/i386/machxbox.h> #include <internal/i386/ke.h> +#elif defined(_PPC_) +#include <arch/powerpc/compat.h> #endif /* misc files */ #include <keycodes.h> Modified: branches/powerpc/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/hal/hal.c?r… ============================================================================== --- branches/powerpc/reactos/hal/hal/hal.c (original) +++ branches/powerpc/reactos/hal/hal/hal.c Sun Jun 25 01:34:12 2006 @@ -836,13 +836,14 @@ } #undef KeRaiseIrql -VOID -NTAPI +NTOSAPI +KIRQL +DDKAPI KeRaiseIrql( - KIRQL NewIrql, - PKIRQL OldIrql) -{ - UNIMPLEMENTED; + IN KIRQL NewIrql) +{ + UNIMPLEMENTED; + return 0; } Modified: branches/powerpc/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/ddk/ndi… ============================================================================== --- branches/powerpc/reactos/include/ddk/ndis.h (original) +++ branches/powerpc/reactos/include/ddk/ndis.h Sun Jun 25 01:34:12 2006 @@ -4125,7 +4125,6 @@ BOOLEAN Removing; KEVENT DpcsCompletedEvent; } NDIS_INTERRUPT, *PNDIS_INTERRUPT; - typedef enum _NDIS_WORK_ITEM_TYPE { NdisWorkItemRequest, Modified: branches/powerpc/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/ddk/win… ============================================================================== --- branches/powerpc/reactos/include/ddk/winddk.h (original) +++ branches/powerpc/reactos/include/ddk/winddk.h Sun Jun 25 01:34:12 2006 @@ -5268,9 +5268,189 @@ #define KeGetDcacheFillSize() 1L +#elif defined(_PPC_) + +typedef ULONG PFN_NUMBER, *PPFN_NUMBER; + +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define PROFILE_LEVEL 27 +#define CLOCK1_LEVEL 28 +#define CLOCK2_LEVEL 28 +#define IPI_LEVEL 29 +#define SYNCH_LEVEL (IPI_LEVEL-1) +#define POWER_LEVEL 30 +#define HIGH_LEVEL 31 + +extern NTOSAPI PVOID MmHighestUserAddress; +extern NTOSAPI PVOID MmSystemRangeStart; +extern NTOSAPI ULONG_PTR MmUserProbeAddress; + +#define MM_HIGHEST_USER_ADDRESS MmHighestUserAddress +#define MM_SYSTEM_RANGE_START MmSystemRangeStart +#define MM_USER_PROBE_ADDRESS MmUserProbeAddress +#define MM_LOWEST_USER_ADDRESS (PVOID)0x10000 +#define MM_LOWEST_SYSTEM_ADDRESS (PVOID)0xC0C00000 + +#define KI_USER_SHARED_DATA 0xffdf0000 +#define SharedUserData ((KUSER_SHARED_DATA * CONST) KI_USER_SHARED_DATA) + +#define EFLAG_SIGN 0x8000 +#define EFLAG_ZERO 0x4000 +#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) + +#define RESULT_NEGATIVE ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) +#define RESULT_ZERO ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT) +#define RESULT_POSITIVE ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) + +typedef struct _KPCR_TIB { + PVOID ExceptionList; /* 00 */ + PVOID StackBase; /* 04 */ + PVOID StackLimit; /* 08 */ + PVOID SubSystemTib; /* 0C */ + _ANONYMOUS_UNION union { + PVOID FiberData; /* 10 */ + DWORD Version; /* 10 */ + } DUMMYUNIONNAME; + PVOID ArbitraryUserPointer; /* 14 */ + struct _KPCR_TIB *Self; /* 18 */ +} KPCR_TIB, *PKPCR_TIB; /* 1C */ + +#define PCR_MINOR_VERSION 1 +#define PCR_MAJOR_VERSION 1 + +typedef struct _KPCR { + KPCR_TIB Tib; /* 00 */ + struct _KPCR *Self; /* 1C */ + struct _KPRCB *Prcb; /* 20 */ + KIRQL Irql; /* 24 */ + ULONG IRR; /* 28 */ + ULONG IrrActive; /* 2C */ + ULONG IDR; /* 30 */ + PVOID KdVersionBlock; /* 34 */ + PUSHORT IDT; /* 38 */ + PUSHORT GDT; /* 3C */ + struct _KTSS *TSS; /* 40 */ + USHORT MajorVersion; /* 44 */ + USHORT MinorVersion; /* 46 */ + KAFFINITY SetMember; /* 48 */ + ULONG StallScaleFactor; /* 4C */ + UCHAR SpareUnused; /* 50 */ + UCHAR Number; /* 51 */ +} KPCR, *PKPCR; /* 54 */ + +#if !defined(__INTERLOCKED_DECLARED) +#define __INTERLOCKED_DECLARED + +NTOSAPI +LONG +DDKFASTAPI +InterlockedIncrement( + IN PLONG VOLATILE Addend); + +NTOSAPI +LONG +DDKFASTAPI +InterlockedDecrement( + IN PLONG VOLATILE Addend); + +NTOSAPI +LONG +DDKFASTAPI +InterlockedCompareExchange( + IN OUT PLONG VOLATILE Destination, + IN LONG Exchange, + IN LONG Comparand); + +NTOSAPI +LONG +DDKFASTAPI +InterlockedExchange( + IN OUT PLONG VOLATILE Target, + IN LONG Value); + +NTOSAPI +LONG +DDKFASTAPI +InterlockedExchangeAdd( + IN OUT PLONG VOLATILE Addend, + IN LONG Value); + +/* + * PVOID + * InterlockedExchangePointer( + * IN OUT PVOID VOLATILE *Target, + * IN PVOID Value) + */ +#define InterlockedExchangePointer(Target, Value) \ + ((PVOID) InterlockedExchange((PLONG) Target, (LONG) Value)) + +/* + * PVOID + * InterlockedCompareExchangePointer( + * IN OUT PVOID *Destination, + * IN PVOID Exchange, + * IN PVOID Comparand) + */ +#define InterlockedCompareExchangePointer(Destination, Exchange, Comparand) \ + ((PVOID) InterlockedCompareExchange((PLONG) Destination, (LONG) Exchange, (LONG) Comparand)) + +#endif /* !__INTERLOCKED_DECLARED */ + +NTOSAPI +VOID +DDKFASTAPI +KefAcquireSpinLockAtDpcLevel( + IN PKSPIN_LOCK SpinLock); + +NTOSAPI +VOID +DDKFASTAPI +KefReleaseSpinLockFromDpcLevel( + IN PKSPIN_LOCK SpinLock); + +NTHALAPI +KIRQL +DDKFASTAPI +KfAcquireSpinLock( + IN PKSPIN_LOCK SpinLock); + +NTHALAPI +VOID +DDKFASTAPI +KfReleaseSpinLock( + IN PKSPIN_LOCK SpinLock, + IN KIRQL NewIrql); + +#define KeAcquireSpinLockAtDpcLevel(SpinLock) KefAcquireSpinLockAtDpcLevel(SpinLock) +#define KeReleaseSpinLockFromDpcLevel(SpinLock) KefReleaseSpinLockFromDpcLevel(SpinLock) +#define KeAcquireSpinLock(a,b) *(b) = KfAcquireSpinLock(a) +#define KeReleaseSpinLock(a,b) KfReleaseSpinLock(a,b) + +#define RtlCopyMemoryNonTemporal RtlCopyMemory + +#define KeGetDcacheFillSize() 1L + +typedef enum _INTERLOCKED_RESULT { + ResultNegative = -1, + ResultZero = 0, + ResultPositive = 1 +} INTERLOCKED_RESULT; + +typedef struct _KFLOATING_SAVE { + ULONG Fr[32]; +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +static __inline +ULONG +DDKAPI +KeGetCurrentProcessorNumber(VOID) +{ + return 0; // XXX arty fixme +} #endif /* _X86_ */ - - /* ** Utillity functions @@ -8653,6 +8833,15 @@ #endif } +#elif defined(_PPC_) + +static __inline +VOID +KeMemoryBarrier( + VOID) +{ +} + #endif NTOSAPI @@ -8931,6 +9120,35 @@ IN PLARGE_INTEGER Timeout OPTIONAL); #if defined(_X86_) + +NTHALAPI +VOID +FASTCALL +KfLowerIrql( + IN KIRQL NewIrql); + +NTHALAPI +KIRQL +FASTCALL +KfRaiseIrql( + IN KIRQL NewIrql); + +NTHALAPI +KIRQL +DDKAPI +KeRaiseIrqlToDpcLevel( + VOID); + +NTHALAPI +KIRQL +DDKAPI +KeRaiseIrqlToSynchLevel( + VOID); + +#define KeLowerIrql(a) KfLowerIrql(a) +#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) + +#elif defined(_PPC_) NTHALAPI VOID Modified: branches/powerpc/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/ndk/mmt… ============================================================================== --- branches/powerpc/reactos/include/ndk/mmtypes.h (original) +++ branches/powerpc/reactos/include/ndk/mmtypes.h Sun Jun 25 01:34:12 2006 @@ -207,6 +207,7 @@ // // PTE Structures // +#ifndef _M_PPC typedef struct _MMPTE { union @@ -221,6 +222,12 @@ MMPTE_LIST List; }; } MMPTE, *PMMPTE; +#else +typedef struct _MMPTE +{ + ULONG Long; +} MMPTE, *PMMPTE; +#endif // // Section Information structure Modified: branches/powerpc/reactos/include/ndk/powerpc/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/ndk/pow… ============================================================================== --- branches/powerpc/reactos/include/ndk/powerpc/ketypes.h (original) +++ branches/powerpc/reactos/include/ndk/powerpc/ketypes.h Sun Jun 25 01:34:12 2006 @@ -31,6 +31,45 @@ #define IPI_FREEZE 3 #define IPI_PACKET_READY 4 #define IPI_SYNCH_REQUEST 10 +#define MAXIMUM_VECTOR 0x100 + +#ifndef ROUND_UP +#define ROUND_UP(x,y) (((x) + ((y)-1)) & ~((y)-1)) +#endif + +typedef double DOUBLE; + +typedef struct _FX_SAVE_AREA { + ULONG Fr[32]; +} FX_SAVE_AREA; + +typedef struct _LDT_ENTRY { + USHORT LimitLow; + USHORT BaseLow; + union + { + struct + { + UCHAR BaseMid; + UCHAR Flags1; + UCHAR Flags2; + UCHAR BaseHi; + } Bytes; + struct + { + ULONG BaseMid : 8; + ULONG Type : 5; + ULONG Dpl : 2; + ULONG Pres : 1; + ULONG LimitHi : 4; + ULONG Sys : 1; + ULONG Reserved_0 : 1; + ULONG Default_Big : 1; + ULONG Granularity : 1; + ULONG BaseHi : 8; + } Bits; + } HighWord; +} LDT_ENTRY; // // Trap Frame Definition @@ -42,7 +81,7 @@ UCHAR PreviousMode; UCHAR SavedApcStateIndex; UCHAR SavedKernelApcDisable; - UCHAR ExceptionRecord[ROUND_UP(sizeof(EXCEPTION_RECORD), ULONGLONG]; + UCHAR ExceptionRecord[ROUND_UP(sizeof(EXCEPTION_RECORD), sizeof(ULONGLONG))]; ULONG FILL2; ULONG Gpr0; ULONG Gpr1; @@ -403,7 +442,8 @@ // // TSS Definition // -typedef struct _KTSS, KTSS, *PKTSS; +typedef struct _KTSS { +} KTSS, *PKTSS; // // PowerPC Exception Frame Modified: branches/powerpc/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/ndk/pst… ============================================================================== --- branches/powerpc/reactos/include/ndk/pstypes.h (original) +++ branches/powerpc/reactos/include/ndk/pstypes.h Sun Jun 25 01:34:12 2006 @@ -1117,7 +1117,11 @@ #endif union { +#ifdef _M_IX86 HARDWARE_PTE_X86 PagedirectoryPte; +#else + HARDWARE_PTE_PPC PagedirectoryPte; +#endif ULONGLONG Filler; }; ULONG Session; Modified: branches/powerpc/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… ============================================================================== --- branches/powerpc/reactos/include/reactos/debug.h (original) +++ branches/powerpc/reactos/include/reactos/debug.h Sun Jun 25 01:34:12 2006 @@ -125,7 +125,7 @@ #elif defined(_M_MIPS) #define ASM_BREAKPOINT "\nbreak\n" #else -#error Unsupported architecture. +#define ASM_BREAKPOINT "\ntwi 1\n" #endif #ifndef KEBUGCHECK Modified: branches/powerpc/reactos/include/reactos/elf/machine.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… ============================================================================== --- branches/powerpc/reactos/include/reactos/elf/machine.h (original) +++ branches/powerpc/reactos/include/reactos/elf/machine.h Sun Jun 25 01:34:12 2006 @@ -5,6 +5,10 @@ #define _REACTOS_ELF_MACHINE_IS_TARGET #include <elf/elf-i386.h> #undef _REACTOS_ELF_MACHINE_IS_TARGET +#elif defined(_M_PPC) +#define _REACTOS_ELF_MACHINE_IS_TARGET +#include <elf/elf-powerpc.h> +#undef _REACTOS_ELF_MACHINE_IS_TARGET #else #error Unsupported target architecture #endif Modified: branches/powerpc/reactos/include/reactos/libs/pseh/setjmp.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… ============================================================================== --- branches/powerpc/reactos/include/reactos/libs/pseh/setjmp.h (original) +++ branches/powerpc/reactos/include/reactos/libs/pseh/setjmp.h Sun Jun 25 01:34:12 2006 @@ -34,6 +34,13 @@ unsigned long JB_Edi; } _SEHJmpBuf_t[1]; +#elif defined(_M_PPC) +typedef struct __SEHJmpBuf +{ + unsigned long R[32]; + unsigned long LR, CTR; +} +_SEHJmpBuf_t[1]; #endif #ifdef __cplusplus Modified: branches/powerpc/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… ============================================================================== --- branches/powerpc/reactos/include/reactos/probe.h (original) +++ branches/powerpc/reactos/include/reactos/probe.h Sun Jun 25 01:34:12 2006 @@ -3,6 +3,10 @@ #if ! defined(_NTOSKRNL_) && ! defined(_WIN32K_) #error Header intended for use by NTOSKRNL/WIN32K only! +#endif + +#if defined(_M_PPC) +extern ULONG_PTR MmUserProbeAddress; #endif static const UNICODE_STRING __emptyUnicodeString = {0}; Modified: branches/powerpc/reactos/include/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/winnt.h… ============================================================================== --- branches/powerpc/reactos/include/winnt.h (original) +++ branches/powerpc/reactos/include/winnt.h Sun Jun 25 01:34:12 2006 @@ -1838,6 +1838,9 @@ DWORD Dr6; DWORD Dr7; } CONTEXT; +typedef struct _FLOATING_SAVE_AREA { + DWORD Fr[32]; +} FLOATING_SAVE_AREA; #elif defined(_ALPHA_) #define CONTEXT_ALPHA 0x20000 #define CONTEXT_CONTROL (CONTEXT_ALPHA|1L) @@ -3699,16 +3702,21 @@ static __inline__ PVOID GetCurrentFiber(void) { +#ifdef _X86_ void* ret; __asm__ __volatile__ ( "movl %%fs:0x10,%0" : "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */ ); return ret; +#elif defined(_PPC_) + return NULL; +#endif } static __inline__ struct _TEB * NtCurrentTeb(void) { +#ifdef _X86_ struct _TEB *ret; __asm__ __volatile__ ( @@ -3718,6 +3726,9 @@ ); return ret; +#elif defined(_PPC_) + return NULL; +#endif } #elif defined(__WATCOMC__) @@ -3778,13 +3789,14 @@ IN LONG Bit) { LONG OldBit; - +#ifdef _M_IX86 __asm__ __volatile__("lock " "btsl %2,%1\n\t" "sbbl %0,%0\n\t" :"=r" (OldBit),"=m" (*Base) :"Ir" (Bit) : "memory"); +#endif return OldBit; } @@ -3793,19 +3805,24 @@ IN LONG Bit) { LONG OldBit; - +#ifdef _M_IX86 __asm__ __volatile__("lock " "btrl %2,%1\n\t" "sbbl %0,%0\n\t" :"=r" (OldBit),"=m" (*Base) :"Ir" (Bit) : "memory"); +#endif return OldBit; } #endif +#ifdef _M_IX86 #define YieldProcessor() __asm__ __volatile__("pause"); +#elif defined(_M_PPC) +#define YieldProcessor() __asm__("ori 0,0,0"); +#endif #if defined(_AMD64_) #if defined(_M_AMD64) Modified: branches/powerpc/reactos/lib/kjs/ksrc/longjmp.S URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/kjs/ksrc/lo… ============================================================================== --- branches/powerpc/reactos/lib/kjs/ksrc/longjmp.S (original) +++ branches/powerpc/reactos/lib/kjs/ksrc/longjmp.S Sun Jun 25 01:34:12 2006 @@ -38,7 +38,8 @@ * return PC */ -.globl _longjmp +#ifdef _M_IX86 + .globl _longjmp _longjmp: pushl %ebp movl %esp,%ebp @@ -69,4 +70,8 @@ */ jmpl *20(%ecx) - +#else + .globl _longjmp +_longjmp: + blr +#endif Modified: branches/powerpc/reactos/lib/kjs/ksrc/setjmp.S URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/kjs/ksrc/se… ============================================================================== --- branches/powerpc/reactos/lib/kjs/ksrc/setjmp.S (original) +++ branches/powerpc/reactos/lib/kjs/ksrc/setjmp.S Sun Jun 25 01:34:12 2006 @@ -37,7 +37,8 @@ * ptr to jmp_buf * return PC */ -.globl _setjmp +#ifdef _M_IX86 + .globl _setjmp _setjmp: pushl %ebp movl %esp,%ebp @@ -56,4 +57,8 @@ xorl %eax,%eax /* return 0 the first time */ leave ret - +#else + .globl _setjmp +_setjmp: + blr +#endif Modified: branches/powerpc/reactos/lib/pseh/pseh.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/pseh/pseh.r… ============================================================================== --- branches/powerpc/reactos/lib/pseh/pseh.rbuild (original) +++ branches/powerpc/reactos/lib/pseh/pseh.rbuild Sun Jun 25 01:34:12 2006 @@ -1,8 +1,16 @@ <module name="pseh" type="staticlibrary"> <define name="__USE_W32API" /> - <directory name="i386"> - <file>framebased.asm</file> - <file>setjmp.asm</file> - </directory> + <if property='ARCH' value='i386'> + <directory name="i386"> + <file>framebased.asm</file> + <file>setjmp.asm</file> + </directory> + </if> + <if property='ARCH' value='powerpc'> + <directory name="powerpc"> + <file>framebased.s</file> + <file>setjmp.s</file> + </directory> + </if> <file>framebased.c</file> </module> Modified: branches/powerpc/reactos/lib/rossym/find.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/rossym/find… ============================================================================== --- branches/powerpc/reactos/lib/rossym/find.c (original) +++ branches/powerpc/reactos/lib/rossym/find.c Sun Jun 25 01:34:12 2006 @@ -104,7 +104,11 @@ if (RosSymInfo->Symbols == NULL || RosSymInfo->SymbolsCount == 0 || RosSymInfo->Strings == NULL || RosSymInfo->StringsLength == 0) { +#ifdef _X86_ __asm__("int $3\n"); +#elif defined(_PPC_) +__asm__("twi 0,0,0\n"); +#endif DPRINT1("Uninitialized RosSymInfo\n"); return FALSE; } Modified: branches/powerpc/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/rtl/heap.c?… ============================================================================== --- branches/powerpc/reactos/lib/rtl/heap.c (original) +++ branches/powerpc/reactos/lib/rtl/heap.c Sun Jun 25 01:34:12 2006 @@ -962,6 +962,7 @@ void DumpStackFrames ( PULONG Frame, ULONG FrameCount ) { +#ifdef _M_IX86 ULONG i=0; DbgPrint("Frames: "); @@ -983,6 +984,7 @@ DbgPrint(" "); } DbgPrint("\n"); +#endif } /*********************************************************************** Modified: branches/powerpc/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/rtl/nls.c?r… ============================================================================== --- branches/powerpc/reactos/lib/rtl/nls.c (original) +++ branches/powerpc/reactos/lib/rtl/nls.c Sun Jun 25 01:34:12 2006 @@ -365,7 +365,7 @@ DPRINT("RtlResetRtlTranslations() called\n"); /* Set ANSI data */ - NlsAnsiToUnicodeTable = NlsTable->AnsiTableInfo.MultiByteTable; + NlsAnsiToUnicodeTable = (void *)NlsTable->AnsiTableInfo.MultiByteTable; NlsUnicodeToAnsiTable = NlsTable->AnsiTableInfo.WideCharTable; NlsDbcsUnicodeToAnsiTable = (PWCHAR)NlsTable->AnsiTableInfo.WideCharTable; NlsMbCodePageTag = (NlsTable->AnsiTableInfo.DBCSCodePage != 0); @@ -374,7 +374,7 @@ DPRINT("Ansi codepage %hu\n", NlsAnsiCodePage); /* Set OEM data */ - NlsOemToUnicodeTable = NlsTable->OemTableInfo.MultiByteTable; + NlsOemToUnicodeTable = (void *)NlsTable->OemTableInfo.MultiByteTable; NlsUnicodeToOemTable = NlsTable->OemTableInfo.WideCharTable; NlsDbcsUnicodeToOemTable = (PWCHAR)NlsTable->OemTableInfo.WideCharTable; NlsMbOemCodePageTag = (NlsTable->OemTableInfo.DBCSCodePage != 0); Modified: branches/powerpc/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ex/ini… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ex/init.c (original) +++ branches/powerpc/reactos/ntoskrnl/ex/init.c Sun Jun 25 01:34:12 2006 @@ -73,7 +73,9 @@ * The shared user page has been zeroed-out right after creation. * There is NO need to do this again. */ +#ifdef _M_IX86 Ki386SetProcessorFeatures(); +#endif /* Set the Version Data */ SharedUserData->NtProductType = NtProductWinNt; @@ -238,6 +240,7 @@ STDCALL ExecuteRuntimeAsserts(VOID) { +#ifdef _M_IX86 /* * Fail at runtime if someone has changed various structures without * updating the offsets used for the assembler code. @@ -265,6 +268,7 @@ ASSERT(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0); ASSERT(FIELD_OFFSET(KTSS, IoMapBase) == KTSS_IOMAPBASE); ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); +#endif } __inline Modified: branches/powerpc/reactos/ntoskrnl/ex/power.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ex/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ex/power.c (original) +++ branches/powerpc/reactos/ntoskrnl/ex/power.c Sun Jun 25 01:34:12 2006 @@ -36,7 +36,9 @@ while (TRUE) { KfRaiseIrql(SYNCH_LEVEL); +#ifdef _M_IX86 Ke386HaltProcessor(); +#endif } } Modified: branches/powerpc/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ex/sys… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ex/sysinfo.c (original) +++ branches/powerpc/reactos/ntoskrnl/ex/sysinfo.c Sun Jun 25 01:34:12 2006 @@ -1646,8 +1646,9 @@ ) { PAGED_CODE(); - +#ifdef _M_IX86 __asm__("wbinvd\n"); +#endif return STATUS_SUCCESS; } Modified: branches/powerpc/reactos/ntoskrnl/include/internal/arch/ke.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/includ… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/include/internal/arch/ke.h (original) +++ branches/powerpc/reactos/ntoskrnl/include/internal/arch/ke.h Sun Jun 25 01:34:12 2006 @@ -21,6 +21,8 @@ #ifdef _M_IX86 #include "../i386/ke.h" +#elif defined(_M_PPC) +#include "../powerpc/ke.h" #else #error "Unknown processor" #endif Modified: branches/powerpc/reactos/ntoskrnl/include/internal/arch/mm.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/includ… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/include/internal/arch/mm.h (original) +++ branches/powerpc/reactos/ntoskrnl/include/internal/arch/mm.h Sun Jun 25 01:34:12 2006 @@ -21,6 +21,8 @@ #ifdef _M_IX86 #include <internal/i386/mm.h> +#elif defined(_M_PPC) +#include <internal/powerpc/mm.h> #else #error "Unknown processor" #endif Modified: branches/powerpc/reactos/ntoskrnl/include/internal/arch/ps.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/includ… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/include/internal/arch/ps.h (original) +++ branches/powerpc/reactos/ntoskrnl/include/internal/arch/ps.h Sun Jun 25 01:34:12 2006 @@ -4,6 +4,9 @@ #ifdef _M_IX86 #define KiArchContextSwitch KiSwapContext #define KiArchInitThreadWithContext Ke386InitThreadWithContext +#elif defined(_M_PPC) +#define KiArchContextSwitch KiSwapContext +#define KiArchInitThreadWithContext KePPCInitThreadWithContext #else #error "Unknown processor" #endif Modified: branches/powerpc/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/includ… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/include/internal/ex.h (original) +++ branches/powerpc/reactos/ntoskrnl/include/internal/ex.h Sun Jun 25 01:34:12 2006 @@ -16,6 +16,7 @@ EX_HANDLE_ENTRY_AUDITONCLOSE))) /* Note: we only use a spinlock on SMP. On UP, we cli/sti intead */ +#ifdef _M_IX86 #ifndef CONFIG_SMP #define ExAcquireResourceLock(l, i) { \ (void)i; \ @@ -25,6 +26,11 @@ #else #define ExAcquireResourceLock(l, i) KeAcquireSpinLock(l, i); #define ExReleaseResourceLock(l, i) KeReleaseSpinLock(l, i); +#endif /* CONFIG_SMP */ +#elif defined(_M_PPC) /* _M_IX86 */ +/* XXX arty fixme */ +#define ExAcquireResourceLock(l,i) KeAcquireSpinLock(l,i); +#define ExReleaseResourceLock(l,i) KeReleaseSpinLock(l,i); #endif /* INITIALIZATION FUNCTIONS *************************************************/ Modified: branches/powerpc/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/includ… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ branches/powerpc/reactos/ntoskrnl/include/internal/ntoskrnl.h Sun Jun 25 01:34:12 2006 @@ -12,9 +12,15 @@ #ifdef _NTOSKRNL_ #include "ke.h" +#ifdef _M_IX86 #include "i386/mm.h" #include "i386/fpu.h" #include "i386/v86m.h" +#elif defined(_M_PPC) +#include "powerpc/mm.h" +#else +#error "Unknown CPU" +#endif #include "ob.h" #include "mm.h" #include "ps.h" @@ -247,7 +253,8 @@ /* on Itanium if the 24 most significant bits are set, we're not dealing with offsets anymore. */ #define IsPointerOffset(Ptr) (((ULONG_PTR)(Ptr) & 0xFFFFFF0000000000ULL) == 0) - +#elif defined(_PPC_) +#define IsPointerOffset(Ptr) ((LONG_PTR)(Ptr) >= 0) #else #error IsPointerOffset() needs to be defined for this architecture #endif Modified: branches/powerpc/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/includ… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/include/internal/powerpc/ke.h (original) +++ branches/powerpc/reactos/ntoskrnl/include/internal/powerpc/ke.h Sun Jun 25 01:34:12 2006 @@ -126,10 +126,52 @@ #define KePPCHaltProcessor() ; -#endif /* __ASM__ */ - #define KeArchEraseFlags() #define KeArchDisableInterrupts() KePPCDisableInterrupts() + +static __inline struct _KPRCB * KeGetCurrentPrcb( + VOID) +{ + ULONG Value = 0; + return (struct _KPRCB *) Value; +} + +static __inline KIRQL KeGetCurrentIrql( + VOID) +{ + return PASSIVE_LEVEL; +} + +VOID +STDCALL +KePPCInitThreadWithContext( + PKTHREAD Thread, + PKSYSTEM_ROUTINE SystemRoutine, + PKSTART_ROUTINE StartRoutine, + PVOID StartContext, + PCONTEXT Context); + +VOID +STDCALL +KeApplicationProcessorInitDispatcher( + VOID); + +VOID +STDCALL +KeCreateApplicationProcessorIdleThread( + ULONG Id); + +#ifdef _NTOSKRNL_ /* FIXME: Move flags above to NDK instead of here */ +VOID +STDCALL +KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, + PKSTART_ROUTINE StartRoutine, + PVOID StartContext, + BOOLEAN UserThread, + KTRAP_FRAME TrapFrame); +#endif + +#endif /* __ASM__ */ #endif /* __NTOSKRNL_INCLUDE_INTERNAL_POWERPC_KE_H */ Modified: branches/powerpc/reactos/ntoskrnl/io/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/io/pnp… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/io/pnpmgr.c (original) +++ branches/powerpc/reactos/ntoskrnl/io/pnpmgr.c Sun Jun 25 01:34:12 2006 @@ -775,6 +775,7 @@ return Status; } +ULONG TreeTraverse = 0; NTSTATUS IopTraverseDeviceTreeNode(PDEVICETREE_TRAVERSE_CONTEXT Context) @@ -782,6 +783,10 @@ PDEVICE_NODE ParentDeviceNode; PDEVICE_NODE ChildDeviceNode; NTSTATUS Status; + ULONG Indent = TreeTraverse; + + while( Indent-- ) DbgPrint(" "); + DPRINT1("Checking device node 0x%x\n", Context->DeviceNode); /* Copy context data so we don't overwrite it in subsequent calls to this function */ ParentDeviceNode = Context->DeviceNode; @@ -793,6 +798,8 @@ return Status; } + TreeTraverse++; + /* Traversal of all children nodes */ for (ChildDeviceNode = ParentDeviceNode->Child; ChildDeviceNode != NULL; @@ -804,10 +811,19 @@ Status = IopTraverseDeviceTreeNode(Context); if (!NT_SUCCESS(Status)) { - return Status; - } - } - + Indent = TreeTraverse; + while( Indent-- ) DbgPrint(" "); + DPRINT1("Device node 0x%x done (bad)\n", Context->DeviceNode); + TreeTraverse--; + return Status; + } + } + + Indent = TreeTraverse; + while( Indent-- ) DbgPrint(" "); + DPRINT1("Device node 0x%x done (good)\n", Context->DeviceNode); + + TreeTraverse--; return Status; } Modified: branches/powerpc/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/kd/kdm… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/kd/kdmain.c (original) +++ branches/powerpc/reactos/ntoskrnl/kd/kdmain.c Sun Jun 25 01:34:12 2006 @@ -198,7 +198,11 @@ KdEnteredDebugger = TRUE; /* Halt the CPU */ +#ifdef _M_IX86 for (;;) Ke386HaltProcessor(); +#elif defined(_M_PPC) + for (;;); +#endif } /* Modified: branches/powerpc/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/kd/wra… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/kd/wrappers/gdbstub.c (original) +++ branches/powerpc/reactos/ntoskrnl/kd/wrappers/gdbstub.c Sun Jun 25 01:34:12 2006 @@ -129,6 +129,7 @@ static CPU_REGISTER GspRegisters[NUMREGS] = { +#ifdef _M_IX86 { 4, FIELD_OFFSET(KTRAP_FRAME, Eax), FIELD_OFFSET(CONTEXT, Eax), TRUE }, { 4, FIELD_OFFSET(KTRAP_FRAME, Ecx), FIELD_OFFSET(CONTEXT, Ecx), TRUE }, { 4, FIELD_OFFSET(KTRAP_FRAME, Edx), FIELD_OFFSET(CONTEXT, Edx), FALSE }, @@ -145,6 +146,7 @@ { 4, FIELD_OFFSET(KTRAP_FRAME, SegEs), FIELD_OFFSET(CONTEXT, SegEs), TRUE }, { 4, FIELD_OFFSET(KTRAP_FRAME, SegFs), FIELD_OFFSET(CONTEXT, SegFs), TRUE }, { 4, FIELD_OFFSET(KTRAP_FRAME, SegGs), FIELD_OFFSET(CONTEXT, SegGs), TRUE } +#endif }; static PCHAR GspThreadStates[DeferredReady+1] = @@ -563,8 +565,12 @@ static LONG GspGetEspFromTrapFrame(PKTRAP_FRAME TrapFrame) { +#ifdef _M_IX86 return KeGetPreviousMode() == KernelMode ? (LONG) &TrapFrame->HardwareEsp : (LONG)TrapFrame->HardwareEsp; +#elif defined(_M_PPC) + return 0; +#endif } @@ -613,12 +619,14 @@ case ESP: Value = (ULONG_PTR) (KernelStack + 8); break; +#ifdef _M_IX86 case CS: Value = KGDT_R0_CODE; break; case DS: Value = KGDT_R0_DATA; break; +#endif default: Value = 0; break; @@ -1332,6 +1340,7 @@ DPRINT("Thread %p acquired mutex\n", PsGetCurrentThread()); /* Disable hardware debugging while we are inside the stub */ +#ifdef _M_IX86 #if defined(__GNUC__) __asm__("movl %0,%%db7" : /* no output */ : "r" (0)); #elif defined(_MSC_VER) @@ -1339,6 +1348,9 @@ #else #error Unknown compiler for inline assembler #endif +#elif defined(_M_PPC) + /* XXX arty fixme */ +#endif GspUnloadBreakpoints(TrapFrame); @@ -1373,6 +1385,7 @@ ptr = GspMem2Hex((PCHAR) &Esp, ptr, 4, 0); *ptr++ = ';'; +#ifdef _M_IX86 *ptr++ = HexChars[EBP]; *ptr++ = ':'; ptr = GspMem2Hex((PCHAR) &TrapFrame->Ebp, ptr, 4, 0); /* FP */ @@ -1382,6 +1395,7 @@ *ptr++ = ':'; ptr = GspMem2Hex((PCHAR) &TrapFrame->Eip, ptr, 4, 0); /* PC */ *ptr++ = ';'; +#endif *ptr = '\0'; @@ -1558,12 +1572,16 @@ Context->EFlags |= 0x100; } +#ifdef _M_IX86 #if defined(__GNUC__) asm volatile ("movl %%db6, %0\n" : "=r" (dr6_) : ); #elif defined(_MSC_VER) __asm mov eax, dr6 __asm mov dr6_, eax; #else #error Unknown compiler for inline assembler +#endif +#elif defined(_M_PPC) + /* XXX arty fixme */ #endif if (!(dr6_ & 0x4000)) { @@ -1581,12 +1599,16 @@ } } GspLoadBreakpoints(TrapFrame); +#ifdef _M_IX86 #if defined(__GNUC__) asm volatile ("movl %0, %%db6\n" : : "r" (0)); #elif defined(_MSC_VER) __asm mov eax, 0 __asm mov dr6, eax; #else #error Unknown compiler for inline assembler +#endif +#elif defined(_M_PPC) + /* XXX arty fixme */ #endif if (NULL != GspDbgThread) Modified: branches/powerpc/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/apc… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/apc.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/apc.c Sun Jun 25 01:34:12 2006 @@ -908,8 +908,10 @@ DPRINT("KiInitializeUserApc(TrapFrame %x/%x)\n", TrapFrame, KeGetCurrentThread()->TrapFrame); +#ifdef _M_IX86 /* Don't deliver APCs in V86 mode */ if (TrapFrame->EFlags & X86_EFLAGS_VM) return; +#endif /* Save the full context */ Context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS; @@ -928,9 +930,11 @@ &Context, sizeof(CONTEXT)); +#ifdef _M_IX86 /* Run at APC dispatcher */ TrapFrame->Eip = (ULONG)KeUserApcDispatcher; TrapFrame->HardwareEsp = Stack; +#endif /* Setup the stack */ *(PULONG_PTR)(Stack + 0 * sizeof(ULONG_PTR)) = (ULONG_PTR)NormalRoutine; Modified: branches/powerpc/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/bug… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/bug.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/bug.c Sun Jun 25 01:34:12 2006 @@ -35,7 +35,9 @@ static LIST_ENTRY BugcheckReasonCallbackListHead = {NULL,NULL}; static ULONG InBugCheck; static PRTL_MESSAGE_RESOURCE_DATA KiBugCodeMessages; +#ifdef _M_IX86 static ULONG KeBugCheckCount = 1; +#endif /* FUNCTIONS *****************************************************************/ @@ -298,6 +300,7 @@ ULONG BugCheckParameter4, PKTRAP_FRAME Tf) { +#ifdef _M_IX86 KIRQL OldIrql; BOOLEAN GotExtendedCrashInfo = FALSE; PVOID Address = 0; @@ -469,6 +472,9 @@ /* Halt this CPU now */ for (;;) Ke386HaltProcessor(); +#elif defined(_M_PPC) + for (;;); +#endif } /* Modified: branches/powerpc/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/clo… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/clock.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/clock.c Sun Jun 25 01:34:12 2006 @@ -260,6 +260,7 @@ CurrentThread = Prcb->CurrentThread; CurrentProcess = CurrentThread->ApcState.Process; +#ifdef _M_IX86 /* * Cs bit 0 is always set for user mode if we are in protected mode. * V86 mode is counted as user time. @@ -288,6 +289,7 @@ Prcb->KernelTime++; } } +#endif #if 0 DpcLastCount = Prcb->DpcLastCount; @@ -341,6 +343,7 @@ * FUNCTION: Handles a timer interrupt */ { +#ifdef _M_IX86 LARGE_INTEGER Time; ASSERT(KeGetCurrentIrql() == PROFILE_LEVEL); @@ -378,6 +381,7 @@ * Queue a DPC that will expire timers */ KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); +#endif } /* Modified: branches/powerpc/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/dpc… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/dpc.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/dpc.c Sun Jun 25 01:34:12 2006 @@ -441,7 +441,7 @@ /* Set DPC Event if requested */ if (Prcb->DpcSetEventRequest) { - KeSetEvent(&Prcb->DpcEvent, 0, 0); + KeSetEvent((void *)&Prcb->DpcEvent, 0, 0); } /* Check if Quantum expired */ Modified: branches/powerpc/reactos/ntoskrnl/ke/ipi.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/ipi… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/ipi.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/ipi.c Sun Jun 25 01:34:12 2006 @@ -33,7 +33,9 @@ if (TargetSet & Current) { Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); +#ifdef _M_IX86 Ke386TestAndSetBit(IpiRequest, &Pcr->Prcb->IpiFrozen); +#endif HalRequestIpi(i); } } @@ -48,8 +50,10 @@ IN PVOID ExceptionFrame) { #ifdef DBG +#ifdef _M_IX86 LARGE_INTEGER StartTime, CurrentTime, Frequency; ULONG Count = 5; +#endif #endif PKPRCB Prcb; @@ -59,6 +63,7 @@ Prcb = KeGetCurrentPrcb(); +#ifdef _M_IX86 if (Ke386TestAndClearBit(IPI_APC, &Prcb->IpiFrozen)) { HalRequestSoftwareInterrupt(APC_LEVEL); @@ -111,6 +116,7 @@ } (void)InterlockedExchangePointer(&Prcb->SignalDone, NULL); } +#endif DPRINT("KiIpiServiceRoutine done\n"); return TRUE; } @@ -140,11 +146,13 @@ { Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; while(0 != InterlockedCompareExchangeUL(&Prcb->SignalDone, (LONG)CurrentPrcb, 0)); +#ifdef _M_IX86 Ke386TestAndSetBit(IPI_SYNCH_REQUEST, &Prcb->IpiFrozen); if (Processor != CurrentPrcb->SetMember) { HalRequestIpi(i); } +#endif } } if (TargetSet & CurrentPrcb->SetMember) Modified: branches/powerpc/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/kth… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/kthread.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/kthread.c Sun Jun 25 01:34:12 2006 @@ -885,7 +885,9 @@ Thread->UserAffinity = Process->Affinity; Thread->DisableBoost = Process->DisableBoost; Thread->AutoAlignment = Process->AutoAlignment; +#ifdef _M_IX86 Thread->Iopl = Process->Iopl; +#endif /* Set the Thread to initalized */ Thread->State = Initialized; Modified: branches/powerpc/reactos/ntoskrnl/ke/main.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/mai… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/main.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/main.c Sun Jun 25 01:34:12 2006 @@ -17,7 +17,6 @@ /* GLOBALS *******************************************************************/ #define BUILD_OSCSDVERSION(major, minor) (((major & 0xFF) << 8) | (minor & 0xFF)) - ULONG NtMajorVersion = 5; ULONG NtMinorVersion = 0; Modified: branches/powerpc/reactos/ntoskrnl/ke/process.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pro… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/process.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/process.c Sun Jun 25 01:34:12 2006 @@ -133,7 +133,9 @@ Process->QuantumReset = 6; Process->DirectoryTableBase = DirectoryTableBase; Process->AutoAlignment = TRUE; +#ifdef _M_IX86 Process->IopmOffset = 0xFFFF; +#endif Process->State = ProcessInMemory; /* Initialize the Thread List */ @@ -176,8 +178,10 @@ KiSwapProcess(PKPROCESS NewProcess, PKPROCESS OldProcess) { +#ifdef _M_IX86 DPRINT("Switching CR3 to: %x\n", NewProcess->DirectoryTableBase.u.LowPart); Ke386SetPageTableDirectory(NewProcess->DirectoryTableBase.u.LowPart); +#endif } /* Modified: branches/powerpc/reactos/ntoskrnl/ke/profile.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pro… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/profile.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/profile.c Sun Jun 25 01:34:12 2006 @@ -226,6 +226,7 @@ IN KPROFILE_SOURCE Source, IN PLIST_ENTRY ListHead) { +#ifdef _M_IX86 PULONG BucketValue; PKPROFILE Profile; @@ -248,6 +249,7 @@ /* Increment the value */ ++BucketValue; } +#endif } /* Modified: branches/powerpc/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/mm/pag… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/mm/pagefile.c (original) +++ branches/powerpc/reactos/ntoskrnl/mm/pagefile.c Sun Jun 25 01:34:12 2006 @@ -548,6 +548,7 @@ Headers->Type = MmCoreDumpType; if (TrapFrame != NULL) { +#ifdef _M_IX86 if (!(TrapFrame->EFlags & (1 << 17))) { memcpy(&Headers->TrapFrame, TrapFrame, @@ -555,8 +556,11 @@ } else { +#endif memcpy(&Headers->TrapFrame, TrapFrame, sizeof(KTRAP_FRAME)); - } +#ifdef _M_IX86 + } +#endif } Headers->BugCheckCode = BugCode; Headers->BugCheckParameters[0] = BugCodeParameter1; Modified: branches/powerpc/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ntoskr… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ntoskrnl.def (original) +++ branches/powerpc/reactos/ntoskrnl/ntoskrnl.def Sun Jun 25 01:34:12 2006 @@ -1510,3 +1510,4 @@ wcsstr wcstombs wctomb +KeDumpStackFrames@4 Modified: branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ntoskr… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild Sun Jun 25 01:34:12 2006 @@ -43,6 +43,11 @@ <file>v86m.c</file> <file>v86m_sup.S</file> <file>vdm.c</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file first="true">main_asm.S</file> </directory> </if> <file>apc.c</file> Modified: branches/powerpc/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ps/deb… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ps/debug.c (original) +++ branches/powerpc/reactos/ntoskrnl/ps/debug.c Sun Jun 25 01:34:12 2006 @@ -56,12 +56,14 @@ Event = &GetSetContext->Event; Mode = GetSetContext->Mode; +#ifdef _M_IX86 if (TrapFrame->SegCs == KGDT_R0_CODE && Mode != KernelMode) { GetSetContext->Status = STATUS_ACCESS_DENIED; } else { +#endif /* Check if it's a set or get */ if (*SystemArgument1) { /* Get the Context */ @@ -71,7 +73,9 @@ KeContextToTrapFrame(Context, NULL, TrapFrame, Context->ContextFlags, Mode); } GetSetContext->Status = STATUS_SUCCESS; - } +#ifdef _M_IX86 + } +#endif /* Notify the Native API that we are done */ KeSetEvent(Event, IO_NO_INCREMENT, FALSE); Modified: branches/powerpc/reactos/ntoskrnl/ps/idle.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ps/idl… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ps/idle.c (original) +++ branches/powerpc/reactos/ntoskrnl/ps/idle.c Sun Jun 25 01:34:12 2006 @@ -45,7 +45,11 @@ NtYieldExecution(); +#ifdef _M_IX86 Ke386HaltProcessor(); +#elif defined(_M_PPC) + for(;;); +#endif } } Modified: branches/powerpc/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ps/psm… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ps/psmgr.c (original) +++ branches/powerpc/reactos/ntoskrnl/ps/psmgr.c Sun Jun 25 01:34:12 2006 @@ -199,7 +199,9 @@ RtlZeroMemory(PsIdleProcess, sizeof(EPROCESS)); PsIdleProcess->Pcb.Affinity = 0xFFFFFFFF; +#ifdef _M_IX86 PsIdleProcess->Pcb.IopmOffset = 0xffff; +#endif PsIdleProcess->Pcb.BasePriority = PROCESS_PRIORITY_IDLE; PsIdleProcess->Pcb.QuantumReset = 6; InitializeListHead(&PsIdleProcess->Pcb.ThreadListHead); @@ -243,7 +245,9 @@ #else PsInitialSystemProcess->Pcb.Affinity = KeActiveProcessors; #endif +#ifdef _M_IX86 PsInitialSystemProcess->Pcb.IopmOffset = 0xffff; +#endif PsInitialSystemProcess->Pcb.BasePriority = PROCESS_PRIORITY_NORMAL; PsInitialSystemProcess->Pcb.QuantumReset = 6; InitializeListHead(&PsInitialSystemProcess->Pcb.ThreadListHead);

18 years, 4 months

[arty] 22591: PowerPC WIP. Some of this is indeed hacky and will be changed.

by arty＠svn.reactos.org

Author: arty Date: Sun Jun 25 01:27:06 2006 New Revision: 22591 URL: http://svn.reactos.org/svn/reactos?rev=22591&view=rev Log: PowerPC WIP. Some of this is indeed hacky and will be changed. Added: branches/powerpc/reactos/tools/ppc.lost+found/ branches/powerpc/reactos/tools/ppc.lost+found/link-ntoskrnl (with props) branches/powerpc/reactos/tools/ppc.lost+found/pmake (with props) Modified: branches/powerpc/reactos/tools/nci/nci.mak branches/powerpc/reactos/tools/nci/ncitool.c branches/powerpc/reactos/tools/pefixup.mak branches/powerpc/reactos/tools/rsym.c branches/powerpc/reactos/tools/rsym.h branches/powerpc/reactos/tools/ssprintf.cpp branches/powerpc/reactos/tools/wrc/newstruc.c branches/powerpc/reactos/tools/wrc/wrc.mak branches/powerpc/reactos/tools/wrc/wrctypes.h Modified: branches/powerpc/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/nci/nci.m… ============================================================================== --- branches/powerpc/reactos/tools/nci/nci.mak (original) +++ branches/powerpc/reactos/tools/nci/nci.mak Sun Jun 25 01:27:06 2006 @@ -30,11 +30,11 @@ $(NCI_TARGET): $(NCI_OBJECTS) | $(NCI_OUT) $(ECHO_LD) - ${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_LFLAGS) -o $@ + ${host_gcc} -g $(NCI_OBJECTS) $(NCI_HOST_LFLAGS) -o $@ $(NCI_INT_)ncitool.o: $(NCI_BASE_)ncitool.c | $(NCI_INT) $(ECHO_CC) - ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ + ${host_gcc} -g $(NCI_HOST_CFLAGS) -c $< -o $@ .PHONY: nci_clean nci_clean: @@ -63,7 +63,7 @@ $(NCI_SERVICE_FILES): $(NCI_TARGET) $(KERNEL_SVC_DB) $(WIN32K_SVC_DB) $(ECHO_NCI) - $(Q)$(NCI_TARGET) \ + $(Q)$(NCI_TARGET) -arch $(ARCH) \ $(KERNEL_SVC_DB) \ $(WIN32K_SVC_DB) \ $(KERNEL_SERVICE_TABLE) \ Modified: branches/powerpc/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/nci/ncito… ============================================================================== --- branches/powerpc/reactos/tools/nci/ncitool.c (original) +++ branches/powerpc/reactos/tools/nci/ncitool.c Sun Jun 25 01:27:06 2006 @@ -53,6 +53,16 @@ " movl $KUSER_SHARED_SYSCALL, %%ecx\n" \ " call *%%ecx\n" \ " ret $0x%x\n\n" + +#define UserModeStub_ppc " mflr 0\n" \ + " addi 1,1,-16\n" \ + " li 0,%x\n" \ + " stw 0,1(0)\n" \ + " sc\n" \ + " lwz 0,1(0)\n" \ + " mtlr 0\n" \ + " addi 1,1,16\n" \ + " blr\n" #elif defined(_MSC_VER) #define UserModeStub_x86 " asm { \n" \ " mov eax, %xh\n" \ @@ -75,6 +85,9 @@ " pushl $KGDT_R0_CODE\n" \ " call _KiSystemService\n" \ " ret $0x%x\n\n" + +#define KernelModeStub_ppc " bl KiSystemService\n" \ + " rfi\n" #elif defined(_MSC_VER) #define KernelModeStub_x86 " asm { \n" \ " mov eax, %xh\n" \ @@ -89,14 +102,28 @@ #endif /***** Arch Dependent Stuff ******/ -//#ifdef _M_IX86 -#define ARGS_TO_BYTES(x) x*4 -#define UserModeStub UserModeStub_x86 -#define KernelModeStub KernelModeStub_x86 - -//#elseif -//#error Unsupported Architecture -//#endif +struct ncitool_data_t { + const char *arch; + int args_to_bytes; + const char *km_stub; + const char *um_stub; + const char *global_header; + const char *declaration; +}; + +struct ncitool_data_t ncitool_data[] = { + { "x86", 4, KernelModeStub_x86, UserModeStub_x86, + ".global _%s@%d\n", "_%s@%d:\n" }, + { "powerpc", 4, KernelModeStub_ppc, UserModeStub_ppc, + "\t.globl %s\n", "%s:\n" }, + { 0 } +}; +int arch_sel = 0; +#define ARGS_TO_BYTES(x) 4*(ncitool_data[arch_sel].args_to_bytes) +#define UserModeStub ncitool_data[arch_sel].um_stub +#define KernelModeStub ncitool_data[arch_sel].km_stub +#define GlobalHeader ncitool_data[arch_sel].global_header +#define Declaration ncitool_data[arch_sel].declaration /* FUNCTIONS ****************************************************************/ @@ -162,10 +189,10 @@ unsigned StackBytes) { /* Export the function */ - fprintf(StubFile, ".global _%s@%d\n", SyscallName, StackBytes); + fprintf(StubFile, GlobalHeader, SyscallName, StackBytes); /* Define it */ - fprintf(StubFile, "_%s@%d:\n\n", SyscallName, StackBytes); + fprintf(StubFile, Declaration, SyscallName, StackBytes); } @@ -489,7 +516,7 @@ void usage(char * argv0) { - printf("Usage: %s sysfuncs.lst w32ksvc.db napi.h ssdt.h napi.S zw.S win32k.S win32k.S\n" + printf("Usage: %s [-arch <arch>] sysfuncs.lst w32ksvc.db napi.h ssdt.h napi.S zw.S win32k.S win32k.S\n" " sysfuncs.lst native system functions database\n" " w32ksvc.db native graphic functions database\n" " napi.h NTOSKRNL service table\n" @@ -497,19 +524,31 @@ " napi.S NTDLL stubs\n" " zw.S NTOSKRNL Zw stubs\n" " win32k.S GDI32 stubs\n" - " win32k.S USER32 stubs\n", + " win32k.S USER32 stubs\n" + " -arch is optional, default is x86\n", argv0 ); } int main(int argc, char* argv[]) { - FILE * Files[Arguments]; - int FileNumber; + FILE * Files[Arguments] = { }; + int FileNumber, ArgOffset = 1; char * OpenType = "r"; + /* Catch architecture argument */ + if (argc > 3 && !strcmp(argv[1],"-arch")) { + int i; + for( i = 0; ncitool_data[arch_sel].arch && strcmp(argv[2],ncitool_data[i].arch); i++ ); + if (!ncitool_data[arch_sel].arch) { + usage(argv[0]); + return 1; + } + arch_sel = i; + ArgOffset = 3; + } /* Make sure all arguments all there */ - if (argc != Arguments + 1) { + if (argc != Arguments + ArgOffset) { usage(argv[0]); return(1); } @@ -519,11 +558,11 @@ /* Open the File */ if (FileNumber == 2) OpenType = "wb"; - Files[FileNumber] = fopen(argv[FileNumber + 1], OpenType); + Files[FileNumber] = fopen(argv[FileNumber + ArgOffset], OpenType); /* Check for failure and error out if so */ if (!Files[FileNumber]) { - perror(argv[FileNumber + 1]); + perror(argv[FileNumber + ArgOffset]); return (1); } @@ -532,20 +571,20 @@ /* Write the File Headers */ WriteFileHeader(Files[NtosUserStubs], "System Call Stubs for Native API", - argv[NtosUserStubs + 1]); + argv[NtosUserStubs + ArgOffset]); WriteFileHeader(Files[NtosKernelStubs], "System Call Stubs for Native API", - argv[NtosKernelStubs + 1]); + argv[NtosKernelStubs + ArgOffset]); fputs("#include <ndk/asm.h>\n\n", Files[NtosKernelStubs]); WriteFileHeader(Files[Win32kGdiStubs], "System Call Stubs for Native API", - argv[Win32kGdiStubs + 1]); + argv[Win32kGdiStubs + ArgOffset]); WriteFileHeader(Files[Win32kUserStubs], "System Call Stubs for Native API", - argv[Win32kUserStubs + 1]); + argv[Win32kUserStubs + ArgOffset]); /* Create the System Stubs */ @@ -572,15 +611,15 @@ CreateSystemServiceTable(Files[NativeSystemDb], Files[NtosServiceTable], "Main", - argv[NtosServiceTable + 1]); + argv[NtosServiceTable + ArgOffset]); CreateSystemServiceTable(Files[NativeGuiDb], Files[Win32kServiceTable], "Win32k", - argv[Win32kServiceTable + 1]); + argv[Win32kServiceTable + ArgOffset]); /* Close all files */ - for (FileNumber = 0; FileNumber < Arguments; FileNumber++) { + for (FileNumber = 0; FileNumber < Arguments-ArgOffset; FileNumber++) { /* Close the File */ fclose(Files[FileNumber]); Modified: branches/powerpc/reactos/tools/pefixup.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/pefixup.m… ============================================================================== --- branches/powerpc/reactos/tools/pefixup.mak (original) +++ branches/powerpc/reactos/tools/pefixup.mak Sun Jun 25 01:27:06 2006 @@ -24,11 +24,11 @@ $(PEFIXUP_TARGET): $(PEFIXUP_OBJECTS) | $(PEFIXUP_OUT) $(ECHO_LD) - ${host_gcc} $(PEFIXUP_OBJECTS) $(PEFIXUP_HOST_LFLAGS) -o $@ + ${host_gcc} -g $(PEFIXUP_OBJECTS) $(PEFIXUP_HOST_LFLAGS) -o $@ $(PEFIXUP_INT_)pefixup.o: $(PEFIXUP_BASE_)pefixup.c | $(PEFIXUP_INT) $(ECHO_CC) - ${host_gcc} $(PEFIXUP_HOST_CFLAGS) -c $< -o $@ + ${host_gcc} -g $(PEFIXUP_HOST_CFLAGS) -c $< -o $@ .PHONY: pefixup_clean pefixup_clean: Added: branches/powerpc/reactos/tools/ppc.lost+found/link-ntoskrnl URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/link-ntoskrnl (added) +++ branches/powerpc/reactos/tools/ppc.lost+found/link-ntoskrnl Sun Jun 25 01:27:06 2006 @@ -1,0 +1,3 @@ +#!/bin/sh -xv + +reactos-powerpc-gcc --begin-group -v -Wl,--subsystem,native -Wl,--entry,NtProcessStartup -Wl,--image-base,0x80000000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared ntoskrnl.temp.exp -o output-ppc/ntoskrnl/ntoskrnl.exe obj-ppc/ntoskrnl/ke/powerpc/main_asm.o obj-ppc/ntoskrnl/ke/apc.o obj-ppc/ntoskrnl/ke/bug.o obj-ppc/ntoskrnl/ke/clock.o obj-ppc/ntoskrnl/ke/device.o obj-ppc/ntoskrnl/ke/dpc.o obj-ppc/ntoskrnl/ke/event.o obj-ppc/ntoskrnl/ke/exception.o obj-ppc/ntoskrnl/ke/gate.o obj-ppc/ntoskrnl/ke/gmutex.o obj-ppc/ntoskrnl/ke/ipi.o obj-ppc/ntoskrnl/ke/kqueue.o obj-ppc/ntoskrnl/ke/kthread.o obj-ppc/ntoskrnl/ke/main.o obj-ppc/ntoskrnl/ke/mutex.o obj-ppc/ntoskrnl/ke/process.o obj-ppc/ntoskrnl/ke/profile.o obj-ppc/ntoskrnl/ke/queue.o obj-ppc/ntoskrnl/ke/sem.o obj-ppc/ntoskrnl/ke/spinlock.o obj-ppc/ntoskrnl/ke/timer.o obj-ppc/ntoskrnl/ke/usercall.o obj-ppc/ntoskrnl/ke/wait.o obj-ppc/ntoskrnl/cc/cacheman.o obj-ppc/ntoskrnl/cc/copy.o obj-ppc/ntoskrnl/cc/fs.o obj-ppc/ntoskrnl/cc/mdl.o obj-ppc/ntoskrnl/cc/pin.o obj-ppc/ntoskrnl/cc/view.o obj-ppc/ntoskrnl/cm/import.o obj-ppc/ntoskrnl/cm/ntfunc.o obj-ppc/ntoskrnl/cm/regfile.o obj-ppc/ntoskrnl/cm/registry.o obj-ppc/ntoskrnl/cm/regobj.o obj-ppc/ntoskrnl/dbgk/dbgkutil.o obj-ppc/ntoskrnl/dbgk/debug.o obj-ppc/ntoskrnl/ex/atom.o obj-ppc/ntoskrnl/ex/callback.o obj-ppc/ntoskrnl/ex/dbgctrl.o obj-ppc/ntoskrnl/ex/error.o obj-ppc/ntoskrnl/ex/event.o obj-ppc/ntoskrnl/ex/evtpair.o obj-ppc/ntoskrnl/ex/fmutex.o obj-ppc/ntoskrnl/ex/handle.o obj-ppc/ntoskrnl/ex/init.o obj-ppc/ntoskrnl/ex/lookas.o obj-ppc/ntoskrnl/ex/mutant.o obj-ppc/ntoskrnl/ex/power.o obj-ppc/ntoskrnl/ex/pushlock.o obj-ppc/ntoskrnl/ex/profile.o obj-ppc/ntoskrnl/ex/resource.o obj-ppc/ntoskrnl/ex/rundown.o obj-ppc/ntoskrnl/ex/sem.o obj-ppc/ntoskrnl/ex/sysinfo.o obj-ppc/ntoskrnl/ex/time.o obj-ppc/ntoskrnl/ex/timer.o obj-ppc/ntoskrnl/ex/uuid.o obj-ppc/ntoskrnl/ex/win32k.o obj-ppc/ntoskrnl/ex/work.o obj-ppc/ntoskrnl/ex/zone.o obj-ppc/ntoskrnl/ex/zw.o obj-ppc/ntoskrnl/fs/context.o obj-ppc/ntoskrnl/fs/fastio.o obj-ppc/ntoskrnl/fs/filelock.o obj-ppc/ntoskrnl/fs/mcb.o obj-ppc/ntoskrnl/fs/name.o obj-ppc/ntoskrnl/fs/notify.o obj-ppc/ntoskrnl/fs/oplock.o obj-ppc/ntoskrnl/fs/pool.o obj-ppc/ntoskrnl/fs/tunnel.o obj-ppc/ntoskrnl/fs/unc.o obj-ppc/ntoskrnl/fs/util.o obj-ppc/ntoskrnl/inbv/inbv.o obj-ppc/ntoskrnl/io/adapter.o obj-ppc/ntoskrnl/io/arcname.o obj-ppc/ntoskrnl/io/bootlog.o obj-ppc/ntoskrnl/io/controller.o obj-ppc/ntoskrnl/io/device.o obj-ppc/ntoskrnl/io/deviface.o obj-ppc/ntoskrnl/io/disk.o obj-ppc/ntoskrnl/io/driver.o obj-ppc/ntoskrnl/io/efi.o obj-ppc/ntoskrnl/io/error.o obj-ppc/ntoskrnl/io/event.o obj-ppc/ntoskrnl/io/fs.o obj-ppc/ntoskrnl/io/iocomp.o obj-ppc/ntoskrnl/io/iomgr.o obj-ppc/ntoskrnl/io/iowork.o obj-ppc/ntoskrnl/io/irp.o obj-ppc/ntoskrnl/io/irq.o obj-ppc/ntoskrnl/io/mdl.o obj-ppc/ntoskrnl/io/plugplay.o obj-ppc/ntoskrnl/io/pnpdma.o obj-ppc/ntoskrnl/io/pnpmgr.o obj-ppc/ntoskrnl/io/pnpnotify.o obj-ppc/ntoskrnl/io/pnpreport.o obj-ppc/ntoskrnl/io/pnproot.o obj-ppc/ntoskrnl/io/rawfs.o obj-ppc/ntoskrnl/io/remlock.o obj-ppc/ntoskrnl/io/resource.o obj-ppc/ntoskrnl/io/share.o obj-ppc/ntoskrnl/io/symlink.o obj-ppc/ntoskrnl/io/timer.o obj-ppc/ntoskrnl/io/vpb.o obj-ppc/ntoskrnl/io/wmi.o obj-ppc/ntoskrnl/io/file.o obj-ppc/ntoskrnl/kd/wrappers/bochs.o obj-ppc/ntoskrnl/kd/wrappers/gdbstub.o obj-ppc/ntoskrnl/kd/kdinit.o obj-ppc/ntoskrnl/kd/kdio.o obj-ppc/ntoskrnl/kd/kdmain.o obj-ppc/ntoskrnl/ldr/loader.o obj-ppc/ntoskrnl/ldr/rtl.o obj-ppc/ntoskrnl/lpc/close.o obj-ppc/ntoskrnl/lpc/complete.o obj-ppc/ntoskrnl/lpc/connect.o obj-ppc/ntoskrnl/lpc/create.o obj-ppc/ntoskrnl/lpc/listen.o obj-ppc/ntoskrnl/lpc/port.o obj-ppc/ntoskrnl/lpc/query.o obj-ppc/ntoskrnl/lpc/queue.o obj-ppc/ntoskrnl/lpc/receive.o obj-ppc/ntoskrnl/lpc/reply.o obj-ppc/ntoskrnl/lpc/send.o obj-ppc/ntoskrnl/mm/anonmem.o obj-ppc/ntoskrnl/mm/aspace.o obj-ppc/ntoskrnl/mm/balance.o obj-ppc/ntoskrnl/mm/cont.o obj-ppc/ntoskrnl/mm/drvlck.o obj-ppc/ntoskrnl/mm/freelist.o obj-ppc/ntoskrnl/mm/iospace.o obj-ppc/ntoskrnl/mm/kmap.o obj-ppc/ntoskrnl/mm/marea.o obj-ppc/ntoskrnl/mm/mdl.o obj-ppc/ntoskrnl/mm/mm.o obj-ppc/ntoskrnl/mm/process.o obj-ppc/ntoskrnl/mm/mminit.o obj-ppc/ntoskrnl/mm/mpw.o obj-ppc/ntoskrnl/mm/ncache.o obj-ppc/ntoskrnl/mm/npool.o obj-ppc/ntoskrnl/mm/pagefile.o obj-ppc/ntoskrnl/mm/pageop.o obj-ppc/ntoskrnl/mm/pager.o obj-ppc/ntoskrnl/mm/pagfault.o obj-ppc/ntoskrnl/mm/paging.o obj-ppc/ntoskrnl/mm/pe.o obj-ppc/ntoskrnl/mm/physical.o obj-ppc/ntoskrnl/mm/pool.o obj-ppc/ntoskrnl/mm/ppool.o obj-ppc/ntoskrnl/mm/region.o obj-ppc/ntoskrnl/mm/rmap.o obj-ppc/ntoskrnl/mm/section.o obj-ppc/ntoskrnl/mm/verifier.o obj-ppc/ntoskrnl/mm/virtual.o obj-ppc/ntoskrnl/mm/wset.o obj-ppc/ntoskrnl/mm/elf32.o obj-ppc/ntoskrnl/mm/elf64.o obj-ppc/ntoskrnl/ob/obdir.o obj-ppc/ntoskrnl/ob/obinit.o obj-ppc/ntoskrnl/ob/obhandle.o obj-ppc/ntoskrnl/ob/obname.o obj-ppc/ntoskrnl/ob/oblife.o obj-ppc/ntoskrnl/ob/obref.o obj-ppc/ntoskrnl/ob/sdcache.o obj-ppc/ntoskrnl/ob/security.o obj-ppc/ntoskrnl/ob/symlink.o obj-ppc/ntoskrnl/ob/wait.o obj-ppc/ntoskrnl/po/power.o obj-ppc/ntoskrnl/ps/debug.o obj-ppc/ntoskrnl/ps/idle.o obj-ppc/ntoskrnl/ps/job.o obj-ppc/ntoskrnl/ps/kill.o obj-ppc/ntoskrnl/ps/locale.o obj-ppc/ntoskrnl/ps/notify.o obj-ppc/ntoskrnl/ps/process.o obj-ppc/ntoskrnl/ps/psmgr.o obj-ppc/ntoskrnl/ps/query.o obj-ppc/ntoskrnl/ps/quota.o obj-ppc/ntoskrnl/ps/security.o obj-ppc/ntoskrnl/ps/suspend.o obj-ppc/ntoskrnl/ps/thread.o obj-ppc/ntoskrnl/ps/win32.o obj-ppc/ntoskrnl/rtl/libsupp.o obj-ppc/ntoskrnl/rtl/misc.o obj-ppc/ntoskrnl/rtl/nls.o obj-ppc/ntoskrnl/rtl/regio.o obj-ppc/ntoskrnl/rtl/strtok.o obj-ppc/ntoskrnl/se/access.o obj-ppc/ntoskrnl/se/acl.o obj-ppc/ntoskrnl/se/audit.o obj-ppc/ntoskrnl/se/lsa.o obj-ppc/ntoskrnl/se/luid.o obj-ppc/ntoskrnl/se/priv.o obj-ppc/ntoskrnl/se/sd.o obj-ppc/ntoskrnl/se/semgr.o obj-ppc/ntoskrnl/se/sid.o obj-ppc/ntoskrnl/se/token.o obj-ppc/ntoskrnl/ntoskrnl.coff obj-ppc/ntoskrnl/kdbg/kdb_symbols.o obj-ppc/lib/drivers/csq/csq.a obj-ppc/hal/hal/libhal.a obj-ppc/lib/kjs/kjs.a obj-ppc/lib/pseh/pseh.a obj-ppc/lib/rtl/rtl.a obj-ppc/lib/rossym/rossym.a obj-ppc/lib/string/string.a obj-ppc/lib/wdmguid/wdmguid.a -nostartfiles -nostdlib -lgcc -g --end-group Propchange: branches/powerpc/reactos/tools/ppc.lost+found/link-ntoskrnl ------------------------------------------------------------------------------ svn:executable = * Added: branches/powerpc/reactos/tools/ppc.lost+found/pmake URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/pmake (added) +++ branches/powerpc/reactos/tools/ppc.lost+found/pmake Sun Jun 25 01:27:06 2006 @@ -1,0 +1,12 @@ +#!/bin/sh + +export PATH=$PATH:/usr/local/pkg/reactos-powerpc/bin +make \ + HOST=mingw32-linux \ + ROS_INTERMEDIATE=obj-ppc \ + ROS_OUTPUT=output-ppc \ + ROS_PREFIX=reactos-powerpc \ + ROS_INSTALL=rosppc \ + ROS_AUTOMAKE=makefile.ppc \ + ROS_RBUILDFLAGS=-rReactOS-ppc.rbuild \ + $* Propchange: branches/powerpc/reactos/tools/ppc.lost+found/pmake ------------------------------------------------------------------------------ svn:executable = * Modified: branches/powerpc/reactos/tools/rsym.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/rsym.c?re… ============================================================================== --- branches/powerpc/reactos/tools/rsym.c (original) +++ branches/powerpc/reactos/tools/rsym.c Sun Jun 25 01:27:06 2006 @@ -26,6 +26,35 @@ #include <assert.h> #include "rsym.h" + +static inline WORD dtohs(WORD in) +{ + PBYTE in_ptr = (PBYTE)&in; + return in_ptr[0] | (in_ptr[1] << 8); +} + +static inline WORD htods(WORD in) +{ + WORD out; + PBYTE out_ptr = (PBYTE)&out; + out_ptr[0] = in; out_ptr[1] = in >> 8; + return out; +} + +static inline DWORD dtohl(DWORD in) +{ + PBYTE in_ptr = (PBYTE)&in; + return in_ptr[0] | (in_ptr[1] << 8) | (in_ptr[2] << 16) | (in_ptr[3] << 24); +} + +static inline DWORD htodl(DWORD in) +{ + DWORD out; + PBYTE out_ptr = (PBYTE)&out; + out_ptr[0] = in ; out_ptr[1] = in >> 8; + out_ptr[2] = in >> 16; out_ptr[3] = in >> 24; + return out; +} static int CompareSymEntry(const PROSSYM_ENTRY SymEntry1, const PROSSYM_ENTRY SymEntry2) @@ -814,6 +843,9 @@ /* Check if MZ header exists */ PEDosHeader = (PIMAGE_DOS_HEADER) FileData; + PEDosHeader->e_magic = dtohs(PEDosHeader->e_magic); + PEDosHeader->e_lfanew = dtohl(PEDosHeader->e_lfanew); + if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || PEDosHeader->e_lfanew == 0L) { perror("Input file is not a PE image.\n"); Modified: branches/powerpc/reactos/tools/rsym.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/rsym.h?re… ============================================================================== --- branches/powerpc/reactos/tools/rsym.h (original) +++ branches/powerpc/reactos/tools/rsym.h Sun Jun 25 01:27:06 2006 @@ -10,7 +10,7 @@ #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 -typedef unsigned char BYTE; +typedef unsigned char BYTE, *PBYTE; typedef unsigned char UCHAR; typedef unsigned short WORD; typedef unsigned short USHORT; Modified: branches/powerpc/reactos/tools/ssprintf.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ssprintf.… ============================================================================== --- branches/powerpc/reactos/tools/ssprintf.cpp (original) +++ branches/powerpc/reactos/tools/ssprintf.cpp Sun Jun 25 01:27:06 2006 @@ -690,6 +690,7 @@ return true; } +#ifdef __i386__ static bool numberfl(std::string& f, long double __n, char exp_sign, int size, int precision, int type) { @@ -1091,6 +1092,7 @@ } return true; } +#endif static int do_string(std::string& f, const char* s, int len, int field_width, int precision, int flags) @@ -1507,7 +1509,9 @@ } else { if ( precision == -1 ) precision = 6; +#ifdef __i386__ result = numberfl(f,_ldouble,*fmt,field_width,precision,flags); +#endif if (result < 0) { assert(!"TODO FIXME handle error better"); @@ -1831,7 +1835,9 @@ } else { if ( precision == -1 ) precision = 6; +#ifdef __i386__ result = wnumberfl(f,_ldouble,*fmt,field_width,precision,flags); +#endif if (result < 0) { assert(!"TODO FIXME handle error better"); Modified: branches/powerpc/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/wrc/newst… ============================================================================== --- branches/powerpc/reactos/tools/wrc/newstruc.c (original) +++ branches/powerpc/reactos/tools/wrc/newstruc.c Sun Jun 25 01:27:06 2006 @@ -68,6 +68,29 @@ __NEW_STRUCT_FUNC(string) __NEW_STRUCT_FUNC(toolbar_item) __NEW_STRUCT_FUNC(ani_any) + +void hdump( void *v, int l ) { + int i; + char *c = (char *)v, *begin = c; + + while( l > 0 ) { + if( (c - begin) ) + printf("\n"); + printf("%08x:", c); + for( i = 0; i < l && i < 16; i++ ) { + printf(" %02x", c[i] & 0xff); + } + for( ; i < 16; i++ ) { + printf(" "); + } + printf(" -- "); + for( i = 0; i < l && i < 16; i++ ) { + printf("%c", isprint(c[i]) ? c[i] : '.'); + } + c += 16; l -= 16; + } + printf("\n"); +} /* New instances for all types of structures */ /* Very inefficient (in size), but very functional :-] @@ -984,7 +1007,10 @@ return w; } -#define MSGTAB_BAD_PTR(p, b, l, r) (((l) - ((char *)(p) - (char *)(b))) > (r)) +#define MSGTAB_BAD_PTR(p, b, l, r) \ + (printf("MSGTAB_BAD_PTR(%x,%x,%d,r) => %x > r=%x\n", p,b,l, \ + ((l) - ((char *)(p) - (char *)(b))), r), \ + (((l) - ((char *)(p) - (char *)(b))) > (r))) messagetable_t *new_messagetable(raw_data_t *rd, int *memopt) { messagetable_t *msg = (messagetable_t *)xmalloc(sizeof(messagetable_t)); @@ -1023,97 +1049,48 @@ if(!hi && !lo) yyerror("Invalid messagetable block count 0"); - if(!hi && lo) /* Messagetable byteorder == native byteorder */ - { #ifdef WORDS_BIGENDIAN - if(byteorder != WRC_BO_LITTLE) goto out; + if(byteorder != WRC_BO_LITTLE) goto out; #else - if(byteorder != WRC_BO_BIG) goto out; + if(byteorder != WRC_BO_BIG) goto out; #endif - /* Resource byteorder != native byteorder */ - - mbp = (msgtab_block_t *)&(((DWORD *)rd->data)[1]); - if(MSGTAB_BAD_PTR(mbp, rd->data, rd->size, nblk * sizeof(*mbp))) - yyerror("Messagetable's blocks are outside of defined data"); - for(i = 0; i < nblk; i++) - { - msgtab_entry_t *mep, *next_mep; - DWORD id; - - mep = (msgtab_entry_t *)(((char *)rd->data) + mbp[i].offset); - - for(id = mbp[i].idlo; id <= mbp[i].idhi; id++) - { - if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - yyerror("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); - if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ - { - WORD *wp = (WORD *)&mep[1]; - int l = mep->length/2 - 2; /* Length included header */ - int n; - - if(mep->length & 1) - yyerror("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); - for(n = 0; n < l; n++) - wp[n] = BYTESWAP_WORD(wp[n]); - - } - next_mep = (msgtab_entry_t *)(((char *)mep) + mep->length); - mep->length = BYTESWAP_WORD(mep->length); - mep->flags = BYTESWAP_WORD(mep->flags); - mep = next_mep; - } - - mbp[i].idlo = BYTESWAP_DWORD(mbp[i].idlo); - mbp[i].idhi = BYTESWAP_DWORD(mbp[i].idhi); - mbp[i].offset = BYTESWAP_DWORD(mbp[i].offset); - } - } - if(hi && !lo) /* Messagetable byteorder != native byteorder */ - { -#ifdef WORDS_BIGENDIAN - if(byteorder == WRC_BO_LITTLE) goto out; -#else - if(byteorder == WRC_BO_BIG) goto out; -#endif - /* Resource byteorder == native byteorder */ - - mbp = (msgtab_block_t *)&(((DWORD *)rd->data)[1]); - nblk = BYTESWAP_DWORD(nblk); - if(MSGTAB_BAD_PTR(mbp, rd->data, rd->size, nblk * sizeof(*mbp))) - yyerror("Messagetable's blocks are outside of defined data"); - for(i = 0; i < nblk; i++) - { - msgtab_entry_t *mep; - DWORD id; - - mbp[i].idlo = BYTESWAP_DWORD(mbp[i].idlo); - mbp[i].idhi = BYTESWAP_DWORD(mbp[i].idhi); - mbp[i].offset = BYTESWAP_DWORD(mbp[i].offset); - mep = (msgtab_entry_t *)(((char *)rd->data) + mbp[i].offset); - - for(id = mbp[i].idlo; id <= mbp[i].idhi; id++) - { - mep->length = BYTESWAP_WORD(mep->length); - mep->flags = BYTESWAP_WORD(mep->flags); - - if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - yyerror("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); - if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ - { - WORD *wp = (WORD *)&mep[1]; - int l = mep->length/2 - 2; /* Length included header */ - int n; - - if(mep->length & 1) - yyerror("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); - for(n = 0; n < l; n++) - wp[n] = BYTESWAP_WORD(wp[n]); - - } - mep = (msgtab_entry_t *)(((char *)mep) + mep->length); - } - } + /* Resource byteorder != native byteorder */ + + mbp = BYTESWAP_DWORD((msgtab_block_t *)&(((DWORD *)rd->data)[1])); + if(MSGTAB_BAD_PTR(mbp, rd->data, rd->size, nblk * sizeof(*mbp))) + yyerror("[1] Messagetable's blocks are outside of defined data"); + for(i = 0; i < nblk; i++) + { + msgtab_entry_t *mep, *next_mep; + DWORD id; + + mep = (msgtab_entry_t *)(((char *)rd->data) + mbp[i].offset); + + for(id = mbp[i].idlo; id <= mbp[i].idhi; id++) + { + if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) + yyerror("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); + if(BYTESWAP_DWORD(mep->flags) == 1) /* Docu says 'flags == 0x0001' for unicode */ + { + WORD *wp = (WORD *)&mep[1]; + int l = BYTESWAP_DWORD(mep->length)/2 - 2; /* Length included header */ + int n; + + if(BYTESWAP_DWORD(mep->length) & 1) + yyerror("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, BYTESWAP_DWORD(mep->length)); + for(n = 0; n < l; n++) + wp[n] = BYTESWAP_WORD(wp[n]); + + } + next_mep = (msgtab_entry_t *)(((char *)mep) + BYTESWAP_DWORD(mep->length)); + mep->length = BYTESWAP_WORD(mep->length); + mep->flags = BYTESWAP_WORD(mep->flags); + mep = next_mep; + } + + mbp[i].idlo = BYTESWAP_DWORD(mbp[i].idlo); + mbp[i].idhi = BYTESWAP_DWORD(mbp[i].idhi); + mbp[i].offset = BYTESWAP_DWORD(mbp[i].offset); } out: Modified: branches/powerpc/reactos/tools/wrc/wrc.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/wrc/wrc.m… ============================================================================== --- branches/powerpc/reactos/tools/wrc/wrc.mak (original) +++ branches/powerpc/reactos/tools/wrc/wrc.mak Sun Jun 25 01:27:06 2006 @@ -70,7 +70,7 @@ $(WRC_TARGET): $(WRC_OBJECTS) $(WRC_LIBS) | $(WRC_OUT) $(ECHO_LD) - ${host_gcc} $(WRC_OBJECTS) $(WRC_LIBS) $(WRC_HOST_LFLAGS) -o $@ + ${host_gcc} -g $(WRC_OBJECTS) $(WRC_LIBS) $(WRC_HOST_LFLAGS) -o $@ $(WRC_INT_)dumpres.o: $(WRC_BASE_)dumpres.c | $(WRC_INT) $(ECHO_CC) @@ -82,7 +82,7 @@ $(WRC_INT_)newstruc.o: $(WRC_BASE_)newstruc.c | $(WRC_INT) $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ + ${host_gcc} -g $(WRC_HOST_CFLAGS) -c $< -o $@ $(WRC_INT_)readres.o: $(WRC_BASE_)readres.c | $(WRC_INT) $(ECHO_CC) Modified: branches/powerpc/reactos/tools/wrc/wrctypes.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/wrc/wrcty… ============================================================================== --- branches/powerpc/reactos/tools/wrc/wrctypes.h (original) +++ branches/powerpc/reactos/tools/wrc/wrctypes.h Sun Jun 25 01:27:06 2006 @@ -80,8 +80,13 @@ #define WRC_HIBYTE(w) (((WORD)(w) >> 8) & 0xff) #define WRC_LOWORD(d) ((DWORD)(d) & 0xffff) #define WRC_HIWORD(d) (((DWORD)(d) >> 16) & 0xffff) +#ifndef WORDS_BIGENDIAN #define BYTESWAP_WORD(w) ((WORD)(((WORD)WRC_LOBYTE(w) << 8) + (WORD)WRC_HIBYTE(w))) #define BYTESWAP_DWORD(d) ((DWORD)(((DWORD)BYTESWAP_WORD(WRC_LOWORD(d)) << 16) + ((DWORD)BYTESWAP_WORD(WRC_HIWORD(d))))) +#else +#define BYTESWAP_WORD(w) ((WORD)(w)) +3define BYTESWAP_DWORD(d) ((DWORD)(d)) +#endif /* Binary resource structure */ #define RES_BLOCKSIZE 512

18 years, 4 months

[greatlrd] 22590: fix some problem to edit main.cpl rc with vc but not all

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jun 25 01:19:34 2006 New Revision: 22590 URL: http://svn.reactos.org/svn/reactos?rev=22590&view=rev Log: fix some problem to edit main.cpl rc with vc but not all Added: trunk/reactos/dll/cpl/main/rsrc.rc (with props) Modified: trunk/reactos/dll/cpl/main/Ru.rc trunk/reactos/dll/cpl/main/main.rc Modified: trunk/reactos/dll/cpl/main/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/Ru.rc?rev=225… ============================================================================== --- trunk/reactos/dll/cpl/main/Ru.rc (original) +++ trunk/reactos/dll/cpl/main/Ru.rc Sun Jun 25 01:19:34 2006 @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION Modified: trunk/reactos/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rc (original) +++ trunk/reactos/dll/cpl/main/main.rc Sun Jun 25 01:19:34 2006 @@ -13,11 +13,4 @@ IDC_CPLICON_1 ICON "resources/mouse.ico" IDC_CPLICON_2 ICON "resources/keyboard.ico" -#include "En.rc" -#include "De.rc" -#include "Fr.rc" -#include "Nl.rc" -#include "Ja.rc" -#include "Hu.rc" -#include "Es.rc" -#include "Ru.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/rsrc.rc (added) +++ trunk/reactos/dll/cpl/main/rsrc.rc Sun Jun 25 01:19:34 2006 @@ -1,0 +1,19 @@ + + +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + +/* define language neutral resources */ + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* include localised resources */ +#include "En.rc" +#include "De.rc" +#include "Fr.rc" +#include "Nl.rc" +#include "Ja.rc" +#include "Hu.rc" +#include "Es.rc" +#include "Ru.rc" Propchange: trunk/reactos/dll/cpl/main/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

18 years, 4 months

[hpoussin] 22589: Don't redefine UNICODE_STRING/STRING (may happen if winternl.h is already included)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Jun 25 01:14:41 2006 New Revision: 22589 URL: http://svn.reactos.org/svn/reactos?rev=22589&view=rev Log: Don't redefine UNICODE_STRING/STRING (may happen if winternl.h is already included) Modified: trunk/reactos/include/ntsecapi.h Modified: trunk/reactos/include/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ntsecapi.h?rev=225… ============================================================================== --- trunk/reactos/include/ntsecapi.h (original) +++ trunk/reactos/include/ntsecapi.h Sun Jun 25 01:14:41 2006 @@ -374,8 +374,10 @@ LONG DomainIndex; } LSA_TRANSLATED_NAME, *PLSA_TRANSLATED_NAME; -#ifndef _NTDEF_ +#if defined(_NTDEF_) && !defined(UNICODE_STRING) typedef LSA_UNICODE_STRING UNICODE_STRING, *PUNICODE_STRING; +#endif +#if defined(_NTDEF_) && !defined(STRING) typedef LSA_STRING STRING, *PSTRING ; #endif

18 years, 4 months

[hpoussin] 22588: Update wincrypt.h header (sync with Wine)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Jun 25 00:59:20 2006 New Revision: 22588 URL: http://svn.reactos.org/svn/reactos?rev=22588&view=rev Log: Update wincrypt.h header (sync with Wine) Modified: trunk/reactos/include/winbase.h trunk/reactos/include/wincrypt.h Modified: trunk/reactos/include/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/winbase.h?rev=2258… ============================================================================== --- trunk/reactos/include/winbase.h (original) +++ trunk/reactos/include/winbase.h Sun Jun 25 00:59:20 2006 @@ -778,7 +778,7 @@ WORD wMinute; WORD wSecond; WORD wMilliseconds; -} SYSTEMTIME,*LPSYSTEMTIME; +} SYSTEMTIME,*LPSYSTEMTIME,*PSYSTEMTIME; typedef struct _WIN32_FILE_ATTRIBUTE_DATA { DWORD dwFileAttributes; FILETIME ftCreationTime; Modified: trunk/reactos/include/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/wincrypt.h?rev=225… ============================================================================== --- trunk/reactos/include/wincrypt.h (original) +++ trunk/reactos/include/wincrypt.h Sun Jun 25 00:59:20 2006 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_WINCRYPT_H @@ -128,6 +128,29 @@ DWORD cUnusedBits; } CRYPT_BIT_BLOB, *PCRYPT_BIT_BLOB; +typedef struct _CRYPT_KEY_PROV_PARAM { + DWORD dwParam; + BYTE *pbData; + DWORD cbData; + DWORD dwFlags; +} CRYPT_KEY_PROV_PARAM, *PCRYPT_KEY_PROV_PARAM; + +typedef struct _CRYPT_KEY_PROV_INFO { + LPWSTR pwszContainerName; + LPWSTR pwszProvName; + DWORD dwProvType; + DWORD dwFlags; + DWORD cProvParam; + PCRYPT_KEY_PROV_PARAM rgProvParam; + DWORD dwKeySpec; +} CRYPT_KEY_PROV_INFO, *PCRYPT_KEY_PROV_INFO; + +typedef struct _CERT_KEY_CONTEXT { + DWORD cbSize; + HCRYPTPROV hCryptProv; + DWORD dwKeySpec; +} CERT_KEY_CONTEXT, *PCERT_KEY_CONTEXT; + typedef struct _CERT_PUBLIC_KEY_INFO { CRYPT_ALGORITHM_IDENTIFIER Algorithm; CRYPT_BIT_BLOB PublicKey; @@ -892,6 +915,89 @@ typedef BOOL (WINAPI *PFN_CRYPT_ENUM_OID_INFO)(PCCRYPT_OID_INFO pInfo, void *pvArg); + +typedef struct _CRYPT_SIGN_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgEncodingType; + PCCERT_CONTEXT pSigningCert; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void * pvHashAuxInfo; + DWORD cMsgCert; + PCCERT_CONTEXT *rgpMsgCert; + DWORD cMsgCrl; + PCCRL_CONTEXT *rgpMsgCrl; + DWORD cAuthAttr; + PCRYPT_ATTRIBUTE rgAuthAttr; + DWORD cUnauthAttr; + PCRYPT_ATTRIBUTE rgUnauthAttr; + DWORD dwFlags; + DWORD dwInnerContentType; +#ifdef CRYPT_SIGN_MESSAGE_PARA_HAS_CMS_FIELDS + CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm; + void * pvHashEncryptionAuxInfo; +#endif +} CRYPT_SIGN_MESSAGE_PARA, *PCRYPT_SIGN_MESSAGE_PARA; + +#define CRYPT_MESSAGE_BARE_CONTENT_OUT_FLAG 0x00000001 +#define CRYPT_MESSAGE_ENCAPSULATED_CONTENT_OUT_FLAG 0x00000002 +#define CRYPT_MESSAGE_KEYID_SIGNER_FLAG 0x00000004 +#define CRYPT_MESSAGE_SILENT_KEYSET_FLAG 0x00000008 + +typedef PCCERT_CONTEXT (WINAPI *PFN_CRYPT_GET_SIGNER_CERTIFICATE)(void *pvArg, + DWORD dwCertEncodingType, PCERT_INFO pSignerId, HCERTSTORE hMsgCertStore); + +typedef struct _CRYPT_VERIFY_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgAndCertEncodingType; + HCRYPTPROV hCryptProv; + PFN_CRYPT_GET_SIGNER_CERTIFICATE pfnGetSignerCertificate; + void * pvGetArg; +} CRYPT_VERIFY_MESSAGE_PARA, *PCRYPT_VERIFY_MESSAGE_PARA; + +typedef struct _CRYPT_ENCRYPT_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgEncodingType; + HCRYPTPROV hCryptProv; + CRYPT_ALGORITHM_IDENTIFIER ContentEncryptionAlgorithm; + void * pvEncryptionAuxInfo; + DWORD dwFlags; + DWORD dwInnerContentType; +} CRYPT_ENCRYPT_MESSAGE_PARA, *PCRYPT_ENCRYPT_MESSAGE_PARA; + +#define CRYPT_MESSAGE_KEYID_RECIPIENT_FLAG 0x00000004 + +typedef struct _CRYPT_DECRYPT_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgAndCertEncodingType; + DWORD cCertStore; + HCERTSTORE *rghCertStore; +#ifdef CRYPT_DECRYPT_MESSAGE_PARA_HAS_EXTRA_FIELDS + DWORD dwFlags; +#endif +} CRYPT_DECRYPT_MESSAGE_PARA, *PCRYPT_DECRYPT_MESSAGE_PARA; + +typedef struct _CRYPT_HASH_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgEncodingType; + HCRYPTPROV hCryptProv; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void * pvHashAuxInfo; +} CRYPT_HASH_MESSAGE_PARA, *PCRYPT_HASH_MESSAGE_PARA; + +typedef struct _CRYPT_KEY_SIGN_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgAndCertEncodingType; + HCRYPTPROV hCryptProv; + DWORD dwKeySpec; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void * pvHashAuxInfo; +} CRYPT_KEY_SIGN_MESSAGE_PARA, *PCRYPT_KEY_SIGN_MESSAGE_PARA; + +typedef struct _CRYPT_KEY_VERIFY_MESSAGE_PARA { + DWORD cbSize; + DWORD dwMsgEncodingType; + HCRYPTPROV hCryptProv; +} CRYPT_KEY_VERIFY_MESSAGE_PARA, *PCRYPT_KEY_VERIFY_MESSAGE_PARA; typedef struct _CRYPT_URL_ARRAY { DWORD cUrl; @@ -1916,6 +2022,22 @@ #define CERT_FIND_VALID_ENHKEY_USAGE_FLAG 0x20 #define CERT_FIND_VALID_CTL_USAGE_FLAG 0x20 +#define CRL_FIND_ANY 0 +#define CRL_FIND_ISSUED_BY 1 +#define CRL_FIND_EXISTING 2 +#define CRL_FIND_ISSUED_FOR 3 + +#define CRL_FIND_ISSUED_BY_AKI_FLAG 0x1 +#define CRL_FIND_ISSUED_BY_SIGNATURE_FLAG 0x2 +#define CRL_FIND_ISSUED_BY_DELTA_FLAG 0x4 +#define CRL_FIND_ISSUED_BY_BASE_FLAG 0x8 + +typedef struct _CRL_FIND_ISSUED_FOR_PARA +{ + PCCERT_CONTEXT pSubjectCert; + PCCERT_CONTEXT pIssuerCert; +} CRL_FIND_ISSUED_FOR_PARA, *PCRL_FIND_ISSUED_FOR_PARA; + /* PFN_CERT_STORE_PROV_WRITE_CERT dwFlags values */ #define CERT_STORE_PROV_WRITE_ADD_FLAG 0x1 @@ -1928,6 +2050,21 @@ (1 << CERT_STORE_CERTIFICATE_CONTEXT) #define CERT_STORE_CRL_CONTEXT_FLAG (1 << CERT_STORE_CRL_CONTEXT) #define CERT_STORE_CTL_CONTEXT_FLAG (1 << CERT_STORE_CTL_CONTEXT) + +/* CryptBinaryToString/CryptStringToBinary flags */ +#define CRYPT_STRING_BASE64HEADER 0x00000000 +#define CRYPT_STRING_BASE64 0x00000001 +#define CRYPT_STRING_BINARY 0x00000002 +#define CRYPT_STRING_BASE64REQUESTHEADER 0x00000003 +#define CRYPT_STRING_HEX 0x00000004 +#define CRYPT_STRING_HEXASCII 0x00000005 +#define CRYPT_STRING_BASE64_ANY 0x00000006 +#define CRYPT_STRING_ANY 0x00000007 +#define CRYPT_STRING_HEX_ANY 0x00000008 +#define CRYPT_STRING_BASE64X509CRLHEADER 0x00000009 +#define CRYPT_STRING_HEXADDR 0x0000000a +#define CRYPT_STRING_HEXASCIIADDR 0x0000000b +#define CRYPT_STRING_NOCR 0x80000000 /* OIDs */ #define szOID_RSA "1.2.840.113549" @@ -2366,6 +2503,15 @@ #define CRYPT_UNICODE_NAME_DECODE_DISABLE_IE4_UTF8_FLAG \ CERT_RDN_DISABLE_IE4_UTF8_FLAG +#define CERT_STORE_SIGNATURE_FLAG 0x00000001 +#define CERT_STORE_TIME_VALIDITY_FLAG 0x00000002 +#define CERT_STORE_REVOCATION_FLAG 0x00000004 +#define CERT_STORE_NO_CRL_FLAG 0x00010000 +#define CERT_STORE_NO_ISSUER_FLAG 0x00020000 + +#define CERT_STORE_BASE_CRL_FLAG 0x00000100 +#define CERT_STORE_DELTA_CRL_FLAG 0x00000200 + /* subject types for CryptVerifyCertificateSignatureEx */ #define CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB 1 #define CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT 2 @@ -2407,6 +2553,12 @@ #define CERT_NAME_ISSUER_FLAG 0x00000001 #define CERT_NAME_DISABLE_IE4_UTF8_FLAG 0x00010000 + +#define CERT_SET_KEY_PROV_HANDLE_PROP_ID 0x00000001 +#define CERT_SET_KEY_CONTEXT_PROP_ID 0x00000001 + +#define CERT_CREATE_SELFSIGN_NO_SIGN 1 +#define CERT_CREATE_SELFSIGN_NO_KEY_INFO 2 /* function declarations */ /* advapi32.dll */ @@ -2486,6 +2638,20 @@ LPVOID WINAPI CryptMemRealloc(LPVOID pv, ULONG cbSize); VOID WINAPI CryptMemFree(LPVOID pv); +BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary, + DWORD cbBinary, DWORD dwFlags, LPSTR pszString, DWORD *pcchString); +BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, + DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString); +#define CryptBinaryToString WINELIB_NAME_AW(CryptBinaryToString) + +BOOL WINAPI CryptStringToBinaryA(LPCSTR pszString, + DWORD cchString, DWORD dwFlags, BYTE *pbBinary, DWORD *pcbBinary, + DWORD *pdwSkip, DWORD *pdwFlags); +BOOL WINAPI CryptStringToBinaryW(LPCWSTR pszString, + DWORD cchString, DWORD dwFlags, BYTE *pbBinary, DWORD *pcbBinary, + DWORD *pdwSkip, DWORD *pdwFlags); +#define CryptStringToBinary WINELIB_NAME_AW(CryptStringToBinary) + BOOL WINAPI CryptRegisterDefaultOIDFunction(DWORD,LPCSTR,DWORD,LPCWSTR); BOOL WINAPI CryptRegisterOIDFunction(DWORD,LPCSTR,LPCSTR,LPCWSTR,LPCSTR); BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, @@ -2655,6 +2821,15 @@ const BYTE *pbElement, DWORD cbElement, DWORD dwAddDisposition, DWORD dwFlags, DWORD dwContextTypeFlags, DWORD *pdwContentType, const void **ppvContext); +BOOL WINAPI CertCompareCertificate(DWORD dwCertEncodingType, + PCERT_INFO pCertId1, PCERT_INFO pCertId2); +BOOL WINAPI CertCompareCertificateName(DWORD dwCertEncodingType, + PCERT_NAME_BLOB pCertName1, PCERT_NAME_BLOB pCertName2); +BOOL WINAPI CertCompareIntegerBlob(PCRYPT_INTEGER_BLOB pInt1, + PCRYPT_INTEGER_BLOB pInt2); +BOOL WINAPI CertComparePublicKeyInfo(DWORD dwCertEncodingType, + PCERT_PUBLIC_KEY_INFO pPublicKey1, PCERT_PUBLIC_KEY_INFO pPublicKey2); + const void *CertCreateContext(DWORD dwContextType, DWORD dwEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCERT_CREATE_CONTEXT_PARA pCreatePara); @@ -2668,6 +2843,12 @@ PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, const BYTE *pbCtlEncoded, DWORD cbCtlEncoded); +PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV hProv, + PCERT_NAME_BLOB pSubjectIssuerBlob, DWORD dwFlags, + PCRYPT_KEY_PROV_INFO pKeyProvInfo, + PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, PSYSTEMTIME pStartTime, + PSYSTEMTIME pEndTime, PCERT_EXTENSIONS pExtensions); + BOOL WINAPI CertDeleteCertificateFromStore(PCCERT_CONTEXT pCertContext); BOOL WINAPI CertDeleteCRLFromStore(PCCRL_CONTEXT pCrlContext); @@ -2692,6 +2873,16 @@ PCCTL_CONTEXT WINAPI CertFindCTLInStore(HCERTSTORE hCertStore, DWORD dwCertEncodingType, DWORD dwFindFlags, DWORD dwFindType, const void *pvFindPara, PCCTL_CONTEXT pPrevCtlContext); + +PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore(HCERTSTORE hCertStore, + PCCERT_CONTEXT pSubjectContext, PCCERT_CONTEXT pPrevIssuerContext, + DWORD *pdwFlags); + +PCCERT_CONTEXT WINAPI CertGetSubjectCertificateFromStore(HCERTSTORE hCertStore, + DWORD dwCertEncodingType, PCERT_INFO pCertId); + +PCCRL_CONTEXT WINAPI CertGetCRLFromStore(HCERTSTORE hCertStore, + PCCERT_CONTEXT pIssuerContext, PCCRL_CONTEXT pPrevCrlContext, DWORD *pdwFlags); BOOL WINAPI CertSerializeCertificateStoreElement(PCCERT_CONTEXT pCertContext, DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement); @@ -2764,6 +2955,19 @@ CERT_EXTENSION rgExtensions[]); PCERT_RDN_ATTR WINAPI CertFindRDNAttr(LPCSTR pszObjId, PCERT_NAME_INFO pName); +BOOL WINAPI CertIsValidCRLForCertificate(PCCERT_CONTEXT pCert, + PCCRL_CONTEXT pCrl, DWORD dwFlags, void *pvReserved); +BOOL WINAPI CertFindCertificateInCRL(PCCERT_CONTEXT pCert, + PCCRL_CONTEXT pCrlContext, DWORD dwFlags, void *pvReserved, + PCRL_ENTRY *ppCrlEntry); +BOOL WINAPI CertVerifyCRLRevocation(DWORD dwCertEncodingType, + PCERT_INFO pCertId, DWORD cCrlInfo, PCRL_INFO rgpCrlInfo[]); + +BOOL WINAPI CertVerifySubjectCertificateContext(PCCERT_CONTEXT pSubject, + PCCERT_CONTEXT pIssuer, DWORD *pdwFlags); + +LONG WINAPI CertVerifyCRLTimeValidity(LPFILETIME pTimeToVerify, + PCRL_INFO pCrlInfo); LONG WINAPI CertVerifyTimeValidity(LPFILETIME pTimeToVerify, PCERT_INFO pCertInfo); @@ -2812,6 +3016,71 @@ LPCWSTR *ppszError); #define CertStrToName WINELIB_NAME_AW(CertStrToName) +BOOL WINAPI CryptSignMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara, + BOOL fDetachedSignature, DWORD cToBeSigned, const BYTE *rgpbToBeSigned[], + DWORD rgcbToBeSigned[], BYTE *pbSignedBlob, DWORD *pcbSignedBlob); +BOOL WINAPI CryptSignMessageWithKey(PCRYPT_KEY_SIGN_MESSAGE_PARA pSignPara, + const BYTE *pbToBeSigned, DWORD cbToBeSigned, BYTE *pbSignedBlob, + DWORD *pcbSignedBlob); + +BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, + DWORD dwSignerIndex, const BYTE* pbSignedBlob, DWORD cbSignedBlob, + BYTE* pbDecoded, DWORD* pcbDecoded, PCCERT_CONTEXT* ppSignerCert); +BOOL WINAPI CryptVerifyMessageSignatureWithKey( + PCRYPT_KEY_VERIFY_MESSAGE_PARA pVerifyPara, + PCERT_PUBLIC_KEY_INFO pPublicKeyInfo, const BYTE *pbSignedBlob, + DWORD cbSignedBlob, BYTE *pbDecoded, DWORD *pcbDecoded); + +BOOL WINAPI CryptVerifyDetachedMessageSignature( + PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, DWORD dwSignerIndex, + const BYTE *pbDetachedSignBlob, DWORD cbDetachedSignBlob, DWORD cToBeSigned, + const BYTE *rgpbToBeSigned[], DWORD rgcbToBeSigned[], + PCCERT_CONTEXT *ppSignerCert); +LONG WINAPI CryptGetMessageSignerCount(DWORD dwMsgEncodingType, + const BYTE *pbSignedBlob, DWORD cbSignedBlob); + +BOOL WINAPI CryptEncryptMessage(PCRYPT_ENCRYPT_MESSAGE_PARA pEncryptPara, + DWORD cRecipientCert, PCCERT_CONTEXT rgpRecipientCert[], + const BYTE *pbToBeEncrypted, DWORD cbToBeEncrypted, BYTE *pbEncryptedBlob, + DWORD *pcbEncryptedBlob); +BOOL WINAPI CryptDecryptMessage(PCRYPT_DECRYPT_MESSAGE_PARA pDecryptPara, + const BYTE *pbEncryptedBlob, DWORD cbEncryptedBlob, BYTE *pbDecrypted, + DWORD *pcbDecrypted, PCCERT_CONTEXT *ppXchgCert); + +BOOL WINAPI CryptSignAndEncryptMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara, + PCRYPT_ENCRYPT_MESSAGE_PARA pEncryptPara, DWORD cRecipientCert, + PCCERT_CONTEXT rgpRecipientCert[], const BYTE *pbToBeSignedAndEncrypted, + DWORD cbToBeSignedAndEncrypted, BYTE *pbSignedAndEncryptedBlob, + DWORD *pcbSignedAndEncryptedBlob); +BOOL WINAPI CryptDecryptAndVerifyMessageSignature( + PCRYPT_DECRYPT_MESSAGE_PARA pDecryptPara, + PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, DWORD dwSignerIndex, + const BYTE *pbEncryptedBlob, DWORD cbEncryptedBlob, BYTE *pbDecrypted, + DWORD *pcbDecrypted, PCCERT_CONTEXT *ppXchgCert, PCCERT_CONTEXT *ppSignerCert); + +HCERTSTORE WINAPI CryptGetMessageCertificates(DWORD dwMsgAndCertEncodingType, + HCRYPTPROV hCryptProv, DWORD dwFlags, const BYTE *pbSignedBlob, + DWORD cbSignedBlob); + +BOOL WINAPI CryptDecodeMessage(DWORD dwMsgTypeFlags, + PCRYPT_DECRYPT_MESSAGE_PARA pDecryptPara, + PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, DWORD dwSignerIndex, + const BYTE *pbEncodedBlob, DWORD cbEncodedBlob, DWORD dwPrevInnerContentType, + DWORD *pdwMsgType, DWORD *pdwInnerContentType, BYTE *pbDecoded, + DWORD *pcbDecoded, PCCERT_CONTEXT *ppXchgCert, PCCERT_CONTEXT *ppSignerCert); + +BOOL WINAPI CryptHashMessage(PCRYPT_HASH_MESSAGE_PARA pHashPara, + BOOL fDetachedHash, DWORD cToBeHashed, const BYTE *rgpbToBeHashed[], + DWORD rgcbToBeHashed[], BYTE *pbHashedBlob, DWORD *pcbHashedBlob, + BYTE *pbComputedHash, DWORD *pcbComputedHash); +BOOL WINAPI CryptVerifyMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, + BYTE *pbHashedBlob, DWORD cbHashedBlob, BYTE *pbToBeHashed, + DWORD *pcbToBeHashed, BYTE *pbComputedHash, DWORD *pcbComputedHash); +BOOL WINAPI CryptVerifyDetachedMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, + BYTE *pbDetachedHashBlob, DWORD cbDetachedHashBlob, DWORD cToBeHashed, + const BYTE *rgpbToBeHashed[], DWORD rgcbToBeHashed[], BYTE *pbComputedHash, + DWORD *pcbComputedHash); + /* cryptnet.dll functions */ BOOL WINAPI CryptGetObjectUrl(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags, PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, PCRYPT_URL_INFO pUrlInfo,

18 years, 4 months

[greatlrd] 22587: Copy trunk rev 22585 to new branches/powerpc

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jun 25 00:44:47 2006 New Revision: 22587 URL: http://svn.reactos.org/svn/reactos?rev=22587&view=rev Log: Copy trunk rev 22585 to new branches/powerpc Added: branches/powerpc/ - copied from r22586, trunk/

18 years, 4 months

[greatlrd] 22586: arty did say it should be delete and then recreate it

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jun 25 00:42:49 2006 New Revision: 22586 URL: http://svn.reactos.org/svn/reactos?rev=22586&view=rev Log: arty did say it should be delete and then recreate it Removed: branches/powerpc/

18 years, 4 months

[hpoussin] 22585: Fix MLLoadLibraryA/W prototypes

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Jun 25 00:40:55 2006 New Revision: 22585 URL: http://svn.reactos.org/svn/reactos?rev=22585&view=rev Log: Fix MLLoadLibraryA/W prototypes Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/url.c trunk/reactos/include/shlwapi.h Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c Sun Jun 25 00:40:55 2006 @@ -3419,7 +3419,7 @@ * Success: A handle to the loaded module * Failure: A NULL handle. */ -HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags) +HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCodePage) { /* FIXME: Native appears to do DPA_Create and a DPA_InsertPtr for * each call here. @@ -3443,7 +3443,7 @@ LPSTR ptr; DWORD len; - FIXME("(%s,%p,0x%08lx) semi-stub!\n", debugstr_a(new_mod), inst_hwnd, dwFlags); + FIXME("(%s,%p,0x%08lx) semi-stub!\n", debugstr_a(new_mod), inst_hwnd, bCrossCodePage); len = GetModuleFileNameA(inst_hwnd, mod_path, sizeof(mod_path)); if (!len || len >= sizeof(mod_path)) return NULL; @@ -3461,13 +3461,13 @@ * * Unicode version of MLLoadLibraryA. */ -HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags) +HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCodePage) { WCHAR mod_path[2*MAX_PATH]; LPWSTR ptr; DWORD len; - FIXME("(%s,%p,0x%08lx) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, dwFlags); + FIXME("(%s,%p,0x%08lx) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, bCrossCodePage); len = GetModuleFileNameW(inst_hwnd, mod_path, sizeof(mod_path) / sizeof(WCHAR)); if (!len || len >= sizeof(mod_path) / sizeof(WCHAR)) return NULL; Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c (original) +++ trunk/reactos/dll/win32/shlwapi/url.c Sun Jun 25 00:40:55 2006 @@ -36,7 +36,6 @@ #include "shlwapi.h" #include "wine/debug.h" -HMODULE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,DWORD); BOOL WINAPI MLFreeLibrary(HMODULE); HRESULT WINAPI MLBuildResURLW(LPCWSTR,HMODULE,DWORD,LPCWSTR,LPWSTR,DWORD); Modified: trunk/reactos/include/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/shlwapi.h?rev=2258… ============================================================================== --- trunk/reactos/include/shlwapi.h (original) +++ trunk/reactos/include/shlwapi.h Sun Jun 25 00:40:55 2006 @@ -551,8 +551,8 @@ WINSHLWAPI int WINAPI wvnsprintfA(LPSTR,int,LPCSTR,va_list); WINSHLWAPI int WINAPI wvnsprintfW(LPWSTR,int,LPCWSTR,va_list); -HINSTANCE WINAPI MLLoadLibraryA(LPCSTR,HMODULE,DWORD); -HINSTANCE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,DWORD); +HINSTANCE WINAPI MLLoadLibraryA(LPCSTR,HMODULE,BOOL); +HINSTANCE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,BOOL); HRESULT WINAPI DllInstall(BOOL,LPCWSTR);

18 years, 4 months

[frik85] 22584: RSDB: * add more options to the AJAX search script RosCMS: * add AJAX website content search script

by frik85＠svn.reactos.org

Author: frik85 Date: Sun Jun 25 00:22:53 2006 New Revision: 22584 URL: http://svn.reactos.org/svn/reactos?rev=22584&view=rev Log: RSDB: * add more options to the AJAX search script RosCMS: * add AJAX website content search script Added: trunk/web/reactos.org/htdocs/roscms/search.php Modified: trunk/web/reactos.org/htdocs/support/search.js Added: trunk/web/reactos.org/htdocs/roscms/search.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/sear… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/search.php (added) +++ trunk/web/reactos.org/htdocs/roscms/search.php Sun Jun 25 00:22:53 2006 @@ -1,0 +1,82 @@ +<?php + /* + RosCMS - Search Function + Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + + require_once("connect.db.php"); + + $RSDB_SET_search=""; // Search string + $RSDB_SET_search_lang=""; // Search language + if (array_key_exists("search", $_GET)) $RSDB_SET_search=htmlspecialchars($_GET["search"]); + if (array_key_exists("searchlang", $_GET)) $RSDB_SET_search_lang=htmlspecialchars($_GET["searchlang"]); + if ($RSDB_SET_search_lang == "en") { + $RSDB_SET_search_lang = "all"; + } + + $query_count_groups=mysql_query("SELECT COUNT(content_id) + FROM `content`, `pages` + WHERE content_active = '1' + AND + ( content_name LIKE '%" . mysql_real_escape_string($RSDB_SET_search) . "%' + OR content_text LIKE '%" . mysql_real_escape_string($RSDB_SET_search) . "%' + ) + AND content_name = page_name + AND page_active = '1' + AND content_lang = '". mysql_real_escape_string($RSDB_SET_search_lang) ."' + ORDER BY `page_name` ASC + LIMIT 0 , 20 ;"); + $result_count_groups = mysql_fetch_row($query_count_groups); + +header( 'Content-type: text/xml' ); +echo '<?xml version="1.0" encoding="UTF-8"?> +<root> +'; + + if (!$result_count_groups[0]) { + echo " #none#\n"; + } + else { + echo " ".$result_count_groups[0]."\n"; + } + +if ($RSDB_SET_search != "" || strlen($RSDB_SET_search) > 1) { + + $query_page = mysql_query("SELECT content.content_name, content.content_id, pages.page_title + FROM `content`, `pages` + WHERE content_active = '1' + AND + ( content_name LIKE '%" . mysql_real_escape_string($RSDB_SET_search) . "%' + OR content_text LIKE '%" . mysql_real_escape_string($RSDB_SET_search) . "%' + ) + AND content_name = page_name + AND page_active = '1' + AND content_lang = '". mysql_real_escape_string($RSDB_SET_search_lang) ."' + GROUP BY page_name, content_name + ORDER BY `content_id` DESC + LIMIT 0 , 15 ;"); + while($result_page = mysql_fetch_array($query_page)) { // Pages +?> + <dbentry> + <content id="<?php echo $result_page['page_title']; ?>"><?php echo $result_page['content_name']; ?></content> + </dbentry> +<? + } +} +?> +</root> Modified: trunk/web/reactos.org/htdocs/support/search.js URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/support/sea… ============================================================================== --- trunk/web/reactos.org/htdocs/support/search.js (original) +++ trunk/web/reactos.org/htdocs/support/search.js Sun Jun 25 00:22:53 2006 @@ -11,8 +11,10 @@ var tWhere = ""; var tPicAnimation = ""; var tResults = ""; - var twebsite = "http://localhost/reactos.org/support/index.php"; - //var twebsite = "http://www.reactos.org/support/index.php"; + //var twebsite = "http://localhost/reactos.org/support/index.php"; + //var twebsite2 = "http://localhost/reactos.org/"; + var twebsite = "http://www.reactos.org/support/index.php"; + var twebsite2 = "http://www.reactos.org/"; function writeItemList_style_header() { @@ -58,6 +60,12 @@ return tempb; } + function write_rosweb_entry(itemname, itemid) { + var tempb = ""; + tempb += "<a href=\""+twebsite2+"?page=" + itemid + "\">• " + itemname + "</a>\n"; + return tempb; + } + function write_compsubmit_header() { var tempa = ""; @@ -137,32 +145,37 @@ if (asearch.length > 1) { document.getElementById(tResults).style.display = "block"; document.getElementById(tPicAnimation).style.display = "inline"; - if (asearch != "") { - setCursor('wait'); - if (http_request && (http_request.readyState == 2 || http_request.readyState == 3)) { - http_request.abort(); // stop running request - } - - if (tWhere == "comp") { - makeRequest(twebsite+'?page=dat&export=grplst&search='+asearch); - } - else if (tWhere == "vendor") { - //alert("vendor"); - makeRequest(twebsite+'?page=dat&export=vdrlst&search='+asearch); - } - } - } - else { + if (asearch != "") { + setCursor('wait'); + if (http_request && (http_request.readyState == 2 || http_request.readyState == 3)) { + http_request.abort(); // stop running request + } + + + if (tWhere == "comp") { + makeRequest(twebsite+'?page=dat&export=grplst&search='+asearch); + } + else if (tWhere == "vendor") { + //alert("vendor"); + makeRequest(twebsite+'?page=dat&export=vdrlst&search='+asearch); + } + else if (tWhere.substr(0, 6) == "roscms") { + //alert("vendor"); + makeRequest(twebsite2+'roscms/search.php?search='+asearch+'&searchlang='+tWhere.substr(7, 2)); + } + } + } + else { document.getElementById(tResults).style.display = "none"; document.getElementById(tPicAnimation).style.display = "none"; deleteItemList(); - } + } } function setCursor(mode) { - var pageBody = document.getElementsByTagName("body")[0]; - pageBody.style.cursor = mode; + var pageBody = document.getElementsByTagName("body")[0]; + pageBody.style.cursor = mode; } @@ -230,7 +243,10 @@ var vendo = http_request.responseXML.getElementsByTagName("vendor"); var vendurl = http_request.responseXML.getElementsByTagName("url"); } - + else if (tWhere.substr(0, 6) == "roscms") { + var webcontent = http_request.responseXML.getElementsByTagName("content"); + } + // Colors: var colorcur=""; var color1="#E2E2E2"; @@ -245,7 +261,10 @@ else if (tWhere == "vendor") { xmllength = vendo.length; } - + else if (tWhere.substr(0, 6) == "roscms") { + xmllength = webcontent.length; + } + // XML-Loop: for (var i = 0; i < xmllength; i++) { // Table colors: @@ -271,6 +290,10 @@ else if (tView == "submit_vendor") { lstData += write_vendorsubmit_entry(vendo[i].getAttributeNode("id").value, vendo[i].firstChild.data, vendurl[i].firstChild.data, colorcur); } + else if (tView == "rosweb") { + lstData += write_rosweb_entry(webcontent[i].getAttributeNode("id").value, webcontent[i].firstChild.data); + } + } // Table footer: @@ -307,6 +330,9 @@ } else if (tView == "submit_vendor") { document.getElementById(tResults).innerHTML = "Your search - " + tSearch + " - did not match any database entries.Choose a vendor from the <a href=\"javascript://\" onclick=\"SelectVendor()\">vendor list</a> or <a href=\"javascript://\" onclick=\"AddVendor()\">submit a new vendor</a> to the database."; + } + else if (tView == "rosweb") { + document.getElementById(tResults).innerHTML = "<center>no entries found</center>"; } }

18 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006