Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[ekohl] 13094: Set the environment variables %USERPROFILE% and %ALLUSERSPROFILE% for the Live-CD. Fixes bug #479.

by ekohl＠svn.reactos.com

Set the environment variables %USERPROFILE% and %ALLUSERSPROFILE% for the Live-CD. Fixes bug #479. Patch by tinus. Modified: trunk/reactos/bootdata/livecd.inf _____ Modified: trunk/reactos/bootdata/livecd.inf --- trunk/reactos/bootdata/livecd.inf 2005-01-17 07:31:12 UTC (rev 13093) +++ trunk/reactos/bootdata/livecd.inf 2005-01-17 09:50:10 UTC (rev 13094) @@ -31,4 +31,8 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders","Desktop",0x00020000,"%SystemDrive%\Profiles\Default User\Desktop" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders","Personal",0x00020000,"%SystemDrive%\Profiles\Default User\My Documents" +; User Profile environment variables +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","USERPROFILE",0x00020000,"%SystemRoot%\Profiles\Def ault User" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ALLUSERSPROFILE",0x00020000,"%SystemRoot%\Profiles \All Users" + ; EOF

19 years, 10 months

[ion] 13093: The actual fix...

by ion＠svn.reactos.com

The actual fix... Modified: trunk/reactos/lib/d3d8thk/win32k.S _____ Modified: trunk/reactos/lib/d3d8thk/win32k.S --- trunk/reactos/lib/d3d8thk/win32k.S 2005-01-17 07:25:38 UTC (rev 13092) +++ trunk/reactos/lib/d3d8thk/win32k.S 2005-01-17 07:31:12 UTC (rev 13093) @@ -1 +1 @@ -#include "../gdi32/misc/win32k.c" +#include "../gdi32/misc/win32k.S"

19 years, 10 months

[ion] 13092: SVN Stupidity

by ion＠svn.reactos.com

SVN Stupidity Added: trunk/reactos/lib/d3d8thk/win32k.S _____ Copied: trunk/reactos/lib/d3d8thk/win32k.S (from rev 13091, trunk/reactos/win32k.S)

19 years, 10 months

[ion] 13091: Small fix

by ion＠svn.reactos.com

Small fix Deleted: trunk/reactos/lib/d3d8thk/win32k.c Added: trunk/reactos/win32k.S _____ Deleted: trunk/reactos/lib/d3d8thk/win32k.c --- trunk/reactos/lib/d3d8thk/win32k.c 2005-01-17 07:10:34 UTC (rev 13090) +++ trunk/reactos/lib/d3d8thk/win32k.c 2005-01-17 07:24:10 UTC (rev 13091) @@ -1 +0,0 @@ -#include "../gdi32/misc/win32k.c" _____ Copied: trunk/reactos/win32k.S (from rev 13090, trunk/reactos/lib/d3d8thk/win32k.c)

19 years, 10 months

[ion] 13090: SYSENTER support, INT2E Optimization, new Syscall Table/Stub generator and svn:ignore fixes. Please read associated Mailing List Post.

by ion＠svn.reactos.com

SYSENTER support, INT2E Optimization, new Syscall Table/Stub generator and svn:ignore fixes. Please read associated Mailing List Post. Modified: trunk/reactos/Makefile Modified: trunk/reactos/config Deleted: trunk/reactos/iface/ Modified: trunk/reactos/include/napi/shared_data.h Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h Modified: trunk/reactos/ntoskrnl/ke/i386/bthread.S Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c Modified: trunk/reactos/ntoskrnl/ke/i386/stkswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/process.c Modified: trunk/reactos/ntoskrnl/ps/i386/continue.c Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c Added: trunk/reactos/tools/nci/ Added: trunk/reactos/tools/nci/makefile Added: trunk/reactos/tools/nci/ncitool.c Added: trunk/reactos/tools/nci/sysfuncs.lst Added: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-01-17 01:30:26 UTC (rev 13089) +++ trunk/reactos/Makefile 2005-01-17 07:10:34 UTC (rev 13090) @@ -130,7 +130,7 @@ all: bootstrap $(BOOT_LOADERS) $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) \ $(DLLS) $(SUBSYS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) $(APPS) $(EXT_MODULES) -bootstrap: dk implib iface_native iface_additional +bootstrap: dk implib iface_native depends: $(LIB_STATIC:%=%_depends) $(LIB_FSLIB:%=%_depends) msvcrt_depends $(DLLS:%=%_depends) \ $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \ @@ -147,7 +147,7 @@ $(KERNEL_DRIVERS:%=%_test) $(SUBSYS:%=%_test) \ $(SYS_SVC:%=%_test) $(EXT_MODULES:%=%_test) -clean: tools dk_clean iface_native_clean iface_additional_clean hallib_clean \ +clean: tools dk_clean iface_native_clean hallib_clean \ $(BOOT_LOADERS:%=%_clean) $(HALS:%=%_clean) $(COMPONENTS:%=%_clean) \ $(BUS:%=%_clean) $(LIB_STATIC:%=%_clean) $(LIB_FSLIB:%=%_clean) \ msvcrt_clean $(DLLS:%=%_clean) $(KERNEL_DRIVERS:%=%_clean) \ @@ -462,37 +462,21 @@ # Interfaces # iface_native: - $(MAKE) --silent -C iface/native + $(MAKE) --silent -C tools/nci iface_native_implib: iface_native_test: iface_native_clean: - $(MAKE) --silent -C iface/native clean + $(MAKE) --silent -C tools/nci clean iface_native_install: iface_native_bootcd: -iface_additional: - $(MAKE) --silent -C iface/addsys - -iface_additional_implib: - -iface_additional_test: - -iface_additional_clean: - $(MAKE) --silent -C iface/addsys clean - -iface_additional_install: - -iface_additional_bootcd: - .PHONY: iface_native iface_native_implib iface_native_test iface_native_clean \ - iface_native_install iface_native_bootcd iface_additional \ - iface_additional_implib iface_additional_test iface_additional_clean \ - iface_additional_install iface_additional_bootcd + iface_native_install iface_native_bootcd # _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-01-17 01:30:26 UTC (rev 13089) +++ trunk/reactos/config 2005-01-17 07:10:34 UTC (rev 13090) @@ -25,7 +25,7 @@ # # Whether to compile for debugging # -DBG := 0 +DBG := 0 # # Whether to compile with optimizations _____ Modified: trunk/reactos/include/napi/shared_data.h --- trunk/reactos/include/napi/shared_data.h 2005-01-17 01:30:26 UTC (rev 13089) +++ trunk/reactos/include/napi/shared_data.h 2005-01-17 07:10:34 UTC (rev 13090) @@ -13,6 +13,8 @@ #define PF_PAE_ENABLED 9 #define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 +#ifndef __ASM__ + typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE { StandardDesign, @@ -62,13 +64,15 @@ BOOLEAN SafeBootMode; ULONG TraceLogging; ULONGLONG Fill0; - ULONGLONG SystemCall[4]; + UCHAR SystemCall[16]; union { volatile KSYSTEM_TIME TickCount; volatile ULONG64 TickCountQuad; }; } KUSER_SHARED_DATA, *PKUSER_SHARED_DATA; +#endif + /* Values for DosDeviceDriveType */ #define DOSDEVICE_DRIVE_UNKNOWN 0 #define DOSDEVICE_DRIVE_CALCULATE 1 @@ -102,5 +106,7 @@ #define SharedUserData ((KUSER_SHARED_DATA * const)USER_SHARED_DATA) #endif +#define KUSER_SHARED_SYSCALL 0x7FFE0300 +#define KUSER_SHARED_SYSCALL_RET 0x7FFE0304 #endif /* __INCLUDE_NAPI_SHARED_DATA_H */ Property changes on: trunk/reactos/lib/gdi32/misc ___________________________________________________________________ Name: svn:ignore - win32k.c *.o .*.d + win32k.S *.o .*.d Property changes on: trunk/reactos/lib/kbdes ___________________________________________________________________ Name: svn:ignore + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map Property changes on: trunk/reactos/lib/ntdll ___________________________________________________________________ Name: svn:ignore - temp.exp napi.asm napi.c *.tmp *.lib *.sym *.coff *.dll *.o *.a *.map doxy-doc + temp.exp napi.asm napi.S *.tmp *.lib *.sym *.coff *.dll *.o *.a *.map doxy-doc Property changes on: trunk/reactos/lib/user32/misc ___________________________________________________________________ Name: svn:ignore - win32k.c *.d *.a *.o *.sym + win32k.S *.d *.a *.o *.sym _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-01-17 01:30:26 UTC (rev 13089) +++ trunk/reactos/ntoskrnl/Makefile 2005-01-17 07:10:34 UTC (rev 13090) @@ -550,7 +550,7 @@ $(PATH_TO_TOP)/include/reactos/bugcodes.h \ $(DEP_OBJECTS) $(DEP_FILES) MSG00409.bin bugcodes.rc -ex/napi.o: ex/napi.c $(PATH_TO_TOP)/include/ntdll/napi.h +ex/napi.o: ex/zw.S $(PATH_TO_TOP)/include/ntdll/napi.h ke/main.o: ke/main.c $(PATH_TO_TOP)/include/reactos/buildno.h Property changes on: trunk/reactos/ntoskrnl/ex ___________________________________________________________________ Name: svn:ignore - *.d *.o *.sym + *.d *.o *.sym zw.S _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-01-17 01:30:26 UTC (rev 13089) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-01-17 07:10:34 UTC (rev 13090) @@ -88,6 +88,7 @@ #define X86_FEATURE_TSC 0x00000010 /* time stamp counters are present */ #define X86_FEATURE_PAE 0x00000040 /* physical address extension is present */ #define X86_FEATURE_CX8 0x00000100 /* CMPXCHG8B instruction present */ +#define X86_FEATURE_SYSCALL 0x00000800 /* SYSCALL/SYSRET support present */ #define X86_FEATURE_PGE 0x00002000 /* Page Global Enable */ #define X86_FEATURE_MMX 0x00800000 /* MMX extension present */ #define X86_FEATURE_FXSR 0x01000000 /* FXSAVE/FXRSTOR instructions present */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h --- trunk/reactos/ntoskrnl/include/internal/i386/ps.h 2005-01-17 01:30:26 UTC (rev 13089) +++ trunk/reactos/ntoskrnl/include/internal/i386/ps.h 2005-01-17 07:10:34 UTC (rev 13090) @@ -27,6 +27,7 @@ #define KTHREAD_TEB 0x20 #define KTHREAD_KERNEL_STACK 0x28 #define KTHREAD_NPX_STATE 0x31 +#define KTHREAD_PENDING_USER_APC 0x34 + 0x16 #define KTHREAD_APCSTATE_PROCESS 0x44 #define KTHREAD_SERVICE_TABLE 0xDC #define KTHREAD_PREVIOUS_MODE 0x137 _____ Modified: trunk/reactos/ntoskrnl/ke/i386/bthread.S --- trunk/reactos/ntoskrnl/ke/i386/bthread.S 2005-01-17 01:30:26 UTC (rev 13089) +++ trunk/reactos/ntoskrnl/ke/i386/bthread.S 2005-01-17 07:10:34 UTC (rev 13090) @@ -143,4 +143,4 @@ /* Load the rest of the thread's user mode context. */ movl $0, %eax - jmp KeReturnFromSystemCallWithHook + jmp _KiServiceExit _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-01-17 01:30:26 UTC (rev 13089) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-01-17 07:10:34 UTC (rev 13090) @@ -45,7 +45,7 @@ # define ARRAY_SIZE(x) (sizeof (x) / sizeof (x[0])) #endif -extern void interrupt_handler2e(void); +extern void KiSystemService(void); extern void interrupt_handler2d(void); extern VOID KiTrap0(VOID); @@ -850,7 +850,7 @@ } set_system_call_gate(0x2d,(int)interrupt_handler2d); - set_system_call_gate(0x2e,(int)interrupt_handler2e); + set_system_call_gate(0x2e,(int)KiSystemService); } /* @@ -873,30 +873,32 @@ return((NTSTATUS)OldEip); } -VOID -FASTCALL -KeRosTrapReturn ( PKTRAP_FRAME TrapFrame, PKTRAP_FRAME PrevTrapFrame ); - /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtRaiseException ( - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context, - IN BOOLEAN SearchFrames) + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN BOOLEAN SearchFrames) { - PKTRAP_FRAME TrapFrame = KeGetCurrentThread()->TrapFrame; - PKTRAP_FRAME PrevTrapFrame = (PKTRAP_FRAME)TrapFrame->Edx; + PKTHREAD Thread = KeGetCurrentThread(); + PKTRAP_FRAME TrapFrame = Thread->TrapFrame; + PKTRAP_FRAME PrevTrapFrame = (PKTRAP_FRAME)TrapFrame->Edx; - KeGetCurrentKPCR()->Tib.ExceptionList = TrapFrame->ExceptionList; + KeGetCurrentKPCR()->Tib.ExceptionList = TrapFrame->ExceptionList; - KiDispatchException(ExceptionRecord, - Context, - PsGetCurrentThread()->Tcb.TrapFrame, - (KPROCESSOR_MODE)ExGetPreviousMode(), - SearchFrames); + KiDispatchException(ExceptionRecord, + Context, + TrapFrame, + KeGetPreviousMode(), + SearchFrames); - KeRosTrapReturn ( TrapFrame, PrevTrapFrame ); - return(STATUS_SUCCESS); + /* Restore the user context */ + Thread->TrapFrame = PrevTrapFrame; + __asm__("mov %%ebx, %%esp;\n" "jmp _KiServiceExit": : "b" (TrapFrame)); + + /* We never get here */ + return(STATUS_SUCCESS); } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c --- trunk/reactos/ntoskrnl/ke/i386/gdt.c 2005-01-17 01:30:26 UTC (rev 13089) +++ trunk/reactos/ntoskrnl/ke/i386/gdt.c 2005-01-17 07:10:34 UTC (rev 13090) @@ -40,10 +40,10 @@ 0x0, 0x0, 0x0, 0x0, /* Null */ 0xffff, 0x0, 0x9a00, 0xcf, /* Kernel CS */ 0xffff, 0x0, 0x9200, 0xcf, /* Kernel DS */ - 0x0, 0x0, 0xfa00, 0xcc, /* User CS */ - 0x0, 0x0, 0xf200, 0xcc, /* User DS */ + 0x0, 0x0, 0xfa00, 0xcf, /* User CS */ + 0x0, 0x0, 0xf200, 0xcf, /* User DS */ 0x0, 0x0, 0x0, 0x0, /* TSS */ - 0x1000, 0x0000, 0x9200, 0xff00, /* PCR */ + 0x1000, 0x0000, 0x9200, 0xffc0, /* PCR */ 0x1000, 0x0, 0xf200, 0x0, /* TEB */ 0x0, 0x0, 0x0, 0x0, /* Reserved */ 0x0, 0x0, 0x0, 0x0, /* LDT */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-01-17 01:30:26 UTC (rev 13089) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-01-17 07:10:34 UTC (rev 13090) @@ -43,6 +43,7 @@ BOOLEAN Ke386Pae = FALSE; BOOLEAN Ke386PaeEnabled = FALSE; BOOLEAN Ke386GlobalPagesEnabled = FALSE; +ULONG KiFastSystemCallDisable = 0; /* FUNCTIONS *****************************************************************/ @@ -323,6 +324,18 @@ MiEnablePAE((PVOID*)LastKernelAddress); Ke386PaeEnabled = TRUE; } + + if (KPCR->PrcbData.FeatureBits & X86_FEATURE_SYSCALL) + { + extern void KiFastCallEntry(void); + + /* CS Selector of the target segment. */ + Ke386Wrmsr(0x174, KERNEL_CS, 0); + /* Target ESP. */ + Ke386Wrmsr(0x175, 0, 0); + /* Target EIP. */ + Ke386Wrmsr(0x176, (ULONG_PTR)KiFastCallEntry, 0); + } } VOID INIT_FUNCTION @@ -391,23 +404,89 @@ VOID INIT_FUNCTION Ki386SetProcessorFeatures(VOID) { - PKPCR Pcr = KeGetCurrentKPCR(); + PKPCR Pcr = KeGetCurrentKPCR(); + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + ULONG ResultLength; + KEY_VALUE_PARTIAL_INFORMATION ValueData; + NTSTATUS Status; - SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = FALSE; - SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = FALSE; - SharedUserData->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = - (Pcr->PrcbData.FeatureBits & X86_FEATURE_CX8); - SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = - (Pcr->PrcbData.FeatureBits & X86_FEATURE_MMX); - SharedUserData->ProcessorFeatures[PF_PPC_MOVEMEM_64BIT_OK] = FALSE; - SharedUserData->ProcessorFeatures[PF_ALPHA_BYTE_INSTRUCTIONS] = FALSE; - SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = - (Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE); - SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = - (Ke386CpuidExFlags & X86_EXT_FEATURE_3DNOW); - SharedUserData->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = - (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC); - SharedUserData->ProcessorFeatures[PF_PAE_ENABLED] = Ke386PaeEnabled; - SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = - (Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE2); + SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = FALSE; + SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = FALSE; + SharedUserData->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = + (Pcr->PrcbData.FeatureBits & X86_FEATURE_CX8); + SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = + (Pcr->PrcbData.FeatureBits & X86_FEATURE_MMX); + SharedUserData->ProcessorFeatures[PF_PPC_MOVEMEM_64BIT_OK] = FALSE; + SharedUserData->ProcessorFeatures[PF_ALPHA_BYTE_INSTRUCTIONS] = FALSE; + SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = + (Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE); + SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = + (Ke386CpuidExFlags & X86_EXT_FEATURE_3DNOW); + SharedUserData->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = + (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC); + SharedUserData->ProcessorFeatures[PF_PAE_ENABLED] = Ke386PaeEnabled; + SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = + (Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE2); + + /* Does the CPU Support Fast System Call? */ + if (Pcr->PrcbData.FeatureBits & X86_FEATURE_SYSCALL) { + + /* FIXME: Check for Family == 6, Model < 3 and Stepping < 3 and disable */ + + /* Make sure it's not disabled in registry */ + RtlRosInitUnicodeStringFromLiteral(&KeyName, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Session Manager\\Kernel"); + RtlRosInitUnicodeStringFromLiteral(&ValueName, + L"FastSystemCallDisable"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); + + if (NT_SUCCESS(Status)) { + + /* Read the Value then Close the Key */ + Status = NtQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + &ValueData, + sizeof(ValueData), + &ResultLength); + RtlMoveMemory(&KiFastSystemCallDisable, ValueData.Data, sizeof(ULONG)); + + NtClose(KeyHandle); + } + + } else { + + /* Disable SYSENTER/SYSEXIT, because the CPU doesn't support it */ + KiFastSystemCallDisable = 1; + + } + + if (!KiFastSystemCallDisable) { + + /* Use SYSENTER */ + SharedUserData->SystemCall[0] = 0x8B; + SharedUserData->SystemCall[1] = 0xD4; + SharedUserData->SystemCall[2] = 0x0F; + SharedUserData->SystemCall[3] = 0x34; + SharedUserData->SystemCall[4] = 0xC3; + + } else { + + /* Use INT2E */ + SharedUserData->SystemCall[0] = 0x8D; + SharedUserData->SystemCall[1] = 0x54; + SharedUserData->SystemCall[2] = 0x24; + SharedUserData->SystemCall[3] = 0x08; + SharedUserData->SystemCall[4] = 0xCD; + SharedUserData->SystemCall[5] = 0x2E; + SharedUserData->SystemCall[6] = 0xC3; + } } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/stkswitch.S --- trunk/reactos/ntoskrnl/ke/i386/stkswitch.S 2005-01-17 01:30:26 UTC (rev 13089) +++ trunk/reactos/ntoskrnl/ke/i386/stkswitch.S 2005-01-17 07:10:34 UTC (rev 13090) @@ -78,5 +78,5 @@ push $0 call _KeLowerIrql@4 - jmp KeReturnFromSystemCall + jmp _KiServiceExit _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-17 01:30:26 UTC (rev 13089) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-17 07:10:34 UTC (rev 13090) @@ -1,324 +1,317 @@ -/* - * ReactOS kernel - * Copyright (C) 2000 David Welch <welch(a)cwcom.net> - * - * 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. - */ /* $Id$ * * FILE: ntoskrnl/ke/i386/syscall.S - * PURPOSE: 2E trap handler - * PROGRAMMER: David Welch (david.welch(a)seh.ox.ac.uk) + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: System Call Handler + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) * UPDATE HISTORY: - * ??? + * ??-??-??: Original Version - David Welch(?) + * 13-01-05: Complete rewrite, added support for SYSENTER, direct kmode syscalls + * and re-wrote most of handler code. - Alex Ionescu */ #include <ddk/status.h> #include <internal/i386/segment.h> #include <internal/ps.h> #include <internal/i386/ke.h> +#include <ntos/tss.h> +#include <napi/shared_data.h> #include <roscfg.h> -#define KernelMode (0) -#define UserMode (1) +#define UserMode (1) -/* - * - */ -.globl KeReturnFromSystemCall .globl KeReturnFromSystemCallWithHook -.globl _interrupt_handler2e -_interrupt_handler2e: +.globl _KiServiceExit +.globl _KiFastCallEntry +.globl _KiSystemService - /* Construct a trap frame on the stack */ +_KiFastCallEntry: - /* Error code */ - pushl $0 - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - pushl %fs - /* Load PCR selector into fs */ - movl $PCR_SELECTOR, %ebx - movl %ebx, %fs + /* Set FS to PCR */ + movl $PCR_SELECTOR, %ecx + movw %cx, %fs + + /* Set the current stack to Kernel Stack */ + movl %fs:KPCR_TSS, %ecx + movl KTSS_ESP0(%ecx), %ecx + movl %ecx, %esp + + /* Set up a fake INT Stack. */ + pushl $USER_DS + pushl %edx /* Ring 3 SS:ESP */ + pushfl + orl $200, (%esp) /* Re-enable IRQs in EFLAGS, to fake INT */ + pushl $USER_CS + pushl $KUSER_SHARED_SYSCALL_RET + + /* User Parameter List */ + add $8, %edx + +_KiSystemService: - /* Save the old exception list */ - movl %fs:KPCR_EXCEPTION_LIST, %ebx - pushl %ebx - /* Set the exception handler chain terminator */ - movl $0xffffffff, %fs:KPCR_EXCEPTION_LIST - /* Get a pointer to the current thread */ - movl %fs:KPCR_CURRENT_THREAD, %esi - /* Save the old previous mode */ - movl $0, %ebx - movb %ss:KTHREAD_PREVIOUS_MODE(%esi), %bl - pushl %ebx - /* Set the new previous mode based on the saved CS selector */ - movl 0x24(%esp), %ebx - andl $0x0000FFFF, %ebx - cmpl $KERNEL_CS, %ebx - jne L1 - movb $KernelMode, %ss:KTHREAD_PREVIOUS_MODE(%esi) - jmp L3 -L1: - movb $UserMode, %ss:KTHREAD_PREVIOUS_MODE(%esi) -L3: + /* + * Construct a trap frame on the stack. + * The following are already on the stack. + */ + // SS + 0x0 + // ESP + 0x4 + // EFLAGS + 0x8 + // CS + 0xC + // EIP + 0x10 + pushl $0 // + 0x14 + pushl %ebp // + 0x18 + pushl %ebx // + 0x1C + pushl %esi // + 0x20 + pushl %edi // + 0x24 + pushl %fs // + 0x28 + + /* Load PCR Selector into fs */ + movw $PCR_SELECTOR, %bx + movw %bx, %fs + + /* Save the previous exception list */ + pushl %fs:KPCR_EXCEPTION_LIST // + 0x2C - /* Save other registers */ - pushl %eax - pushl %ecx - pushl %edx - pushl %ds - pushl %es - pushl %gs - pushl $0 /* DR7 */ - pushl $0 /* DR6 */ - pushl $0 /* DR3 */ - pushl $0 /* DR2 */ - pushl $0 /* DR1 */ - pushl $0 /* DR0 */ - pushl $0 /* XXX: TempESP */ - pushl $0 /* XXX: TempCS */ - pushl $0 /* XXX: DebugPointer */ - pushl $0 /* XXX: DebugArgMark */ + /* Set the exception handler chain terminator */ + movl $0xffffffff, %fs:KPCR_EXCEPTION_LIST -#ifdef DBG - /* Trick gdb 6 into backtracing over the system call */ - movl 4(%ebp), %ebx - pushl %ebx /* DebugEIP */ - movl (%ebp), %ebx - pushl %ebx /* DebugEBP */ -#else - movl 0x60(%esp), %ebx - pushl %ebx /* DebugEIP */ - pushl %ebp /* DebugEBP */ -#endif + /* Get a pointer to the current thread */ + movl %fs:KPCR_CURRENT_THREAD, %esi - /* Load the segment registers */ - movl $KERNEL_DS, %ebx - movl %ebx, %ds - movl %ebx, %es - movl %ebx, %gs + /* Save the old previous mode */ + pushl %ss:KTHREAD_PREVIOUS_MODE(%esi) // + 0x30 + + /* Set the new previous mode based on the saved CS selector */ + movl 0x24(%esp), %ebx + and $1, %ebx + movb %bl, %ss:KTHREAD_PREVIOUS_MODE(%esi) - /* - * Save the old trap frame pointer over where we would save the EDX - * register. - */ - movl KTHREAD_TRAP_FRAME(%esi), %ebx - movl %ebx, KTRAP_FRAME_EDX(%esp) + /* Save other registers */ + pushl %eax // + 0x34 + pushl %ecx // + 0x38 + pushl %edx // + 0x3C + pushl %ds // + 0x40 + pushl %es // + 0x44 + pushl %gs // + 0x48 + sub $0x28, %esp // + 0x70 - /* Allocate new Kernel stack frame */ - movl %esp,%ebp - - /* Save a pointer to the trap frame in the TCB */ - movl %ebp, KTHREAD_TRAP_FRAME(%esi) - - /* Set ES to kernel segment */ - movw $KERNEL_DS,%bx - movw %bx,%es - - /* Users's current stack frame pointer is source */ - movl %edx,%esi - - /* Determine system service table to use */ - cmpl $0x0fff, %eax - ja new_useShadowTable - - /* Check to see if EAX is valid/inrange */ - cmpl %es:_KeServiceDescriptorTable + 8, %eax - jbe new_serviceInRange - movl $STATUS_INVALID_SYSTEM_SERVICE, %eax - movl %eax, KTRAP_FRAME_EAX(%ebp) /* save our return value in PKTRAP_FRAME->Eax */ - jmp KeReturnFromSystemCall - -new_serviceInRange: - #ifdef DBG - /* GDB thinks the function starts here and - wants a standard prolog, so let's give it */ - pushl %ebp - movl %esp,%ebp - popl %ebp + /* Trick gdb 6 into backtracing over the system call */ + pushl 4(%ebp) /* DebugEIP */ // + 0x74 + pushl (%ebp) /* DebugEBP */ // + 0x78 +#else + pushl 0x60(%esp) /* DebugEIP */ // + 0x74 + pushl %ebp /* DebugEBP */ // + 0x78 #endif - /* Allocate room for argument list from kernel stack */ - movl %es:_KeServiceDescriptorTable + 12, %ecx - movb %es:(%ecx, %eax), %cl - movzx %cl, %ecx - subl %ecx, %esp + /* Load the segment registers */ + movw $KERNEL_DS, %bx + movw %bx, %ds + movw %bx, %es + movw %bx, %gs - /* Copy the arguments from the user stack to the kernel stack */ - movl %esp,%edi - cld - rep movsb + /* Save the old trap frame pointer where EDX would be saved */ + movl KTHREAD_TRAP_FRAME(%esi), %ebx + movl %ebx, KTRAP_FRAME_EDX(%esp) - /* DS is now also kernel segment */ - movw %bx, %ds + /* Allocate new Kernel stack frame */ + movl %esp,%ebp - /* Call system call hook */ - pushl %eax - call _KiSystemCallHook - popl %eax + /* Save a pointer to the trap frame in the TCB */ + movl %ebp, KTHREAD_TRAP_FRAME(%esi) - /* Make the system service call */ - movl %es:_KeServiceDescriptorTable, %ecx - movl %es:(%ecx, %eax, 4), %eax - call *%eax - movl %eax, KTRAP_FRAME_EAX(%ebp) /* save our return value in PKTRAP_FRAME->Eax */ +CheckValidCall: -#if CHECKED - /* Bump Service Counter */ -#endif - - jmp KeDeallocateStackAndReturnFromSystemCallWithHook - -new_useShadowTable: - - subl $0x1000, %eax - - /* Check to see if EAX is valid/inrange */ - cmpl %es:_KeServiceDescriptorTableShadow + 24, %eax - jbe new_shadowServiceInRange - movl $STATUS_INVALID_SYSTEM_SERVICE, %eax - movl %eax, KTRAP_FRAME_EAX(%ebp) /* save our return value in PKTRAP_FRAME->Eax */ - jmp KeReturnFromSystemCall - -new_shadowServiceInRange: - + /* + * Find out which table offset to use. Converts 0x1124 into 0x10. + * The offset is related to the Table Index as such: Offset = TableIndex x 10 + */ + movl %eax, %edi + shrl $8, %edi + andl $0x10, %edi + movl %edi, %ecx + + /* Now add the thread's base system table to the offset */ + addl KTHREAD_SERVICE_TABLE(%esi), %edi + + /* Get the true syscall ID and check it */ + movl %eax, %ebx + andl $0x0FFF, %eax + cmpl 8(%edi), %eax + + /* Invalid ID, try to load Win32K Table */ + jnb KiBBTUnexpectedRange + #ifdef DBG - /* - * GDB thinks the function starts here and - * wants a standard prolog, so let's give it - */ - pushl %ebp - movl %esp,%ebp - popl %ebp + /* + * GDB thinks the function starts here and + * wants a standard prolog, so let's give it + */ + pushl %ebp + movl %esp,%ebp + popl %ebp #endif - /* Allocate room for argument list from kernel stack */ - movl %es:_KeServiceDescriptorTableShadow + 28, %ecx - movb %es:(%ecx, %eax), %cl - movzx %cl, %ecx - subl %ecx, %esp + /* Users's current stack frame pointer is source */ + movl %edx, %esi + + /* Allocate room for argument list from kernel stack */ + movl 12(%edi), %ecx + movb (%ecx, %eax), %cl + movzx %cl, %ecx + + /* Allocate space on our stack */ + subl %ecx, %esp + + /* Get pointer to function */ + movl (%edi), %edi + movl (%edi, %eax, 4), %eax - /* Copy the arguments from the user stack to the kernel stack */ - movl %esp,%edi - cld - rep movsb + /* Copy the arguments from the user stack to our stack */ + shr $2, %ecx + movl %esp, %edi + cld + rep movsd - /* DS is now also kernel segment */ - movw %bx,%ds + /* Do the System Call */ + call *%eax + movl %eax, KTRAP_FRAME_EAX(%ebp) - /* Call system call hook */ -// pushl %eax -// call _KiSystemCallHook -// popl %eax + /* Deallocate the kernel stack frame */ + movl %ebp, %esp - /* Call service check routine */ - pushl %eax - call _KiServiceCheck - popl %eax - - /* Make the system service call */ - movl %es:_KeServiceDescriptorTableShadow + 16, %ecx - movl %es:(%ecx, %eax, 4), %eax - call *%eax - movl %eax, KTRAP_FRAME_EAX(%ebp) /* save our return value in PKTRAP_FRAME->Eax */ - -#if CHECKED - /* Bump Service Counter */ -#endif - -KeDeallocateStackAndReturnFromSystemCallWithHook: - /* Deallocate the kernel stack frame */ - movl %ebp,%esp - -KeReturnFromSystemCallWithHook: - /* Call the post system call hook and deliver any pending APCs */ - pushl %esp - call _KiAfterSystemCallHook - addl $4,%esp - KeReturnFromSystemCall: - /* Restore the user context */ - /* Get a pointer to the current thread */ - movl %fs:0x124, %esi + /* Get the Current Thread */ + movl %fs:KPCR_CURRENT_THREAD, %esi - /* Restore the old trap frame pointer */ - movl KTRAP_FRAME_EDX(%esp), %ebx - movl %ebx, KTHREAD_TRAP_FRAME(%esi) + /* Restore the old trap frame pointer */ + movl KTRAP_FRAME_EDX(%esp), %ebx + movl %ebx, KTHREAD_TRAP_FRAME(%esi) +_KiServiceExit: + + /* Get the Current Thread */ + movl %fs:KPCR_CURRENT_THREAD, %esi + + /* Deliver APCs only if we were called from user mode */ + testb $1, KTRAP_FRAME_CS(%esp) + je KiRosTrapReturn + + /* And only if any are actually pending */ + cmpb $0, KTHREAD_PENDING_USER_APC(%esi) + je KiRosTrapReturn + + /* Save pointer to Trap Frame */ + movl %esp, %ebx + + /* Raise IRQL to HIGH_LEVEL */ + movl $1, %ecx + call @KfRaiseIrql@4 + + /* Save old IRQL */ + pushl %eax + + /* Deliver APCs */ + pushl %ebx + pushl $0 + pushl $UserMode + call _KiDeliverApc@12 + + /* Return to old IRQL */ + popl %ecx + call @KfLowerIrql@4 + KiRosTrapReturn: + + /* Skip debug information and unsaved registers */ + addl $0x30, %esp // + 0x48 + popl %gs // + 0x44 + popl %es // + 0x40 + popl %ds // + 0x3C + popl %edx // + 0x38 + popl %ecx // + 0x34 + popl %eax // + 0x30 -#if 0 - mov KTRAP_FRAME_RESERVED1(%ebp), %ax - cmp %ax, SSIDX_NTCONTINUE - jnz KeNoEpilogPrint - movl KTRAP_FRAME_ESP(%ebp), %ecx - movl KTRAP_FRAME_EBP(%ebp), %edx - call @KeRosPrintEspEbp@8 -KeNoEpilogPrint: -#endif + /* Restore the old previous mode */ + popl %ebx // + 0x2C + movb %bl, %ss:KTHREAD_PREVIOUS_MODE(%esi) - /* Skip debug information and unsaved registers */ - addl $0x30, %esp - popl %gs - popl %es - popl %ds - popl %edx - popl %ecx - popl %eax + /* Restore the old exception handler list */ + popl %fs:KPCR_EXCEPTION_LIST // + 0x28 - /* Restore the old previous mode */ - popl %ebx - movb %bl, %ss:KTHREAD_PREVIOUS_MODE(%esi) + /* Restore final registers from trap frame */ + popl %fs // + 0x24 + popl %edi // + 0x20 + popl %esi // + 0x1C + popl %ebx // + 0x18 + popl %ebp // + 0x14 + add $4, %esp // + 0x10 - /* Restore the old exception handler list */ - popl %ebx - movl %ebx, %fs:KPCR_EXCEPTION_LIST + /* Check if previous CS is from user-mode */ + testl $1, 4(%esp) + + /* It is, so use Fast Exit */ + jnz FastRet + + /* + * Restore what the stub pushed, and return back to it. + * Note that we were CALLed, so the first thing on our stack is the ret EIP! + */ + pop %edx // + 0x0C + pop %ecx // + 0x08 + popf // + 0x04 + jmp *%edx + +IntRet: + + iret [truncated at 1000 lines; 1911 more skipped]

19 years, 10 months

[arty] 13089: Assert writable on a new socket.

by arty＠svn.reactos.com

Assert writable on a new socket. Modified: trunk/reactos/drivers/net/afd/afd/listen.c _____ Modified: trunk/reactos/drivers/net/afd/afd/listen.c --- trunk/reactos/drivers/net/afd/afd/listen.c 2005-01-16 22:53:36 UTC (rev 13088) +++ trunk/reactos/drivers/net/afd/afd/listen.c 2005-01-17 01:30:26 UTC (rev 13089) @@ -12,7 +12,9 @@ #include "tdiconn.h" #include "debug.h" -VOID SatisfyAccept( PIRP Irp, PFILE_OBJECT NewFileObject, +VOID SatisfyAccept( PAFD_DEVICE_EXTENSION DeviceExt, + PIRP Irp, + PFILE_OBJECT NewFileObject, PAFD_TDI_OBJECT_QELT Qelt ) { PAFD_FCB FCB = NewFileObject->FsContext; @@ -31,7 +33,9 @@ IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); MakeSocketIntoConnection( FCB ); - + FCB->PollState |= AFD_EVENT_SEND; + PollReeval( DeviceExt, NewFileObject ); + SocketStateUnlock( FCB ); } @@ -131,8 +135,6 @@ if( !IsListEmpty( &FCB->PendingConnections ) ) { FCB->PollState |= AFD_EVENT_ACCEPT; PollReeval( FCB->DeviceExt, FCB->FileObject ); - } else { - FCB->PollState &= ~AFD_EVENT_ACCEPT; } SocketStateUnlock( FCB ); @@ -214,6 +216,9 @@ AFD_DbgPrint(MID_TRACE,("Completed a wait for accept\n")); + FCB->PollState &= ~AFD_EVENT_ACCEPT; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + SocketStateUnlock( FCB ); return Status; } else { @@ -227,6 +232,8 @@ PIO_STACK_LOCATION IrpSp ) { NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_DEVICE_EXTENSION DeviceExt = + (PAFD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; PAFD_FCB FCB = FileObject->FsContext; PAFD_ACCEPT_DATA AcceptData = Irp->AssociatedIrp.SystemBuffer; PLIST_ENTRY PendingConn; @@ -284,7 +291,7 @@ ASSERT(NewFileObject->FsContext != FCB); /* We have a pending connection ... complete this irp right away */ - SatisfyAccept( Irp, NewFileObject, PendingConnObj ); + SatisfyAccept( DeviceExt, Irp, NewFileObject, PendingConnObj ); ObDereferenceObject( NewFileObject );

19 years, 10 months

[ea] 13088: Alex Ionescu added.

by ea＠svn.reactos.com

Alex Ionescu added. Modified: trunk/rosapps/notevil/notevil.rc Modified: trunk/rosapps/notevil/resource.h _____ Modified: trunk/rosapps/notevil/notevil.rc --- trunk/rosapps/notevil/notevil.rc 2005-01-16 22:35:11 UTC (rev 13087) +++ trunk/rosapps/notevil/notevil.rc 2005-01-16 22:53:36 UTC (rev 13088) @@ -1,4 +1,4 @@ -/* $Id: notevil.rc,v 1.14 2004/10/16 22:30:18 gvg Exp $ */ +/* $Id$ */ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Coders Console Parade\0" #define REACTOS_STR_INTERNAL_NAME "notevil\0" @@ -9,9 +9,9 @@ * String table * * Order is the same as in the status report published weekly in - * the "ros-kernel" mailing list by Rex Jolliff. + * the "ros-kernel" mailing list by Rex Jolliff. (obsolete) * - * 20030602.EA: new coders are added scanning the cvs-commit mailing + * 20050116.EA: new coders are added scanning the ros-svn mailing * list, in no particular order. Current order is kept for historical * reason. * @@ -68,6 +68,7 @@ 40, "Andrew Greenwood" 41, "Thomas Weidenmueller" 42, "Jonathan Wilson" + 43, "Alex Ionescu" END /* EOF */ _____ Modified: trunk/rosapps/notevil/resource.h --- trunk/rosapps/notevil/resource.h 2005-01-16 22:35:11 UTC (rev 13087) +++ trunk/rosapps/notevil/resource.h 2005-01-16 22:53:36 UTC (rev 13088) @@ -1,2 +1,2 @@ #define RES_FIRST_INDEX 1 -#define RES_LAST_INDEX 42 +#define RES_LAST_INDEX 43

19 years, 10 months

[gvg] 13087: Create performance test program

by gvg＠svn.reactos.com

Create performance test program Added: trunk/reactos/apps/utils/rosperf/ Added: trunk/reactos/apps/utils/rosperf/Makefile Added: trunk/reactos/apps/utils/rosperf/fill.c Added: trunk/reactos/apps/utils/rosperf/lines.c Added: trunk/reactos/apps/utils/rosperf/rosperf.c Added: trunk/reactos/apps/utils/rosperf/rosperf.h Added: trunk/reactos/apps/utils/rosperf/rosperf.rc Added: trunk/reactos/apps/utils/rosperf/testlist.c _____ Added: trunk/reactos/apps/utils/rosperf/Makefile --- trunk/reactos/apps/utils/rosperf/Makefile 2005-01-16 22:26:26 UTC (rev 13086) +++ trunk/reactos/apps/utils/rosperf/Makefile 2005-01-16 22:35:11 UTC (rev 13087) @@ -0,0 +1,24 @@ +PATH_TO_TOP = ../../.. + +TARGET_TYPE = program + +TARGET_APPTYPE = console + +TARGET_NAME = rosperf + +TARGET_SDKLIBS = version.a gdi32.a user32.a kernel32.a ntdll.a + +TARGET_OBJECTS = rosperf.o testlist.o fill.o lines.o + +TARGET_CFLAGS = -Wall -Werror -D__USE_W32API + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +# Automatic dependency tracking +DEP_OBJECTS := $(TARGET_OBJECTS) + +include $(PATH_TO_TOP)/tools/depend.mk + +# EOF _____ Added: trunk/reactos/apps/utils/rosperf/fill.c --- trunk/reactos/apps/utils/rosperf/fill.c 2005-01-16 22:26:26 UTC (rev 13086) +++ trunk/reactos/apps/utils/rosperf/fill.c 2005-01-16 22:35:11 UTC (rev 13087) @@ -0,0 +1,60 @@ +/* + * ReactOS RosPerf - ReactOS GUI performance test program + * + * 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. + */ + +#include <windows.h> +#include "rosperf.h" + +void +FillProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + unsigned Rep; + + for (Rep = 0; Rep < Reps; Rep++) + { + PatBlt((Rep & 0x100) ? PerfInfo->BackgroundDc : PerfInfo->ForegroundDc, 0, 0, + PerfInfo->WndWidth, PerfInfo->WndHeight, PATCOPY); + } +} + +void +FillSmallProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ +#define SMALL_SIZE 16 + unsigned Rep; + unsigned x, y; + + x = 0; + y = 0; + + for (Rep = 0; Rep < Reps; Rep++) + { + PatBlt((Rep & 0x10000) ? PerfInfo->BackgroundDc : PerfInfo->ForegroundDc, x, y, + SMALL_SIZE, SMALL_SIZE, PATCOPY); + x += SMALL_SIZE + 1; + if (PerfInfo->WndWidth < x + SMALL_SIZE) + { + x = 0; + y += SMALL_SIZE + 1; + if (PerfInfo->WndHeight < y + SMALL_SIZE) + { + y = 0; + } + } + } +} +/* EOF */ _____ Added: trunk/reactos/apps/utils/rosperf/lines.c --- trunk/reactos/apps/utils/rosperf/lines.c 2005-01-16 22:26:26 UTC (rev 13086) +++ trunk/reactos/apps/utils/rosperf/lines.c 2005-01-16 22:35:11 UTC (rev 13087) @@ -0,0 +1,97 @@ +/* + * ReactOS RosPerf - ReactOS GUI performance test program + * + * 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. + */ + +#include <windows.h> +#include "rosperf.h" + +void +LinesProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + unsigned Rep; + int Dest; + HDC Dc; + + for (Rep = 0; Rep < Reps; ) + { + Dc = (Rep & 0x1000) ? PerfInfo->BackgroundDc : PerfInfo->ForegroundDc; + + for (Dest = 2; Dest < PerfInfo->WndHeight && Rep < Reps; Rep++, Dest += 2) + { + MoveToEx(Dc, 0, 0, NULL); + LineTo(Dc, PerfInfo->WndWidth, Dest); + } + + for (Dest = PerfInfo->WndWidth - 2; 0 <= Dest && Rep < Reps; Rep++, Dest -= 2) + { + MoveToEx(Dc, PerfInfo->WndWidth, 0, NULL); + LineTo(Dc, Dest, PerfInfo->WndHeight); + } + + for (Dest = PerfInfo->WndHeight - 2; 0 <= Dest && Rep < Reps; Rep++, Dest -= 2) + { + MoveToEx(Dc, PerfInfo->WndWidth, PerfInfo->WndHeight, NULL); + LineTo(Dc, 0, Dest); + } + + for (Dest = 2; Dest < PerfInfo->WndWidth && Rep < Reps; Rep++, Dest += 2) + { + MoveToEx(Dc, 0, PerfInfo->WndHeight, NULL); + LineTo(Dc, Dest, 0); + } + } +} + +void +LinesHorizontalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + unsigned Rep; + unsigned y; + HDC Dc; + + for (Rep = 0; Rep < Reps; ) + { + Dc = (Rep & 0x10000) ? PerfInfo->BackgroundDc : PerfInfo->ForegroundDc; + + for (y = 0; y < PerfInfo->WndHeight && Rep < Reps; Rep++, y += 3) + { + MoveToEx(Dc, 0, y, NULL); + LineTo(Dc, PerfInfo->WndWidth, y); + } + } +} + +void +LinesVerticalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + unsigned Rep; + unsigned x; + HDC Dc; + + for (Rep = 0; Rep < Reps; ) + { + Dc = (Rep & 0x1000) ? PerfInfo->BackgroundDc : PerfInfo->ForegroundDc; + + for (x = 0; x < PerfInfo->WndWidth && Rep < Reps; Rep++, x += 3) + { + MoveToEx(Dc, x, 0, NULL); + LineTo(Dc, x, PerfInfo->WndHeight); + } + } +} + +/* EOF */ _____ Added: trunk/reactos/apps/utils/rosperf/rosperf.c --- trunk/reactos/apps/utils/rosperf/rosperf.c 2005-01-16 22:26:26 UTC (rev 13086) +++ trunk/reactos/apps/utils/rosperf/rosperf.c 2005-01-16 22:35:11 UTC (rev 13087) @@ -0,0 +1,923 @@ +/* + * ReactOS RosPerf - ReactOS GUI performance test program + * + * 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. + */ +/* + * Ideas copied from x11perf: + * + * Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. + * + * All Rights Reserved + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose and without fee is hereby granted, + * provided that the above copyright notice appear in all copies and that + * both that copyright notice and this permission notice appear in + * supporting documentation, and that the name of Digital not be + * used in advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * + * DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + * DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + */ + +#include <limits.h> +#include <stdio.h> +#include <stdlib.h> +#include <windows.h> +#include <reactos/buildno.h> + +#include "rosperf.h" + +#define MAINWND_WIDTH 400 +#define MAINWND_HEIGHT 400 + +static HWND LabelWnd; + +unsigned +NullInit(void **Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + *Context = NULL; + + return Reps; +} + +void +NullCleanup(void *Context, PPERF_INFO PerfInfo) +{ +} + +static void +ProcessMessages(void) +{ + MSG Msg; + + while (PeekMessageW(&Msg, NULL, 0, 0, PM_REMOVE)) + { + if (WM_QUIT == Msg.message) + { + exit(Msg.wParam); + } + TranslateMessage(&Msg); + DispatchMessageW(&Msg); + } +} + +static void +ClearWindow(PPERF_INFO PerfInfo) +{ + InvalidateRect(PerfInfo->Wnd, NULL, TRUE); + UpdateWindow(PerfInfo->Wnd); +} + +static unsigned +CalibrateTest(PTEST Test, PPERF_INFO PerfInfo) +{ +#define GOAL 2500 /* Try to get up to 2.5 seconds */ +#define ENOUGH 2000 /* But settle for 2.0 seconds */ +#define TICK 10 /* Assume clock not faster than .01 seconds */ + + unsigned Reps, DidReps; /* Reps desired, reps performed */ + unsigned Exponent; + void *Context; + DWORD StartTick; + DWORD Duration; + + /* Attempt to get an idea how long each rep lasts by getting enough + reps to last more than ENOUGH. Then scale that up to the number of + seconds desired. + + If init call to test ever fails, return False and test will be skipped. + */ + + Reps = 1; + for (;;) + { + ClearWindow(PerfInfo); + DidReps = (*Test->Init)(&Context, PerfInfo, Reps); + ProcessMessages(); + if (0 == DidReps) + { + return 0; + } + StartTick = GetTickCount(); + (*Test->Proc)(Context, PerfInfo, Reps); + Duration = GetTickCount() - StartTick; + (*Test->PassCleanup) (Context, PerfInfo); + (*Test->Cleanup)(Context, PerfInfo); + ProcessMessages(); + + if (DidReps != Reps) + { + /* The test can't do the number of reps as we asked for. + Give up */ + return DidReps; + } + /* Did we go long enough? */ + if (ENOUGH <= Duration) + { + break; + } + + /* Don't let too short a clock make new reps wildly high */ + if (Duration <= TICK) + { + Reps *= 10; + } + else + { + /* Try to get up to GOAL seconds. */ + Reps = (int)(GOAL * (double) Reps / (double) Duration) + 1; + } + } + + Reps = (int) ((double) PerfInfo->Seconds * 1000.0 * (double) Reps / (double) Duration) + 1; + + /* Now round reps up to 1 digit accuracy, so we don't get stupid-looking + numbers of repetitions. */ + Reps--; + Exponent = 1; + while (9 < Reps) + { + Reps /= 10; + Exponent *= 10; + } + Reps = (Reps + 1) * Exponent; + + return Reps; +} + +static void +DisplayStatus(HWND Label, LPCWSTR Message, LPCWSTR Test, int Try) +{ + WCHAR Status[128]; + + snwprintf(Status, sizeof(Status) / sizeof(Status[0]), L"%d %s %s", Try, Message, Test); + SetWindowTextW(Label, Status); + InvalidateRect(Label, NULL, TRUE); + UpdateWindow(Label); +} + +static double +RoundTo3Digits(double d) +{ + /* It's kind of silly to print out things like ``193658.4/sec'' so just + junk all but 3 most significant digits. */ + + double exponent, sign; + + exponent = 1.0; + /* the code below won't work if d should happen to be non-positive. */ + if (d < 0.0) + { + d = -d; + sign = -1.0; + } + else + { + sign = 1.0; + } + + if (1000.0 <= d) + { + do + { + exponent *= 10.0; + } + while (1000.0 <= d / exponent); + d = (double)((int)(d / exponent + 0.5)); + d *= exponent; + } + else + { + if (0.0 != d) + { + while (d * exponent < 100.0) + { + exponent *= 10.0; + } + } + d = (double)((int)(d * exponent + 0.5)); + d /= exponent; + } + + return d * sign; +} + +static void +ReportTimes(DWORD Time, int Reps, LPCWSTR Label, BOOL Average) +{ + double MSecsPerObj, ObjsPerSec; + + if (0 != Time) + { + MSecsPerObj = (double) Time / (double) Reps; + ObjsPerSec = (double) Reps * 1000.0 / (double) Time; + + /* Round obj/sec to 3 significant digits. Leave msec untouched, to + allow averaging results from several repetitions. */ + ObjsPerSec = RoundTo3Digits(ObjsPerSec); + + wprintf(L"%7d %s @ %8.4f msec (%8.1f/sec): %s\n", + Reps, Average ? L"trep" : L"reps", MSecsPerObj, ObjsPerSec, Label); + } + else + { + wprintf(L"%6d %sreps @ 0.0 msec (unmeasurably fast): %s\n", + Reps, Average ? L"t" : L"", Label); + } + +} + +static void +ProcessTest(PTEST Test, PPERF_INFO PerfInfo) +{ + unsigned Reps; + unsigned Repeat; + void *Context; + DWORD StartTick; + DWORD Time, TotalTime; + + DisplayStatus(LabelWnd, L"Calibrating", Test->Label, 0); + Reps = CalibrateTest(Test, PerfInfo); + if (0 == Reps) + { + return; + } + + Reps = Test->Init(&Context, PerfInfo, Reps); + if (0 == Reps) + { + return; + } + TotalTime = 0; + for (Repeat = 0; Repeat < PerfInfo->Repeats; Repeat++) + { + DisplayStatus(LabelWnd, L"Testing", Test->Label, Repeat + 1); + ClearWindow(PerfInfo); + StartTick = GetTickCount(); + (*Test->Proc)(Context, PerfInfo, Reps); + Time = GetTickCount() - StartTick; + ProcessMessages(); + TotalTime += Time; + ReportTimes(Time, Reps, Test->Label, FALSE); + (*Test->PassCleanup)(Context, PerfInfo); + ProcessMessages(); + } + (*Test->Cleanup)(Context, PerfInfo); + ReportTimes(TotalTime, Repeat * Reps, Test->Label, TRUE); + ProcessMessages(); +} + +static void +PrintOSVersion(void) +{ +#define BUFSIZE 160 + OSVERSIONINFOEXW VersionInfo; + BOOL OsVersionInfoEx; + HKEY hKey; + WCHAR ProductType[BUFSIZE]; + DWORD BufLen; + LONG Ret; + unsigned RosVersionLen; + LPWSTR RosVersion; + + /* Try calling GetVersionEx using the OSVERSIONINFOEX structure. + * If that fails, try using the OSVERSIONINFO structure. */ + + ZeroMemory(&VersionInfo, sizeof(OSVERSIONINFOEXW)); + VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); + + OsVersionInfoEx = GetVersionExW((OSVERSIONINFOW *) &VersionInfo); + if (! OsVersionInfoEx) + { + VersionInfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); + if (! GetVersionExW((OSVERSIONINFOW *) &VersionInfo)) + { + return; + } + } + + RosVersion = VersionInfo.szCSDVersion + wcslen(VersionInfo.szCSDVersion) + 1; + RosVersionLen = sizeof(VersionInfo.szCSDVersion) / sizeof(VersionInfo.szCSDVersion[0]) - + (RosVersion - VersionInfo.szCSDVersion); + if (7 <= RosVersionLen && 0 == wcsnicmp(RosVersion, L"ReactOS", 7)) + { + wprintf(L"Running on %s\n", RosVersion); + return; + } + + switch (VersionInfo.dwPlatformId) + { + /* Test for the Windows NT product family. */ + case VER_PLATFORM_WIN32_NT: + + /* Test for the specific product. */ + if (5 == VersionInfo.dwMajorVersion && 2 == VersionInfo.dwMinorVersion) + { + wprintf(L"Running on Microsoft Windows Server 2003, "); + } + else if (5 == VersionInfo.dwMajorVersion && 1 == VersionInfo.dwMinorVersion) + { + wprintf(L"Running on Microsoft Windows XP "); + } + else if (5 == VersionInfo.dwMajorVersion && 0 == VersionInfo.dwMinorVersion) + { + wprintf(L"Running on Microsoft Windows 2000 "); + } + else if (VersionInfo.dwMajorVersion <= 4 ) + { + wprintf(L"Running on Microsoft Windows NT "); + } + + /* Test for specific product on Windows NT 4.0 SP6 and later. */ + if (OsVersionInfoEx) + { + /* Test for the workstation type. */ + if (VER_NT_WORKSTATION == VersionInfo.wProductType) + { + if (4 == VersionInfo.dwMajorVersion) + { + wprintf(L"Workstation 4.0 "); + } + else if (0 != (VersionInfo.wSuiteMask & VER_SUITE_PERSONAL)) + { + wprintf(L"Home Edition "); + } + else + { + wprintf(L"Professional "); + } + } + + /* Test for the server type. */ + else if (VER_NT_SERVER == VersionInfo.wProductType || + VER_NT_DOMAIN_CONTROLLER == VersionInfo.wProductType) + { + if (5 == VersionInfo.dwMajorVersion && 2 == VersionInfo.dwMinorVersion) + { + if (0 != (VersionInfo.wSuiteMask & VER_SUITE_DATACENTER)) + { + wprintf(L"Datacenter Edition "); + } + else if (0 != (VersionInfo.wSuiteMask & VER_SUITE_ENTERPRISE)) + { + wprintf(L"Enterprise Edition "); + } + else if (VER_SUITE_BLADE == VersionInfo.wSuiteMask) + { + wprintf(L"Web Edition "); + } + else + { + wprintf(L"Standard Edition "); + } + } + + else if (5 == VersionInfo.dwMajorVersion && 0 == VersionInfo.dwMinorVersion) + { + if (0 != (VersionInfo.wSuiteMask & VER_SUITE_DATACENTER)) + { + wprintf(L"Datacenter Server "); + } + else if (0 != (VersionInfo.wSuiteMask & VER_SUITE_ENTERPRISE)) + { + wprintf(L"Advanced Server " ); + } + else + { + wprintf(L"Server " ); + } + } + + else /* Windows NT 4.0 */ + { + if (0 != (VersionInfo.wSuiteMask & VER_SUITE_ENTERPRISE)) + { + wprintf(L"Server 4.0, Enterprise Edition "); + } + else + { + wprintf(L"Server 4.0 "); + } + } + } + } + else /* Test for specific product on Windows NT 4.0 SP5 and earlier */ + { + BufLen = BUFSIZE; + + Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions", + 0, KEY_QUERY_VALUE, &hKey); + if (ERROR_SUCCESS != Ret) + { + return; + } + + Ret = RegQueryValueExW(hKey, L"ProductType", NULL, NULL, + (LPBYTE) ProductType, &BufLen); + if (ERROR_SUCCESS != Ret || BUFSIZE < BufLen) + { + return; + } + + RegCloseKey(hKey); + + if (0 == lstrcmpiW(L"WINNT", ProductType)) + { + wprintf(L"Workstation "); + } + else if (0 == lstrcmpiW(L"LANMANNT", ProductType)) + { + wprintf(L"Server "); + } + else if (0 == lstrcmpiW(L"SERVERNT", ProductType)) + { + wprintf(L"Advanced Server "); + } + + wprintf(L"%d.%d ", VersionInfo.dwMajorVersion, VersionInfo.dwMinorVersion); + } + + /* Display service pack (if any) and build number. */ + + if (4 == VersionInfo.dwMajorVersion && + 0 == lstrcmpiW(VersionInfo.szCSDVersion, L"Service Pack 6")) + { + /* Test for SP6 versus SP6a. */ + Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Hotfix\\Q246009", + 0, KEY_QUERY_VALUE, &hKey); + if (ERROR_SUCCESS == Ret) + { + wprintf(L"Service Pack 6a (Build %d)\n", VersionInfo.dwBuildNumber & 0xFFFF); + } + else /* Windows NT 4.0 prior to SP6a */ + { + wprintf(L"%s (Build %d)\n", + VersionInfo.szCSDVersion, + VersionInfo.dwBuildNumber & 0xFFFF); + } + + RegCloseKey(hKey); + } + else /* not Windows NT 4.0 */ + { + wprintf(L"%s (Build %d)\n", + VersionInfo.szCSDVersion, + VersionInfo.dwBuildNumber & 0xFFFF); + } + + + break; + + /* Test for the Windows Me/98/95. A bit silly since we're using Unicode... */ + case VER_PLATFORM_WIN32_WINDOWS: + + if (4 == VersionInfo.dwMajorVersion && 0 == VersionInfo.dwMinorVersion) + { + wprintf(L"Running on Microsoft Windows 95 "); + if (L'C' == VersionInfo.szCSDVersion[1] || L'B' == VersionInfo.szCSDVersion[1]) + { + wprintf(L"OSR2"); + } + } + + else if (4 == VersionInfo.dwMajorVersion && 10 == VersionInfo.dwMinorVersion) + { + wprintf(L"Running on Microsoft Windows 98 "); + if (L'A' == VersionInfo.szCSDVersion[1]) + { + wprintf(L"SE"); + } + } + + else if (4 == VersionInfo.dwMajorVersion && 90 == VersionInfo.dwMinorVersion) + { + wprintf(L"Running on Microsoft Windows Millennium Edition"); + } + wprintf(L"\n"); + break; + + case VER_PLATFORM_WIN32s: /* Even silier... */ + + wprintf(L"Running on Microsoft Win32s\n"); + break; + } +} + +static void +PrintAppVersion(void) +{ + wprintf(L"RosPerf %S (Build %S)\n", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR); +} + +static void +PrintDisplayInfo(void) +{ + HDC Dc; + + Dc = GetDC(NULL); + if (NULL == Dc) + { + return; + } + + wprintf(L"Display settings %d * %d * %d\n", GetDeviceCaps(Dc, HORZRES), + GetDeviceCaps(Dc, VERTRES), GetDeviceCaps(Dc, BITSPIXEL) * GetDeviceCaps(Dc, PLANES)); + + ReleaseDC(NULL, Dc); +} + +static void +PrintStartupInfo(void) +{ + PrintAppVersion(); + PrintOSVersion(); + PrintDisplayInfo(); +} + +static LRESULT CALLBACK +MainWndProc(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + PAINTSTRUCT Ps; + HDC Dc; + LRESULT Result; + + switch (Msg) + { + case WM_DESTROY: + PostQuitMessage(0); + Result = 0; + break; + + case WM_PAINT: + Dc = BeginPaint(Wnd, &Ps); + EndPaint (Wnd, &Ps); + Result = 0; + break; + + default: + Result = DefWindowProcW(Wnd, Msg, wParam, lParam); + break; + } + + return Result; +} + +static LRESULT CALLBACK +LabelWndProc(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + PAINTSTRUCT Ps; + HDC Dc; + RECT ClientRect, WindowRect; + TEXTMETRICW Tm; + LRESULT Result; + WCHAR Title[80]; + + switch (Msg) + { + case WM_CREATE: + /* Make text fit */ + Dc = GetDC(Wnd); + if (NULL != Dc && GetClientRect(Wnd, &ClientRect) && GetWindowRect(Wnd, &WindowRect) + && GetTextMetricsW(Dc, &Tm)) + { + if (Tm.tmHeight != ClientRect.bottom) + { + SetWindowPos(Wnd, NULL, 0, 0, WindowRect.right - WindowRect.left, + (WindowRect.bottom - WindowRect.top) + (Tm.tmHeight - ClientRect.bottom), + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER); + } + } + if (NULL != Dc) + { + ReleaseDC(Wnd, Dc); + } + Result = DefWindowProcW(Wnd, Msg, wParam, lParam); + break; + + case WM_PAINT: + Dc = BeginPaint(Wnd, &Ps); + GetWindowTextW(Wnd, Title, sizeof(Title) / sizeof(Title[0])); + TextOutW(Dc, 0, 0, Title, wcslen(Title)); + EndPaint (Wnd, &Ps); + Result = 0; + break; + + default: + Result = DefWindowProcW(Wnd, Msg, wParam, lParam); + break; + } + + return Result; +} + +static HWND +CreatePerfWindows(HINSTANCE hInstance, PPERF_INFO PerfInfo) +{ + WNDCLASSW wc; + HWND MainWnd; + + wc.lpszClassName = L"RosPerfMain"; + wc.lpfnWndProc = MainWndProc; + wc.style = 0; + wc.hInstance = hInstance; + wc.hIcon = LoadIconW(NULL, (LPCWSTR) IDI_APPLICATION); + wc.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); + wc.hbrBackground = CreateSolidBrush(PerfInfo->BackgroundColor); + wc.lpszMenuName = NULL; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + if (RegisterClassW(&wc) == 0) + { + fwprintf(stderr, L"Failed to register RosPerfMain (last error %d)\n", + GetLastError()); + return NULL; + } + + wc.lpszClassName = L"RosPerfLabel"; + wc.lpfnWndProc = LabelWndProc; + wc.style = 0; + wc.hInstance = hInstance; + wc.hIcon = LoadIconW(NULL, (LPCWSTR) IDI_APPLICATION); + wc.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH); + wc.lpszMenuName = NULL; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + if (RegisterClassW(&wc) == 0) + { + fwprintf(stderr, L"Failed to register RosPerfLabel (last error %d)\n", + GetLastError()); + return NULL; + } + + MainWnd = CreateWindowW(L"RosPerfMain", + L"ReactOS performance test", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, + 0, + MAINWND_WIDTH, + MAINWND_HEIGHT, + NULL, + NULL, + hInstance, + NULL); + if (NULL == MainWnd) + { + fwprintf(stderr, L"Failed to create main window (last error %d)\n", + GetLastError()); + return NULL; + } + + LabelWnd = CreateWindowW(L"RosPerfLabel", + L"", + WS_POPUP | WS_THICKFRAME | WS_VISIBLE, + 0, + MAINWND_HEIGHT + 10, + MAINWND_WIDTH, + 20, + MainWnd, + NULL, + hInstance, + NULL); + if (NULL == LabelWnd) + { + fwprintf(stderr, L"Failed to create label window (last error 0x%lX)\n", + GetLastError()); + return NULL; + } + + SetActiveWindow(MainWnd); + + return MainWnd; +} + +static BOOL +ProcessCommandLine(PPERF_INFO PerfInfo, unsigned *TestCount, PTEST *Tests) +{ + int ArgC, Arg; + LPWSTR *ArgV; + LPWSTR EndPtr; + PTEST AllTests; + BOOL *DoTest; + BOOL DoAll; + unsigned AllTestCount, i, j; + + ArgV = CommandLineToArgvW(GetCommandLineW(), &ArgC); + if (NULL == ArgV) + { + fwprintf(stderr, L"CommandLineToArgvW failed\n"); + return FALSE; + } + + GetTests(&AllTestCount, &AllTests); + DoTest = malloc(AllTestCount * sizeof(BOOL)); + if (NULL == DoTest) + { + fwprintf(stderr, L"Out of memory\n"); + return FALSE; + } + DoAll = TRUE; + + for (Arg = 1; Arg < ArgC; Arg++) + { + if (L'/' == ArgV[Arg][0] || L'-' == ArgV[Arg][0]) + { + if (0 == wcsicmp(ArgV[Arg] + 1, L"repeat")) + { + if (ArgC <= Arg + 1) + { + fwprintf(stderr, L"%s needs a repeat count\n", ArgV[Arg]); + free(DoTest); + GlobalFree(ArgV); + return FALSE; + } + Arg++; + PerfInfo->Repeats = wcstoul(ArgV[Arg], &EndPtr, 0); + if (L'\0' != *EndPtr || (long) PerfInfo->Repeats <= 0 || ULONG_MAX == PerfInfo->Repeats) + { + fwprintf(stderr, L"Invalid repeat count %s\n", ArgV[Arg]); + free(DoTest); + GlobalFree(ArgV); + return FALSE; + } + } + else if (0 == wcsicmp(ArgV[Arg] + 1, L"seconds")) + { + if (ArgC <= Arg + 1) + { + fwprintf(stderr, L"%s needs a number of seconds\n", ArgV[Arg]); + free(DoTest); + GlobalFree(ArgV); + return FALSE; + } + Arg++; + PerfInfo->Seconds = wcstoul(ArgV[Arg], &EndPtr, 0); + if (L'\0' != *EndPtr || (long) PerfInfo->Seconds < 0 || ULONG_MAX == PerfInfo->Seconds) + { + fwprintf(stderr, L"Invalid duration %s\n", ArgV[Arg]); + free(DoTest); + GlobalFree(ArgV); + return FALSE; + } + } + else + { + fwprintf(stderr, L"Unrecognized option %s\n", ArgV[Arg]); + free(DoTest); + GlobalFree(ArgV); + return FALSE; + } + } + else + { + if (DoAll) + { + for (i = 0; i < AllTestCount; i++) + { + DoTest[i] = FALSE; [truncated at 1000 lines; 246 more skipped]

19 years, 10 months

[chorns] 13086: * Build networking components

by chorns＠svn.reactos.com

* Build networking components * WINE DLL support Added: branches/xmlbuildsystem/reactos/drivers/net/dd/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/net/dd/ne2000/ne2000.xml Added: branches/xmlbuildsystem/reactos/drivers/net/dd/pcnet/pcnet.xml Modified: branches/xmlbuildsystem/reactos/drivers/net/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/net/ndis/ndis.xml Added: branches/xmlbuildsystem/reactos/drivers/net/npf/npf.xml Added: branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml Added: branches/xmlbuildsystem/reactos/drivers/net/tdi/tdi.xml Added: branches/xmlbuildsystem/reactos/drivers/net/wshtcpip/wshtcpip.xml Added: branches/xmlbuildsystem/reactos/lib/adns/adns.xml Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/dnsapi/dnsapi.xml Added: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/stdlib/wcstomb.c Added: branches/xmlbuildsystem/reactos/lib/ws2_32/ws2_32.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/tools.xml Added: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.xml _____ Added: branches/xmlbuildsystem/reactos/drivers/net/dd/directory.xml --- branches/xmlbuildsystem/reactos/drivers/net/dd/directory.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/drivers/net/dd/directory.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,6 @@ +<directory name="ne2000"> + <xi:include href="ne2000/ne2000.xml" /> +</directory> +<directory name="pcnet"> + <xi:include href="pcnet/pcnet.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/net/dd/ne2000/ne2000.xml --- branches/xmlbuildsystem/reactos/drivers/net/dd/ne2000/ne2000.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/drivers/net/dd/ne2000/ne2000.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,11 @@ +<module name="ne2000" type="kernelmodedriver"> + <include base="ne2000">include</include> + <library>ndis</library> + <library>ntoskrnl</library> + <library>hal</library> + <directory name="ne2000"> + <file>8390.c</file> + <file>main.c</file> + </directory> + <file>ne2000.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/net/dd/pcnet/pcnet.xml --- branches/xmlbuildsystem/reactos/drivers/net/dd/pcnet/pcnet.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/drivers/net/dd/pcnet/pcnet.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,11 @@ +<module name="pcnet" type="kernelmodedriver"> + <include base="pcnet">.</include> + <define name="NDIS50_MINIPORT" /> + <define name="__USE_W32API" /> + <library>ndis</library> + <library>ntoskrnl</library> + <library>hal</library> + <file>pcnet.c</file> + <file>requests.c</file> + <file>pcnet.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/drivers/net/directory.xml --- branches/xmlbuildsystem/reactos/drivers/net/directory.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/drivers/net/directory.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -1,3 +1,21 @@ <directory name="afd"> <xi:include href="afd/afd.xml" /> </directory> +<directory name="dd"> + <xi:include href="dd/directory.xml" /> +</directory> +<directory name="ndis"> + <xi:include href="ndis/ndis.xml" /> +</directory> +<directory name="npf"> + <xi:include href="npf/npf.xml" /> +</directory> +<directory name="tcpip"> + <xi:include href="tcpip/tcpip.xml" /> +</directory> +<directory name="tdi"> + <xi:include href="tdi/tdi.xml" /> +</directory> +<directory name="wshtcpip"> + <xi:include href="wshtcpip/wshtcpip.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/net/ndis/ndis.xml --- branches/xmlbuildsystem/reactos/drivers/net/ndis/ndis.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/drivers/net/ndis/ndis.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,32 @@ +<module name="ndis" type="kernelmodedriver"> + <importlibrary definition="ndis.def"></importlibrary> + <include base="ndis">include</include> + <define name="NDIS_WRAPPER" /> + <define name="NDIS50" /> + <define name="NDIS50_MINIPORT" /> + <define name="BINARY_COMPATIBLE" /> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <directory name="ndis"> + <file>40gone.c</file> + <file>50gone.c</file> + <file>buffer.c</file> + <file>cl.c</file> + <file>cm.c</file> + <file>co.c</file> + <file>config.c</file> + <file>control.c</file> + <file>efilter.c</file> + <file>hardware.c</file> + <file>io.c</file> + <file>main.c</file> + <file>memory.c</file> + <file>miniport.c</file> + <file>protocol.c</file> + <file>string.c</file> + <file>stubs.c</file> + <file>time.c</file> + </directory> + <file>ndis.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/net/npf/npf.xml --- branches/xmlbuildsystem/reactos/drivers/net/npf/npf.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/drivers/net/npf/npf.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,28 @@ +<module name="npf" type="kernelmodedriver"> + <include base="npf">include</include> + <include base="ntoskrnl">include</include> + <define name="WIN_NT_DRIVER" /> + <define name="KQPC_TS" /> + <define name="USE_KLOCKS" /> + <define name="BINARY_COMPATIBLE" /> + <library>ndis</library> + <library>ntoskrnl</library> + <library>hal</library> + <file>bucket_lookup.c</file> + <file>count_packets.c</file> + <file>dump.c</file> + <file>functions.c</file> + <file>jitter.c</file> + <file>memory_t.c</file> + <file>normal_lookup.c</file> + <file>openclos.c</file> + <file>packet.c</file> + <file>read.c</file> + <file>tcp_session.c</file> + <file>time_calls.c</file> + <file>tme.c</file> + <file>win_bpf_filter.c</file> + <file>win_bpf_filter_init.c</file> + <file>write.c</file> + <file>npf.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml --- branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,40 @@ +<module name="tcpip" type="kernelmodedriver"> + <importlibrary definition="tcpip.def"></importlibrary> + <include base="tcpip">include</include> + <include base="oskittcp">include</include> + <define name="_SEH_NO_NATIVE_NLG" /> + <define name="NDIS40" /> + <define name="__USE_W32API" /> + <library>ip</library> + <library>oskittcp</library> + <library>ndis</library> + <library>rosrtl</library> + <library>pseh</library> + <library>ntoskrnl</library> + <library>hal</library> + <directory name="datalink"> + <file>lan.c</file> + </directory> + <directory name="tcpip"> + <file>buffer.c</file> + <file>bug.c</file> + <file>dispatch.c</file> + <file>fileobjs.c</file> + <file>iinfo.c</file> + <file>info.c</file> + <file>irp.c</file> + <file>lock.c</file> + <file>main.c</file> + <file>mockbuffer.c</file> + <file>mockbug.c</file> + <file>mocklock.c</file> + <file>mockpool.c</file> + <file>mockwait.c</file> + <file>ninfo.c</file> + <file>pool.c</file> + <file>proto.c</file> + <file>tinfo.c</file> + <file>wait.c</file> + </directory> + <file>tcpip.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/net/tdi/tdi.xml --- branches/xmlbuildsystem/reactos/drivers/net/tdi/tdi.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/drivers/net/tdi/tdi.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,19 @@ +<module name="tdi" type="kernelmodedriver"> + <importlibrary definition="misc/tdi.def"></importlibrary> + <library>ntoskrnl</library> + <library>hal</library> + <directory name="cte"> + <file>string.c</file> + <file>stubs.c</file> + </directory> + <directory name="misc"> + <file>main.c</file> + <file>tdi.rc</file> + </directory> + <directory name="tdi"> + <file>dereg.c</file> + <file>handler.c</file> + <file>obsolete.c</file> + <file>stubs.c</file> + </directory> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/net/wshtcpip/wshtcpip.xml --- branches/xmlbuildsystem/reactos/drivers/net/wshtcpip/wshtcpip.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/drivers/net/wshtcpip/wshtcpip.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,11 @@ +<module name="wshtcpip" type="win32dll"> + <importlibrary definition="wshtcpip.def"></importlibrary> + <include base="wshtcpip">.</include> + <define name="UNICODE" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>kernel32</library> + <library>ws2_32</library> + <file>wshtcpip.c</file> + <file>wshtcpip.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/adns/adns.xml --- branches/xmlbuildsystem/reactos/lib/adns/adns.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/lib/adns/adns.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,20 @@ +<module name="adns" type="staticlibrary"> + <include base="adns">src</include> + <include base="adns">adns_win32</include> + <define name="ADNS_JGAA_WIN32" /> + <directory name="adns_win32"> + <file>adns_unix_calls.c</file> + </directory> + <directory name="src"> + <file>check.c</file> + <file>event.c</file> + <file>general.c</file> + <file>parse.c</file> + <file>poll.c</file> + <file>query.c</file> + <file>reply.c</file> + <file>setup.c</file> + <file>transmit.c</file> + <file>types.c</file> + </directory> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -1,9 +1,18 @@ +<directory name="adns"> + <xi:include href="adns/adns.xml" /> +</directory> <directory name="advapi32"> <xi:include href="advapi32/advapi32.xml" /> </directory> +<directory name="dnsapi"> + <xi:include href="dnsapi/dnsapi.xml" /> +</directory> <directory name="gdi32"> <xi:include href="gdi32/gdi32.xml" /> </directory> +<directory name="iphlpapi"> + <xi:include href="iphlpapi/iphlpapi.xml" /> +</directory> <directory name="kernel32"> <xi:include href="kernel32/kernel32.xml" /> </directory> @@ -34,3 +43,6 @@ <directory name="user32"> <xi:include href="user32/user32.xml" /> </directory> +<directory name="ws2_32"> + <xi:include href="ws2_32/ws2_32.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/lib/dnsapi/dnsapi.xml --- branches/xmlbuildsystem/reactos/lib/dnsapi/dnsapi.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/lib/dnsapi/dnsapi.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,26 @@ +<module name="dnsapi" type="win32dll"> + <importlibrary definition="dnsapi.def" /> + <include base="dnsapi">include</include> + <include base="adns">src</include> + <include base="adns">adns_win32</include> + <define name="_DISABLE_TIDENTS" /> + <define name="ADNS_JGAA_WIN32" /> + <define name="__USE_W32API" /> + <library>adns</library> + <library>rosrtl</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>msvcrt</library> + <library>ws2_32</library> + <library>iphlpapi</library> + <directory name="dnsapi"> + <file>adns.c</file> + <file>context.c</file> + <file>free.c</file> + <file>names.c</file> + <file>query.c</file> + <file>stubs.c</file> + </directory> + <file>dnsapi.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml --- branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,27 @@ +<module name="iphlpapi" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="iphlpapi.def" /> + <include base="iphlpapi">include</include> + <include base="ReactOS">include/wine</include> + <define name="YDEBUG" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <library>wine</library> + + <library>rtl</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>ws2_32</library> + <file>ifenum_reactos.c</file> + <file>ipstats_reactos.c</file> + <file>iphlpapi_main.c</file> + <file>media.c</file> + <file>registry.c</file> + <file>resinfo_reactos.c</file> + <file>route_reactos.c</file> + <file>iphlpapi.rc</file> + <file>iphlpapi.spec</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml --- branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -362,7 +362,6 @@ <file>swab.c</file> <file>wcstod.c</file> <file>wcstol.c</file> - <file>wcstom.c</file> <file>wcstomb.c</file> <file>wcstombs.c</file> <file>wcstoul.c</file> _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/stdlib/wcstomb.c --- branches/xmlbuildsystem/reactos/lib/msvcrt/stdlib/wcstomb.c 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/stdlib/wcstomb.c 2005-01-16 22:26:26 UTC (rev 13086) @@ -46,33 +46,7 @@ size_t __wcrtomb (char *s, wchar_t wc); -/* - * Convert WCHAR into its multibyte character representation, - * putting this in S and returning its length. - * - * Attention: this function should NEVER be intentionally used. - * The interface is completely stupid. The state is shared between - * all conversion functions. You should use instead the restartable - * version `wcrtomb'. - * - * @implemented - */ -int -wctomb (char *s, wchar_t wchar) -{ - /* If S is NULL the function has to return null or not null - depending on the encoding having a state depending encoding or - not. This is nonsense because any multibyte encoding has a - state. The ISO C amendment 1 corrects this while introducing the - restartable functions. We simply say here all encodings have a - state. */ - if (s == NULL) - return 1; - return __wcrtomb (s, wchar); -} - - size_t __wcrtomb (char *s, wchar_t wc) { _____ Added: branches/xmlbuildsystem/reactos/lib/ws2_32/ws2_32.xml --- branches/xmlbuildsystem/reactos/lib/ws2_32/ws2_32.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/lib/ws2_32/ws2_32.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,26 @@ +<module name="ws2_32" type="win32dll"> + <importlibrary definition="ws2_32.def" /> + <include base="ws2_32">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="UNICODE" /> + <define name="LE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>dnsapi</library> + <directory name="misc"> + <file>bsd.c</file> + <file>catalog.c</file> + <file>dllmain.c</file> + <file>event.c</file> + <file>handle.c</file> + <file>ns.c</file> + <file>sndrcv.c</file> + <file>stubs.c</file> + <file>upcall.c</file> + </directory> + <file>ws2_32.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-16 22:26:26 UTC (rev 13086) @@ -166,8 +166,10 @@ fprintf ( fMakefile, "gcc = gcc\n" ); fprintf ( fMakefile, "ld = ld\n" ); fprintf ( fMakefile, "ar = ar\n" ); - fprintf ( fMakefile, "dlltool = dlltool\n\n" ); - fprintf ( fMakefile, "windres = windres\n\n" ); + fprintf ( fMakefile, "dlltool = dlltool\n" ); + fprintf ( fMakefile, "windres = windres\n" ); + fprintf ( fMakefile, "winebuild = tools" SSEP "winebuild" SSEP "winebuild\n" ); + fprintf ( fMakefile, "\n" ); GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.properties, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-16 22:26:26 UTC (rev 13086) @@ -71,6 +71,15 @@ } string +MingwModuleHandler::GetBasename ( const string& filename ) const +{ + size_t index = filename.find_last_of ( '.' ); + if (index != string::npos) + return filename.substr ( 0, index ); + return ""; +} + +string MingwModuleHandler::ReplaceExtension ( const string& filename, const string& newExtension ) const { @@ -81,6 +90,19 @@ } string +MingwModuleHandler::GetActualSourceFilename ( const string& filename ) const +{ + string extension = GetExtension ( filename ); + if ( extension == ".spec" || extension == "SPEC" ) + { + string basename = GetBasename( filename ); + return basename + ".stubs.c"; + } + else + return filename; +} + +string MingwModuleHandler::GetModuleArchiveFilename ( const Module& module ) const { return ReplaceExtension ( FixupTargetFilename ( module.GetPath () ), @@ -120,6 +142,11 @@ const Module* dependencyModule = dependency->dependencyModule; dependencies += dependencyModule->GetTargets (); } + string definitionDependencies = GetDefinitionDependencies ( module ); + if ( dependencies.length () > 0 && definitionDependencies.length () > 0 ) + dependencies += " " + definitionDependencies; + else if ( definitionDependencies.length () > 0 ) + dependencies = definitionDependencies; return dependencies; } @@ -143,7 +170,7 @@ string sourceFilenames ( "" ); for ( i = 0; i < module.files.size (); i++ ) - sourceFilenames += " " + module.files[i]->name; + sourceFilenames += " " + GetActualSourceFilename ( module.files[i]->name ); vector<If*> ifs = module.ifs; for ( i = 0; i < ifs.size(); i++ ) { @@ -152,7 +179,7 @@ for ( j = 0; j < rIf.ifs.size(); j++ ) ifs.push_back ( rIf.ifs[j] ); for ( j = 0; j < rIf.files.size(); j++ ) - sourceFilenames += " " + rIf.files[j]->name; + sourceFilenames += " " + GetActualSourceFilename ( rIf.files[j]->name ); } return sourceFilenames; } @@ -164,6 +191,8 @@ string extension = GetExtension ( sourceFilename ); if ( extension == ".rc" || extension == ".RC" ) newExtension = ".coff"; + else if ( extension == ".spec" || extension == ".SPEC" ) + newExtension = ".stubs.o"; else newExtension = ".o"; return FixupTargetFilename ( ReplaceExtension ( sourceFilename, @@ -314,7 +343,7 @@ } fprintf ( fMakefile, "\n" ); } - + void MingwModuleHandler::GenerateMacros ( const char* assignmentOperation, @@ -366,11 +395,15 @@ assignmentOperation ); for ( i = 0; i < files.size(); i++ ) { - fprintf ( - fMakefile, - "%s%s", - ( i%10 == 9 ? "\\\n\t" : " " ), - GetObjectFilename(files[i]->name).c_str() ); + string extension = GetExtension ( files[i]->name ); + if ( extension != ".spec" && extension != ".SPEC" ) + { + fprintf ( + fMakefile, + "%s%s", + ( i%10 == 9 ? "\\\n\t" : " " ), + GetObjectFilename(files[i]->name).c_str() ); + } } fprintf ( fMakefile, "\n" ); } @@ -443,87 +476,155 @@ module.name.c_str () ); } -string +void MingwModuleHandler::GenerateGccCommand ( const Module& module, const string& sourceFilename, const string& cc, const string& cflagsMacro ) const { string objectFilename = GetObjectFilename ( sourceFilename ); - return ssprintf ( "%s -c %s -o %s %s\n", - cc.c_str (), - sourceFilename.c_str (), - objectFilename.c_str (), - cflagsMacro.c_str () ); + fprintf ( fMakefile, + "%s: %s\n", + objectFilename.c_str (), + sourceFilename.c_str () ); + fprintf ( fMakefile, + "\t%s -c %s -o %s %s\n", + cc.c_str (), + sourceFilename.c_str (), + objectFilename.c_str (), + cflagsMacro.c_str () ); } -string +void MingwModuleHandler::GenerateGccAssemblerCommand ( const Module& module, const string& sourceFilename, const string& cc, const string& cflagsMacro ) const { string objectFilename = GetObjectFilename ( sourceFilename ); - return ssprintf ( "%s -x assembler-with-cpp -c %s -o %s -D__ASM__ %s\n", - cc.c_str (), - sourceFilename.c_str (), - objectFilename.c_str (), - cflagsMacro.c_str () ); + fprintf ( fMakefile, + "%s: %s\n", + objectFilename.c_str (), + sourceFilename.c_str () ); + fprintf ( fMakefile, + "\t%s -x assembler-with-cpp -c %s -o %s -D__ASM__ %s\n", + cc.c_str (), + sourceFilename.c_str (), + objectFilename.c_str (), + cflagsMacro.c_str () ); } -string +void MingwModuleHandler::GenerateNasmCommand ( const Module& module, const string& sourceFilename, const string& nasmflagsMacro ) const { string objectFilename = GetObjectFilename ( sourceFilename ); - return ssprintf ( "%s -f win32 %s -o %s %s\n", - "nasm", - sourceFilename.c_str (), - objectFilename.c_str (), - nasmflagsMacro.c_str () ); + fprintf ( fMakefile, + "%s: %s\n", + objectFilename.c_str (), + sourceFilename.c_str () ); + fprintf ( fMakefile, + "\t%s -f win32 %s -o %s %s\n", + "nasm", + sourceFilename.c_str (), + objectFilename.c_str (), + nasmflagsMacro.c_str () ); } -string +void MingwModuleHandler::GenerateWindresCommand ( const Module& module, const string& sourceFilename, const string& windresflagsMacro ) const { string objectFilename = GetObjectFilename ( sourceFilename ); - return ssprintf ( "%s %s -o %s ${%s}\n", - "${windres}", - sourceFilename.c_str (), - objectFilename.c_str (), - windresflagsMacro.c_str () ); + fprintf ( fMakefile, + "%s: %s\n", + objectFilename.c_str (), + sourceFilename.c_str () ); + fprintf ( fMakefile, + "\t%s %s -o %s ${%s}\n", + "${windres}", + sourceFilename.c_str (), + objectFilename.c_str (), + windresflagsMacro.c_str () ); } -string -MingwModuleHandler::GenerateCommand ( const Module& module, - const string& sourceFilename, - const string& cc, - const string& cflagsMacro, - const string& nasmflagsMacro, - const string& windresflagsMacro ) const +void +MingwModuleHandler::GenerateWinebuildCommands ( const Module& module, + const string& sourceFilename ) const { + string basename = GetBasename ( sourceFilename ); + fprintf ( fMakefile, + "%s.def: %s\n", + basename.c_str (), + sourceFilename.c_str () ); + fprintf ( fMakefile, + "\t%s --def=%s -o %s.def\n", + "${winebuild}", + sourceFilename.c_str (), + basename.c_str () ); + + fprintf ( fMakefile, + "%s.stubs.c: %s\n", + basename.c_str (), + sourceFilename.c_str () ); + fprintf ( fMakefile, + "\t%s --pedll=%s -o %s.stubs.c\n", + "${winebuild}", + sourceFilename.c_str (), + basename.c_str () ); +} + +void +MingwModuleHandler::GenerateCommands ( const Module& module, + const string& sourceFilename, + const string& cc, + const string& cflagsMacro, + const string& nasmflagsMacro, + const string& windresflagsMacro ) const +{ string extension = GetExtension ( sourceFilename ); if ( extension == ".c" || extension == ".C" ) - return GenerateGccCommand ( module, - sourceFilename, - cc, - cflagsMacro ); + { + GenerateGccCommand ( module, + sourceFilename, + cc, + cflagsMacro ); + return; + } else if ( extension == ".s" || extension == ".S" ) - return GenerateGccAssemblerCommand ( module, - sourceFilename, - cc, - cflagsMacro ); + { + GenerateGccAssemblerCommand ( module, + sourceFilename, + cc, + cflagsMacro ); + return; + } else if ( extension == ".asm" || extension == ".ASM" ) - return GenerateNasmCommand ( module, - sourceFilename, - nasmflagsMacro ); + { + GenerateNasmCommand ( module, + sourceFilename, + nasmflagsMacro ); + return; + } else if ( extension == ".rc" || extension == ".RC" ) - return GenerateWindresCommand ( module, - sourceFilename, - windresflagsMacro ); + { + GenerateWindresCommand ( module, + sourceFilename, + windresflagsMacro ); + return; + } + else if ( extension == ".spec" || extension == ".SPEC" ) + { + GenerateWinebuildCommands ( module, + sourceFilename ); + GenerateGccCommand ( module, + GetActualSourceFilename ( sourceFilename ), + cc, + cflagsMacro ); + return; + } throw InvalidOperationException ( __FILE__, __LINE__, @@ -614,19 +715,14 @@ for ( i = 0; i < files.size (); i++ ) { string sourceFilename = files[i]->name; - string objectFilename = GetObjectFilename ( sourceFilename ); + GenerateCommands ( module, + sourceFilename, + cc, + cflagsMacro, + nasmflagsMacro, + windresflagsMacro ); fprintf ( fMakefile, - "%s: %s\n", - objectFilename.c_str (), - sourceFilename.c_str () ); - fprintf ( fMakefile, - "\t%s\n", - GenerateCommand ( module, - sourceFilename, - cc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro ).c_str () ); + "\n" ); } for ( i = 0; i < ifs.size(); i++ ) @@ -937,8 +1033,10 @@ { if ( module.importLibrary != NULL ) { - fprintf ( fMakefile, "%s:\n", - module.GetDependencyPath ().c_str () ); + string definitionDependencies = GetDefinitionDependencies ( module ); + fprintf ( fMakefile, "%s: %s\n", + module.GetDependencyPath ().c_str (), + definitionDependencies.c_str () ); fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib %s --kill-at\n\n", @@ -948,7 +1046,45 @@ } } +string +MingwModuleHandler::GetSpecObjectDependencies ( const string& filename ) const +{ + string basename = GetBasename ( filename ); + return basename + ".def" + " " + basename + ".stubs.c"; +} +string +MingwModuleHandler::GetDefinitionDependencies ( const Module& module ) const +{ + string dependencies; + for ( size_t i = 0; i < module.files.size (); i++ ) + { + File& file = *module.files[i]; + string extension = GetExtension ( file.name ); + if ( extension == ".spec" || extension == ".SPEC" ) + { + if ( dependencies.length () > 0 ) + dependencies += " "; + dependencies += GetSpecObjectDependencies ( file.name ); + } + } + return dependencies; +} + +string +MingwModuleHandler::GetLinkingDependencies ( const Module& module ) const +{ + string dependencies = GetImportLibraryDependencies ( module ); + string s = GetDefinitionDependencies ( module ); + if ( s.length () > 0 ) + { + dependencies += " "; + dependencies += s; + } + return dependencies; +} + + static MingwBuildToolModuleHandler buildtool_handler; MingwBuildToolModuleHandler::MingwBuildToolModuleHandler() @@ -1141,6 +1277,7 @@ GenerateInvocations ( module ); } + void MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget ( const Module& module ) { @@ -1253,8 +1390,8 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string archiveFilename = GetModuleArchiveFilename ( module ); - string importLibraryDependencies = GetImportLibraryDependencies ( module ); + string objectFilenames = GetObjectFilenames ( module ); + string linkingDependencies = GetLinkingDependencies ( module ); GenerateImportLibraryTargetIfNeeded ( module ); @@ -1264,14 +1401,14 @@ fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - archiveFilename.c_str (), - importLibraryDependencies.c_str () ); + objectFilenames.c_str (), + linkingDependencies.c_str () ); string linkerParameters ( "-Wl,--subsystem,console -Wl,--entry,_DllMain@12 -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll" ); GenerateLinkerCommand ( module, "${gcc}", linkerParameters, - archiveFilename ); + objectFilenames ); } else { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-16 22:26:26 UTC (rev 13086) @@ -20,8 +20,10 @@ protected: std::string GetWorkingDirectory () const; std::string GetExtension ( const std::string& filename ) const; + std::string GetBasename ( const std::string& filename ) const; std::string ReplaceExtension ( const std::string& filename, const std::string& newExtension ) const; + std::string GetActualSourceFilename ( const std::string& filename ) const; std::string GetModuleArchiveFilename ( const Module& module ) const; std::string GetImportLibraryDependencies ( const Module& module ) const; std::string GetModuleDependencies ( const Module& module ) const; @@ -46,6 +48,8 @@ const std::string& linkerParameters, const std::string& objectFilenames ) const; void GenerateImportLibraryTargetIfNeeded ( const Module& module ) const; + std::string GetDefinitionDependencies ( const Module& module ) const; + std::string GetLinkingDependencies ( const Module& module ) const; static FILE* fMakefile; private: std::string ConcatenatePaths ( const std::string& path1, @@ -79,26 +83,28 @@ std::string GenerateGccIncludeParameters ( const Module& module ) const; std::string GenerateGccParameters ( const Module& module ) const; std::string GenerateNasmParameters ( const Module& module ) const; - std::string GenerateGccCommand ( const Module& module, - const std::string& sourceFilename, - const std::string& cc, - const std::string& cflagsMacro ) const; - std::string GenerateGccAssemblerCommand ( const Module& module, - const std::string& sourceFilename, - const std::string& cc, - const std::string& cflagsMacro ) const; - std::string GenerateNasmCommand ( const Module& module, - const std::string& sourceFilename, - const std::string& nasmflagsMacro ) const; - std::string GenerateWindresCommand ( const Module& module, - const std::string& sourceFilename, - const std::string& windresflagsMacro ) const; - std::string GenerateCommand ( const Module& module, + void GenerateGccCommand ( const Module& module, + const std::string& sourceFilename, + const std::string& cc, + const std::string& cflagsMacro ) const; + void GenerateGccAssemblerCommand ( const Module& module, + const std::string& sourceFilename, + const std::string& cc, + const std::string& cflagsMacro ) const; + void GenerateNasmCommand ( const Module& module, + const std::string& sourceFilename, + const std::string& nasmflagsMacro ) const; + void GenerateWindresCommand ( const Module& module, const std::string& sourceFilename, - const std::string& cc, - const std::string& cflagsMacro, - const std::string& nasmflagsMacro, const std::string& windresflagsMacro ) const; + void GenerateWinebuildCommands ( const Module& module, + const std::string& sourceFilename ) const; + void GenerateCommands ( const Module& module, + const std::string& sourceFilename, + const std::string& cc, + const std::string& cflagsMacro, + const std::string& nasmflagsMacro, + const std::string& windresflagsMacro ) const; void GenerateObjectFileTargets ( const Module& module, const std::vector<File*>& files, const std::vector<If*>& ifs, @@ -122,6 +128,7 @@ const std::string& ar, const std::string* clags ) const; std::string GetPreconditionDependenciesName ( const Module& module ) const; + std::string GetSpecObjectDependencies ( const std::string& filename ) const; }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-16 22:26:26 UTC (rev 13086) @@ -108,7 +108,7 @@ bool HasImportLibrary () const; std::string GetTargetName () const; std::string GetDependencyPath () const; - std::string GetBasePath() const; + std::string GetBasePath () const; std::string GetPath () const; std::string GetPathWithPrefix ( const std::string& prefix ) const; std::string GetTargets () const; _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.xml --- branches/xmlbuildsystem/reactos/tools/tools.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/tools/tools.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -10,3 +10,6 @@ <directory name="wmc"> <xi:include href="wmc/wmc.xml" /> </directory> +<directory name="winebuild"> + <xi:include href="winebuild/winebuild.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.xml --- branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.xml 2005-01-16 18:39:32 UTC (rev 13085) +++ branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.xml 2005-01-16 22:26:26 UTC (rev 13086) @@ -0,0 +1,13 @@ +<module name="winebuild" type="buildtool"> + <include base="winebuild">.</include> + <include base="ReactOS">include/wine</include> + <define name="__USE_W32API" /> + <file>import.c</file> + <file>main.c</file> + <file>mkstemps.c</file> + <file>parser.c</file> + <file>res16.c</file> + <file>res32.c</file> + <file>spec32.c</file> + <file>utils.c</file> +</module>

19 years, 10 months

[chorns] 13085: Build input device drivers

by chorns＠svn.reactos.com

Build input device drivers Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/input/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.xml Added: branches/xmlbuildsystem/reactos/drivers/input/mouclass/mouclass.xml Added: branches/xmlbuildsystem/reactos/drivers/input/psaux/psaux.xml Added: branches/xmlbuildsystem/reactos/drivers/input/sermouse/sermouse.xml _____ Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml --- branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-16 18:30:40 UTC (rev 13084) +++ branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-16 18:39:32 UTC (rev 13085) @@ -7,6 +7,9 @@ <directory name="fs"> <xi:include href="fs/directory.xml" /> </directory> +<directory name="input"> + <xi:include href="input/directory.xml" /> +</directory> <directory name="lib"> <xi:include href="lib/directory.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/input/directory.xml --- branches/xmlbuildsystem/reactos/drivers/input/directory.xml 2005-01-16 18:30:40 UTC (rev 13084) +++ branches/xmlbuildsystem/reactos/drivers/input/directory.xml 2005-01-16 18:39:32 UTC (rev 13085) @@ -0,0 +1,12 @@ +<directory name="keyboard"> + <xi:include href="keyboard/keyboard.xml" /> +</directory> +<directory name="mouclass"> + <xi:include href="mouclass/mouclass.xml" /> +</directory> +<directory name="psaux"> + <xi:include href="psaux/psaux.xml" /> +</directory> +<directory name="sermouse"> + <xi:include href="sermouse/sermouse.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.xml --- branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.xml 2005-01-16 18:30:40 UTC (rev 13084) +++ branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.xml 2005-01-16 18:39:32 UTC (rev 13085) @@ -0,0 +1,7 @@ +<module name="keyboard" type="kernelmodedriver"> + <include base="keyboard">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>keyboard.c</file> + <file>keyboard.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/input/mouclass/mouclass.xml --- branches/xmlbuildsystem/reactos/drivers/input/mouclass/mouclass.xml 2005-01-16 18:30:40 UTC (rev 13084) +++ branches/xmlbuildsystem/reactos/drivers/input/mouclass/mouclass.xml 2005-01-16 18:39:32 UTC (rev 13085) @@ -0,0 +1,7 @@ +<module name="mouclass" type="kernelmodedriver"> + <include base="mouclass">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>mouclass.c</file> + <file>mouclass.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/input/psaux/psaux.xml --- branches/xmlbuildsystem/reactos/drivers/input/psaux/psaux.xml 2005-01-16 18:30:40 UTC (rev 13084) +++ branches/xmlbuildsystem/reactos/drivers/input/psaux/psaux.xml 2005-01-16 18:39:32 UTC (rev 13085) @@ -0,0 +1,11 @@ +<module name="psaux" type="kernelmodedriver"> + <include base="psaux">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>controller.c</file> + <file>logips2pp.c</file> + <file>mouse.c</file> + <file>psaux.c</file> + <file>synaptics.c</file> + <file>psaux.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/input/sermouse/sermouse.xml --- branches/xmlbuildsystem/reactos/drivers/input/sermouse/sermouse.xml 2005-01-16 18:30:40 UTC (rev 13084) +++ branches/xmlbuildsystem/reactos/drivers/input/sermouse/sermouse.xml 2005-01-16 18:39:32 UTC (rev 13085) @@ -0,0 +1,7 @@ +<module name="sermouse" type="kernelmodedriver"> + <include base="sermouse">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>sermouse.c</file> + <file>sermouse.rc</file> +</module>

19 years, 10 months

← Newer
1
...
26
27
28
29
30
31
32
...
71
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 January 2005