Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 26181: - Move NCI generated files to arch-specific directories - Replace ncitool by the one from powerpc branch, which supports code generation for multiple architectures
by hpoussin＠svn.reactos.org 26 Mar '07

26 Mar '07

Author: hpoussin Date: Tue Mar 27 02:56:22 2007 New Revision: 26181 URL: http://svn.reactos.org/svn/reactos?rev=26181&view=rev Log: - Move NCI generated files to arch-specific directories - Replace ncitool by the one from powerpc branch, which supports code generation for multiple architectures Added: trunk/reactos/tools/nci/ncitool.c - copied, changed from r26180, branches/powerpc/reactos/tools/nci/ncitool.c Modified: trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/tools/nci/nci.mak Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild Tue Mar 27 02:56:22 2007 @@ -47,5 +47,19 @@ <directory name="inc"> <pch>ntdll.h</pch> </directory> - <file>napi.S</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>napi.S</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>napi.S</file> + </directory> + </if> + <if property="ARCH" value="mips"> + <directory name="mips"> + <file>napi.S</file> + </directory> + </if> </module> Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Tue Mar 27 02:56:22 2007 @@ -22,8 +22,22 @@ <file>stubs.c</file> <file>stubsa.c</file> <file>stubsw.c</file> - <file>win32k.S</file> <file>wingl.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>win32k.S</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>win32k.S</file> + </directory> + </if> + <if property="ARCH" value="mips"> + <directory name="mips"> + <file>win32k.S</file> + </directory> + </if> </directory> <directory name="objects"> <file>bitmap.c</file> Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild Tue Mar 27 02:56:22 2007 @@ -43,10 +43,24 @@ <file>strpool.c</file> <file>stubs.c</file> <file>timer.c</file> - <file>win32k.S</file> <file>winhelp.c</file> <file>winsta.c</file> <file>wsprintf.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>win32k.S</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>win32k.S</file> + </directory> + </if> + <if property="ARCH" value="mips"> + <directory name="mips"> + <file>win32k.S</file> + </directory> + </if> </directory> <directory name="windows"> <file>accel.c</file> Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Tue Mar 27 02:56:22 2007 @@ -103,6 +103,17 @@ <file>interlck_asm.S</file> <file>fastinterlck_asm.S</file> <file>ioport.S</file> + <file>zw.S</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>zw.S</file> + </directory> + </if> + <if property="ARCH" value="mips"> + <directory name="mips"> + <file>zw.S</file> </directory> </if> <file>atom.c</file> @@ -132,7 +143,6 @@ <file>win32k.c</file> <file>work.c</file> <file>zone.c</file> - <file>zw.S</file> </directory> <directory name="fsrtl"> <file>dbcsname.c</file> Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=2618… ============================================================================== --- trunk/reactos/tools/nci/nci.mak (original) +++ trunk/reactos/tools/nci/nci.mak Tue Mar 27 02:56:22 2007 @@ -44,14 +44,14 @@ # WIN32K.SYS WIN32K_SVC_DB = $(NCI_BASE_)w32ksvc.db WIN32K_SERVICE_TABLE = subsystems$(SEP)win32$(SEP)win32k$(SEP)include$(SEP)napi.h -WIN32K_GDI_STUBS = dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)win32k.S -WIN32K_USER_STUBS = dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)win32k.S +WIN32K_GDI_STUBS = dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH)$(SEP)win32k.S +WIN32K_USER_STUBS = dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH)$(SEP)win32k.S # NTOSKRNL.EXE KERNEL_SVC_DB = $(NCI_BASE_)sysfuncs.lst KERNEL_SERVICE_TABLE = ntoskrnl$(SEP)include$(SEP)internal$(SEP)napi.h -NTDLL_STUBS = dll$(SEP)ntdll$(SEP)napi.S -KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)zw.S +NTDLL_STUBS = dll$(SEP)ntdll$(SEP)$(ARCH)$(SEP)napi.S +KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)$(ARCH)$(SEP)zw.S NCI_SERVICE_FILES = \ $(KERNEL_SERVICE_TABLE) \ @@ -63,7 +63,11 @@ $(NCI_SERVICE_FILES): $(NCI_TARGET) $(KERNEL_SVC_DB) $(WIN32K_SVC_DB) $(ECHO_NCI) - $(Q)$(NCI_TARGET) \ + ${mkdir} dll$(SEP)ntdll$(SEP)$(ARCH) 2>$(NUL) + ${mkdir} ntoskrnl$(SEP)ex$(SEP)$(ARCH) 2>$(NUL) + ${mkdir} dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL) + ${mkdir} dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL) + $(Q)$(NCI_TARGET) -arch $(ARCH) \ $(KERNEL_SVC_DB) \ $(WIN32K_SVC_DB) \ $(KERNEL_SERVICE_TABLE) \ Copied: trunk/reactos/tools/nci/ncitool.c (from r26180, branches/powerpc/reactos/tools/nci/ncitool.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?p2=tru… ============================================================================== --- branches/powerpc/reactos/tools/nci/ncitool.c (original) +++ trunk/reactos/tools/nci/ncitool.c Tue Mar 27 02:56:22 2007 @@ -51,7 +51,7 @@ #if defined(__GNUC__) #define UserModeStub_x86 " movl $0x%x, %%eax\n" \ " movl $KUSER_SHARED_SYSCALL, %%ecx\n" \ - " call *%%ecx\n" \ + " call *(%%ecx)\n" \ " ret $0x%x\n\n" #define UserModeStub_ppc " mflr 0\n" \ @@ -112,11 +112,11 @@ }; struct ncitool_data_t ncitool_data[] = { - { "x86", 4, KernelModeStub_x86, UserModeStub_x86, + { "i386", 4, KernelModeStub_x86, UserModeStub_x86, ".global _%s@%d\n", "_%s@%d:\n" }, { "powerpc", 4, KernelModeStub_ppc, UserModeStub_ppc, "\t.globl %s\n", "%s:\n" }, - { 0 } + { 0, } }; int arch_sel = 0; #define ARGS_TO_BYTES(x) 4*(ncitool_data[arch_sel].args_to_bytes) @@ -525,8 +525,9 @@ " zw.S NTOSKRNL Zw stubs\n" " win32k.S GDI32 stubs\n" " win32k.S USER32 stubs\n" - " -arch is optional, default is x86\n", - argv0 + " -arch is optional, default is %s\n", + argv0, + ncitool_data[0].arch ); } @@ -538,14 +539,15 @@ /* Catch architecture argument */ if (argc > 3 && !strcmp(argv[1],"-arch")) { - int i; - for( i = 0; ncitool_data[arch_sel].arch && strcmp(argv[2],ncitool_data[i].arch); i++ ); - if (!ncitool_data[arch_sel].arch) { - usage(argv[0]); - return 1; - } - arch_sel = i; - ArgOffset = 3; + for( arch_sel = 0; ncitool_data[arch_sel].arch; arch_sel++ ) + if (strcmp(argv[2],ncitool_data[arch_sel].arch) == 0) + break; + if (!ncitool_data[arch_sel].arch) { + printf("Invalid arch '%s'\n", argv[2]); + usage(argv[0]); + return 1; + } + ArgOffset = 3; } /* Make sure all arguments all there */ if (argc != Arguments + ArgOffset) { @@ -565,7 +567,6 @@ perror(argv[FileNumber + ArgOffset]); return (1); } - } /* Write the File Headers */

1 0

[hpoussin] 26180: Cleanup code for easier porting to other architectures
by hpoussin＠svn.reactos.org 26 Mar '07

26 Mar '07

Author: hpoussin Date: Tue Mar 27 00:28:13 2007 New Revision: 26180 URL: http://svn.reactos.org/svn/reactos?rev=26180&view=rev Log: Cleanup code for easier porting to other architectures Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/arch/ke.h trunk/reactos/ntoskrnl/include/internal/arch/mm.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/ipi.c trunk/reactos/ntoskrnl/ke/procobj.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ps/debug.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=261… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Tue Mar 27 00:28:13 2007 @@ -1010,7 +1010,10 @@ #elif defined(_PPC_) // <3 Arty SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_POWERPC; SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_POWERPC; -#elif +#elif defined(_MIPS_) + SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_R4000; + SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_R4000; +#else #error "Unsupported ReactOS Target" #endif } Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c Tue Mar 27 00:28:13 2007 @@ -36,7 +36,11 @@ while (TRUE) { KfRaiseIrql(SYNCH_LEVEL); +#if defined(_M_X86) Ke386HaltProcessor(); +#else + HalProcessorIdle(); +#endif } } Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Tue Mar 27 00:28:13 2007 @@ -1895,7 +1895,16 @@ { PAGED_CODE(); +#if defined(_M_IX86) __wbinvd(); +#elif defined(_M_PPC) +#error Needs to be implemented for PPC architecture! +#elif defined(_M_MIPS) + DPRINT1("NtFlushInstructionCache() is not implemented\n"); + for (;;); +#else +#error Unknown architecture +#endif return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/include/internal/arch/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/ke.h Tue Mar 27 00:28:13 2007 @@ -21,6 +21,10 @@ #ifdef _M_IX86 #include "../i386/ke.h" +#elif defined(_M_PPC) +#include "../powerpc/ke.h" +#elif defined(_M_MIPS) +#include "../mips/ke.h" #else #error "Unknown processor" #endif Modified: trunk/reactos/ntoskrnl/include/internal/arch/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/mm.h Tue Mar 27 00:28:13 2007 @@ -21,6 +21,10 @@ #ifdef _M_IX86 #include <internal/i386/mm.h> +#elif defined(_M_PPC) +#include <internal/powerpc/ke.h> +#elif defined(_M_MIPS) +#include <internal/mips/ke.h> #else #error "Unknown processor" #endif Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Tue Mar 27 00:28:13 2007 @@ -105,6 +105,7 @@ extern PULONG KiInterruptTemplateDispatch; extern PULONG KiInterruptTemplate2ndDispatch; extern ULONG KiUnexpectedEntrySize; +#ifdef _M_IX86 extern PVOID Ki386IopmSaveArea; extern ULONG KeI386EFlagsAndMaskV86; extern ULONG KeI386EFlagsOrMaskV86; @@ -114,6 +115,7 @@ extern KDESCRIPTOR KiGdtDescriptor; extern KDESCRIPTOR KiIdtDescriptor; extern KTSS KiBootTss; +#endif extern UCHAR P0BootStack[]; extern UCHAR KiDoubleFaultStack[]; extern FAST_MUTEX KernelAddressSpaceLock; Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Tue Mar 27 00:28:13 2007 @@ -13,6 +13,7 @@ #define DR_ACTIVE_MASK 0x10 #define DR_REG_MASK 0x4F +#ifdef _M_IX86 // // Sanitizes a selector // @@ -85,6 +86,7 @@ return ((Mode == KernelMode) ? DrAddress : (DrAddress <= MM_HIGHEST_USER_ADDRESS) ? DrAddress : 0); } +#endif /* _M_IX86 */ // // Enters a Guarded Region Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Tue Mar 27 00:28:13 2007 @@ -22,7 +22,7 @@ #undef PsGetCurrentProcess #define PsGetCurrentProcess _PsGetCurrentProcess -#include "i386/intrin_i.h" +#include "arch/intrin_i.h" #include "ke.h" #include "i386/mm.h" #include "i386/fpu.h" @@ -281,7 +281,7 @@ * Use IsPointerOffset to test whether a pointer should be interpreted as an offset * or as a pointer */ -#if defined(_X86_) || defined(_M_AMD64) +#if defined(_X86_) || defined(_M_AMD64) || defined(_MIPS_) /* for x86 and x86-64 the MSB is 1 so we can simply test on that */ #define IsPointerOffset(Ptr) ((LONG_PTR)(Ptr) >= 0) @@ -309,11 +309,6 @@ C_ASSERT(FIELD_OFFSET(KTHREAD, CallbackStack) == KTHREAD_CALLBACK_STACK); C_ASSERT(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS); C_ASSERT(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == KPROCESS_DIRECTORY_TABLE_BASE); -C_ASSERT(FIELD_OFFSET(KPROCESS, IopmOffset) == KPROCESS_IOPM_OFFSET); -C_ASSERT(FIELD_OFFSET(KPROCESS, LdtDescriptor) == KPROCESS_LDT_DESCRIPTOR0); -C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, SavedExceptionStack) == TF_SAVED_EXCEPTION_STACK); -C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS); -C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP); //C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); //C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); C_ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR); @@ -321,9 +316,18 @@ C_ASSERT(FIELD_OFFSET(KPCR, Irql) == KPCR_IRQL); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread) == KPCR_NPX_THREAD); +C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, DpcStack) == KPCR_PRCB_DPC_STACK); +C_ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); + +/* Platform specific checks */ +#ifdef _M_IX86 +C_ASSERT(FIELD_OFFSET(KPROCESS, IopmOffset) == KPROCESS_IOPM_OFFSET); +C_ASSERT(FIELD_OFFSET(KPROCESS, LdtDescriptor) == KPROCESS_LDT_DESCRIPTOR0); +C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, SavedExceptionStack) == TF_SAVED_EXCEPTION_STACK); +C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS); +C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP); C_ASSERT(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0); C_ASSERT(FIELD_OFFSET(KTSS, IoMapBase) == KTSS_IOMAPBASE); -C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, DpcStack) == KPCR_PRCB_DPC_STACK); -C_ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); +#endif #endif /* INCLUDE_INTERNAL_NTOSKRNL_H */ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Mar 27 00:28:13 2007 @@ -1400,7 +1400,7 @@ } /* Release the lock */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); /* Check if insertion failed */ if (!Inserted) @@ -1446,7 +1446,7 @@ } /* Release lock */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); /* Return nothing or the extension */ if (!DriverExtensions) return NULL; Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Tue Mar 27 00:28:13 2007 @@ -321,6 +321,7 @@ IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { PLOADER_PARAMETER_BLOCK NtLoaderBlock; +#if defined(_M_IX86) PKTSS Tss; PKGDTENTRY TssEntry; @@ -337,6 +338,7 @@ TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); +#endif /* Save pointer to ROS Block */ KeRosLoaderBlock = LoaderBlock; @@ -351,8 +353,10 @@ MmFreeLdrLastKrnlPhysAddr = MmFreeLdrLastKernelAddress - KSEG0_BASE + 0x200000; +#if defined(_M_IX86) /* Set up the VDM Data */ NtEarlyInitVdm(); +#endif /* Convert the loader block */ KiRosFrldrLpbToNtLpb(KeRosLoaderBlock, &NtLoaderBlock); Modified: trunk/reactos/ntoskrnl/ke/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ipi.c?rev=2618… ============================================================================== --- trunk/reactos/ntoskrnl/ke/ipi.c (original) +++ trunk/reactos/ntoskrnl/ke/ipi.c Tue Mar 27 00:28:13 2007 @@ -151,7 +151,7 @@ /* Raise to DPC level if required */ OldIrql = KeGetCurrentIrql(); - if (OldIrql <= DISPATCH_LEVEL) KfRaiseIrql(DISPATCH_LEVEL); + if (OldIrql < DISPATCH_LEVEL) OldIrql = KfRaiseIrql(DISPATCH_LEVEL); /* Acquire the IPI lock */ KefAcquireSpinLockAtDpcLevel(&KiIpiLock); Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c Tue Mar 27 00:28:13 2007 @@ -157,7 +157,9 @@ Process->QuantumReset = 6; Process->DirectoryTableBase = *DirectoryTableBase; Process->AutoAlignment = Enable; +#if defined(_M_IX86) Process->IopmOffset = KiComputeIopmOffset(IO_ACCESS_MAP_NONE); +#endif /* Initialize the lists */ InitializeListHead(&Process->ThreadListHead); Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Tue Mar 27 00:28:13 2007 @@ -461,7 +461,9 @@ /* Setup static fields from parent */ Thread->DisableBoost = Process->DisableBoost; +#if defined(_M_IX86) Thread->Iopl = Process->Iopl; +#endif Thread->Quantum = Process->QuantumReset; Thread->QuantumReset = Process->QuantumReset; Thread->SystemAffinityActive = FALSE; @@ -815,6 +817,7 @@ KERNEL_STACK_SIZE); MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); +#if defined(_M_IX86) /* Enter SEH to avoid crashes due to user mode */ Status = STATUS_SUCCESS; _SEH_TRY @@ -840,6 +843,9 @@ } } _SEH_END; +#else + Status = STATUS_SUCCESS; +#endif /* Set the Thread to initalized */ Thread->State = Initialized; Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=261… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c Tue Mar 27 00:28:13 2007 @@ -406,7 +406,7 @@ new_entry->Address = Address; new_entry->Process = (PEPROCESS)Process; #ifdef DBG -#ifdef _GNUC_ +#ifdef __GNUC__ new_entry->Caller = __builtin_return_address(0); #else new_entry->Caller = _ReturnAddress(); Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Tue Mar 27 00:28:13 2007 @@ -22,7 +22,7 @@ /* DOS Device Prefix \??\ and \?? */ ALIGNEDNAME ObpDosDevicesShortNamePrefix = {{L'\\',L'?',L'?',L'\\'}}; ALIGNEDNAME ObpDosDevicesShortNameRoot = {{L'\\',L'?',L'?',L'\0'}}; -UNICODE_STRING ObpDosDevicesShortName = +static UNICODE_STRING ObpDosDevicesShortName = { sizeof(ObpDosDevicesShortNamePrefix), sizeof(ObpDosDevicesShortNamePrefix), Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=26… ============================================================================== --- trunk/reactos/ntoskrnl/ps/debug.c (original) +++ trunk/reactos/ntoskrnl/ps/debug.c Tue Mar 27 00:28:13 2007 @@ -109,6 +109,7 @@ IN OUT PVOID* SystemArgument1, IN OUT PVOID* SystemArgument2) { +#if defined(_M_IX86) PGET_SET_CTX_CONTEXT GetSetContext; PKEVENT Event; PCONTEXT Context; @@ -150,6 +151,10 @@ /* Notify the Native API that we are done */ KeSetEvent(Event, IO_NO_INCREMENT, FALSE); +#else + DPRINT1("PspGetOrSetContextKernelRoutine() not implemented!"); + for (;;); +#endif } /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Tue Mar 27 00:28:13 2007 @@ -74,7 +74,7 @@ KiInitializeUserApc(NULL, (PVOID)((ULONG_PTR)Thread->Tcb.InitialStack - sizeof(KTRAP_FRAME) - - sizeof(FX_SAVE_AREA)), + SIZEOF_FX_SAVE_AREA), PspSystemDllEntryPoint, NULL, PspSystemDllBase, @@ -320,8 +320,16 @@ } /* Set the Start Addresses */ +#if defined(_M_IX86) Thread->StartAddress = (PVOID)ThreadContext->Eip; Thread->Win32StartAddress = (PVOID)ThreadContext->Eax; +#elif defined(_M_PPC) +#error Not implemented yet for PPC architecture! +#elif defined(_M_MIPS) + for (;;); +#else +#error Unknown architecture +#endif /* Let the kernel intialize the Thread */ Status = KeInitThread(&Thread->Tcb,

1 0

[greatlrd] 26178: we now resive DrvGetDirectDrawInfo DD_HALINFO from the driver to win32k from win32k to gdi32.dll or d3dthk.dll or direcly syscall. it take care of allot bugs in my test case. tested with vmware driver
by greatlrd＠svn.reactos.org 26 Mar '07

26 Mar '07

Author: greatlrd Date: Mon Mar 26 11:49:05 2007 New Revision: 26178 URL: http://svn.reactos.org/svn/reactos?rev=26178&view=rev Log: we now resive DrvGetDirectDrawInfo DD_HALINFO from the driver to win32k from win32k to gdi32.dll or d3dthk.dll or direcly syscall. it take care of allot bugs in my test case. tested with vmware driver Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Mon Mar 26 11:49:05 2007 @@ -12,7 +12,6 @@ //#define NDEBUG #include <debug.h> -GDIDEVICE IntGetPrimarySurface(VOID); /* swtich this off to get rid of all dx debug msg */ #define DX_DEBUG @@ -107,9 +106,11 @@ */ if (pDirectDraw->dwNumHeaps != 0) { + DPRINT1("Setup pvmList\n"); pDirectDraw->pvmList = (PVIDEOMEMORY) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumHeaps * sizeof(VIDEOMEMORY), TAG_DXPVMLIST); if (pDirectDraw->pvmList == NULL) { + DPRINT1("pvmList memmery alloc fail\n"); return FALSE; } } @@ -120,10 +121,12 @@ if (pDirectDraw->dwNumFourCC != 0) { + DPRINT1("Setup pdwFourCC\n"); pDirectDraw->pdwFourCC = (LPDWORD) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumFourCC * sizeof(DWORD), TAG_DXFOURCC); if (pDirectDraw->pdwFourCC == NULL) { + DPRINT1("pdwFourCC memmery alloc fail\n"); return FALSE; } } @@ -170,15 +173,15 @@ { /* Unknown version found */ DPRINT1(" Fail : did not get DD_HALINFO size \n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); return FALSE; } - - /* Copy it to user mode pointer the data */ - RtlCopyMemory(&pDirectDraw->Hal, &HalInfo, sizeof(DD_HALINFO)); - } - } + } + /* Copy it to user mode pointer the data */ + RtlCopyMemory(&pDirectDraw->Hal, &HalInfo, sizeof(DD_HALINFO)); + } + + DPRINT1("Trying EnableDirectDraw the driver\n"); success = pDirectDraw->EnableDirectDraw( pDirectDraw->Global.dhpdev, &pDirectDraw->DD,

1 0

[greatlrd] 26177: ReactOS win32k are using windows 2000 driver and it seam if we want using ms dx interface for graphics driver we must report it is plan NT5 driver we want not higher or lower, this show from vmware own display driver, now we get req for pvmList before we doing second call to DrvGetDirectDrawInfo, it show good sign we got that request from vmware driver.
by greatlrd＠svn.reactos.org 26 Mar '07

26 Mar '07

Author: greatlrd Date: Mon Mar 26 07:46:11 2007 New Revision: 26177 URL: http://svn.reactos.org/svn/reactos?rev=26177&view=rev Log: ReactOS win32k are using windows 2000 driver and it seam if we want using ms dx interface for graphics driver we must report it is plan NT5 driver we want not higher or lower, this show from vmware own display driver, now we get req for pvmList before we doing second call to DrvGetDirectDrawInfo, it show good sign we got that request from vmware driver. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Mar 26 07:46:11 2007 @@ -500,7 +500,7 @@ /* Call DDI driver's EnableDriver function */ RtlZeroMemory(&DED, sizeof(DED)); - if (! GDEnableDriver(DDI_DRIVER_VERSION_NT5_01, sizeof(DED), &DED)) + if (! GDEnableDriver(DDI_DRIVER_VERSION_NT5, sizeof(DED), &DED)) { DPRINT("DrvEnableDriver failed for %S\n", CurrentName); } @@ -2602,7 +2602,7 @@ /* Call DDI driver's EnableDriver function */ RtlZeroMemory(&DrvEnableData, sizeof (DrvEnableData)); - if (!GDEnableDriver(DDI_DRIVER_VERSION_NT5_01, sizeof (DrvEnableData), &DrvEnableData)) + if (!GDEnableDriver(DDI_DRIVER_VERSION_NT5, sizeof (DrvEnableData), &DrvEnableData)) { DPRINT("DrvEnableDriver failed for %S\n", CurrentName); continue;

1 0

[hpoussin] 26176: Allocate enough memory to copy string See issue #2107 for more details.
by hpoussin＠svn.reactos.org 25 Mar '07

25 Mar '07

Author: hpoussin Date: Mon Mar 26 02:42:37 2007 New Revision: 26176 URL: http://svn.reactos.org/svn/reactos?rev=26176&view=rev Log: Allocate enough memory to copy string See issue #2107 for more details. Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Mon Mar 26 02:42:37 2007 @@ -568,11 +568,11 @@ } /* Terminate the parameters */ if(ptrStart && ptrEnd) - { - temp = malloc((ptrEnd - ptrStart) + 2 * sizeof (TCHAR)); + { + temp = malloc((ptrEnd - ptrStart + 2) * sizeof(TCHAR)); if(!temp) return FALSE; - memcpy(temp, ptrStart, (ptrEnd - ptrStart) + 2 * sizeof (TCHAR)); + memcpy(temp, ptrStart, (ptrEnd - ptrStart + 1) * sizeof(TCHAR)); temp[(ptrEnd - ptrStart + 1)] = _T('\0'); if(!add_entry(entries, params, temp)) {

1 0

[hpoussin] 26175: Fix warnings by Pierre Schweitzer Add svn:eol-style property See issue #2096 for more details.
by hpoussin＠svn.reactos.org 25 Mar '07

25 Mar '07

Author: hpoussin Date: Mon Mar 26 01:25:11 2007 New Revision: 26175 URL: http://svn.reactos.org/svn/reactos?rev=26175&view=rev Log: Fix warnings by Pierre Schweitzer Add svn:eol-style property See issue #2096 for more details. Modified: trunk/reactos/drivers/multimedia/ks/allocators.c (props changed) trunk/reactos/drivers/multimedia/ks/clocks.c (props changed) trunk/reactos/drivers/multimedia/ks/connectivity.c (props changed) trunk/reactos/drivers/multimedia/ks/events.c (props changed) trunk/reactos/drivers/multimedia/ks/irp.c (contents, props changed) trunk/reactos/drivers/multimedia/ks/ks.def (props changed) trunk/reactos/drivers/multimedia/ks/ks.rc (props changed) trunk/reactos/drivers/multimedia/ks/methods.c (props changed) trunk/reactos/drivers/multimedia/ks/misc.c (props changed) trunk/reactos/drivers/multimedia/ks/properties.c (props changed) trunk/reactos/drivers/multimedia/ks/topology.c (props changed) trunk/reactos/drivers/multimedia/ks/worker.c (props changed) Propchange: trunk/reactos/drivers/multimedia/ks/allocators.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/clocks.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/connectivity.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/events.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/multimedia/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/ks/irp.… ============================================================================== --- trunk/reactos/drivers/multimedia/ks/irp.c (original) +++ trunk/reactos/drivers/multimedia/ks/irp.c Mon Mar 26 01:25:11 2007 @@ -4,6 +4,8 @@ */ #include <ks.h> + +#define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) /* @unimplemented @@ -75,7 +77,7 @@ if ( ! Header ) return STATUS_INVALID_PARAMETER; - Header = ExAllocatePoolWithTag(PagedPool, sizeof(KSDEVICE_HEADER), 'HDSK'); + Header = ExAllocatePoolWithTag(PagedPool, sizeof(KSDEVICE_HEADER), TAG('H','D','S','K')); if ( ! Header ) return STATUS_INSUFFICIENT_RESOURCES; @@ -97,7 +99,7 @@ /* TODO: Free content first */ - ExFreePoolWithTag(Header, 'HDSK'); + ExFreePoolWithTag(Header, TAG('H','D','S','K')); } /* @@ -153,7 +155,7 @@ /* TODO: Validate parameters */ - object_header = ExAllocatePoolWithTag(PagedPool, sizeof(KSOBJECT_HEADER), 'HOSK'); + object_header = ExAllocatePoolWithTag(PagedPool, sizeof(KSOBJECT_HEADER), TAG('H','O','S','K')); if ( ! object_header ) { @@ -176,7 +178,7 @@ KsFreeObjectHeader( IN PVOID Header) { - ExFreePoolWithTag(Header, 'HOSK'); + ExFreePoolWithTag(Header, TAG('H','O','S','K')); /* TODO */ Propchange: trunk/reactos/drivers/multimedia/ks/irp.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/ks.def ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/ks.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/methods.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/properties.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/topology.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/worker.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 26174: Updated French translation by Pierre Schweitzer See issue #2001 for more details.
by hpoussin＠svn.reactos.org 25 Mar '07

25 Mar '07

Author: hpoussin Date: Mon Mar 26 01:20:32 2007 New Revision: 26174 URL: http://svn.reactos.org/svn/reactos?rev=26174&view=rev Log: Updated French translation by Pierre Schweitzer See issue #2001 for more details. Modified: trunk/reactos/dll/cpl/intl_new/En.rc trunk/reactos/dll/cpl/intl_new/Fr.rc Modified: trunk/reactos/dll/cpl/intl_new/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/En.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/En.rc (original) +++ trunk/reactos/dll/cpl/intl_new/En.rc Mon Mar 26 01:20:32 2007 @@ -153,7 +153,7 @@ LTEXT "Calendar type:", -1, 13, 48, 56, 10 COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - LTEXT "Chronology by Hijra:", -1, 13, 59, 60, 16 + LTEXT "Muslim Calendar:", -1, 13, 59, 60, 16 COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED GROUPBOX "Short date format", IDC_GROUPBOX, 7, 83, 238, 81 Modified: trunk/reactos/dll/cpl/intl_new/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/Fr.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/Fr.rc (original) +++ trunk/reactos/dll/cpl/intl_new/Fr.rc Mon Mar 26 01:20:32 2007 @@ -1,181 +1,181 @@ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -IDD_REGOPTSPAGE DIALOGEX 0, 0, 252, 236 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Options régionales" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Options régionales et standards", IDC_GROUPBOX, 5, 3, 242, 165 - LTEXT "Cette option influence la façon d'affichage par les programmes des nombres, des devises, des dates et de l'heure.", IDC_STATIC, 14, 15, 230, 16 - LTEXT "&Choisir un élément de la liste ou presser le bouton ""Pa&ramétrer"" pour modifier séparément les formats:", IDC_STATIC, 14, 36, 230, 16 - COMBOBOX IDC_SETREG_COMBO, 14, 54, 168, 120, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT - PUSHBUTTON "Pa&ramétrer...", IDC_SETUP_BUTTON, 187, 54, 52, 13 - LTEXT "Exemples", IDC_STATIC, 14, 73, 70, 10 - LTEXT "Nombre:", IDC_STATIC, 16, 86, 48, 10 - LTEXT "Monétaire:", IDC_STATIC, 16, 101, 48, 10 - LTEXT "Heure:", IDC_STATIC, 16, 116, 48, 10 - LTEXT "Date courte:", IDC_STATIC, 16, 131, 48, 10 - LTEXT "Date longue:", IDC_STATIC, 16, 146, 48, 10 - EDITTEXT IDC_NUMSAMPLE_EDIT, 69, 86, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_MONEYSAMPLE_EDIT, 69, 101, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_TIMESAMPLE_EDIT, 69, 116, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 69, 131, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 69, 146, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "Position géographique", IDC_GROUPBOX, 5, 172, 242, 56 - LTEXT "Sélectionner votre position géographique pour les services tels que les infos locales ou la météo" , IDC_STATIC, 14, 184, 225, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 211, 225, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT -END - -IDD_EXTRAOPTSPAGE DIALOGEX 0, 0, 252, 236 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Extra" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Program language that not unicode supported", IDC_GROUPBOX, 5, 5, 242, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 225, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "This option...", IDC_STATIC, 14, 18, 223, 33 - LTEXT "Sélectionner la langue...", IDC_STATIC, 14, 55, 223, 18 - GROUPBOX "Transformation tables codepages", IDC_GROUPBOX, 5, 101, 242, 88 - /* TODO: add other components*/ -END - -IDD_LANGSOPTSPAGE DIALOGEX 0, 0, 252, 236 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Langues" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Langue de saisie du texte et services", IDC_GROUPBOX, 5, 3, 242, 52 - LTEXT "Pour voir ou modifier les langues et les méthodes de saisie de texte, cliquer sur ""Détail...""", -1, 12, 13, 230, 18 - PUSHBUTTON "Dé&tail...", IDC_DETAIL_BUTTON, 186, 34, 54, 14 - GROUPBOX "Support de langages additionnels", IDC_GROUPBOX, 5, 60, 242, 82 - /* TODO: add other components*/ -END - -IDD_NUMSOPTSSETUP DIALOGEX 0, 0, 252, 236 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Nombres" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Exemples", IDC_GROUPBOX, 5, 7, 242, 48 - LTEXT "Positif:", -1, 11, 20, 28, 10 - EDITTEXT IDC_NUM_EDIT, 42, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Négatif:", -1, 128, 20, 31, 10 - EDITTEXT IDC_NEGNUM_EDIT, 162, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Positif:", -1, 11, 38, 28, 10 - EDITTEXT IDC_NUM1_EDIT, 42, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Négatif:", -1, 128, 38, 31, 10 - EDITTEXT IDC_NEGNUM1_EDIT, 162, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Séparateur décimal:", -1, 18, 61, 126, 9 - COMBOBOX IDC_NUMDECIMALSEP_COMBO, 147, 59, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Nombre de chiffres décimaux:", -1, 18, 77, 126, 9 - COMBOBOX IDC_NUMFRACSYBMS_COMBO, 147, 75, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Séparateur de champ:", -1, 18, 93, 126, 9 - COMBOBOX IDC_NUMFIELDSEP_COMBO, 147, 91, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Nombre de chiffres dans le champ:", -1, 18, 109, 126, 9 - COMBOBOX IDC_NUMDIGFIELD_COMBO, 147, 107, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Signe de nombre négatif:", -1, 18, 125, 126, 9 - COMBOBOX IDC_NUMNEGSIGN_COMBO, 147, 123, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Format des nombres négatifs:", -1, 18, 141, 126, 9 - COMBOBOX IDC_NUMNEGFMT_COMBO, 147, 139, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Zéros d'en-tête:", -1, 18, 157, 126, 9 - COMBOBOX IDC_NUMLEADZERO_COMBO, 147, 155, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Séparateur d'éléments de liste :", -1, 18, 173, 126, 9 - COMBOBOX IDC_NUMELEMLISTSEP_COMBO, 147, 171, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Unité de mesure:", -1, 18, 189, 126, 9 - COMBOBOX IDC_NUMUNITSSYS_COMBO, 147, 187, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Region corresponding digits:", -1, 18, 205, 126, 9 - COMBOBOX IDC_NUMREGDIG_COMBO, 147, 203, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Digit replacement:", -1, 18, 221, 126, 9 - COMBOBOX IDC_NUMDIGREPL_COMBO, 147, 219, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE -END - -IDD_CURRENCYOPTSSETUP DIALOGEX 0, 0, 252, 236 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Monnaie" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Exemples", IDC_GROUPBOX, 5, 7, 242, 40 - LTEXT "Positif:", -1, 10, 25, 30, 10 - EDITTEXT IDC_CURRENCY_EDIT, 42, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Négatif:", -1, 128, 25, 31, 10 - EDITTEXT IDC_NEGCURRENCY_EDIT, 162, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Symbole monétaire:", -1, 20, 61, 126, 9 - COMBOBOX IDC_CURRENCYUNIT_COMBO, 148, 59, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT - LTEXT "Monnaie au format négatif:", -1, 20, 78, 126, 9 - COMBOBOX IDC_POSCURRENCYSUM_COMBO, 148, 76, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Monnaie au format positif:", -1, 20, 95, 126, 9 - COMBOBOX IDC_NEGCURRENCYSUM_COMBO, 148, 93, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Séparateur décimal:", -1, 20, 121, 126, 9 - COMBOBOX IDC_WHOLEFRACTSEP_COMBO, 148, 119, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT - LTEXT "Nombre de chiffres décimaux:", -1, 20, 137, 126, 9 - COMBOBOX IDC_FRACSYMBSNUM_COMBO, 148, 136, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT - LTEXT "Séparateur de champ:", -1, 20, 166, 126, 9 - COMBOBOX IDC_FIELDSEP_COMBO, 148, 164, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT - LTEXT "Nombre de chiffres dans le champ:", -1, 20, 183, 126, 9 - COMBOBOX IDC_DIGINFIELDNUM_COMBO, 148, 181, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE -END - -IDD_TIMEOPTSSETUP DIALOGEX 0, 0, 252, 236 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Heure" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Exemples", IDC_GROUPBOX, 5, 7, 242, 33 - LTEXT "Exemple:", -1, 13, 21, 52, 10 - EDITTEXT IDC_TIME_EDIT, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_UNKNOWN_EDIT, 156, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Format de l'heure:", -1, 10, 52, 147, 10 - COMBOBOX IDC_TIMEFMT_COMBO, 161, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Séparateur horaire:", -1, 10, 69, 147, 10 - COMBOBOX IDC_TIMESEP_COMBO, 161, 67, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Heure avant midi (AM):", -1, 10, 86, 147, 10 - COMBOBOX IDC_TIMEAM_COMBO, 161, 84, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Heure après midi (PM):", -1, 10, 104, 147, 10 - COMBOBOX IDC_TIMEPM_COMBO, 161, 102, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - GROUPBOX "", IDC_GROUPBOX, 7, 132, 238, 80 - LTEXT "Description du format de l'heure\nh = heure m = minute s = seconde t = matin ou après-midi\n\nh = heure au format 12 heures\nH = heure au format 24 heures\n\nhh, mm, ss = avec des zéros\nh, m, s = sans zéros", -1, 13, 141, 226, 65 -END - -IDD_DATEOPTSSETUP DIALOGEX 0, 0, 252, 236 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Date" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Calendrier", IDC_GROUPBOX, 5, 7, 242, 74 - LTEXT "Si l'année est saisie sur 2 chiffres, l'afficher en tant qu'année entre:", -1, 13, 18, 225, 8 - EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "et", -1, 55, 32, 17, 8 - EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP - CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 - LTEXT "Calendrier:", -1, 13, 48, 56, 10 - COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - LTEXT "Chronology by Hijra:", -1, 13, 59, 60, 16 - COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - GROUPBOX "Format court", IDC_GROUPBOX, 7, 83, 238, 81 - LTEXT "Exemple:", -1, 13, 95, 63, 10 - EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Exemple - lecture de droite à gauche:", -1, 13, 109, 60, 16 - EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "Format court:", -1, 13, 131, 60, 10 - COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Séparateur de date:", -1, 13, 148, 113, 10 - COMBOBOX IDC_SHRTDATESEP_COMBO, 187, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - GROUPBOX "Format long:", IDC_GROUPBOX, 7, 167, 238, 64 - LTEXT "Exemple:", -1, 13, 179, 61, 10 - EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Exemple - lecture de gauche à droite:", -1, 13, 193, 61, 16 - EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "Format long:", -1, 13, 215, 60, 10 - COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Langage et options régionales" - IDS_CPLDESCRIPTION "Sélectionner le langage, les formats de nombres, les devises, l'heure et la date." -END +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_REGOPTSPAGE DIALOGEX 0, 0, 252, 236 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Options régionales" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Options régionales et standards", IDC_GROUPBOX, 5, 3, 242, 165 + LTEXT "Cette option définit comment certains programmes afficheront les nombres, les devises, les dates et l'heure.", IDC_STATIC, 14, 15, 230, 16 + LTEXT "&Choisissez un élément de la liste ou pressez le bouton ""Pa&ramétrer"" pour modifier séparément les formats:", IDC_STATIC, 14, 36, 230, 16 + COMBOBOX IDC_SETREG_COMBO, 14, 54, 168, 120, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + PUSHBUTTON "Pa&ramétrer...", IDC_SETUP_BUTTON, 187, 54, 52, 13 + LTEXT "Exemples", IDC_STATIC, 14, 73, 70, 10 + LTEXT "Nombre:", IDC_STATIC, 16, 86, 48, 10 + LTEXT "Monétaire:", IDC_STATIC, 16, 101, 48, 10 + LTEXT "Heure:", IDC_STATIC, 16, 116, 48, 10 + LTEXT "Date courte:", IDC_STATIC, 16, 131, 48, 10 + LTEXT "Date longue:", IDC_STATIC, 16, 146, 48, 10 + EDITTEXT IDC_NUMSAMPLE_EDIT, 69, 86, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MONEYSAMPLE_EDIT, 69, 101, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE_EDIT, 69, 116, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 69, 131, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 69, 146, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Position géographique", IDC_GROUPBOX, 5, 172, 242, 56 + LTEXT "Sélectionnez votre position géographique pour pouvoir utiliser les services tels que les informations locales ou la météo." , IDC_STATIC, 14, 184, 225, 24 + COMBOBOX IDC_LOCATION_COMBO, 14, 211, 225, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT +END + +IDD_EXTRAOPTSPAGE DIALOGEX 0, 0, 252, 236 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extra" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Langue pour les programmes ne supportant pas Unicode", IDC_GROUPBOX, 5, 5, 242, 90 + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 225, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Cette option...", IDC_STATIC, 14, 18, 223, 33 + LTEXT "Sélectionnez la langue...", IDC_STATIC, 14, 55, 223, 18 + GROUPBOX "Transformation tables codepages", IDC_GROUPBOX, 5, 101, 242, 88 + /* TODO: add other components*/ +END + +IDD_LANGSOPTSPAGE DIALOGEX 0, 0, 252, 236 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Langues" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Langue de saisie du texte et services", IDC_GROUPBOX, 5, 3, 242, 52 + LTEXT "Pour voir ou modifier les langues et les méthodes de saisie de texte, cliquez sur ""Détail...""", -1, 12, 13, 230, 18 + PUSHBUTTON "Dé&tail...", IDC_DETAIL_BUTTON, 186, 34, 54, 14 + GROUPBOX "Support de langues additionnelles", IDC_GROUPBOX, 5, 60, 242, 82 + /* TODO: add other components*/ +END + +IDD_NUMSOPTSSETUP DIALOGEX 0, 0, 252, 236 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Nombres" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Exemples", IDC_GROUPBOX, 5, 7, 242, 48 + LTEXT "Positif:", -1, 11, 20, 28, 10 + EDITTEXT IDC_NUM_EDIT, 42, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Négatif:", -1, 128, 20, 31, 10 + EDITTEXT IDC_NEGNUM_EDIT, 162, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Positif:", -1, 11, 38, 28, 10 + EDITTEXT IDC_NUM1_EDIT, 42, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Négatif:", -1, 128, 38, 31, 10 + EDITTEXT IDC_NEGNUM1_EDIT, 162, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Séparateur décimal:", -1, 18, 61, 126, 9 + COMBOBOX IDC_NUMDECIMALSEP_COMBO, 147, 59, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Nombre de chiffres décimaux:", -1, 18, 77, 126, 9 + COMBOBOX IDC_NUMFRACSYBMS_COMBO, 147, 75, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Séparateur de champ:", -1, 18, 93, 126, 9 + COMBOBOX IDC_NUMFIELDSEP_COMBO, 147, 91, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Nombre de chiffres dans le champ:", -1, 18, 109, 126, 9 + COMBOBOX IDC_NUMDIGFIELD_COMBO, 147, 107, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Signe de nombre négatif:", -1, 18, 125, 126, 9 + COMBOBOX IDC_NUMNEGSIGN_COMBO, 147, 123, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Format des nombres négatifs:", -1, 18, 141, 126, 9 + COMBOBOX IDC_NUMNEGFMT_COMBO, 147, 139, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Zéros d'en-tête:", -1, 18, 157, 126, 9 + COMBOBOX IDC_NUMLEADZERO_COMBO, 147, 155, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Séparateur d'éléments de liste :", -1, 18, 173, 126, 9 + COMBOBOX IDC_NUMELEMLISTSEP_COMBO, 147, 171, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Unité de mesure:", -1, 18, 189, 126, 9 + COMBOBOX IDC_NUMUNITSSYS_COMBO, 147, 187, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Région correspondant aux chiffres:", -1, 18, 205, 126, 9 + COMBOBOX IDC_NUMREGDIG_COMBO, 147, 203, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Remplacement de chiffres:", -1, 18, 221, 126, 9 + COMBOBOX IDC_NUMDIGREPL_COMBO, 147, 219, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + +IDD_CURRENCYOPTSSETUP DIALOGEX 0, 0, 252, 236 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Monnaie" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Exemples", IDC_GROUPBOX, 5, 7, 242, 40 + LTEXT "Positif:", -1, 10, 25, 30, 10 + EDITTEXT IDC_CURRENCY_EDIT, 42, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Négatif:", -1, 128, 25, 31, 10 + EDITTEXT IDC_NEGCURRENCY_EDIT, 162, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Symbole monétaire:", -1, 20, 61, 126, 9 + COMBOBOX IDC_CURRENCYUNIT_COMBO, 148, 59, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT + LTEXT "Monnaie au format négatif:", -1, 20, 78, 126, 9 + COMBOBOX IDC_POSCURRENCYSUM_COMBO, 148, 76, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Monnaie au format positif:", -1, 20, 95, 126, 9 + COMBOBOX IDC_NEGCURRENCYSUM_COMBO, 148, 93, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Séparateur décimal:", -1, 20, 121, 126, 9 + COMBOBOX IDC_WHOLEFRACTSEP_COMBO, 148, 119, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT + LTEXT "Nombre de chiffres décimaux:", -1, 20, 137, 126, 9 + COMBOBOX IDC_FRACSYMBSNUM_COMBO, 148, 136, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT + LTEXT "Séparateur de champ:", -1, 20, 166, 126, 9 + COMBOBOX IDC_FIELDSEP_COMBO, 148, 164, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT + LTEXT "Nombre de chiffres dans le champ:", -1, 20, 183, 126, 9 + COMBOBOX IDC_DIGINFIELDNUM_COMBO, 148, 181, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + +IDD_TIMEOPTSSETUP DIALOGEX 0, 0, 252, 236 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Heure" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Exemples", IDC_GROUPBOX, 5, 7, 242, 33 + LTEXT "Exemple:", -1, 13, 21, 52, 10 + EDITTEXT IDC_TIME_EDIT, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_UNKNOWN_EDIT, 156, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Format de l'heure:", -1, 10, 52, 147, 10 + COMBOBOX IDC_TIMEFMT_COMBO, 161, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Séparateur horaire:", -1, 10, 69, 147, 10 + COMBOBOX IDC_TIMESEP_COMBO, 161, 67, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Heure avant midi (AM):", -1, 10, 86, 147, 10 + COMBOBOX IDC_TIMEAM_COMBO, 161, 84, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Heure après midi (PM):", -1, 10, 104, 147, 10 + COMBOBOX IDC_TIMEPM_COMBO, 161, 102, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + GROUPBOX "", IDC_GROUPBOX, 7, 132, 238, 80 + LTEXT "Description du format de l'heure\nh = heure m = minute s = seconde t = matin ou après-midi\n\nh = heure au format 12 heures\nH = heure au format 24 heures\n\nhh, mm, ss = avec des zéros\nh, m, s = sans zéros", -1, 13, 141, 226, 65 +END + +IDD_DATEOPTSSETUP DIALOGEX 0, 0, 252, 236 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Date" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Calendrier", IDC_GROUPBOX, 5, 7, 242, 74 + LTEXT "Si l'année est saisie sur 2 chiffres, l'afficher en tant qu'année entre:", -1, 13, 18, 225, 8 + EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "et", -1, 55, 32, 17, 8 + EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP + CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 + LTEXT "Calendrier:", -1, 13, 48, 56, 10 + COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED + LTEXT "Calendrier Musulman:", -1, 13, 59, 60, 16 + COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED + GROUPBOX "Format court", IDC_GROUPBOX, 7, 83, 238, 81 + LTEXT "Exemple:", -1, 13, 95, 63, 10 + EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Exemple - lecture de droite à gauche:", -1, 13, 109, 60, 16 + EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "Format court:", -1, 13, 131, 60, 10 + COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Séparateur de date:", -1, 13, 148, 113, 10 + COMBOBOX IDC_SHRTDATESEP_COMBO, 187, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + GROUPBOX "Format long:", IDC_GROUPBOX, 7, 167, 238, 64 + LTEXT "Exemple:", -1, 13, 179, 61, 10 + EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Exemple - lecture de gauche à droite:", -1, 13, 193, 61, 16 + EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "Format long:", -1, 13, 215, 60, 10 + COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Langue et options régionales" + IDS_CPLDESCRIPTION "Sélectionner la langue, les formats de nombres, les devises, l'heure et la date." +END

1 0

[fireball] 26170: - Change ScsiPort prototype to match DDK.
by fireball＠svn.reactos.org 25 Mar '07

25 Mar '07

Author: fireball Date: Sun Mar 25 22:21:12 2007 New Revision: 26170 URL: http://svn.reactos.org/svn/reactos?rev=26170&view=rev Log: - Change ScsiPort prototype to match DDK. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sun Mar 25 22:21:12 2007 @@ -1207,7 +1207,7 @@ VOID STDCALL ScsiPortIoMapTransfer(IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, - IN ULONG LogicalAddress, + IN PVOID LogicalAddress, IN ULONG Length) { DPRINT1("ScsiPortIoMapTransfer()\n");

1 0

[fireball] 26169: - Add a few more IOCTLs needed for storage stack - Add a couple of structs from DDK - Change ScsiPort prototype to match DDK
by fireball＠svn.reactos.org 25 Mar '07

25 Mar '07

Author: fireball Date: Sun Mar 25 22:18:51 2007 New Revision: 26169 URL: http://svn.reactos.org/svn/reactos?rev=26169&view=rev Log: - Add a few more IOCTLs needed for storage stack - Add a couple of structs from DDK - Change ScsiPort prototype to match DDK Modified: trunk/reactos/include/ddk/ntdddisk.h trunk/reactos/include/ddk/ntddstor.h trunk/reactos/include/ddk/srb.h Modified: trunk/reactos/include/ddk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdddisk.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntdddisk.h (original) +++ trunk/reactos/include/ddk/ntdddisk.h Sun Mar 25 22:18:51 2007 @@ -125,8 +125,23 @@ #define IOCTL_DISK_REQUEST_STRUCTURE \ CTL_CODE(IOCTL_DISK_BASE, 0x000f, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_MEDIA_REMOVAL \ + CTL_CODE(IOCTL_DISK_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_DISK_EJECT_MEDIA \ + CTL_CODE(IOCTL_DISK_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_DISK_LOAD_MEDIA \ + CTL_CODE(IOCTL_DISK_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) + #define IOCTL_DISK_RESERVE \ CTL_CODE(IOCTL_DISK_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_DISK_RELEASE \ + CTL_CODE(IOCTL_DISK_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_DISK_FIND_NEW_DEVICES \ + CTL_CODE(IOCTL_DISK_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_DISK_SET_CACHE_INFORMATION \ CTL_CODE(IOCTL_DISK_BASE, 0x0036, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) @@ -565,6 +580,15 @@ #define RETURN_SMART_STATUS 0xDA #define ENABLE_DISABLE_AUTO_OFFLINE 0xDB +typedef struct _MAPPED_ADDRESS { + struct _MAPPED_ADDRESS *NextMappedAddress; + PVOID MappedAddress; + ULONG NumberOfBytes; + LARGE_INTEGER IoAddress; + ULONG BusNumber; +} MAPPED_ADDRESS, *PMAPPED_ADDRESS; + + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ddk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddstor.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntddstor.h (original) +++ trunk/reactos/include/ddk/ntddstor.h Sun Mar 25 22:18:51 2007 @@ -324,6 +324,10 @@ UCHAR AdditionalParameters[1]; } STORAGE_PROPERTY_QUERY, *PSTORAGE_PROPERTY_QUERY; +typedef struct _PREVENT_MEDIA_REMOVAL { + BOOLEAN PreventMediaRemoval; +} PREVENT_MEDIA_REMOVAL, *PPREVENT_MEDIA_REMOVAL; + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=2616… ============================================================================== --- trunk/reactos/include/ddk/srb.h (original) +++ trunk/reactos/include/ddk/srb.h Sun Mar 25 22:18:51 2007 @@ -164,6 +164,11 @@ #define SRB_FLAGS_DONT_START_NEXT_PACKET 0x00800000 #define SRB_FLAGS_PORT_DRIVER_RESERVED 0x0F000000 #define SRB_FLAGS_CLASS_DRIVER_RESERVED 0xF0000000 + +/* Asynchronous events */ +#define SRBEV_BUS_RESET 0x0001 +#define SRBEV_SCSI_ASYNC_NOTIFICATION 0x0002 + typedef struct _SCSI_REQUEST_BLOCK { USHORT Length; @@ -496,7 +501,7 @@ ScsiPortIoMapTransfer( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, - IN ULONG LogicalAddress, + IN PVOID LogicalAddress, IN ULONG Length); SCSIPORTAPI

1 0

[fireball] 26168: rbuild uses TABs for indentation.
by fireball＠svn.reactos.org 25 Mar '07

25 Mar '07

Author: fireball Date: Sun Mar 25 21:24:52 2007 New Revision: 26168 URL: http://svn.reactos.org/svn/reactos?rev=26168&view=rev Log: rbuild uses TABs for indentation. Modified: trunk/reactos/hal/halx86/generic/generic.rbuild Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Sun Mar 25 21:24:52 2007 @@ -6,13 +6,13 @@ <define name="_NTHAL_" /> <file>beep.c</file> <file>bus.c</file> - <file>cmos.c</file> - <file>dma.c</file> + <file>cmos.c</file> + <file>dma.c</file> <file>drive.c</file> <file>misc.c</file> <file>pci.c</file> <file>portio.c</file> - <file>profil.c</file> + <file>profil.c</file> <file>reboot.c</file> <file>sysinfo.c</file> <file>timer.c</file> @@ -26,7 +26,7 @@ <define name="_NTHAL_" /> <define name="__USE_W32API" /> <file>irq.S</file> - <file>halinit.c</file> + <file>halinit.c</file> <file>processor.c</file> <file>spinlock.c</file> </module>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs